diff --git a/Allwmake b/Allwmake
index e9e7995414..e0dded16f0 100755
--- a/Allwmake
+++ b/Allwmake
@@ -37,7 +37,10 @@ src/Allwmake $targetType $*
 applications/Allwmake $targetType $*
 
 # Optionally build OpenFOAM Doxygen documentation
-[ $genDoc -eq 1 ] && doc/Allwmake
+if [ $genDoc -eq 1 ]
+then
+    doc/Allwmake
+fi
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/DNS/DNSSolversDoc.H b/applications/solvers/DNS/DNSSolversDoc.H
new file mode 100644
index 0000000000..307be76cc5
--- /dev/null
+++ b/applications/solvers/DNS/DNSSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpDNSSolvers Direct Numerical Simulation solvers
+@{
+    \ingroup grpSolvers
+    This group contains Direct Numerical Simulation (DNS) solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 38c5b7be8f..444874c82f 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -24,6 +24,9 @@ License
 Application
     dnsFoam
 
+Group
+    grpDNSSolvers
+
 Description
     Direct numerical simulation solver for boxes of isotropic turbulence
 
diff --git a/applications/solvers/basic/basicSolversDoc.H b/applications/solvers/basic/basicSolversDoc.H
new file mode 100644
index 0000000000..c8bb86db95
--- /dev/null
+++ b/applications/solvers/basic/basicSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpBasicSolvers Basic solvers
+@{
+    \ingroup grpSolvers
+    This group contains basic solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index 218d91ac44..846a4b00a0 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -24,8 +24,30 @@ License
 Application
     laplacianFoam
 
+Group
+    grpBasicSolvers
+
 Description
-    Solves a simple Laplace equation, e.g. for thermal diffusion in a solid.
+    Laplace equation solver for a scalar quantity.
+
+    \heading Solver details
+    The solver is applicable to, e.g. for thermal diffusion in a solid.  The
+    equation is given by:
+
+    \f[
+        \ddt{T}  = \div \left( D_T \grad T \right)
+    \f]
+
+    Where:
+    \vartable
+        T     | Scalar field which is solved for, e.g. temperature
+        D_T   | Diffusion coefficient
+    \endvartable
+
+    \heading Required fields
+    \plaintable
+        T     | Scalar field which is solved for, e.g. temperature
+    \endplaintable
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/solvers/basic/potentialFoam/Make/options b/applications/solvers/basic/potentialFoam/Make/options
index 159afb0f46..b4ad3d8bdf 100644
--- a/applications/solvers/basic/potentialFoam/Make/options
+++ b/applications/solvers/basic/potentialFoam/Make/options
@@ -1,11 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lfvOptions \
     -lsampling
diff --git a/applications/solvers/basic/potentialFoam/createControls.H b/applications/solvers/basic/potentialFoam/createControls.H
deleted file mode 100644
index 7015cae02e..0000000000
--- a/applications/solvers/basic/potentialFoam/createControls.H
+++ /dev/null
@@ -1,9 +0,0 @@
-const dictionary& potentialFlow
-(
-    mesh.solutionDict().subDict("potentialFlow")
-);
-
-const int nNonOrthCorr
-(
-    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
-);
diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index ce912510ec..36c4dcc08a 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -12,6 +12,7 @@ volVectorField U
     mesh
 );
 
+// Initialise the velocity internal field to zero
 U = dimensionedVector("0", U.dimensions(), vector::zero);
 
 surfaceScalarField phi
@@ -34,7 +35,9 @@ if (args.optionFound("initialiseUBCs"))
 }
 
 
-// Default name for the pressure field
+// Construct a pressure field
+// If it is available read it otherwise construct from the velocity BCs
+// converting fixed-value BCs to zero-gradient and vice versa.
 word pName("p");
 
 // Update name of the pressure field from the command-line option
@@ -55,6 +58,9 @@ forAll(U.boundaryField(), patchi)
     }
 }
 
+// Note that registerObject is false for the pressure field. The pressure
+// field in this solver doesn't have a physical value during the solution.
+// It shouldn't be looked up and used by sub models or boundary conditions.
 Info<< "Constructing pressure field " << pName << nl << endl;
 volScalarField p
 (
@@ -64,13 +70,28 @@ volScalarField p
         runTime.timeName(),
         mesh,
         IOobject::READ_IF_PRESENT,
-        IOobject::NO_WRITE
+        IOobject::NO_WRITE,
+        false
     ),
     mesh,
     dimensionedScalar(pName, sqr(dimVelocity), 0),
     pBCTypes
 );
 
+label pRefCell = 0;
+scalar pRefValue = 0.0;
+if (args.optionFound("writep"))
+{
+    setRefCell
+    (
+        p,
+        potentialFlow.dict(),
+        pRefCell,
+        pRefValue
+    );
+}
+
+
 Info<< "Constructing velocity potential field Phi\n" << endl;
 volScalarField Phi
 (
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index 5c56133788..a13d288a21 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -24,19 +24,69 @@ License
 Application
     potentialFoam
 
-Description
-    Potential flow solver which solves for the velocity potential
-    from which the flux-field is obtained and velocity field by reconstructing
-    the flux.
+Group
+    grpBasicSolvers
 
-    This application is particularly useful to generate starting fields for
-    Navier-Stokes codes.
+Description
+    Potential flow solver.
+
+    \heading Solver details
+    The potential flow solution is typically employed to generate initial fields
+    for full Navier-Stokes codes.  The flow is evolved using the equation:
+
+    \f[
+        \laplacian \Phi = \div(\vec{U})
+    \f]
+
+    Where:
+    \vartable
+        \Phi      | Velocity potential [m2/s]
+        \vec{U}   | Velocity [m/s]
+    \endvartable
+
+    The corresponding pressure field could be calculated from the divergence
+    of the Euler equation:
+
+    \f[
+        \laplacian p + \div(\div(\vec{U}\otimes\vec{U})) = 0
+    \f]
+
+    but this generates excessive pressure variation in regions of large
+    velocity gradient normal to the flow direction.  A better option is to
+    calculate the pressure field corresponding to velocity variation along the
+    stream-lines:
+
+    \f[
+        \laplacian p + \div(\vec{F}\cdot\div(\vec{U}\otimes\vec{U})) = 0
+    \f]
+    where the flow direction tensor \f$\vec{F}\f$ is obtained from
+    \f[
+        \vec{F} = \hat{\vec{U}}\otimes\hat{\vec{U}}
+    \f]
+
+    \heading Required fields
+    \plaintable
+        U         | Velocity [m/s]
+    \endplaintable
+
+    \heading Optional fields
+    \plaintable
+        p         | Kinematic pressure [m2/s2]
+        Phi       | Velocity potential [m2/s]
+                  | Generated from p (if present) or U if not present
+    \endplaintable
+
+    \heading Options
+    \plaintable
+        -writep   | write the Euler pressure
+        -writePhi | Write the final velocity potential
+        -initialiseUBCs | Update the velocity boundaries before solving for Phi
+    \endplaintable
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "pisoControl.H"
-#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,13 +108,13 @@ int main(int argc, char *argv[])
     argList::addBoolOption
     (
         "writePhi",
-        "Write the velocity potential field"
+        "Write the final velocity potential field"
     );
 
     argList::addBoolOption
     (
         "writep",
-        "Calculate and write the pressure field"
+        "Calculate and write the Euler pressure field"
     );
 
     argList::addBoolOption
@@ -81,7 +131,6 @@ int main(int argc, char *argv[])
 
     #include "createFields.H"
     #include "createMRF.H"
-    #include "createFvOptions.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -137,7 +186,7 @@ int main(int argc, char *argv[])
         Phi.write();
     }
 
-    // Calculate the pressure field
+    // Calculate the pressure field from the Euler equation
     if (args.optionFound("writep"))
     {
         Info<< nl << "Calculating approximate pressure field" << endl;
diff --git a/applications/solvers/basic/scalarTransportFoam/Make/options b/applications/solvers/basic/scalarTransportFoam/Make/options
index 51402dfc99..acbe7a6475 100644
--- a/applications/solvers/basic/scalarTransportFoam/Make/options
+++ b/applications/solvers/basic/scalarTransportFoam/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index 2430732e6d..f98225586f 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -24,13 +24,37 @@ License
 Application
     scalarTransportFoam
 
+Group
+    grpBasicSolvers
+
 Description
-    Solves a transport equation for a passive scalar
+    Passive scalar transport equation solver.
+
+    \heading Solver details
+    The equation is given by:
+
+    \f[
+        \ddt{T} + \div \left(\vec{U} T\right) - \div \left(D_T \grad T \right)
+        = S_{T}
+    \f]
+
+    Where:
+    \vartable
+        T       | Passive scalar
+        D_T     | Diffusion coefficient
+        S_T     | Source
+    \endvartable
+
+    \heading Required fields
+    \plaintable
+        T       | Passive scalar
+        U       | Velocity [m/s]
+    \endplaintable
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/EaEqn.H b/applications/solvers/combustion/PDRFoam/EaEqn.H
index 1baaa7180f..8b844a8159 100644
--- a/applications/solvers/combustion/PDRFoam/EaEqn.H
+++ b/applications/solvers/combustion/PDRFoam/EaEqn.H
@@ -1,7 +1,7 @@
 {
     volScalarField& hea = thermo.he();
 
-    solve
+    fvScalarMatrix EaEqn
     (
         betav*fvm::ddt(rho, hea) + mvConvection->fvmDiv(phi, hea)
       + betav*fvc::ddt(rho, K) + fvc::div(phi, K)
@@ -16,7 +16,16 @@
           : -betav*dpdt
         )
       - fvm::laplacian(Db, hea)
+      + betav*fvOptions(rho, hea)
     );
 
+    EaEqn.relax();
+
+    fvOptions.constrain(EaEqn);
+
+    EaEqn.solve();
+
+    fvOptions.correct(hea);
+
     thermo.correct();
 }
diff --git a/applications/solvers/combustion/PDRFoam/EauEqn.H b/applications/solvers/combustion/PDRFoam/EauEqn.H
index f031d90732..91bb49b913 100644
--- a/applications/solvers/combustion/PDRFoam/EauEqn.H
+++ b/applications/solvers/combustion/PDRFoam/EauEqn.H
@@ -2,7 +2,7 @@ if (ign.ignited())
 {
     volScalarField& heau = thermo.heu();
 
-    solve
+    fvScalarMatrix heauEqn
     (
         betav*fvm::ddt(rho, heau) + mvConvection->fvmDiv(phi, heau)
       + (betav*fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou()
@@ -23,5 +23,13 @@ if (ign.ignited())
         // A possible solution would be to solve for ftu as well as ft.
         //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), heau)
         //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau)
+     ==
+        betav*fvOptions(rho, heau)
     );
+
+    fvOptions.constrain(heauEqn);
+
+    heauEqn.solve();
+
+    fvOptions.correct(heau);
 }
diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 4768728619..405f5bcf62 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -16,7 +16,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude
+    -I$(LIB_SRC)/triSurface/lnInclude \
 
 EXE_LIBS = \
     -lengine \
@@ -29,4 +29,5 @@ EXE_LIBS = \
     -lspecie \
     -llaminarFlameSpeedModels \
     -lfiniteVolume \
-    -ldynamicFvMesh
+    -ldynamicFvMesh \
+    -lfvOptions
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index fa8518ba49..7e2ed0b63e 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -24,6 +24,9 @@ License
 Application
     PDRFoam
 
+Group
+    grpCombustionSolvers
+
 Description
     Solver for compressible premixed/partially-premixed combustion with
     turbulence modelling.
@@ -54,16 +57,17 @@ Description
     regions containing blockages which cannot be resolved by the mesh.
 
     The fields used by this solver are:
-
-    betav:  Volume porosity
-    Lobs:   Average diameter of obstacle in cell (m)
-    Aw:     Obstacle surface area per unit volume (1/m)
-    CR:     Drag tensor (1/m)
-    CT:     Turbulence generation parameter (1/m)
-    Nv:     Number of obstacles in cell per unit volume (m^-2)
-    nsv:    Tensor whose diagonal indicates the number to substract from
-            Nv to get the number of obstacles crossing the flow in each
-            direction.
+    \plaintable
+    betav  | Volume porosity
+    Lobs   | Average diameter of obstacle in cell (m)
+    Aw     | Obstacle surface area per unit volume (1/m)
+    CR     | Drag tensor (1/m)
+    CT     | Turbulence generation parameter (1/m)
+    Nv     | Number of obstacles in cell per unit volume (m^-2)
+    nsv    | Tensor whose diagonal indicates the number to substract from
+           | Nv to get the number of obstacles crossing the flow in each
+           | direction.
+    \endplaintable
 
 \*---------------------------------------------------------------------------*/
 
@@ -77,6 +81,7 @@ Description
 #include "Switch.H"
 #include "bound.H"
 #include "pimpleControl.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,11 +98,13 @@ int main(int argc, char *argv[])
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createMRF.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
     scalar StCoNum = 0.0;
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 057286f1e9..4e561052fd 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
     scalar StCoNum = 0.0;
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index e7bd21a628..7c06ab6e79 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -168,7 +168,7 @@ public:
 
         virtual void writeFields() const
         {
-            notImplemented("PDRDragModel::write()");
+            NotImplemented;
         }
 };
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
index 8a8ab924a3..3570aebd80 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,8 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PDRDragModel::New"
-        )   << "Unknown PDRDragModel type "
+        FatalErrorInFunction
+            << "Unknown PDRDragModel type "
             << modelType << nl << nl
             << "Valid  PDRDragModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/UEqn.H b/applications/solvers/combustion/PDRFoam/UEqn.H
index 1d949d17b7..983e020cab 100644
--- a/applications/solvers/combustion/PDRFoam/UEqn.H
+++ b/applications/solvers/combustion/PDRFoam/UEqn.H
@@ -7,13 +7,17 @@
       + turbulence->divDevRhoReff(U)
      ==
         betav*rho*g
+      + betav*fvOptions(rho, U)
     );
 
+    fvOptions.constrain(UEqn);
+
     volSymmTensorField invA(inv(I*UEqn.A() + drag->Dcu()));
 
     if (pimple.momentumPredictor())
     {
         U = invA & (UEqn.H() - betav*fvc::grad(p));
         U.correctBoundaryConditions();
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
index bdedac7a33..82411751fb 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,15 +44,8 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "XiEqModel::New"
-            "("
-            "    const psiuReactionThermo& thermo,"
-            "    const compressible::RASModel& turbulence,"
-            "    const volScalarField& Su"
-            ")"
-        )   << "Unknown XiEqModel type "
+        FatalErrorInFunction
+            << "Unknown XiEqModel type "
             << modelType << nl << nl
             << "Valid XiEqModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
index d77cfd8da6..0d7f1afcfb 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,15 +44,8 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "XiGModel::New"
-            "("
-            "    const psiuReactionThermo& thermo,"
-            "    const compressible::RASModel& turbulence,"
-            "    const volScalarField& Su"
-            ")"
-        )   << "Unknown XiGModel type "
+        FatalErrorInFunction
+            << "Unknown XiGModel type "
             << modelType << nl << nl
             << "Valid XiGModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
index 04f9b41cd1..a317eb50ec 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,10 +47,8 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "XiModel::New"
-        )   << "Unknown XiModel type "
+        FatalErrorInFunction
+            << "Unknown XiModel type "
             << modelType << nl << nl
             << "Valid XiModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
index 2ba6ae4514..2a02795313 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ public:
         //- Correct the flame-wrinking Xi
         virtual void correct()
         {
-            notImplemented("transport::correct()");
+            NotImplemented;
         }
 
         //- Correct the flame-wrinking Xi using the given convection scheme
diff --git a/applications/solvers/combustion/PDRFoam/bEqn.H b/applications/solvers/combustion/PDRFoam/bEqn.H
index abec1938c3..8ad1161871 100644
--- a/applications/solvers/combustion/PDRFoam/bEqn.H
+++ b/applications/solvers/combustion/PDRFoam/bEqn.H
@@ -73,6 +73,8 @@ if (ign.ignited())
       + fvm::div(phiSt, b)
       - fvm::Sp(fvc::div(phiSt), b)
       - fvm::laplacian(Db, b)
+     ==
+        betav*fvOptions(rho, b)
     );
 
 
@@ -82,8 +84,14 @@ if (ign.ignited())
 
     // Solve for b
     // ~~~~~~~~~~~
+    bEqn.relax();
+
+    fvOptions.constrain(bEqn);
+
     bEqn.solve();
 
+    fvOptions.correct(b);
+
     Info<< "min(b) = " << min(b).value() << endl;
 
     if (composition.contains("ft"))
diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H
index fb958b3b52..95f42a03d6 100644
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@@ -49,7 +49,7 @@ mesh.setFluxRequired(p.name());
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::RASModel> turbulence
 (
-    compressible::RASModel::New
+    compressible::New<compressible::RASModel>
     (
         rho,
         U,
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
index 7ae51fd5d1..d4d7782287 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -172,7 +172,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::SuRef
     }
     else
     {
-        FatalErrorIn("laminarFlameSpeedModels::SCOPE::SuRef(scalar phi)")
+        FatalErrorInFunction
             << "phi = " << phi
             << " cannot be handled by SCOPE function with the "
                "given coefficients"
@@ -210,7 +210,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::Ma
     }
     else
     {
-        FatalErrorIn("laminarFlameSpeedModels::SCOPE::Ma(scalar phi)")
+        FatalErrorInFunction
             << "phi = " << phi
             << " cannot be handled by SCOPE function with the "
                "given coefficients"
diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index 714a3e84e8..499885875b 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -25,6 +25,8 @@ if (pimple.transonic())
             betav*fvm::ddt(psi, p)
           + fvm::div(phid, p)
           - fvm::laplacian(rho*invA, p)
+         ==
+            betav*fvOptions(psi, p, rho.name())
         );
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
@@ -53,6 +55,8 @@ else
             betav*fvm::ddt(psi, p)
           + fvc::div(phiHbyA)
           - fvm::laplacian(rho*invA, p)
+         ==
+            betav*fvOptions(psi, p, rho.name())
         );
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
@@ -69,6 +73,7 @@ else
 
 U = HbyA - (invA & (betav*fvc::grad(p)));
 U.correctBoundaryConditions();
+fvOptions.correct(U);
 K = 0.5*magSqr(U);
 
 if (thermo.dpdt())
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index c30b39fdee..f659b4dcbe 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -1,8 +1,4 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude\
     -I$(LIB_SRC)/engine/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -10,13 +6,12 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lsampling \
-    -lmeshTools \
     -lengine \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
@@ -24,4 +19,8 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
-    -llaminarFlameSpeedModels
+    -llaminarFlameSpeedModels \
+    -lfiniteVolume \
+    -lfvOptions \
+    -lsampling \
+    -lmeshTools
diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H
index f493177d76..59e51b370b 100644
--- a/applications/solvers/combustion/XiFoam/UEqn.H
+++ b/applications/solvers/combustion/XiFoam/UEqn.H
@@ -6,8 +6,7 @@
       + MRF.DDt(rho, U)
       + turbulence->divDevRhoReff(U)
      ==
-        rho*g
-      + fvOptions(rho, U)
+        fvOptions(rho, U)
     );
 
     UEqn.relax();
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/files b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/files
new file mode 100644
index 0000000000..55ea77cbdf
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/files
@@ -0,0 +1,3 @@
+XiDyMFoam.C
+
+EXE = $(FOAM_APPBIN)/XiDyMFoam
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
new file mode 100644
index 0000000000..a726de69b3
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
@@ -0,0 +1,33 @@
+EXE_INC = \
+    -I.. \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/engine/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lfvOptions \
+    -ldynamicFvMesh \
+    -ltopoChangerFvMesh \
+    -ldynamicMesh \
+    -lmeshTools \
+    -lsampling \
+    -lengine \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
+    -lcompressibleTransportModels \
+    -lfluidThermophysicalModels \
+    -lreactionThermophysicalModels \
+    -lspecie \
+    -llaminarFlameSpeedModels
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C
new file mode 100644
index 0000000000..0f6f2976f1
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    XiFoam
+
+Group
+    grpCombustionSolvers grpMovingMeshSolvers
+
+Description
+    Solver for compressible premixed/partially-premixed combustion with
+    turbulence modelling.
+
+    Combusting RANS code using the b-Xi two-equation model.
+    Xi may be obtained by either the solution of the Xi transport
+    equation or from an algebraic exression.  Both approaches are
+    based on Gulder's flame speed correlation which has been shown
+    to be appropriate by comparison with the results from the
+    spectral model.
+
+    Strain effects are encorporated directly into the Xi equation
+    but not in the algebraic approximation.  Further work need to be
+    done on this issue, particularly regarding the enhanced removal rate
+    caused by flame compression.  Analysis using results of the spectral
+    model will be required.
+
+    For cases involving very lean Propane flames or other flames which are
+    very strain-sensitive, a transport equation for the laminar flame
+    speed is present.  This equation is derived using heuristic arguments
+    involving the strain time scale and the strain-rate at extinction.
+    the transport velocity is the same as that for the Xi equation.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "dynamicFvMesh.H"
+#include "psiuReactionThermo.H"
+#include "turbulentFluidThermoModel.H"
+#include "laminarFlameSpeed.H"
+#include "ignition.H"
+#include "Switch.H"
+#include "pimpleControl.H"
+#include "CorrectPhi.H"
+#include "fvOptions.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createDynamicFvMesh.H"
+    #include "initContinuityErrs.H"
+
+    pimpleControl pimple(mesh);
+
+    #include "readCombustionProperties.H"
+    #include "readGravitationalAcceleration.H"
+    #include "createFields.H"
+    #include "createMRF.H"
+    #include "createFvOptions.H"
+    #include "createRhoUf.H"
+    #include "createControls.H"
+    #include "initContinuityErrs.H"
+    #include "compressibleCourantNo.H"
+    #include "setInitialDeltaT.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.run())
+    {
+        #include "createTimeControls.H"
+
+        {
+            // Store divrhoU from the previous mesh so that it can be mapped
+            // and used in correctPhi to ensure the corrected phi has the
+            // same divergence
+            volScalarField divrhoU
+            (
+                "divrhoU",
+                fvc::div(fvc::absolute(phi, rho, U))
+            );
+
+            #include "compressibleCourantNo.H"
+            #include "setDeltaT.H"
+
+            runTime++;
+
+            Info<< "Time = " << runTime.timeName() << nl << endl;
+
+            // Store momentum to set rhoUf for introduced faces.
+            volVectorField rhoU("rhoU", rho*U);
+
+            // Do any mesh changes
+            mesh.update();
+
+            if (mesh.changing() && correctPhi)
+            {
+                // Calculate absolute flux from the mapped surface velocity
+                phi = mesh.Sf() & rhoUf;
+
+                #include "correctPhi.H"
+
+                // Make the fluxes relative to the mesh-motion
+                fvc::makeRelative(phi, rho, U);
+            }
+        }
+
+        if (mesh.changing() && checkMeshCourantNo)
+        {
+            #include "meshCourantNo.H"
+        }
+
+        #include "rhoEqn.H"
+        Info<< "rhoEqn max/min : " << max(rho).value()
+            << " " << min(rho).value() << endl;
+
+        // --- Pressure-velocity PIMPLE corrector loop
+        while (pimple.loop())
+        {
+            #include "UEqn.H"
+
+            #include "ftEqn.H"
+            #include "bEqn.H"
+            #include "EauEqn.H"
+            #include "EaEqn.H"
+
+            if (!ign.ignited())
+            {
+                thermo.heu() == thermo.he();
+            }
+
+            // --- Pressure corrector loop
+            while (pimple.correct())
+            {
+                #include "pEqn.H"
+            }
+
+            if (pimple.turbCorr())
+            {
+                turbulence->correct();
+            }
+        }
+
+        rho = thermo.rho();
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/correctPhi.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/correctPhi.H
new file mode 100644
index 0000000000..37072312ff
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/correctPhi.H
@@ -0,0 +1,11 @@
+CorrectPhi
+(
+    U,
+    phi,
+    p,
+    rho,
+    psi,
+    dimensionedScalar("rAUf", dimTime, 1),
+    divrhoU,
+    pimple
+);
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H
new file mode 100644
index 0000000000..aed0e76956
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H
@@ -0,0 +1,11 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
+);
+
+bool checkMeshCourantNo
+(
+    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H
new file mode 100644
index 0000000000..438396ae90
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H
@@ -0,0 +1,99 @@
+rho = thermo.rho();
+
+volScalarField rAU(1.0/UEqn.A());
+surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
+
+volVectorField HbyA("HbyA", U);
+HbyA = rAU*UEqn.H();
+
+if (pimple.transonic())
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(psi)
+       *(
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+        )
+    );
+
+    fvc::makeRelative(phid, psi, U);
+    MRF.makeRelative(fvc::interpolate(psi), phid);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          - fvm::laplacian(rhorAUf, p)
+         ==
+            fvOptions(psi, p, rho.name())
+        );
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi == pEqn.flux();
+        }
+    }
+}
+else
+{
+    surfaceScalarField phiHbyA
+    (
+        "phiHbyA",
+        (
+            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+          + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
+        )
+    );
+
+    fvc::makeRelative(phiHbyA, rho, U);
+    MRF.makeRelative(phiHbyA);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvc::div(phiHbyA)
+          - fvm::laplacian(rhorAUf, p)
+         ==
+            fvOptions(psi, p, rho.name())
+        );
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi = phiHbyA + pEqn.flux();
+        }
+    }
+}
+
+#include "rhoEqn.H"
+#include "compressibleContinuityErrs.H"
+
+U = HbyA - rAU*fvc::grad(p);
+U.correctBoundaryConditions();
+fvOptions.correct(U);
+K = 0.5*magSqr(U);
+
+{
+    rhoUf = fvc::interpolate(rho*U);
+    surfaceVectorField n(mesh.Sf()/mesh.magSf());
+    rhoUf += n*(fvc::absolute(phi, rho, U)/mesh.magSf() - (n & rhoUf));
+}
+
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+
+    if (mesh.moving())
+    {
+        dpdt -= fvc::div(fvc::meshPhi(rho, U), p);
+    }
+}
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H
new file mode 100644
index 0000000000..cf50980460
--- /dev/null
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H
@@ -0,0 +1,7 @@
+    #include "readTimeControls.H"
+
+    bool correctPhi =
+        pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+
+    bool checkMeshCourantNo =
+        pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 6090f923ca..a336810139 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -24,6 +24,9 @@ License
 Application
     XiFoam
 
+Group
+    grpCombustionSolvers
+
 Description
     Solver for compressible premixed/partially-premixed combustion with
     turbulence modelling.
@@ -56,7 +59,7 @@ Description
 #include "ignition.H"
 #include "Switch.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -70,7 +73,6 @@ int main(int argc, char *argv[])
     pimpleControl pimple(mesh);
 
     #include "readCombustionProperties.H"
-    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
@@ -79,6 +81,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options
index 8a3aee2784..176ec9fd9c 100644
--- a/applications/solvers/combustion/chemFoam/Make/options
+++ b/applications/solvers/combustion/chemFoam/Make/options
@@ -1,26 +1,14 @@
 EXE_INC = \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude\
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lreactionThermophysicalModels \
-    -lcompressibleTransportModels \
-    -lfluidThermophysicalModels \
     -lchemistryModel \
-    -lODE \
-    -lthermophysicalFunctions \
-    -lspecie \
     -lfiniteVolume \
     -lmeshTools
diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C
index a345551933..60c915d9dd 100644
--- a/applications/solvers/combustion/chemFoam/chemFoam.C
+++ b/applications/solvers/combustion/chemFoam/chemFoam.C
@@ -24,10 +24,14 @@ License
 Application
     chemFoam
 
+Group
+    grpCombustionSolvers
+
 Description
-    Solver for chemistry problems
-    - designed for use on single cell cases to provide comparison against
-      other chemistry solvers
+    Solver for chemistry problems designed for use on single cell cases to
+    provide comparison against other chemistry solvers
+
+    Note:
     - single cell mesh created on-the-fly
     - fields created on the fly from the initial conditions
 
@@ -35,7 +39,6 @@ Description
 
 #include "fvCFD.H"
 #include "psiReactionThermo.H"
-#include "turbulentFluidThermoModel.H"
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"
 #include "OFstream.H"
diff --git a/applications/solvers/combustion/chemFoam/createControls.H b/applications/solvers/combustion/chemFoam/createControls.H
index 14dcf56a16..6aeb2fff15 100644
--- a/applications/solvers/combustion/chemFoam/createControls.H
+++ b/applications/solvers/combustion/chemFoam/createControls.H
@@ -1,8 +1,2 @@
-if (runTime.controlDict().lookupOrDefault("suppressSolverInfo", false))
-{
-    lduMatrix::debug = 0;
-}
-
 Switch adjustTimeStep(runTime.controlDict().lookup("adjustTimeStep"));
-
 scalar maxDeltaT(readScalar(runTime.controlDict().lookup("maxDeltaT")));
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index 8855e4501a..ae5d54fc58 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -1,6 +1,6 @@
     if (mesh.nCells() != 1)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Solver only applicable to single cell cases"
             << exit(FatalError);
     }
@@ -86,20 +86,6 @@
 
     #include "createPhi.H"
 
-    Info << "Creating turbulence model.\n" << endl;
-    autoPtr<compressible::turbulenceModel> turbulence
-    (
-        compressible::turbulenceModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
     OFstream post(args.path()/"chemFoam.out");
     post<< "# Time" << token::TAB << "Temperature [K]" << token::TAB
         << "Pressure [Pa]" << endl;
-
-
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index 0878858de7..6ef06f8991 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -12,7 +12,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lengine \
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index e85010239b..14e35856f3 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -22,7 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    engineFoam
+    coldEngineFoam
+
+Group
+    grpCombustionSolvers grpMovingMeshSolvers
 
 Description
     Solver for cold-flow in internal combustion engines.
@@ -35,7 +38,7 @@ Description
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "OFstream.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,6 +62,8 @@ int main(int argc, char *argv[])
     #include "setInitialDeltaT.H"
     #include "startSummary.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/combustion/combustionSolversDoc.H b/applications/solvers/combustion/combustionSolversDoc.H
new file mode 100644
index 0000000000..bc68bdb7fe
--- /dev/null
+++ b/applications/solvers/combustion/combustionSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpCombustionSolvers Combustion solvers
+@{
+    \ingroup grpSolvers
+    This group contains combustion solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options
index ab0bbe9ffa..6fe414c1bb 100644
--- a/applications/solvers/combustion/engineFoam/Make/options
+++ b/applications/solvers/combustion/engineFoam/Make/options
@@ -1,7 +1,6 @@
 EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/XiFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/engine/lnInclude \
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index 4602eac997..a13df4cea3 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -24,6 +24,9 @@ License
 Application
     engineFoam
 
+Group
+    grpCombustionSolvers
+
 Description
     Solver for internal combustion engines.
 
@@ -59,7 +62,7 @@ Description
 #include "OFstream.H"
 #include "mathematicalConstants.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -83,6 +86,8 @@ int main(int argc, char *argv[])
     #include "setInitialDeltaT.H"
     #include "startSummary.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index fa336e9798..2d2d441e24 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 31ace4dda8..4d8c59a297 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -24,8 +24,11 @@ License
 Application
     fireFoam
 
+Group
+    grpCombustionSolvers
+
 Description
-    Transient PIMPLE solver for Fires and turbulent diffusion flames with
+    Transient PIMPLE solver for fires and turbulent diffusion flames with
     reacting Lagrangian parcels, surface film and pyrolysis modelling.
 
 \*---------------------------------------------------------------------------*/
@@ -40,7 +43,7 @@ Description
 #include "solidChemistryModel.H"
 #include "psiCombustionModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,6 +70,8 @@ int main(int argc, char *argv[])
     #include "setInitialDeltaT.H"
     #include "readPyrolysisTimeControls.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/combustion/reactingFoam/EEqn.H b/applications/solvers/combustion/reactingFoam/EEqn.H
index bd47416425..9267c9a9be 100644
--- a/applications/solvers/combustion/reactingFoam/EEqn.H
+++ b/applications/solvers/combustion/reactingFoam/EEqn.H
@@ -17,8 +17,7 @@
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
-        rho*(U&g)
-      + reaction->Sh()
+        reaction->Sh()
       + fvOptions(rho, he)
     );
 
diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options
index b6a03d74d8..6363f6d80d 100644
--- a/applications/solvers/combustion/reactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H
index f493177d76..907c9934e2 100644
--- a/applications/solvers/combustion/reactingFoam/UEqn.H
+++ b/applications/solvers/combustion/reactingFoam/UEqn.H
@@ -1,23 +1,24 @@
-    MRF.correctBoundaryVelocity(U);
+// Solve the Momentum equation
 
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U) + fvm::div(phi, U)
-      + MRF.DDt(rho, U)
-      + turbulence->divDevRhoReff(U)
-     ==
-        rho*g
-      + fvOptions(rho, U)
-    );
+MRF.correctBoundaryVelocity(U);
 
-    UEqn.relax();
+tmp<fvVectorMatrix> UEqn
+(
+    fvm::ddt(rho, U) + fvm::div(phi, U)
+  + MRF.DDt(rho, U)
+  + turbulence->divDevRhoReff(U)
+ ==
+    fvOptions(rho, U)
+);
 
-    fvOptions.constrain(UEqn);
+UEqn().relax();
 
-    if (pimple.momentumPredictor())
-    {
-        solve(UEqn == -fvc::grad(p));
+fvOptions.constrain(UEqn());
 
-        fvOptions.correct(U);
-        K = 0.5*magSqr(U);
-    }
+if (pimple.momentumPredictor())
+{
+    solve(UEqn() == -fvc::grad(p));
+
+    fvOptions.correct(U);
+    K = 0.5*magSqr(U);
+}
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index 19c115a8f2..71c805c43b 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -45,6 +45,28 @@ const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
+dimensionedScalar rhoMax
+(
+    dimensionedScalar::lookupOrDefault
+    (
+        "rhoMax",
+        pimple.dict(),
+        dimDensity,
+        GREAT
+    )
+);
+
+dimensionedScalar rhoMin
+(
+    dimensionedScalar::lookupOrDefault
+    (
+        "rhoMin",
+        pimple.dict(),
+        dimDensity,
+        0
+    )
+);
+
 mesh.setFluxRequired(p.name());
 
 Info << "Creating turbulence model.\n" << nl;
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index cedab05eab..2f352db5da 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -1,10 +1,18 @@
 rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
 
-volScalarField rAU(1.0/UEqn.A());
+volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
 
 volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn.H();
+HbyA = rAU*UEqn().H();
+
+if (pimple.nCorrPISO() <= 1)
+{
+    UEqn.clear();
+}
 
 if (pimple.transonic())
 {
@@ -26,7 +34,7 @@ if (pimple.transonic())
         (
             fvm::ddt(psi, p)
           + fvm::div(phid, p)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(rhorAUf, p)
          ==
             fvOptions(psi, p, rho.name())
         );
@@ -58,7 +66,7 @@ else
         (
             fvm::ddt(psi, p)
           + fvc::div(phiHbyA)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(rhorAUf, p)
          ==
             fvOptions(psi, p, rho.name())
         );
@@ -75,6 +83,17 @@ else
 #include "rhoEqn.H"
 #include "compressibleContinuityErrs.H"
 
+// Explicitly relax pressure for momentum corrector
+p.relax();
+
+// Recalculate density from the relaxed pressure
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
+Info<< "rho max/min : " << max(rho).value()
+    << " " << min(rho).value() << endl;
+
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 fvOptions.correct(U);
diff --git a/applications/solvers/combustion/reactingFoam/pcEqn.H b/applications/solvers/combustion/reactingFoam/pcEqn.H
new file mode 100644
index 0000000000..3d7fffc459
--- /dev/null
+++ b/applications/solvers/combustion/reactingFoam/pcEqn.H
@@ -0,0 +1,125 @@
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
+
+volScalarField rAU(1.0/UEqn().A());
+volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
+volVectorField HbyA("HbyA", U);
+HbyA = rAU*UEqn().H();
+
+if (pimple.nCorrPISO() <= 1)
+{
+    UEqn.clear();
+}
+
+if (pimple.transonic())
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(psi)
+       *(
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
+           /fvc::interpolate(rho)
+        )
+    );
+
+    MRF.makeRelative(fvc::interpolate(psi), phid);
+
+    surfaceScalarField phic
+    (
+        "phic",
+        fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf()
+    );
+
+    HbyA -= (rAU - rAtU)*fvc::grad(p);
+
+    volScalarField rhorAtU("rhorAtU", rho*rAtU);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          + fvc::div(phic)
+          - fvm::laplacian(rhorAtU, p)
+         ==
+            fvOptions(psi, p, rho.name())
+        );
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi == phic + pEqn.flux();
+        }
+    }
+}
+else
+{
+    surfaceScalarField phiHbyA
+    (
+        "phiHbyA",
+        (
+            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+          + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
+        )
+    );
+
+    MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
+
+    phiHbyA += fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf();
+    HbyA -= (rAU - rAtU)*fvc::grad(p);
+
+    volScalarField rhorAtU("rhorAtU", rho*rAtU);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvc::div(phiHbyA)
+          - fvm::laplacian(rhorAtU, p)
+         ==
+            fvOptions(psi, p, rho.name())
+        );
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi = phiHbyA + pEqn.flux();
+        }
+    }
+}
+
+#include "rhoEqn.H"
+#include "compressibleContinuityErrs.H"
+
+// Explicitly relax pressure for momentum corrector
+p.relax();
+
+U = HbyA - rAtU*fvc::grad(p);
+U.correctBoundaryConditions();
+fvOptions.correct(U);
+K = 0.5*magSqr(U);
+
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
+
+// Recalculate density from the relaxed pressure
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+
+if (!pimple.transonic())
+{
+    rho.relax();
+}
+
+Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 79deedb763..dab20b2ed6 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -24,6 +24,9 @@ License
 Application
     reactingFoam
 
+Group
+    grpCombustionSolvers
+
 Description
     Solver for combustion with chemical reactions.
 
@@ -34,7 +37,7 @@ Description
 #include "psiCombustionModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
@@ -51,11 +54,12 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
-    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
@@ -95,7 +99,14 @@ int main(int argc, char *argv[])
             // --- Pressure corrector loop
             while (pimple.correct())
             {
-                #include "pEqn.H"
+                if (pimple.consistent())
+                {
+                    #include "pcEqn.H"
+                }
+                else
+                {
+                    #include "pEqn.H"
+                }
             }
 
             if (pimple.turbCorr())
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
index c5ced108f0..e7b46c4e00 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
@@ -1,7 +1,6 @@
 EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
index e8645bb47c..63b7b8a61f 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoReactingBuoyantFoam
 
+Group
+    grpCombustionSolvers
+
 Description
     Solver for combustion with chemical reactions using density based
     thermodynamics package, using enahanced buoyancy treatment.
@@ -35,7 +38,7 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
@@ -57,6 +60,8 @@ int main(int argc, char *argv[])
     #include "createMRF.H"
     #include "createFvOptions.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
index c5ced108f0..e7b46c4e00 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
@@ -1,7 +1,6 @@
 EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index 87ca80dbf6..c3b18e6bd7 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -5,11 +5,11 @@
     // pressure solution - done in 2 parts. Part 1:
     thermo.rho() -= psi*p;
 
-    volScalarField rAU(1.0/UEqn.A());
+    volScalarField rAU(1.0/UEqn().A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
+    HbyA = rAU*UEqn().H();
 
     if (pimple.transonic())
     {
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
index 6eb245028d..610bf3a136 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoReactingFoam
 
+Group
+    grpCombustionSolvers
+
 Description
     Solver for combustion with chemical reactions using density based
     thermodynamics package.
@@ -35,7 +38,7 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
@@ -52,11 +55,12 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
-    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
index a01f9bac3b..b84be5a66d 100644
--- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H
+++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
@@ -116,6 +116,9 @@ License
         );
     }
 
+    // Update tho boundary values of the reciprocal time-step
+    rDeltaT.correctBoundaryConditions();
+
     Info<< "    Overall     = "
         << gMin(1/rDeltaT.internalField())
         << ", " << gMax(1/rDeltaT.internalField()) << endl;
diff --git a/applications/solvers/compressible/compressibleSolvers.H b/applications/solvers/compressible/compressibleSolvers.H
new file mode 100644
index 0000000000..85ab71f517
--- /dev/null
+++ b/applications/solvers/compressible/compressibleSolvers.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpCompressibleSolvers Compressible flow solvers
+@{
+    \ingroup grpSolvers
+    This group contains compressible flow solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index 22f5555335..d9a4a4e7df 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -94,15 +94,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
      || mag(accommodationCoeff_) > 2.0
     )
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "smoluchowskiJumpTFvPatchScalarField::"
-            "smoluchowskiJumpTFvPatchScalarField"
-            "("
-            "    const fvPatch&,"
-            "    const DimensionedField<scalar, volMesh>&,"
-            "    const dictionary&"
-            ")",
             dict
         )   << "unphysical accommodationCoeff specified"
             << "(0 < accommodationCoeff <= 1)" << endl
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 6ec81dd4dc..4656fe7281 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,14 +96,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
      || mag(accommodationCoeff_) > 2.0
     )
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "maxwellSlipUFvPatchScalarField::maxwellSlipUFvPatchScalarField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<vector, volMesh>&, "
-                "const dictionary&"
-            ")",
             dict
         )   << "unphysical accommodationCoeff_ specified"
             << "(0 < accommodationCoeff_ <= 1)" << endl
diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index 453c346040..24fc2d966e 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -11,6 +11,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lfvOptions \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
index 13f8f02c9c..e8c28d65c2 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
@@ -7,10 +7,8 @@ if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme))
     }
     else
     {
-        FatalErrorIn
-        (
-            "rhoCentralFoam::readFluxScheme"
-        )   << "fluxScheme: " << fluxScheme
+        FatalErrorInFunction
+            << "fluxScheme: " << fluxScheme
             << " is not a valid choice. "
             << "Options are: Tadmor, Kurganov"
             << abort(FatalError);
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
index fd02717d86..29b8a6faa4 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
@@ -13,6 +13,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lfvOptions \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index 38ffddc779..dea76502f1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoCentralDyMFoam
 
+Group
+    grpCompressibleSolvers grpMovingMeshSolvers
+
 Description
     Density-based compressible flow solver based on central-upwind schemes of
     Kurganov and Tadmor with support for mesh-motion and topology changes
@@ -49,6 +52,8 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "createTimeControls.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     #include "readFluxScheme.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 4faed39f75..1b71f42b94 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoCentralFoam
 
+Group
+    grpCompressibleSolvers
+
 Description
     Density-based compressible flow solver based on central-upwind schemes of
     Kurganov and Tadmor
@@ -51,6 +54,8 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     #include "readFluxScheme.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index 2a9889aa1a..0bf2d5dee7 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -7,7 +7,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lcompressibleTransportModels \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options
index cff9147b31..9d6c2d3850 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index bd30b60a90..667d78cd30 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
@@ -43,7 +43,7 @@ Description
 #include "bound.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
@@ -65,6 +65,8 @@ int main(int argc, char *argv[])
     #include "createRhoUf.H"
     #include "createControls.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 382d041fd9..0ff153263f 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoPimpleFoam
 
+Group
+    grpCompressibleSolvers
+
 Description
     Transient solver for laminar or turbulent flow of compressible fluids
     for HVAC and similar applications.
@@ -38,7 +41,7 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "bound.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
@@ -59,6 +62,8 @@ int main(int argc, char *argv[])
     #include "createMRF.H"
     #include "createFvOptions.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index b30fe8bd00..aecfa919e7 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -7,7 +7,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lcompressibleTransportModels \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index fdf8a2a769..80f317cd85 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -71,7 +71,7 @@ dimensionedScalar rhoMin
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::RASModel> turbulence
 (
-    compressible::RASModel::New
+    compressible::New<compressible::RASModel>
     (
         rho,
         U,
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
index ee0ed0de42..0c899c3171 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lcompressibleTransportModels \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 149049e63e..537eea2ea3 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -70,7 +70,7 @@ dimensionedScalar rhoMin
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::RASModel> turbulence
 (
-    compressible::RASModel::New
+    compressible::New<compressible::RASModel>
     (
         rho,
         U,
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index a7482b3df1..bc9b2d67cd 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoPorousSimpleFoam
 
+Group
+    grpCompressibleSolvers
+
 Description
     Steady-state solver for turbulent flow of compressible fluids with
     RANS turbulence modelling, implicit or explicit porosity treatment
@@ -34,7 +37,7 @@ Description
 #include "fvCFD.H"
 #include "rhoThermo.H"
 #include "turbulentFluidThermoModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "IOporosityModelList.H"
 #include "simpleControl.H"
 
@@ -54,6 +57,8 @@ int main(int argc, char *argv[])
     #include "createZones.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index d554931e62..07a4ca7d0f 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     rhoSimpleFoam
 
+Group
+    grpCompressibleSolvers
+
 Description
     Steady-state SIMPLE solver for laminar or turbulent RANS flow of
     compressible fluids.
@@ -34,7 +37,7 @@ Description
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "simpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,6 +54,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options
index 6e90739a0b..f66a8538ae 100644
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/Make/options
@@ -6,7 +6,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
index a638d4dc9c..c6a648d203 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index 8d913919d2..ac2614c2dd 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
@@ -39,7 +39,7 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,6 +60,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 95a4b4cc9d..8abeef1614 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -37,7 +37,7 @@ Description
 #include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,6 +54,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index c60a331b2d..9fda461211 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -21,6 +21,9 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Group
+    grpCompressibleSolvers
+
 Application
     sonicLiquidFoam
 
diff --git a/applications/solvers/discreteMethods/discreteMethodsSolversDoc.H b/applications/solvers/discreteMethods/discreteMethodsSolversDoc.H
new file mode 100644
index 0000000000..06c67407aa
--- /dev/null
+++ b/applications/solvers/discreteMethods/discreteMethodsSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpDiscreteMethodsSolvers Discrete method solvers
+@{
+    \ingroup grpSolvers
+    This group contains discrete method solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C
index a5e0562155..edf3691fb4 100644
--- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C
+++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C
@@ -24,6 +24,9 @@ License
 Application
     dsmcFoam
 
+Group
+    grpDiscreteMethodsSolvers
+
 Description
     Direct simulation Monte Carlo (DSMC) solver for 3D, transient, multi-
     species flows
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index 50c7f66085..fa2b04f563 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -24,6 +24,9 @@ License
 Application
     mdEquilibrationFoam
 
+Group
+    grpDiscreteMethodsSolvers
+
 Description
     Equilibrates and/or preconditions molecular dynamics systems
 
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
index 68f6530c95..f06436c603 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
@@ -24,6 +24,9 @@ License
 Application
     mdFoam
 
+Group
+    grpDiscreteMethodsSolvers
+
 Description
     Molecular dynamics solver for fluid dynamics
 
diff --git a/applications/solvers/doc/solver.dox b/applications/solvers/doc/solver.dox
new file mode 100644
index 0000000000..4c829de162
--- /dev/null
+++ b/applications/solvers/doc/solver.dox
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\page pageSolvers Solvers
+
+\section secSolvers Overview
+The available solvers are grouped into the following categories:
+  - \ref grpBasicSolvers
+  - \ref grpCombustionSolvers
+  - \ref grpCompressibleSolvers
+  - \ref grpDiscreteMethodsSolvers
+  - \ref grpDNSSolvers
+  - \ref grpElectroMagneticsSolvers
+  - \ref grpFinancialSolvers
+  - \ref grpHeatTransferSolvers
+  - \ref grpIncompressibleSolvers
+  - \ref grpLagrangianSolvers
+  - \ref grpMultiphaseSolvers
+  - \ref grpStressAnalysisSolvers
+
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/doc/solversDoc.H b/applications/solvers/doc/solversDoc.H
new file mode 100644
index 0000000000..da58bc0ce3
--- /dev/null
+++ b/applications/solvers/doc/solversDoc.H
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpSolvers Solvers
+@{
+    This group contains solvers
+@}
+
+\defgroup grpMovingMeshSolvers Moving mesh solvers
+@{
+    \ingroup grpSolvers
+    This group contains moving mesh solvers solvers
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/electromagnetics/electromagneticsSolversDoc.H b/applications/solvers/electromagnetics/electromagneticsSolversDoc.H
new file mode 100644
index 0000000000..773733f5bb
--- /dev/null
+++ b/applications/solvers/electromagnetics/electromagneticsSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpElectroMagneticsSolvers Electro-magnetics solvers
+@{
+    \ingroup grpSolvers
+    This group contains electro-magnetics solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
index 94cd1f0ca7..5c4a248df0 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
+++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
@@ -24,6 +24,9 @@ License
 Application
     electrostaticFoam
 
+Group
+    grpElectroMagneticsSolvers
+
 Description
     Solver for electrostatics.
 
diff --git a/applications/solvers/electromagnetics/magneticFoam/createFields.H b/applications/solvers/electromagnetics/magneticFoam/createFields.H
index 22d4008921..189ef5d105 100644
--- a/applications/solvers/electromagnetics/magneticFoam/createFields.H
+++ b/applications/solvers/electromagnetics/magneticFoam/createFields.H
@@ -58,7 +58,7 @@
 
         if (magnetZonei == -1)
         {
-            FatalIOErrorIn(args.executable().c_str(), transportProperties)
+            FatalIOErrorInFunction(transportProperties)
                 << "Cannot find faceZone for magnet " << magnets[i].name()
                 << exit(FatalIOError);
         }
diff --git a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
index 1b7d4f4f94..6613d2f206 100644
--- a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
+++ b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
@@ -24,6 +24,9 @@ License
 Application
     magneticFoam
 
+Group
+    grpElectroMagneticsSolvers
+
 Description
     Solver for the magnetic field generated by permanent magnets.
 
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index c9cb0242bd..497e977e85 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -24,6 +24,9 @@ License
 Application
     mhdFoam
 
+Group
+    grpElectroMagneticsSolvers
+
 Description
     Solver for magnetohydrodynamics (MHD): incompressible, laminar flow of a
     conducting fluid under the influence of a magnetic field.
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 16640d7ce7..2c912c7b93 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -24,6 +24,9 @@ License
 Application
     financialFoam
 
+Group
+    grpFinancialSolvers
+
 Description
     Solves the Black-Scholes equation to price commodities.
 
diff --git a/applications/solvers/financial/financialSolversDoc.H b/applications/solvers/financial/financialSolversDoc.H
new file mode 100644
index 0000000000..02197d5e37
--- /dev/null
+++ b/applications/solvers/financial/financialSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpFinancialSolvers Financial solvers
+@{
+    \ingroup grpSolvers
+    This group contains financial solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
index 9a60cac433..c14a8799f6 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
@@ -7,7 +7,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index e71cd3febe..bc348b840e 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     buoyantBoussinesqPimpleFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Transient solver for buoyant, turbulent flow of incompressible fluids
 
@@ -49,7 +52,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "radiationModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -72,6 +75,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
index f98c472e11..b8d07b1f1a 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
@@ -49,7 +49,7 @@ volVectorField U
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<incompressible::RASModel> turbulence
 (
-    incompressible::RASModel::New(U, phi, laminarTransport)
+    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
 );
 
 // Kinematic density for buoyancy force
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
index 48d83838ac..9046994122 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
@@ -3,15 +3,16 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
+    -lradiationModels \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H
index c495e58285..fec770c974 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H
@@ -9,7 +9,8 @@
         fvm::div(phi, T)
       - fvm::laplacian(alphaEff, T)
      ==
-        fvOptions(T)
+        radiation->ST(rhoCpRef, T)
+      + fvOptions(T)
     );
 
     TEqn.relax();
@@ -18,6 +19,8 @@
 
     TEqn.solve();
 
+    radiation->correct();
+
     fvOptions.correct(T);
 
     rhok = 1.0 - beta*(T - TRef);
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 6dff329d1f..8547f274fa 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     buoyantBoussinesqSimpleFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Steady-state solver for buoyant, turbulent flow of incompressible fluids
 
@@ -48,7 +51,8 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
-#include "fvIOoptionList.H"
+#include "radiationModel.H"
+#include "fvOptions.H"
 #include "simpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -63,10 +67,13 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createIncompressibleRadiationModel.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
index 17306f7d46..014bf8045c 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
@@ -49,7 +49,7 @@ volVectorField U
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<incompressible::RASModel> turbulence
 (
-    incompressible::RASModel::New(U, phi, laminarTransport)
+    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
 );
 
 // Kinematic density for buoyancy force
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
index 7138a3dad0..934083f2bb 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@@ -2,7 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index cd254643b0..5437e7f625 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     buoyantPimpleFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Transient solver for buoyant, turbulent flow of compressible fluids for
     ventilation and heat-transfer.
@@ -37,7 +40,7 @@ Description
 #include "rhoThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "radiationModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -51,7 +54,6 @@ int main(int argc, char *argv[])
 
     pimpleControl pimple(mesh);
 
-    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
@@ -61,6 +63,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
index 977fb1542a..af2b8926aa 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
@@ -50,9 +50,11 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
-Info<< "Calculating field g.h\n" << endl;
-volScalarField gh("gh", g & mesh.C());
-surfaceScalarField ghf("ghf", g & mesh.Cf());
+
+#include "readGravitationalAcceleration.H"
+#include "readhRef.H"
+#include "gh.H"
+
 
 Info<< "Reading field p_rgh\n" << endl;
 volScalarField p_rgh
@@ -88,3 +90,27 @@ volScalarField dpdt
 
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
+
+label pRefCell = 0;
+scalar pRefValue = 0.0;
+
+if (p_rgh.needReference())
+{
+    setRefCell
+    (
+        p,
+        p_rgh,
+        pimple.dict(),
+        pRefCell,
+        pRefValue
+    );
+
+    p += dimensionedScalar
+    (
+        "p",
+        p.dimensions(),
+        pRefValue - getRefCellValue(p, pRefCell)
+    );
+}
+
+dimensionedScalar initialMass("initialMass", fvc::domainIntegrate(rho));
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index e2f99671a3..76b4925917 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -1,4 +1,9 @@
 {
+    bool closedVolume = p_rgh.needReference();
+
+    dimensionedScalar compressibility = fvc::domainIntegrate(psi);
+    bool compressible = (compressibility.value() > SMALL);
+
     rho = thermo.rho();
 
     // Thermodynamic density needs to be updated by psi*d(p) after the
@@ -36,19 +41,27 @@
         )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
     );
 
-    fvScalarMatrix p_rghDDtEqn
+    tmp<fvScalarMatrix> p_rghDDtEqn
     (
-        fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
-      + fvc::div(phiHbyA)
-      ==
-        fvOptions(psi, p_rgh, rho.name())
+        new fvScalarMatrix(p_rgh, dimMass/dimTime)
     );
 
+    if (compressible)
+    {
+        p_rghDDtEqn =
+        (
+            fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
+        ==
+            fvOptions(psi, p_rgh, rho.name())
+        );
+    }
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            p_rghDDtEqn
+            p_rghDDtEqn()
+          + fvc::div(phiHbyA)
           - fvm::laplacian(rAUf, p_rgh)
         );
 
@@ -81,6 +94,32 @@
         dpdt = fvc::ddt(p);
     }
 
-    #include "rhoEqn.H"
+    if (compressible)
+    {
+        #include "rhoEqn.H"
+    }
     #include "compressibleContinuityErrs.H"
+
+    if (closedVolume)
+    {
+        if (!compressible)
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pRefCell)
+            );
+        }
+        else
+        {
+            p += (initialMass - fvc::domainIntegrate(thermo.rho()))
+                /compressibility;
+            rho = thermo.rho();
+        }
+        p_rgh = p - rho*gh;
+    }
+
+    Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value()
+        << endl;
 }
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index ac34158a6e..0d9433bac7 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 403fb6fecd..6aa339f56e 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     buoyantSimpleFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Steady-state solver for buoyant, turbulent flow of compressible fluids,
     including radiation, for ventilation and heat-transfer.
@@ -35,7 +38,7 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "radiationModel.H"
 #include "simpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,13 +51,14 @@ int main(int argc, char *argv[])
 
     simpleControl simple(mesh);
 
-    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index 5b07f643b1..d7cf3eb704 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -39,7 +39,7 @@ volVectorField U
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::RASModel> turbulence
 (
-    compressible::RASModel::New
+    compressible::New<compressible::RASModel>
     (
         rho,
         U,
@@ -49,9 +49,10 @@ autoPtr<compressible::RASModel> turbulence
 );
 
 
-Info<< "Calculating field g.h\n" << endl;
-volScalarField gh("gh", g & mesh.C());
-surfaceScalarField ghf("ghf", g & mesh.Cf());
+#include "readGravitationalAcceleration.H"
+#include "readhRef.H"
+#include "gh.H"
+
 
 Info<< "Reading field p_rgh\n" << endl;
 volScalarField p_rgh
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index a470461654..2b6f5e7e70 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -15,7 +15,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 7fe33fab37..34fcad63b7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -24,13 +24,17 @@ License
 Application
     chtMultiRegionFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Combination of heatConductionFoam and buoyantFoam for conjugate heat
-    transfer between solid regions and fluid regions. Both regions include
-    the fvOptions framework.
+    transfer between solid regions and fluid regions.
 
-    It handles secondary fluid or solid circuits which can be coupled
-    thermally with the main fluid region. i.e radiators, etc.
+    Note:
+    - Both regions support the fvOptions framework.
+    - It handles secondary fluid or solid circuits which can be coupled
+      thermally with the main fluid region. i.e radiators, etc.
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,7 +47,7 @@ Description
 #include "solidRegionDiffNo.H"
 #include "solidThermo.H"
 #include "radiationModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "coordinateSystem.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
index 22155c7aa4..252ecae022 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -12,7 +12,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
index 6c07dcbdfc..263dae535e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     chtMultiRegionSimpleFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Steady-state version of chtMultiRegionFoam
 
@@ -36,7 +39,7 @@ Description
 #include "regionProperties.H"
 #include "solidThermo.H"
 #include "radiationModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "coordinateSystem.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index 1811878bd7..aabee1cd37 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -4,10 +4,11 @@ PtrList<volScalarField> rhoFluid(fluidRegions.size());
 PtrList<volVectorField> UFluid(fluidRegions.size());
 PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
 PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
-PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
-PtrList<volScalarField> p_rghFluid(fluidRegions.size());
+PtrList<uniformDimensionedScalarField> hRefFluid(fluidRegions.size());
 PtrList<volScalarField> ghFluid(fluidRegions.size());
 PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
+PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
+PtrList<volScalarField> p_rghFluid(fluidRegions.size());
 PtrList<radiation::radiationModel> radiation(fluidRegions.size());
 
 List<scalar> initialMassFluid(fluidRegions.size());
@@ -19,7 +20,7 @@ PtrList<dimensionedScalar> rhoMax(fluidRegions.size());
 PtrList<dimensionedScalar> rhoMin(fluidRegions.size());
 
 PtrList<IOMRFZoneList> MRFfluid(fluidRegions.size());
-PtrList<fv::IOoptionList> fluidFvOptions(fluidRegions.size());
+PtrList<fv::options> fluidFvOptions(fluidRegions.size());
 
 // Populate fluid field pointer lists
 forAll(fluidRegions, i)
@@ -107,6 +108,54 @@ forAll(fluidRegions, i)
         )
     );
 
+    Info<< "    Adding to hRefFluid\n" << endl;
+    hRefFluid.set
+    (
+        i,
+        new uniformDimensionedScalarField
+        (
+            IOobject
+            (
+                "hRef",
+                runTime.constant(),
+                fluidRegions[i],
+                IOobject::READ_IF_PRESENT,
+                IOobject::NO_WRITE
+            ),
+            dimensionedScalar("hRef", dimLength, 0)
+        )
+    );
+
+    dimensionedScalar ghRef
+    (
+        mag(gFluid[i].value()) > SMALL
+      ? gFluid[i]
+          & (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i]
+      : dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0)
+    );
+
+    Info<< "    Adding to ghFluid\n" << endl;
+    ghFluid.set
+    (
+        i,
+        new volScalarField
+        (
+            "gh",
+            (gFluid[i] & fluidRegions[i].C()) - ghRef
+        )
+    );
+
+    Info<< "    Adding to ghfFluid\n" << endl;
+    ghfFluid.set
+    (
+        i,
+        new surfaceScalarField
+        (
+            "ghf",
+            (gFluid[i] & fluidRegions[i].Cf()) - ghRef
+        )
+    );
+
     Info<< "    Adding to turbulence\n" << endl;
     turbulence.set
     (
@@ -120,20 +169,6 @@ forAll(fluidRegions, i)
         ).ptr()
     );
 
-    Info<< "    Adding to ghFluid\n" << endl;
-    ghFluid.set
-    (
-        i,
-        new volScalarField("gh", gFluid[i] & fluidRegions[i].C())
-    );
-
-    Info<< "    Adding to ghfFluid\n" << endl;
-    ghfFluid.set
-    (
-        i,
-        new surfaceScalarField("ghf", gFluid[i] & fluidRegions[i].Cf())
-    );
-
     p_rghFluid.set
     (
         i,
@@ -219,6 +254,8 @@ forAll(fluidRegions, i)
     fluidFvOptions.set
     (
         i,
-        new fv::IOoptionList(fluidRegions[i])
+        new fv::options(fluidRegions[i])
     );
+
+    turbulence[i].validate();
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
index a008b0c1d4..6cde0ec06b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
@@ -13,7 +13,7 @@
     const volScalarField& psi = thermo.psi();
 
     IOMRFZoneList& MRF = MRFfluid[i];
-    fv::IOoptionList& fvOptions = fluidFvOptions[i];
+    fv::options& fvOptions = fluidFvOptions[i];
 
     const dimensionedScalar initialMass
     (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 2e66546483..be3ec79a2c 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -4,10 +4,11 @@ PtrList<volScalarField> rhoFluid(fluidRegions.size());
 PtrList<volVectorField> UFluid(fluidRegions.size());
 PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
 PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
-PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
-PtrList<volScalarField> p_rghFluid(fluidRegions.size());
+PtrList<uniformDimensionedScalarField> hRefFluid(fluidRegions.size());
 PtrList<volScalarField> ghFluid(fluidRegions.size());
 PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
+PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
+PtrList<volScalarField> p_rghFluid(fluidRegions.size());
 PtrList<radiation::radiationModel> radiation(fluidRegions.size());
 PtrList<volScalarField> KFluid(fluidRegions.size());
 PtrList<volScalarField> dpdtFluid(fluidRegions.size());
@@ -16,7 +17,7 @@ List<scalar> initialMassFluid(fluidRegions.size());
 List<bool> frozenFlowFluid(fluidRegions.size(), false);
 
 PtrList<IOMRFZoneList> MRFfluid(fluidRegions.size());
-PtrList<fv::IOoptionList> fluidFvOptions(fluidRegions.size());
+PtrList<fv::options> fluidFvOptions(fluidRegions.size());
 
 // Populate fluid field pointer lists
 forAll(fluidRegions, i)
@@ -104,6 +105,54 @@ forAll(fluidRegions, i)
         )
     );
 
+    Info<< "    Adding to hRefFluid\n" << endl;
+    hRefFluid.set
+    (
+        i,
+        new uniformDimensionedScalarField
+        (
+            IOobject
+            (
+                "hRef",
+                runTime.constant(),
+                fluidRegions[i],
+                IOobject::READ_IF_PRESENT,
+                IOobject::NO_WRITE
+            ),
+            dimensionedScalar("hRef", dimLength, 0)
+        )
+    );
+
+    dimensionedScalar ghRef
+    (
+        mag(gFluid[i].value()) > SMALL
+      ? gFluid[i]
+          & (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i]
+      : dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0)
+    );
+
+    Info<< "    Adding to ghFluid\n" << endl;
+    ghFluid.set
+    (
+        i,
+        new volScalarField
+        (
+            "gh",
+            (gFluid[i] & fluidRegions[i].C()) - ghRef
+        )
+    );
+
+    Info<< "    Adding to ghfFluid\n" << endl;
+    ghfFluid.set
+    (
+        i,
+        new surfaceScalarField
+        (
+            "ghf",
+            (gFluid[i] & fluidRegions[i].Cf()) - ghRef
+        )
+    );
+
     Info<< "    Adding to turbulence\n" << endl;
     turbulence.set
     (
@@ -117,20 +166,6 @@ forAll(fluidRegions, i)
         ).ptr()
     );
 
-    Info<< "    Adding to ghFluid\n" << endl;
-    ghFluid.set
-    (
-        i,
-        new volScalarField("gh", gFluid[i] & fluidRegions[i].C())
-    );
-
-    Info<< "    Adding to ghfFluid\n" << endl;
-    ghfFluid.set
-    (
-        i,
-        new surfaceScalarField("ghf", gFluid[i] & fluidRegions[i].Cf())
-    );
-
     p_rghFluid.set
     (
         i,
@@ -209,6 +244,8 @@ forAll(fluidRegions, i)
     fluidFvOptions.set
     (
         i,
-        new fv::IOoptionList(fluidRegions[i])
+        new fv::options(fluidRegions[i])
     );
+
+    turbulence[i].validate();
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 002faddb59..cd42cc00fd 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -36,12 +36,21 @@
         )/(mesh.magSf().boundaryField()*rhorAUf.boundaryField())
     );
 
+    tmp<fvScalarMatrix> p_rghDDtEqn
+    (
+        new fvScalarMatrix(p_rgh, dimMass/dimTime)
+    );
+
     {
-        fvScalarMatrix p_rghDDtEqn
-        (
-            fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
-          + fvc::div(phiHbyA)
-        );
+        if (compressible)
+        {
+            p_rghDDtEqn =
+            (
+                fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
+             ==
+                fvOptions(psi, p_rgh, rho.name())
+            );
+        }
 
         // Thermodynamic density needs to be updated by psi*d(p) after the
         // pressure solution - done in 2 parts. Part 1:
@@ -52,6 +61,7 @@
             fvScalarMatrix p_rghEqn
             (
                 p_rghDDtEqn
+              + fvc::div(phiHbyA)
               - fvm::laplacian(rhorAUf, p_rgh)
             );
 
@@ -93,8 +103,11 @@
         dpdt = fvc::ddt(p);
     }
 
-    // Solve continuity
-    #include "rhoEqn.H"
+    if (compressible)
+    {
+        // Solve continuity
+        #include "rhoEqn.H"
+    }
 
     // Update continuity errors
     #include "compressibleContinuityErrors.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index e61f057316..8d3a291bef 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -23,7 +23,7 @@
     radiation::radiationModel& rad = radiation[i];
 
     IOMRFZoneList& MRF = MRFfluid[i];
-    fv::IOoptionList& fvOptions = fluidFvOptions[i];
+    fv::options& fvOptions = fluidFvOptions[i];
 
     const dimensionedScalar initialMass
     (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index cb9be11787..d80e053727 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -2,7 +2,7 @@
     PtrList<coordinateSystem> coordinates(solidRegions.size());
     PtrList<solidThermo> thermos(solidRegions.size());
     PtrList<radiation::radiationModel> radiations(solidRegions.size());
-    PtrList<fv::IOoptionList> solidHeatSources(solidRegions.size());
+    PtrList<fv::options> solidHeatSources(solidRegions.size());
     PtrList<volScalarField> betavSolid(solidRegions.size());
     PtrList<volSymmTensorField> aniAlphas(solidRegions.size());
 
@@ -22,7 +22,7 @@
         solidHeatSources.set
         (
             i,
-            new fv::IOoptionList(solidRegions[i])
+            new fv::options(solidRegions[i])
         );
 
         if (!thermos[i].isotropic())
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index ab168a2016..9eb71909c1 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -29,4 +29,4 @@ volScalarField& h = thermo.he();
 
 const volScalarField& betav = betavSolid[i];
 
-fv::IOoptionList& fvOptions = solidHeatSources[i];
+fv::options& fvOptions = solidHeatSources[i];
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
old mode 100755
new mode 100644
diff --git a/applications/solvers/heatTransfer/heatTransferSolversDoc.H b/applications/solvers/heatTransfer/heatTransferSolversDoc.H
new file mode 100644
index 0000000000..e85a79b97c
--- /dev/null
+++ b/applications/solvers/heatTransfer/heatTransferSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpHeatTransferSolvers Heat transfer solvers
+@{
+    \ingroup grpSolvers
+    This group contains heat transfer solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options
index 7138a3dad0..934083f2bb 100644
--- a/applications/solvers/heatTransfer/thermoFoam/Make/options
+++ b/applications/solvers/heatTransfer/thermoFoam/Make/options
@@ -2,7 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
index 90b475794b..4af3af3ce4 100644
--- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
+++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
@@ -44,7 +44,7 @@
     {
         autoPtr<compressible::RASModel> turbulence
         (
-            compressible::RASModel::New
+            compressible::New<compressible::RASModel>
             (
                 rho,
                 U,
@@ -59,7 +59,7 @@
     {
         autoPtr<compressible::LESModel> turbulence
         (
-            compressible::LESModel::New
+            compressible::New<compressible::LESModel>
             (
                 rho,
                 U,
diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
index a23ce288e3..a9f906e84c 100644
--- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
+++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
@@ -24,6 +24,9 @@ License
 Application
     thermoFoam
 
+Group
+    grpHeatTransferSolvers
+
 Description
     Evolves the thermodynamics on a frozen flow field
 
@@ -35,7 +38,7 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "LESModel.H"
 #include "radiationModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "simpleControl.H"
 #include "pimpleControl.H"
 
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
index d33d199f06..48a0b023a7 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
@@ -5,11 +5,12 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
-    -lmeshTools
+    -lmeshTools \
+    -lfvOptions
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index f57f444121..74fcec0eb3 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -24,6 +24,9 @@ License
 Application
     ajointShapeOptimizationFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Steady-state solver for incompressible, turbulent flow of non-Newtonian
     fluids with optimisation of duct shape by applying "blockage" in regions
@@ -49,6 +52,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "simpleControl.H"
+#include "fvOptions.H"
 
 template<class Type>
 void zeroCells
@@ -76,9 +80,12 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "initAdjointContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -108,12 +115,18 @@ int main(int argc, char *argv[])
                 fvm::div(phi, U)
               + turbulence->divDevReff(U)
               + fvm::Sp(alpha, U)
+             ==
+                fvOptions(U)
             );
 
             UEqn().relax();
 
+            fvOptions.constrain(UEqn());
+
             solve(UEqn() == -fvc::grad(p));
 
+            fvOptions.correct(U);
+
             volScalarField rAU(1.0/UEqn().A());
             volVectorField HbyA("HbyA", U);
             HbyA = rAU*UEqn().H();
@@ -150,6 +163,7 @@ int main(int argc, char *argv[])
             // Momentum corrector
             U = HbyA - rAU*fvc::grad(p);
             U.correctBoundaryConditions();
+            fvOptions.correct(U);
         }
 
         // Adjoint Pressure-velocity SIMPLE corrector
@@ -173,12 +187,18 @@ int main(int argc, char *argv[])
               - adjointTransposeConvection
               + turbulence->divDevReff(Ua)
               + fvm::Sp(alpha, Ua)
+             ==
+                fvOptions(Ua)
             );
 
             UaEqn().relax();
 
+            fvOptions.constrain(UaEqn());
+
             solve(UaEqn() == -fvc::grad(pa));
 
+            fvOptions.correct(Ua);
+
             volScalarField rAUa(1.0/UaEqn().A());
             volVectorField HbyAa("HbyAa", Ua);
             HbyAa = rAUa*UaEqn().H();
@@ -215,6 +235,7 @@ int main(int argc, char *argv[])
             // Adjoint momentum corrector
             Ua = HbyAa - rAUa*fvc::grad(pa);
             Ua.correctBoundaryConditions();
+            fvOptions.correct(Ua);
         }
 
         laminarTransport.correct();
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
index fa27e4b38b..cb7da73687 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
@@ -82,7 +82,7 @@ singlePhaseTransportModel laminarTransport(U, phi);
 
 autoPtr<incompressible::RASModel> turbulence
 (
-    incompressible::RASModel::New(U, phi, laminarTransport)
+    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
 );
 
 
diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index 770a9fae92..9af500124c 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -13,4 +13,5 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lmeshTools \
+    -lfvOptions \
     -lsampling
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 4e35c5258f..62931e8654 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -24,9 +24,12 @@ License
 Application
     boundaryFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Steady-state solver for incompressible, 1D turbulent flow, typically to
-    generate boundary layer conditions at an inlet, for use in a simulation.
+    generate boundary layer conditions at an inlet.
 
     Boundary layer code to calculate the U, k and epsilon distributions.
     Used to create inlet boundary conditions for experimental comparisons
@@ -38,6 +41,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
+#include "fvOptions.H"
 #include "wallFvPatch.H"
 #include "makeGraph.H"
 
@@ -52,8 +56,11 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createFvOptions.H"
     #include "interrogateWallPatches.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -67,13 +74,17 @@ int main(int argc, char *argv[])
 
         fvVectorMatrix UEqn
         (
-            divR == gradP
+            divR == gradP + fvOptions(U)
         );
 
         UEqn.relax();
 
+        fvOptions.constrain(UEqn);
+
         UEqn.solve();
 
+        fvOptions.correct(U);
+
 
         // Correct driving force for a constant volume flow rate
         dimensionedVector UbarStar = flowMask & U.weightedAverage(mesh.V());
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 15faa59f82..5ecfebfcb4 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -33,7 +33,7 @@ singlePhaseTransportModel laminarTransport(U, phi);
 
 autoPtr<incompressible::RASModel> turbulence
 (
-    incompressible::RASModel::New(U, phi, laminarTransport)
+    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
 );
 
 dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);
diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
index 7fd01f0e9e..513ca54a42 100644
--- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -36,7 +36,7 @@ forAll(patches, patchi)
                  || mag(wallNormal & wallNormal2) < 0.99
                 )
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "wall faces are not parallel for patches "
                         << patches[patchId].name() << " and "
                         << currPatch.name() << nl
@@ -45,7 +45,7 @@ forAll(patches, patchi)
             }
             else
             {
-                FatalErrorIn(args.executable()) << "number of wall faces > 2"
+                FatalErrorInFunction
                     << nl << exit(FatalError);
             }
         }
@@ -54,7 +54,7 @@ forAll(patches, patchi)
 
 if (nWallFaces == 0)
 {
-    FatalErrorIn(args.executable()) << "No wall patches identified"
+    FatalErrorInFunction
         << exit(FatalError);
 }
 else
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index 80e13faa8d..a7d0da4a8a 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -24,9 +24,40 @@ License
 Application
     icoFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Transient solver for incompressible, laminar flow of Newtonian fluids.
 
+    \heading Solver details
+    The solver uses the PISO algorithm to solve the continuity equation:
+
+        \f[
+            \div \vec{U} = 0
+        \f]
+
+    and momentum equation:
+
+        \f[
+            \ddt{\vec{U}}
+          + \div \left( \vec{U} \vec{U} \right)
+          - \div \left(\nu \grad \vec{U} \right)
+          = - \grad p
+        \f]
+
+    Where:
+    \vartable
+        \vec{U} | Velocity
+        p       | Pressure
+    \endvartable
+
+    \heading Required fields
+    \plaintable
+        U       | Velocity [m/s]
+        p       | Kinematic pressure, p/rho [m2/s2]
+    \endplaintable
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
diff --git a/applications/solvers/incompressible/incompressibleSolversDoc.H b/applications/solvers/incompressible/incompressibleSolversDoc.H
new file mode 100644
index 0000000000..1ae50df034
--- /dev/null
+++ b/applications/solvers/incompressible/incompressibleSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpIncompressibleSolvers Incompressible flow solvers
+@{
+    \ingroup grpSolvers
+    This group contains incompressible flow solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index 9d3b567d3b..e1153a2772 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -24,6 +24,9 @@ License
 Application
     nonNewtonianIcoFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Transient solver for incompressible, laminar flow of non-Newtonian fluids.
 
diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options
index 20feab872f..9af500124c 100644
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
index 20feab872f..9af500124c 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index bfa86ea1d9..f31dace8fe 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     SRFPimpleFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Large time-step transient solver for incompressible, flow in a single
     rotating frame using the PIMPLE (merged PISO-SIMPLE) algorithm.
@@ -37,7 +40,7 @@ Description
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "SRFModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,6 +57,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
index 90e43d56aa..41aeca934c 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index cb01c03d63..deb266dd3d 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     pimpleDyMFoam.C
 
+Group
+    grpIncompressibleSolvers grpMovingMeshSolvers
+
 Description
     Transient solver for incompressible, flow of Newtonian fluids
     on a moving mesh using the PIMPLE (merged PISO-SIMPLE) algorithm.
@@ -38,7 +41,7 @@ Description
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,6 +63,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 72c6178d72..5a56b2b0ef 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -24,21 +24,54 @@ License
 Application
     pimpleFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Large time-step transient solver for incompressible, flow using the PIMPLE
     (merged PISO-SIMPLE) algorithm.
 
+    \heading Solver details
+    The solver uses the PIMPLE (merged PISO-SIMPLE) algorithm to solve the
+    continuity equation:
+
+        \f[
+            \div \vec{U} = 0
+        \f]
+
+    and momentum equation:
+
+        \f[
+            \ddt{\vec{U}} + \div \left( \vec{U} \vec{U} \right) - \div \gvec{R}
+          = - \grad p + \vec{S}_U
+        \f]
+
+    Where:
+    \vartable
+        \vec{U} | Velocity
+        p       | Pressure
+        \vec{R} | Stress tensor
+        \vec{S}_U | Momentum source
+    \endvartable
+
     Sub-models include:
     - turbulence modelling, i.e. laminar, RAS or LES
     - run-time selectable MRF and finite volume options, e.g. explicit porosity
 
+    \heading Required fields
+    \plaintable
+        U       | Velocity [m/s]
+        p       | Kinematic pressure, p/rho [m2/s2]
+        \<turbulence fields\> | As required by user selection
+    \endplaintable
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,6 +90,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/incompressible/pisoFoam/Make/options b/applications/solvers/incompressible/pisoFoam/Make/options
index 20feab872f..9af500124c 100644
--- a/applications/solvers/incompressible/pisoFoam/Make/options
+++ b/applications/solvers/incompressible/pisoFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 482b695cb9..24e99aba73 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -24,20 +24,51 @@ License
 Application
     pisoFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Transient solver for incompressible flow.
 
+    \heading Solver details
+    The solver uses the PISO algorithm to solve the continuity equation:
+
+        \f[
+            \div \vec{U} = 0
+        \f]
+
+    and momentum equation:
+
+        \f[
+            \ddt{\vec{U}} + \div \left( \vec{U} \vec{U} \right) - \div \gvec{R}
+          = - \grad p
+        \f]
+
+    Where:
+    \vartable
+        \vec{U} | Velocity
+        p       | Pressure
+        \vec{R} | Stress tensor
+    \endvartable
+
     Sub-models include:
     - turbulence modelling, i.e. laminar, RAS or LES
     - run-time selectable MRF and finite volume options, e.g. explicit porosity
 
+    \heading Required fields
+    \plaintable
+        U       | Velocity [m/s]
+        p       | Kinematic pressure, p/rho [m2/s2]
+        \<turbulence fields\> | As required by user selection
+    \endplaintable
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "pisoControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,6 +85,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 47ec8ac9f6..e7693a073e 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -24,6 +24,9 @@ License
 Application
     shallowWaterFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Transient solver for inviscid shallow-water equations with rotation.
 
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index bc0201f371..1d9ded80bf 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
index a888499d85..90df601079 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
@@ -6,7 +6,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
index 97617bd925..ea791c8868 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     SRFSimpleFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Steady-state solver for incompressible, turbulent flow of non-Newtonian
     fluids in a single rotating frame.
@@ -35,7 +38,7 @@ Description
 #include "turbulentTransportModel.H"
 #include "SRFModel.H"
 #include "simpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,6 +54,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
index 9d9fb484fc..5658b68ec6 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
@@ -66,5 +66,5 @@ singlePhaseTransportModel laminarTransport(U, phi);
 
 autoPtr<incompressible::RASModel> turbulence
 (
-    incompressible::RASModel::New(U, phi, laminarTransport)
+    incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
 );
diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 032e0e044b..12b5621636 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -7,7 +7,7 @@
         fvm::div(phi, U)
       + MRF.DDt(U)
       + turbulence->divDevReff(U)
-      ==
+     ==
         fvOptions(U)
     );
 
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
index a888499d85..90df601079 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
@@ -6,7 +6,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
index 3c9ef15c95..8010a7325e 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -24,6 +24,9 @@ License
 Application
     porousSimpleFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
     Steady-state solver for incompressible, turbulent flow with
     implicit or explicit porosity treatment and support for multiple reference
@@ -36,7 +39,7 @@ Description
 #include "turbulentTransportModel.H"
 #include "simpleControl.H"
 #include "IOporosityModelList.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,6 +57,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index eeb7bc1e34..1b84b48f7b 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -24,8 +24,40 @@ License
 Application
     simpleFoam
 
+Group
+    grpIncompressibleSolvers
+
 Description
-    Steady-state solver for incompressible, turbulent flow
+    Steady-state solver for incompressible flows with turbulence modelling.
+
+    \heading Solver details
+    The solver uses the SIMPLE algorithm to solve the continuity equation:
+
+        \f[
+            \div \vec{U} = 0
+        \f]
+
+    and momentum equation:
+
+        \f[
+            \div \left( \vec{U} \vec{U} \right) - \div \gvec{R}
+          = - \grad p + \vec{S}_U
+        \f]
+
+    Where:
+    \vartable
+        \vec{U} | Velocity
+        p       | Pressure
+        \vec{R} | Stress tensor
+        \vec{S}_U | Momentum source
+    \endvartable
+
+    \heading Required fields
+    \plaintable
+        U       | Velocity [m/s]
+        p       | Kinematic pressure, p/rho [m2/s2]
+        \<turbulence fields\> | As required by user selection
+    \endplaintable
 
 \*---------------------------------------------------------------------------*/
 
@@ -33,7 +65,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "simpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +82,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 8999e03663..22c16b4c80 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     DPMFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient solver for the coupled transport of a single kinematic particle
     cloud including the effect of the volume fraction of particles on the
diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C
index 69048cf5a6..4bb369f11b 100644
--- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C
@@ -24,6 +24,9 @@ License
 Application
     MPPICFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient solver for the coupled transport of a single kinematic particle
     cloud including the effect of the volume fraction of particles on the
diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
index 21a47f8893..aed6969724 100644
--- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
@@ -20,6 +20,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index 75f2b0a88c..8ab44318e6 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -32,4 +32,5 @@ EXE_LIBS = \
     -lsurfaceFilmModels \
     -lsampling \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 35e1cb7fb6..9c23effa57 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -24,7 +24,6 @@ EXE_INC = \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 3bfb2be776..dbf2a79605 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -24,14 +24,16 @@ License
 Application
     coalChemistryFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
-    Transient solver for:
-    - compressible,
-    - turbulent flow,
-    with
-    - coal and limestone parcel injections,
-    - energy source, and
-    - combustion.
+    Transient PIMPLE solver for compressible, laminar or turbulent flow with 
+    coal and thermodynamic parcels, and combustion.
+
+    Note:
+    - includes run-time selectable finite volume options, e.g. sources,
+      constraints
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,7 +42,7 @@ Description
 #include "basicThermoCloud.H"
 #include "coalCloud.H"
 #include "psiCombustionModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
@@ -68,6 +70,8 @@ int main(int argc, char *argv[])
     #include "createClouds.H"
     #include "createRadiationModel.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index cb41f9a407..2f9a7ce6f4 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
 
 if (!composition.contains(inertSpecie))
 {
-    FatalErrorIn(args.executable())
+    FatalErrorInFunction
         << "Specified inert specie '" << inertSpecie << "' not found in "
         << "species list. Available species:" << composition.species()
         << exit(FatalError);
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index 1f2e7a32db..0004a128e4 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -28,6 +28,7 @@ EXE_LIBS = \
     -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools \
     -lregionModels \
     -lsurfaceFilmModels
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index a6a35147e9..4f94e7f64f 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -32,6 +32,7 @@ EXE_LIBS = \
     -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools \
     -lregionModels \
     -lsurfaceFilmModels \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index b355148a94..0110832f2d 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     uncoupledKinematicParcelDyMFoam
 
+Group
+    grpLagrangianSolvers grpMovingMeshSolvers
+
 Description
     Transient solver for the passive transport of a single kinematic
     particle cloud.
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index befcb57d02..42273c1be5 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -24,6 +24,9 @@ License
 Application
     icoUncoupledKinematicParcelFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient solver for the passive transport of a single kinematic
     particle cloud.
diff --git a/applications/solvers/lagrangian/lagrangianSolversDoc.H b/applications/solvers/lagrangian/lagrangianSolversDoc.H
new file mode 100644
index 0000000000..7eb88c4f3f
--- /dev/null
+++ b/applications/solvers/lagrangian/lagrangianSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpLagrangianSolvers Lagrangian solvers
+@{
+    \ingroup grpSolvers
+    This group contains Lagrangian solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index fedb72a15c..8b2729e8c0 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
index 98b33ff285..8014596ae6 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
@@ -24,6 +24,9 @@ License
 Application
     reactingParcelFilmFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient PIMPLE solver for compressible, laminar or turbulent flow with
     reacting Lagrangian parcels, and surface film modelling.
@@ -37,7 +40,7 @@ Description
 #include "psiCombustionModel.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "pimpleControl.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -63,6 +66,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index a797d28efb..755aa59e9a 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -23,7 +23,6 @@ EXE_INC = \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index 9d05da0425..54f0e9e9b2 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
 
 if (!composition.contains(inertSpecie))
 {
-    FatalErrorIn(args.executable())
+    FatalErrorInFunction
         << "Specified inert specie '" << inertSpecie << "' not found in "
         << "species list. Available species:" << composition.species()
         << exit(FatalError);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index b3e758df12..8ccd5d5ecd 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -24,10 +24,16 @@ License
 Application
     reactingParcelFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient PIMPLE solver for compressible, laminar or turbulent flow with
-    reacting multiphase Lagrangian parcels, including run-time selectable
-    finite volume options, e.g. sources, constraints
+    reacting multiphase Lagrangian parcels.
+
+    Note:
+    - includes run-time selectable finite volume options, e.g. sources,
+      constraints
 
 \*---------------------------------------------------------------------------*/
 
@@ -36,7 +42,7 @@ Description
 #include "basicReactingMultiphaseCloud.H"
 #include "rhoCombustionModel.H"
 #include "radiationModel.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
 #include "localEulerDdtScheme.H"
@@ -63,6 +69,8 @@ int main(int argc, char *argv[])
     #include "createMRF.H"
     #include "createFvOptions.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "compressibleCourantNo.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index a797d28efb..755aa59e9a 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -23,7 +23,6 @@ EXE_INC = \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
index cfabbfb5b0..7a26729e54 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
 
 if (!composition.contains(inertSpecie))
 {
-    FatalErrorIn(args.executable())
+    FatalErrorInFunction
         << "Specified inert specie '" << inertSpecie << "' not found in "
         << "species list. Available species:" << composition.species()
         << exit(FatalError);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
index 9a49318c23..a04bc4aa5e 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
@@ -24,6 +24,9 @@ License
 Application
     simpleReactingParcelFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Steady state SIMPLE solver for compressible, laminar or turbulent flow with
     reacting multiphase Lagrangian parcels, including run-time selectable
@@ -37,7 +40,7 @@ Description
 #include "rhoCombustionModel.H"
 #include "radiationModel.H"
 #include "IOporosityModelList.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "SLGThermo.H"
 #include "simpleControl.H"
 
@@ -60,6 +63,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/files b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/files
new file mode 100644
index 0000000000..963e828de6
--- /dev/null
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/files
@@ -0,0 +1,3 @@
+simpleCoalParcelFoam.C
+
+EXE = $(FOAM_APPBIN)/simpleCoalParcelFoam
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
new file mode 100644
index 0000000000..efdf721ee3
--- /dev/null
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
@@ -0,0 +1,57 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
+    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/ODE/lnInclude \
+    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/combustionModels/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam
+
+
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -llagrangianTurbulence \
+    -lspecie \
+    -lfluidThermophysicalModels \
+    -lliquidProperties \
+    -lliquidMixtureProperties \
+    -lsolidProperties \
+    -lsolidMixtureProperties \
+    -lthermophysicalFunctions \
+    -lreactionThermophysicalModels \
+    -lSLGThermo \
+    -lchemistryModel \
+    -lradiationModels \
+    -lODE \
+    -lregionModels \
+    -lsurfaceFilmModels \
+    -lcombustionModels \
+    -lfvOptions \
+    -lsampling \
+    -lcoalCombustion
+
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/createClouds.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/createClouds.H
new file mode 100644
index 0000000000..3a371a0f10
--- /dev/null
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createClouds.H
@@ -0,0 +1,9 @@
+Info<< "\nConstructing coal cloud" << endl;
+coalCloud parcels
+(
+    "reactingCloud1",
+    rho,
+    U,
+    g,
+    slgThermo
+);
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
new file mode 100644
index 0000000000..5db8e7ede5
--- /dev/null
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    simpleReactingParcelFoam
+
+Description
+    Steady state SIMPLE solver for laminar or turbulent flow with coal
+    Lagrangian parcels.
+
+    Note:
+    - including run-time selectable finite volume options,e.g. sources,
+      constraints
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "turbulentFluidThermoModel.H"
+#include "coalCloud.H"
+#include "rhoCombustionModel.H"
+#include "radiationModel.H"
+#include "IOporosityModelList.H"
+#include "fvOptions.H"
+#include "SLGThermo.H"
+#include "simpleControl.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readGravitationalAcceleration.H"
+
+    simpleControl simple(mesh);
+
+    #include "createFields.H"
+    #include "createRadiationModel.H"
+    #include "createClouds.H"
+    #include "createMRF.H"
+    #include "createFvOptions.H"
+    #include "initContinuityErrs.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (simple.loop())
+    {
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        parcels.evolve();
+
+        // --- Pressure-velocity SIMPLE corrector loop
+        {
+            #include "UEqn.H"
+            #include "YEqn.H"
+            #include "EEqn.H"
+            #include "pEqn.H"
+        }
+
+        turbulence->correct();
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return(0);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 5e01b76369..af719ec4c2 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -24,7 +24,6 @@ EXE_INC = \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H
index 7cc45050ce..e043feb221 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
 
 if (!composition.contains(inertSpecie))
 {
-    FatalErrorIn(args.executable())
+    FatalErrorInFunction
         << "Specified inert specie '" << inertSpecie << "' not found in "
         << "species list. Available species:" << composition.species()
         << exit(FatalError);
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
index 6ffe1ddd9f..75d59e0933 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@@ -26,7 +26,6 @@ EXE_INC = \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C
index 38ac4e515b..ff36ee4c48 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     sprayDyMFoam
 
+Group
+    grpLagrangianSolvers grpMovingMeshSolvers
+
 Description
     Transient PIMPLE solver for compressible, laminar or turbulent flow with
     spray parcels and support for moving meshes.
@@ -39,7 +42,7 @@ Description
 #include "SLGThermo.H"
 #include "pimpleControl.H"
 #include "CorrectPhi.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,6 +66,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index 576c892149..69fd826ce6 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -27,7 +27,6 @@ EXE_INC = \
     -I$(LIB_SRC)/engine/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude
 
 
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
index 730d0f3fb4..7d2b3b2100 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
@@ -24,6 +24,9 @@ License
 Application
     sprayEngineFoam
 
+Group
+    grpLagrangianSolvers grpMovingMeshSolvers
+
 Description
     Transient PIMPLE solver for compressible, laminar or turbulent engine
     flow swith spray parcels.
@@ -39,7 +42,7 @@ Description
 #include "radiationModel.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,6 +68,8 @@ int main(int argc, char *argv[])
     #include "setInitialDeltaT.H"
     #include "startSummary.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
index 066ce82f68..28e6caa581 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
@@ -24,6 +24,9 @@ License
 Application
     sprayFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient PIMPLE solver for compressible, laminar or turbulent flow with
     spray parcels.
@@ -37,7 +40,7 @@ Description
 #include "radiationModel.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,6 +64,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 0726b90a3f..f9056dd790 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -25,6 +25,7 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools \
     -lregionModels \
     -lsurfaceFilmModels
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 6545c4d72b..c6b592fb45 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -24,6 +24,9 @@ License
 Application
     uncoupledKinematicParcelFoam
 
+Group
+    grpLagrangianSolvers
+
 Description
     Transient solver for the passive transport of a single kinematic
     particle cloud.
diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options
index c4628e3498..02d5a1cc3e 100644
--- a/applications/solvers/multiphase/cavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -14,4 +14,5 @@ EXE_LIBS = \
     -lincompressibleTurbulenceModels \
     -lbarotropicCompressibilityModel \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
index 5ec5c9a72c..b5d7b2cdfa 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
@@ -17,6 +17,7 @@ EXE_LIBS = \
     -lincompressibleTurbulenceModels \
     -lbarotropicCompressibilityModel \
     -lfiniteVolume \
+    -lfvOptions \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -lmeshTools
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
index 189208de95..e2305c4f70 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     cavitatingFoam
 
+Group
+    grpMultiphaseSolvers grpMovingMeshSolvers
+
 Description
     Transient cavitation code based on the homogeneous equilibrium model
     from which the compressibility of the liquid/vapour "mixture" is obtained.
@@ -59,6 +62,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index b521f5b9c6..3fd2ea3780 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -24,6 +24,9 @@ License
 Application
     cavitatingFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Transient cavitation code based on the homogeneous equilibrium model
     from which the compressibility of the liquid/vapour "mixture" is obtained.
@@ -55,6 +58,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index af8f0442e1..e24e6697f9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -20,4 +20,5 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index 01b2a8d5a1..cc7d5a2832 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -25,4 +25,5 @@ EXE_LIBS = \
     -ldynamicMesh \
     -lmeshTools \
     -ldynamicFvMesh \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lfvOptions
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 4e40addf20..0f6bf83172 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     compressibleInterDyMFoam
 
+Group
+    grpMultiphaseSolvers grpMovingMeshSolvers
+
 Description
     Solver for 2 compressible, non-isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach,
@@ -66,6 +69,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     Info<< "\nStarting time loop\n" << endl;
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 7736099eaa..bb7548164b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -24,6 +24,9 @@ License
 Application
     compressibleInterFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for 2 compressible, non-isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
@@ -61,6 +64,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
index e9c5322c79..a3217a073b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::THE
     const labelList& cells
 ) const
 {
-    notImplemented("twoPhaseMixtureThermo::THE(...)");
+    NotImplemented;
     return T0;
 }
 
@@ -165,7 +165,7 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::THE
     const label patchi
 ) const
 {
-    notImplemented("twoPhaseMixtureThermo::THE(...)");
+    NotImplemented;
     return T0;
 }
 
@@ -267,6 +267,26 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::CpByCpv
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureThermo::nu() const
+{
+    return mu()/(alpha1()*thermo1_->rho() + alpha2()*thermo2_->rho());
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::nu
+(
+    const label patchi
+) const
+{
+    return
+        mu(patchi)
+       /(
+            alpha1().boundaryField()[patchi]*thermo1_->rho(patchi)
+          + alpha2().boundaryField()[patchi]*thermo2_->rho(patchi)
+        );
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureThermo::kappa() const
 {
     return alpha1()*thermo1_->kappa() + alpha2()*thermo2_->kappa();
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
index b8320bd105..3cde04bb46 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
@@ -122,14 +122,14 @@ public:
             //  Non-const access allowed for transport equations
             virtual volScalarField& he()
             {
-                notImplemented("twoPhaseMixtureThermo::he()");
+                NotImplemented;
                 return thermo1_->he();
             }
 
             //- Enthalpy/Internal energy [J/kg]
             virtual const volScalarField& he() const
             {
-                notImplemented("twoPhaseMixtureThermo::he() const");
+                NotImplemented;
                 return thermo1_->he();
             }
 
@@ -239,6 +239,12 @@ public:
 
         // Fields derived from transport state variables
 
+            //- Kinematic viscosity of mixture [m^2/s]
+            virtual tmp<volScalarField> nu() const;
+
+            //- Kinematic viscosity of mixture for patch [m^2/s]
+            virtual tmp<scalarField> nu(const label patchi) const;
+
             //- Thermal diffusivity for temperature of mixture [J/m/s/K]
             virtual tmp<volScalarField> kappa() const;
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
index 59a9ba5a26..b237353985 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
index 4fd75efebf..667941ecc5 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
@@ -24,6 +24,9 @@ License
 Application
     compressibleMultiphaseInterFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for n compressible, non-isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
@@ -56,6 +59,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 7733cf1364..55af594283 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -270,7 +270,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::THE
     const labelList& cells
 ) const
 {
-    notImplemented("multiphaseMixtureThermo::THE(...)");
+    NotImplemented;
     return T0;
 }
 
@@ -283,7 +283,7 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::THE
     const label patchi
 ) const
 {
-    notImplemented("multiphaseMixtureThermo::THE(...)");
+    NotImplemented;
     return T0;
 }
 
@@ -303,6 +303,28 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::rho() const
 }
 
 
+Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::rho
+(
+    const label patchi
+) const
+{
+    PtrDictionary<phaseModel>::const_iterator phasei = phases_.begin();
+
+    tmp<scalarField> trho
+    (
+        phasei().boundaryField()[patchi]*phasei().thermo().rho(patchi)
+    );
+
+    for (++phasei; phasei != phases_.end(); ++phasei)
+    {
+        trho() +=
+            phasei().boundaryField()[patchi]*phasei().thermo().rho(patchi);
+    }
+
+    return trho;
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::Cp() const
 {
     PtrDictionary<phaseModel>::const_iterator phasei = phases_.begin();
@@ -501,6 +523,21 @@ Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::CpByCpv
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::nu() const
+{
+    return mu()/rho();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::multiphaseMixtureThermo::nu
+(
+    const label patchi
+) const
+{
+    return mu(patchi)/rho(patchi);
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::kappa() const
 {
     PtrDictionary<phaseModel>::const_iterator phasei = phases_.begin();
@@ -680,10 +717,8 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
 
             if (sigma == sigmas_.end())
             {
-                FatalErrorIn
-                (
-                    "multiphaseMixtureThermo::surfaceTensionForce() const"
-                )   << "Cannot find interface " << interfacePair(alpha1, alpha2)
+                FatalErrorInFunction
+                    << "Cannot find interface " << interfacePair(alpha1, alpha2)
                     << " in list of sigma values"
                     << exit(FatalError);
             }
@@ -811,12 +846,8 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
 
             if (tp == acap.thetaProps().end())
             {
-                FatalErrorIn
-                (
-                    "multiphaseMixtureThermo::correctContactAngle"
-                    "(const phaseModel& alpha1, const phaseModel& alpha2, "
-                    "fvPatchVectorFieldField& nHatb) const"
-                )   << "Cannot find interface " << interfacePair(alpha1, alpha2)
+                FatalErrorInFunction
+                    << "Cannot find interface " << interfacePair(alpha1, alpha2)
                     << "\n    in table of theta properties for patch "
                     << acap.patch().name()
                     << exit(FatalError);
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
index a769a45914..b62ea97f68 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
@@ -253,14 +253,14 @@ public:
             //  Non-const access allowed for transport equations
             virtual volScalarField& he()
             {
-                notImplemented("multiphaseMixtureThermo::he()");
+                NotImplemented;
                 return phases_[0].thermo().he();
             }
 
             //- Enthalpy/Internal energy [J/kg]
             virtual const volScalarField& he() const
             {
-                notImplemented("multiphaseMixtureThermo::he() const");
+                NotImplemented;
                 return phases_[0].thermo().he();
             }
 
@@ -315,6 +315,9 @@ public:
             //- Density [kg/m^3]
             virtual tmp<volScalarField> rho() const;
 
+            //- Density for patch [kg/m^3]
+            virtual tmp<scalarField> rho(const label patchi) const;
+
             //- Heat capacity at constant pressure [J/kg/K]
             virtual tmp<volScalarField> Cp() const;
 
@@ -373,6 +376,12 @@ public:
 
         // Fields derived from transport state variables
 
+            //- Kinematic viscosity of mixture [m^2/s]
+            virtual tmp<volScalarField> nu() const;
+
+            //- Kinematic viscosity of mixture for patch [m^2/s]
+            virtual tmp<scalarField> nu(const label patchi) const;
+
             //- Thermal diffusivity for temperature of mixture [J/m/s/K]
             virtual tmp<volScalarField> kappa() const;
 
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
index 1559f25a48..2d3a7b6163 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::phaseModel::phaseModel
 
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
 {
-    notImplemented("phaseModel::clone() const");
+    NotImplemented;
     return autoPtr<phaseModel>(NULL);
 }
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options
index b237960a08..a92f599820 100644
--- a/applications/solvers/multiphase/driftFluxFoam/Make/options
+++ b/applications/solvers/multiphase/driftFluxFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
index 3b88b1b956..d35c3a262b 100644
--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -24,6 +24,9 @@ License
 Application
     driftFluxFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for 2 incompressible fluids using the mixture approach with the
     drift-flux approximation for relative motion of the phases.
@@ -41,7 +44,7 @@ Description
 #include "turbulenceModel.H"
 #include "CompressibleTurbulenceModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "gaussLaplacianScheme.H"
 #include "uncorrectedSnGrad.H"
@@ -63,6 +66,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
index ecd9c25623..b36e3f6e77 100644
--- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
+++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,11 +46,8 @@ Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "mixtureViscosityModel::New(const volVectorField&, "
-            "const surfaceScalarField&)"
-        )   << "Unknown mixtureViscosityModel type "
+        FatalErrorInFunction
+            << "Unknown mixtureViscosityModel type "
             << modelType << nl << nl
             << "Valid mixtureViscosityModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index 578b23f38b..be4de6b2c0 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,13 +82,8 @@ Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "relativeVelocityModel::New"
-            "("
-                "const dictionary&"
-            ")"
-        )   << "Unknown time scale model type " << modelType
+        FatalErrorInFunction
+            << "Unknown time scale model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid time scale model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index df659a93d2..cfe4a92072 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -7,7 +7,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index a2e9097e30..6a24830137 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -25,7 +25,7 @@
     {
         if (nAlphaSubCycles > 1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Sub-cycling is not supported "
                    "with the CrankNicolson ddt scheme"
                 << exit(FatalError);
@@ -36,7 +36,7 @@
     }
     else
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Only Euler and CrankNicolson ddt schemes are supported"
             << exit(FatalError);
     }
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
index 2e8c289ff7..33aac0ab4a 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
@@ -11,7 +11,6 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index f30a195806..7f3f677349 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     interDyMFoam
 
+Group
+    grpMultiphaseSolvers grpMovingMeshSolvers
+
 Description
     Solver for 2 incompressible, isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach,
@@ -42,7 +45,7 @@ Description
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
@@ -82,6 +85,8 @@ int main(int argc, char *argv[])
     #include "correctPhi.H"
     #include "createUf.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "CourantNo.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 26f22af205..c6dc2f47e4 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -24,6 +24,9 @@ License
 Application
     interFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for 2 incompressible, isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
@@ -46,7 +49,7 @@ Description
 #include "immiscibleIncompressibleTwoPhaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
@@ -70,6 +73,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "correctPhi.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "readTimeControls.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index 7198616b30..53234dcaee 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -11,7 +11,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 1a0ae893c2..59180b8723 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -79,10 +79,12 @@ autoPtr<incompressible::turbulenceModel> turbulence
     incompressible::turbulenceModel::New(U, phi, mixture)
 );
 
+
 #include "readGravitationalAcceleration.H"
 #include "readhRef.H"
 #include "gh.H"
 
+
 volScalarField p
 (
     IOobject
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 86a05e71f1..201b6bb926 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -24,6 +24,9 @@ License
 Application
     interMixingFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for 3 incompressible fluids, two of which are miscible,
     using a VOF method to capture the interface.
@@ -36,7 +39,7 @@ Description
 #include "immiscibleIncompressibleThreePhaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "localEulerDdtScheme.H"
@@ -60,6 +63,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "correctPhi.H"
 
+    turbulence->validate();
+
     if (!LTS)
     {
         #include "readTimeControls.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
index 254f3ad8be..a29ad660e8 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
     -IphaseChangeTwoPhaseMixtures/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude\
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
index 0512ee1946..0a4397e063 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
@@ -11,7 +11,6 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude\
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
index 93e4ebc0d1..a3b3e64cbc 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     interPhaseChangeDyMFoam
 
+Group
+    grpMultiphaseSolvers grpMovingMeshSolvers
+
 Description
     Solver for 2 incompressible, isothermal immiscible fluids with phase-change
     (e.g. cavitation).  Uses a VOF (volume of fluid) phase-fraction based
@@ -49,7 +52,7 @@ Description
 #include "phaseChangeTwoPhaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -86,6 +89,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index 8552126034..525efbc3ab 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -24,6 +24,9 @@ License
 Application
     interPhaseChangeFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for 2 incompressible, isothermal immiscible fluids with phase-change
     (e.g. cavitation).  Uses a VOF (volume of fluid) phase-fraction based
@@ -47,7 +50,7 @@ Description
 #include "phaseChangeTwoPhaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,6 +69,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index 0a86459705..0825368e5c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,10 +62,8 @@ Foam::phaseChangeTwoPhaseMixture::New
 
     if (cstrIter == componentsConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "phaseChangeTwoPhaseMixture::New"
-        )   << "Unknown phaseChangeTwoPhaseMixture type "
+        FatalErrorInFunction
+            << "Unknown phaseChangeTwoPhaseMixture type "
             << phaseChangeTwoPhaseMixtureTypeName << endl << endl
             << "Valid  phaseChangeTwoPhaseMixtures are : " << endl
             << componentsConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
index a18d189f7c..2cb9a28a02 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
@@ -22,4 +22,5 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 72542bc01b..3bdd49ec7a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("dragModel::New")
+        FatalErrorInFunction
             << "Unknown dragModelType type "
             << dragModelType << endl << endl
             << "Valid dragModel types are : " << endl
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index aaa972032d..deabfc900f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("heatTransferModel::New")
+        FatalErrorInFunction
             << "Unknown heatTransferModelType type "
             << heatTransferModelType << endl << endl
             << "Valid heatTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
index 8244f739d7..2ec41b40f8 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
@@ -24,6 +24,9 @@ License
 Application
     multiphaseEulerFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for a system of many compressible fluid phases including
     heat-transfer.
@@ -61,6 +64,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
index b9014f3f46..b58f00291b 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("diameterModel::New")
+        FatalErrorInFunction
            << "Unknown diameterModelType type "
            << diameterModelType << endl << endl
            << "Valid diameterModel types are : " << endl
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 767600e394..d0cd5c9b18 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -295,12 +295,8 @@ void Foam::multiphaseSystem::correctContactAngle
 
             if (tp == acap.thetaProps().end())
             {
-                FatalErrorIn
-                (
-                    "multiphaseSystem::correctContactAngle"
-                    "(const phaseModel& phase1, const phaseModel& phase2, "
-                    "fvPatchVectorFieldField& nHatb) const"
-                )   << "Cannot find interface " << interfacePair(phase1, phase2)
+                FatalErrorInFunction
+                    << "Cannot find interface " << interfacePair(phase1, phase2)
                     << "\n    in table of theta properties for patch "
                     << acap.patch().name()
                     << exit(FatalError);
@@ -478,12 +474,8 @@ Foam::multiphaseSystem::multiphaseSystem
 
                     if (cAlpha == cAlphas_.end())
                     {
-                        WarningIn
-                        (
-                            "multiphaseSystem::multiphaseSystem"
-                            "(const volVectorField& U,"
-                            "const surfaceScalarField& phi)"
-                        ) << "Compression coefficient not specified for "
+                        WarningInFunction
+                          << "Compression coefficient not specified for "
                              "phase pair ("
                           << phase1.name() << ' ' << phase2.name()
                           << ") for which a surface tension "
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index f107cfb440..9dc9f2bf80 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -201,7 +201,7 @@ Foam::phaseModel::~phaseModel()
 
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
 {
-    notImplemented("phaseModel::clone() const");
+    NotImplemented;
     return autoPtr<phaseModel>(NULL);
 }
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 2eb366fd98..0cd432b02c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -7,7 +7,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
index f6419312ce..1a210c20e6 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
@@ -11,7 +11,6 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
index a04341c7ba..a4413f6295 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     multiphaseInterFoam
 
+Group
+    grpMultiphaseSolvers grpMovingMeshSolvers
+
 Description
     Solver for n incompressible fluids which captures the interfaces and
     includes surface-tension and contact-angle effects for each phase.
@@ -37,7 +40,7 @@ Description
 #include "multiphaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -76,6 +79,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 0fb8ff1208..130c9f1cb6 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -24,6 +24,9 @@ License
 Application
     multiphaseInterFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for n incompressible fluids which captures the interfaces and
     includes surface-tension and contact-angle effects for each phase.
@@ -36,7 +39,7 @@ Description
 #include "multiphaseMixture.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -59,6 +62,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index f1305897ba..1bbd3177af 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -288,7 +288,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
 
             if (sigma == sigmas_.end())
             {
-                FatalErrorIn("multiphaseMixture::surfaceTensionForce() const")
+                FatalErrorInFunction
                     << "Cannot find interface " << interfacePair(alpha1, alpha2)
                     << " in list of sigma values"
                     << exit(FatalError);
@@ -442,12 +442,8 @@ void Foam::multiphaseMixture::correctContactAngle
 
             if (tp == acap.thetaProps().end())
             {
-                FatalErrorIn
-                (
-                    "multiphaseMixture::correctContactAngle"
-                    "(const phase& alpha1, const phase& alpha2, "
-                    "fvPatchVectorFieldField& nHatb) const"
-                )   << "Cannot find interface " << interfacePair(alpha1, alpha2)
+                FatalErrorInFunction
+                    << "Cannot find interface " << interfacePair(alpha1, alpha2)
                     << "\n    in table of theta properties for patch "
                     << acap.patch().name()
                     << exit(FatalError);
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
index f3adfa9b61..ae68ff1682 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
@@ -67,7 +67,7 @@ Foam::phase::phase
 
 Foam::autoPtr<Foam::phase> Foam::phase::clone() const
 {
-    notImplemented("phase::clone() const");
+    NotImplemented;
     return autoPtr<phase>(NULL);
 }
 
diff --git a/applications/solvers/multiphase/multiphaseSolversDoc.H b/applications/solvers/multiphase/multiphaseSolversDoc.H
new file mode 100644
index 0000000000..1efb73e01b
--- /dev/null
+++ b/applications/solvers/multiphase/multiphaseSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpMultiphaseSolvers Multiphase solvers
+@{
+    \ingroup grpSolvers
+    This group contains multiphase solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
index 72a106ba1e..2026e36fb6 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
index df44bd78a0..4c789c10bb 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
index b740ab2b9b..7687ba6aab 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
@@ -24,6 +24,9 @@ License
 Application
     potentialFreeSurfaceDyMFoam
 
+Group
+    grpMultiphaseSolvers grpMovingMeshSolvers
+
 Description
     Incompressible Navier-Stokes solver with inclusion of a wave height field
     to enable single-phase free-surface approximations.
@@ -42,7 +45,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
@@ -79,6 +82,8 @@ int main(int argc, char *argv[])
     #include "correctPhi.H"
     #include "createUf.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index b98bdb694d..0bbb2c1807 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
@@ -24,6 +24,9 @@ License
 Application
     potentialFreeSurfaceFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Incompressible Navier-Stokes solver with inclusion of a wave height field
     to enable single-phase free-surface approximations
@@ -38,7 +41,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,6 +61,8 @@ int main(int argc, char *argv[])
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/files
index 35878ec93a..0642107d64 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/files
@@ -16,6 +16,7 @@ saturationModels/saturationModel/newSaturationModel.C
 saturationModels/Antoine/Antoine.C
 saturationModels/AntoineExtended/AntoineExtended.C
 saturationModels/ArdenBuck/ArdenBuck.C
+saturationModels/polynomial/polynomial.C
 saturationModels/constantSaturationConditions/constantSaturationConditions.C
 
 LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialCompositionModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
index 06754e2f86..03b21be490 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
@@ -50,16 +50,8 @@ Foam::interfaceCompositionModels::Henry<Thermo, OtherThermo>::Henry
 {
     if (k_.size() != this->speciesNames_.size())
     {
-        FatalErrorIn
-        (
-            "template<class Thermo, class OtherThermo> "
-            "Foam::interfaceCompositionModels::Henry<Thermo, OtherThermo>:: "
-            "Henry "
-            "( "
-                "const dictionary& dict, "
-                "const phasePair& pair "
-            ")"
-        )   << "Differing number of species and solubilities"
+        FatalErrorInFunction
+            << "Differing number of species and solubilities"
             << exit(FatalError);
     }
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
index 169580e3cf..6818c243f1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
@@ -63,17 +63,8 @@ NonRandomTwoLiquid
 {
     if (this->speciesNames_.size() != 2)
     {
-        FatalErrorIn
-        (
-            "template<class Thermo, class OtherThermo>"
-            "Foam::interfaceCompositionModels::"
-            "NonRandomTwoLiquid<Thermo, OtherThermo>::"
-            "NonRandomTwoLiquid"
-            "( "
-                "const dictionary& dict, "
-                "const phasePair& pair "
-            ")"
-        )   << "NonRandomTwoLiquid model is suitable for two species only."
+        FatalErrorInFunction
+            << "NonRandomTwoLiquid model is suitable for two species only."
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
index c0d9b64e39..435bb7df2a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
@@ -64,16 +64,8 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Saturated
 {
     if (this->speciesNames_.size() != 1)
     {
-        FatalErrorIn
-        (
-            "template<class Thermo, class OtherThermo>"
-            "Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::"
-            "Saturated"
-            "( "
-                "const dictionary& dict, "
-                "const phasePair& pair "
-            ")"
-        )   << "Saturated model is suitable for one species only."
+        FatalErrorInFunction
+            << "Saturated model is suitable for one species only."
             << exit(FatalError);
     }
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
index 8b04d8f5f1..16b3055687 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
@@ -54,7 +54,7 @@ Foam::interfaceCompositionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("interfaceCompositionModel::New")
+        FatalErrorInFunction
             << "Unknown interfaceCompositionModelType type "
             << interfaceCompositionModelType << endl << endl
             << "Valid interfaceCompositionModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
index d8ee288ef0..1251c98fe0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::massTransferModel> Foam::massTransferModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("massTransferModel::New")
+        FatalErrorInFunction
             << "Unknown massTransferModelType type "
             << massTransferModelType << endl << endl
             << "Valid massTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
index 0c273ee866..90f1c989c5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
@@ -95,7 +95,7 @@ Foam::saturationModels::Antoine::Tsat
     const volScalarField& p
 ) const
 {
-    return B_/(A_ - log10(p)) - C_;
+    return B_/(log(p) - A_) - C_;
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H
index ec9ba27b25..6252aaf817 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H
@@ -61,7 +61,7 @@ class Antoine
 {
 protected:
 
-    // Private data
+    // Protected data
 
         //- Constant A
         dimensionedScalar A_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
index f05ee21b83..8e0ad9b316 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
@@ -108,10 +108,7 @@ Foam::saturationModels::AntoineExtended::Tsat
     const volScalarField& p
 ) const
 {
-    notImplemented
-    (
-        "saturationModels::AntoineExtended::Tsat(const volScalarField& p)"
-    );
+    NotImplemented;
 
     return volScalarField::null();
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C
index 4c27901589..273a63ca5f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C
@@ -115,10 +115,7 @@ Foam::saturationModels::ArdenBuck::Tsat
     const volScalarField& p
 ) const
 {
-    notImplemented
-    (
-        "saturationModels::ArdenBuck::Tsat(const volScalarField& p)"
-    );
+    NotImplemented;
 
     return volScalarField::null();
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
new file mode 100644
index 0000000000..886fefe8e8
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polynomial.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace saturationModels
+{
+    defineTypeNameAndDebug(polynomial, 0);
+    addToRunTimeSelectionTable(saturationModel, polynomial, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::saturationModels::polynomial::polynomial(const dictionary& dict)
+:
+    saturationModel(),
+    C_(dict.lookup("C<8>"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::saturationModels::polynomial::~polynomial()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::saturationModels::polynomial::pSat
+(
+    const volScalarField& T
+) const
+{
+    NotImplemented;
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::saturationModels::polynomial::pSatPrime
+(
+    const volScalarField& T
+) const
+{
+    NotImplemented;
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::saturationModels::polynomial::lnPSat
+(
+    const volScalarField& T
+) const
+{
+    NotImplemented;
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::saturationModels::polynomial::Tsat
+(
+    const volScalarField& p
+) const
+{
+    tmp<volScalarField> tTsat
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Tsat",
+                p.mesh().time().timeName(),
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            p.mesh(),
+            dimensionedScalar("zero", dimTemperature, 0)
+        )
+    );
+
+    volScalarField& Tsat = tTsat();
+
+    forAll(Tsat,celli)
+    {
+        Tsat[celli] = C_.value(p[celli]);
+    }
+
+    forAll(Tsat.boundaryField(), patchi)
+    {
+        scalarField& Tsatp = Tsat.boundaryField()[patchi];
+        const scalarField& pp = p.boundaryField()[patchi];
+
+        forAll(Tsatp, facei)
+        {
+            Tsatp[facei] = C_.value(pp[facei]);
+        }
+    }
+
+    return tTsat;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H
new file mode 100644
index 0000000000..c2715040e2
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::saturationModels::polynomial
+
+Description
+    Polynomial equation for the saturation vapour temperature in terms of
+    the vapour pressure (in Pa).
+
+    \f[
+        T_sat = \sum_i C_i p^i
+    \f]
+
+    where \f$p\f$ is the pressure in Pa and \f$C\f$ are the coefficients.
+
+    Currently this class only provides \f$T_sat\f$, the inverse function to
+    return the vapour pressure for a given temperature are not implemented.
+
+SourceFiles
+    polynomial.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef polynomial_H
+#define polynomial_H
+
+#include "saturationModel.H"
+#include "Polynomial.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace saturationModels
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class polynomial Declaration
+\*---------------------------------------------------------------------------*/
+
+class polynomial
+:
+    public saturationModel
+{
+    // Private data
+
+        //- Polynomial coefficients
+        Polynomial<8> C_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("polynomial");
+
+    // Constructors
+
+        //- Construct from a dictionary
+        polynomial(const dictionary& dict);
+
+
+    //- Destructor
+    virtual ~polynomial();
+
+
+    // Member Functions
+
+        //- Saturation pressure
+        virtual tmp<volScalarField> pSat(const volScalarField& T) const;
+
+        //- Saturation pressure derivetive w.r.t. temperature
+        virtual tmp<volScalarField> pSatPrime(const volScalarField& T) const;
+
+        //- Natural log of the saturation pressure
+        virtual tmp<volScalarField> lnPSat(const volScalarField& T) const;
+
+        //- Saturation temperature
+        virtual tmp<volScalarField> Tsat(const volScalarField& p) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace saturationModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
index 93770692a5..920d7c62c8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
@@ -42,7 +42,7 @@ Foam::autoPtr<Foam::saturationModel> Foam::saturationModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("saturationModel::New")
+        FatalErrorInFunction
             << "Unknown saturationModelType type "
             << saturationModelType << endl << endl
             << "Valid saturationModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
index 0b01665863..82359c0508 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
@@ -45,7 +45,7 @@ Foam::surfaceTensionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("surfaceTensionModel::New")
+        FatalErrorInFunction
             << "Unknown surfaceTensionModelType type "
             << surfaceTensionModelType << endl << endl
             << "Valid surfaceTensionModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
index 9a526d3625..1293886cde 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
@@ -25,6 +25,7 @@ liftModels/constantLiftCoefficient/constantLiftCoefficient.C
 liftModels/Moraga/Moraga.C
 liftModels/LegendreMagnaudet/LegendreMagnaudet.C
 liftModels/TomiyamaLift/TomiyamaLift.C
+liftModels/wallDampedLift/wallDampedLift.C
 
 heatTransferModels/heatTransferModel/heatTransferModel.C
 heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -61,4 +62,12 @@ aspectRatioModels/Wellek/Wellek.C
 
 wallDependentModel/wallDependentModel.C
 
+wallDampingModels/wallDampingModel/wallDampingModel.C
+wallDampingModels/wallDampingModel/newWallDampingModel.C
+wallDampingModels/noWallDamping/noWallDamping.C
+wallDampingModels/interpolated/interpolatedWallDamping.C
+wallDampingModels/linear/linearWallDamping.C
+wallDampingModels/cosine/cosineWallDamping.C
+wallDampingModels/sine/sineWallDamping.C
+
 LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
index ff4cb63441..568c1b2682 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
@@ -45,7 +45,7 @@ Foam::aspectRatioModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("aspectRatioModel::New")
+        FatalErrorInFunction
             << "Unknown aspectRatioModelType type "
             << aspectRatioModelType << endl << endl
             << "Valid aspectRatioModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index 386b06d6aa..a670b67e44 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -77,7 +77,7 @@ Foam::aspectRatioModels::constantAspectRatio::E() const
             (
                 IOobject
                 (
-                    "zero",
+                    aspectRatioModel::typeName + ":E",
                     mesh.time().timeName(),
                     mesh
                 ),
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 041468a15b..e077e31b2d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("dragModel::New")
+        FatalErrorInFunction
             << "Unknown dragModelType type "
             << dragModelType << endl << endl
             << "Valid dragModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 2f3e0db699..00ca3d49ee 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -66,7 +66,7 @@ Foam::dragModels::segregated::~segregated()
 
 Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::CdRe() const
 {
-    FatalErrorIn("Foam::dragModels::segregated::CdRe() const")
+    FatalErrorInFunction
         << "Not implemented."
         << "Drag coefficient not defined for the segregated model."
         << exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index 24f02b69b4..8cdb07f297 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("heatTransferModel::New")
+        FatalErrorInFunction
             << "Unknown heatTransferModelType type "
             << heatTransferModelType << endl << endl
             << "Valid heatTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
index 5548dfd70a..fa364a68c1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
@@ -79,11 +79,8 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::Moraga::Cl() const
      || max(sqrSr).value() > 0.04
     )
     {
-        WarningIn
-        (
-            "Foam::tmp<Foam::volScalarField> "
-            "Foam::liftModels::Moraga::Cl() const"
-        )   << "Re and/or Sr are out of the range of applicability of the "
+        WarningInFunction
+            << "Re and/or Sr are out of the range of applicability of the "
             << "Moraga model. Clamping to range bounds"
             << endl;
     }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
index c53ff96e3d..3da4caee7c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("liftModel::New")
+        FatalErrorInFunction
             << "Unknown liftModelType type "
             << liftModelType << endl << endl
             << "Valid liftModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
new file mode 100644
index 0000000000..b21b2ae03a
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "wallDampedLift.H"
+#include "phasePair.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace liftModels
+{
+    defineTypeNameAndDebug(wallDamped, 0);
+    addToRunTimeSelectionTable(liftModel, wallDamped, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::liftModels::wallDamped::wallDamped
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    liftModel(dict, pair),
+    liftModel_(liftModel::New(dict.subDict("lift"), pair)),
+    wallDampingModel_
+    (
+        wallDampingModel::New(dict.subDict("wallDamping"), pair)
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::liftModels::wallDamped::~wallDamped()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField> Foam::liftModels::wallDamped::Cl() const
+{
+    return wallDampingModel_->damp(liftModel_->Cl());
+}
+
+
+Foam::tmp<Foam::volVectorField> Foam::liftModels::wallDamped::Fi() const
+{
+    return wallDampingModel_->damp(liftModel_->Fi());
+}
+
+
+Foam::tmp<Foam::volVectorField> Foam::liftModels::wallDamped::F() const
+{
+    return wallDampingModel_->damp(liftModel_->F());
+}
+
+
+Foam::tmp<Foam::surfaceScalarField> Foam::liftModels::wallDamped::Ff() const
+{
+    return wallDampingModel_->damp(liftModel_->Ff());
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H
new file mode 100644
index 0000000000..8a13850dd8
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::liftModels::wallDamped
+
+Description
+
+SourceFiles
+    wallDamped.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef wallDampedLift_H
+#define wallDampedLift_H
+
+#include "liftModel.H"
+#include "wallDampingModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace liftModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class wallDamped Declaration
+\*---------------------------------------------------------------------------*/
+
+class wallDamped
+:
+    public liftModel
+{
+    // Private data
+
+        //- The lift model to damp
+        autoPtr<liftModel> liftModel_;
+
+        //- The wall-damping model
+        autoPtr<wallDampingModel> wallDampingModel_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("wallDamped");
+
+
+    // Constructors
+
+        //- Construct from a dictionary and a phase pair
+        wallDamped
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~wallDamped();
+
+
+    // Member Functions
+
+        //- Return lift coefficient
+        virtual tmp<volScalarField> Cl() const;
+
+        //- Return phase-intensive lift force
+        virtual tmp<volVectorField> Fi() const;
+
+        //- Return lift force
+        virtual tmp<volVectorField> F() const;
+
+        //- Return face lift force
+        virtual tmp<surfaceScalarField> Ff() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace liftModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
index 651286c3ee..a7181b4396 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
@@ -45,7 +45,7 @@ Foam::swarmCorrection::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("swarmCorrection::New")
+        FatalErrorInFunction
             << "Unknown swarmCorrectionType type "
             << swarmCorrectionType << endl << endl
             << "Valid swarmCorrection types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index 093013cca3..1f0fc837cb 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -25,7 +25,7 @@ License
 
 #include "Burns.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 #include "dragModel.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index a6f8a16fbd..98463216e8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -25,7 +25,7 @@ License
 
 #include "Gosman.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 #include "dragModel.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index 848911fe2d..68c0e1627d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -25,7 +25,7 @@ License
 
 #include "LopezDeBertodano.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index fb8126c5d2..5488561463 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -25,7 +25,7 @@ License
 
 #include "constantTurbulentDispersionCoefficient.H"
 #include "phasePair.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
index 14d560969b..e440e3d1ee 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
@@ -45,7 +45,7 @@ Foam::turbulentDispersionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("turbulentDispersionModel::New")
+        FatalErrorInFunction
             << "Unknown turbulentDispersionModelType type "
             << turbulentDispersionModelType << endl << endl
             << "Valid turbulentDispersionModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
index 72f620a424..4c4ced9ddc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("virtualMassModel::New")
+        FatalErrorInFunction
             << "Unknown virtualMassModelType type "
             << virtualMassModelType << endl << endl
             << "Valid virtualMassModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
new file mode 100644
index 0000000000..c204cf32f6
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cosineWallDamping.H"
+#include "phasePair.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace wallDampingModels
+{
+    defineTypeNameAndDebug(cosine, 0);
+    addToRunTimeSelectionTable
+    (
+        wallDampingModel,
+        cosine,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::wallDampingModels::cosine::limiter() const
+{
+    return
+    (
+        0.5*
+        (
+            1
+          - cos
+            (
+                constant::mathematical::pi
+               *min(yWall()/(Cd_*pair_.dispersed().d()), scalar(1))
+            )
+        )
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::cosine::cosine
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    interpolated(dict, pair),
+    Cd_("Cd", dimless, dict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::cosine::~cosine()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H
new file mode 100644
index 0000000000..0042c4e97a
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallDampingModels::cosine
+
+Description
+
+SourceFiles
+    cosineWallDamping.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cosineWallDamping_H
+#define cosineWallDamping_H
+
+#include "interpolatedWallDamping.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace wallDampingModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class cosine Declaration
+\*---------------------------------------------------------------------------*/
+
+class cosine
+:
+    public interpolated
+{
+    // Private data
+
+        //- Diameter coefficient
+        const dimensionedScalar Cd_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Return the force limiter field
+        virtual tmp<volScalarField> limiter() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cosine");
+
+
+    // Constructors
+
+        //- Construct from components
+        cosine
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~cosine();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace wallDampingModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C
new file mode 100644
index 0000000000..b1a9522636
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolatedWallDamping.H"
+#include "phasePair.H"
+#include "surfaceInterpolate.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace wallDampingModels
+{
+    defineTypeNameAndDebug(interpolated, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::interpolated::interpolated
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    wallDampingModel(dict, pair)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::interpolated::~interpolated()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::wallDampingModels::interpolated::damp
+(
+    const tmp<volScalarField>& F
+) const
+{
+    return limiter()*F;
+}
+
+
+Foam::tmp<Foam::volVectorField>
+Foam::wallDampingModels::interpolated::damp
+(
+    const tmp<volVectorField>& F
+) const
+{
+    return limiter()*F;
+}
+
+
+Foam::tmp<Foam::surfaceScalarField>
+Foam::wallDampingModels::interpolated::damp
+(
+    const tmp<surfaceScalarField>& Ff
+) const
+{
+    return fvc::interpolate(limiter())*Ff;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H
new file mode 100644
index 0000000000..d9eeef2609
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallDampingModels::interpolated
+
+Description
+
+SourceFiles
+    interpolatedWallDamping.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interpolatedWallDamping_H
+#define interpolatedWallDamping_H
+
+#include "wallDampingModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace wallDampingModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class interpolated Declaration
+\*---------------------------------------------------------------------------*/
+
+class interpolated
+:
+    public wallDampingModel
+{
+protected:
+
+    // Protected member functions
+
+        //- Return the force limiter field
+        virtual tmp<volScalarField> limiter() const = 0;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("interpolated");
+
+
+    // Constructors
+
+        //- Construct from components
+        interpolated
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~interpolated();
+
+
+    // Member Functions
+
+        //- Return damped coefficient
+        virtual tmp<volScalarField> damp
+        (
+            const tmp<volScalarField>&
+        ) const;
+
+        //- Return damped force
+        virtual tmp<volVectorField> damp
+        (
+            const tmp<volVectorField>&
+        ) const;
+
+        //- Return damped face force
+        virtual tmp<surfaceScalarField> damp
+        (
+            const tmp<surfaceScalarField>&
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace wallDampingModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C
new file mode 100644
index 0000000000..bdb34973f2
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "linearWallDamping.H"
+#include "phasePair.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace wallDampingModels
+{
+    defineTypeNameAndDebug(linear, 0);
+    addToRunTimeSelectionTable
+    (
+        wallDampingModel,
+        linear,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::wallDampingModels::linear::limiter() const
+{
+    return min(yWall()/(Cd_*pair_.dispersed().d()), scalar(1));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::linear::linear
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    interpolated(dict, pair),
+    Cd_("Cd", dimless, dict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::linear::~linear()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H
new file mode 100644
index 0000000000..582baa3bdd
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallDampingModels::linear
+
+Description
+
+SourceFiles
+    linearWallDamping.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearWallDamping_H
+#define linearWallDamping_H
+
+#include "interpolatedWallDamping.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace wallDampingModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class linear Declaration
+\*---------------------------------------------------------------------------*/
+
+class linear
+:
+    public interpolated
+{
+    // Private data
+
+        //- Diameter coefficient
+        const dimensionedScalar Cd_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Return the force limiter field
+        virtual tmp<volScalarField> limiter() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linear");
+
+
+    // Constructors
+
+        //- Construct from components
+        linear
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~linear();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace wallDampingModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
new file mode 100644
index 0000000000..0a177a6090
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "noWallDamping.H"
+#include "phasePair.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace wallDampingModels
+{
+    defineTypeNameAndDebug(noWallDamping, 0);
+    addToRunTimeSelectionTable
+    (
+        wallDampingModel,
+        noWallDamping,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::noWallDamping::noWallDamping
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    wallDampingModel(dict, pair)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::noWallDamping::~noWallDamping()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::wallDampingModels::noWallDamping::damp
+(
+    const tmp<volScalarField>& Cl
+) const
+{
+    return Cl;
+}
+
+
+Foam::tmp<Foam::volVectorField>
+Foam::wallDampingModels::noWallDamping::damp
+(
+    const tmp<volVectorField>& F
+) const
+{
+    return F;
+}
+
+
+Foam::tmp<Foam::surfaceScalarField>
+Foam::wallDampingModels::noWallDamping::damp
+(
+    const tmp<surfaceScalarField>& Ff
+) const
+{
+    return Ff;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H
new file mode 100644
index 0000000000..7c4100934c
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallDampingModels::noWallDamping
+
+Description
+
+SourceFiles
+    noWallDamping.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef noWallDamping_H
+#define noWallDamping_H
+
+#include "wallDampingModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace wallDampingModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class noWallDamping Declaration
+\*---------------------------------------------------------------------------*/
+
+class noWallDamping
+:
+    public wallDampingModel
+{
+public:
+
+    //- Runtime type information
+    TypeName("none");
+
+
+    // Constructors
+
+        //- Construct from components
+        noWallDamping
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~noWallDamping();
+
+
+    // Member Functions
+
+        //- Return damped coefficient
+        virtual tmp<volScalarField> damp
+        (
+            const tmp<volScalarField>&
+        ) const;
+
+        //- Return damped force
+        virtual tmp<volVectorField> damp
+        (
+            const tmp<volVectorField>&
+        ) const;
+
+        //- Return damped face force
+        virtual tmp<surfaceScalarField> damp
+        (
+            const tmp<surfaceScalarField>&
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace wallDampingModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C
new file mode 100644
index 0000000000..eb975aa85f
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "sineWallDamping.H"
+#include "phasePair.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace wallDampingModels
+{
+    defineTypeNameAndDebug(sine, 0);
+    addToRunTimeSelectionTable
+    (
+        wallDampingModel,
+        sine,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::wallDampingModels::sine::limiter() const
+{
+    return sin
+    (
+        constant::mathematical::piByTwo
+       *min(yWall()/(Cd_*pair_.dispersed().d()), scalar(1))
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::sine::sine
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    interpolated(dict, pair),
+    Cd_("Cd", dimless, dict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDampingModels::sine::~sine()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H
new file mode 100644
index 0000000000..7a87afe14e
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallDampingModels::sine
+
+Description
+
+SourceFiles
+    sineWallDamping.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sineWallDamping_H
+#define sineWallDamping_H
+
+#include "interpolatedWallDamping.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class phasePair;
+
+namespace wallDampingModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class sine Declaration
+\*---------------------------------------------------------------------------*/
+
+class sine
+:
+    public interpolated
+{
+    // Private data
+
+        //- Diameter coefficient
+        const dimensionedScalar Cd_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Return the force limiter field
+        virtual tmp<volScalarField> limiter() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("sine");
+
+
+    // Constructors
+
+        //- Construct from components
+        sine
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~sine();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace wallDampingModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C
new file mode 100644
index 0000000000..a5b0748679
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "wallDampingModel.H"
+#include "phasePair.H"
+
+// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::wallDampingModel> Foam::wallDampingModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    word wallDampingModelType(dict.lookup("type"));
+
+    Info<< "Selecting wallDampingModel for "
+        << pair << ": " << wallDampingModelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(wallDampingModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown wallDampingModelType type "
+            << wallDampingModelType << endl << endl
+            << "Valid wallDampingModel types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return cstrIter()(dict, pair);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
new file mode 100644
index 0000000000..4ba2e6fcd8
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "wallDampingModel.H"
+#include "phasePair.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(wallDampingModel, 0);
+    defineRunTimeSelectionTable(wallDampingModel, dictionary);
+}
+
+const Foam::dimensionSet Foam::wallDampingModel::dimF(1, -2, -2, 0, 0);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallDampingModel::wallDampingModel
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+:
+    wallDependentModel(pair.phase1().mesh()),
+    pair_(pair)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::wallDampingModel::~wallDampingModel()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
new file mode 100644
index 0000000000..395a363af2
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallDampingModel
+
+Description
+
+SourceFiles
+    wallDampingModel.C
+    newWallDampingModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef wallDampingModel_H
+#define wallDampingModel_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "wallDependentModel.H"
+#include "volFields.H"
+#include "dictionary.H"
+#include "runTimeSelectionTables.H"
+
+namespace Foam
+{
+
+class phasePair;
+
+/*---------------------------------------------------------------------------*\
+                      Class wallDampingModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class wallDampingModel
+:
+    public wallDependentModel
+{
+protected:
+
+    // Protected data
+
+        //- Phase pair
+        const phasePair& pair_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("wallDampingModel");
+
+
+    // Declare runtime construction
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            wallDampingModel,
+            dictionary,
+            (
+                const dictionary& dict,
+                const phasePair& pair
+            ),
+            (dict, pair)
+        );
+
+
+    // Static data members
+
+        //- Coefficient dimensions
+        static const dimensionSet dimF;
+
+
+    // Constructors
+
+        //- Construct from components
+        wallDampingModel
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    //- Destructor
+    virtual ~wallDampingModel();
+
+
+    // Selectors
+
+        static autoPtr<wallDampingModel> New
+        (
+            const dictionary& dict,
+            const phasePair& pair
+        );
+
+
+    // Member Functions
+
+        //- Return damped coefficient
+        virtual tmp<volScalarField> damp
+        (
+            const tmp<volScalarField>&
+        ) const = 0;
+
+        //- Return damped force
+        virtual tmp<volVectorField> damp
+        (
+            const tmp<volVectorField>&
+        ) const = 0;
+
+        //- Return damped face force
+        virtual tmp<surfaceScalarField> damp
+        (
+            const tmp<surfaceScalarField>&
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
index 9f7d905c19..08dfd7065d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("wallLubricationModel::New")
+        FatalErrorInFunction
             << "Unknown wallLubricationModelType type "
             << wallLubricationModelType << endl << endl
             << "Valid wallLubricationModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
index 2dcc6d0a5e..e288235568 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("blendingMethod::New")
+        FatalErrorInFunction
             << "Unknown blendingMethodType type "
             << blendingMethodType << endl << endl
             << "Valid blendingMethod types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
index d9bfe2b598..5106653535 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -93,14 +93,8 @@ Foam::blendingMethods::linear::linear
           < minPartlyContinuousAlpha_[*iter]
         )
         {
-            FatalErrorIn
-            (
-                "Foam::blendingMethods::linear::linear"
-                "("
-                    "const dictionary& dict,"
-                    "const wordList& phaseNames"
-                ")"
-            )   << "The supplied fully continuous volume fraction for "
+            FatalErrorInFunction
+                << "The supplied fully continuous volume fraction for "
                 << *iter
                 << " is less than the partly continuous value."
                 << endl << exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
index db17065417..b93dd16af6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 175a993e30..8950f3d958 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -67,26 +67,7 @@ ThermalPhaseChangePhaseSystem
                     IOobject::groupName("iDmdt", pair.name()),
                     this->mesh().time().timeName(),
                     this->mesh(),
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                this->mesh(),
-                dimensionedScalar("zero", dimDensity/dimTime, 0)
-            )
-        );
-
-        // Initially assume no mass transfer
-        wDmdt_.insert
-        (
-            pair,
-            new volScalarField
-            (
-                IOobject
-                (
-                    IOobject::groupName("wDmdt", pair.name()),
-                    this->mesh().time().timeName(),
-                    this->mesh(),
-                    IOobject::NO_READ,
+                    IOobject::READ_IF_PRESENT,
                     IOobject::AUTO_WRITE
                 ),
                 this->mesh(),
@@ -115,6 +96,101 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::saturation() const
 }
 
 
+template<class BasePhaseSystem>
+Foam::autoPtr<Foam::phaseSystem::heatTransferTable>
+Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
+{
+    typedef compressible::alphatPhaseChangeWallFunctionFvPatchScalarField
+        alphatPhaseChangeWallFunction;
+
+    autoPtr<phaseSystem::heatTransferTable> eqnsPtr =
+        Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer();
+
+    phaseSystem::heatTransferTable& eqns = eqnsPtr();
+
+    // Accumulate mDotL contributions from boundaries
+    forAllConstIter
+    (
+        phaseSystem::phasePairTable,
+        this->phasePairs_,
+        phasePairIter
+    )
+    {
+        const phasePair& pair(phasePairIter());
+
+        if (pair.ordered())
+        {
+            continue;
+        }
+
+        const phaseModel& phase = pair.phase1();
+        const phaseModel& otherPhase = pair.phase2();
+
+        volScalarField mDotL
+        (
+            IOobject
+            (
+                "mDotL",
+                phase.mesh().time().timeName(),
+                phase.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            phase.mesh(),
+            dimensionedScalar("",dimensionSet(1,-1,-3,0,0),0.0)
+        );
+
+        if
+        (
+            otherPhase.mesh().foundObject<volScalarField>
+            (
+                "alphat." +  otherPhase.name()
+            )
+        )
+        {
+            const volScalarField& alphat =
+                otherPhase.mesh().lookupObject<volScalarField>
+                (
+                    "alphat." +  otherPhase.name()
+                );
+
+            const fvPatchList& patches = this->mesh().boundary();
+            forAll(patches, patchi)
+            {
+                const fvPatch& currPatch = patches[patchi];
+
+                if
+                (
+                    isA<alphatPhaseChangeWallFunction>
+                    (
+                        alphat.boundaryField()[patchi]
+                    )
+                )
+                {
+                    const scalarField& patchMDotL =
+                        refCast<const alphatPhaseChangeWallFunction>
+                        (
+                            alphat.boundaryField()[patchi]
+                        ).mDotL();
+
+                    forAll(patchMDotL,facei)
+                    {
+                        label faceCelli = currPatch.faceCells()[facei];
+                        mDotL[faceCelli] = patchMDotL[facei];
+                    }
+                }
+            }
+        }
+
+        *eqns[otherPhase.name()] -= mDotL;
+
+    }
+
+    return eqnsPtr;
+}
+
+
 template<class BasePhaseSystem>
 Foam::autoPtr<Foam::phaseSystem::massTransferTable>
 Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
@@ -189,6 +265,8 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
 
     BasePhaseSystem::correctThermo();
 
+
+
     forAllConstIter
     (
         phaseSystem::phasePairTable,
@@ -206,6 +284,18 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
         const phaseModel& phase1 = pair.phase1();
         const phaseModel& phase2 = pair.phase2();
 
+        Info<< phase1.name() << " min/max T "
+            << min(phase1.thermo().T()).value()
+            << " - "
+            << max(phase1.thermo().T()).value()
+            << endl;
+
+        Info<< phase2.name() << " min/max T "
+            << min(phase2.thermo().T()).value()
+            << " - "
+            << max(phase2.thermo().T()).value()
+            << endl;
+
         const volScalarField& T1(phase1.thermo().T());
         const volScalarField& T2(phase2.thermo().T());
 
@@ -214,7 +304,6 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
 
         volScalarField& dmdt(*this->dmdt_[pair]);
         volScalarField& iDmdt(*this->iDmdt_[pair]);
-        volScalarField& wDmdt(*this->wDmdt_[pair]);
 
         volScalarField& Tf = *this->Tf_[pair];
 
@@ -287,6 +376,21 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
             << endl;
 
         // Accumulate dmdt contributions from boundaries
+        volScalarField wDmdt
+        (
+            IOobject
+            (
+                IOobject::groupName("wDmdt", pair.name()),
+                this->mesh().time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            this->mesh(),
+            dimensionedScalar("zero", dimDensity/dimTime, 0)
+        );
+
         if
         (
             phase2.mesh().foundObject<volScalarField>
@@ -295,9 +399,6 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
             )
         )
         {
-            scalar wDmdtRelax(this->mesh().fieldRelaxationFactor("wDmdt"));
-            wDmdt *= (1 - wDmdtRelax);
-
             const volScalarField& alphat =
                 phase2.mesh().lookupObject<volScalarField>
                 (
@@ -326,7 +427,7 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
                     forAll(patchDmdt,facei)
                     {
                         label faceCelli = currPatch.faceCells()[facei];
-                        wDmdt[faceCelli] += wDmdtRelax*patchDmdt[facei];
+                        wDmdt[faceCelli] += patchDmdt[facei];
                     }
                 }
             }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
index e67b8209fe..b54c183150 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
@@ -77,10 +77,6 @@ protected:
         HashPtrTable<volScalarField, phasePairKey, phasePairKey::hash>
             iDmdt_;
 
-        //- Wall Mass transfer rate
-        HashPtrTable<volScalarField, phasePairKey, phasePairKey::hash>
-            wDmdt_;
-
 
 public:
 
@@ -99,6 +95,9 @@ public:
         //- Return the saturationModel
         const saturationModel& saturation() const;
 
+        //- Return the heat transfer matrices
+        virtual autoPtr<phaseSystem::heatTransferTable> heatTransfer() const;
+
         //- Return the mass transfer matrices
         virtual autoPtr<phaseSystem::massTransferTable> massTransfer() const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
index 8db37d2bf0..b58f00291b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("diameterModel::New")
+        FatalErrorInFunction
            << "Unknown diameterModelType type "
            << diameterModelType << endl << endl
            << "Valid diameterModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
index 8d705049f7..b737cd0322 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
@@ -37,7 +37,6 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::AnisothermalPhaseModel
 )
 :
     BasePhaseModel(fluid, phaseName, index),
-    divU_(NULL),
     K_
     (
         IOobject
@@ -88,10 +87,7 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::heEqn()
 
     const volScalarField& contErr(this->continuityError());
 
-    const volScalarField alphaEff
-    (
-        this->thermo_->alphaEff(this->turbulence().mut())
-    );
+    const volScalarField alphaEff(this->turbulence().alphaEff());
 
     volScalarField& he = this->thermo_->he();
 
@@ -136,25 +132,6 @@ bool Foam::AnisothermalPhaseModel<BasePhaseModel>::compressible() const
 }
 
 
-template<class BasePhaseModel>
-const Foam::tmp<Foam::volScalarField>&
-Foam::AnisothermalPhaseModel<BasePhaseModel>::divU() const
-{
-    return divU_;
-}
-
-
-template<class BasePhaseModel>
-void
-Foam::AnisothermalPhaseModel<BasePhaseModel>::divU
-(
-    const tmp<volScalarField>& divU
-)
-{
-    divU_ = divU;
-}
-
-
 template<class BasePhaseModel>
 const Foam::volScalarField&
 Foam::AnisothermalPhaseModel<BasePhaseModel>::K() const
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
index a8c4be694a..1b7ec2f615 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
@@ -54,9 +54,6 @@ class AnisothermalPhaseModel
 {
     // Private data
 
-        //- Dilatation rate
-        tmp<volScalarField> divU_;
-
         //- Kinetic energy
         volScalarField K_;
 
@@ -94,12 +91,6 @@ public:
             //- Return true if the phase is compressible otherwise false
             virtual bool compressible() const;
 
-            //- Return the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
-            virtual const tmp<volScalarField>& divU() const;
-
-            //- Set the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
-            virtual void divU(const tmp<volScalarField>& divU);
-
             //- Return the phase kinetic energy
             virtual const volScalarField& K() const;
 };
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index d06c61987a..74c6b7b46a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -25,7 +25,7 @@ License
 
 #include "MovingPhaseModel.H"
 #include "phaseSystem.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "fixedValueFvPatchFields.H"
 #include "slipFvPatchFields.H"
 #include "partialSlipFvPatchFields.H"
@@ -174,9 +174,10 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
         fluid.mesh(),
         dimensionedVector("0", dimAcceleration, vector::zero)
     ),
+    divU_(NULL),
     turbulence_
     (
-        PhaseCompressibleTurbulenceModel<phaseModel>::New
+        phaseCompressibleTurbulenceModel::New
         (
             *this,
             this->thermo().rho(),
@@ -317,6 +318,25 @@ Foam::MovingPhaseModel<BasePhaseModel>::DUDt() const
 }
 
 
+template<class BasePhaseModel>
+const Foam::tmp<Foam::volScalarField>&
+Foam::MovingPhaseModel<BasePhaseModel>::divU() const
+{
+    return divU_;
+}
+
+
+template<class BasePhaseModel>
+void
+Foam::MovingPhaseModel<BasePhaseModel>::divU
+(
+    const tmp<volScalarField>& divU
+)
+{
+    divU_ = divU;
+}
+
+
 template<class BasePhaseModel>
 Foam::tmp<Foam::volScalarField>
 Foam::MovingPhaseModel<BasePhaseModel>::continuityError() const
@@ -374,7 +394,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::alphaRhoPhi()
 
 
 template<class BasePhaseModel>
-const Foam::PhaseCompressibleTurbulenceModel<Foam::phaseModel>&
+const Foam::phaseCompressibleTurbulenceModel&
 Foam::MovingPhaseModel<BasePhaseModel>::turbulence() const
 {
     return turbulence_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
index b78762fd53..6c5da0bde9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
@@ -47,15 +47,13 @@ SourceFiles
 #define MovingPhaseModel_H
 
 #include "phaseModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-template<class TransportModel>
-class PhaseCompressibleTurbulenceModel;
-
 /*---------------------------------------------------------------------------*\
                            Class phaseModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -82,8 +80,11 @@ class MovingPhaseModel
         //- Lagrangian acceleration field (needed for virtual-mass)
         volVectorField DUDt_;
 
+        //- Dilatation rate
+        tmp<volScalarField> divU_;
+
         //- Turbulence model
-        autoPtr<PhaseCompressibleTurbulenceModel<phaseModel> > turbulence_;
+        autoPtr<phaseCompressibleTurbulenceModel> turbulence_;
 
         //- Continuity error
         volScalarField continuityError_;
@@ -153,6 +154,12 @@ public:
             //- Return the substantive acceleration
             virtual tmp<volVectorField> DUDt() const;
 
+            //- Return the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
+            virtual const tmp<volScalarField>& divU() const;
+
+            //- Set the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
+            virtual void divU(const tmp<volScalarField>& divU);
+
             //- Constant access the continuity error
             virtual tmp<volScalarField> continuityError() const;
 
@@ -178,8 +185,7 @@ public:
         // Turbulence
 
             //- Return the turbulence model
-            virtual const PhaseCompressibleTurbulenceModel<phaseModel>&
-                turbulence() const;
+            virtual const phaseCompressibleTurbulenceModel& turbulence() const;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
new file mode 100644
index 0000000000..862f75646e
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::phaseCompressibleTurbulenceModel
+
+Description
+    Typedef for phaseCompressibleTurbulenceModel
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseCompressibleTurbulenceModel_H
+#define phaseCompressibleTurbulenceModel_H
+
+#include "phaseCompressibleTurbulenceModelFwd.H"
+#include "PhaseCompressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "phaseModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+          phaseCompressibleTurbulenceModel;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
new file mode 100644
index 0000000000..9600f6ef9b
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::phaseCompressibleTurbulenceModel
+
+Description
+    Forward declaration of typedef for phaseCompressibleTurbulenceModel
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseCompressibleTurbulenceModelFwd_H
+#define phaseCompressibleTurbulenceModelFwd_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    class phaseModel;
+
+    template<class TransportModel>
+    class PhaseCompressibleTurbulenceModel;
+
+    template<class BasicTurbulenceModel>
+    class ThermalDiffusivity;
+
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+          phaseCompressibleTurbulenceModel;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
index be28005744..9d94f7627e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
@@ -56,13 +56,7 @@ Foam::PurePhaseModel<BasePhaseModel>::YiEqn
     volScalarField& Yi
 )
 {
-    notImplemented
-    (
-        "template<class BasePhaseModel> "
-        "Foam::tmp<Foam::fvScalarMatrix> "
-        "Foam::PurePhaseModel<BasePhaseModel>::YiEqn"
-        "(volScalarField& Yi) const"
-    );
+    NotImplemented;
 
     return tmp<fvScalarMatrix>();
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
index 0a577313b2..6c1ca526db 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
@@ -45,7 +45,7 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
 
     if (cstrIter == phaseSystemConstructorTablePtr_->end())
     {
-        FatalErrorIn("phaseModel::New")
+        FatalErrorInFunction
             << "Unknown phaseModelType type "
             << phaseModelType << endl << endl
             << "Valid phaseModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index eb2e871530..8d73c1286c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -76,7 +76,7 @@ Foam::phaseModel::phaseModel
 
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
 {
-    notImplemented("phaseModel::clone() const");
+    NotImplemented;
     return autoPtr<phaseModel>(NULL);
 }
 
@@ -167,7 +167,7 @@ bool Foam::phaseModel::compressible() const
 
 const Foam::tmp<Foam::volScalarField>& Foam::phaseModel::divU() const
 {
-    notImplemented("Foam::phaseModel::divU()");
+    NotImplemented;
     static tmp<Foam::volScalarField> divU_(NULL);
     return divU_;
 }
@@ -175,7 +175,7 @@ const Foam::tmp<Foam::volScalarField>& Foam::phaseModel::divU() const
 
 void Foam::phaseModel::divU(const tmp<volScalarField>& divU)
 {
-    WarningIn("phaseModel::divU(const tmp<volScalarField>& divU)")
+    WarningInFunction
         << "Attempt to set the dilatation rate of an incompressible phase"
         << endl;
 }
@@ -183,7 +183,7 @@ void Foam::phaseModel::divU(const tmp<volScalarField>& divU)
 
 const Foam::volScalarField& Foam::phaseModel::K() const
 {
-    notImplemented("Foam::phaseModel::K()");
+    NotImplemented;
     return volScalarField::null();
 }
 
@@ -196,7 +196,7 @@ const Foam::surfaceScalarField& Foam::phaseModel::DbyA() const
 
 void Foam::phaseModel::DbyA(const tmp<surfaceScalarField>& DbyA)
 {
-    WarningIn("phaseModel::DbyA(const surfaceScalarField& DbyA)")
+    WarningInFunction
         << "Attempt to set the dilatation rate of an incompressible phase"
         << endl;
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index 27d78390ca..719ef80a8c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -38,6 +38,7 @@ SourceFiles
 #include "surfaceFields.H"
 #include "fvMatricesFwd.H"
 #include "rhoThermo.H"
+#include "phaseCompressibleTurbulenceModelFwd.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,9 +49,6 @@ namespace Foam
 class phaseSystem;
 class diameterModel;
 
-template<class TransportModel>
-class PhaseCompressibleTurbulenceModel;
-
 /*---------------------------------------------------------------------------*\
                            Class phaseModel Declaration
 \*---------------------------------------------------------------------------*/
@@ -342,7 +340,7 @@ public:
         // Turbulence
 
             //- Return the turbulence model
-            virtual const PhaseCompressibleTurbulenceModel<phaseModel>&
+            virtual const phaseCompressibleTurbulenceModel&
                 turbulence() const = 0;
 };
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
index 8c2bb470ad..d6ea3da0b5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "orderedPhasePair.H"
-#include "aspectRatioModel.H"
+#include "phaseSystem.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -73,15 +73,7 @@ Foam::word Foam::orderedPhasePair::name() const
 
 Foam::tmp<Foam::volScalarField> Foam::orderedPhasePair::E() const
 {
-    return
-        phase1().mesh().lookupObject<aspectRatioModel>
-        (
-            IOobject::groupName
-            (
-                aspectRatioModel::typeName,
-                orderedPhasePair::name()
-            )
-        ).E();
+    return phase1().fluid().E(*this);
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H
index 4779fd333d..be4e23261d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H
@@ -41,8 +41,6 @@ SourceFiles
 namespace Foam
 {
 
-class aspectRatioModel;
-
 /*---------------------------------------------------------------------------*\
                          Class orderedPhasePair Declaration
 \*---------------------------------------------------------------------------*/
@@ -51,17 +49,6 @@ class orderedPhasePair
 :
     public phasePair
 {
-    // Private data
-
-        //- Aspect ratio model
-        autoPtr<aspectRatioModel> aspectRatio_;
-
-
-    // Private member functions
-
-        //- Set the aspect ratio model, if there is one
-        void setAspectRatioModel(const dictTable aspectRatioTable);
-
 
 public:
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
index 16478646d7..70ddd04270 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
@@ -67,7 +67,7 @@ Foam::phasePair::~phasePair()
 
 const Foam::phaseModel& Foam::phasePair::dispersed() const
 {
-    FatalErrorIn("Foam::phasePair::dispersed() const")
+    FatalErrorInFunction
         << "Requested dispersed phase from an unordered pair."
         << exit(FatalError);
 
@@ -77,7 +77,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const
 
 const Foam::phaseModel& Foam::phasePair::continuous() const
 {
-    FatalErrorIn("Foam::phasePair::dispersed() const")
+    FatalErrorInFunction
         << "Requested continuous phase from an unordered pair."
         << exit(FatalError);
 
@@ -191,7 +191,7 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::Ta() const
 
 Foam::tmp<Foam::volScalarField> Foam::phasePair::E() const
 {
-    FatalErrorIn("Foam::phasePair::E() const")
+    FatalErrorInFunction
         << "Requested aspect ratio of the dispersed phase in an unordered pair"
         << exit(FatalError);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
index 13ae288f08..da6627b922 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
@@ -133,14 +133,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key)
     }
     else
     {
-        FatalErrorIn
-        (
-            "friend Istream& operator>>"
-            "("
-                "Istream& is, "
-                "phasePairKey& key"
-            ")"
-        )   << "Phase pair type is not recognised. "
+        FatalErrorInFunction
+            << "Phase pair type is not recognised. "
             << temp
             << "Use (phaseDispersed in phaseContinuous) for an ordered"
             << "pair, or (phase1 and pase2) for an unordered pair."
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index aa9380758d..4efd86189b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -221,6 +221,36 @@ Foam::tmp<Foam::volVectorField> Foam::phaseSystem::U() const
 }
 
 
+Foam::tmp<Foam::volScalarField>
+Foam::phaseSystem::E(const phasePairKey& key) const
+{
+    if (aspectRatioModels_.found(key))
+    {
+        return aspectRatioModels_[key]->E();
+    }
+    else
+    {
+        return tmp<volScalarField>
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    aspectRatioModel::typeName + ":E",
+                    this->mesh_.time().timeName(),
+                    this->mesh_,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                this->mesh_,
+                dimensionedScalar("zero", dimless, 1)
+            )
+        );
+    }
+}
+
+
 Foam::tmp<Foam::volScalarField>
 Foam::phaseSystem::sigma(const phasePairKey& key) const
 {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 001f1acdd3..c5ec2aa501 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -45,7 +45,7 @@ SourceFiles
 #include "PtrListDictionary.H"
 
 #include "IOMRFZoneList.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 #include "volFields.H"
 #include "surfaceFields.H"
@@ -177,7 +177,7 @@ protected:
         IOMRFZoneList MRF_;
 
         //- Optional FV-options
-        mutable fv::IOoptionList fvOptions_;
+        mutable fv::options fvOptions_;
 
         //- Blending methods
         blendingMethodTable blendingMethods_;
@@ -310,6 +310,9 @@ public:
         //- Access the rate of change of the pressure
         inline volScalarField& dpdt();
 
+        //- Return the aspect-ratio
+        tmp<volScalarField> E(const phasePairKey& key) const;
+
         //- Return the surface tension coefficient
         tmp<volScalarField> sigma(const phasePairKey& key) const;
 
@@ -317,7 +320,7 @@ public:
         inline const IOMRFZoneList& MRF() const;
 
         //- Optional FV-options
-        inline fv::IOoptionList& fvOptions() const;
+        inline fv::options& fvOptions() const;
 
         //- Access a sub model between a phase pair
         template <class modelType>
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
index 0f9aef5033..125d286d9d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
@@ -82,7 +82,7 @@ inline const Foam::IOMRFZoneList& Foam::phaseSystem::MRF() const
 }
 
 
-inline Foam::fv::IOoptionList& Foam::phaseSystem::fvOptions() const
+inline Foam::fv::options& Foam::phaseSystem::fvOptions() const
 {
     return fvOptions_;
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
index 386331e0ee..422f6324b1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
@@ -1,3 +1,4 @@
+for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
 {
     fluid.correctEnergyTransport();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
index 9acc2a5f82..656a9941a6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
index 1375db8c40..6e7b6aacc8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
@@ -50,4 +50,4 @@ setRefCell
 mesh.setFluxRequired(p_rgh.name());
 
 const IOMRFZoneList& MRF = fluid.MRF();
-fv::IOoptionList& fvOptions = fluid.fvOptions();
+fv::options& fvOptions = fluid.fvOptions();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
index 553f60638c..5bdb4cea14 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@@ -9,5 +9,4 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
index de792b433a..d927601ba6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
@@ -23,15 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PhaseCompressibleTurbulenceModel.H"
-#include "phaseModel.H"
-#include "multiphaseSystem.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "ThermalDiffusivity.H"
-#include "EddyDiffusivity.H"
-
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
index 222f3b3ba4..2ba7197d42 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
@@ -12,7 +12,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index fe1e4d4a8d..2b06f1a7f4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -400,12 +400,8 @@ void Foam::multiphaseSystem::correctContactAngle
 
             if (tp == acap.thetaProps().end())
             {
-                FatalErrorIn
-                (
-                    "multiphaseSystem::correctContactAngle"
-                    "(const phaseModel& phase1, const phaseModel& phase2, "
-                    "fvPatchVectorFieldField& nHatb) const"
-                )   << "Cannot find interface "
+                FatalErrorInFunction
+                    << "Cannot find interface "
                     << phasePairKey(phase1.name(), phase2.name())
                     << "\n    in table of theta properties for patch "
                     << acap.patch().name()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
index 79e3546c49..7ee24aa1aa 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("multiphaseSystem::New")
+        FatalErrorInFunction
             << "Unknown multiphaseSystemType type "
             << multiphaseSystemType << endl << endl
             << "Valid multiphaseSystem types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
index cb90ee1196..f23b5649fc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
@@ -24,6 +24,9 @@ License
 Application
     reactingMultiphaseEulerFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for a system of any number of compressible fluid phases with a
     common pressure, but otherwise separate properties. The type of phase model
@@ -76,6 +79,11 @@ int main(int argc, char *argv[])
 
     //#include "pUf/createDDtU.H"
 
+    int nEnergyCorrectors
+    (
+        pimple.dict().lookupOrDefault<int>("nEnergyCorrectors", 1)
+    );
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
index 684e5ede43..3060c444de 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
@@ -1,3 +1,4 @@
+for (int Ecorr=0; Ecorr<nEnergyCorrectors; Ecorr++)
 {
     fluid.correctEnergyTransport();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
index 6d3bc54b85..5216efaa9c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
index 60d17c251f..75d7de420e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
@@ -74,4 +74,4 @@ setRefCell
 mesh.setFluxRequired(p_rgh.name());
 
 const IOMRFZoneList& MRF = fluid.MRF();
-fv::IOoptionList& fvOptions = fluid.fvOptions();
+fv::options& fvOptions = fluid.fvOptions();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
index d18171a35d..04c3d2e206 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
@@ -24,6 +24,9 @@ License
 Application
     reactingTwoPhaseEulerFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for a system of 2 compressible fluid phases with a common pressure,
     but otherwise separate properties. The type of phase model is run time
@@ -35,7 +38,7 @@ Description
 
 #include "fvCFD.H"
 #include "twoPhaseSystem.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "pimpleControl.H"
 #include "localEulerDdtScheme.H"
@@ -77,6 +80,11 @@ int main(int argc, char *argv[])
 
     #include "pUf/createDDtU.H"
 
+    int nEnergyCorrectors
+    (
+        pimple.dict().lookupOrDefault<int>("nEnergyCorrectors", 1)
+    );
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
index 10a0e8679a..300e1902a9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
@@ -35,6 +35,10 @@ kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
 kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
 kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
 
+derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
 derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingTurbulenceModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index f003ce2281..3c3db948dd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -10,5 +10,4 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
old mode 100644
new mode 100755
index a37553e338..0b026f4e64
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -24,15 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H"
-#include "compressibleTurbulenceModel.H"
 #include "fvPatchFieldMapper.H"
-#include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
-#include "twoPhaseSystem.H"
-#include "phaseSystem.H"
-#include "ThermalPhaseChangePhaseSystem.H"
-#include "MomentumTransferPhaseSystem.H"
-#include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,86 +34,6 @@ namespace Foam
 namespace compressible
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-scalar alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::maxExp_
-    = 50.0;
-scalar alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::tolerance_
-    = 0.01;
-label alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::maxIters_
-    = 10;
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::checkType()
-{
-    if (!isA<wallFvPatch>(patch()))
-    {
-        FatalErrorIn
-        (
-            "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField"
-            "::checkType()"
-        )
-            << "Patch type for patch " << patch().name() << " must be wall\n"
-            << "Current patch type is " << patch().type() << nl
-            << exit(FatalError);
-    }
-}
-
-
-tmp<scalarField>
-alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::Psmooth
-(
-    const scalarField& Prat
-) const
-{
-    return 9.24*(pow(Prat, 0.75) - 1.0)*(1.0 + 0.28*exp(-0.007*Prat));
-}
-
-
-tmp<scalarField>
-alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::yPlusTherm
-(
-    const scalarField& P,
-    const scalarField& Prat
-) const
-{
-
-    tmp<scalarField> typtf(new scalarField(this->size()));
-    scalarField& yptf = typtf();
-
-    forAll(yptf, faceI)
-    {
-        scalar ypt = 11.0;
-
-        for (int i=0; i<maxIters_; i++)
-        {
-            scalar f = ypt - (log(E_*ypt)/kappa_ + P[faceI])/Prat[faceI];
-            scalar df = 1.0 - 1.0/(ypt*kappa_*Prat[faceI]);
-            scalar yptNew = ypt - f/df;
-
-            if (yptNew < VSMALL)
-            {
-                yptf[faceI] =  0;
-            }
-            else if (mag(yptNew - ypt) < tolerance_)
-            {
-                yptf[faceI] = yptNew;
-            }
-            else
-            {
-                ypt = yptNew;
-            }
-        }
-
-        yptf[faceI] = ypt;
-    }
-
-    return typtf;
-}
-
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
@@ -130,12 +43,10 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphatPhaseChangeWallFunctionFvPatchScalarField(p, iF),
-    Prt_(0.85),
-    Cmu_(0.09),
-    kappa_(0.41),
-    E_(9.8),
-    fixedDmdt_(0.0)
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF),
+    relax_(1.0),
+    fixedDmdt_(0.0),
+    L_(0.0)
 {
     checkType();
 }
@@ -149,61 +60,57 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphatPhaseChangeWallFunctionFvPatchScalarField(p, iF, dict),
-    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
-    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
-    fixedDmdt_(dict.lookupOrDefault<scalar>("fixedDmdt", 0.0))
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF, dict),
+    relax_(dict.lookupOrDefault<scalar>("relax", 1.0)),
+    fixedDmdt_(dict.lookupOrDefault<scalar>("fixedDmdt", 0.0)),
+    L_(dict.lookupOrDefault<scalar>("L", 0.0))
 {}
 
 
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
 (
-    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& ptf,
+    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& psf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    alphatPhaseChangeWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
-    Prt_(ptf.Prt_),
-    Cmu_(ptf.Cmu_),
-    kappa_(ptf.kappa_),
-    E_(ptf.E_),
-    fixedDmdt_(ptf.fixedDmdt_)
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+    (
+        psf,
+        p,
+        iF,
+        mapper
+    ),
+    fixedDmdt_(psf.fixedDmdt_),
+    L_(psf.L_)
 {}
 
 
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
 (
-    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& awfpsf
+    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& psf
 )
 :
-    alphatPhaseChangeWallFunctionFvPatchScalarField(awfpsf),
-    Prt_(awfpsf.Prt_),
-    Cmu_(awfpsf.Cmu_),
-    kappa_(awfpsf.kappa_),
-    E_(awfpsf.E_),
-    fixedDmdt_(awfpsf.fixedDmdt_)
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(psf),
+    relax_(psf.relax_),
+    fixedDmdt_(psf.fixedDmdt_),
+    L_(psf.L_)
 {}
 
-
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
 alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
 (
-    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& awfpsf,
+    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& psf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphatPhaseChangeWallFunctionFvPatchScalarField(awfpsf, iF),
-    Prt_(awfpsf.Prt_),
-    Cmu_(awfpsf.Cmu_),
-    kappa_(awfpsf.kappa_),
-    E_(awfpsf.E_),
-    fixedDmdt_(awfpsf.fixedDmdt_)
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(psf, iF),
+    relax_(psf.relax_),
+    fixedDmdt_(psf.fixedDmdt_),
+    L_(psf.L_)
 {}
 
 
@@ -216,125 +123,10 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    // Lookup the fluid model
-    const ThermalPhaseChangePhaseSystem
-    <
-        MomentumTransferPhaseSystem<twoPhaseSystem>
-    >& fluid =
-        refCast
-        <
-            const ThermalPhaseChangePhaseSystem
-            <
-                MomentumTransferPhaseSystem<twoPhaseSystem>
-            >
-        >
-        (
-            db().lookupObject<phaseSystem>("phaseProperties")
-        );
+    dmdt_ = (1 - relax_)*dmdt_ + relax_*fixedDmdt_;
+    mDotL_ = dmdt_*L_;
 
-    const phaseModel& liquid
-    (
-        fluid.phase1().name() == dimensionedInternalField().group()
-      ? fluid.phase1()
-      : fluid.phase2()
-    );
-
-    const label patchi = patch().index();
-
-    // Retrieve turbulence properties from model
-    const compressibleTurbulenceModel& turbModel =
-        db().lookupObject<compressibleTurbulenceModel>
-        (
-            IOobject::groupName
-            (
-                compressibleTurbulenceModel::propertiesName,
-                dimensionedInternalField().group()
-            )
-        );
-
-    const scalar Cmu25 = pow025(Cmu_);
-
-    const scalarField& y = turbModel.y()[patchi];
-
-    const tmp<scalarField> tmuw = turbModel.mu(patchi);
-    const scalarField& muw = tmuw();
-
-    const tmp<scalarField> talphaw = liquid.thermo().alpha(patchi);
-    const scalarField& alphaw = talphaw();
-
-    scalarField& alphatw = *this;
-
-    const tmp<volScalarField> tk = turbModel.k();
-    const volScalarField& k = tk();
-    const fvPatchScalarField& kw = k.boundaryField()[patchi];
-
-    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
-    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
-    const scalarField magGradUw(mag(Uw.snGrad()));
-
-    const fvPatchScalarField& rhow = turbModel.rho().boundaryField()[patchi];
-    const fvPatchScalarField& hew =
-        liquid.thermo().he().boundaryField()[patchi];
-
-    const fvPatchScalarField& Tw =
-        liquid.thermo().T().boundaryField()[patchi];
-
-    scalarField Tp(Tw.patchInternalField());
-
-    // Heat flux [W/m2] - lagging alphatw
-    const scalarField qDot
-    (
-        (alphatw + alphaw)*hew.snGrad()
-    );
-
-    scalarField uTau(Cmu25*sqrt(kw));
-
-    scalarField yPlus(uTau*y/(muw/rhow));
-
-    scalarField Pr(muw/alphaw);
-
-    // Molecular-to-turbulent Prandtl number ratio
-    scalarField Prat(Pr/Prt_);
-
-    // Thermal sublayer thickness
-    scalarField P(this->Psmooth(Prat));
-
-    scalarField yPlusTherm(this->yPlusTherm(P, Prat));
-
-    scalarField alphatConv(this->size(), 0.0);
-
-    // Populate boundary values
-    forAll(alphatw, faceI)
-    {
-        // Evaluate new effective thermal diffusivity
-        scalar alphaEff = 0.0;
-        if (yPlus[faceI] < yPlusTherm[faceI])
-        {
-            scalar A = qDot[faceI]*rhow[faceI]*uTau[faceI]*y[faceI];
-            scalar B = qDot[faceI]*Pr[faceI]*yPlus[faceI];
-            scalar C = Pr[faceI]*0.5*rhow[faceI]*uTau[faceI]*sqr(magUp[faceI]);
-            alphaEff = A/(B + C + VSMALL);
-        }
-        else
-        {
-            scalar A = qDot[faceI]*rhow[faceI]*uTau[faceI]*y[faceI];
-            scalar B =
-                qDot[faceI]*Prt_*(1.0/kappa_*log(E_*yPlus[faceI]) + P[faceI]);
-            scalar magUc =
-                uTau[faceI]/kappa_*log(E_*yPlusTherm[faceI]) - mag(Uw[faceI]);
-            scalar C =
-                0.5*rhow[faceI]*uTau[faceI]
-               *(Prt_*sqr(magUp[faceI]) + (Pr[faceI] - Prt_)*sqr(magUc));
-            alphaEff = A/(B + C + VSMALL);
-        }
-
-        // Update convective heat transfer turbulent thermal diffusivity
-        alphatConv[faceI] = max(0.0, alphaEff - alphaw[faceI]);
-    }
-
-    dmdt_ = fixedDmdt_;
-
-    operator==(alphatConv);
+    operator==(calcAlphat(*this));
 
     fixedValueFvPatchScalarField::updateCoeffs();
 }
@@ -346,11 +138,9 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
 ) const
 {
     fvPatchField<scalar>::write(os);
-    os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    os.writeKeyword("relax") << relax_ << token::END_STATEMENT << nl;
     os.writeKeyword("fixedDmdt") << fixedDmdt_ << token::END_STATEMENT << nl;
+    os.writeKeyword("L") << L_ << token::END_STATEMENT << nl;
     dmdt_.writeEntry("dmdt", os);
     writeEntry("value", os);
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H
old mode 100644
new mode 100755
index bd9426fdb6..4238f77444
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H
@@ -22,17 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::compressible::alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+    Foam::compressible::
+        alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
 
 Group
     grpCmpWallFunctions
 
 Description
-    A simple alphatPhaseChangeWallFunctionFvPatchScalarField with a fixed
-    volumetric phase-change mass flux.
+    A simple alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField with
+    a fixed volumetric phase-change mass flux.
 
 SeeAlso
-    Foam::compressible::alphatPhaseChangeWallFunctionFvPatchScalarField
+    Foam::compressible::
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
 
 SourceFiles
     alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -42,7 +44,7 @@ SourceFiles
 #ifndef compressibleAlphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField_H
 #define compressibleAlphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField_H
 
-#include "alphatPhaseChangeWallFunctionFvPatchScalarField.H"
+#include "alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,47 +59,18 @@ namespace compressible
 
 class alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
 :
-    public alphatPhaseChangeWallFunctionFvPatchScalarField
+    public alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
 {
     // Private data
 
-        //- Turbulent Prandtl number
-        scalar Prt_;
+        //- dmdt relaxationFactor
+        scalar relax_;
 
-        //- Cmu coefficient
-        scalar Cmu_;
-
-        //- Von Karman constant
-        scalar kappa_;
-
-        //- E coefficient
-        scalar E_;
-
-        //- E coefficient
+        //- Volumetric phase-change mass flux in near wall cells
         scalar fixedDmdt_;
 
-
-        // Solution parameters
-
-            static scalar maxExp_;
-            static scalar tolerance_;
-            static label maxIters_;
-
-
-    // Private Member Functions
-
-        //- Check the type of the patch
-        void checkType();
-
-        //- 'P' function
-        tmp<scalarField> Psmooth(const scalarField& Prat) const;
-
-        //- Calculate y+ at the edge of the thermal laminar sublayer
-        tmp<scalarField> yPlusTherm
-        (
-            const scalarField& P,
-            const scalarField& Prat
-        ) const;
+        //- Latent heat
+        scalar L_;
 
 
 public:
@@ -178,13 +151,6 @@ public:
 
     // Member functions
 
-        //- Return the rate of phase-change
-        virtual const scalarField& dmdt() const
-        {
-            return dmdt_;
-        }
-
-
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
new file mode 100755
index 0000000000..0d4a1128c0
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
@@ -0,0 +1,360 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
+
+#include "twoPhaseSystem.H"
+#include "ThermalPhaseChangePhaseSystem.H"
+#include "MomentumTransferPhaseSystem.H"
+#include "compressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "PhaseCompressibleTurbulenceModel.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+scalar alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::maxExp_
+    = 50.0;
+scalar alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::tolerance_
+    = 0.01;
+label alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::maxIters_
+    = 10;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorInFunction
+            << "Patch type for patch " << patch().name() << " must be wall\n"
+            << "Current patch type is " << patch().type() << nl
+            << exit(FatalError);
+    }
+}
+
+
+tmp<scalarField>
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::Psmooth
+(
+    const scalarField& Prat
+) const
+{
+    return 9.24*(pow(Prat, 0.75) - 1.0)*(1.0 + 0.28*exp(-0.007*Prat));
+}
+
+
+tmp<scalarField>
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
+(
+    const scalarField& P,
+    const scalarField& Prat
+) const
+{
+    tmp<scalarField> typsf(new scalarField(this->size()));
+    scalarField& ypsf = typsf();
+
+    forAll(ypsf, faceI)
+    {
+        scalar ypt = 11.0;
+
+        for (int i=0; i<maxIters_; i++)
+        {
+            scalar f = ypt - (log(E_*ypt)/kappa_ + P[faceI])/Prat[faceI];
+            scalar df = 1 - 1.0/(ypt*kappa_*Prat[faceI]);
+            scalar yptNew = ypt - f/df;
+
+            if (yptNew < VSMALL)
+            {
+                ypsf[faceI] = 0;
+            }
+            else if (mag(yptNew - ypt) < tolerance_)
+            {
+                ypsf[faceI] = yptNew;
+            }
+            else
+            {
+                ypt = yptNew;
+            }
+        }
+
+        ypsf[faceI] = ypt;
+    }
+
+    return typsf;
+}
+
+tmp<scalarField>
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::calcAlphat
+(
+    const scalarField& prevAlphat
+) const
+{
+    // Lookup the fluid model
+    const ThermalPhaseChangePhaseSystem
+    <
+        MomentumTransferPhaseSystem<twoPhaseSystem>
+    >& fluid =
+        refCast
+        <
+            const ThermalPhaseChangePhaseSystem
+            <
+                MomentumTransferPhaseSystem<twoPhaseSystem>
+            >
+        >
+        (
+            db().lookupObject<phaseSystem>("phaseProperties")
+        );
+
+    const phaseModel& liquid
+    (
+        fluid.phase1().name() == dimensionedInternalField().group()
+      ? fluid.phase1()
+      : fluid.phase2()
+    );
+
+    const label patchi = patch().index();
+
+    // Retrieve turbulence properties from model
+    const phaseCompressibleTurbulenceModel& turbModel = liquid.turbulence();
+
+    const scalar Cmu25 = pow025(Cmu_);
+
+    const scalarField& y = turbModel.y()[patchi];
+
+    const tmp<scalarField> tmuw = turbModel.mu(patchi);
+    const scalarField& muw = tmuw();
+
+    const tmp<scalarField> talphaw = liquid.thermo().alpha(patchi);
+    const scalarField& alphaw = talphaw();
+
+    const tmp<volScalarField> tk = turbModel.k();
+    const volScalarField& k = tk();
+    const fvPatchScalarField& kw = k.boundaryField()[patchi];
+
+    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
+    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
+    const scalarField magGradUw(mag(Uw.snGrad()));
+
+    const fvPatchScalarField& rhow = turbModel.rho().boundaryField()[patchi];
+    const fvPatchScalarField& hew =
+        liquid.thermo().he().boundaryField()[patchi];
+
+    const fvPatchScalarField& Tw =
+        liquid.thermo().T().boundaryField()[patchi];
+
+    scalarField Tp(Tw.patchInternalField());
+
+    // Heat flux [W/m2] - lagging alphatw
+    const scalarField qDot
+    (
+        (prevAlphat + alphaw)*hew.snGrad()
+    );
+
+    scalarField uTau(Cmu25*sqrt(kw));
+
+    scalarField yPlus(uTau*y/(muw/rhow));
+
+    scalarField Pr(muw/alphaw);
+
+    // Molecular-to-turbulent Prandtl number ratio
+    scalarField Prat(Pr/Prt_);
+
+    // Thermal sublayer thickness
+    scalarField P(this->Psmooth(Prat));
+
+    scalarField yPlusTherm(this->yPlusTherm(P, Prat));
+
+    tmp<scalarField> talphatConv(new scalarField(this->size()));
+    scalarField& alphatConv = talphatConv();
+
+    // Populate boundary values
+    forAll(alphatConv, faceI)
+    {
+        // Evaluate new effective thermal diffusivity
+        scalar alphaEff = 0.0;
+        if (yPlus[faceI] < yPlusTherm[faceI])
+        {
+            scalar A = qDot[faceI]*rhow[faceI]*uTau[faceI]*y[faceI];
+            scalar B = qDot[faceI]*Pr[faceI]*yPlus[faceI];
+            scalar C = Pr[faceI]*0.5*rhow[faceI]*uTau[faceI]*sqr(magUp[faceI]);
+            alphaEff = A/(B + C + VSMALL);
+        }
+        else
+        {
+            scalar A = qDot[faceI]*rhow[faceI]*uTau[faceI]*y[faceI];
+            scalar B =
+                qDot[faceI]*Prt_*(1.0/kappa_*log(E_*yPlus[faceI]) + P[faceI]);
+            scalar magUc =
+                uTau[faceI]/kappa_*log(E_*yPlusTherm[faceI]) - mag(Uw[faceI]);
+            scalar C =
+                0.5*rhow[faceI]*uTau[faceI]
+               *(Prt_*sqr(magUp[faceI]) + (Pr[faceI] - Prt_)*sqr(magUc));
+            alphaEff = A/(B + C + VSMALL);
+        }
+
+        // Update convective heat transfer turbulent thermal diffusivity
+        alphatConv[faceI] = max(0.0, alphaEff - alphaw[faceI]);
+    }
+
+    return talphatConv;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(p, iF),
+    Prt_(0.85),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8)
+{
+    checkType();
+}
+
+
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(p, iF, dict),
+    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+{}
+
+
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    Prt_(ptf.Prt_),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_)
+{}
+
+
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField& awfpsf
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(awfpsf),
+    Prt_(awfpsf.Prt_),
+    Cmu_(awfpsf.Cmu_),
+    kappa_(awfpsf.kappa_),
+    E_(awfpsf.E_)
+{}
+
+
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::
+alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(awfpsf, iF),
+    Prt_(awfpsf.Prt_),
+    Cmu_(awfpsf.Cmu_),
+    kappa_(awfpsf.kappa_),
+    E_(awfpsf.E_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    operator==(calcAlphat(*this));
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    dmdt_.writeEntry("dmdt", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H
new file mode 100755
index 0000000000..76bc4e451d
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H
@@ -0,0 +1,232 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::compressible::
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+
+Group
+    grpCmpWallFunctions
+
+Description
+    This boundary condition provides a thermal wall function for turbulent
+    thermal diffusivity (usually\c alphat) based on the Jayatilleke model for
+    the Eulerian multiphase solvers.
+
+    \heading Patch usage
+
+    \table
+        Property     | Description             | Required    | Default value
+        Prt          | Turbulent Prandtl number | no         | 0.85
+        Cmu          | Model coefficient       | no          | 0.09
+        kappa        | von Karman constant     | no          | 0.41
+        E            | Model coefficient       | no          | 9.8
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            alphatPhaseChangeJayatillekeWallFunction;
+        Prt             0.85;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0; // optional value entry
+    }
+    \endverbatim
+
+SeeAlso
+    Foam::compressible::alphatPhaseChangeWallFunctionFvPatchScalarField
+
+SourceFiles
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressiblealphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField_H
+#define compressiblealphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField_H
+
+#include "alphatPhaseChangeWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+   Class alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+:
+    public alphatPhaseChangeWallFunctionFvPatchScalarField
+{
+
+protected:
+
+    // Protected data
+
+        //- Turbulent Prandtl number
+        scalar Prt_;
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        // Solution parameters
+
+            static scalar maxExp_;
+            static scalar tolerance_;
+            static label maxIters_;
+
+
+    // Protected Member Functions
+
+        //- Check the type of the patch
+        void checkType();
+
+        //- 'P' function
+        tmp<scalarField> Psmooth(const scalarField& Prat) const;
+
+        //- Calculate y+ at the edge of the thermal laminar sublayer
+        tmp<scalarField> yPlusTherm
+        (
+            const scalarField& P,
+            const scalarField& Prat
+        ) const;
+
+        //- Update turbulent thermal diffusivity
+        tmp<scalarField> calcAlphat
+        (
+            const scalarField& prevAlphat
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::alphatPhaseChangeJayatillekeWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
new file mode 100755
index 0000000000..924f8209a4
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -0,0 +1,388 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphatWallBoilingWallFunctionFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
+
+#include "twoPhaseSystem.H"
+#include "phaseSystem.H"
+#include "ThermalPhaseChangePhaseSystem.H"
+#include "MomentumTransferPhaseSystem.H"
+#include "compressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "PhaseCompressibleTurbulenceModel.H"
+#include "saturationModel.H"
+#include "wallFvPatch.H"
+#include "uniformDimensionedFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphatWallBoilingWallFunctionFvPatchScalarField::
+alphatWallBoilingWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF),
+    relax_(0.5),
+    AbyV_(p.size(), 0.0),
+    alphatConv_(p.size(), 0.0)
+{
+    AbyV_ = this->patch().magSf();
+    forAll(AbyV_,facei)
+    {
+        label faceCelli = this->patch().faceCells()[facei];
+        AbyV_[facei] /= iF.mesh().V()[faceCelli];
+    }
+}
+
+
+alphatWallBoilingWallFunctionFvPatchScalarField::
+alphatWallBoilingWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF, dict),
+    relax_(dict.lookupOrDefault<scalar>("relax", 0.5)),
+    AbyV_(p.size(), 0.0),
+    alphatConv_(p.size(), 0.0)
+{
+    if (dict.found("alphatConv"))
+    {
+        alphatConv_ = scalarField("alphatConv", dict, p.size());
+    }
+
+    AbyV_ = this->patch().magSf();
+    forAll(AbyV_,facei)
+    {
+        label faceCelli = this->patch().faceCells()[facei];
+        AbyV_[facei] /= iF.mesh().V()[faceCelli];
+    }
+}
+
+
+alphatWallBoilingWallFunctionFvPatchScalarField::
+alphatWallBoilingWallFunctionFvPatchScalarField
+(
+    const alphatWallBoilingWallFunctionFvPatchScalarField& psf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+    (
+        psf,
+        p,
+        iF,
+        mapper
+    ),
+    relax_(psf.relax_),
+    AbyV_(psf.AbyV_),
+    alphatConv_(psf.alphatConv_, mapper)
+{}
+
+
+alphatWallBoilingWallFunctionFvPatchScalarField::
+alphatWallBoilingWallFunctionFvPatchScalarField
+(
+    const alphatWallBoilingWallFunctionFvPatchScalarField& psf
+)
+:
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(psf),
+    relax_(psf.relax_),
+    AbyV_(psf.AbyV_),
+    alphatConv_(psf.alphatConv_)
+{}
+
+
+alphatWallBoilingWallFunctionFvPatchScalarField::
+alphatWallBoilingWallFunctionFvPatchScalarField
+(
+    const alphatWallBoilingWallFunctionFvPatchScalarField& psf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(psf, iF),
+    relax_(psf.relax_),
+    AbyV_(psf.AbyV_),
+    alphatConv_(psf.alphatConv_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Lookup the fluid model
+    const ThermalPhaseChangePhaseSystem<MomentumTransferPhaseSystem
+    <
+        twoPhaseSystem>
+    >&
+        fluid
+      = refCast
+        <
+            const ThermalPhaseChangePhaseSystem
+            <
+                MomentumTransferPhaseSystem<twoPhaseSystem>
+            >
+        >
+        (
+            db().lookupObject<phaseSystem>("phaseProperties")
+        );
+
+    const phaseModel& liquid
+    (
+        fluid.phase1().name() == dimensionedInternalField().group()
+      ? fluid.phase1()
+      : fluid.phase2()
+    );
+
+    const phaseModel& vapor(fluid.otherPhase(liquid));
+
+    const label patchi = patch().index();
+
+    // Retrieve turbulence properties from model
+    const phaseCompressibleTurbulenceModel& turbModel = liquid.turbulence();
+
+    const tmp<scalarField> tnutw = turbModel.nut(patchi);
+
+    const scalar Cmu25(pow025(Cmu_));
+
+    const scalarField& y = turbModel.y()[patchi];
+
+    const tmp<scalarField> tmuw = turbModel.mu(patchi);
+    const scalarField& muw = tmuw();
+
+    const tmp<scalarField> talphaw = liquid.thermo().alpha(patchi);
+    const scalarField& alphaw = talphaw();
+
+    const tmp<volScalarField> tk = turbModel.k();
+    const volScalarField& k = tk();
+    const fvPatchScalarField& kw = k.boundaryField()[patchi];
+
+    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
+    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
+    const scalarField magGradUw(mag(Uw.snGrad()));
+
+    const fvPatchScalarField& rhow = turbModel.rho().boundaryField()[patchi];
+    const fvPatchScalarField& hew =
+        liquid.thermo().he().boundaryField()[patchi];
+
+    const fvPatchScalarField& Tw =
+        liquid.thermo().T().boundaryField()[patchi];
+    const scalarField Tc(Tw.patchInternalField());
+
+    scalarField uTau(Cmu25*sqrt(kw));
+
+    scalarField yPlus(uTau*y/(muw/rhow));
+
+    scalarField Pr(muw/alphaw);
+
+    // Molecular-to-turbulent Prandtl number ratio
+    scalarField Prat(Pr/Prt_);
+
+    // Thermal sublayer thickness
+    scalarField P(this->Psmooth(Prat));
+
+    scalarField yPlusTherm(this->yPlusTherm(P, Prat));
+
+    const scalarField rhoc(rhow.patchInternalField());
+
+    tmp<volScalarField> trhoVapor = vapor.thermo().rho();
+    const volScalarField& rhoVapor = trhoVapor();
+    const fvPatchScalarField& rhoVaporw =
+       rhoVapor.boundaryField()[patchi];
+    const scalarField rhoVaporp(rhoVaporw.patchInternalField());
+
+    tmp<volScalarField> tCp = liquid.thermo().Cp();
+    const volScalarField& Cp = tCp();
+    const fvPatchScalarField& Cpw = Cp.boundaryField()[patchi];
+
+    // Saturation temperature
+    const tmp<volScalarField> tTsat =
+        fluid.saturation().Tsat(liquid.thermo().p());
+    const volScalarField& Tsat = tTsat();
+    const fvPatchScalarField& Tsatw(Tsat.boundaryField()[patchi]);
+    const scalarField Tsatc(Tsatw.patchInternalField());
+
+    // Gravitational acceleration
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
+
+    const fvPatchScalarField& pw =
+        liquid.thermo().p().boundaryField()[patchi];
+
+    const scalarField L
+    (
+        vapor.thermo().he(pw,Tsatc,patchi)-hew.patchInternalField()
+    );
+
+    // Liquid temperature at y+=250 is estimated from logarithmic
+    // thermal wall function (Koncar, Krepper & Egorov, 2005)
+    scalarField Tplus_y250(Prt_*(log(E_*250)/kappa_ + P));
+    scalarField Tplus(Prt_*(log(E_*yPlus)/kappa_ + P));
+    scalarField Tl(Tw - (Tplus_y250/Tplus)*(Tw - Tc));
+    Tl = max(Tc - 40, min(Tc, Tl));
+
+    // Nucleation site density:
+    // Reformulation of Lemmert & Chawla (Egorov & Menter, 2004)
+    const scalarField N
+    (
+        0.8*9.922e5*pow(max((Tw - Tsatw)/10, scalar(0)), 1.805)
+    );
+
+    // Bubble departure diameter:
+    // Tolubinski and Kostanchuk (1970)
+    const scalarField Tsub(max(Tsatw - Tl, scalar(0)));
+    const scalarField Ddep
+    (
+        max(min(0.0006*exp(-Tsub/45), scalar(0.0014)), scalar(1e-6))
+    );
+
+    // Bubble departure frequency:
+    // Cole (1960)
+    const scalarField F
+    (
+        sqrt
+        (
+            4*mag(g).value()*(max(rhoc - rhoVaporp, scalar(0.1)))/(3*Ddep*rhow)
+        )
+    );
+
+    // Area fractions:
+
+    // Del Valle & Kenning (1985)
+    const scalarField Ja(rhoc*Cpw*Tsub/(rhoVaporp*L));
+    const scalarField Al(4.8*exp(-Ja/80));
+
+    // Liquid phase fraction at the wall
+    const scalarField liquidw(liquid.boundaryField()[patchi]);
+
+    // Damp boiling at high void fractions.
+    const scalarField W(min(liquidw/0.2, scalar(0.1)));
+
+    const scalarField A2(W*min(M_PI*sqr(Ddep)*N*Al/4, scalar(1)));
+    const scalarField A1(max(1 - A2, scalar(1e-4)));
+    const scalarField A2E(W*min(M_PI*sqr(Ddep)*N*Al/4, scalar(5)));
+
+    // Wall evaporation heat flux [kg/s3 = J/m2s]
+    const scalarField Qe((1.0/6.0)*A2E*Ddep*rhoVaporw*F*L);
+
+    // Volumetric mass source in the near wall cell due to the wall boiling
+    dmdt_ = (1 - relax_)*dmdt_ + relax_*Qe*AbyV_/L;
+
+    // Volumetric source in the near wall cell due to the wall boiling
+    mDotL_ = dmdt_*L;
+
+    // Quenching heat transfer coefficient
+    const scalarField hQ
+    (
+        2*(alphaw*Cpw)*F*sqrt((0.8/F)/(M_PI*alphaw/rhow))
+    );
+
+    // Quenching heat flux
+    const scalarField Qq(A2*hQ*max(Tw - Tl, scalar(0)));
+
+    // Convective heat flux
+    alphatConv_ = calcAlphat(alphatConv_);
+    //const scalarField Qc(A1*(alphatConv_ + alphaw)*hew.snGrad());
+
+    // Effective thermal diffusivity that corresponds to the calculated
+    // convective, quenching and evaporative heat fluxes
+
+    operator==
+    (
+        A1*alphatConv_ + (Qq + Qe)/max(liquidw*hew.snGrad(), scalar(1e-16))
+    );
+
+    if(debug)
+    {
+        Info<< "  L: " << gMin(L) << " - " << gMax(L) << endl;
+        Info<< "  Tl: " << gMin(Tl) << " - " << gMax(Tl) << endl;
+        Info<< "  N: " << gMin(N) << " - " << gMax(N) << endl;
+        Info<< "  Ddep: " << gMin(Ddep) << " - " << gMax(Ddep) << endl;
+        Info<< "  F: " << gMin(F) << " - " << gMax(F) << endl;
+        Info<< "  Al: " << gMin(Al) << " - " << gMax(Al) << endl;
+        Info<< "  A1: " << gMin(A1) << " - " << gMax(A1) << endl;
+        Info<< "  A2: " << gMin(A2) << " - " << gMax(A2) << endl;
+        Info<< "  A2E: " << gMin(A2E) << " - " << gMax(A2E) << endl;
+        Info<< "  dmdtW: " << gMin(dmdt_) << " - " << gMax(dmdt_) << endl;
+        const scalarField Qc(A1*(alphatConv_ + alphaw)*hew.snGrad());
+        Info<< "  Qc: " << gMin(Qc) << " - " << gMax(Qc) << endl;
+        Info<< "  Qq: " << gMin(Qq) << " - " << gMax(Qq) << endl;
+        Info<< "  Qe: " << gMin(Qe) << " - " << gMax(Qe) << endl;
+        const scalarField QEff(liquidw*(*this + alphaw)*hew.snGrad());
+        Info<< "  QEff: " << gMin(QEff) << " - " << gMax(QEff) << endl;
+        Info<< "  alphat: " << gMin(*this) << " - " << gMax(*this) << endl;
+        Info<< "  alphatConv: " << gMin(alphatConv_)
+            << " - " << gMax(alphatConv_) << endl;
+    }
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void alphatWallBoilingWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    os.writeKeyword("relax") << relax_ << token::END_STATEMENT << nl;
+    dmdt_.writeEntry("dmdt", os);
+    alphatConv_.writeEntry("alphatConv", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphatWallBoilingWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
new file mode 100755
index 0000000000..c469abdae9
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::compressible::alphatWallBoilingWallFunctionFvPatchScalarField
+
+Group
+    grpCmpWallFunctions
+
+Description
+    A thermal wall function for simulation of subcooled nucleate wall boiling.
+
+    Implements a version of the well-known RPI wall boiling model
+    (Kurul & Podowski, 1991). The model implementation is similar to the model
+    described by Peltola & Pättikangas (2012).
+
+    References:
+    \verbatim
+        "On the modeling of multidimensional effects in boiling channels"
+        Kurul, N., Podowski, M.Z.,
+        ANS Proceedings, National Heat Transfer Conference,
+        Minneapolis, Minnesota, USA, July 28-31, 1991,
+        ISBN: 0-89448-162-1, pp. 30-40
+    \endverbatim
+
+    \verbatim
+        "Development and validation of a boiling model for OpenFOAM
+        multiphase solver"
+        Peltola, J., Pättikangas, T.J.H.,
+        CFD4NRS-4 Conference Proceedings, paper 59,
+        Daejeon, Korea, September 10-12 2012
+    \endverbatim
+
+SeeAlso
+    Foam::fixedValueFvPatchField
+
+SourceFiles
+    alphatWallBoilingWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressiblealphatWallBoilingWallFunctionFvPatchScalarField_H
+#define compressiblealphatWallBoilingWallFunctionFvPatchScalarField_H
+
+#include "alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+            Class alphatWallBoilingWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphatWallBoilingWallFunctionFvPatchScalarField
+:
+    public alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField
+{
+    // Private data
+
+        //- dmdt relaxationFactor
+        scalar relax_;
+
+        //- Patch face area by cell volume
+        scalarField AbyV_;
+
+        //- Convective turbulent thermal diffusivity
+        scalarField alphatConv_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::alphatWallBoilingWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphatWallBoilingWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphatWallBoilingWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  alphatWallBoilingWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphatWallBoilingWallFunctionFvPatchScalarField
+        (
+            const alphatWallBoilingWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphatWallBoilingWallFunctionFvPatchScalarField
+        (
+            const alphatWallBoilingWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatWallBoilingWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphatWallBoilingWallFunctionFvPatchScalarField
+        (
+            const alphatWallBoilingWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatWallBoilingWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
new file mode 100644
index 0000000000..2f7abc7015
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "copiedFixedValueFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    sourceFieldName_("default")
+{}
+
+
+Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    sourceFieldName_(dict.lookup("sourceFieldName"))
+{}
+
+
+Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
+(
+    const copiedFixedValueFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    sourceFieldName_(ptf.sourceFieldName_)
+{}
+
+
+Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
+(
+    const copiedFixedValueFvPatchScalarField& awfpsf
+)
+:
+    fixedValueFvPatchScalarField(awfpsf),
+    sourceFieldName_(awfpsf.sourceFieldName_)
+{}
+
+
+Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
+(
+    const copiedFixedValueFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(awfpsf, iF),
+    sourceFieldName_(awfpsf.sourceFieldName_)
+{}
+
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    operator==
+    (
+        patch().lookupPatchField<volScalarField, scalar>(sourceFieldName_)
+    );
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    os.writeKeyword("sourceFieldName")
+        << sourceFieldName_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        copiedFixedValueFvPatchScalarField
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
new file mode 100644
index 0000000000..2db6a151ce
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::copiedFixedValueFvPatchScalarField
+
+Group
+    grpCmpWallFunctions
+
+Description
+    Copies the boundary values from a user specified field.
+
+SeeAlso
+    Foam::fixedValueFvPatchField
+
+SourceFiles
+    copiedFixedValueFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef copiedFixedValueFvPatchScalarField_H
+#define copiedFixedValueFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+            Class copiedFixedValueFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class copiedFixedValueFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        word sourceFieldName_;
+
+public:
+
+    //- Runtime type information
+    TypeName("copiedFixedValue");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        copiedFixedValueFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        copiedFixedValueFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  copiedFixedValueFvPatchScalarField
+        //  onto a new patch
+        copiedFixedValueFvPatchScalarField
+        (
+            const copiedFixedValueFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        copiedFixedValueFvPatchScalarField
+        (
+            const copiedFixedValueFvPatchScalarField&
+        );
+
+        //- Construct as copy setting internal field reference
+        copiedFixedValueFvPatchScalarField
+        (
+            const copiedFixedValueFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
new file mode 100644
index 0000000000..c991a1a333
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedMultiPhaseHeatFluxFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
+
+#include "twoPhaseSystem.H"
+#include "ThermalPhaseChangePhaseSystem.H"
+#include "MomentumTransferPhaseSystem.H"
+#include "compressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "PhaseCompressibleTurbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
+fixedMultiPhaseHeatFluxFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    q_(p.size(), 0.0),
+    relax_(1.0)
+{}
+
+
+Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
+fixedMultiPhaseHeatFluxFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    q_("q", dict, p.size()),
+    relax_(dict.lookupOrDefault<scalar>("relax", 1.0))
+{}
+
+
+Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
+fixedMultiPhaseHeatFluxFvPatchScalarField
+(
+    const fixedMultiPhaseHeatFluxFvPatchScalarField& psf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(psf, p, iF, mapper),
+    q_(psf.q_, mapper),
+    relax_(psf.relax_)
+{}
+
+
+Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
+fixedMultiPhaseHeatFluxFvPatchScalarField
+(
+    const fixedMultiPhaseHeatFluxFvPatchScalarField& psf
+)
+:
+    fixedValueFvPatchScalarField(psf),
+    q_(psf.q_),
+    relax_(psf.relax_)
+{}
+
+
+Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::
+fixedMultiPhaseHeatFluxFvPatchScalarField
+(
+    const fixedMultiPhaseHeatFluxFvPatchScalarField& psf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(psf, iF),
+    q_(psf.q_),
+    relax_(psf.relax_)
+{}
+
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Lookup the fluid model
+    const ThermalPhaseChangePhaseSystem
+    <
+        MomentumTransferPhaseSystem<twoPhaseSystem>
+    >& fluid =
+        refCast
+        <
+            const ThermalPhaseChangePhaseSystem
+            <
+                MomentumTransferPhaseSystem<twoPhaseSystem>
+            >
+        >
+        (
+            db().lookupObject<phaseSystem>("phaseProperties")
+        );
+
+    const scalarField& Tp = *this;
+
+    scalarField A(Tp.size(), scalar(0));
+    scalarField B(Tp.size(), scalar(0));
+    scalarField Q(Tp.size(), scalar(0));
+
+    forAll(fluid.phases(), phasei)
+    {
+        const phaseModel& phase = fluid.phases()[phasei];
+        const fluidThermo& thermo = phase.thermo();
+
+        const fvPatchScalarField& alpha =
+            phase.boundaryField()[patch().index()];
+
+        const fvPatchScalarField& T =
+            thermo.T().boundaryField()[patch().index()];
+
+        const scalarField kappaEff
+        (
+            thermo.kappaEff
+            (
+                phase.turbulence().alphat(patch().index()),
+                patch().index()
+            )
+        );
+
+        if (debug)
+        {
+            scalarField q0(T.snGrad()*alpha*kappaEff);
+            Q += q0;
+
+            Info<< patch().name() << " " << phase.name()
+                << ": Heat flux " << gMin(q0) << " - " << gMax(q0) << endl;
+        }
+
+        A += T.patchInternalField()*alpha*kappaEff*patch().deltaCoeffs();
+        B += alpha*kappaEff*patch().deltaCoeffs();
+    }
+
+    if (debug)
+    {
+        Info<< patch().name() << " " << ": overall heat flux "
+            << gMin(Q) << " - " << gMax(Q) << endl;
+    }
+
+    operator==((1 - relax_)*Tp + relax_*(q_ + A)/(B));
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    os.writeKeyword("relax") << relax_ << token::END_STATEMENT << nl;
+    q_.writeEntry("q", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        fixedMultiPhaseHeatFluxFvPatchScalarField
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H
new file mode 100644
index 0000000000..c3eb42d691
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fixedMultiPhaseHeatFluxFvPatchScalarField
+
+Group
+    grpCmpWallFunctions
+
+Description
+    Calculates a wall temperature that produces the specified overall wall heat
+    flux across all the phases in an Eulerian multi-phase simulation.
+
+    Intended to be used with copiedFixedValue to ensure that phase wall
+    temperature are consistent:
+        - Set 'fixedMultiPhaseHeatFlux' boundary for one of the phases
+        - Use 'copiedFixedValue' for all the other phases.
+
+SeeAlso
+    Foam::fixedValueFvPatchField
+
+SourceFiles
+    fixedMultiPhaseHeatFluxFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedMultiPhaseHeatFluxFvPatchScalarField_H
+#define fixedMultiPhaseHeatFluxFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+            Class fixedMultiPhaseHeatFluxFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class fixedMultiPhaseHeatFluxFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Heat power [W] or flux [W/m2]
+        scalarField q_;
+
+        //- Relaxation factor
+        scalar relax_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedMultiPhaseHeatFlux");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        fixedMultiPhaseHeatFluxFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        fixedMultiPhaseHeatFluxFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  fixedMultiPhaseHeatFluxFvPatchScalarField
+        //  onto a new patch
+        fixedMultiPhaseHeatFluxFvPatchScalarField
+        (
+            const fixedMultiPhaseHeatFluxFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        fixedMultiPhaseHeatFluxFvPatchScalarField
+        (
+            const fixedMultiPhaseHeatFluxFvPatchScalarField&
+        );
+
+        //- Construct as copy setting internal field reference
+        fixedMultiPhaseHeatFluxFvPatchScalarField
+        (
+            const fixedMultiPhaseHeatFluxFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index ea28dd01b5..c3d306738d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -89,16 +89,8 @@ JohnsonJacksonParticleSlipFvPatchVectorField
      || (specularityCoefficient_.value() > 1)
     )
     {
-        FatalErrorIn
-        (
-            "("
-                "Foam::JohnsonJacksonParticleSlipFvPatchVectorField::"
-                "JohnsonJacksonParticleSlipFvPatchVectorField"
-                "const fvPatch& p,"
-                "const DimensionedField<scalar, volMesh>& iF,"
-                "const dictionary& dict"
-            ")"
-        )   << "The specularity coefficient has to be between 0 and 1"
+        FatalErrorInFunction
+            << "The specularity coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 93d97c650c..f4d7dd4ee9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -97,16 +97,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
      || (restitutionCoefficient_.value() > 1)
     )
     {
-        FatalErrorIn
-        (
-            "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
-            "JohnsonJacksonParticleThetaFvPatchScalarField"
-            "("
-                "const fvPatch& p,"
-                "const DimensionedField<scalar, volMesh>& iF,"
-                "const dictionary& dict"
-            ")"
-        )   << "The restitution coefficient has to be between 0 and 1"
+        FatalErrorInFunction
+            << "The restitution coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
@@ -116,16 +108,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
      || (specularityCoefficient_.value() > 1)
     )
     {
-        FatalErrorIn
-        (
-            "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
-            "JohnsonJacksonParticleThetaFvPatchScalarField"
-            "("
-                "const fvPatch& p,"
-                "const DimensionedField<scalar, volMesh>& iF,"
-                "const dictionary& dict"
-            ")"
-        )   << "The specularity coefficient has to be between 0 and 1"
+        FatalErrorInFunction
+            << "The specularity coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index bbf37904ca..83017e1557 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -43,10 +43,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
     >
     (
         type,
@@ -189,10 +186,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<ThermalDiffusivity
-            <
-                PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
         >::read()
     )
     {
@@ -219,7 +213,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::kineticTheoryModel::k() const
 {
-    notImplemented("kineticTheoryModel::k()");
+    NotImplemented;
     return nut_;
 }
 
@@ -227,7 +221,7 @@ Foam::RASModels::kineticTheoryModel::k() const
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::kineticTheoryModel::epsilon() const
 {
-    notImplemented("kineticTheoryModel::epsilon()");
+    NotImplemented;
     return nut_;
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 9aadb83d12..e18d41fb40 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -47,8 +47,7 @@ SourceFiles
 
 #include "RASModel.H"
 #include "eddyViscosity.H"
-#include "PhaseCompressibleTurbulenceModel.H"
-#include "ThermalDiffusivity.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "EddyDiffusivity.H"
 #include "phaseModel.H"
 #include "dragModel.H"
@@ -74,10 +73,7 @@ class kineticTheoryModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index eb0a070044..7b534db6d2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -23,15 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PhaseCompressibleTurbulenceModel.H"
-#include "phaseModel.H"
-#include "twoPhaseSystem.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "ThermalDiffusivity.H"
-#include "EddyDiffusivity.H"
-
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index adb23d40d2..79df9e4922 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -42,10 +42,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
     >
     (
         type,
@@ -93,10 +90,7 @@ bool Foam::RASModels::phasePressureModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<ThermalDiffusivity
-            <
-                PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
         >::read()
     )
     {
@@ -117,7 +111,7 @@ bool Foam::RASModels::phasePressureModel::read()
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::phasePressureModel::k() const
 {
-    notImplemented("phasePressureModel::k()");
+    NotImplemented;
     return nut_;
 }
 
@@ -125,7 +119,7 @@ Foam::RASModels::phasePressureModel::k() const
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::phasePressureModel::epsilon() const
 {
-    notImplemented("phasePressureModel::epsilon()");
+    NotImplemented;
     return nut_;
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index 68734e5b4f..c7e9842f37 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -53,8 +53,7 @@ SourceFiles
 
 #include "RASModel.H"
 #include "eddyViscosity.H"
-#include "PhaseCompressibleTurbulenceModel.H"
-#include "ThermalDiffusivity.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "EddyDiffusivity.H"
 #include "phaseModel.H"
 
@@ -73,10 +72,7 @@ class phasePressureModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<ThermalDiffusivity
-        <
-            PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
index 7321f6ef68..3fa406f3d3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
@@ -11,7 +11,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
index aaee131eeb..e085403f76 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -31,7 +31,7 @@ License
 #include "fvcDdt.H"
 #include "fvcDiv.H"
 #include "fvcAverage.H"
-#include "fvOptionList.H"
+#include "fvOptions.H"
 #include "mathematicalConstants.H"
 #include "fundamentalConstants.H"
 #include "addToRunTimeSelectionTable.H"
@@ -155,12 +155,7 @@ void Foam::diameterModels::IATE::correct()
         R -= sources_[j].R();
     }
 
-    // const_cast needed because the operators and functions of fvOptions
-    // are currently non-const.
-    fv::optionList& fvOptions = const_cast<fv::optionList&>
-    (
-        phase_.mesh().lookupObject<fv::optionList>("fvOptions")
-    );
+    fv::options& fvOptions(fv::options::New(phase_.mesh()));
 
     // Construct the interfacial curvature equation
     fvScalarMatrix kappaiEqn
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 9c62dfc819..dd110902b1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -25,7 +25,7 @@ License
 
 #include "IATEsource.H"
 #include "fvMatrix.H"
-#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseCompressibleTurbulenceModel.H"
 #include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -55,11 +55,8 @@ Foam::diameterModels::IATEsource::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "IATEsource::New"
-            "(const word& type, const IATE&, const dictionary&)"
-        )   << "Unknown IATE source type "
+        FatalErrorInFunction
+            << "Unknown IATE source type "
             << type << nl << nl
             << "Valid IATE source types : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index 8c8a68ef63..b9f0f15af2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -114,7 +114,7 @@ public:
 
         autoPtr<IATEsource> clone() const
         {
-            notImplemented("autoPtr<IATEsource> clone() const");
+            NotImplemented;
             return autoPtr<IATEsource>(NULL);
         }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
index 0324fb2f56..5477ae7c58 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::twoPhaseSystem> Foam::twoPhaseSystem::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("twoPhaseSystem::New")
+        FatalErrorInFunction
             << "Unknown twoPhaseSystemType type "
             << twoPhaseSystemType << endl << endl
             << "Valid twoPhaseSystem types are : " << endl
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index 256d739187..04e5d53a91 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -14,4 +14,5 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index d8519d6182..02b05c03d6 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -24,6 +24,9 @@ License
 Application
     twoLiquidMixingFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for mixing 2 incompressible fluids.
 
@@ -55,6 +58,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    turbulence->validate();
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
index 7faa436e57..6bc8c07441 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
     -IinterfacialModels/lnInclude \
     -ItwoPhaseSystem/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
index ff4cb63441..568c1b2682 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
@@ -45,7 +45,7 @@ Foam::aspectRatioModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("aspectRatioModel::New")
+        FatalErrorInFunction
             << "Unknown aspectRatioModelType type "
             << aspectRatioModelType << endl << endl
             << "Valid aspectRatioModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index ce06feab07..e077e31b2d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("dragModel::New")
+        FatalErrorInFunction
             << "Unknown dragModelType type "
             << dragModelType << endl << endl
             << "Valid dragModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 4b1fc88ddc..ca0a145f5b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -66,7 +66,7 @@ Foam::dragModels::segregated::~segregated()
 
 Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::CdRe() const
 {
-    FatalErrorIn("Foam::dragModels::segregated::CdRe() const")
+    FatalErrorInFunction
         << "Not implemented."
         << "Drag coefficient not defined for the segregated model."
         << exit(FatalError);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index bceb23cacc..8cdb07f297 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("heatTransferModel::New")
+        FatalErrorInFunction
             << "Unknown heatTransferModelType type "
             << heatTransferModelType << endl << endl
             << "Valid heatTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
index 5548dfd70a..fa364a68c1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
@@ -79,11 +79,8 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::Moraga::Cl() const
      || max(sqrSr).value() > 0.04
     )
     {
-        WarningIn
-        (
-            "Foam::tmp<Foam::volScalarField> "
-            "Foam::liftModels::Moraga::Cl() const"
-        )   << "Re and/or Sr are out of the range of applicability of the "
+        WarningInFunction
+            << "Re and/or Sr are out of the range of applicability of the "
             << "Moraga model. Clamping to range bounds"
             << endl;
     }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
index e8a476d441..3da4caee7c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("liftModel::New")
+        FatalErrorInFunction
             << "Unknown liftModelType type "
             << liftModelType << endl << endl
             << "Valid liftModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
index 8c8f096a2e..a7181b4396 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::swarmCorrection::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("swarmCorrection::New")
+        FatalErrorInFunction
             << "Unknown swarmCorrectionType type "
             << swarmCorrectionType << endl << endl
             << "Valid swarmCorrection types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
index fa267e80d5..e440e3d1ee 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::turbulentDispersionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("turbulentDispersionModel::New")
+        FatalErrorInFunction
             << "Unknown turbulentDispersionModelType type "
             << turbulentDispersionModelType << endl << endl
             << "Valid turbulentDispersionModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
index 82b9b47f17..4c4ced9ddc 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("virtualMassModel::New")
+        FatalErrorInFunction
             << "Unknown virtualMassModelType type "
             << virtualMassModelType << endl << endl
             << "Valid virtualMassModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
index b9766e7d52..08dfd7065d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("wallLubricationModel::New")
+        FatalErrorInFunction
             << "Unknown wallLubricationModelType type "
             << wallLubricationModelType << endl << endl
             << "Valid wallLubricationModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
index 1035e5526e..84786bdc5d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
@@ -8,5 +8,4 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index ea28dd01b5..c3d306738d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -89,16 +89,8 @@ JohnsonJacksonParticleSlipFvPatchVectorField
      || (specularityCoefficient_.value() > 1)
     )
     {
-        FatalErrorIn
-        (
-            "("
-                "Foam::JohnsonJacksonParticleSlipFvPatchVectorField::"
-                "JohnsonJacksonParticleSlipFvPatchVectorField"
-                "const fvPatch& p,"
-                "const DimensionedField<scalar, volMesh>& iF,"
-                "const dictionary& dict"
-            ")"
-        )   << "The specularity coefficient has to be between 0 and 1"
+        FatalErrorInFunction
+            << "The specularity coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 93d97c650c..f4d7dd4ee9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -97,16 +97,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
      || (restitutionCoefficient_.value() > 1)
     )
     {
-        FatalErrorIn
-        (
-            "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
-            "JohnsonJacksonParticleThetaFvPatchScalarField"
-            "("
-                "const fvPatch& p,"
-                "const DimensionedField<scalar, volMesh>& iF,"
-                "const dictionary& dict"
-            ")"
-        )   << "The restitution coefficient has to be between 0 and 1"
+        FatalErrorInFunction
+            << "The restitution coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
@@ -116,16 +108,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
      || (specularityCoefficient_.value() > 1)
     )
     {
-        FatalErrorIn
-        (
-            "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
-            "JohnsonJacksonParticleThetaFvPatchScalarField"
-            "("
-                "const fvPatch& p,"
-                "const DimensionedField<scalar, volMesh>& iF,"
-                "const dictionary& dict"
-            ")"
-        )   << "The specularity coefficient has to be between 0 and 1"
+        FatalErrorInFunction
+            << "The specularity coefficient has to be between 0 and 1"
             << abort(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index bbf37904ca..99879c41d5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -219,7 +219,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::kineticTheoryModel::k() const
 {
-    notImplemented("kineticTheoryModel::k()");
+    NotImplemented;
     return nut_;
 }
 
@@ -227,7 +227,7 @@ Foam::RASModels::kineticTheoryModel::k() const
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::kineticTheoryModel::epsilon() const
 {
-    notImplemented("kineticTheoryModel::epsilon()");
+    NotImplemented;
     return nut_;
 }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index adb23d40d2..2eba4bdab7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -117,7 +117,7 @@ bool Foam::RASModels::phasePressureModel::read()
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::phasePressureModel::k() const
 {
-    notImplemented("phasePressureModel::k()");
+    NotImplemented;
     return nut_;
 }
 
@@ -125,7 +125,7 @@ Foam::RASModels::phasePressureModel::k() const
 Foam::tmp<Foam::volScalarField>
 Foam::RASModels::phasePressureModel::epsilon() const
 {
-    notImplemented("phasePressureModel::epsilon()");
+    NotImplemented;
     return nut_;
 }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 646b340c82..b367381a84 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -24,6 +24,9 @@ License
 Application
     twoPhaseEulerFoam
 
+Group
+    grpMultiphaseSolvers
+
 Description
     Solver for a system of 2 compressible fluid phases with one phase
     dispersed, e.g. gas bubbles in a liquid including heat-transfer.
@@ -34,7 +37,7 @@ Description
 #include "twoPhaseSystem.H"
 #include "PhaseCompressibleTurbulenceModel.H"
 #include "pimpleControl.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
 #include "fixedValueFvsPatchFields.H"
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
index 95b277fd99..e288235568 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("blendingMethod::New")
+        FatalErrorInFunction
             << "Unknown blendingMethodType type "
             << blendingMethodType << endl << endl
             << "Valid blendingMethod types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
index 48dcd0855e..f89804bb7d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,14 +93,8 @@ Foam::blendingMethods::linear::linear
           > maxPartlyDispersedAlpha_[*iter]
         )
         {
-            FatalErrorIn
-            (
-                "Foam::blendingMethods::linear::linear"
-                "("
-                    "const dictionary& dict,"
-                    "const wordList& phaseNames"
-                ")"
-            )   << "The supplied fully dispersed volume fraction for "
+            FatalErrorInFunction
+                << "The supplied fully dispersed volume fraction for "
                 << *iter
                 << " is greater than the partly dispersed value."
                 << endl << exit(FatalError);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
index ee40ebbc68..7c0e7485a9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
index 6999c184cd..afa96a571a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -32,7 +32,7 @@ License
 #include "fvcDdt.H"
 #include "fvcDiv.H"
 #include "fvcAverage.H"
-#include "fvOptionList.H"
+#include "fvOptions.H"
 #include "mathematicalConstants.H"
 #include "fundamentalConstants.H"
 #include "addToRunTimeSelectionTable.H"
@@ -156,12 +156,7 @@ void Foam::diameterModels::IATE::correct()
         R -= sources_[j].R();
     }
 
-    // const_cast needed because the operators and functions of fvOptions
-    // are currently non-const.
-    fv::optionList& fvOptions = const_cast<fv::optionList&>
-    (
-        phase_.U().mesh().lookupObject<fv::optionList>("fvOptions")
-    );
+    fv::options& fvOptions(fv::options::New(phase_.mesh()));
 
     // Construct the interfacial curvature equation
     fvScalarMatrix kappaiEqn
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 84db282908..27fd28d68d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,11 +56,8 @@ Foam::diameterModels::IATEsource::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "IATEsource::New"
-            "(const word& type, const IATE&, const dictionary&)"
-        )   << "Unknown IATE source type "
+        FatalErrorInFunction
+            << "Unknown IATE source type "
             << type << nl << nl
             << "Valid IATE source types : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index f21f4f3876..fc2456871e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
 
         autoPtr<IATEsource> clone() const
         {
-            notImplemented("autoPtr<IATEsource> clone() const");
+            NotImplemented;
             return autoPtr<IATEsource>(NULL);
         }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
index b9014f3f46..b58f00291b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("diameterModel::New")
+        FatalErrorInFunction
            << "Unknown diameterModelType type "
            << diameterModelType << endl << endl
            << "Valid diameterModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
index 808208ea99..5e983b7c19 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ Foam::tmp<Foam::volScalarField> Foam::orderedPhasePair::E() const
 {
     if (!aspectRatio_.valid())
     {
-        FatalErrorIn("Foam::orderedPhasePair::E() const")
+        FatalErrorInFunction
             << "Aspect ratio model not specified for " << *this << "."
             << exit(FatalError);
     }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
index 0f77a41ad0..ef4f6abb8e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
@@ -82,7 +82,7 @@ Foam::phasePair::~phasePair()
 
 const Foam::phaseModel& Foam::phasePair::dispersed() const
 {
-    FatalErrorIn("Foam::phasePair::dispersed() const")
+    FatalErrorInFunction
         << "Requested dispersed phase from an unordered pair."
         << exit(FatalError);
 
@@ -92,7 +92,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const
 
 const Foam::phaseModel& Foam::phasePair::continuous() const
 {
-    FatalErrorIn("Foam::phasePair::dispersed() const")
+    FatalErrorInFunction
         << "Requested continuous phase from an unordered pair."
         << exit(FatalError);
 
@@ -185,7 +185,7 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::Ta() const
 
 Foam::tmp<Foam::volScalarField> Foam::phasePair::E() const
 {
-    FatalErrorIn("Foam::phasePair::E() const")
+    FatalErrorInFunction
         << "Requested aspect ratio of the dispersed phase in an unordered pair"
         << exit(FatalError);
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
index 4280dd5fb3..d203fb0349 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,14 +125,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key)
     }
     else
     {
-        FatalErrorIn
-        (
-            "friend Istream& operator>>"
-            "("
-                "Istream& is, "
-                "phasePairKey& key"
-            ")"
-        )   << "Phase pair type is not recognised. "
+        FatalErrorInFunction
+            << "Phase pair type is not recognised. "
             << temp
             << "Use (phaseDispersed in phaseContinuous) for an ordered"
             << "pair, or (phase1 and pase2) for an unordered pair."
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
index 4f85d6dad8..eca43adbf7 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
@@ -61,10 +61,8 @@
     }
     else
     {
-        FatalErrorIn
-        (
-            "readMechanicalProperties.H"
-        )   << "Valid type entries are uniform or field for rho"
+        FatalErrorInFunction
+            << "Valid type entries are uniform or field for rho"
             << abort(FatalError);
     }
 
@@ -119,10 +117,8 @@
     }
     else
     {
-        FatalErrorIn
-        (
-            "readMechanicalProperties.H"
-        )   << "Valid type entries are uniform or field for E"
+        FatalErrorInFunction
+            << "Valid type entries are uniform or field for E"
             << abort(FatalError);
     }
 
@@ -175,10 +171,8 @@
     }
     else
     {
-        FatalErrorIn
-        (
-            "readMechanicalProperties.H"
-        )   << "Valid type entries are uniform or field for nu"
+        FatalErrorInFunction
+            << "Valid type entries are uniform or field for nu"
             << abort(FatalError);
     }
 
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
index afcff762e4..45327c2b4b 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
@@ -96,10 +96,8 @@ if (thermalStress)
     }
     else
     {
-        FatalErrorIn
-        (
-             "readThermalProperties.H"
-        )   << "Valid type entries are uniform or field for C"
+        FatalErrorInFunction
+            << "Valid type entries are uniform or field for C"
             << abort(FatalError);
     }
 
@@ -154,10 +152,8 @@ if (thermalStress)
     }
     else
     {
-        FatalErrorIn
-        (
-             "readThermalProperties.H"
-        )   << "Valid type entries are uniform or field for K"
+        FatalErrorInFunction
+            << "Valid type entries are uniform or field for K"
             << abort(FatalError);
     }
 
@@ -212,10 +208,8 @@ if (thermalStress)
     }
     else
     {
-        FatalErrorIn
-        (
-            "readThermalProperties.H"
-        )   << "Valid type entries are uniform or field for alpha"
+        FatalErrorInFunction
+            << "Valid type entries are uniform or field for alpha"
             << abort(FatalError);
     }
 
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index e2c6c94337..a52d35ae0f 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
@@ -24,6 +24,9 @@ License
 Application
     solidDisplacementFoam
 
+Group
+    grpStressAnalysisSolvers
+
 Description
     Transient segregated finite-volume solver of linear-elastic,
     small-strain deformation of a solid body, with optional thermal
@@ -93,7 +96,7 @@ int main(int argc, char *argv[])
                 //DEqn.setComponentReference(1, 0, vector::X, 0);
                 //DEqn.setComponentReference(1, 0, vector::Z, 0);
 
-                initialResidual = DEqn.solve().initialResidual();
+                initialResidual = DEqn.solve().max().initialResidual();
 
                 if (!compactNormalStress)
                 {
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index 240593d814..4abd493e2f 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
@@ -24,6 +24,9 @@ License
 Application
     solidEquilibriumDisplacementFoam
 
+Group
+    grpStressAnalysisSolvers
+
 Description
     Steady-state segregated finite-volume solver of linear-elastic,
     small-strain deformation of a solid body, with optional thermal
diff --git a/applications/solvers/stressAnalysis/stressAnalysisSolversDoc.H b/applications/solvers/stressAnalysis/stressAnalysisSolversDoc.H
new file mode 100644
index 0000000000..fe3e73b0d4
--- /dev/null
+++ b/applications/solvers/stressAnalysis/stressAnalysisSolversDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpStressAnalysisSolvers Stress analysis solvers
+@{
+    \ingroup grpSolvers
+    This group contains stress analysis solvers.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
index 2dd7905294..940bc871ab 100644
--- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
+++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
         );
         if (!ok)
         {
-            WarningIn(args.executable())
+            WarningInFunction
                 << "At level " << level
                 << " there are " << coarseSize
                 << " agglomerated cells but " << newCoarseSize
diff --git a/applications/test/Hashing/hashingTests b/applications/test/Hashing/hashingTests
index 64c358f577..0472478422 100644
--- a/applications/test/Hashing/hashingTests
+++ b/applications/test/Hashing/hashingTests
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/test/codeStream/codeStreamDict1 b/applications/test/codeStream/codeStreamDict1
index 65e9f77554..ea0c882cf5 100644
--- a/applications/test/codeStream/codeStreamDict1
+++ b/applications/test/codeStream/codeStreamDict1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/dataEntry/dataEntryProperties b/applications/test/dataEntry/dataEntryProperties
index b2511690f4..5f604caae5 100644
--- a/applications/test/dataEntry/dataEntryProperties
+++ b/applications/test/dataEntry/dataEntryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/dictionary/testDict b/applications/test/dictionary/testDict
index 6e52395a48..1ead81477c 100644
--- a/applications/test/dictionary/testDict
+++ b/applications/test/dictionary/testDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/dictionary/testDict2 b/applications/test/dictionary/testDict2
index 0612545363..5baa71d979 100644
--- a/applications/test/dictionary/testDict2
+++ b/applications/test/dictionary/testDict2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex
index 4a24a74ef3..462f52ffe2 100644
--- a/applications/test/dictionary/testDictRegex
+++ b/applications/test/dictionary/testDictRegex
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/error/Test-error.C b/applications/test/error/Test-error.C
index a6789502c6..b9be1924a5 100644
--- a/applications/test/error/Test-error.C
+++ b/applications/test/error/Test-error.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,15 +40,15 @@ int main(int argc, char *argv[])
 
     try
     {
-        WarningIn("main") << "warning 1" << endl;
-        IOWarningIn("main", Serr) << "warning 2" << endl;
+        WarningInFunction << "warning 1" << endl;
+        IOWarningInFunction(Serr) << "warning 2" << endl;
 
         dictionary dict;
 
-        IOWarningIn("main", dict) << "warning 3" << endl;
+        IOWarningInFunction(dict) << "warning 3" << endl;
 
-        FatalErrorIn("main") << "error 1" << endl;
-        FatalErrorIn("main") << "error 2" << exit(FatalError);
+        FatalErrorInFunction << "error 1" << endl;
+        FatalErrorInFunction << "error 2" << exit(FatalError);
     }
     catch (Foam::error& fErr)
     {
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index e4bc196777..38a4b110f9 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
         {
             if (mesh.V().size() != mesh.nCells())
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Volume not mapped. V:" << mesh.V().size()
                     << " nCells:" << mesh.nCells()
                     << exit(FatalError);
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
 
             if (mag(newVol-totalVol)/totalVol > 1e-10)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Volume loss: old volume:" << totalVol
                     << "  new volume:" << newVol
                     << exit(FatalError);
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
 
             if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Uniform volVectorField not preserved."
                     << " Min and max should both be 1.0. min:" << min
                     << " max:" << max
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
 
             if (notEqual(max, 0.0, 1e-10) || notEqual(min, 0.0, 1e-10))
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Linear profile not preserved."
                     << " Min and max should both be 0.0. min:" << min
                     << " max:" << max
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
 
             if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Uniform surfaceScalarField not preserved."
                     << " Min and max should both be 1.0. min:" << min
                     << " max:" << max
diff --git a/applications/test/fieldMapping/pipe1D/constant/manualDecomposition b/applications/test/fieldMapping/pipe1D/constant/manualDecomposition
index 8f08c2826f..4f31d1bfee 100644
--- a/applications/test/fieldMapping/pipe1D/constant/manualDecomposition
+++ b/applications/test/fieldMapping/pipe1D/constant/manualDecomposition
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/fieldMapping/pipe1D/constant/transportProperties b/applications/test/fieldMapping/pipe1D/constant/transportProperties
index fa1c1ca0b1..fb50fc693d 100644
--- a/applications/test/fieldMapping/pipe1D/constant/transportProperties
+++ b/applications/test/fieldMapping/pipe1D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/fieldMapping/pipe1D/constant/polyMesh/blockMeshDict b/applications/test/fieldMapping/pipe1D/system/blockMeshDict
similarity index 95%
rename from applications/test/fieldMapping/pipe1D/constant/polyMesh/blockMeshDict
rename to applications/test/fieldMapping/pipe1D/system/blockMeshDict
index 14bfd1bc80..f909398f8b 100644
--- a/applications/test/fieldMapping/pipe1D/constant/polyMesh/blockMeshDict
+++ b/applications/test/fieldMapping/pipe1D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/fieldMapping/pipe1D/system/controlDict b/applications/test/fieldMapping/pipe1D/system/controlDict
index ff7a82a791..c530d0b080 100644
--- a/applications/test/fieldMapping/pipe1D/system/controlDict
+++ b/applications/test/fieldMapping/pipe1D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/fieldMapping/pipe1D/system/fvSchemes b/applications/test/fieldMapping/pipe1D/system/fvSchemes
index e2faee5674..f2ad7c84f2 100644
--- a/applications/test/fieldMapping/pipe1D/system/fvSchemes
+++ b/applications/test/fieldMapping/pipe1D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/fieldMapping/pipe1D/system/fvSolution b/applications/test/fieldMapping/pipe1D/system/fvSolution
index cc4750f16c..e4dfb7f73d 100644
--- a/applications/test/fieldMapping/pipe1D/system/fvSolution
+++ b/applications/test/fieldMapping/pipe1D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/globalIndex/Test-globalIndex.C b/applications/test/globalIndex/Test-globalIndex.C
index 11078c858b..0de4f04b3c 100644
--- a/applications/test/globalIndex/Test-globalIndex.C
+++ b/applications/test/globalIndex/Test-globalIndex.C
@@ -53,14 +53,14 @@ int main(int argc, char *argv[])
 
     if (globalNumbering.localSize() != mesh.nCells())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Problem." << abort(FatalError);
     }
 
 
     if (!Pstream::parRun())
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "globalIndex class is only useful in parallel code."
             << endl;
     }
@@ -77,14 +77,14 @@ int main(int argc, char *argv[])
 
         if (procI != Pstream::myProcNo() || localCellI != cellI)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. cellI:" << cellI << " localCellI:" << localCellI
                 << " procI:" << procI << abort(FatalError);
         }
 
         if (!globalNumbering.isLocal(globalCellI))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. cellI:" << cellI << " globalCellI:" << globalCellI
                 << " not local" << abort(FatalError);
         }
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
     if (mesh.nCells() < 1)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Test needs to be run on a case with at least one"
             << " cell per processor." << abort(FatalError);
     }
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 
         if (procI != Pstream::myProcNo()-1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. global:" << prevProcCellI
                 << " expected on processor:" << Pstream::myProcNo()-1
                 << " but is calculated to be on procI:" << procI
@@ -118,14 +118,14 @@ int main(int argc, char *argv[])
 
         if (globalNumbering.isLocal(prevProcCellI))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. globalCellI:" << prevProcCellI
                 << " calculated as local" << abort(FatalError);
         }
 
         if (!globalNumbering.isLocal(procI, prevProcCellI))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. globalCellI:" << prevProcCellI
                 << " not calculated as local on processor:" << procI
                 << abort(FatalError);
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 
         if (procI != Pstream::myProcNo()+1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. global:" << nextProcCellI
                 << " expected on processor:" << Pstream::myProcNo()+1
                 << " but is calculated to be on procI:" << procI
@@ -149,14 +149,14 @@ int main(int argc, char *argv[])
 
         if (globalNumbering.isLocal(nextProcCellI))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. globalCellI:" << nextProcCellI
                 << " calculated as local" << abort(FatalError);
         }
 
         if (!globalNumbering.isLocal(procI, nextProcCellI))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem. globalCellI:" << nextProcCellI
                 << " not calculated as local on processor:" << procI
                 << abort(FatalError);
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 44a6094076..f79628fd8c 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
         {
             if (mesh.V().size() != mesh.nCells())
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Volume not mapped. V:" << mesh.V().size()
                     << " nCells:" << mesh.nCells()
                     << exit(FatalError);
@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
 
             if (mag(newVol-totalVol)/totalVol > 1e-10)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Volume loss: old volume:" << totalVol
                     << "  new volume:" << newVol
                     << exit(FatalError);
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
 
             if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Uniform volVectorField not preserved."
                     << " Min and max should both be 1.0. min:" << min
                     << " max:" << max
@@ -389,7 +389,7 @@ int main(int argc, char *argv[])
 
             if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Uniform surfaceScalarField not preserved."
                     << " Min and max should both be 1.0. min:" << min
                     << " max:" << max
diff --git a/applications/test/hexRef8/block/constant/manualDecomposition b/applications/test/hexRef8/block/constant/manualDecomposition
index 8f08c2826f..4f31d1bfee 100644
--- a/applications/test/hexRef8/block/constant/manualDecomposition
+++ b/applications/test/hexRef8/block/constant/manualDecomposition
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/hexRef8/block/constant/transportProperties b/applications/test/hexRef8/block/constant/transportProperties
index fa1c1ca0b1..fb50fc693d 100644
--- a/applications/test/hexRef8/block/constant/transportProperties
+++ b/applications/test/hexRef8/block/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/hexRef8/block/constant/polyMesh/blockMeshDict b/applications/test/hexRef8/block/system/blockMeshDict
similarity index 94%
rename from applications/test/hexRef8/block/constant/polyMesh/blockMeshDict
rename to applications/test/hexRef8/block/system/blockMeshDict
index bff37d4ece..1720e7ebc6 100644
--- a/applications/test/hexRef8/block/constant/polyMesh/blockMeshDict
+++ b/applications/test/hexRef8/block/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/hexRef8/block/system/controlDict b/applications/test/hexRef8/block/system/controlDict
index 0c8cfee218..c94d108915 100644
--- a/applications/test/hexRef8/block/system/controlDict
+++ b/applications/test/hexRef8/block/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/hexRef8/block/system/decomposeParDict b/applications/test/hexRef8/block/system/decomposeParDict
index be54c7d925..7c159c3888 100644
--- a/applications/test/hexRef8/block/system/decomposeParDict
+++ b/applications/test/hexRef8/block/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/hexRef8/block/system/fvSchemes b/applications/test/hexRef8/block/system/fvSchemes
index e2faee5674..f2ad7c84f2 100644
--- a/applications/test/hexRef8/block/system/fvSchemes
+++ b/applications/test/hexRef8/block/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/hexRef8/block/system/fvSolution b/applications/test/hexRef8/block/system/fvSolution
index cc4750f16c..e4dfb7f73d 100644
--- a/applications/test/hexRef8/block/system/fvSolution
+++ b/applications/test/hexRef8/block/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
index ea27cfc7df..88c0a24571 100644
--- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
+++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 
             if (data != procI)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "From processor " << procI << " received " << data
                     << " but expected " << procI
                     << exit(FatalError);
diff --git a/applications/test/patchRegion/cavity_pinched/constant/transportProperties b/applications/test/patchRegion/cavity_pinched/constant/transportProperties
index fa1c1ca0b1..fb50fc693d 100644
--- a/applications/test/patchRegion/cavity_pinched/constant/transportProperties
+++ b/applications/test/patchRegion/cavity_pinched/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/patchRegion/cavity_pinched/constant/polyMesh/blockMeshDict b/applications/test/patchRegion/cavity_pinched/system/blockMeshDict
similarity index 95%
rename from applications/test/patchRegion/cavity_pinched/constant/polyMesh/blockMeshDict
rename to applications/test/patchRegion/cavity_pinched/system/blockMeshDict
index 165a600c7b..2e5f98c1a5 100644
--- a/applications/test/patchRegion/cavity_pinched/constant/polyMesh/blockMeshDict
+++ b/applications/test/patchRegion/cavity_pinched/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/patchRegion/cavity_pinched/system/collapseDict b/applications/test/patchRegion/cavity_pinched/system/collapseDict
index a059a67f14..86232a4570 100644
--- a/applications/test/patchRegion/cavity_pinched/system/collapseDict
+++ b/applications/test/patchRegion/cavity_pinched/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/patchRegion/cavity_pinched/system/controlDict b/applications/test/patchRegion/cavity_pinched/system/controlDict
index 4fc602f95c..4d31300b3e 100644
--- a/applications/test/patchRegion/cavity_pinched/system/controlDict
+++ b/applications/test/patchRegion/cavity_pinched/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/patchRegion/cavity_pinched/system/decomposeParDict b/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
index 8f0581f952..c5cd662d2b 100644
--- a/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
+++ b/applications/test/patchRegion/cavity_pinched/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/patchRegion/cavity_pinched/system/fvSchemes b/applications/test/patchRegion/cavity_pinched/system/fvSchemes
index 700ae4ff14..2924dc99fc 100644
--- a/applications/test/patchRegion/cavity_pinched/system/fvSchemes
+++ b/applications/test/patchRegion/cavity_pinched/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/patchRegion/cavity_pinched/system/fvSolution b/applications/test/patchRegion/cavity_pinched/system/fvSolution
index a0130726c4..9a5d3edcc9 100644
--- a/applications/test/patchRegion/cavity_pinched/system/fvSolution
+++ b/applications/test/patchRegion/cavity_pinched/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index 60d321b2b7..3f5e9161e3 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -71,7 +71,7 @@ void checkFaceEdges
 
             if (edges[myEdges[fp]] != edge(f[fp], f[fp1]))
             {
-                FatalErrorIn("checkFaceEdges")
+                FatalErrorInFunction
                     << "Edges of face not in face point order:"
                     << "face:" << faceI << " localF:" << f
                     << " faceEdges:" << myEdges
diff --git a/applications/test/regex/testRegexps b/applications/test/regex/testRegexps
index 904eb5d861..9efee68793 100644
--- a/applications/test/regex/testRegexps
+++ b/applications/test/regex/testRegexps
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/test/router/Gather/GatherBase.C b/applications/test/router/Gather/GatherBase.C
index 553e41a818..e3f281db7e 100644
--- a/applications/test/router/Gather/GatherBase.C
+++ b/applications/test/router/Gather/GatherBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,11 +70,8 @@ IndexType GatherBase::offset
 {
     if (values.size() != indices.size())
     {
-        FatalErrorIn
-        (
-            "GatherBase::offset(const List<DataType>&, "
-            "const List<IndexType>&, AddOp)"
-        )   << "Input data and indices lists not equal size." << endl
+        FatalErrorInFunction
+            << "Input data and indices lists not equal size." << endl
             << "data size:" << values.size()
             << "  indices:" << indices.size()
             << abort(FatalError);
diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C
index 580277ee7e..2c6e5b1e6d 100644
--- a/applications/test/router/Test-processorRouter.C
+++ b/applications/test/router/Test-processorRouter.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
     if (!Pstream::parRun())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Please run in parallel" << exit(FatalError);
     }
 
diff --git a/applications/test/router/router.C b/applications/test/router/router.C
index 84420a907c..0b55495bea 100644
--- a/applications/test/router/router.C
+++ b/applications/test/router/router.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,12 +125,8 @@ void Foam::router::fixWeights
 
     if (minNodeI == -1)
     {
-        WarningIn
-        (
-            "Foam::router::fixWeights"
-            "(const label startNodeI, const label endNodeI,"
-            "const label nodeI, const label prevNodeI)"
-        )   << "Cannot route from node " << nodeI
+        WarningInFunction
+            << "Cannot route from node " << nodeI
             << " since all neigbours of node "
             << "already allocated:" << endl;
 
@@ -138,12 +134,7 @@ void Foam::router::fixWeights
         {
             label nbrNodeI = myNeighbours[neighbourI];
 
-            WarningIn
-            (
-                "Foam::router::fixWeights"
-                "(const label startNodeI, const label endNodeI,"
-                "const label nodeI, const label prevNodeI)"
-            )   << "  neighbour:" << nbrNodeI
+            WarningInFunction
                 << "  weight:" << weights_[nbrNodeI] << endl;
         }
         return;
@@ -292,7 +283,7 @@ bool Foam::router::route(const labelList& path, const label pathValue)
 {
     if (pathValue >= 0)
     {
-        FatalErrorIn("router::route(const labelList&, const label)")
+        FatalErrorInFunction
             << "Illegal pathValue " << pathValue << exit(FatalError);
     }
 
@@ -382,7 +373,7 @@ Foam::labelList Foam::router::getRoute(const label pathValue) const
 
     if (pathNodeI == -1)
     {
-        FatalErrorIn("router::getRoute(const label)")
+        FatalErrorInFunction
             << "No route with value " << pathValue << endl;
     }
 
diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict
index 9e6da7cbc2..2cd9c50958 100644
--- a/applications/test/router/routerDict
+++ b/applications/test/router/routerDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/spline/test-splines b/applications/test/spline/test-splines
index f6fd1e29c0..f76c1532ff 100644
--- a/applications/test/spline/test-splines
+++ b/applications/test/spline/test-splines
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 (
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index f7379b8cd5..f9a7764384 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -29,7 +29,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-
 #include "syncTools.H"
 #include "argList.H"
 #include "polyMesh.H"
@@ -81,7 +80,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
              || maxEdgeValues[i] != label(maxBits.get(i))
             )
             {
-                FatalErrorIn("testPackedList()")
+                FatalErrorInFunction
                     << "edge:" << i
                     << " minlabel:" << edgeValues[i]
                     << " minbits:" << bits.get(i)
@@ -128,7 +127,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
              || maxPointValues[i] != label(maxBits.get(i))
             )
             {
-                FatalErrorIn("testPackedList()")
+                FatalErrorInFunction
                     << "point:" << i
                     << " at:" << mesh.points()[i]
                     << " minlabel:" << pointValues[i]
@@ -170,7 +169,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
              || maxFaceValues[faceI] != label(maxBits.get(faceI))
             )
             {
-                FatalErrorIn("testPackedList()")
+                FatalErrorInFunction
                     << "face:" << faceI
                     << " minlabel:" << faceValues[faceI]
                     << " minbits:" << bits.get(faceI)
@@ -187,7 +186,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 {
     Info<< nl << "Testing Map synchronisation." << endl;
 
-    WarningIn("testSparseData()")
+    WarningInFunction
         << "Position test of sparse data only correct for cases without cyclics"
         << " with shared points." << endl;
 
@@ -252,7 +251,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
                 if (fullPt != sparsePt)
                 {
-                    FatalErrorIn("testSparseData()")
+                    FatalErrorInFunction
                         << "point:" << meshPointI
                         << " full:" << fullPt
                         << " sparse:" << sparsePt
@@ -270,7 +269,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
             if (fullPt != sparsePt)
             {
-                FatalErrorIn("testSparseData()")
+                FatalErrorInFunction
                     << "point:" << meshPointI
                     << " full:" << fullPt
                     << " sparse:" << sparsePt
@@ -335,7 +334,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
                 if (fullPt != sparsePt)
                 {
-                    FatalErrorIn("testSparseData()")
+                    FatalErrorInFunction
                         << "edge:" << meshEdgeI
                         << " points:" << mesh.edges()[meshEdgeI]
                         << " full:" << fullPt
@@ -359,7 +358,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
                 if (fullPt != sparsePt)
                 {
-                    FatalErrorIn("testSparseData()")
+                    FatalErrorInFunction
                         << "Extra edge:" << meshEdgeI
                         << " points:" << mesh.edges()[meshEdgeI]
                         << " full:" << fullPt
@@ -392,7 +391,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
         {
             if (mag(syncedPoints[pointI] - mesh.points()[pointI]) > SMALL)
             {
-                FatalErrorIn("testPointSync()")
+                FatalErrorInFunction
                     << "Point " << pointI
                     << " original location " << mesh.points()[pointI]
                     << " synced location " << syncedPoints[pointI]
@@ -428,13 +427,11 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
         {
             if (nMasters[pointI] != 1)
             {
-                //FatalErrorIn("testPointSync()")
-                WarningIn("testPointSync()")
+                WarningInFunction
                     << "Point " << pointI
                     << " original location " << mesh.points()[pointI]
                     << " has " << nMasters[pointI]
                     << " masters."
-                    //<< exit(FatalError);
                     << endl;
             }
         }
@@ -470,7 +467,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
 
             if (mag(syncedMids[edgeI] - eMid) > SMALL)
             {
-                FatalErrorIn("testEdgeSync()")
+                FatalErrorInFunction
                     << "Edge " << edgeI
                     << " original midpoint " << eMid
                     << " synced location " << syncedMids[edgeI]
@@ -507,13 +504,11 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
             if (nMasters[edgeI] != 1)
             {
                 const edge& e = edges[edgeI];
-                //FatalErrorIn("testEdgeSync()")
-                WarningIn("testEdgeSync()")
+                WarningInFunction
                     << "Edge " << edgeI
                     << " at:" << mesh.points()[e[0]] << mesh.points()[e[1]]
                     << " has " << nMasters[edgeI]
                     << " masters."
-                    //<< exit(FatalError);
                     << endl;
             }
         }
@@ -541,7 +536,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
         {
             if (mag(syncedFc[faceI] - mesh.faceCentres()[faceI]) > SMALL)
             {
-                FatalErrorIn("testFaceSync()")
+                FatalErrorInFunction
                     << "Face " << faceI
                     << " original centre " << mesh.faceCentres()[faceI]
                     << " synced centre " << syncedFc[faceI]
@@ -576,7 +571,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
         {
             if (nMasters[faceI] != 1)
             {
-                FatalErrorIn("testFaceSync()")
+                FatalErrorInFunction
                     << "Face " << faceI
                     << " centre " << mesh.faceCentres()[faceI]
                     << " has " << nMasters[faceI]
diff --git a/applications/test/tetTetOverlap/Test-tetTetOverlap.C b/applications/test/tetTetOverlap/Test-tetTetOverlap.C
index df6f2b8f83..e314931614 100644
--- a/applications/test/tetTetOverlap/Test-tetTetOverlap.C
+++ b/applications/test/tetTetOverlap/Test-tetTetOverlap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
 
     if (mag(volInside+volOutside-tetA.mag()) > SMALL)
     {
-        FatalErrorIn("Test-tetetOverlap")
+        FatalErrorInFunction
             << "Tet volumes do not sum up to input tet."
             << exit(FatalError);
     }
diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C
index 25d8fbabff..37e4d303bf 100644
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,13 +83,35 @@ int main(int argc, char *argv[])
         zeroGradientFvPatchSymmTensorField::typeName
     );
 
-    solve
+    SolverPerformance<symmTensor> sP =
     (
-        fvm::ddt(st)
-      + fvm::div(phi, st)
-      - fvm::laplacian(dimensionedScalar("D", sqr(dimLength)/dimTime, 1), st)
+        solve
+        (
+            fvm::ddt(st)
+          + fvm::div(phi, st)
+          - fvm::laplacian
+            (
+                dimensionedScalar("D", sqr(dimLength)/dimTime, 1),
+                st
+            )
+         ==
+            dimensioned<symmTensor>
+            (
+                "source",
+                dimless/dimTime,
+                symmTensor(0, 2, 0, 1, 1.5, 0)
+            )
+        )
     );
 
+    Info<< nl
+        << "Detailed SolverPerformance<symmTensor>: " << nl
+        << "  " << sP << endl;
+
+    Info<< nl
+        << "solverPerformanceDict: "
+        << mesh.solverPerformanceDict() << endl;
+
     return 0;
 }
 
diff --git a/applications/test/volField/cavity/0/U b/applications/test/volField/cavity/0/U
index 4287c89701..ac297bc2e6 100644
--- a/applications/test/volField/cavity/0/U
+++ b/applications/test/volField/cavity/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/volField/cavity/0/p b/applications/test/volField/cavity/0/p
index 56032f8b68..c4e8171235 100644
--- a/applications/test/volField/cavity/0/p
+++ b/applications/test/volField/cavity/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/volField/cavity/constant/transportProperties b/applications/test/volField/cavity/constant/transportProperties
index fa1c1ca0b1..fb50fc693d 100644
--- a/applications/test/volField/cavity/constant/transportProperties
+++ b/applications/test/volField/cavity/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/volField/cavity/constant/polyMesh/blockMeshDict b/applications/test/volField/cavity/system/blockMeshDict
similarity index 96%
rename from applications/test/volField/cavity/constant/polyMesh/blockMeshDict
rename to applications/test/volField/cavity/system/blockMeshDict
index f8f86ab8d6..870f5878a3 100644
--- a/applications/test/volField/cavity/constant/polyMesh/blockMeshDict
+++ b/applications/test/volField/cavity/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/volField/cavity/system/controlDict b/applications/test/volField/cavity/system/controlDict
index d2fa09cc52..8644d48460 100644
--- a/applications/test/volField/cavity/system/controlDict
+++ b/applications/test/volField/cavity/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/volField/cavity/system/fvSchemes b/applications/test/volField/cavity/system/fvSchemes
index 7a50b1146f..889e9f3662 100644
--- a/applications/test/volField/cavity/system/fvSchemes
+++ b/applications/test/volField/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/volField/cavity/system/fvSolution b/applications/test/volField/cavity/system/fvSolution
index d95ff952c0..2ba5ffe166 100644
--- a/applications/test/volField/cavity/system/fvSolution
+++ b/applications/test/volField/cavity/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/test/wordRe/testRegexps b/applications/test/wordRe/testRegexps
index 89865a5a54..7b7bd2d4a7 100644
--- a/applications/test/wordRe/testRegexps
+++ b/applications/test/wordRe/testRegexps
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options
index acd5a23a15..4e7c20058c 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/Make/options
+++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options
@@ -10,4 +10,5 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lmeshTools \
     -ldynamicMesh \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lfvOptions
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 6473bb4d88..ea342de863 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,8 @@ Description
     NOTE: To avoid exposing wrong fields values faceSets should include
     faces contained in the blockedCells cellset.
 
-    - coupledFaces reads coupledFacesSet to introduces mixe-coupled baffles
+    - coupledFaces reads coupledFacesSet to introduces mixed-coupled
+      duplicate baffles
 
     Subsets out the blocked cells and splits the blockedFaces and updates
     fields.
@@ -530,7 +531,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
 
     if (patchI == -1)
     {
-        FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)")
+        FatalErrorInFunction
             << "Illegal patch " << patchName
             << nl << "Valid patches are " << patches.names()
             << exit(FatalError);
@@ -543,7 +544,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
 
         if (newPatch != patchI)
         {
-            FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)")
+            FatalErrorInFunction
                 << "Patch " << patchName
                 << " should have the same patch index on all processors." << nl
                 << "On my processor it has index " << patchI
@@ -651,7 +652,7 @@ int main(int argc, char *argv[])
         {
             if (wantedPatch[iter.key()] != -1)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Face " << iter.key()
                     << " is in faceSet " << setsAndPatches[setI][0]
                     << " destined for patch " << setsAndPatches[setI][1]
@@ -689,7 +690,7 @@ int main(int argc, char *argv[])
         {
             if (coupledWantedPatch[iter.key()] != -1)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Face " << iter.key()
                     << " is in faceSet " << coupledAndPatches[setI][0]
                     << " destined for patch " << coupledAndPatches[setI][1]
@@ -1151,7 +1152,7 @@ int main(int argc, char *argv[])
 
     if (cellRegion.nRegions() > 1)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Removing blocked faces and cells created "
             << cellRegion.nRegions()
             << " regions that are not connected via a face." << nl
@@ -1167,7 +1168,7 @@ int main(int argc, char *argv[])
 
         if (startFrom != "latestTime")
         {
-            WarningIn(args.executable())
+            WarningInFunction
                 << "To run splitMeshRegions please set your"
                 << " startFrom entry to latestTime" << endl;
         }
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict
index 94fb1d6b8c..0879bedc1b 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -17,7 +17,8 @@ FoamFile
 //- Per faceSet the patch the faces should go into blocked baffles
 blockedFaces ((blockedFacesSet blockedFaces));
 
-//- Per faceSet the patch the faces should go into coupled baffles
+//- Per faceSet the duplicate baffles to generate (one 'normal', wall baffle,
+//  one cyclic baffle). For use with active baffle boundary conditions.
 coupledFaces
 {
     coupledFacesSet
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 8daf4edc44..ed30517153 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -365,7 +365,7 @@ bool limitRefinementLevel
                 {
                     if (refLevel[cellI] - refLevel[nbr] >= limitDiff)
                     {
-                        FatalErrorIn("limitRefinementLevel")
+                        FatalErrorInFunction
                             << "Level difference between neighbouring cells "
                             << cellI << " and " << nbr
                             << " greater than or equal to " << limitDiff << endl
@@ -705,7 +705,7 @@ int main(int argc, char *argv[])
 
     if (nCutLayers > 0 && selectInside)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Illogical settings : Both nCutLayers>0 and selectInside true."
             << endl
             << "This would mean that inside cells get removed but should be"
@@ -728,7 +728,7 @@ int main(int argc, char *argv[])
 
         if (queryMesh.findCell(outsidePoint, -1, false) == -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "outsidePoint " << outsidePoint
                 << " is not inside any cell"
                 << exit(FatalError);
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
index adfee94118..d9eb0d474c 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index 134c735919..9df985f42e 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
     if (collapseFaces && collapseFaceSet)
     {
-        FatalErrorIn("main(int, char*[])")
+        FatalErrorInFunction
             << "Both face zone collapsing and face collapsing have been"
             << "selected. Choose only one of:" << nl
             << "    -collapseFaces" << nl
diff --git a/applications/utilities/mesh/advanced/collapseEdges/meshQualityDict b/applications/utilities/mesh/advanced/collapseEdges/meshQualityDict
index 43eb9a5836..79cc435593 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/meshQualityDict
+++ b/applications/utilities/mesh/advanced/collapseEdges/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index f4d5d13418..9854ec2fef 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -177,7 +177,7 @@ label mergePatchFaces
 
                         if (newVertI < 0)
                         {
-                            FatalErrorIn("mergePatchFaces")
+                            FatalErrorInFunction
                                 << "In set:" << setI << " old face labels:"
                                 << allFaceSets[setI] << " new face vertices:"
                                 << setFaceVerts[i] << " are unmapped vertices!"
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index c3f8bed837..abd5eb45ad 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
      || (collapseEdge && cellsToSplit)
     )
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Used more than one mesh modifying module "
             << "(boundary cutting, cell splitting, edge collapsing)" << nl
             << "Please do them in separate passes." << exit(FatalError);
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
index b388da5dac..c377bdb44a 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 2872db86d9..ba5b7f8548 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
 
     if (!patchSet.size())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot find any patches in set " << patches << endl
             << "Valid patches are " << mesh.boundaryMesh().names()
             << exit(FatalError);
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index a992deb519..b3af03b509 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
 
     if (!readLevel && refHeader.headerOk())
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Detected " << refHeader.name() << " file in "
             << polyMesh::defaultRegion <<  " directory. Please remove to"
             << " recreate it or use the -readLevel option to use it"
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index 86eddffcf4..c71929e500 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -174,7 +174,7 @@ void cutBySurface
         }
         else
         {
-            FatalErrorIn("cutBySurface")
+            FatalErrorInFunction
                 << "Multiple mesh regions in original mesh" << endl
                 << "Please use splitMeshRegions to separate these"
                 << exit(FatalError);
@@ -393,7 +393,7 @@ int main(int argc, char *argv[])
         label cellI = queryMesh.findCell(outsidePoint, -1, false);
         if (returnReduce(cellI, maxOp<label>()) == -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "outsidePoint " << outsidePoint
                 << " is not inside any cell"
                 << exit(FatalError);
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
index 72f074d3a9..143269548b 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCellsDict
+++ b/applications/utilities/mesh/advanced/selectCells/selectCellsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index ec1a480ad8..0e1eb5b1e5 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -261,7 +261,7 @@ bool splitHex
 
     if (leftI == -1 || rightI == -1)
     {
-        FatalErrorIn("splitHex") << "Problem : leftI:" << leftI
+        FatalErrorInFunction
             << " rightI:" << rightI << abort(FatalError);
     }
 
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 239bb20832..deda5581f8 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,7 +164,7 @@ void CheckError(CCMIOError const &err, const Foam::string& str)
 {
     if (err != kCCMIONoErr)
     {
-        FatalErrorIn("CheckError")
+        FatalErrorInFunction
             << str << exit(FatalError);
     }
 }
@@ -625,14 +625,14 @@ int main(int argc, char *argv[])
 
         if (!isFile(ccmFile))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Cannot read file " << ccmFile
                 << exit(FatalError);
         }
 
         if (ccmExt != "ccm" && ccmExt != "ccmg")
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Illegal extension " << ccmExt << " for file " << ccmFile
                 << nl << "Allowed extensions are '.ccm', '.ccmg'"
                 << exit(FatalError);
@@ -697,7 +697,7 @@ int main(int argc, char *argv[])
             );
             if (err != kCCMIONoErr)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Could not read the file."
                     << exit(FatalError);
             }
@@ -838,7 +838,7 @@ int main(int argc, char *argv[])
 
         if (nbr >= foamCellType.size() || own >= foamCellType.size())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "face:" << faceI
                 << " nbr:" << nbr
                 << " own:" << own
@@ -864,7 +864,7 @@ int main(int argc, char *argv[])
         {
             if (f[fp] < 0 || f[fp] >= foamPoints.size())
             {
-                FatalErrorIn(args.executable()) << "face:" << faceI
+                FatalErrorInFunction
                     << " f:" << f << abort(FatalError);
             }
         }
@@ -1002,7 +1002,7 @@ int main(int argc, char *argv[])
 
     if (meshFaceI != foamOwner.size())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "meshFaceI:" << meshFaceI
             << " nFaces:" << foamOwner.size()
             << abort(FatalError);
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index f569b19612..8e2a1749a9 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -285,7 +285,7 @@ label findFace(const polyMesh& mesh, const face& f)
         }
     }
 
-    FatalErrorIn("findFace(const polyMesh&, const face&)")
+    FatalErrorInFunction
         << "Cannot find a face matching " << f
         << exit(FatalError);
 
@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
 
     if (!ansysStream)
     {
-        FatalErrorIn("ansysToFoam::main(int argc, char *argv[])")
+        FatalErrorInFunction
             << args.executable()
             << ": file " << ansysFile << " not found"
             << exit(FatalError);
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 2c4d7b0eaa..c3d2fef073 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
 
         if (blockPFaces.size() != blockNFaces.size())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Inconsistent number of faces for glue pair "
                 << glueI << " between blocks " << blockPlabel + 1
                 << " and " << blockNlabel + 1
@@ -417,7 +417,7 @@ int main(int argc, char *argv[])
 
     if (changedPointMerge == true)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Point merging failed after max number of passes."
             << abort(FatalError);
     }
@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
 
                 if (pointMergeList[PpointLabel] == -1)
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Unable to merge point " << blockPFacePointI
                         << " of face " << blockPFaceLabel
                         << " of block " << blockPlabel
@@ -470,7 +470,7 @@ int main(int argc, char *argv[])
 
                 if (pointMergeList[NpointLabel] == -1)
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Unable to merge point " << blockNFacePointI
                         << " of face " << blockNFaceLabel
                         << " of block " << blockNlabel
@@ -489,7 +489,7 @@ int main(int argc, char *argv[])
     {
         if (pointMergeList[pointLabel] > pointLabel)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "ouch" << abort(FatalError);
         }
 
@@ -692,7 +692,7 @@ int main(int argc, char *argv[])
                 }
                 else
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Unrecognised CFX patch type "
                         << cfxPatchTypes[patchI]
                         << abort(FatalError);
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
index 1bbf6f5569..094627f7da 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ labelListList hexBlock::blockCells() const
     }
     else
     {
-        FatalErrorIn("hexBlock::cellShapes()")
+        FatalErrorInFunction
             << "Unable to determine block handedness as points "
             << "have not been read in yet"
             << abort(FatalError);
@@ -155,10 +155,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
 {
     if (range.size() != 6)
     {
-        FatalErrorIn
-        (
-            "patchFaces(const label direc, const labelList& range) const"
-        )   << "Invalid size of the range array: " << range.size()
+        FatalErrorInFunction
+            << "Invalid size of the range array: " << range.size()
             << ". Should be 6 (xMin, xMax, yMin, yMax, zMin, zMax"
             << abort(FatalError);
     }
@@ -351,10 +349,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
 
         default:
         {
-            FatalErrorIn
-            (
-                "patchFaces(const label direc, const labelList& range) const"
-            )   << "direction out of range (1 to 6): " << direc
+            FatalErrorInFunction
+                << "direction out of range (1 to 6): " << direc
                 << abort(FatalError);
         }
     }
@@ -363,10 +359,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
     // Do nothing for the right-handed block
     if (blockHandedness_ == noPoints)
     {
-        FatalErrorIn
-        (
-            "patchFaces(const label direc, const labelList& range) const"
-        )   << "Unable to determine block handedness as points "
+        FatalErrorInFunction
+            << "Unable to determine block handedness as points "
             << "have not been read in yet"
             << abort(FatalError);
     }
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
index 097cf1c816..adec113adf 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ public:
         {
             if (blockHandedness_ == noPoints)
             {
-                FatalErrorIn("hexBlock::points() const")
+                FatalErrorInFunction
                     << "points not read in yet"
                     << abort(FatalError);
             }
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 830fecbb23..75a1cfcbc7 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -750,7 +750,7 @@ endOfSection               {space}")"{space}
 
 <*>. {
         // This is a catch all.
-        FatalErrorIn("fluentMeshToFoam::lexer")
+        FatalErrorInFunction
             << "Do not understand characters: " << YYText() << nl
             << "    on line " << lineNo
             << exit(FatalError);
@@ -826,7 +826,7 @@ int main(int argc, char *argv[])
 
     if (!fluentStream)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << ": file " << fluentFile << " not found"
             << exit(FatalError);
     }
@@ -840,7 +840,7 @@ int main(int argc, char *argv[])
 
     if (dimensionOfGrid != 3)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Mesh is not 3D, dimension of grid: " << dimensionOfGrid
             << exit(FatalError);
     }
@@ -1018,7 +1018,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                WarningIn(args.executable())
+                WarningInFunction
                     << "Unknown FaceGroup " << zoneID << " not in a zone"
                     << endl;
             }
@@ -1255,7 +1255,7 @@ int main(int argc, char *argv[])
             {
                 if (!doneWarning)
                 {
-                    WarningIn(args.executable())
+                    WarningInFunction
                         << "Ignoring internal face " << facei
                         << " on FaceZone " << zoneID
                         << " since owner " << owner[facei] << " or neighbour "
@@ -1306,7 +1306,7 @@ int main(int argc, char *argv[])
             {
                 if (!doneWarning)
                 {
-                    WarningIn(args.executable())
+                    WarningInFunction
                         << "Ignoring patch face " << facei
                         << " on FaceZone " << zoneID
                         << " since owner " << owner[facei] << " or neighbour "
@@ -1363,7 +1363,7 @@ int main(int argc, char *argv[])
             // Check the face being added as an internal face actually is one
             if (neighbour[facei] == -1)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Attempt of add internal face " << facei
                     << " which is a boundary face"
                     << exit(FatalError);
@@ -1373,7 +1373,7 @@ int main(int argc, char *argv[])
             {
                 if (!doneWarning)
                 {
-                    WarningIn(args.executable())
+                    WarningInFunction
                         << "Ignoring internal face " << facei
                         << " since owner " << owner[facei] << " or neighbour "
                         << neighbour[facei] << " outside range of cells 0.."
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
index 47cffc1789..c0da25a015 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,13 +74,8 @@ cellShape create3DCellShape
     // Checking
     if (faceLabels.size() != curModel.nFaces())
     {
-        FatalErrorIn
-        (
-            "create3DCellShape(const label cellIndex, "
-            "const labelList& faceLabels, const labelListList& faces, "
-            "const labelList& owner, const labelList& neighbour, "
-            "const label fluentCellModelID)"
-        )   << "Number of face labels not equal to"
+        FatalErrorInFunction
+            << "Number of face labels not equal to"
             << "number of face in the model. "
             << "Number of face labels: " << faceLabels.size()
             << " number of faces in model: " << curModel.nFaces()
@@ -113,13 +108,8 @@ cellShape create3DCellShape
         }
         else
         {
-            FatalErrorIn
-            (
-                "create3DCellShape(const label cellIndex, "
-                "const labelList& faceLabels, const labelListList& faces, "
-                "const labelList& owner, const labelList& neighbour, "
-                "const label fluentCellModelID)"
-            )   << "face " << curFaceLabel
+            FatalErrorInFunction
+                << "face " << curFaceLabel
                 << " does not belong to cell " << cellIndex
                 << ". Face owner: " << owner[curFaceLabel] << " neighbour: "
                 << neighbour[curFaceLabel]
@@ -176,13 +166,8 @@ cellShape create3DCellShape
 
     if (!found)
     {
-        FatalErrorIn
-        (
-            "create3DCellShape(const label cellIndex, "
-            "const labelList& faceLabels, const labelListList& faces, "
-            "const labelList& owner, const labelList& neighbour, "
-            "const label fluentCellModelID)"
-        )   << "Cannot find match for first face. "
+        FatalErrorInFunction
+            << "Cannot find match for first face. "
             << "cell model: " << curModel.name() << " first model face: "
             << firstModelFace << " Mesh faces: " << localFaces
             << abort(FatalError);
@@ -271,13 +256,8 @@ cellShape create3DCellShape
         if (!found)
         {
             // A model face is not matched. Shape detection failed
-            FatalErrorIn
-            (
-                "create3DCellShape(const label cellIndex, "
-                "const labelList& faceLabels, const labelListList& faces, "
-                "const labelList& owner, const labelList& neighbour, "
-                "const label fluentCellModelID)"
-            )   << "Cannot find match for face "
+            FatalErrorInFunction
+                << "Cannot find match for face "
                 << modelFaceI
                 << ".\nModel: " << curModel.name() << " model face: "
                 << curModelFace << " Mesh faces: " << localFaces
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
index 44a60f1128..c7aec88390 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,13 +59,8 @@ cellShape extrudedQuadCellShape
     // Checking
     if (faceLabels.size() != 4)
     {
-        FatalErrorIn
-        (
-            "extrudedQuadCellShape(const label cellIndex, "
-            "const labelList& faceLabels, const faceList& faces, "
-            "const labelList& owner, const labelList& neighbour, "
-            "const label pointOffset, faceList& frontAndBackFaces)"
-        )   << "Trying to create a quad with " << faceLabels.size() << " faces"
+        FatalErrorInFunction
+            << "Trying to create a quad with " << faceLabels.size() << " faces"
             << abort(FatalError);
     }
 
@@ -80,13 +75,8 @@ cellShape extrudedQuadCellShape
 
         if (curFace.size() != 2)
         {
-            FatalErrorIn
-            (
-                "extrudedQuadCellShape(const label cellIndex, "
-                "const labelList& faceLabels, const faceList& faces, "
-                "const labelList& owner, const labelList& neighbour, "
-                "const label pointOffset, faceList& frontAndBackFaces)"
-            )   << "face " << curFaceLabel
+            FatalErrorInFunction
+                << "face " << curFaceLabel
                 << "does not have 2 vertices. Number of vertices: " << curFace
                 << abort(FatalError);
         }
@@ -110,13 +100,8 @@ cellShape extrudedQuadCellShape
         }
         else
         {
-            FatalErrorIn
-            (
-                "extrudedQuadCellShape(const label cellIndex, "
-                "const labelList& faceLabels, const faceList& faces, "
-                "const labelList& owner, const labelList& neighbour, "
-                "const label pointOffset, faceList& frontAndBackFaces)"
-            )   << "face " << curFaceLabel
+            FatalErrorInFunction
+                << "face " << curFaceLabel
                 << " does not belong to cell " << cellIndex
                 << ". Face owner: " << owner[curFaceLabel] << " neighbour: "
                 << neighbour[curFaceLabel]
@@ -253,13 +238,8 @@ cellShape extrudedQuadCellShape
     }
     else
     {
-        FatalErrorIn
-        (
-            "extrudedQuadCellShape(const label cellIndex, "
-            "const labelList& faceLabels, const faceList& faces, "
-            "const labelList& owner, const labelList& neighbour, "
-            "const label pointOffset, faceList& frontAndBackFaces)"
-        )   << "Problem with edge matching. Edges: " << localFaces
+        FatalErrorInFunction
+            << "Problem with edge matching. Edges: " << localFaces
             << abort(FatalError);
     }
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
index c3f482ad92..ccf77d8258 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,13 +60,8 @@ cellShape extrudedTriangleCellShape
     // Checking
     if (faceLabels.size() != 3)
     {
-        FatalErrorIn
-        (
-            "extrudedTriangleCellShape(const label cellIndex, "
-            "const labelList& faceLabels, const faceList& faces, "
-            "const labelList& owner, const labelList& neighbour, "
-            "const label pointOffset, faceList& frontAndBackFaces)"
-        )   << "Trying to create a triangle with " << faceLabels.size()
+        FatalErrorInFunction
+            << "Trying to create a triangle with " << faceLabels.size()
             << " faces"
             << abort(FatalError);
     }
@@ -82,13 +77,8 @@ cellShape extrudedTriangleCellShape
 
         if (curFace.size() != 2)
         {
-            FatalErrorIn
-            (
-                "extrudedTriangleCellShape(const label cellIndex, "
-                "const labelList& faceLabels, const faceList& faces, "
-                "const labelList& owner, const labelList& neighbour, "
-                "const label pointOffset, faceList& frontAndBackFaces)"
-            )   << "face " << curFaceLabel
+            FatalErrorInFunction
+                << "face " << curFaceLabel
                 << "does not have 2 vertices. Number of vertices: " << curFace
                 << abort(FatalError);
         }
@@ -112,13 +102,8 @@ cellShape extrudedTriangleCellShape
         }
         else
         {
-            FatalErrorIn
-            (
-                "extrudedTriangleCellShape(const label cellIndex, "
-                "const labelList& faceLabels, const faceList& faces, "
-                "const labelList& owner, const labelList& neighbour, "
-                "const label pointOffset, faceList& frontAndBackFaces)"
-            )   << "face " << curFaceLabel
+            FatalErrorInFunction
+                << "face " << curFaceLabel
                 << " does not belong to cell " << cellIndex
                 << ". Face owner: " << owner[curFaceLabel] << " neighbour: "
                 << neighbour[curFaceLabel]
@@ -193,13 +178,8 @@ cellShape extrudedTriangleCellShape
     }
     else
     {
-        FatalErrorIn
-        (
-            "extrudedTriangleCellShape(const label cellIndex, "
-            "const labelList& faceLabels, const faceList& faces, "
-            "const labelList& owner, const labelList& neighbour, "
-            "const label pointOffset, faceList& frontAndBackFaces)"
-        )   << "Problem with edge matching. Edges: " << localFaces
+        FatalErrorInFunction
+            << "Problem with edge matching. Edges: " << localFaces
             << abort(FatalError);
     }
 
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index ad55312e1c..a040ca4195 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -853,7 +853,7 @@ label findFace(const primitiveMesh& mesh, const face& f)
     }
 
     // Didn't find face. Do what?
-    FatalErrorIn("findFace(const primitiveMesh&, const face&)")
+    FatalErrorInFunction
         << "Problem : cannot find a single face in the mesh which uses"
         << " vertices " << f << exit(FatalError);
 
@@ -901,7 +901,7 @@ int main(int argc, char *argv[])
 
     if (!fluentStream)
     {
-        FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
+        FatalErrorInFunction
             << args.executable()
             << ": file " << fluentFile << " not found"
             << exit(FatalError);
@@ -1054,8 +1054,7 @@ int main(int argc, char *argv[])
 
                 default:
                 {
-                    FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
-                        << "unrecognised  2-D cell shape: "
+                    FatalErrorInFunction
                         << fluentCellModelID[celli]
                         << abort(FatalError);
                 }
@@ -1068,7 +1067,7 @@ int main(int argc, char *argv[])
 
             if (faces[faceI].size() != 2)
             {
-                FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
+                FatalErrorInFunction
                     << "fluentMeshToFoam: a 2-D face defined with "
                     << faces[faceI].size() << " points." << endl;
             }
@@ -1114,7 +1113,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
+                FatalErrorInFunction
                     << "unrecognised 3-D cell shape: "
                     << fluentCellModelID[celli]
                     << abort(FatalError);
@@ -1255,7 +1254,7 @@ int main(int argc, char *argv[])
             }
             else
             {
-                FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
+                FatalErrorInFunction
                     << "unrecognised face shape with "
                     << patchFaces[faceI].size() << " vertices"
                     << abort(FatalError);
@@ -1340,7 +1339,7 @@ int main(int argc, char *argv[])
         }
         else //unknown face regions are not handled
         {
-            FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
+            FatalErrorInFunction
                 << "fluent patch type " << curPatchType << " not recognised."
                 << abort(FatalError);
         }
@@ -1417,7 +1416,7 @@ int main(int argc, char *argv[])
 
                 if (pShapeMesh.isInternalFace(faceI))
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Face " << faceI << " on new patch "
                         << patchNames[patchI]
                         << " is not an external face of the mesh." << endl
@@ -1426,7 +1425,7 @@ int main(int argc, char *argv[])
 
                 if (facePatchID[faceI - pShapeMesh.nInternalFaces()]!= -1)
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Face " << faceI << " on new patch "
                         << patchNames[patchI]
                         << " has already been marked for repatching to"
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index 05c27a15df..0353caf74b 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -254,7 +254,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
             {
                 hasWarned = true;
 
-                WarningIn("void fluentFvMesh::writeFluentMesh() const")
+                WarningInFunction
                     << "foamMeshToFluent: cell shape for cell "
                     << cellI << " only supported by Fluent polyhedral meshes."
                     << nl
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 9f3f615dc6..2de3fa2932 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -425,7 +425,7 @@ mtype                 {space}"MTYPE:"{space}
 
         if (curGroupID > 0)
         {
-            FatalErrorIn("gambitToFoam::main")
+            FatalErrorInFunction
                 << "<readCellStreamGroupID>{space}{label} : "
                 << "trying to reset group ID while active"
                 << abort(FatalError);
@@ -582,7 +582,7 @@ mtype                 {space}"MTYPE:"{space}
 <boundaryPatchFaces>{spaceNl}{label}({scalarList}|\n) {
 
         // Vertex-based boundary condition
-        FatalErrorIn("gambitToFoam::main")
+        FatalErrorInFunction
             << "<boundaryPatchFaces>{spaceNl}{label}{scalarList} : "
             << "boundary condition specified on vertices not supported"
             << abort(FatalError);
@@ -648,7 +648,7 @@ int main(int argc, char *argv[])
 
     if (!gambitStream)
     {
-        FatalErrorIn("gambitToFoam::main")
+        FatalErrorInFunction
             << args.executable()
             << ": file " << gambitFile << " not found"
             << abort(FatalError);
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index e606af501e..5ed5279c9c 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -257,7 +257,7 @@ scalar readMeshFormat(IFstream& inFile)
 
     if (asciiFlag != 0)
     {
-        FatalIOErrorIn("readMeshFormat(IFstream&)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "Can only read ascii msh files."
             << exit(FatalIOError);
     }
@@ -268,7 +268,7 @@ scalar readMeshFormat(IFstream& inFile)
 
     if (tag != "$EndMeshFormat")
     {
-        FatalIOErrorIn("readMeshFormat(IFstream&)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "Did not find $ENDNOD tag on line "
             << inFile.lineNumber() << exit(FatalIOError);
     }
@@ -323,7 +323,7 @@ void readPoints(IFstream& inFile, pointField& points, Map<label>& mshToFoam)
 
     if (tag != "$ENDNOD" && tag != "$EndNodes")
     {
-        FatalIOErrorIn("readPoints(..)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "Did not find $ENDNOD tag on line "
             << inFile.lineNumber() << exit(FatalIOError);
     }
@@ -396,7 +396,7 @@ void readPhysNames(IFstream& inFile, Map<word>& physicalNames)
 
     if (tag != "$EndPhysicalNames")
     {
-        FatalIOErrorIn("readPhysicalNames(..)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "Did not find $EndPhysicalNames tag on line "
             << inFile.lineNumber() << exit(FatalIOError);
     }
@@ -699,7 +699,7 @@ void readCells
 
     if (tag != "$ENDELM" && tag != "$EndElements")
     {
-        FatalIOErrorIn("readCells(..)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "Did not find $ENDELM tag on line "
             << inFile.lineNumber() << exit(FatalIOError);
     }
@@ -723,7 +723,7 @@ void readCells
 
     if (cells.size() == 0)
     {
-        FatalIOErrorIn("readCells(..)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "No cells read from file " << inFile.name() << nl
             << "Does your file specify any 3D elements (hex=" << MSHHEX
             << ", prism=" << MSHPRISM << ", pyramid=" << MSHPYR
@@ -969,7 +969,7 @@ int main(int argc, char *argv[])
                 }
                 else
                 {
-                    WarningIn(args.executable())
+                    WarningInFunction
                         << "Could not match gmsh face " << f
                         << " to any of the interior or exterior faces"
                         << " that share the same 0th point" << endl;
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index a0b6465a95..874f787119 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -222,10 +222,8 @@ void readPoints
         {
             hasWarned = true;
 
-            IOWarningIn
+            IOWarningInFunction
             (
-                "readPoints(IFstream&, label&, DynamicList<point>"
-                ", DynamicList<label>&)",
                 is
             )   << "Points not in order starting at point " << pointI
                 //<< " at line " << is.lineNumber()
@@ -464,7 +462,7 @@ void readCells
         {
             if (skippedElements.insert(feID))
             {
-                IOWarningIn("readCells(IFstream&, label&)", is)
+                IOWarningInFunction(is)
                     << "Cell type " << feID << " not supported" << endl;
             }
             is.getLine(line);  // Do nothing
@@ -552,7 +550,7 @@ void readSets
         }
         else
         {
-            IOWarningIn("readSets(..)", is)
+            IOWarningInFunction(is)
                 << "When reading patches expect entity type code 8"
                 << nl << "    Skipping group code " << groupType
                 << endl;
@@ -672,7 +670,7 @@ int main(int argc, char *argv[])
 
     if (!inFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot open file " << ideasName
             << exit(FatalError);
     }
@@ -805,7 +803,7 @@ int main(int argc, char *argv[])
 
         if (findIndex(foamVerts, -1) != -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Cell " << cellI
                 << " unv vertices " << cellVerts[cellI]
                 << " has some undefined vertices " << foamVerts
@@ -824,7 +822,7 @@ int main(int argc, char *argv[])
 
         if (findIndex(foamVerts, -1) != -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Boundary face " << bFaceI
                 << " unv vertices " << boundaryFaces[bFaceI]
                 << " has some undefined vertices " << foamVerts
@@ -1045,7 +1043,7 @@ int main(int argc, char *argv[])
                 {
                     if (cnt != patchFaces.size())
                     {
-                        WarningIn(args.executable())
+                        WarningInFunction
                             << "For patch " << patchI << " there were "
                             << patchFaces.size()-cnt
                             << " faces not used because they seem"
@@ -1055,7 +1053,7 @@ int main(int argc, char *argv[])
                     }
                     else
                     {
-                        WarningIn(args.executable())
+                        WarningInFunction
                             << "Patch "
                             << patchI << " has faces that are already "
                             << " in use on other boundary-patches,"
@@ -1073,7 +1071,7 @@ int main(int argc, char *argv[])
                     {
                         if (cellCorrespondence[faceIndices[0]] < 0)
                         {
-                            FatalErrorIn(args.executable())
+                            FatalErrorInFunction
                                 << "The face index " << faceIndices[i]
                                 << " was not found amongst the cells."
                                 << " This kills the theory that "
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H b/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
index dd4a6f2d0b..6e9eaae381 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
@@ -88,7 +88,7 @@
     }
     else
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "bc not defined for active cell = " << i
             << exit(FatalError);
     }
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 36067bd18e..99d522f741 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            FatalErrorIn("main(int argc, char *argv[])")
+            FatalErrorInFunction
                 << "KIVA file version " << versionName << " not supported"
                 << exit(FatalError);
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 1505b74e45..a8ffe7b6b6 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -2,7 +2,7 @@ ifstream kivaFile(kivaFileName.c_str());
 
 if (!kivaFile.good())
 {
-    FatalErrorIn(args.executable())
+    FatalErrorInFunction
         << "Cannot open file " << kivaFileName
         << exit(FatalError);
 }
@@ -76,7 +76,7 @@ kivaFile >> mTable;
 
 if (mTable == 0)
 {
-    FatalErrorIn(args.executable())
+    FatalErrorInFunction
         << "mTable == 0. This is not supported."
            " kivaToFoam needs complete neighbour information"
         << exit(FatalError);
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 1259c1bbc5..065e36119b 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 
         if (domain != 1)
         {
-            WarningIn(args.executable())
+            WarningInFunction
                 << "Cannot handle multiple domains"
                 << nl << "Ignoring domain " << domain << " setting on line "
                 << str.lineNumber() << endl;
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 
         if (patchI < 0)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Invalid boundary region number " << patchI
                 << " on line " << str.lineNumber()
                 << exit(FatalError);
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
     if (vertsToBoundary.size())
     {
         // Didn't find cells connected to boundary faces.
-        WarningIn(args.executable())
+        WarningInFunction
             << "There are boundary faces without attached cells."
             << "Boundary faces (as triFaces):" << vertsToBoundary.toc()
             << endl;
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
index 97a8a7c6ce..73060e1d2c 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ void hexBlock::setHandedness()
 
     if (blockHandedness_ == noPoints)
     {
-        WarningIn("hexBlock::hexBlock::setHandedness()")
+        WarningInFunction
             << "Cannot determine orientation of block."
             << " Continuing as if right handed." << endl;
         blockHandedness_ = right;
@@ -233,7 +233,7 @@ labelListList hexBlock::blockCells() const
     }
     else
     {
-        FatalErrorIn("hexBlock::cellShapes()")
+        FatalErrorInFunction
             << "Unable to determine block handedness as points "
             << "have not been read in yet"
             << abort(FatalError);
@@ -252,10 +252,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
 {
     if (range.size() != 6)
     {
-        FatalErrorIn
-        (
-            "patchFaces(const label direc, const labelList& range) const"
-        )   << "Invalid size of the range array: " << range.size()
+        FatalErrorInFunction
+            << "Invalid size of the range array: " << range.size()
             << ". Should be 6 (xMin, xMax, yMin, yMax, zMin, zMax"
             << abort(FatalError);
     }
@@ -448,10 +446,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
 
         default:
         {
-            FatalErrorIn
-            (
-                "patchFaces(const label direc, const labelList& range) const"
-            )   << "direction out of range (1 to 6): " << direc
+            FatalErrorInFunction
+                << "direction out of range (1 to 6): " << direc
                 << abort(FatalError);
         }
     }
@@ -460,10 +456,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
     // Do nothing for the right-handed block
     if (blockHandedness_ == noPoints)
     {
-        FatalErrorIn
-        (
-            "patchFaces(const label direc, const labelList& range) const"
-        )   << "Unable to determine block handedness as points "
+        FatalErrorInFunction
+            << "Unable to determine block handedness as points "
             << "have not been read in yet"
             << abort(FatalError);
     }
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
index 3a91b036bb..f7a1f82ee7 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ public:
         {
             if (blockHandedness_ == noPoints)
             {
-                FatalErrorIn("hexBlock::points() const")
+                FatalErrorInFunction
                     << "points not read in yet"
                     << abort(FatalError);
             }
diff --git a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
index 801b0a8639..d646428ade 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
@@ -36,7 +36,7 @@ void Foam::sammMesh::calcPointCells() const
 
     if (pointCellsPtr_)
     {
-        FatalErrorIn("sammMesh::calcPointCells()")
+        FatalErrorInFunction
             << "PointCells already calculated"
             << abort(FatalError);
     }
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
index a6ec4baf16..b9ec74dabe 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
@@ -112,7 +112,7 @@ void Foam::sammMesh::createBoundaryFaces()
             }
             if (!found)
             {
-                FatalErrorIn("sammMesh::createBoundaryFaces()")
+                FatalErrorInFunction
                     << "Face " << faceI
                     << " does not have neighbour cell." << endl
                     << "    face : " << endl << curFace
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
index 1442909f3d..25c4447177 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
@@ -83,10 +83,8 @@ void Foam::sammMesh::createPolyBoundary()
                              != -1
                             )
                             {
-                                FatalErrorIn
-                                (
-                                    "void sammMesh::createPolyBoundary()"
-                                )   << "This looks like an already detected "
+                                FatalErrorInFunction
+                                    << "This looks like an already detected "
                                     << "internal face"
                                     << abort(FatalError);
                             }
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
index ed1ecc2317..0e2d71bd5c 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
@@ -173,7 +173,7 @@ void Foam::sammMesh::createPolyCells()
             }
             else
             {
-              FatalErrorIn("void starMesh::createPolyCells()")
+              FatalErrorInFunction
                   << "Error in internal face insertion"
                   << abort(FatalError);
             }
diff --git a/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
index 307c74e577..edaf23a1cd 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
@@ -128,7 +128,7 @@ void Foam::sammMesh::fixCollapsedEdges()
 
                 if (nNewVertices < 3)
                 {
-                    FatalErrorIn("void sammMesh::fixCollapsedEdges()")
+                    FatalErrorInFunction
                         << "face " << faceI << " of cell " << cellI
                         << " is colapsed down to a point or edge, which is "
                         << "not permitted" << endl
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
index e81bbae233..86aa2d6c1e 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
@@ -116,7 +116,7 @@ void Foam::sammMesh::readBoundary()
         }
         else
         {
-            FatalErrorIn("void sammMesh::readBoundary()")
+            FatalErrorInFunction
                 << "Cannot read file "
                 << boundaryFileName
                 << abort(FatalError);
@@ -222,7 +222,7 @@ void Foam::sammMesh::readBoundary()
     }
     else
     {
-        FatalErrorIn("sammMesh::readBoundary()")
+        FatalErrorInFunction
             << "No boundary faces in file "
             << boundaryFileName
             << endl;
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCells.C b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
index ea65b78b20..c46270c312 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
@@ -146,11 +146,8 @@ void Foam::sammMesh::addSAMMcell
     // grab the shape from the table
     if (!sammShapeLookup[typeFlag] || !sammAddressingTable[typeFlag])
     {
-        FatalErrorIn
-        (
-            "sammMesh::addRegularCell(const labelList& labels, "
-            "const label nCreatedCells)"
-        )   << "SAMM type " << typeFlag << " has no registered label. BUG!"
+        FatalErrorInFunction
+            << "SAMM type " << typeFlag << " has no registered label. BUG!"
             << abort(FatalError);
     }
 
@@ -206,7 +203,7 @@ void Foam::sammMesh::readCells()
         }
         else
         {
-            FatalErrorIn("sammMesh::readCells()")
+            FatalErrorInFunction
                 << "Cannot read file "
                 << cellsFileName
                 << abort(FatalError);
@@ -243,7 +240,7 @@ void Foam::sammMesh::readCells()
             {
                 if (nLabels > 24)
                 {
-                    FatalErrorIn("sammMesh::readCells()")
+                    FatalErrorInFunction
                         << "Unknown SAMM cell. "
                         << "More than 24 vertices"
                         << abort(FatalError);
@@ -251,7 +248,7 @@ void Foam::sammMesh::readCells()
 
                 if ((cellsFile >> lineLabel).eof())
                 {
-                    FatalErrorIn("sammMesh::readCells()")
+                    FatalErrorInFunction
                         << "Reached end of cells file before "
                         << "all cells are read in."
                         << abort(FatalError);
@@ -311,7 +308,7 @@ void Foam::sammMesh::readCells()
     }
     else
     {
-        FatalErrorIn("sammMesh::readCells()")
+        FatalErrorInFunction
             << "No cells in file "
             << cellsFileName
             << abort(FatalError);
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
index 668a452425..044196c392 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
@@ -36,7 +36,7 @@ void Foam::starMesh::calcPointCells() const
 
     if (pointCellsPtr_)
     {
-        FatalErrorIn("starMesh::calcPointCells() const")
+        FatalErrorInFunction
             << "pointCells already calculated"
             << abort(FatalError);
     }
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
index 61dd9f7a0f..976274c6a9 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
@@ -148,7 +148,7 @@ void Foam::starMesh::markBoundaryFaces()
             }
             if (!found)
             {
-                FatalErrorIn("starMesh::markBoundaryFaces()")
+                FatalErrorInFunction
                     << "Face " << faceI
                     << " does not have neighbour cell."
                     << " Face : " << endl << curFace << endl
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 6ded0c8426..9f35fcb89b 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -1097,7 +1097,7 @@ void Foam::starMesh::createCoupleMatches()
 
                     if (edgesToConsider.empty())
                     {
-                        FatalErrorIn("void starMesh::createCoupleMatches()")
+                        FatalErrorInFunction
                             << setprecision(12)
                             << "void starMesh::createCoupleMatches() : "
                             << endl << "error in face intersection: "
@@ -1219,7 +1219,7 @@ void Foam::starMesh::createCoupleMatches()
                         // Check if there is room for more points
                         if (nIntFacePoints >= intersectedFace.size())
                         {
-                            FatalErrorIn("void starMesh::createCoupleMatches()")
+                            FatalErrorInFunction
                                 << setprecision(12)
                                 << "void starMesh::createCoupleMatches() : "
                                 << endl << "error in intersected face: "
@@ -1270,7 +1270,7 @@ void Foam::starMesh::createCoupleMatches()
                     {
                         if (intersectedFace[checkI] == intersectedFace[checkJ])
                         {
-                            FatalErrorIn("void starMesh::createCoupleMatches()")
+                            FatalErrorInFunction
                                 << setprecision(12)
                                 << "void starMesh::createCoupleMatches() : "
                                 << endl << "error in intersected face: "
@@ -1294,7 +1294,7 @@ void Foam::starMesh::createCoupleMatches()
             }
             else
             {
-                FatalErrorIn("void starMesh::createCoupleMatches()")
+                FatalErrorInFunction
                     << setprecision(12)
                     << "void starMesh::createCoupleMatches() : " << endl
                     << "could not find start edge for intersection of couple "
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
index c74fcccd91..084cf6eebd 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
@@ -173,7 +173,7 @@ void Foam::starMesh::createPolyCells()
             }
             else
             {
-              FatalErrorIn("void starMesh::createPolyCells()")
+              FatalErrorInFunction
                   << "Error in internal face insertion"
                   << abort(FatalError);
             }
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
index 422866f44c..931d1a638d 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
@@ -127,7 +127,7 @@ void Foam::starMesh::fixCollapsedEdges()
 
                 if (nNewVertices < 3)
                 {
-                    FatalErrorIn("starMesh::fixCollapsedEdges()")
+                    FatalErrorInFunction
                         << "Face " << faceI << " of cell " << cellI
                         << " is colapsed down to a point or edge, which is "
                         << "not permitted" << endl
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
index 2e7a3cfa9c..f71573c112 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
@@ -266,7 +266,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
             {
                 if (renumberPoints[oldFacePoints[pointI]] < 0)
                 {
-                    FatalErrorIn("starMesh::mergeCoupleFacePoints()")
+                    FatalErrorInFunction
                         << "Error in point renumbering. Old face: "
                         << oldFacePoints << endl
                         << "prelim face: " << prelimFacePoints
@@ -306,7 +306,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
         {
             if (renumberPoints[curLabels[pointI]] == 0)
             {
-                FatalErrorIn("starMesh::mergeCoupleFacePoints()")
+                FatalErrorInFunction
                     << "Error in point merging for cell "
                     << cellI << ". STAR index: " << starCellID_[cellI]
                     << ". " << endl
@@ -360,7 +360,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
             {
                 if (renumberPoints[oldFacePoints[pointI]] < 0)
                 {
-                    FatalErrorIn("starMesh::mergeCoupleFacePoints()")
+                    FatalErrorInFunction
                         << "Error in point renumbering for point "
                         << oldFacePoints[pointI]
                         << ". Renumbering index is -1." << endl
@@ -385,7 +385,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
         {
             if (renumberPoints[curLabels[pointI]] < 0)
             {
-                FatalErrorIn("starMesh::mergeCoupleFacePoints()")
+                FatalErrorInFunction
                     << "Error in point renumbering for cell "
                     << cellI << ". STAR index: " << starCellID_[cellI]
                     << ". " << endl
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
index 63aa38e028..10b80fbcd7 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
@@ -114,7 +114,7 @@ void Foam::starMesh::readBoundary()
         }
         else
         {
-            FatalErrorIn("starMesh::readBoundary()")
+            FatalErrorInFunction
                 << "Cannot read file "
                 << boundaryFileName
                 << abort(FatalError);
@@ -220,7 +220,7 @@ void Foam::starMesh::readBoundary()
     }
     else
     {
-        WarningIn("void starMesh::readBoundary()")
+        WarningInFunction
             << "no boundary faces in file "
             << boundaryFileName
             << endl;
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
index b485a6115d..265de9c72f 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
@@ -179,11 +179,8 @@ void Foam::starMesh::addSAMMcell
 
         default:
         {
-            FatalErrorIn
-            (
-                "starMesh::addSAMMcell"
-                "(const labelList& labels, const label nCreatedCells)"
-            )   << "SAMM type " << sammTypeFlag << " is invalid"
+            FatalErrorInFunction
+                << "SAMM type " << sammTypeFlag << " is invalid"
                 << abort(FatalError);
         }
     }
@@ -245,7 +242,7 @@ void Foam::starMesh::readCells()
         }
         else
         {
-            FatalErrorIn("starMesh::readCells()")
+            FatalErrorInFunction
                 << "Cannot read file " << cellsFileName
                 << abort(FatalError);
         }
@@ -294,7 +291,7 @@ void Foam::starMesh::readCells()
             {
                 if ((cellsFile >> lineLabel).eof())
                 {
-                    FatalErrorIn("starMesh::readCells()")
+                    FatalErrorInFunction
                         << "Reached end of cells file before "
                         << "all cells are read in."
                         << abort(FatalError);
@@ -370,7 +367,7 @@ void Foam::starMesh::readCells()
             {
                 if (curShapeLabels[i] < 0)
                 {
-                    FatalErrorIn("starMesh::readCells()")
+                    FatalErrorInFunction
                         << "Invalid vertex found in cell " << cellI
                         << ". STAR cell no: " << lineLabel
                         << " labels: " << curShapeLabels
@@ -381,7 +378,7 @@ void Foam::starMesh::readCells()
     }
     else
     {
-        FatalErrorIn("starMesh::readCells()")
+        FatalErrorInFunction
             << "No cells in file " << cellsFileName
             << abort(FatalError);
     }
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
index 19138a3011..3965e6e94b 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
@@ -107,7 +107,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
         }
         else
         {
-            FatalErrorIn("starMesh::readPoints()")
+            FatalErrorInFunction
                 << "Cannot read file " << pointsFileName
                 << abort(FatalError);
         }
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
index c13376dfd2..73782190c2 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
@@ -58,7 +58,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
         }
         else
         {
-            FatalErrorIn("starMesh::readPoints()")
+            FatalErrorInFunction
                 << "Cannot read file " << pointsFileName
                 << abort(FatalError);
         }
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index f56e499792..c3baad3458 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -88,7 +88,7 @@ label findFace(const primitiveMesh& mesh, const face& f)
         }
     }
 
-    FatalErrorIn("findFace(const primitiveMesh&, const face&)")
+    FatalErrorInFunction
         << "Cannot find face " << f << " in mesh." << abort(FatalError);
 
     return -1;
@@ -135,14 +135,14 @@ int main(int argc, char *argv[])
 
     if (!isFile(nodeFile) || !isFile(eleFile))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read " << nodeFile << " or " << eleFile
             << exit(FatalError);
     }
 
     if (readFaceFile && !isFile(faceFile))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read " << faceFile << endl
             << "Did you run tetgen with -f option?" << endl
             << "If you don't want to read the .face file and thus not have"
@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
         }
         if (pointI != nNodes)
         {
-            FatalIOErrorIn(args.executable().c_str(), nodeStream)
+            FatalIOErrorInFunction(nodeStream)
                 << "Only " << pointI << " nodes present instead of " << nNodes
                 << " from header." << exit(FatalIOError);
         }
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
 
     if (nPtsPerTet != 4)
     {
-        FatalIOErrorIn(args.executable().c_str(), eleStream)
+        FatalIOErrorInFunction(eleStream)
             << "Cannot handle tets with "
             << nPtsPerTet << " points per tetrahedron in .ele file" << endl
             << "Can only handle tetrahedra with four points"
@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
 
     if (nElemAttr != 0)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Element attributes (third elemenent in .ele header)"
             << " not used" << endl;
     }
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
 
         if (nFaceAttr != 1)
         {
-            FatalIOErrorIn(args.executable().c_str(), faceStream)
+            FatalIOErrorInFunction(faceStream)
                 << "Expect boundary markers to be"
                 << " present in .face file." << endl
                 << "This is the second number in the header which is now:"
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index d1cbc0f494..6e050b39dd 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -146,8 +146,7 @@ int main(int argc, char *argv[])
 
     if (!meshDictIO.headerOk())
     {
-        FatalErrorIn(args.executable())
-            << "Cannot open mesh description file\n    "
+        FatalErrorInFunction
             << meshDictIO.objectPath()
             << nl
             << exit(FatalError);
@@ -334,7 +333,7 @@ int main(int argc, char *argv[])
     mesh.removeFiles();
     if (!mesh.write())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing polyMesh."
             << exit(FatalError);
     }
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index a7ec45eef4..c4773342d4 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -138,7 +138,7 @@ label findPatchID(const polyBoundaryMesh& patches, const word& name)
 
     if (patchID == -1)
     {
-        FatalErrorIn("findPatchID(const polyBoundaryMesh&, const word&)")
+        FatalErrorInFunction
             << "Cannot find patch " << name
             << " in the source mesh.\n"
             << "Valid patch names are " << patches.names()
@@ -343,7 +343,7 @@ int main(int argc, char *argv[])
     {
         if (flipNormals && mode == MESH)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Flipping normals not supported for extrusions from mesh."
                 << exit(FatalError);
         }
@@ -493,21 +493,30 @@ int main(int argc, char *argv[])
         //    new patchID to neighbour processor)
         //  - number of new patches (nPatches)
 
-        labelList sidePatchID;
+        labelList edgePatchID;
+        labelList edgeZoneID;
+        boolList edgeFlip;
+        labelList inflateFaceID;
         label nPatches;
         Map<label> nbrProcToPatch;
         Map<label> patchToNbrProc;
-        addPatchCellLayer::calcSidePatch
+        addPatchCellLayer::calcExtrudeInfo
         (
+            true,   // for internal edges get zone info from any face
+
             mesh,
             globalFaces,
             edgeGlobalFaces,
             extrudePatch,
 
-            sidePatchID,
+            edgePatchID,
             nPatches,
             nbrProcToPatch,
-            patchToNbrProc
+            patchToNbrProc,
+
+            edgeZoneID,
+            edgeFlip,
+            inflateFaceID
         );
 
 
@@ -659,7 +668,12 @@ int main(int argc, char *argv[])
 
             ratio,              // expansion ratio
             extrudePatch,       // patch faces to extrude
-            sidePatchID,        // if boundary edge: patch to use
+
+            edgePatchID,        // if boundary edge: patch for extruded face
+            edgeZoneID,         // optional zone for extruded face
+            edgeFlip,
+            inflateFaceID,      // mesh face that zone/patch info is from
+
             exposedPatchID,     // if new mesh: patches for exposed faces
             nFaceLayers,
             nPointLayers,
@@ -947,7 +961,7 @@ int main(int argc, char *argv[])
     {
         if (mode == MESH)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Cannot stitch front and back of extrusion since"
                 << " in 'mesh' mode (extrusion appended to mesh)."
                 << exit(FatalError);
@@ -960,7 +974,7 @@ int main(int argc, char *argv[])
 
         if (frontPatchFaces.size() != backPatchFaces.size())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Differing number of faces on front ("
                 << frontPatchFaces.size() << ") and back ("
                 << backPatchFaces.size() << ")"
@@ -1047,7 +1061,7 @@ int main(int argc, char *argv[])
 
     if (!mesh.write())
     {
-        FatalErrorIn(args.executable()) << "Failed writing mesh"
+        FatalErrorInFunction
             << exit(FatalError);
     }
 
@@ -1060,7 +1074,7 @@ int main(int argc, char *argv[])
             << nl << endl;
         if (!addedCells.write())
         {
-            FatalErrorIn(args.executable()) << "Failed writing cellSet"
+            FatalErrorInFunction
                 << addedCells.name()
                 << exit(FatalError);
         }
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
index 0728864488..fb3e56e69d 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -63,6 +63,10 @@ extrudeModel        wedge;
 //- Extrudes into sphere with grading according to pressure (atmospherics)
 //extrudeModel        sigmaRadial;
 
+//- Extrudes by interpolating along path inbetween two (topologically identical)
+//  surfaces (e.g. one is an offsetted version of the other)
+//extrudeModel        offsetSurface;
+
 nLayers             10;
 
 expansionRatio      1.0;
@@ -105,6 +109,16 @@ sigmaRadialCoeffs
     pStrat          1;
 }
 
+offsetSurfaceCoeffs
+{
+    // Surface that mesh has been meshed to
+    baseSurface "$FOAM_CASE/constant/triSurface/DTC-scaled-inflated.obj";
+
+    // Surface to fill in to
+    offsetSurface "$FOAM_CASE/constant/triSurface/DTC-scaled.obj";
+}
+
+
 // Do front and back need to be merged? Usually only makes sense for 360
 // degree wedges.
 mergeFaces false;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index e9444d0eae..1174444fe0 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -175,11 +175,8 @@ label addPatch
         }
         else
         {
-            FatalErrorIn
-            (
-                "addPatch<PatchType>(const polyBoundaryMesh&,"
-                " const word&, DynamicList<polyPatch*>)"
-            )   << "Already have patch " << patchName
+            FatalErrorInFunction
+                << "Already have patch " << patchName
                 << " but of type " << newPatches[patchI]->type()
                 << exit(FatalError);
         }
@@ -233,11 +230,8 @@ label addPatch
         }
         else
         {
-            FatalErrorIn
-            (
-                "addPatch<PatchType>(const polyBoundaryMesh&,"
-                " const word&, DynamicList<polyPatch*>)"
-            )   << "Already have patch " << patchName
+            FatalErrorInFunction
+                << "Already have patch " << patchName
                 << " but of type " << newPatches[patchI]->type()
                 << exit(FatalError);
         }
@@ -436,7 +430,7 @@ void checkZoneInside
         label zoneI = zoneID[i];
         if (isInternal[zoneI] != mesh.isInternalFace(faceI))
         {
-            FatalErrorIn("checkZoneInside(..)")
+            FatalErrorInFunction
                 << "Zone " << zoneNames[zoneI]
                 << " is not consistently all internal or all boundary faces."
                 << " Face " << faceI << " at " << mesh.faceCentres()[faceI]
@@ -694,7 +688,7 @@ void countExtrudePatches
             {
                 const edge& e = extrudePatch.edges()[edgeI];
                 const pointField& pts = extrudePatch.localPoints();
-                WarningIn("countExtrudePatches(..)")
+                WarningInFunction
                     << "Edge " << edgeI
                     << "at " << pts[e[0]] << pts[e[1]]
                     << " is a coupled edge and inbetween two different zones "
@@ -954,20 +948,8 @@ void addCoupledPatches
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "void addCoupledPatches"
-                        "("
-                            "const fvMesh&, "
-                            "const primitiveFacePatch&, "
-                            "const labelList&, "
-                            "const labelList&, "
-                            "const mapDistribute&, "
-                            "const labelListList&, "
-                            "labelList&, "
-                            "DynamicList<polyPatch*>&"
-                        ")"
-                    )   << "Unable to determine coupled patch addressing"
+                    FatalErrorInFunction
+                        << "Unable to determine coupled patch addressing"
                         << abort(FatalError);
                 }
             }
@@ -1054,7 +1036,7 @@ void addZoneSidePatches
             }
             else
             {
-                FatalErrorIn("addZoneSidePatches()")
+                FatalErrorInFunction
                     << "Type " << oneDPolyPatchType << " does not exist "
                     << exit(FatalError);
             }
@@ -1475,7 +1457,7 @@ void extrudeGeometricProperties
 
     if (!ok)
     {
-        FatalErrorIn("extrudeGeometricProperties(..)")
+        FatalErrorInFunction
             << "Failed writing " << faceCentres.objectPath()
             << " and " << cellCentres.objectPath()
             << exit(FatalError);
@@ -1503,7 +1485,7 @@ int main(int argc, char *argv[])
         Pstream::gatherList(allNames);
         Pstream::scatterList(allNames);
 
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Patches are not synchronised on all processors."
             << " Per processor patches " << allNames
             << exit(FatalError);
@@ -1541,7 +1523,7 @@ int main(int argc, char *argv[])
         // Check
         if (dict.found("faceSets"))
         {
-            FatalIOErrorIn(args.executable().c_str(), dict)
+            FatalIOErrorInFunction(dict)
                 << "Please supply faces to extrude either through 'faceZones'"
                 << " or 'faceSets' entry. Found both."
                 << exit(FatalIOError);
@@ -1585,7 +1567,7 @@ int main(int argc, char *argv[])
 
     if (shellRegionName == regionName)
     {
-        FatalIOErrorIn(args.executable().c_str(), dict)
+        FatalIOErrorInFunction(dict)
             << "Cannot extrude into same region as mesh." << endl
             << "Mesh region : " << regionName << endl
             << "Shell region : " << shellRegionName
@@ -1711,7 +1693,7 @@ int main(int argc, char *argv[])
             meshZoneID[i] = faceZones.findZoneID(zoneNames[i]);
             if (meshZoneID[i] == -1)
             {
-                FatalIOErrorIn(args.executable().c_str(), dict)
+                FatalIOErrorInFunction(dict)
                     << "Cannot find zone " << zoneNames[i] << endl
                     << "Valid zones are " << faceZones.names()
                     << exit(FatalIOError);
@@ -1758,7 +1740,7 @@ int main(int argc, char *argv[])
                 zoneShadowIDs[i] = faceZones.findZoneID(zoneShadowNames[i]);
                 if (zoneShadowIDs[i] == -1)
                 {
-                    FatalIOErrorIn(args.executable().c_str(), dict)
+                    FatalIOErrorInFunction(dict)
                         << "Cannot find zone " << zoneShadowNames[i] << endl
                         << "Valid zones are " << faceZones.names()
                         << exit(FatalIOError);
@@ -1821,7 +1803,7 @@ int main(int argc, char *argv[])
                 label faceI = iter.key();
                 if (mesh.isInternalFace(faceI))
                 {
-                    FatalIOErrorIn(args.executable().c_str(), dict)
+                    FatalIOErrorInFunction(dict)
                         << "faceSet " << fz.name()
                         << "contains internal faces."
                         << " This is not permitted."
@@ -1861,7 +1843,7 @@ int main(int argc, char *argv[])
 
             if (nExtrudeFaces != nShadowFaces)
             {
-                FatalIOErrorIn(args.executable().c_str(), dict)
+                FatalIOErrorInFunction(dict)
                     << "Extruded faces " << nExtrudeFaces << endl
                     << "is different from shadow faces. " << nShadowFaces
                     << "This is not permitted " << endl
@@ -1881,7 +1863,7 @@ int main(int argc, char *argv[])
                     label faceI = iter.key();
                     if (mesh.isInternalFace(faceI))
                     {
-                        FatalIOErrorIn(args.executable().c_str(), dict)
+                        FatalIOErrorInFunction(dict)
                             << "faceSet " << fz.name()
                             << "contains internal faces."
                             << " This is not permitted."
@@ -2654,7 +2636,7 @@ int main(int argc, char *argv[])
 
     if (!ok)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing mesh " << regionMesh.name()
             << " at location " << regionMesh.facesInstance()
             << exit(FatalError);
@@ -2855,7 +2837,7 @@ int main(int argc, char *argv[])
 
         if (!mesh.write())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Failed writing mesh " << mesh.name()
                 << " at location " << mesh.facesInstance()
                 << exit(FatalError);
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
index 6587c84298..2b36d070bb 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
index 178df8fa4a..5f6de0801d 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ void Foam::extrude2DMesh::check2D() const
     {
         if (faces[faceI].size() != 2)
         {
-            FatalErrorIn("void Foam::extrude2DMesh::check2D() const")
+            FatalErrorInFunction
                 << "Face " << faceI << " size " << faces[faceI].size()
                 << " is not of size 2: mesh is not a valid two-dimensional "
                 << "mesh" << exit(FatalError);
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
index 114b370641..9f57be2929 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ void Foam::patchToPoly2DMesh::createNeighbours()
         }
         else
         {
-            FatalErrorIn("polyMesh neighbour construction")
+            FatalErrorInFunction
                 << abort(FatalError);
         }
     }
@@ -307,7 +307,7 @@ void Foam::patchToPoly2DMesh::createMesh()
     {
         if (patch_.edgeFaces()[edgeI].size() != 2)
         {
-            FatalErrorIn("patchToPoly2DMesh::patchToPoly2DMesh(..)")
+            FatalErrorInFunction
                 << "internal edge:" << edgeI
                 << " patch.edgeFaces()[edgeI]:" << patch_.edgeFaces()[edgeI]
                 << abort(FatalError);
@@ -323,7 +323,7 @@ void Foam::patchToPoly2DMesh::createMesh()
     {
         if (patch_.edgeFaces()[edgeI].size() != 1)
         {
-            FatalErrorIn("patchToPoly2DMesh::patchToPoly2DMesh(..)")
+            FatalErrorInFunction
                 << "boundary edge:" << edgeI
                 << " patch.edgeFaces()[edgeI]:" << patch_.edgeFaces()[edgeI]
                 << abort(FatalError);
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict
index 5e53c29c88..5b0e22862b 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
index 3d015f2e94..44c830b452 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
@@ -66,10 +66,8 @@ inline Foam::label Foam::DelaunayMesh<Triangulation>::getNewCellIndex() const
 
     if (id == labelMax)
     {
-        WarningIn
-        (
-            "Foam::DelaunayMesh<Triangulation>::getNewCellIndex() const"
-        )   << "Cell counter has overflowed." << endl;
+        WarningInFunction
+            << "Cell counter has overflowed." << endl;
     }
 
     return id;
@@ -83,10 +81,8 @@ inline Foam::label Foam::DelaunayMesh<Triangulation>::getNewVertexIndex() const
 
     if (id == labelMax)
     {
-        WarningIn
-        (
-            "Foam::DelaunayMesh<Triangulation>::getNewVertexIndex() const"
-        )   << "Vertex counter has overflowed." << endl;
+        WarningInFunction
+            << "Vertex counter has overflowed." << endl;
     }
 
     return id;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 644f48bde2..a2865609ac 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -306,7 +306,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
 
     if (nTotalVertices != label(Triangulation::number_of_vertices()))
     {
-        WarningIn("Foam::conformalVoronoiMesh::printVertexInfo()")
+        WarningInFunction
             << nTotalVertices << " does not equal "
             << Triangulation::number_of_vertices()
             << endl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 7a7cd277ee..7a672354ec 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -792,13 +792,7 @@ bool Foam::DistributedDelaunayMesh<Triangulation>::distribute
     const boundBox& bb
 )
 {
-    notImplemented
-    (
-        "Foam::DistributedDelaunayMesh<Triangulation>::distribute"
-        "("
-        "    const boundBox& bb"
-        ")"
-    );
+    NotImplemented;
 
     if (!Pstream::parRun())
     {
@@ -960,11 +954,8 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
         }
         else if (lt == Triangulation::OUTSIDE_AFFINE_HULL)
         {
-            WarningIn
-            (
-                "Foam::DistributedDelaunayMesh<Triangulation>"
-                "::rangeInsertReferredWithInfo"
-            )   << "Point is outside affine hull! pt = " << pointToInsert
+            WarningInFunction
+                << "Point is outside affine hull! pt = " << pointToInsert
                 << endl;
         }
         else if (lt == Triangulation::OUTSIDE_CONVEX_HULL)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
index 44c1d87758..bad58b9d58 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
@@ -16,6 +16,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -29,6 +30,7 @@ EXE_INC = \
 LIB_LIBS = \
     ${CGAL_LIBS} \
     -lmeshTools \
+    -ldecompose \
     -ledgeMesh \
     -lfileFormats \
     -ltriSurface \
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
index 79df1e7c69..3e64caa717 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
@@ -222,11 +222,8 @@ void Foam::PrintTable<KeyType, DataType>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::PrintTable<KeyType, DataType>::operator="
-            "(const Foam::PrintTable<KeyType, DataType>&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 25e0f9a73e..3396cc73a2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -30,6 +30,7 @@ License
 #include "Time.H"
 #include "Random.H"
 #include "pointConversion.H"
+#include "decompositionModel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -149,7 +150,8 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
 
     const conformationSurfaces& geometry = geometryToConformTo_;
 
-    decompositionMethod& decomposer = decomposerPtr_();
+    decompositionMethod& decomposer =
+        decompositionModel::New(mesh_).decomposer();
 
     volScalarField::InternalField& icellWeights = cellWeights.internalField();
 
@@ -782,7 +784,8 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
     const Time& runTime,
     Random& rndGen,
     const conformationSurfaces& geometryToConformTo,
-    const dictionary& coeffsDict
+    const dictionary& coeffsDict,
+    const fileName& decompDictFile
 )
 :
     runTime_(runTime),
@@ -810,18 +813,6 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
     bFTreePtr_(),
     allBackgroundMeshBounds_(Pstream::nProcs()),
     globalBackgroundBounds_(),
-    decomposeDict_
-    (
-        IOobject
-        (
-            "decomposeParDict",
-            runTime_.system(),
-            runTime_,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    ),
-    decomposerPtr_(decompositionMethod::New(decomposeDict_)),
     mergeDist_(1e-6*mesh_.bounds().mag()),
     spanScale_(readScalar(coeffsDict.lookup("spanScale"))),
     minCellSizeLimit_
@@ -834,26 +825,19 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
 {
     if (!Pstream::parRun())
     {
-        FatalErrorIn
-        (
-            "Foam::backgroundMeshDecomposition::backgroundMeshDecomposition"
-            "("
-                "const dictionary& coeffsDict, "
-                "const conformalVoronoiMesh& foamyHexMesh"
-            ")"
-        )
+        FatalErrorInFunction
             << "This cannot be used when not running in parallel."
             << exit(FatalError);
     }
 
-    if (!decomposerPtr_().parallelAware())
+    const decompositionMethod& decomposer =
+        decompositionModel::New(mesh_, decompDictFile).decomposer();
+
+    if (!decomposer.parallelAware())
     {
-        FatalErrorIn
-        (
-            "void Foam::backgroundMeshDecomposition::initialRefinement() const"
-        )
+        FatalErrorInFunction
             << "You have selected decomposition method "
-            << decomposerPtr_().typeName
+            << decomposer.typeName
             << " which is not parallel aware." << endl
             << exit(FatalError);
     }
@@ -1008,7 +992,10 @@ Foam::backgroundMeshDecomposition::distribute
             << endl;
     }
 
-    labelList newDecomp = decomposerPtr_().decompose
+    decompositionMethod& decomposer =
+        decompositionModel::New(mesh_).decomposer();
+
+    labelList newDecomp = decomposer.decompose
     (
         mesh_,
         mesh_.cellCentres(),
@@ -1217,14 +1204,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
 
         if (ptNearestProc[pI] < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::labelList"
-                "Foam::backgroundMeshDecomposition::processorNearestPosition"
-                "("
-                    "const List<point>& pts"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "The position " << pts[pI]
                 << " did not find a nearest point on the background mesh."
                 << exit(FatalError);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 90dde14aa4..0fe330f3fd 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -30,16 +30,16 @@ Description
 
     The requirements are:
 
-    + To have a decomposition of space which can quickly interrogate an
+    - To have a decomposition of space which can quickly interrogate an
       arbitrary location from any processor to reliably and unambiguously
       determine which processor owns the space that the point is in, i.e. as
       the vertices move, or need inserted as part of the surface conformation,
       send them to the correct proc.
 
-    + To be able to be dynamically built, refined and redistributed to other
+    - To be able to be dynamically built, refined and redistributed to other
       procs the partitioning as the meshing progresses to balance the load.
 
-    + To be able to query whether a sphere (the circumsphere of a Delaunay tet)
+    - To be able to query whether a sphere (the circumsphere of a Delaunay tet)
       overlaps any part of the space defined by the structure, and whether a
       ray (Voronoi edge) penetrates any part of the space defined by the
       structure, this is what determines if points get referred to a processor.
@@ -127,13 +127,7 @@ class backgroundMeshDecomposition
         //  a point that is not found on any processor is in the domain at all
         treeBoundBox globalBackgroundBounds_;
 
-        //- Decomposition dictionary
-        IOdictionary decomposeDict_;
-
-        //- Decomposition method
-        autoPtr<decompositionMethod> decomposerPtr_;
-
-        //- Merge distance required by fvMeshDistribute
+        //- merge distance required by fvMeshDistribute
         scalar mergeDist_;
 
         //- Scale of a cell span vs cell size used to decide to refine a cell
@@ -204,7 +198,8 @@ public:
             const Time& runTime,
             Random& rndGen,
             const conformationSurfaces& geometryToConformTo,
-            const dictionary& coeffsDict
+            const dictionary& coeffsDict,
+            const fileName& decompDictFile = ""
         );
 
 
@@ -324,8 +319,6 @@ public:
             //- Return the point level of the underlying mesh
             inline const labelList& pointLevel() const;
 
-            //- Return the current decomposition method
-            inline const decompositionMethod& decomposer() const;
 };
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
index 199f4ae4ff..b8dcb5187f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
@@ -57,11 +57,4 @@ const Foam::labelList& Foam::backgroundMeshDecomposition::pointLevel() const
 }
 
 
-const Foam::decompositionMethod&
-Foam::backgroundMeshDecomposition::decomposer() const
-{
-    return decomposerPtr_();
-}
-
-
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
index 4201caa5d8..b633210762 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
@@ -134,14 +134,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
 
             if (!globalBackgroundBounds_.contains(pt))
             {
-                FatalErrorIn
-                (
-                    "Foam::labelList"
-                    "Foam::backgroundMeshDecomposition::processorPosition"
-                    "("
-                        "const List<point>&"
-                    ") const"
-                )
+                FatalErrorInFunction
                     << "The position " << pt
                     << " is not in any part of the background mesh "
                     << globalBackgroundBounds_ << endl
@@ -152,14 +145,8 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
 
             if (debug)
             {
-                WarningIn
-                (
-                    "Foam::labelList"
-                    "Foam::backgroundMeshDecomposition::processorPosition"
-                    "("
-                        "const List<point>&"
-                    ") const"
-                )   << "The position " << pt
+                WarningInFunction
+                    << "The position " << pt
                     << " was not found in the background mesh "
                     << globalBackgroundBounds_ << ", finding nearest."
                     << endl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index 15c67d6857..ca65462488 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -350,10 +350,8 @@ void Foam::cellShapeControl::cellSizeAndAlignment
 
             alignment = v;
 
-//            FatalErrorIn
-//            (
-//                "Foam::conformalVoronoiMesh::setVertexSizeAndAlignment()"
-//            )   << "Point has bad alignment! "
+//            FatalErrorInFunction
+//                << "Point has bad alignment! "
 //                << pt << " " << size << " " << alignment << nl
 //                << "Bary Coords = " << bary <<  nl
 //                << ch->vertex(0)->info() << nl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index e7f7f5816c..ba65ebd638 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -65,10 +65,8 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
 //
 //    if (!surfHit.hit())
 //    {
-//        FatalErrorIn
-//        (
-//            "Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment"
-//        )   << "findSurfaceNearest did not find a hit across the surfaces."
+//        FatalErrorInFunction
+//            << "findSurfaceNearest did not find a hit across the surfaces."
 //            << exit(FatalError) << endl;
 //    }
 //
@@ -174,13 +172,8 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
 //
 //    if (closestSpokeSurface == -1)
 //    {
-////        WarningIn
-////        (
-////            "conformalVoronoiMesh::requiredAlignment"
-////            "("
-////                "const Foam::point& pt"
-////            ") const"
-////        )   << "No secondary surface hit found in spoke search "
+////        WarningInFunction
+////            << "No secondary surface hit found in spoke search "
 ////            << "using " << s
 ////            << " spokes, try increasing alignmentSearchSpokes."
 ////            << endl;
@@ -203,7 +196,7 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
 //
 //    if (mag(ns) < SMALL)
 //    {
-//        FatalErrorIn("conformalVoronoiMesh::requiredAlignment")
+//        FatalErrorInFunction
 //            << "Parallel normals detected in spoke search." << nl
 //            << "point: " << pt << nl
 //            << "closest surface point: " << surfHit.hitPoint() << nl
@@ -355,10 +348,8 @@ void Foam::cellShapeControlMesh::writeTriangulation()
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::triangulatedMesh::writeRefinementTriangulation()"
-        )   << "Triangulation is not valid"
+        FatalErrorInFunction
+            << "Triangulation is not valid"
             << abort(FatalError);
     }
 }
@@ -392,61 +383,56 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
 
         if (mesh.nPoints() == this->vertexCount())
         {
-            pointScalarField sizes
+            IOobject io
             (
-                IOobject
-                (
-                    "sizes",
-                    runTime.timeName(),
-                    meshSubDir,
-                    runTime,
-                    IOobject::READ_IF_PRESENT,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                pointMesh::New(mesh)
+                "sizes",
+                runTime.timeName(),
+                meshSubDir,
+                runTime,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                false
             );
 
-            triadIOField alignments
-            (
-                IOobject
-                (
-                    "alignments",
-                    mesh.time().timeName(),
-                    meshSubDir,
-                    mesh.time(),
-                    IOobject::READ_IF_PRESENT,
-                    IOobject::AUTO_WRITE,
-                    false
-                )
-            );
-
-            if
-            (
-                sizes.size() == this->vertexCount()
-             && alignments.size() == this->vertexCount()
-            )
+            if (io.headerOk())
             {
-                for
+                pointScalarField sizes(io, pointMesh::New(mesh));
+
+                triadIOField alignments
                 (
-                    Finite_vertices_iterator vit = finite_vertices_begin();
-                    vit != finite_vertices_end();
-                    ++vit
-                )
+                    IOobject
+                    (
+                        "alignments",
+                        mesh.time().timeName(),
+                        meshSubDir,
+                        mesh.time(),
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    )
+                );
+
+                if (alignments.size() == this->vertexCount())
                 {
-                    vit->targetCellSize() = sizes[vit->index()];
-                    vit->alignment() = alignments[vit->index()];
+                    for
+                    (
+                        Finite_vertices_iterator vit = finite_vertices_begin();
+                        vit != finite_vertices_end();
+                        ++vit
+                    )
+                    {
+                        vit->targetCellSize() = sizes[vit->index()];
+                        vit->alignment() = alignments[vit->index()];
+                    }
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Cell alignments point field " << alignments.size()
+                        << " is not the same size as the number of vertices"
+                        << " in the mesh " << this->vertexCount()
+                        << abort(FatalError);
                 }
-            }
-            else
-            {
-                FatalErrorIn
-                (
-                    "Foam::cellShapeControlMesh::cellShapeControlMesh"
-                    "(const Time&)"
-                )   << "Cell size point field is not the same size as the "
-                    << "mesh."
-                    << abort(FatalError);
             }
         }
     }
@@ -672,7 +658,7 @@ void Foam::cellShapeControlMesh::write() const
             IOobject::AUTO_WRITE
         ),
         pointMesh::New(mesh),
-        scalar(0)
+        dimensionedScalar("zero", dimLength, scalar(0))
     );
 
     triadIOField alignments
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
index 24eafe7cac..4551fe2c6f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
@@ -92,10 +92,8 @@ Foam::cellSizeAndAlignmentControl::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "cellSizeAndAlignmentControl::New()"
-        )   << "Unknown cellSizeAndAlignmentControl type "
+        FatalErrorInFunction
+            << "Unknown cellSizeAndAlignmentControl type "
             << cellSizeAndAlignmentControlTypeName
             << endl << endl
             << "Valid cellSizeAndAlignmentControl types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
index 981b18817a..921298660d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
@@ -235,15 +235,8 @@ void Foam::fileControl::initialVertices
 
     if ((pts.size() != sizes.size()) || (pts.size() != alignments.size()))
     {
-        FatalErrorIn
-        (
-            "Foam::fileControl::initialVertices"
-            "("
-            "   pointField&,"
-            "   scalarField&,"
-            "   Field<triad>&"
-            ")"
-        )   << "Size of list of points, sizes and alignments do not match:"
+        FatalErrorInFunction
+            << "Size of list of points, sizes and alignments do not match:"
             << nl
             << "Points size     = " << pts.size() << nl
             << "Sizes size      = " << sizes.size() << nl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
index 319a3808dd..851a773b06 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
@@ -69,10 +69,7 @@ addToRunTimeSelectionTable
 ////
 ////    if (!surfHit.hit())
 ////    {
-////        FatalErrorIn
-////        (
-////            "Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment"
-////        )
+////        FatalErrorInFunction
 ////            << "findSurfaceNearest did not find a hit across the surfaces."
 ////            << exit(FatalError) << endl;
 ////    }
@@ -125,7 +122,7 @@ addToRunTimeSelectionTable
 //
 //    if (mag(ns) < SMALL)
 //    {
-//        WarningIn("conformalVoronoiMesh::requiredAlignment")
+//        WarningInFunction
 //            << "Parallel normals detected in spoke search." << nl
 //            << "point: " << pt << nl
 //            << "np   : " << np << nl
@@ -466,11 +463,8 @@ void Foam::searchableSurfaceControl::initialVertices
         if (!cellSize(pts[pI], sizes[pI], priority))
         {
             sizes[pI] = defaultCellSize_;
-//            FatalErrorIn
-//            (
-//                "Foam::searchableSurfaceControl::initialVertices"
-//                "(pointField&, scalarField&, tensorField&)"
-//            )   << "Could not calculate cell size"
+//            FatalErrorInFunction
+//                << "Could not calculate cell size"
 //                << abort(FatalError);
         }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 9f7f5d5e7a..c0db55e558 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -82,7 +82,7 @@ Foam::cellSizeFunction::cellSizeFunction
         }
         else
         {
-            FatalErrorIn("searchableSurfaceControl::searchableSurfaceControl")
+            FatalErrorInFunction
                 << "Unknown mode, expected: inside, outside or bothSides" << nl
                 << exit(FatalError);
         }
@@ -91,7 +91,7 @@ Foam::cellSizeFunction::cellSizeFunction
     {
         if (mode != "bothSides")
         {
-            WarningIn("searchableSurfaceControl::searchableSurfaceControl")
+            WarningInFunction
                 << "surface does not support volumeType, defaulting mode to "
                 << "bothSides."
                 << endl;
@@ -135,11 +135,8 @@ Foam::autoPtr<Foam::cellSizeFunction> Foam::cellSizeFunction::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "cellSizeFunction::New(dictionary&, "
-            "const conformalVoronoiMesh&, const searchableSurface&)"
-        )   << "Unknown cellSizeFunction type "
+        FatalErrorInFunction
+            << "Unknown cellSizeFunction type "
             << cellSizeFunctionTypeName
             << endl << endl
             << "Valid cellSizeFunction types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
index c7cf2201f2..a6d802523b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
@@ -197,7 +197,7 @@ public:
             const pointField& pts
         )
         {
-            WarningIn("cellSizeFunction::setCellSize(const pointField&)")
+            WarningInFunction
                 << "Not overloaded."
                 << endl;
             return false;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
index 36b02aa7a9..2502c3a6cb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
@@ -84,15 +84,7 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
          && coeffsDict().found("linearDistanceCoeff")
         )
         {
-            FatalErrorIn
-            (
-                "surfaceOffsetLinearDistance::surfaceOffsetLinearDistance"
-                "("
-                "    const dictionary& initialPointsDict,"
-                "    const searchableSurface& surface,"
-                "    const scalar& defaultCellSize"
-                ")"
-            )
+            FatalErrorInFunction
                 << "totalDistanceCoeff and linearDistanceCoeff found, "
                 << "specify one or other, not both."
                 << nl << exit(FatalError) << endl;
@@ -114,15 +106,7 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
     }
     else
     {
-        FatalErrorIn
-        (
-            "surfaceOffsetLinearDistance::surfaceOffsetLinearDistance"
-            "("
-            "    const dictionary& initialPointsDict,"
-            "    const searchableSurface& surface,"
-            "    const scalar& defaultCellSize"
-            ")"
-        )
+        FatalErrorInFunction
             << "totalDistanceCoeff or linearDistanceCoeff not found."
             << nl << exit(FatalError) << endl;
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
index 0abe372910..2e925b9b32 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
@@ -73,11 +73,8 @@ Foam::autoPtr<Foam::cellSizeCalculationType> Foam::cellSizeCalculationType::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "cellSizeCalculationType::New(dictionary&, "
-            "const conformalVoronoiMesh&, const searchableSurface&)"
-        )   << "Unknown cellSizeCalculationType type "
+        FatalErrorInFunction
+            << "Unknown cellSizeCalculationType type "
             << cellSizeCalculationTypeTypeName
             << endl << endl
             << "Valid cellSizeCalculationType types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
index c74a552e22..cac1837021 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
@@ -77,11 +77,8 @@ Foam::autoPtr<Foam::surfaceCellSizeFunction> Foam::surfaceCellSizeFunction::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "surfaceCellSizeFunction::New(dictionary&, "
-            "const conformalVoronoiMesh&, const searchableSurface&)"
-        )   << "Unknown surfaceCellSizeFunction type "
+        FatalErrorInFunction
+            << "Unknown surfaceCellSizeFunction type "
             << surfaceCellSizeFunctionTypeName
             << endl << endl
             << "Valid surfaceCellSizeFunction types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 9cc9862129..939ab07bab 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -284,11 +284,8 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
         }
         else
         {
-            WarningIn
-            (
-                "Foam::conformalVoronoiMesh::insertSurfacePointPairs"
-                "(const pointIndexHitAndFeatureList&, const fileName)"
-            )   << meshableSide << ", bad"
+            WarningInFunction
+                << meshableSide << ", bad"
                 << endl;
         }
     }
@@ -652,7 +649,7 @@ Foam::face Foam::conformalVoronoiMesh::buildDualFace
 //            DelaunayMeshTools::drawDelaunayCell(Pout, cc1);
 //            DelaunayMeshTools::drawDelaunayCell(Pout, cc2);
 
-            WarningIn("Foam::conformalVoronoiMesh::buildDualFace")
+            WarningInFunction
                 << "Dual face uses circumcenter defined by a "
                 << "Delaunay tetrahedron with no internal "
                 << "or boundary points.  Defining Delaunay edge ends: "
@@ -723,7 +720,7 @@ Foam::label Foam::conformalVoronoiMesh::maxFilterCount
             Vertex_handle vA = c->vertex(eit->second);
             Vertex_handle vB = c->vertex(eit->third);
 
-            FatalErrorIn("Foam::conformalVoronoiMesh::buildDualFace")
+            FatalErrorInFunction
                 << "Dual face uses circumcenter defined by a "
                 << "Delaunay tetrahedron with no internal "
                 << "or boundary points.  Defining Delaunay edge ends: "
@@ -780,16 +777,7 @@ bool Foam::conformalVoronoiMesh::ownerAndNeighbour
 
     if (dualCellIndexA == -1 && dualCellIndexB == -1)
     {
-        FatalErrorIn
-        (
-            "bool Foam::conformalVoronoiMesh::ownerAndNeighbour"
-            "("
-                "Vertex_handle vA,"
-                "Vertex_handle vB,"
-                "label& owner,"
-                "label& neighbour"
-            ") const"
-        )
+        FatalErrorInFunction
             << "Attempting to create a face joining "
             << "two unindexed dual cells "
             << exit(FatalError);
@@ -837,7 +825,8 @@ bool Foam::conformalVoronoiMesh::ownerAndNeighbour
 Foam::conformalVoronoiMesh::conformalVoronoiMesh
 (
     const Time& runTime,
-    const dictionary& foamyHexMeshDict
+    const dictionary& foamyHexMeshDict,
+    const fileName& decompDictFile
 )
 :
     DistributedDelaunayMesh<Delaunay>(runTime),
@@ -876,7 +865,8 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
             foamyHexMeshControls().foamyHexMeshDict().subDict
             (
                 "backgroundMeshDecomposition"
-            )
+            ),
+            decompDictFile
         )
       : NULL
     ),
@@ -1614,7 +1604,7 @@ void Foam::conformalVoronoiMesh::move()
         {
             if (!vit->referred() && !usedIndices.insert(vit->index()))
             {
-                FatalErrorIn("Foam::conformalVoronoiMesh::move()")
+                FatalErrorInFunction
                     << "Index already used! Could not insert: " << nl
                     << vit->info()
                     << abort(FatalError);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index f6d44489b7..59fbba90a9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -163,10 +163,8 @@ private:
         //- Limiting bound box before infinity begins
         treeBoundBox limitBounds_;
 
-        //-
         mutable pointPairs<Delaunay> ptPairs_;
 
-        //-
         featurePointConformer ftPtConformer_;
 
         //- Search tree for edge point locations
@@ -546,7 +544,7 @@ private:
         ) const;
 
         //- Check if a location is in the exclusion range of an existing feature
-        //- Edge conformation location
+        //  edge conformation location
         bool nearFeatureEdgeLocation
         (
             const pointIndexHit& pHit,
@@ -730,8 +728,7 @@ private:
 
         label classifyBoundaryPoint(Cell_handle cit) const;
 
-        //- Index all of the the Delaunay cells and calculate their
-        //- Dual points
+        //- Index all of the the Delaunay cells and calculate their dual points
         void indexDualVertices
         (
             pointField& pts,
@@ -874,7 +871,8 @@ public:
         conformalVoronoiMesh
         (
             const Time& runTime,
-            const dictionary& foamyHexMeshDict
+            const dictionary& foamyHexMeshDict,
+            const fileName& decompDictFile = ""
         );
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index e88ee94369..920a380fb9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -234,8 +234,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
             {
                 patchIndex = patchNames.size() - 1;
 
-                WarningIn("Foam::conformalVoronoiMesh::calcTetMesh")
-                    << "Tet face centre at  " << nl
+                WarningInFunction
                     << newFace.centre(points) << nl
                     << "did not find a surface patch. Adding to "
                     << patchNames[patchIndex]
@@ -1292,9 +1291,9 @@ void Foam::conformalVoronoiMesh::indexDualVertices
         }
     }
 
-    OBJstream snapping1("snapToSurface1.obj");
-    OBJstream snapping2("snapToSurface2.obj");
-    OFstream tetToSnapTo("tetsToSnapTo.obj");
+    //OBJstream snapping1("snapToSurface1.obj");
+    //OBJstream snapping2("snapToSurface2.obj");
+    //OFstream tetToSnapTo("tetsToSnapTo.obj");
 
     for
     (
@@ -2479,15 +2478,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
              || slaves.size() != sortingIndices.size()
             )
             {
-                FatalErrorIn
-                (
-                    "void Foam::conformalVoronoiMesh::sortProcPatches"
-                    "("
-                        "List<DynamicList<face> >& patchFaces, "
-                        "List<DynamicList<label> >& patchOwners, "
-                        "const List<DynamicList<label> >& patchSortingIndices"
-                    ") const"
-                )
+                FatalErrorInFunction
                     << "patch size and size of sorting indices is inconsistent "
                     << " for patch " << patchI << nl
                     << " faces.size() " << faces.size() << nl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index bbe6337c59..fdc4ef4354 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -649,7 +649,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
 
         if (iterationNo == maxIterations)
         {
-            WarningIn("conformalVoronoiMesh::conformToSurface()")
+            WarningInFunction
                 << "Maximum surface conformation iterations ("
                 << maxIterations <<  ") reached." << endl;
         }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index f9a690c6d3..d886d195c0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -149,11 +149,8 @@ bool Foam::conformalVoronoiMesh::regionIsInside
     }
     else
     {
-        WarningIn
-        (
-            "Foam::conformalVoronoiMesh::regionIsInside"
-            "(volTypeA, normalA, volTypeB, normalB, masterPtVec)"
-        )   << ""
+        WarningInFunction
+            << ""
             << endl;
 
         return false;
@@ -252,16 +249,8 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating
                 }
                 else
                 {
-                    WarningIn
-                    (
-                        "Foam::conformalVoronoiMesh::"
-                        "createEdgePointGroupByCirculating"
-                        "("
-                        "    const extendedFeatureEdgeMesh&,"
-                        "    const pointIndexHit&,"
-                        "    DynamicList<Vb>&"
-                        ")"
-                    )   << "Failed to insert flat/open edge as volType is "
+                    WarningInFunction
+                        << "Failed to insert flat/open edge as volType is "
                         << extendedFeatureEdgeMesh::sideVolumeTypeNames_
                            [
                                volType
@@ -314,16 +303,8 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating
             }
             else
             {
-                WarningIn
-                (
-                    "Foam::conformalVoronoiMesh::"
-                    "createEdgePointGroupByCirculating"
-                    "("
-                    "    const extendedFeatureEdgeMesh&,"
-                    "    const pointIndexHit&,"
-                    "    DynamicList<Vb>&"
-                    ")"
-                )   << "Faces are parallel but master point is not inside"
+                WarningInFunction
+                    << "Faces are parallel but master point is not inside"
                     << endl;
             }
         }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index e3ef651d0f..190e493322 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -122,7 +122,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::averageAnyCellSize
 
     if (sizeSum < 0)
     {
-        WarningIn("averageAnyCellSize(const Delaunay::Finite_facets_iterator&)")
+        WarningInFunction
             << "sizeSum = " << sizeSum
             << endl;
 
@@ -558,11 +558,7 @@ Foam::conformalVoronoiMesh::decomposition() const
 {
     if (!Pstream::parRun())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::backgroundMeshDecomposition& "
-            "Foam::conformalVoronoiMesh::decomposition() const"
-        )
+        FatalErrorInFunction
             << "The backgroundMeshDecomposition cannot be asked for in serial."
             << exit(FatalError) << endl;
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 1c50486f97..714cb2bfe2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -219,7 +219,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //
 //            if (vertexToDualAddressing[vertI] != 0)
 //            {
-//                FatalErrorIn("conformalVoronoiMesh::writeMesh(..)")
+//                FatalErrorInFunction
 //                    << "Delaunay vertex " << vertI
 //                    << " from cell " << cellI
 //                    << " is already mapped to "
@@ -239,7 +239,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //
 //                if (vertexToDualAddressing[vertI] > 0)
 //                {
-//                    FatalErrorIn("conformalVoronoiMesh::writeMesh(..)")
+//                    FatalErrorInFunction
 //                        << "Delaunay vertex " << vertI
 //                        << " from patch " << patchI
 //                        << " local index " << i
@@ -310,14 +310,8 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //        label pointI = findIndex(pointDualAddressing, -1);
 //        if (pointI != -1)
 //        {
-//            WarningIn
-//            (
-//                "conformalVoronoiMesh::writeMesh\n"
-//                "(\n"
-//                "    const fileName& instance,\n"
-//                "    bool filterFaces\n"
-//                ")\n"
-//            )   << "Delaunay vertex " << pointI
+//            WarningInFunction
+//                << "Delaunay vertex " << pointI
 //                << " does not have a corresponding dual cell." << endl;
 //        }
 //
@@ -1060,7 +1054,7 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     if (!mesh.write())
     {
-        FatalErrorIn("Foam::conformalVoronoiMesh::writeMesh(..)")
+        FatalErrorInFunction
             << "Failed writing polyMesh."
             << exit(FatalError);
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
index 2bb549e305..9bb7e33f95 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
@@ -43,7 +43,7 @@ void Foam::conformalVoronoiMesh::calcNeighbourCellCentres
 
     if (neiCc.size() != nBoundaryFaces)
     {
-        FatalErrorIn("conformalVoronoiMesh::calcNeighbourCellCentres(..)")
+        FatalErrorInFunction
             << "nBoundaries:" << nBoundaryFaces
             << " neiCc:" << neiCc.size()
             << abort(FatalError);
@@ -171,12 +171,8 @@ void Foam::conformalVoronoiMesh::findCellZoneInsideWalk
 
         if (keepRegionI == -1)
         {
-            FatalErrorIn
-            (
-                "conformalVoronoiMesh::findCellZoneInsideWalk"
-                "(const polyMesh&, const labelList&"
-                ", const labelList&, labelList&)"
-            )   << "Point " << insidePoint
+            FatalErrorInFunction
+                << "Point " << insidePoint
                 << " is not inside the mesh." << nl
                 << "Bounding box of the mesh:" << mesh.bounds()
                 << exit(FatalError);
@@ -193,12 +189,8 @@ void Foam::conformalVoronoiMesh::findCellZoneInsideWalk
                 }
                 else if (cellToSurface[cellI] != surfI)
                 {
-                    WarningIn
-                    (
-                        "conformalVoronoiMesh::findCellZoneInsideWalk"
-                        "(const labelList&, const labelList&"
-                        ", const labelList&, const labelList&)"
-                    )   << "Cell " << cellI
+                    WarningInFunction
+                        << "Cell " << cellI
                         << " at " << mesh.cellCentres()[cellI]
                         << " is inside surface " << surfName
                         << " but already marked as being in zone "
@@ -251,7 +243,7 @@ Foam::labelList Foam::conformalVoronoiMesh::calcCellZones
          && selectionMethod != surfaceZonesInfo::INSIDEPOINT
         )
         {
-            FatalErrorIn("conformalVoronoiMesh::calcCellZones(..)")
+            FatalErrorInFunction
                 << "Trying to use surface "
                 << surface.name()
                 << " which has non-geometric inside selection method "
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index f119ccc056..56c5929343 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -100,15 +100,13 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
             }
             else if (eS == extendedFeatureEdgeMesh::FLAT)
             {
-                WarningIn("Foam::conformalVoronoiMesh::"
-                    "createSpecialisedFeaturePoint")
+                WarningInFunction
                     << "Edge " << eS << " is flat"
                     << endl;
             }
             else
             {
-                FatalErrorIn("Foam::conformalVoronoiMesh::"
-                    "createSpecialisedFeaturePoint")
+                FatalErrorInFunction
                     << "Edge " << eS << " not concave/convex"
                     << exit(FatalError);
             }
@@ -258,11 +256,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
 
             if ((convexEdgeA && convexEdgeB) || (!convexEdgeA && !convexEdgeB))
             {
-                WarningIn
-                    (
-                     "Foam::conformalVoronoiMesh"
-                     "::createSpecialisedFeaturePoint"
-                    )
+                WarningInFunction
                     << "Both or neither of the convex edges share the concave "
                     << "edge's normal."
                     << " convexEdgeA = " << convexEdgeA
@@ -538,15 +532,13 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
             }
             else if (eS == extendedFeatureEdgeMesh::FLAT)
             {
-                WarningIn("Foam::conformalVoronoiMesh::"
-                    "createSpecialisedFeaturePoint")
+                WarningInFunction
                     << "Edge " << eS << " is flat"
                     << endl;
             }
             else
             {
-                FatalErrorIn("Foam::conformalVoronoiMesh::"
-                    "createSpecialisedFeaturePoint")
+                FatalErrorInFunction
                     << "Edge " << eS << " not concave/convex"
                     << exit(FatalError);
             }
@@ -700,11 +692,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
              || (!concaveEdgeA && !concaveEdgeB)
             )
             {
-                WarningIn
-                (
-                 "Foam::conformalVoronoiMesh"
-                 "::createSpecialisedFeaturePoint"
-                )   << "Both or neither of the concave edges share the convex "
+                WarningInFunction
+                    << "Both or neither of the concave edges share the convex "
                     << "edge's normal."
                     << " concaveEdgeA = " << concaveEdgeA
                     << " concaveEdgeB = " << concaveEdgeB
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index a2eeb21c99..7a19a25ba2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -88,15 +88,13 @@ class indexedCell
     // Private data
 
         //- The index for this Delaunay tetrahedral cell.  Type information is
-        //- Also carried:
-
+        //  also carried:
         //  ctFar : the dual point of this cell does not form part of the
         //          internal or boundary of the dual mesh
         //  >=0   : the (local) index of an internal or boundary dual point,
         //           not on a processor face
         //  < 0 && > ctFar : the (global) index of a dual point on a processor
         //                   face
-
         Foam::label index_;
 
         //- The number of times that this Delaunay cell has been limited
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 8723f43848..464dd646ba 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -187,11 +187,8 @@ void Foam::conformationSurfaces::readFeatures
         }
         else
         {
-            WarningIn
-            (
-                "Foam::conformationSurfaces::readFeatures"
-                "(const label, const dictionary&, const word&, label&)"
-            )   << surface.name() << " of type "
+            WarningInFunction
+                << surface.name() << " of type "
                 << surface.type() << " does not have features"
                 << endl;
         }
@@ -202,7 +199,7 @@ void Foam::conformationSurfaces::readFeatures
     }
     else
     {
-        FatalErrorIn("Foam::conformationSurfaces::readFeatures")
+        FatalErrorInFunction
             << "No valid featureMethod found for surface " << surfaceName
             << nl << "Use \"extendedFeatureEdgeMesh\" "
             << "or \"extractFeatures\"."
@@ -252,7 +249,7 @@ void Foam::conformationSurfaces::readFeatures
     }
     else
     {
-        FatalErrorIn("Foam::conformationSurfaces::readFeatures")
+        FatalErrorInFunction
             << "No valid featureMethod found for surface " << surfaceName
             << nl << "Use \"extendedFeatureEdgeMesh\" "
             << "or \"extractFeatures\"."
@@ -383,7 +380,7 @@ Foam::conformationSurfaces::conformationSurfaces
             {
                 if (!surface.hasVolumeType())
                 {
-                    WarningIn("conformationSurfaces::conformationSurfaces(..)")
+                    WarningInFunction
                         << "Non-baffle surface "
                         << surface.name()
                         << " does not allow inside/outside queries."
@@ -463,9 +460,8 @@ Foam::conformationSurfaces::conformationSurfaces
 
     if (unmatchedKeys.size() > 0)
     {
-        IOWarningIn
+        IOWarningInFunction
         (
-            "conformationSurfaces::conformationSurfaces(..)",
             surfacesDict
         )   << "Not all entries in conformationSurfaces dictionary were used."
             << " The following entries were not used : "
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
index 049d99abb2..6388c0c6c8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
@@ -70,11 +70,8 @@ autoPtr<faceAreaWeightModel> faceAreaWeightModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "faceAreaWeightModel::New(const dictionary&, "
-            "const conformalVoronoiMesh&)"
-        )   << "Unknown faceAreaWeightModel type "
+        FatalErrorInFunction
+            << "Unknown faceAreaWeightModel type "
             << faceAreaWeightModelTypeName
             << endl << endl
             << "Valid faceAreaWeightModel types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index db905881a5..5ce01e23b5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -896,14 +896,8 @@ autoDensity::autoDensity
     {
         maxSizeRatio_ = 2.0;
 
-        WarningIn
-        (
-            "autoDensity::autoDensity"
-            "("
-                "const dictionary& initialPointsDict,"
-                "const conformalVoronoiMesh& foamyHexMesh"
-            ")"
-        )   << "The maxSizeRatio must be greater than one to be sensible, "
+        WarningInFunction
+            << "The maxSizeRatio must be greater than one to be sensible, "
             << "setting to " << maxSizeRatio_
             << endl;
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
index 631ab3ebc8..1100784155 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
@@ -96,11 +96,8 @@ autoPtr<initialPointsMethod> initialPointsMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "initialPointsMethod::New(dictionary&, "
-            "const conformalVoronoiMesh&)"
-        )   << "Unknown initialPointsMethod type "
+        FatalErrorInFunction
+            << "Unknown initialPointsMethod type "
             << initialPointsMethodTypeName
             << endl << endl
             << "Valid initialPointsMethod types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index 0e510a4a68..bea71b9b5c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -91,7 +91,7 @@ List<Vb::Point> pointFile::initialPoints() const
 
     if (points.empty())
     {
-        FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
+        FatalErrorInFunction
             << "Point file contain no points"
             << exit(FatalError) << endl;
     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
index bbed38b476..103a09c23a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
@@ -104,15 +104,8 @@ void rayShooting::splitLine
             }
             else
             {
-                WarningIn
-                (
-                    "rayShooting::splitLine"
-                    "("
-                    "   const line<point,point>&,"
-                    "   const scalar&,"
-                    "   DynamicList<Vb::Point>&"
-                    ")"
-                )   << "Point perturbation crosses a surface. Not inserting."
+                WarningInFunction
+                    << "Point perturbation crosses a surface. Not inserting."
                     << endl;
             }
         }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
index 78b1820866..e47cbf4aaa 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
@@ -73,11 +73,8 @@ autoPtr<relaxationModel> relaxationModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "relaxationModel::New(const dictionary&, "
-            "const conformalVoronoiMesh&)"
-        )   << "Unknown relaxationModel type "
+        FatalErrorInFunction
+            << "Unknown relaxationModel type "
             << relaxationModelTypeName
             << endl << endl
             << "Valid relaxationModel types are :" << endl
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
index cd9eb68312..16dc56814d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
@@ -50,11 +50,8 @@ Foam::searchableSurfaceFeatures::New
 
     if (cstrIter == dictConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "searchableSurfaceFeatures::New(const word&,"
-            " const searchableSurface&, const dictionary&)"
-        )   << "Unknown searchableSurfaceFeatures type "
+        FatalErrorInFunction
+            << "Unknown searchableSurfaceFeatures type "
             << searchableSurfaceFeaturesType << endl << endl
             << "Valid searchableSurfaceFeatures types : " << endl
             << dictConstructorTablePtr_->sortedToc()
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
index d4559a6c7f..e114d71021 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
@@ -100,7 +100,7 @@ public:
         //- Clone
         virtual autoPtr<searchableSurfaceFeatures> clone() const
         {
-            notImplemented("autoPtr<searchableSurfaceFeatures> clone() const");
+            NotImplemented;
             return autoPtr<searchableSurfaceFeatures>(NULL);
         }
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
index b3f2e7dd7c..7aa621f26e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
@@ -30,7 +30,8 @@ EXE_LIBS = \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ldecompositionMethods \
-    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
+    -ldecompose \
+    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \
     -ledgeMesh \
     -lfileFormats \
     -ltriSurface \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index 6e68f1c80e..c83800e031 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
@@ -62,6 +62,17 @@ int main(int argc, char *argv[])
     const bool checkGeometry = args.optionFound("checkGeometry");
     const bool conformationOnly = args.optionFound("conformationOnly");
 
+    // Allow override of decomposeParDict location
+    fileName decompDictFile;
+    if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
+    {
+        if (isDir(decompDictFile))
+        {
+            decompDictFile = decompDictFile / "decomposeParDict";
+        }
+    }
+
+
     IOdictionary foamyHexMeshDict
     (
         IOobject
@@ -114,7 +125,7 @@ int main(int argc, char *argv[])
 
     Info<< "Create mesh for time = " << runTime.timeName() << nl << endl;
 
-    conformalVoronoiMesh mesh(runTime, foamyHexMeshDict);
+    conformalVoronoiMesh mesh(runTime, foamyHexMeshDict, decompDictFile);
 
 
     if (conformationOnly)
@@ -145,7 +156,7 @@ int main(int argc, char *argv[])
     }
 
 
-    Info<< nl << "End" << nl << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMeshDict b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMeshDict
index deca4e0edb..48c0286672 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMeshDict
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -271,11 +271,18 @@ motionControl
             forceInitialPointInsertion  on;
             priority                    1;
             mode                        inside;
+
+            // Cell size at surface
             surfaceCellSizeFunction     uniformValue;
             uniformValueCoeffs
             {
                 surfaceCellSizeCoeff    0.5;
             }
+
+            // Cell size inside domain by having a region of thickness
+            // surfaceOffsetaround the surface with the surface cell size
+            // (so constant) and then down to distanceCellSize over a distance
+            // of linearDistance.
             cellSizeFunction            surfaceOffsetLinearDistance;
             surfaceOffsetLinearDistanceCoeffs
             {
@@ -375,9 +382,17 @@ polyMeshFiltering
     // Filter small and sliver faces
     filterFaces                             off;
 
-    // Write the underlying Delaunay tet mesh at output time
+    // Write the underlying Delaunay tet mesh (at output time)
     writeTetDualMesh                        false;
 
+    // Write the Delaunay tet mesh used for interpolating cell size and
+    // alignment (at output time)
+    writeCellShapeControlMesh           true;
+
+    // Write the hex/split-hex mesh used for parallel load balancing
+    // (at output time)
+    writeBackgroundMeshDecomposition    true;
+
     // Upper limit on the size of faces to be filtered.
     // fraction of the local target cell size
     filterSizeCoeff                         0.2;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
index 07f6800de6..00d889c6c6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
@@ -9,6 +9,7 @@ EXE_INC = \
     ${CGAL_INC} \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -26,6 +27,7 @@ EXE_LIBS = \
     -lgmp \
     -lconformalVoronoiMesh \
     -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
+    -ldecompose \
     -ledgeMesh \
     -ltriSurface \
     -lmeshTools \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index fc99f0fd05..bb8213fd46 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -44,6 +44,7 @@ Description
 #include "isoSurfaceCell.H"
 #include "vtkSurfaceWriter.H"
 #include "syncTools.H"
+#include "decompositionModel.H"
 
 using namespace Foam;
 
@@ -72,7 +73,7 @@ scalar getMergeDistance
 
     if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
     {
-        FatalErrorIn("getMergeDistance")
+        FatalErrorInFunction
             << "Your current settings specify ASCII writing with "
             << IOstream::defaultPrecision() << " digits precision." << endl
             << "Your merging tolerance (" << mergeTol << ") is finer than this."
@@ -367,7 +368,7 @@ tmp<scalarField> signedDistance
             }
             else
             {
-                FatalErrorIn("signedDistance()")
+                FatalErrorInFunction
                     << "getVolumeType failure, neither INSIDE or OUTSIDE"
                     << exit(FatalError);
             }
@@ -467,7 +468,7 @@ int main(int argc, char *argv[])
 
         // Determine the number of cells in each direction.
         const vector span = bb.span();
-        vector nScalarCells = span/cellShapeControls().defaultCellSize();
+        vector nScalarCells = span/cellShapeControls.defaultCellSize();
 
         // Calculate initial cell size to be a little bit smaller than the
         // defaultCellSize to avoid initial refinement triggering.
@@ -521,28 +522,21 @@ int main(int argc, char *argv[])
         Info<< "Loaded mesh:" << endl;
         printMeshData(mesh);
 
-        // Allocate a decomposer
-        IOdictionary decompositionDict
-        (
-            IOobject
-            (
-                "decomposeParDict",
-                runTime.system(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        );
+        // Allow override of decomposeParDict location
+        fileName decompDictFile;
+        if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
+        {
+            if (isDir(decompDictFile))
+            {
+                decompDictFile = decompDictFile / "decomposeParDict";
+            }
+        }
 
-        autoPtr<decompositionMethod> decomposer
+        labelList decomp = decompositionModel::New
         (
-            decompositionMethod::New
-            (
-                decompositionDict
-            )
-        );
-
-        labelList decomp = decomposer().decompose(mesh, mesh.cellCentres());
+            mesh,
+            decompDictFile
+        ).decomposer().decompose(mesh, mesh.cellCentres());
 
         // Global matching tolerance
         const scalar tolDim = getMergeDistance
@@ -574,18 +568,15 @@ int main(int argc, char *argv[])
     Info<< "Refining backgroud mesh according to cell size specification" << nl
         << endl;
 
+    const dictionary& backgroundMeshDict =
+        foamyHexMeshDict.subDict("backgroundMeshDecomposition");
+
     backgroundMeshDecomposition backgroundMesh
     (
-        1.0,    //spanScale,ratio of poly cell size v.s. hex cell size
-        0.0,    //minCellSizeLimit
-        0,      //minLevels
-        4,      //volRes, check multiple points per cell
-        20.0,   //maxCellWeightCoeff
         runTime,
-        geometryToConformTo,
-        cellShapeControls(),
         rndGen,
-        foamyHexMeshDict
+        geometryToConformTo,
+        backgroundMeshDict
     );
 
     if (writeMesh)
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index fdb73d17e7..f8cdecfd6f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -229,7 +229,7 @@ void Foam::CV2D::insertPoints(const fileName& pointFileName)
     }
     else
     {
-        FatalErrorIn("insertInitialPoints")
+        FatalErrorInFunction
             << "Could not open pointsFile " << pointFileName
             << exit(FatalError);
     }
@@ -913,7 +913,7 @@ void Foam::CV2D::newPoints()
 //             }
 //             else
 //             {
-//                 FatalErrorIn("CV2D::newPoints() const")
+//                 FatalErrorInFunction
 //                     << "Infinite triangle found in internal mesh"
 //                     << exit(FatalError);
 //             }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
index b5c3563cea..9e04cdcbbf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
@@ -61,7 +61,7 @@ inline Foam::label Foam::CV2D::insertPoint
 
     if (nVert == number_of_vertices())
     {
-        WarningIn("Foam::CV2D::insertPoint")
+        WarningInFunction
             << "Failed to insert point " << toPoint2D(p) << endl;
     }
     else
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
index 0048a07b32..3896131c1f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
@@ -151,11 +151,8 @@ void Foam::CV2D::writeFaces(const fileName& fName, bool internalOnly) const
                 {
                     if (fc->faceIndex() < 0)
                     {
-                        FatalErrorIn
-                        (
-                            "Foam::CV2D::writeFaces"
-                            "(const fileName& fName, bool internalOnly)"
-                        )<< "Dual face uses vertex defined by a triangle"
+                        FatalErrorInFunction
+                         << "Dual face uses vertex defined by a triangle"
                             " defined by an external point"
                             << exit(FatalError);
                     }
@@ -222,7 +219,7 @@ void Foam::CV2D::extractPatches
             {
                 patchIndex = defaultPatchIndex;
 
-                WarningIn("Foam::CV2D::extractPatches")
+                WarningInFunction
                     << "Dual face found that is not on a surface "
                     << "patch. Adding to CV2D_default_patch."
                     << endl;
@@ -315,11 +312,8 @@ void Foam::CV2D::calcDual
                 {
                     if (fc->faceIndex() < 0)
                     {
-                        FatalErrorIn
-                        (
-                            "Foam::CV2D::calcDual"
-                            "(point2DField& dualPoints, faceList& dualFaces)"
-                        )<< "Dual face uses vertex defined by a triangle"
+                        FatalErrorInFunction
+                         << "Dual face uses vertex defined by a triangle"
                             " defined by an external point"
                             << exit(FatalError);
                     }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
index 066bc8205c..997726bba6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
     Info<< "Finished extruding in = "
         << runTime.cpuTimeIncrement() << " s." << endl;
 
-    Info<< nl << "End\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict
index 3d61b2fabd..051afea62a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
index 740bff886b..6ac1bc9bab 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
@@ -61,7 +61,7 @@ void Foam::CV2D::insertFeaturePoints()
 
     if (feMeshes.empty())
     {
-        WarningIn("CV2D::insertFeaturePoints")
+        WarningInFunction
             << "Extended Feature Edge Mesh is empty so no feature points will "
             << "be found." << nl
             << "    Use: featureMethod extendedFeatureEdgeMesh;" << nl
@@ -341,7 +341,7 @@ void Foam::CV2D::insertFeaturePoints()
                 }
                 else
                 {
-                    WarningIn("void Foam::CV2D::insertFeaturePoints()")
+                    WarningInFunction
                         << "Feature Edge " << edges[edgeI] << nl
                         << "    points(" << points[edges[edgeI].start()]
                         << ", " << points[edges[edgeI].end()] << ")" << nl
@@ -352,7 +352,7 @@ void Foam::CV2D::insertFeaturePoints()
             }
             else
             {
-                WarningIn("void Foam::CV2D::insertFeaturePoints()")
+                WarningInFunction
                       << "Point " << featPoint << " is not on the line "
                       << line << endl;
             }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index bac5c87ca1..9220ca7bed 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -109,7 +109,7 @@ void Foam::shortEdgeFilter2D::updateEdgeRegionMap
         {
             region = startPtRegions[0];
 
-            WarningIn("shortEdgeFilter2D()")
+            WarningInFunction
                 << "Both points in edge are in different regions."
                 << " Assigning edge to region " << region
                 << endl;
@@ -495,7 +495,7 @@ Foam::shortEdgeFilter2D::filter()
                         }
                         else
                         {
-                            WarningIn("shortEdgeFilter")
+                            WarningInFunction
                                 << "Point " << pChain
                                 << " marked for deletion as well as point "
                                 << pointI << nl
@@ -525,7 +525,7 @@ Foam::shortEdgeFilter2D::filter()
         }
         else
         {
-            FatalErrorIn("shortEdgeFilter")
+            FatalErrorInFunction
                 << "Only " << newFace.size() << " in face " << faceI
                 << exit(FatalError);
         }
@@ -553,7 +553,7 @@ Foam::shortEdgeFilter2D::filter()
     {
         if (newPointNumbers[pointI] == -1)
         {
-            WarningIn("shortEdgeFilter")
+            WarningInFunction
                 << pointI << " will be deleted and " << newPointNumbers[pointI]
                 << ", so it will not be replaced. "
                 << "This will cause edges to be deleted." << endl;
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 219e3d419c..d62b82a239 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -8,14 +8,18 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
+    /* note: scotch < 6.0 does not like both scotch and ptscotch together */ \
+    -lscotchDecomp \
     -lmeshTools \
     -lsurfMesh \
     -lfileFormats \
     -ldynamicMesh \
+    -ldecompose \
     -lautoMesh
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict b/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict
index fd0701a01c..8095b2eb46 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index c6906a6c92..e8c2915f13 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -57,6 +57,7 @@ Description
 #include "MeshedSurface.H"
 #include "globalIndex.H"
 #include "IOmanip.H"
+#include "decompositionModel.H"
 
 using namespace Foam;
 
@@ -555,7 +556,7 @@ scalar getMergeDistance(const polyMesh& mesh, const scalar mergeTol)
 
         if (mergeTol < writeTol)
         {
-            FatalErrorIn("getMergeDistance(const polyMesh&, const dictionary&)")
+            FatalErrorInFunction
                 << "Your current settings specify ASCII writing with "
                 << IOstream::defaultPrecision() << " digits precision." << nl
                 << "Your merging tolerance (" << mergeTol
@@ -819,15 +820,28 @@ int main(int argc, char *argv[])
     {
         if (Pstream::parRun())
         {
+            fileName decompDictFile;
+            if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
+            {
+                if (isDir(decompDictFile))
+                {
+                    decompDictFile = decompDictFile/"decomposeParDict";
+                }
+            }
+
             decomposeDict = IOdictionary
             (
-                IOobject
+                decompositionModel::selectIO
                 (
-                    "decomposeParDict",
-                    runTime.system(),
-                    mesh,
-                    IOobject::MUST_READ_IF_MODIFIED,
-                    IOobject::NO_WRITE
+                    IOobject
+                    (
+                        "decomposeParDict",
+                        runTime.system(),
+                        mesh,
+                        IOobject::MUST_READ_IF_MODIFIED,
+                        IOobject::NO_WRITE
+                    ),
+                    decompDictFile
                 )
             );
         }
@@ -1075,6 +1089,26 @@ int main(int argc, char *argv[])
         << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
 
 
+    // Optionally read limit shells
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    const dictionary limitDict(refineDict.subOrEmptyDict("limitRegions"));
+
+    if (!limitDict.empty())
+    {
+        Info<< "Reading limit shells." << endl;
+    }
+
+    shellSurfaces limitShells(allGeometry, limitDict);
+
+    if (!limitDict.empty())
+    {
+        Info<< "Read refinement shells in = "
+            << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
+    }
+
+
+
     // Read feature meshes
     // ~~~~~~~~~~~~~~~~~~~
 
@@ -1105,7 +1139,8 @@ int main(int argc, char *argv[])
         overwrite,          // overwrite mesh files?
         surfaces,           // for surface intersection refinement
         features,           // for feature edges/point based refinement
-        shells              // for volume (inside/outside) refinement
+        shells,             // for volume (inside/outside) refinement
+        limitShells         // limit of volume refinement
     );
     Info<< "Calculated surface intersections in = "
         << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
@@ -1121,6 +1156,38 @@ int main(int argc, char *argv[])
     );
 
 
+    // Refinement parameters
+    const refinementParameters refineParams(refineDict);
+
+    // Snap parameters
+    const snapParameters snapParams(snapDict);
+
+
+
+    // Add all the cellZones and faceZones
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // 1. cellZones relating to surface (faceZones added later)
+
+    const labelList namedSurfaces
+    (
+        surfaceZonesInfo::getNamedSurfaces(surfaces.surfZones())
+    );
+
+    labelList surfaceToCellZone = surfaceZonesInfo::addCellZonesToMesh
+    (
+        surfaces.surfZones(),
+        namedSurfaces,
+        mesh
+    );
+
+
+    // 2. cellZones relating to locations
+
+    refineParams.addCellZonesToMesh(mesh);
+
+
+
     // Add all the surface regions as patches
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1128,6 +1195,8 @@ int main(int argc, char *argv[])
     //  (faceZone surfaces)
     labelList globalToMasterPatch;
     labelList globalToSlavePatch;
+
+
     {
         Info<< nl
             << "Adding patches for surface regions" << nl
@@ -1148,6 +1217,7 @@ int main(int argc, char *argv[])
 
         const labelList& surfaceGeometry = surfaces.surfaces();
         const PtrList<dictionary>& surfacePatchInfo = surfaces.patchInfo();
+        const polyBoundaryMesh& pbm = mesh.boundaryMesh();
 
         forAll(surfaceGeometry, surfI)
         {
@@ -1157,7 +1227,9 @@ int main(int argc, char *argv[])
 
             Info<< surfaces.names()[surfI] << ':' << nl << nl;
 
-            if (surfaces.surfZones()[surfI].faceZoneName().empty())
+            const word& fzName = surfaces.surfZones()[surfI].faceZoneName();
+
+            if (fzName.empty())
             {
                 // 'Normal' surface
                 forAll(regNames, i)
@@ -1188,7 +1260,7 @@ int main(int argc, char *argv[])
 
                     Info<< setf(ios_base::left)
                         << setw(6) << patchI
-                        << setw(20) << mesh.boundaryMesh()[patchI].type()
+                        << setw(20) << pbm[patchI].type()
                         << setw(30) << regNames[i] << nl;
 
                     globalToMasterPatch[globalRegionI] = patchI;
@@ -1228,7 +1300,7 @@ int main(int argc, char *argv[])
 
                         Info<< setf(ios_base::left)
                             << setw(6) << patchI
-                            << setw(20) << mesh.boundaryMesh()[patchI].type()
+                            << setw(20) << pbm[patchI].type()
                             << setw(30) << regNames[i] << nl;
 
                         globalToMasterPatch[globalRegionI] = patchI;
@@ -1260,12 +1332,27 @@ int main(int argc, char *argv[])
 
                         Info<< setf(ios_base::left)
                             << setw(6) << patchI
-                            << setw(20) << mesh.boundaryMesh()[patchI].type()
+                            << setw(20) << pbm[patchI].type()
                             << setw(30) << slaveName << nl;
 
                         globalToSlavePatch[globalRegionI] = patchI;
                     }
                 }
+
+                // For now: have single faceZone per surface. Use first
+                // region in surface for patch for zoneing
+                if (regNames.size())
+                {
+                    label globalRegionI = surfaces.globalRegion(surfI, 0);
+
+                    meshRefiner.addFaceZone
+                    (
+                        fzName,
+                        pbm[globalToMasterPatch[globalRegionI]].name(),
+                        pbm[globalToSlavePatch[globalRegionI]].name(),
+                        surfaces.surfZones()[surfI].faceType()
+                    );
+                }
             }
 
             Info<< nl;
@@ -1275,10 +1362,85 @@ int main(int argc, char *argv[])
     }
 
 
+
+    // Add all information for all the remaining faceZones
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    HashTable<Pair<word> > faceZoneToPatches;
+    forAll(mesh.faceZones(), zoneI)
+    {
+        const word& fzName = mesh.faceZones()[zoneI].name();
+
+        label mpI, spI;
+        surfaceZonesInfo::faceZoneType fzType;
+        bool hasInfo = meshRefiner.getFaceZoneInfo(fzName, mpI, spI, fzType);
+
+        if (!hasInfo)
+        {
+            // faceZone does not originate from a surface but presumably
+            // from a cellZone pair instead
+            string::size_type i = fzName.find("_to_");
+            if (i != string::npos)
+            {
+                word cz0 = fzName.substr(0, i);
+                word cz1 = fzName.substr(i+4, fzName.size()-i+4);
+                word slaveName(cz1 + "_to_" + cz0);
+                faceZoneToPatches.insert(fzName, Pair<word>(fzName, slaveName));
+            }
+            else
+            {
+                // Add as fzName + fzName_slave
+                const word slaveName = fzName + "_slave";
+                faceZoneToPatches.insert(fzName, Pair<word>(fzName, slaveName));
+            }
+        }
+    }
+
+    if (faceZoneToPatches.size())
+    {
+        autoRefineDriver::addFaceZones
+        (
+            meshRefiner,
+            refineParams,
+            faceZoneToPatches
+        );
+    }
+
+
+
+    // Re-do intersections on meshed boundaries since they use an extrapolated
+    // other side
+    {
+        const labelList adaptPatchIDs(meshRefiner.meshedPatches());
+
+        const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+        label nFaces = 0;
+        forAll(adaptPatchIDs, i)
+        {
+            nFaces += pbm[adaptPatchIDs[i]].size();
+        }
+
+        labelList faceLabels(nFaces);
+        nFaces = 0;
+        forAll(adaptPatchIDs, i)
+        {
+            const polyPatch& pp = pbm[adaptPatchIDs[i]];
+            forAll(pp, i)
+            {
+                faceLabels[nFaces++] = pp.start()+i;
+            }
+        }
+        meshRefiner.updateIntersections(faceLabels);
+    }
+
+
+
     // Parallel
     // ~~~~~~~~
 
-    // Decomposition
+    // Construct decomposition engine. Note: cannot use decompositionModel
+    // MeshObject since we're clearing out the mesh inside the mesh generation.
     autoPtr<decompositionMethod> decomposerPtr
     (
         decompositionMethod::New
@@ -1290,7 +1452,7 @@ int main(int argc, char *argv[])
 
     if (Pstream::parRun() && !decomposer.parallelAware())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "You have selected decomposition method "
             << decomposer.typeName
             << " which is not parallel aware." << endl
@@ -1312,14 +1474,17 @@ int main(int argc, char *argv[])
     const Switch wantSnap(meshDict.lookup("snap"));
     const Switch wantLayers(meshDict.lookup("addLayers"));
 
-    // Refinement parameters
-    const refinementParameters refineParams(refineDict);
+    const Switch mergePatchFaces
+    (
+        meshDict.lookupOrDefault("mergePatchFaces", true)
+    );
 
-    // Snap parameters
-    const snapParameters snapParams(snapDict);
-
-    // Layer addition parameters
-    const layerParameters layerParams(layerDict, mesh.boundaryMesh());
+    if (!mergePatchFaces)
+    {
+        Info<< "Not merging patch-faces of cell to preserve"
+            << " (split)hex cell shape."
+            << nl << endl;
+    }
 
 
     if (wantRefine)
@@ -1348,6 +1513,7 @@ int main(int argc, char *argv[])
             refineParams,
             snapParams,
             refineParams.handleSnapProblems(),
+            mergePatchFaces,        // merge co-planar faces
             motionDict
         );
 
@@ -1387,6 +1553,7 @@ int main(int argc, char *argv[])
         (
             snapDict,
             motionDict,
+            mergePatchFaces,
             curvature,
             planarAngle,
             snapParams
@@ -1408,6 +1575,9 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
+        // Layer addition parameters
+        const layerParameters layerParams(layerDict, mesh.boundaryMesh());
+
         autoLayerDriver layerDriver
         (
             meshRefiner,
@@ -1433,6 +1603,7 @@ int main(int argc, char *argv[])
             layerDict,
             motionDict,
             layerParams,
+            mergePatchFaces,
             preBalance,
             decomposer,
             distributor
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 577e116b64..2b3f922207 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -71,6 +71,11 @@ geometry
     }
 };
 
+
+// Optional: avoid patch-face merging. Allows mesh to be used for
+//           refinement/unrefinement
+//mergePatchFaces    off; // default on
+
 // Settings for the castellatedMesh generation.
 castellatedMeshControls
 {
@@ -90,10 +95,10 @@ castellatedMeshControls
     // actually be a lot less.
     maxGlobalCells 2000000;
 
-    // The surface refinement loop might spend lots of iterations refining just a
-    // few cells. This setting will cause refinement to stop if <= minimumRefine
-    // are selected for refinement. Note: it will at least do one iteration
-    // (unless the number of cells to refine is 0)
+    // The surface refinement loop might spend lots of iterations refining just
+    // a few cells. This setting will cause refinement to stop if
+    // <= minimumRefine cells are selected for refinement. Note: it will
+    // at least do one iteration (unless the number of cells to refine is 0)
     minRefinementCells 0;
 
     // Allow a certain level of imbalance during refining
@@ -177,7 +182,7 @@ castellatedMeshControls
             //  how to select the cells that are in the cellZone
             //  (inside / outside / specified insidePoint)
             //  The orientation of the faceZone is
-            //  - if on cellZone(s) : point out of (maximum) cellZone
+            //  - if on cellZone(s) : point out of (minimum) cellZone
             //  - if freestanding   : oriented according to surface
 
             //faceZone sphere;
@@ -239,26 +244,96 @@ castellatedMeshControls
         }
         //sphere.stl
         //{
-        //    mode distance;
-        //    levels ((1.0 5) (2.0 3));
+        //    mode inside;
+        //    levels ((1.0 4));
+        //    // Optional override of uniform refinement level such
+        //    //  that in small gaps we're getting more cells.
+        //    //  The specification is
+        //    //  - numGapCells : minimum number of cells in the gap
+        //    //  - minLevel    : min refinement level at which to kick in
+        //    //  - maxLevel    : upper refinement level
+        //    // All three settings can be overridden on a surface by
+        //    // surface basis in the refinementSurfaces section.
+        //    gapLevel (<numGapCells> <minLevel> <maxlevel>);
         //}
     }
 
+
+    // Limit refinement in geometric region
+    limitRegions
+    {
+    }
+
+
     // Mesh selection
     // ~~~~~~~~~~~~~~
 
     // After refinement patches get added for all refinementSurfaces and
     // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
+    // section reachable from the location(s)InMesh is kept.
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
-    locationInMesh (5 0.28 0.43);
+    //
+    // There are two different ways of specifying the regions to keep:
+    // 1. a single locationInMesh. All the 'zoned' surfaces are marked as such
+    //    in the refinementSurfaces with the faceZone and cellZone keywords.
+    //
+    // or
+    //
+    // 2. multiple locationsInMesh, with per location the name of the cellZone.
+    //    This uses walking to determine zones and automatically creates
+    //    faceZones on the outside of cellZones.
 
-    // Whether any faceZones (as specified in the refinementSurfaces)
-    // are only on the boundary of corresponding cellZones or also allow
-    // free-standing zone faces. Not used if there are no faceZones.
-    allowFreeStandingZoneFaces true;
 
+        // Ad 1. Specify a single location and how to treat faces inbetween
+        //       cellZones
+        locationInMesh (5 0.28 0.43);
+
+        // Whether any faceZones (as specified in the refinementSurfaces)
+        // are only on the boundary of corresponding cellZones or also allow
+        // free-standing zone faces. Not used if there are no faceZones.
+        allowFreeStandingZoneFaces true;
+
+
+
+        // 2. Specify multiple locations with optional cellZones for the
+        //    regions. faceZones are automatically constructed from the
+        //    names of the cellZones: <cellZoneA> _to_ <cellZoneB>
+        //    where the cellZoneA is the lowest numbered cellZone (non-cellZone
+        //    cells are in a special region called "none" which is always
+        //    last).
+
+        locationsInMesh
+        (
+            ((-0.09 -0.039 -0.049)  bottomAir)  // cellZone 0
+            ((-0.09 0.009 -0.049)   topAir)     // cellZone 1
+            ((-0.09 0.001 -0.049)   leftSolid)  // cellZone 2
+            ((0.02  0.001 -0.049)   rightSolid) // cellZone 3
+            ((-0.001 -0.039 0.0015) heater)     // cellZone 4
+        );
+
+        // Per synthesised faceZone name the faceType and type of baffles to
+        // create
+        faceZoneControls
+        {
+            bottomAir_to_heater
+            {
+                // Optional specification of patch type (default is wall). No
+                // constraint types (cyclic, symmetry) etc. are allowed.
+                patchInfo
+                {
+                    type patch;
+                    inGroups (patchPatches);
+                }
+                faceType baffle;
+            }
+        }
+
+
+
+    // Optional locations that should not be reachable from
+    // location(s)InMesh
+    locationsOutsideMesh ((100 100 100));
 
     // Optional: do not remove cells likely to give snapping problems
     // handleSnapProblems false;
@@ -266,6 +341,10 @@ castellatedMeshControls
     // Optional: switch off topological test for cells to-be-squashed
     //           and use geometric test instead
     //useTopologicalSnapDetection false;
+
+    // Optional: do not refine surface cells with opposite faces of
+    //           differing refinement levels
+    //interfaceRefine false;
 }
 
 // Settings for the snapping.
@@ -275,9 +354,13 @@ snapControls
     // to surface
     nSmoothPatch 3;
 
+    // Optional: number of smoothing iterations for internal points on
+    // refinement interfaces. This will reduce non-orthogonality on
+    // refinement interfaces.
+    //nSmoothInternal $nSmoothPatch;
+
     // Maximum relative distance for points to be attracted by surface.
     // True distance is this factor times local maximum edge length.
-    // Note: changed(corrected) w.r.t 17x! (17x used 2* tolerance)
     tolerance 2.0;
 
     // Number of mesh displacement relaxation iterations.
@@ -287,6 +370,11 @@ snapControls
     // before upon reaching a correct mesh.
     nRelaxIter 5;
 
+    // (wip) disable snapping to opposite near surfaces (revert to 22x
+    //  behaviour)
+    // detectNearSurfacesSnap false;
+
+
     // Feature snapping
 
         // Number of feature edge snapping iterations.
@@ -305,8 +393,28 @@ snapControls
         multiRegionFeatureSnap false;
 
 
-    // wip: disable snapping to opposite near surfaces (revert to 22x behaviour)
-    // detectNearSurfacesSnap false;
+        //- When to run face splitting (never at first iteration, always
+        //  at last iteration). Is interval. Default -1 (disabled)
+        //nFaceSplitInterval 5;
+
+
+        // (wip) Optional for explicit feature snapping:
+        //- Detect baffle edges. Default is true.
+        //detectBaffles false;
+        //- Erase attraction close to feature point. Default is false.
+        //releasePoints true;
+        //- Walk along feature edges, adding missing ones. Default is true.
+        //stringFeatures false;
+        //- If diagonal attraction also attract other face points. Default is
+        //  false
+        //avoidDiagonal true;
+        //- When splitting what concave faces to leave intact. Default is 45
+        //  degrees.
+        //concaveAngle 30;
+        //- When splitting the minimum area ratio of faces. If face split
+        //  causes ratio of area less than this do not split. Default is 0.3
+        //minAreaRatio 0.3;
+
 }
 
 // Settings for the layer addition.
@@ -350,10 +458,10 @@ addLayersControls
     // cannot be above minThickness do not add layer.
     // If relativeSizes this is relative to undistorted size of cell
     // outside layer..
-    minThickness 0.25;
+    minThickness 0.1;
 
 
-    // Per final patch (so not geometry!) the layer information
+    // Per final patch or faceZone (so not geometry!) the layer information
     // Note: This behaviour changed after 21x. Any non-mentioned patches
     //       now slide unless:
     //          - nSurfaceLayers is explicitly mentioned to be 0.
@@ -397,6 +505,10 @@ addLayersControls
         // are perpendicular
         featureAngle 130;
 
+        // When to merge patch faces. Default is featureAngle. Useful when
+        // featureAngle is large.
+        //mergePatchFacesAngle 45;
+
         // Stop layer growth on highly warped cells
         maxFaceThicknessRatio 0.5;
 
@@ -411,7 +523,25 @@ addLayersControls
 
 
 
-    // Medial axis analysis
+    // Choice of mesh shrinking algorithm
+
+        // Optional mesh shrinking algorithm (default is displacementMedialAxis)
+        // The displacementMotionSolver is a wrapper around the displacement
+        // motion solvers. It needs specification of the solver to use and
+        // its control dictionary.
+        //meshShrinker displacementMotionSolver;
+        //solver displacementLaplacian;
+        //displacementLaplacianCoeffs
+        //{
+        //    diffusivity quadratic inverseDistance
+        //    (
+        //        sphere.stl_firstSolid
+        //        maxY
+        //    );
+        //}
+
+
+    // Medial axis analysis (for use with default displacementMedialAxis)
 
         // Angle used to pick up medial axis points
         // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130
@@ -433,13 +563,12 @@ addLayersControls
         // default is 0.
         //nSmoothDisplacement 90;
 
-        // (wip)Optional: do not extrude a point if none of the surrounding points is
-        // not extruded. Default is false.
+        // (wip)Optional: do not extrude any point where
+        //   (false) : all surrounding faces are not fully extruded
+        //   (true)  : all surrounding points are not extruded
+        // Default is false.
         //detectExtrusionIsland true;
 
-
-    // Mesh shrinking
-
         // Optional: at non-patched sides allow mesh to slip if extrusion
         // direction makes angle larger than slipFeatureAngle. Default is
         // 0.5*featureAngle.
@@ -449,7 +578,11 @@ addLayersControls
         // before upon reaching a correct mesh.
         nRelaxIter 5;
 
-        // Create buffer region for new layer terminations
+
+    // Mesh shrinking
+
+        // Create buffer region for new layer terminations, i.e. gradually
+        // step down number of layers. Set to <0 to terminate layer in one go.
         nBufferCellsNoExtrude 0;
 
         // Overall max number of layer addition iterations. The mesher will
diff --git a/applications/utilities/mesh/manipulation/checkMesh/Make/files b/applications/utilities/mesh/manipulation/checkMesh/Make/files
index 1a3130a23c..21febe2789 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/Make/files
+++ b/applications/utilities/mesh/manipulation/checkMesh/Make/files
@@ -1,4 +1,4 @@
-printMeshStats.C
+checkTools.C
 checkTopology.C
 checkGeometry.C
 checkMeshQuality.C
diff --git a/applications/utilities/mesh/manipulation/checkMesh/Make/options b/applications/utilities/mesh/manipulation/checkMesh/Make/options
index 2ff5dbabfe..4700e225a5 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/checkMesh/Make/options
@@ -1,8 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
+    -lsampling \
+    -lsurfMesh \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 68c316f24d..98e97cb281 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -7,6 +7,8 @@
 #include "wedgePolyPatch.H"
 #include "unitConversion.H"
 #include "polyMeshTetDecomposition.H"
+#include "surfaceWriter.H"
+#include "checkTools.H"
 
 
 // Find wedge with opposite orientation. Note: does not actually check that
@@ -402,13 +404,8 @@ bool Foam::checkCoupledPoints
 
                     if (f.size() != nbrPoints[bFaceI].size())
                     {
-                        FatalErrorIn
-                        (
-                            "Foam::checkCoupledPoints\n"
-                            "(\n"
-                            "   const polyMesh&, const bool, labelHashSet*\n"
-                            ")\n"
-                        )   << "Local face size : " << f.size()
+                        FatalErrorInFunction
+                            << "Local face size : " << f.size()
                             << " does not equal neighbour face size : "
                             << nbrPoints[bFaceI].size()
                             << abort(FatalError);
@@ -477,7 +474,12 @@ bool Foam::checkCoupledPoints
 }
 
 
-Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
+Foam::label Foam::checkGeometry
+(
+    const polyMesh& mesh,
+    const bool allGeometry,
+    const autoPtr<surfaceWriter>& writer
+)
 {
     label noFailedChecks = 0;
 
@@ -563,6 +565,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << " non closed cells to set " << cells.name() << endl;
                 cells.instance() = mesh.pointsInstance();
                 cells.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), cells);
+                }
             }
         }
 
@@ -575,6 +581,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                 << aspectCells.name() << endl;
             aspectCells.instance() = mesh.pointsInstance();
             aspectCells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), aspectCells);
+            }
         }
     }
 
@@ -592,6 +602,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << " zero area faces to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -610,6 +624,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << " zero volume cells to set " << cells.name() << endl;
                 cells.instance() = mesh.pointsInstance();
                 cells.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), cells);
+                }
             }
         }
     }
@@ -629,6 +647,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                 << " non-orthogonal faces to set " << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
@@ -647,6 +669,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -665,6 +691,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << " skew faces to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -685,6 +715,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -714,6 +748,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << "decomposition tets to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -774,6 +812,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -793,6 +835,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                     << " warped faces to set " << faces.name() << endl;
                 faces.instance() = mesh.pointsInstance();
                 faces.write();
+                if (writer.valid())
+                {
+                    mergeAndWrite(writer(), faces);
+                }
             }
         }
     }
@@ -810,6 +856,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                 << " under-determined cells to set " << cells.name() << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), cells);
+            }
         }
     }
 
@@ -826,6 +876,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                 << " concave cells to set " << cells.name() << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), cells);
+            }
         }
     }
 
@@ -843,6 +897,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
@@ -860,6 +918,10 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
index edc1f44826..9658512eb1 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
@@ -6,6 +6,7 @@ namespace Foam
 {
     class polyMesh;
     class wedgePolyPatch;
+    class surfaceWriter;
 
     label findOppositeWedge(const polyMesh&, const wedgePolyPatch&);
 
@@ -21,5 +22,10 @@ namespace Foam
     //- Check 0th vertex on coupled faces
     bool checkCoupledPoints(const polyMesh&, const bool report, labelHashSet*);
 
-    label checkGeometry(const polyMesh& mesh, const bool allGeometry);
+    label checkGeometry
+    (
+        const polyMesh& mesh,
+        const bool allGeometry,
+        const autoPtr<surfaceWriter>&
+    );
 }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index b11946a28f..527ba497d3 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,16 +42,20 @@ Usage
     \param -region \<name\> \n
     Specify an alternative mesh region.
 
+    \param -writeSets \<surfaceFormat\> \n
+    Reconstruct all cellSets and faceSets geometry and write to postProcessing/
+    directory according to surfaceFormat (e.g. vtk or ensight)
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
 #include "timeSelector.H"
 #include "Time.H"
-
 #include "polyMesh.H"
 #include "globalMeshData.H"
+#include "vtkSurfaceWriter.H"
 
-#include "printMeshStats.H"
+#include "checkTools.H"
 #include "checkTopology.H"
 #include "checkGeometry.H"
 #include "checkMeshQuality.H"
@@ -84,6 +88,12 @@ int main(int argc, char *argv[])
         "meshQuality",
         "read user-defined mesh quality criterions from system/meshQualityDict"
     );
+    argList::addOption
+    (
+        "writeSets",
+        "surfaceFormat"
+        "reconstruct and write all faceSets and cellSets in selected format"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
@@ -95,6 +105,9 @@ int main(int argc, char *argv[])
     const bool allTopology = args.optionFound("allTopology");
     const bool meshQuality = args.optionFound("meshQuality");
 
+    word surfaceFormat;
+    const bool writeSets = args.optionReadIfPresent("writeSets", surfaceFormat);
+
     if (noTopology)
     {
         Info<< "Disabling all topology checks." << nl << endl;
@@ -112,6 +125,12 @@ int main(int argc, char *argv[])
     {
         Info<< "Enabling user-defined geometry checks." << nl << endl;
     }
+    if (writeSets)
+    {
+        Info<< "Reconstructing and writing " << surfaceFormat
+            << " representation"
+            << " of all faceSets and cellSets." << nl << endl;
+    }
 
 
     autoPtr<IOdictionary> qualDict;
@@ -134,6 +153,13 @@ int main(int argc, char *argv[])
     }
 
 
+    autoPtr<surfaceWriter> writer;
+    if (writeSets)
+    {
+        writer = surfaceWriter::New(surfaceFormat);
+    }
+
+
     forAll(timeDirs, timeI)
     {
         runTime.setTime(timeDirs[timeI], timeI);
@@ -161,14 +187,20 @@ int main(int argc, char *argv[])
 
             if (!noTopology)
             {
-                nFailedChecks += checkTopology(mesh, allTopology, allGeometry);
+                nFailedChecks += checkTopology
+                (
+                    mesh,
+                    allTopology,
+                    allGeometry,
+                    writer
+                );
             }
 
-            nFailedChecks += checkGeometry(mesh, allGeometry);
+            nFailedChecks += checkGeometry(mesh, allGeometry, writer);
 
             if (meshQuality)
             {
-                nFailedChecks += checkMeshQuality(mesh, qualDict());
+                nFailedChecks += checkMeshQuality(mesh, qualDict(), writer);
             }
 
 
@@ -189,11 +221,11 @@ int main(int argc, char *argv[])
         {
             Info<< "Time = " << runTime.timeName() << nl << endl;
 
-            label nFailedChecks = checkGeometry(mesh, allGeometry);
+            label nFailedChecks = checkGeometry(mesh, allGeometry, writer);
 
             if (meshQuality)
             {
-                nFailedChecks += checkMeshQuality(mesh, qualDict());
+                nFailedChecks += checkMeshQuality(mesh, qualDict(), writer);
             }
 
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C b/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
index b00f02f8ef..a6a01c7336 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.C
@@ -3,12 +3,14 @@
 #include "cellSet.H"
 #include "faceSet.H"
 #include "motionSmoother.H"
-
+#include "surfaceWriter.H"
+#include "checkTools.H"
 
 Foam::label Foam::checkMeshQuality
 (
     const polyMesh& mesh,
-    const dictionary& dict
+    const dictionary& dict,
+    const autoPtr<surfaceWriter>& writer
 )
 {
     label noFailedChecks = 0;
@@ -27,6 +29,10 @@ Foam::label Foam::checkMeshQuality
                 << " faces in error to set " << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.H b/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.H
index 1e5b3489c9..52507986bf 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMeshQuality.H
@@ -2,5 +2,12 @@
 
 namespace Foam
 {
-    label checkMeshQuality(const polyMesh& mesh, const dictionary&);
+    class surfaceWriter;
+
+    label checkMeshQuality
+    (
+        const polyMesh&,
+        const dictionary&,
+        const autoPtr<surfaceWriter>&
+    );
 }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
new file mode 100644
index 0000000000..249fe6b90d
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
@@ -0,0 +1,403 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "checkTools.H"
+#include "polyMesh.H"
+#include "globalMeshData.H"
+#include "hexMatcher.H"
+#include "wedgeMatcher.H"
+#include "prismMatcher.H"
+#include "pyrMatcher.H"
+#include "tetWedgeMatcher.H"
+#include "tetMatcher.H"
+#include "IOmanip.H"
+#include "faceSet.H"
+#include "cellSet.H"
+#include "PatchTools.H"
+#include "Time.H"
+#include "surfaceWriter.H"
+#include "sampledSurfaces.H"
+#include "syncTools.H"
+
+
+void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
+{
+    Info<< "Mesh stats" << nl
+        << "    points:           "
+        << returnReduce(mesh.points().size(), sumOp<label>()) << nl;
+
+    label nInternalPoints = returnReduce
+    (
+        mesh.nInternalPoints(),
+        sumOp<label>()
+    );
+
+    if (nInternalPoints != -Pstream::nProcs())
+    {
+        Info<< "    internal points:  " << nInternalPoints << nl;
+
+        if (returnReduce(mesh.nInternalPoints(), minOp<label>()) == -1)
+        {
+            WarningInFunction
+                << "Some processors have their points sorted into internal"
+                << " and external and some do not." << endl
+                << "This can cause problems later on." << endl;
+        }
+    }
+
+    if (allTopology && nInternalPoints != -Pstream::nProcs())
+    {
+        label nEdges = returnReduce(mesh.nEdges(), sumOp<label>());
+        label nInternalEdges = returnReduce
+        (
+            mesh.nInternalEdges(),
+            sumOp<label>()
+        );
+        label nInternal1Edges = returnReduce
+        (
+            mesh.nInternal1Edges(),
+            sumOp<label>()
+        );
+        label nInternal0Edges = returnReduce
+        (
+            mesh.nInternal0Edges(),
+            sumOp<label>()
+        );
+
+        Info<< "    edges:            " << nEdges << nl
+            << "    internal edges:   " << nInternalEdges << nl
+            << "    internal edges using one boundary point:   "
+            << nInternal1Edges-nInternal0Edges << nl
+            << "    internal edges using two boundary points:  "
+            << nInternalEdges-nInternal1Edges << nl;
+    }
+
+    label nFaces = returnReduce(mesh.faces().size(), sumOp<label>());
+    label nIntFaces = returnReduce(mesh.faceNeighbour().size(), sumOp<label>());
+    label nCells = returnReduce(mesh.cells().size(), sumOp<label>());
+
+    Info<< "    faces:            " << nFaces << nl
+        << "    internal faces:   " << nIntFaces << nl
+        << "    cells:            " << nCells << nl
+        << "    faces per cell:   "
+        << scalar(nFaces + nIntFaces)/max(1, nCells) << nl
+        << "    boundary patches: " << mesh.boundaryMesh().size() << nl
+        << "    point zones:      " << mesh.pointZones().size() << nl
+        << "    face zones:       " << mesh.faceZones().size() << nl
+        << "    cell zones:       " << mesh.cellZones().size() << nl
+        << endl;
+
+    // Construct shape recognizers
+    hexMatcher hex;
+    prismMatcher prism;
+    wedgeMatcher wedge;
+    pyrMatcher pyr;
+    tetWedgeMatcher tetWedge;
+    tetMatcher tet;
+
+    // Counters for different cell types
+    label nHex = 0;
+    label nWedge = 0;
+    label nPrism = 0;
+    label nPyr = 0;
+    label nTet = 0;
+    label nTetWedge = 0;
+    label nUnknown = 0;
+
+    Map<label> polyhedralFaces;
+
+    for (label cellI = 0; cellI < mesh.nCells(); cellI++)
+    {
+        if (hex.isA(mesh, cellI))
+        {
+            nHex++;
+        }
+        else if (tet.isA(mesh, cellI))
+        {
+            nTet++;
+        }
+        else if (pyr.isA(mesh, cellI))
+        {
+            nPyr++;
+        }
+        else if (prism.isA(mesh, cellI))
+        {
+            nPrism++;
+        }
+        else if (wedge.isA(mesh, cellI))
+        {
+            nWedge++;
+        }
+        else if (tetWedge.isA(mesh, cellI))
+        {
+            nTetWedge++;
+        }
+        else
+        {
+            nUnknown++;
+            polyhedralFaces(mesh.cells()[cellI].size())++;
+        }
+    }
+
+    reduce(nHex,sumOp<label>());
+    reduce(nPrism,sumOp<label>());
+    reduce(nWedge,sumOp<label>());
+    reduce(nPyr,sumOp<label>());
+    reduce(nTetWedge,sumOp<label>());
+    reduce(nTet,sumOp<label>());
+    reduce(nUnknown,sumOp<label>());
+
+    Info<< "Overall number of cells of each type:" << nl
+        << "    hexahedra:     " << nHex << nl
+        << "    prisms:        " << nPrism << nl
+        << "    wedges:        " << nWedge << nl
+        << "    pyramids:      " << nPyr << nl
+        << "    tet wedges:    " << nTetWedge << nl
+        << "    tetrahedra:    " << nTet << nl
+        << "    polyhedra:     " << nUnknown
+        << endl;
+
+    if (nUnknown > 0)
+    {
+        Pstream::mapCombineGather(polyhedralFaces, plusEqOp<label>());
+
+        Info<< "    Breakdown of polyhedra by number of faces:" << nl
+            << "        faces" << "   number of cells" << endl;
+
+        const labelList sortedKeys = polyhedralFaces.sortedToc();
+
+        forAll(sortedKeys, keyI)
+        {
+            const label nFaces = sortedKeys[keyI];
+
+            Info<< setf(std::ios::right) << setw(13)
+                << nFaces << "   " << polyhedralFaces[nFaces] << nl;
+        }
+    }
+
+    Info<< endl;
+}
+
+
+void Foam::mergeAndWrite
+(
+    const surfaceWriter& writer,
+    const faceSet& set
+)
+{
+    const polyMesh& mesh = refCast<const polyMesh>(set.db());
+
+    const indirectPrimitivePatch setPatch
+    (
+        IndirectList<face>(mesh.faces(), set.sortedToc()),
+        mesh.points()
+    );
+
+    const fileName outputDir
+    (
+        set.time().path()
+      / (Pstream::parRun() ? ".." : "")
+      / "postProcessing"
+      / mesh.pointsInstance()
+      / set.name()
+    );
+
+
+    if (Pstream::parRun())
+    {
+        // Use tolerance from sampling (since we're doing exactly the same
+        // when parallel merging)
+        const scalar tol = sampledSurfaces::mergeTol();
+        // dimension as fraction of mesh bounding box
+        scalar mergeDim = tol * mesh.bounds().mag();
+
+        pointField mergedPoints;
+        faceList mergedFaces;
+        labelList pointMergeMap;
+
+        PatchTools::gatherAndMerge
+        (
+            mergeDim,
+            setPatch,
+            mergedPoints,
+            mergedFaces,
+            pointMergeMap
+        );
+        if (Pstream::master())
+        {
+            writer.write
+            (
+                outputDir,
+                set.name(),
+                mergedPoints,
+                mergedFaces
+            );
+        }
+    }
+    else
+    {
+        writer.write
+        (
+            outputDir,
+            set.name(),
+            setPatch.localPoints(),
+            setPatch.localFaces()
+        );
+    }
+}
+
+
+void Foam::mergeAndWrite
+(
+    const surfaceWriter& writer,
+    const cellSet& set
+)
+{
+    const polyMesh& mesh = refCast<const polyMesh>(set.db());
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+
+    // Determine faces on outside of cellSet
+    PackedBoolList isInSet(mesh.nCells());
+    forAllConstIter(cellSet, set, iter)
+    {
+        isInSet[iter.key()] = true;
+    }
+
+
+    boolList bndInSet(mesh.nFaces()-mesh.nInternalFaces());
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+        const labelList& fc = pp.faceCells();
+        forAll(fc, i)
+        {
+            bndInSet[pp.start()+i-mesh.nInternalFaces()] = isInSet[fc[i]];
+        }
+    }
+    syncTools::swapBoundaryFaceList(mesh, bndInSet);
+
+
+    DynamicList<label> outsideFaces(3*set.size());
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        bool ownVal = isInSet[mesh.faceOwner()[faceI]];
+        bool neiVal = isInSet[mesh.faceNeighbour()[faceI]];
+
+        if (ownVal != neiVal)
+        {
+            outsideFaces.append(faceI);
+        }
+    }
+
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+        const labelList& fc = pp.faceCells();
+        if (pp.coupled())
+        {
+            forAll(fc, i)
+            {
+                label faceI = pp.start()+i;
+
+                bool neiVal = bndInSet[faceI-mesh.nInternalFaces()];
+                if (isInSet[fc[i]] && !neiVal)
+                {
+                    outsideFaces.append(faceI);
+                }
+            }
+        }
+        else
+        {
+            forAll(fc, i)
+            {
+                if (isInSet[fc[i]])
+                {
+                    outsideFaces.append(pp.start()+i);
+                }
+            }
+        }
+    }
+
+
+    const indirectPrimitivePatch setPatch
+    (
+        IndirectList<face>(mesh.faces(), outsideFaces),
+        mesh.points()
+    );
+
+    const fileName outputDir
+    (
+        set.time().path()
+      / (Pstream::parRun() ? ".." : "")
+      / "postProcessing"
+      / mesh.pointsInstance()
+      / set.name()
+    );
+
+
+    if (Pstream::parRun())
+    {
+        // Use tolerance from sampling (since we're doing exactly the same
+        // when parallel merging)
+        const scalar tol = sampledSurfaces::mergeTol();
+        // dimension as fraction of mesh bounding box
+        scalar mergeDim = tol * mesh.bounds().mag();
+
+        pointField mergedPoints;
+        faceList mergedFaces;
+        labelList pointMergeMap;
+
+        PatchTools::gatherAndMerge
+        (
+            mergeDim,
+            setPatch,
+            mergedPoints,
+            mergedFaces,
+            pointMergeMap
+        );
+        if (Pstream::master())
+        {
+            writer.write
+            (
+                outputDir,
+                set.name(),
+                mergedPoints,
+                mergedFaces
+            );
+        }
+    }
+    else
+    {
+        writer.write
+        (
+            outputDir,
+            set.name(),
+            setPatch.localPoints(),
+            setPatch.localFaces()
+        );
+    }
+}
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.H b/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
new file mode 100644
index 0000000000..6a3bab982f
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
@@ -0,0 +1,19 @@
+#include "scalar.H"
+
+namespace Foam
+{
+    class polyMesh;
+    class surfaceWriter;
+    class faceSet;
+    class cellSet;
+
+    void printMeshStats(const polyMesh& mesh, const bool allTopology);
+
+    //- Write vtk representation of (assembled) faceSet to vtk file in
+    //  postProcessing/ directory
+    void mergeAndWrite(const surfaceWriter&, const faceSet&);
+
+    //- Write vtk representation of (assembled) cellSet to vtk file in
+    //  postProcessing/ directory
+    void mergeAndWrite(const surfaceWriter&, const cellSet&);
+}
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index b0c4d37c03..190ffef544 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -33,6 +33,8 @@ License
 #include "IOmanip.H"
 #include "emptyPolyPatch.H"
 #include "processorPolyPatch.H"
+#include "surfaceWriter.H"
+#include "checkTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +42,8 @@ Foam::label Foam::checkTopology
 (
     const polyMesh& mesh,
     const bool allTopology,
-    const bool allGeometry
+    const bool allGeometry,
+    const autoPtr<surfaceWriter>& writer
 )
 {
     label noFailedChecks = 0;
@@ -126,6 +129,11 @@ Foam::label Foam::checkTopology
                 << " illegal cells to set " << cells.name() << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), cells);
+            }
+
         }
         else
         {
@@ -164,6 +172,10 @@ Foam::label Foam::checkTopology
                 << " unordered faces to set " << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
@@ -180,6 +192,10 @@ Foam::label Foam::checkTopology
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
@@ -197,6 +213,11 @@ Foam::label Foam::checkTopology
                 << endl;
             cells.instance() = mesh.pointsInstance();
             cells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), cells);
+            }
+
         }
     }
 
@@ -216,6 +237,10 @@ Foam::label Foam::checkTopology
                 << faces.name() << endl;
             faces.instance() = mesh.pointsInstance();
             faces.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), faces);
+            }
         }
     }
 
@@ -267,6 +292,10 @@ Foam::label Foam::checkTopology
                 << endl;
             oneCells.instance() = mesh.pointsInstance();
             oneCells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), oneCells);
+            }
         }
 
         label nTwoCells = returnReduce(twoCells.size(), sumOp<label>());
@@ -279,6 +308,10 @@ Foam::label Foam::checkTopology
                 << endl;
             twoCells.instance() = mesh.pointsInstance();
             twoCells.write();
+            if (writer.valid())
+            {
+                mergeAndWrite(writer(), twoCells);
+            }
         }
     }
 
@@ -316,6 +349,53 @@ Foam::label Foam::checkTopology
             ctr.write();
 
 
+
+            // Is region disconnected
+            boolList regionDisconnected(rs.nRegions(), true);
+            if (allTopology)
+            {
+                // -1   : not assigned
+                // -2   : multiple regions
+                // >= 0 : single region
+                labelList pointToRegion(mesh.nPoints(), -1);
+
+                for
+                (
+                    label faceI = mesh.nInternalFaces();
+                    faceI < mesh.nFaces();
+                    faceI++
+                )
+                {
+                    label regionI = rs[mesh.faceOwner()[faceI]];
+                    const face& f = mesh.faces()[faceI];
+                    forAll(f, fp)
+                    {
+                        label& pRegion = pointToRegion[f[fp]];
+                        if (pRegion == -1)
+                        {
+                            pRegion = regionI;
+                        }
+                        else if (pRegion == -2)
+                        {
+                            // Already marked
+                            regionDisconnected[regionI] = false;
+                        }
+                        else if (pRegion != regionI)
+                        {
+                            // Multiple regions
+                            regionDisconnected[regionI] = false;
+                            regionDisconnected[pRegion] = false;
+                            pRegion = -2;
+                        }
+                    }
+                }
+
+                Pstream::listCombineGather(regionDisconnected, andEqOp<bool>());
+                Pstream::listCombineScatter(regionDisconnected);
+            }
+
+
+
             // write cellSet for each region
             PtrList<cellSet> cellRegions(rs.nRegions());
             for (label i = 0; i < rs.nRegions(); i++)
@@ -339,7 +419,19 @@ Foam::label Foam::checkTopology
 
             for (label i = 0; i < rs.nRegions(); i++)
             {
-                Info<< "  <<Writing region " << i << " with "
+                Info<< "  <<Writing region " << i;
+                if (allTopology)
+                {
+                    if (regionDisconnected[i])
+                    {
+                        Info<< " (fully disconnected)";
+                    }
+                    else
+                    {
+                        Info<< " (point connected)";
+                    }
+                }
+                Info<< " with "
                     << returnReduce(cellRegions[i].size(), sumOp<scalar>())
                     << " cells to cellSet " << cellRegions[i].name() << endl;
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
index 70443a86b6..8e39fd9288 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
@@ -1,9 +1,16 @@
 #include "label.H"
-#include "wordList.H"
+#include "autoPtr.H"
 
 namespace Foam
 {
     class polyMesh;
+    class surfaceWriter;
 
-    label checkTopology(const polyMesh&, const bool, const bool);
+    label checkTopology
+    (
+        const polyMesh&,
+        const bool,
+        const bool,
+        const autoPtr<surfaceWriter>&
+    );
 }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
deleted file mode 100644
index 9d49ffa2a9..0000000000
--- a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
+++ /dev/null
@@ -1,170 +0,0 @@
-#include "printMeshStats.H"
-#include "polyMesh.H"
-#include "globalMeshData.H"
-
-#include "hexMatcher.H"
-#include "wedgeMatcher.H"
-#include "prismMatcher.H"
-#include "pyrMatcher.H"
-#include "tetWedgeMatcher.H"
-#include "tetMatcher.H"
-#include "IOmanip.H"
-
-
-void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
-{
-    Info<< "Mesh stats" << nl
-        << "    points:           "
-        << returnReduce(mesh.points().size(), sumOp<label>()) << nl;
-
-    label nInternalPoints = returnReduce
-    (
-        mesh.nInternalPoints(),
-        sumOp<label>()
-    );
-
-    if (nInternalPoints != -Pstream::nProcs())
-    {
-        Info<< "    internal points:  " << nInternalPoints << nl;
-
-        if (returnReduce(mesh.nInternalPoints(), minOp<label>()) == -1)
-        {
-            WarningIn("Foam::printMeshStats(const polyMesh&, const bool)")
-                << "Some processors have their points sorted into internal"
-                << " and external and some do not." << endl
-                << "This can cause problems later on." << endl;
-        }
-    }
-
-    if (allTopology && nInternalPoints != -Pstream::nProcs())
-    {
-        label nEdges = returnReduce(mesh.nEdges(), sumOp<label>());
-        label nInternalEdges = returnReduce
-        (
-            mesh.nInternalEdges(),
-            sumOp<label>()
-        );
-        label nInternal1Edges = returnReduce
-        (
-            mesh.nInternal1Edges(),
-            sumOp<label>()
-        );
-        label nInternal0Edges = returnReduce
-        (
-            mesh.nInternal0Edges(),
-            sumOp<label>()
-        );
-
-        Info<< "    edges:            " << nEdges << nl
-            << "    internal edges:   " << nInternalEdges << nl
-            << "    internal edges using one boundary point:   "
-            << nInternal1Edges-nInternal0Edges << nl
-            << "    internal edges using two boundary points:  "
-            << nInternalEdges-nInternal1Edges << nl;
-    }
-
-    label nFaces = returnReduce(mesh.faces().size(), sumOp<label>());
-    label nIntFaces = returnReduce(mesh.faceNeighbour().size(), sumOp<label>());
-    label nCells = returnReduce(mesh.cells().size(), sumOp<label>());
-
-    Info<< "    faces:            " << nFaces << nl
-        << "    internal faces:   " << nIntFaces << nl
-        << "    cells:            " << nCells << nl
-        << "    faces per cell:   "
-        << scalar(nFaces + nIntFaces)/max(1, nCells) << nl
-        << "    boundary patches: " << mesh.boundaryMesh().size() << nl
-        << "    point zones:      " << mesh.pointZones().size() << nl
-        << "    face zones:       " << mesh.faceZones().size() << nl
-        << "    cell zones:       " << mesh.cellZones().size() << nl
-        << endl;
-
-    // Construct shape recognizers
-    hexMatcher hex;
-    prismMatcher prism;
-    wedgeMatcher wedge;
-    pyrMatcher pyr;
-    tetWedgeMatcher tetWedge;
-    tetMatcher tet;
-
-    // Counters for different cell types
-    label nHex = 0;
-    label nWedge = 0;
-    label nPrism = 0;
-    label nPyr = 0;
-    label nTet = 0;
-    label nTetWedge = 0;
-    label nUnknown = 0;
-
-    Map<label> polyhedralFaces;
-
-    for (label cellI = 0; cellI < mesh.nCells(); cellI++)
-    {
-        if (hex.isA(mesh, cellI))
-        {
-            nHex++;
-        }
-        else if (tet.isA(mesh, cellI))
-        {
-            nTet++;
-        }
-        else if (pyr.isA(mesh, cellI))
-        {
-            nPyr++;
-        }
-        else if (prism.isA(mesh, cellI))
-        {
-            nPrism++;
-        }
-        else if (wedge.isA(mesh, cellI))
-        {
-            nWedge++;
-        }
-        else if (tetWedge.isA(mesh, cellI))
-        {
-            nTetWedge++;
-        }
-        else
-        {
-            nUnknown++;
-            polyhedralFaces(mesh.cells()[cellI].size())++;
-        }
-    }
-
-    reduce(nHex,sumOp<label>());
-    reduce(nPrism,sumOp<label>());
-    reduce(nWedge,sumOp<label>());
-    reduce(nPyr,sumOp<label>());
-    reduce(nTetWedge,sumOp<label>());
-    reduce(nTet,sumOp<label>());
-    reduce(nUnknown,sumOp<label>());
-
-    Info<< "Overall number of cells of each type:" << nl
-        << "    hexahedra:     " << nHex << nl
-        << "    prisms:        " << nPrism << nl
-        << "    wedges:        " << nWedge << nl
-        << "    pyramids:      " << nPyr << nl
-        << "    tet wedges:    " << nTetWedge << nl
-        << "    tetrahedra:    " << nTet << nl
-        << "    polyhedra:     " << nUnknown
-        << endl;
-
-    if (nUnknown > 0)
-    {
-        Pstream::mapCombineGather(polyhedralFaces, plusEqOp<label>());
-
-        Info<< "    Breakdown of polyhedra by number of faces:" << nl
-            << "        faces" << "   number of cells" << endl;
-
-        const labelList sortedKeys = polyhedralFaces.sortedToc();
-
-        forAll(sortedKeys, keyI)
-        {
-            const label nFaces = sortedKeys[keyI];
-
-            Info<< setf(std::ios::right) << setw(13)
-                << nFaces << "   " << polyhedralFaces[nFaces] << nl;
-        }
-    }
-
-    Info<< endl;
-}
diff --git a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.H b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.H
deleted file mode 100644
index d56ecc2534..0000000000
--- a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.H
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Foam
-{
-    class polyMesh;
-
-    void printMeshStats(const polyMesh& mesh, const bool allTopology);
-}
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 66bc3bcb11..d0d1439b85 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -313,7 +313,7 @@ void createFaces
                     {
                         if (patchWarned.insert(patchI))
                         {
-                            WarningIn("createFaces(..)")
+                            WarningInFunction
                                 << "Found boundary face (in patch "
                                 << pp.name()
                                 << ") in faceZone " << fZone.name()
@@ -525,7 +525,7 @@ int main(int argc, char *argv[])
 
         Info<< "Created zone " << name
             << " at index " << zoneID
-            << " with " << n << " faces" << endl;
+            << " with " << returnReduce(n, sumOp<label>()) << " faces" << endl;
 
         mesh.faceZones().set
         (
@@ -770,7 +770,7 @@ int main(int argc, char *argv[])
                 if (!hasWarned)
                 {
                     hasWarned = true;
-                    WarningIn(args.executable())
+                    WarningInFunction
                         << "Setting field on boundary faces to zero." << endl
                         << "You might have to edit these fields." << endl;
                 }
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBafflesDict b/applications/utilities/mesh/manipulation/createBaffles/createBafflesDict
index e11d8a5c83..b43290d5eb 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBafflesDict
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
index 57a6b554c7..25d8b3272c 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,11 +73,8 @@ Foam::autoPtr<Foam::faceSelection> Foam::faceSelection::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "faceSelection::New"
-            "(const word&, const fvMesh&, const dictionary&)"
-        )   << "Unknown faceSelection type "
+        FatalErrorInFunction
+            << "Unknown faceSelection type "
             << sampleType << nl << nl
             << "Valid faceSelection types : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
index 7be333f030..20cb82808f 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ public:
         //- Clone
         autoPtr<faceSelection> clone() const
         {
-            notImplemented("autoPtr<faceSelection> clone() const");
+            NotImplemented;
             return autoPtr<faceSelection>(NULL);
         }
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C
index bdc6d84e67..5b81ea3532 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,10 +71,8 @@ void Foam::faceSelections::faceZoneSelection::select
 
     if (readID == -1)
     {
-        FatalErrorIn
-        (
-            "faceSelections::faceZoneSelection::select(labelList&) const"
-        )   << "Cannot find faceZone " << zoneName_ << nl << "Valid zones are "
+        FatalErrorInFunction
+            << "Cannot find faceZone " << zoneName_ << nl << "Valid zones are "
             << mesh_.faceZones().names()
             << exit(FatalError);
     }
@@ -92,10 +90,8 @@ void Foam::faceSelections::faceZoneSelection::select
         }
         else if (faceToZoneID[faceI] != zoneID)
         {
-            FatalErrorIn
-            (
-                "faceSelections::faceZoneSelection::select(labelList&) const"
-            )   << "Face " << faceI << " already in faceZone "
+            FatalErrorInFunction
+                << "Face " << faceI << " already in faceZone "
                 << faceToZoneID[faceI]
                 << exit(FatalError);
         }
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
index c7a4ef0c1e..08a3abee31 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         //- Clone
         autoPtr<faceSelection> clone() const
         {
-            notImplemented("autoPtr<faceSelection> clone() const");
+            NotImplemented;
             return autoPtr<faceSelection>(NULL);
         }
 
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H
index f983132552..d5c04ae1ea 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ public:
         //- Clone
         autoPtr<faceSelection> clone() const
         {
-            notImplemented("autoPtr<faceSelection> clone() const");
+            NotImplemented;
             return autoPtr<faceSelection>(NULL);
         }
 
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index deefbaef38..eb89288a30 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -284,10 +284,8 @@ void separateList
     }
     else
     {
-        FatalErrorIn
-        (
-            "separateList(const vectorField&, UList<vector>&)"
-        )   << "Sizes of field and transformation not equal. field:"
+        FatalErrorInFunction
+            << "Sizes of field and transformation not equal. field:"
             << field.size() << " transformation:" << separation.size()
             << abort(FatalError);
     }
@@ -306,11 +304,8 @@ void syncPoints
 {
     if (points.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "syncPoints"
-            "(const polyMesh&, pointField&, const CombineOp&, const point&)"
-        )   << "Number of values " << points.size()
+        FatalErrorInFunction
+            << "Number of values " << points.size()
             << " is not equal to the number of points in the mesh "
             << mesh.nPoints() << abort(FatalError);
     }
@@ -470,11 +465,8 @@ void syncPoints
     {
         if (hasTransformation)
         {
-            WarningIn
-            (
-                "syncPoints"
-                "(const polyMesh&, pointField&, const CombineOp&, const point&)"
-            )   << "There are decomposed cyclics in this mesh with"
+            WarningInFunction
+                << "There are decomposed cyclics in this mesh with"
                 << " transformations." << endl
                 << "This is not supported. The result will be incorrect"
                 << endl;
@@ -512,6 +504,11 @@ int main(int argc, char *argv[])
     #include "addOverwriteOption.H"
     #include "addRegionOption.H"
     #include "addDictOption.H"
+    Foam::argList::addBoolOption
+    (
+        "writeObj",
+        "write obj files showing the cyclic matching process"
+    );
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
@@ -523,12 +520,13 @@ int main(int argc, char *argv[])
 
     #include "createNamedPolyMesh.H"
 
+    const bool writeObj = args.optionFound("writeObj");
+
     const word oldInstance = mesh.pointsInstance();
 
     const word dictName("createPatchDict");
     #include "setSystemMeshDictionaryIO.H"
-
-    Info<< "Reading " << dictName << nl << endl;
+    Info<< "Reading " << dictIO.instance()/dictIO.name() << nl << endl;
 
     IOdictionary dict(dictIO);
 
@@ -542,7 +540,10 @@ int main(int argc, char *argv[])
     patches.checkParallelSync(true);
 
 
-    dumpCyclicMatch("initial_", mesh);
+    if (writeObj)
+    {
+        dumpCyclicMatch("initial_", mesh);
+    }
 
     // Read patch construct info from dictionary
     PtrList<dictionary> patchSources(dict.lookup("patches"));
@@ -671,7 +672,7 @@ int main(int argc, char *argv[])
 
         if (destPatchI == -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "patch " << patchName << " not added. Problem."
                 << abort(FatalError);
         }
@@ -728,7 +729,7 @@ int main(int argc, char *argv[])
 
                 if (mesh.isInternalFace(faceI))
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Face " << faceI << " specified in set "
                         << faces.name()
                         << " is not an external face of the mesh." << endl
@@ -747,7 +748,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Invalid source type " << sourceType << endl
                 << "Valid source types are 'patches' 'set'" << exit(FatalError);
         }
@@ -761,7 +762,10 @@ int main(int argc, char *argv[])
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, true);
     mesh.movePoints(map().preMotionPoints());
 
-    dumpCyclicMatch("coupled_", mesh);
+    if (writeObj)
+    {
+        dumpCyclicMatch("coupled_", mesh);
+    }
 
     // Synchronise points.
     if (!pointSync)
@@ -872,7 +876,10 @@ int main(int argc, char *argv[])
     filterPatches(mesh, addedPatchNames);
 
 
-    dumpCyclicMatch("final_", mesh);
+    if (writeObj)
+    {
+        dumpCyclicMatch("final_", mesh);
+    }
 
 
     // Set the precision of the points data to 10
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 62e6cf619c..2e146fc3f9 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 6aed660ed8..1f9480a5c4 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -96,6 +96,8 @@ int main(int argc, char *argv[])
     Info<< "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H b/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H
index 01f173f10c..3cb000ccc2 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H
@@ -9,6 +9,7 @@
         masterCasePath,
         masterCaseName
     );
+    runTimeMaster.functionObjects().off();
 
     const fileName addCasePath = addCase.path();
     const fileName addCaseName = addCase.name();
@@ -19,4 +20,4 @@
         addCasePath,
         addCaseName
     );
-
+    runTimeToAdd.functionObjects().off();
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 46f59e91e8..62ef9e13fd 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
         "merge two meshes"
     );
 
-    argList::noParallel();
     #include "addOverwriteOption.H"
 
     argList::validArgs.append("masterCase");
@@ -97,6 +96,18 @@ int main(int argc, char *argv[])
     word addRegion = polyMesh::defaultRegion;
     args.optionReadIfPresent("addRegion", addRegion);
 
+    // Since we don't use argList processor directory detection, add it to
+    // the casename ourselves so it triggers the logic inside TimePath.
+    const fileName& cName = args.caseName();
+    std::string::size_type pos = cName.find("processor");
+    if (pos != string::npos && pos != 0)
+    {
+        fileName processorName = cName.substr(pos, cName.size()-pos);
+        masterCase += '/' + processorName;
+        addCase += '/' + processorName;
+    }
+
+
     getRootCase(masterCase);
     getRootCase(addCase);
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index afe8c1ce63..41e2aac937 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -319,7 +319,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
             // Check that the face is valid
             if (min(newFace) < 0)
             {
-                FatalErrorIn("void mergePolyMesh::addMesh(const polyMesh&)")
+                FatalErrorInFunction
                     << "Error in point mapping for face " << faceI
                     << ".  Old face: " << curFace << " New face: " << newFace
                     << abort(FatalError);
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index e35efbd3a6..6db0d3abc6 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,7 +175,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
 
             if (isA<processorPolyPatch>(patches[patchI]))
             {
-                FatalErrorIn("findBaffles(const polyMesh&, const labelList&)")
+                FatalErrorInFunction
                     << "Duplicate face " << faceI
                     << " is on a processorPolyPatch."
                     << "This is not allowed." << nl
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index a13f5ace43..ffbcf01cf1 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
 
         if (curPatch.coupled())
         {
-            WarningIn("mirrorFvMesh::mirrorFvMesh(const IOobject&)")
+            WarningInFunction
                 << "Found coupled patch " << curPatch.name() << endl
                 << "    Mirroring faces on coupled patches destroys"
                 << " the ordering. This might be fixed by running a dummy"
@@ -242,9 +242,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     }
 
     // Mirror boundary faces patch by patch
-
-    wordList newPatchTypes(boundary().size());
-    wordList newPatchNames(boundary().size());
+    labelList newToOldPatch(boundary().size(), -1);
     labelList newPatchSizes(boundary().size(), -1);
     labelList newPatchStarts(boundary().size(), -1);
     label nNewPatches = 0;
@@ -303,8 +301,8 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
         // If patch exists, grab the name and type of the original patch
         if (nNewFaces > newPatchStarts[nNewPatches])
         {
-            newPatchTypes[nNewPatches] = boundaryMesh()[patchI].type();
-            newPatchNames[nNewPatches] = boundaryMesh()[patchI].name();
+            newToOldPatch[nNewPatches] = patchI;
+
             newPatchSizes[nNewPatches] =
                 nNewFaces - newPatchStarts[nNewPatches];
 
@@ -316,8 +314,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     newFaces.setSize(nNewFaces);
     Info<< " New faces: " << nNewFaces << endl;
 
-    newPatchTypes.setSize(nNewPatches);
-    newPatchNames.setSize(nNewPatches);
+    newToOldPatch.setSize(nNewPatches);
     newPatchSizes.setSize(nNewPatches);
     newPatchStarts.setSize(nNewPatches);
 
@@ -377,18 +374,16 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     fvMesh& pMesh = *mirrorMeshPtr_;
 
     // Add the boundary patches
-    List<polyPatch*> p(newPatchTypes.size());
+    List<polyPatch*> p(newPatchSizes.size());
 
     forAll(p, patchI)
     {
-        p[patchI] = polyPatch::New
+        p[patchI] = boundaryMesh()[newToOldPatch[patchI]].clone
         (
-            newPatchTypes[patchI],
-            newPatchNames[patchI],
-            newPatchSizes[patchI],
-            newPatchStarts[patchI],
+            pMesh.boundaryMesh(),
             patchI,
-            pMesh.boundaryMesh()
+            newPatchSizes[patchI],
+            newPatchStarts[patchI]
         ).ptr();
     }
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index f90ed99eef..f7383289cb 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     Info<< "Writing mirrored mesh" << endl;
     mesh.mirrorMesh().write();
 
-    Info<< "End" << endl;
+    Info<< "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
index 234891816a..0c6a0170df 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index d2f25bb46f..2fac9f25c0 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -32,6 +32,7 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "dynamicFvMesh.H"
+#include "pimpleControl.H"
 #include "vtkSurfaceWriter.H"
 #include "cyclicAMIPolyPatch.H"
 
@@ -129,13 +130,23 @@ int main(int argc, char *argv[])
         Info<< "Writing VTK files with weights of AMI patches." << nl << endl;
     }
 
+    pimpleControl pimple(mesh);
+
+    bool moveMeshOuterCorrectors
+    (
+        pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+    );
+
     while (runTime.loop())
     {
         Info<< "Time = " << runTime.timeName() << endl;
 
-        for (int i = 0; i<2; i++)
+        while (pimple.loop())
         {
-            mesh.update();
+            if (pimple.firstIter() || moveMeshOuterCorrectors)
+            {
+                mesh.update();
+            }
         }
 
         mesh.checkMesh(true);
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index ebaf8737b8..e0da25a526 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
     if (!OBJfile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << objName << exit(FatalError);
     }
 
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
             {
                 hasWarned = true;
 
-                WarningIn(args.executable())
+                WarningInFunction
                     << "Unrecognized OBJ command " << cmd << nl
                     << "In line " << lineStream.str()
                     << " at linenumber " << lineNo << nl
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index e446a5d81b..1e92368b09 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
     if (fZone.checkParallelSync())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Face zone " << fZone.name()
             << " is not parallel synchronised."
             << " Any coupled face also needs its coupled version to be included"
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
                 }
                 else
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Incorrect status for face " << meshFaceI
                         << abort(FatalError);
                 }
@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Problem : unvisited face " << faceI
                 << " centre:" << mesh.faceCentres()[faceLabels[faceI]]
                 << abort(FatalError);
@@ -380,7 +380,7 @@ int main(int argc, char *argv[])
         mesh.faceZones()[zoneName].resetAddressing(faceLabels, newFlipMap);
         if (!mesh.faceZones().write())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Failed writing faceZones" << exit(FatalError);
         }
     }
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index a86343da25..ce6e15e9fa 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,10 +68,8 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
         {
             if (newToOld[newI].size() != 1)
             {
-                FatalErrorIn
-                (
-                    "meshDualiser::checkPolyTopoChange(const polyTopoChange&)"
-                )   << "duplicate verts:" << newToOld[newI]
+                FatalErrorInFunction
+                    << "duplicate verts:" << newToOld[newI]
                     << " coords:"
                     << UIndirectList<point>(points, newToOld[newI])()
                     << abort(FatalError);
@@ -189,7 +187,7 @@ bool Foam::meshDualiser::sameDualCell
 {
     if (!mesh_.isInternalFace(faceI))
     {
-        FatalErrorIn("sameDualCell(const label, const label)")
+        FatalErrorInFunction
             << "face:" << faceI << " is not internal face."
             << abort(FatalError);
     }
@@ -236,7 +234,7 @@ Foam::label Foam::meshDualiser::addInternalFace
 
         if (nUnique < facePoints.size())
         {
-            FatalErrorIn("addInternalFace(..)")
+            FatalErrorInFunction
                 << "verts:" << verts << " newFace:" << newFace
                 << " face points:" << facePoints
                 << abort(FatalError);
@@ -607,7 +605,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
             // Check: make sure that there is a midpoint on the edge.
             if (edgeToDualPoint_[edgeI] == -1)
             {
-                FatalErrorIn("createFacesFromInternalFace(..)")
+                FatalErrorInFunction
                     << "face:" << faceI << " verts:" << f
                     << " points:" << UIndirectList<point>(mesh_.points(), f)()
                     << " no feature edge between " << f[fp]
@@ -718,10 +716,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
 
             if (faceI < pp.start() || faceI >= pp.start()+pp.size())
             {
-                FatalErrorIn
-                (
-                    "meshDualiser::createFacesAroundBoundaryPoint(..)"
-                )   << "Walked from face on patch:" << patchI
+                FatalErrorInFunction
+                    << "Walked from face on patch:" << patchI
                     << " to face:" << faceI
                     << " fc:" << mesh_.faceCentres()[faceI]
                     << " on patch:" << patches.whichPatch(faceI)
@@ -731,10 +727,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
             // Check if different cell.
             if (dualCellI != findDualCell(own[faceI], pointI))
             {
-                FatalErrorIn
-                (
-                    "meshDualiser::createFacesAroundBoundaryPoint(..)"
-                )   << "Different dual cells but no feature edge"
+                FatalErrorInFunction
+                    << "Different dual cells but no feature edge"
                     << " inbetween point:" << pointI
                     << " coord:" << mesh_.points()[pointI]
                     << abort(FatalError);
@@ -926,12 +920,8 @@ void Foam::meshDualiser::setRefinement
 
         if (faceI != -1)
         {
-            FatalErrorIn
-            (
-                "meshDualiser::setRefinement"
-                "(const labelList&, const labelList&, const labelList&"
-                ", const labelList, polyTopoChange&)"
-            )   << "In split-face-mode (splitFace=true) but not all faces"
+            FatalErrorInFunction
+                << "In split-face-mode (splitFace=true) but not all faces"
                 << " marked as feature faces." << endl
                 << "First conflicting face:" << faceI
                 << " centre:" << mesh_.faceCentres()[faceI]
@@ -948,12 +938,8 @@ void Foam::meshDualiser::setRefinement
         if (edgeI != -1)
         {
             const edge& e = mesh_.edges()[edgeI];
-            FatalErrorIn
-            (
-                "meshDualiser::setRefinement"
-                "(const labelList&, const labelList&, const labelList&"
-                ", const labelList, polyTopoChange&)"
-            )   << "In split-face-mode (splitFace=true) but not all edges"
+            FatalErrorInFunction
+                << "In split-face-mode (splitFace=true) but not all edges"
                 << " marked as feature edges." << endl
                 << "First conflicting edge:" << edgeI
                 << " verts:" << e
@@ -979,12 +965,8 @@ void Foam::meshDualiser::setRefinement
         {
             if (!featureFaceSet[faceI])
             {
-                FatalErrorIn
-                (
-                    "meshDualiser::setRefinement"
-                    "(const labelList&, const labelList&, const labelList&"
-                    ", const labelList, polyTopoChange&)"
-                )   << "Not all boundary faces marked as feature faces."
+                FatalErrorInFunction
+                    << "Not all boundary faces marked as feature faces."
                     << endl
                     << "First conflicting face:" << faceI
                     << " centre:" << mesh_.faceCentres()[faceI]
@@ -1071,12 +1053,8 @@ void Foam::meshDualiser::setRefinement
 
         if (pointToDualCells_[pointI].size() > 0)
         {
-            FatalErrorIn
-            (
-                "meshDualiser::setRefinement"
-                "(const labelList&, const labelList&, const labelList&"
-                ", const labelList, polyTopoChange&)"
-            )   << "Point " << pointI << " at:" << mesh_.points()[pointI]
+            FatalErrorInFunction
+                << "Point " << pointI << " at:" << mesh_.points()[pointI]
                 << " is both in singleCellFeaturePoints"
                 << " and multiCellFeaturePoints."
                 << abort(FatalError);
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index 9f7b6057ed..f0c4c16d71 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -246,7 +246,7 @@ void simpleMarkFeatures
     {
         if (faceZones.size() > 0)
         {
-            WarningIn("simpleMarkFeatures(..)")
+            WarningInFunction
                 << "Detected " << faceZones.size()
                 << " faceZones. These will not be preserved."
                 << endl;
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 3714b3a712..05a548eeee 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -28,9 +28,9 @@ Description
     Utility to refine cells in multiple directions.
 
     Command-line option handling:
-    + If -all specified or no refineMeshDict exists or, refine all cells
-    + If -dict <file> specified refine according to <file>
-    + If refineMeshDict exists refine according to refineMeshDict
+    - If -all specified or no refineMeshDict exists or, refine all cells
+    - If -dict \<file\> specified refine according to \<file\>
+    - If refineMeshDict exists refine according to refineMeshDict
 
     When the refinement or all cells is selected apply 3D refinement for 3D
     cases and 2D refinement for 2D cases.
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
 
         if (!dictIO.headerOk())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Cannot open specified refinement dictionary "
                 << dictPath
                 << exit(FatalError);
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
index 56601744c8..6bd8d51845 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 6b3b632467..d9fd1daa6b 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anispulation  |
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,11 +46,15 @@ Description
 #include "zeroGradientFvPatchFields.H"
 #include "CuthillMcKeeRenumber.H"
 #include "fvMeshSubset.H"
+#include "cellSet.H"
+#include "faceSet.H"
+#include "pointSet.H"
 
 #ifdef FOAM_USE_ZOLTAN
     #include "zoltanRenumber.H"
 #endif
 
+
 using namespace Foam;
 
 
@@ -163,7 +167,7 @@ void getBand
 labelList getFaceOrder
 (
     const primitiveMesh& mesh,
-    const labelList& cellOrder      // new to old cell
+    const labelList& cellOrder      // New to old cell
 )
 {
     labelList reverseCellOrder(invert(cellOrder.size(), cellOrder));
@@ -240,12 +244,8 @@ labelList getFaceOrder
     {
         if (oldToNewFace[faceI] == -1)
         {
-            FatalErrorIn
-            (
-                "getFaceOrder"
-                "(const primitiveMesh&, const labelList&, const labelList&)"
-            )   << "Did not determine new position"
-                << " for face " << faceI
+            FatalErrorInFunction
+                << "Did not determine new position" << " for face " << faceI
                 << abort(FatalError);
         }
     }
@@ -259,12 +259,10 @@ labelList getFaceOrder
 labelList getRegionFaceOrder
 (
     const primitiveMesh& mesh,
-    const labelList& cellOrder,     // new to old cell
-    const labelList& cellToRegion   // old cell to region
+    const labelList& cellOrder,     // New to old cell
+    const labelList& cellToRegion   // Old cell to region
 )
 {
-    //Pout<< "Determining face order:" << endl;
-
     labelList reverseCellOrder(invert(cellOrder.size(), cellOrder));
 
     labelList oldToNewFace(mesh.nFaces(), -1);
@@ -280,8 +278,6 @@ labelList getRegionFaceOrder
         if (cellToRegion[oldCellI] != prevRegion)
         {
             prevRegion = cellToRegion[oldCellI];
-            //Pout<< "    region " << prevRegion << " internal faces start at "
-            //    << newFaceI << endl;
         }
 
         const cell& cFaces = mesh.cells()[oldCellI];
@@ -368,9 +364,6 @@ labelList getRegionFaceOrder
 
             if (prevKey != key)
             {
-                //Pout<< "    faces inbetween region " << key/nRegions
-                //    << " and " << key%nRegions
-                //    << " start at " << newFaceI << endl;
                 prevKey = key;
             }
 
@@ -390,16 +383,12 @@ labelList getRegionFaceOrder
     {
         if (oldToNewFace[faceI] == -1)
         {
-            FatalErrorIn
-            (
-                "getRegionFaceOrder"
-                "(const primitveMesh&, const labelList&, const labelList&)"
-            )   << "Did not determine new position"
+            FatalErrorInFunction
+                << "Did not determine new position"
                 << " for face " << faceI
                 << abort(FatalError);
         }
     }
-    //Pout<< endl;
 
     return invert(mesh.nFaces(), oldToNewFace);
 }
@@ -407,7 +396,7 @@ labelList getRegionFaceOrder
 
 // cellOrder: old cell for every new cell
 // faceOrder: old face for every new face. Ordering of boundary faces not
-// changed.
+//     changed.
 autoPtr<mapPolyMesh> reorderMesh
 (
     polyMesh& mesh,
@@ -528,7 +517,7 @@ autoPtr<mapPolyMesh> reorderMesh
     (
         new mapPolyMesh
         (
-            mesh,                       //const polyMesh& mesh,
+            mesh,                       // const polyMesh& mesh,
             mesh.nPoints(),             // nOldPoints,
             mesh.nFaces(),              // nOldFaces,
             mesh.nCells(),              // nOldCells,
@@ -634,17 +623,20 @@ int main(int argc, char *argv[])
         "calculate the rms of the frontwidth"
     );
 
-    // Force linker to include zoltan symbols. This section is only needed since
-    // Zoltan is a static library
-    #ifdef FOAM_USE_ZOLTAN
-    Info<< "renumberMesh built with zoltan support." << nl << endl;
-    (void)zoltanRenumber::typeName;
-    #endif
 
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
 
+
+    // Force linker to include zoltan symbols. This section is only needed since
+    // Zoltan is a static library
+    #ifdef FOAM_USE_ZOLTAN
+        Info<< "renumberMesh built with zoltan support." << nl << endl;
+        (void)zoltanRenumber::typeName;
+    #endif
+
+
     // Get times list
     instantList Times = runTime.times();
 
@@ -682,24 +674,26 @@ int main(int argc, char *argv[])
         (
             sumSqrIntersect,
             sumOp<scalar>()
-        )
-       /mesh.globalData().nTotalCells()
+        )/mesh.globalData().nTotalCells()
     );
 
     Info<< "Mesh size: " << mesh.globalData().nTotalCells() << nl
         << "Before renumbering :" << nl
         << "    band           : " << band << nl
         << "    profile        : " << profile << nl;
+
     if (doFrontWidth)
     {
         Info<< "    rms frontwidth : " << rmsFrontwidth << nl;
     }
+
     Info<< endl;
 
     bool sortCoupledFaceCells = false;
     bool writeMaps = false;
     bool orderPoints = false;
     label blockSize = 0;
+    bool renumberSets = true;
 
     // Construct renumberMethod
     autoPtr<IOdictionary> renumberDictPtr;
@@ -717,7 +711,6 @@ int main(int argc, char *argv[])
 
         renumberPtr = renumberMethod::New(renumberDict);
 
-
         sortCoupledFaceCells = renumberDict.lookupOrDefault
         (
             "sortCoupledFaceCells",
@@ -739,7 +732,7 @@ int main(int argc, char *argv[])
 
             if (blockSize < 0 || blockSize >= mesh.nCells())
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Block size " << blockSize
                     << " should be positive integer"
                     << " and less than the number of cells in the mesh."
@@ -760,6 +753,8 @@ int main(int argc, char *argv[])
             Info<< "Writing renumber maps (new to old) to polyMesh." << nl
                 << endl;
         }
+
+        renumberSets = renumberDict.lookupOrDefault("renumberSets", true);
     }
     else
     {
@@ -827,6 +822,7 @@ int main(int argc, char *argv[])
     // Read objects in time directory
     IOobjectList objects(mesh, runTime.timeName());
 
+
     // Read vol fields.
 
     PtrList<volScalarField> vsFlds;
@@ -844,6 +840,7 @@ int main(int argc, char *argv[])
     PtrList<volTensorField> vtFlds;
     ReadFields(mesh, objects, vtFlds);
 
+
     // Read surface fields.
 
     PtrList<surfaceScalarField> ssFlds;
@@ -861,6 +858,72 @@ int main(int argc, char *argv[])
     PtrList<surfaceTensorField> stFlds;
     ReadFields(mesh, objects, stFlds);
 
+
+    // Read point fields.
+
+    PtrList<pointScalarField> psFlds;
+    ReadFields(pointMesh::New(mesh), objects, psFlds);
+
+    PtrList<pointVectorField> pvFlds;
+    ReadFields(pointMesh::New(mesh), objects, pvFlds);
+
+    PtrList<pointSphericalTensorField> pstFlds;
+    ReadFields(pointMesh::New(mesh), objects, pstFlds);
+
+    PtrList<pointSymmTensorField> psymtFlds;
+    ReadFields(pointMesh::New(mesh), objects, psymtFlds);
+
+    PtrList<pointTensorField> ptFlds;
+    ReadFields(pointMesh::New(mesh), objects, ptFlds);
+
+
+    // Read sets
+    PtrList<cellSet> cellSets;
+    PtrList<faceSet> faceSets;
+    PtrList<pointSet> pointSets;
+    if (renumberSets)
+    {
+        // Read sets
+        IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
+        {
+            IOobjectList cSets(objects.lookupClass(cellSet::typeName));
+            if (cSets.size())
+            {
+                Info<< "Reading cellSets:" << endl;
+                forAllConstIter(IOobjectList, cSets, iter)
+                {
+                    cellSets.append(new cellSet(*iter()));
+                    Info<< "    " << cellSets.last().name() << endl;
+                }
+            }
+        }
+        {
+            IOobjectList fSets(objects.lookupClass(faceSet::typeName));
+            if (fSets.size())
+            {
+                Info<< "Reading faceSets:" << endl;
+                forAllConstIter(IOobjectList, fSets, iter)
+                {
+                    faceSets.append(new faceSet(*iter()));
+                    Info<< "    " << faceSets.last().name() << endl;
+                }
+            }
+        }
+        {
+            IOobjectList pSets(objects.lookupClass(pointSet::typeName));
+            if (pSets.size())
+            {
+                Info<< "Reading pointSets:" << endl;
+                forAllConstIter(IOobjectList, pSets, iter)
+                {
+                    pointSets.append(new pointSet(*iter()));
+                    Info<< "    " << pointSets.last().name() << endl;
+                }
+            }
+        }
+    }
+
+
     Info<< endl;
 
     // From renumbering:
@@ -873,7 +936,7 @@ int main(int argc, char *argv[])
         // Renumbering in two phases. Should be done in one so mapping of
         // fields is done correctly!
 
-        label nBlocks = mesh.nCells() / blockSize;
+        label nBlocks = mesh.nCells()/blockSize;
         Info<< "nBlocks   = " << nBlocks << endl;
 
         // Read decompositionMethod dictionary
@@ -1011,7 +1074,7 @@ int main(int argc, char *argv[])
         faceOrder = getFaceOrder
         (
             mesh,
-            cellOrder      // new to old cell
+            cellOrder      // New to old cell
         );
     }
 
@@ -1032,17 +1095,19 @@ int main(int argc, char *argv[])
         autoPtr<mapPolyMesh> pointOrderMap = meshMod.changeMesh
         (
             mesh,
-            false,      //inflate
-            true,       //syncParallel
-            false,      //orderCells
-            orderPoints //orderPoints
+            false,      // inflate
+            true,       // syncParallel
+            false,      // orderCells
+            orderPoints // orderPoints
         );
+
         // Combine point reordering into map.
         const_cast<labelList&>(map().pointMap()) = UIndirectList<label>
         (
             map().pointMap(),
             pointOrderMap().pointMap()
         )();
+
         inplaceRenumber
         (
             pointOrderMap().reversePointMap(),
@@ -1055,7 +1120,6 @@ int main(int argc, char *argv[])
     mesh.updateMesh(map);
 
     // Update proc maps
-    if (cellProcAddressing.headerOk())
     if
     (
         cellProcAddressing.headerOk()
@@ -1070,7 +1134,6 @@ int main(int argc, char *argv[])
             UIndirectList<label>(cellProcAddressing, map().cellMap())
         );
     }
-    if (faceProcAddressing.headerOk())
     if
     (
         faceProcAddressing.headerOk()
@@ -1096,12 +1159,11 @@ int main(int argc, char *argv[])
 
             if (masterFaceI == 0)
             {
-                FatalErrorIn(args.executable()) << "problem faceI:" << faceI
+                FatalErrorInFunction
                     << " masterFaceI:" << masterFaceI << exit(FatalError);
             }
         }
     }
-    if (pointProcAddressing.headerOk())
     if
     (
         pointProcAddressing.headerOk()
@@ -1147,17 +1209,19 @@ int main(int argc, char *argv[])
             (
                 sumSqrIntersect,
                 sumOp<scalar>()
-            )
-          / mesh.globalData().nTotalCells()
+            )/mesh.globalData().nTotalCells()
         );
+
         Info<< "After renumbering :" << nl
             << "    band           : " << band << nl
             << "    profile        : " << profile << nl;
+
         if (doFrontWidth)
         {
 
             Info<< "    rms frontwidth : " << rmsFrontwidth << nl;
         }
+
         Info<< endl;
     }
 
@@ -1225,47 +1289,83 @@ int main(int argc, char *argv[])
     Info<< "Writing mesh to " << mesh.facesInstance() << endl;
 
     mesh.write();
+
     if (cellProcAddressing.headerOk())
-    if
-    (
-        cellProcAddressing.headerOk()
-     && cellProcAddressing.size() == mesh.nCells()
-    )
     {
         cellProcAddressing.instance() = mesh.facesInstance();
-        cellProcAddressing.write();
-    }
-    if (faceProcAddressing.headerOk())
-    if
-    (
-        faceProcAddressing.headerOk()
-     && faceProcAddressing.size() == mesh.nFaces()
-    )
-    {
-        faceProcAddressing.instance() = mesh.facesInstance();
-        faceProcAddressing.write();
-    }
-    if (pointProcAddressing.headerOk())
-    if
-    (
-        pointProcAddressing.headerOk()
-     && pointProcAddressing.size() == mesh.nPoints()
-    )
-    {
-        pointProcAddressing.instance() = mesh.facesInstance();
-        pointProcAddressing.write();
-    }
-    if (boundaryProcAddressing.headerOk())
-    if
-    (
-        boundaryProcAddressing.headerOk()
-     && boundaryProcAddressing.size() == mesh.boundaryMesh().size()
-    )
-    {
-        boundaryProcAddressing.instance() = mesh.facesInstance();
-        boundaryProcAddressing.write();
+        if (cellProcAddressing.size() == mesh.nCells())
+        {
+            cellProcAddressing.write();
+        }
+        else
+        {
+            // procAddressing file no longer valid. Delete it.
+            const fileName fName(cellProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor cell decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
     }
 
+    if (faceProcAddressing.headerOk())
+    {
+        faceProcAddressing.instance() = mesh.facesInstance();
+        if (faceProcAddressing.size() == mesh.nFaces())
+        {
+            faceProcAddressing.write();
+        }
+        else
+        {
+            const fileName fName(faceProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor face decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
+    }
+
+    if (pointProcAddressing.headerOk())
+    {
+        pointProcAddressing.instance() = mesh.facesInstance();
+        if (pointProcAddressing.size() == mesh.nPoints())
+        {
+            pointProcAddressing.write();
+        }
+        else
+        {
+            const fileName fName(pointProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor point decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
+    }
+
+    if (boundaryProcAddressing.headerOk())
+    {
+        boundaryProcAddressing.instance() = mesh.facesInstance();
+        if (boundaryProcAddressing.size() == mesh.boundaryMesh().size())
+        {
+            boundaryProcAddressing.write();
+        }
+        else
+        {
+            const fileName fName(boundaryProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor patch decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
+    }
 
     if (writeMaps)
     {
@@ -1276,17 +1376,18 @@ int main(int argc, char *argv[])
             "origCellID",
             map().cellMap()
         )().write();
+
         createScalarField
         (
             mesh,
             "cellID",
             identity(mesh.nCells())
         )().write();
+
         Info<< nl << "Written current cellID and origCellID as volScalarField"
             << " for use in postprocessing."
             << nl << endl;
 
-
         labelIOList
         (
             IOobject
@@ -1301,6 +1402,7 @@ int main(int argc, char *argv[])
             ),
             map().cellMap()
         ).write();
+
         labelIOList
         (
             IOobject
@@ -1315,6 +1417,7 @@ int main(int argc, char *argv[])
             ),
             map().faceMap()
         ).write();
+
         labelIOList
         (
             IOobject
@@ -1331,6 +1434,28 @@ int main(int argc, char *argv[])
         ).write();
     }
 
+    if (renumberSets)
+    {
+        forAll(cellSets, i)
+        {
+            cellSets[i].updateMesh(map());
+            cellSets[i].instance() = mesh.facesInstance();
+            cellSets[i].write();
+        }
+        forAll(faceSets, i)
+        {
+            faceSets[i].updateMesh(map());
+            faceSets[i].instance() = mesh.facesInstance();
+            faceSets[i].write();
+        }
+        forAll(pointSets, i)
+        {
+            pointSets[i].updateMesh(map());
+            pointSets[i].instance() = mesh.facesInstance();
+            pointSets[i].write();
+        }
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
index 2cd1a68ca5..2355519d0c 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -34,6 +34,8 @@ sortCoupledFaceCells false;
 // Optional entry: sort points into internal and boundary points
 //orderPoints false;
 
+// Optional: suppress renumbering cellSets,faceSets,pointSets
+//renumberSets false;
 
 
 method          CuthillMcKee;
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index a30f49767e..07b146f674 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -174,12 +174,8 @@ void writeVTK
     }
     else
     {
-        WarningIn
-        (
-            "void writeVTK"
-            "(const polyMesh& mesh, const topoSet& currentSet,"
-            "const fileName& vtkName)"
-        )   << "Don't know how to handle set of type " << currentSet.type()
+        WarningInFunction
+            << "Don't know how to handle set of type " << currentSet.type()
             << endl;
     }
 }
@@ -690,7 +686,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
         }
         default:
         {
-            FatalErrorIn("meshReadUpdate(polyMesh&)")
+            FatalErrorInFunction
                 << "Illegal mesh update state "
                 << stat  << abort(FatalError);
             break;
@@ -770,11 +766,8 @@ commandStatus parseType
     }
     else
     {
-        SeriousErrorIn
-        (
-            "commandStatus parseType(Time&, polyMesh&, const word&"
-            ", IStringStream&)"
-        )   << "Illegal command " << setType << endl
+        SeriousErrorInFunction
+            << "Illegal command " << setType << endl
             << "Should be one of 'help', 'list', 'time' or a set type :"
             << " 'cellSet', 'faceSet', 'pointSet', 'faceZoneSet'"
             << endl;
@@ -839,7 +832,7 @@ int main(int argc, char *argv[])
 
     if (loop && !batch)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Can only loop in batch mode."
             << exit(FatalError);
     }
@@ -889,7 +882,7 @@ int main(int argc, char *argv[])
             // we cannot handle .gz files
             if (!isFile(batchFile, false))
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot open file " << batchFile << exit(FatalError);
             }
 
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 60484b356a..da157f7577 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
                     }
                     else
                     {
-                        FatalErrorIn(args.executable())
+                        FatalErrorInFunction
                             << "One of owner or neighbour of internal face "
                             << faceI << " should be in cellSet " << cells.name()
                             << " to be able to determine orientation." << endl
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
 
     if (!mesh.write())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing polyMesh."
             << exit(FatalError);
     }
diff --git a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
index 5289a03d9d..7ce51edf61 100644
--- a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
+++ b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 
     if (regionName == singleCellName)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot convert region " << singleCellName
             << " since result would overwrite it. Please rename your region."
             << exit(FatalError);
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index 50decb45d3..324143751c 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,11 +101,8 @@ Foam::label Foam::regionSide::otherEdge
         }
     }
 
-    FatalErrorIn
-    (
-        "regionSide::otherEdge(const primitiveMesh&, const label, const label"
-        ", const label)"
-    )   << "Cannot find other edge on face " << faceI << " that uses point "
+    FatalErrorInFunction
+        << "Cannot find other edge on face " << faceI << " that uses point "
         << pointI << " but not point " << freePointI << endl
         << "Edges on face:" << fEdges
         << " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index f1ed44e653..3171ed5e86 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -75,10 +75,8 @@ label findEdge(const primitiveMesh& mesh, const label v0, const label v1)
         }
     }
 
-    FatalErrorIn
-    (
-        "findEdge(const primitiveMesh&, const label, const label)"
-    )   << "Cannot find edge between mesh points " << v0 << " and " << v1
+    FatalErrorInFunction
+        << "Cannot find edge between mesh points " << v0 << " and " << v1
         << abort(FatalError);
 
     return -1;
@@ -92,7 +90,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
 
     if (patchI == -1)
     {
-        FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+        FatalErrorInFunction
             << "Cannot find patch " << name << nl
             << "It should be present but of zero size" << endl
             << "Valid patches are " << bMesh.names()
@@ -101,7 +99,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
 
     if (bMesh[patchI].size())
     {
-        FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+        FatalErrorInFunction
             << "Patch " << name << " is present but non-zero size"
             << exit(FatalError);
     }
@@ -143,7 +141,7 @@ int main(int argc, char *argv[])
     {
         if (!mesh.isInternalFace(faces[i]))
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
             << "Face " << faces[i] << " in faceSet " << setName
             << " is not an internal face."
             << exit(FatalError);
@@ -282,12 +280,13 @@ int main(int argc, char *argv[])
     Info<< "Writing mesh to " << runTime.timeName() << endl;
     if (!mesh.write())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing polyMesh."
             << exit(FatalError);
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 6565776cdf..f79a9cb110 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -126,10 +126,8 @@ void renamePatches
 
         if (isA<coupledPolyPatch>(pp))
         {
-            WarningIn
-            (
-                "renamePatches(fvMesh&, const word&, const labelList&"
-            )   << "Encountered coupled patch " << pp.name()
+            WarningInFunction
+                << "Encountered coupled patch " << pp.name()
                 << ". Will only rename the patch itself,"
                 << " not any referred patches."
                 << " This might have to be done by hand."
@@ -202,6 +200,7 @@ void subsetSurfaceFields
 (
     const fvMesh& mesh,
     const fvMesh& subMesh,
+    const labelList& cellMap,
     const labelList& faceMap,
     const labelHashSet& addedPatches
 )
@@ -225,6 +224,7 @@ void subsetSurfaceFields
                 fld,
                 subMesh,
                 patchMap,
+                cellMap,
                 faceMap
             )
         );
@@ -695,7 +695,7 @@ autoPtr<mapPolyMesh> createRegionMesh
         }
         else
         {
-            FatalErrorIn("createRegionMesh(..)")
+            FatalErrorInFunction
                 << "Exposed face:" << faceI
                 << " fc:" << mesh.faceCentres()[faceI]
                 << " has owner region " << ownRegion
@@ -830,6 +830,7 @@ void createAndWriteRegion
     (
         mesh,
         newMesh(),
+        map().cellMap(),
         map().faceMap(),
         addedPatches
     );
@@ -837,6 +838,7 @@ void createAndWriteRegion
     (
         mesh,
         newMesh(),
+        map().cellMap(),
         map().faceMap(),
         addedPatches
     );
@@ -844,6 +846,7 @@ void createAndWriteRegion
     (
         mesh,
         newMesh(),
+        map().cellMap(),
         map().faceMap(),
         addedPatches
     );
@@ -851,6 +854,7 @@ void createAndWriteRegion
     (
         mesh,
         newMesh(),
+        map().cellMap(),
         map().faceMap(),
         addedPatches
     );
@@ -858,6 +862,7 @@ void createAndWriteRegion
     (
         mesh,
         newMesh(),
+        map().cellMap(),
         map().faceMap(),
         addedPatches
     );
@@ -1209,7 +1214,7 @@ void getZoneID
             }
             else
             {
-                FatalErrorIn("getZoneID(..)")
+                FatalErrorInFunction
                     << "Cell " << cellI << " with cell centre "
                     << mesh.cellCentres()[cellI]
                     << " is multiple zones. This is not allowed." << endl
@@ -1267,7 +1272,7 @@ void matchRegions
         {
             if (zoneNames[procI] != zoneNames[0])
             {
-                FatalErrorIn("matchRegions(..)")
+                FatalErrorInFunction
                     << "cellZones not synchronised across processors." << endl
                     << "Master has cellZones " << zoneNames[0] << endl
                     << "Processor " << procI
@@ -1501,7 +1506,7 @@ int main(int argc, char *argv[])
      && (useCellZones || blockedFacesName.size())
     )
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "You cannot specify both -cellZonesOnly or -cellZonesFileOnly"
             << " (which specify complete split)"
             << " in combination with -blockedFaces or -cellZones"
@@ -1526,7 +1531,7 @@ int main(int argc, char *argv[])
 
     if (insidePoint && largestOnly)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "You cannot specify both -largestOnly"
             << " (keep region with most cells)"
             << " and -insidePoint (keep region containing point)"
@@ -1566,7 +1571,7 @@ int main(int argc, char *argv[])
         label unzonedCellI = findIndex(zoneID, -1);
         if (unzonedCellI != -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "For the cellZonesOnly option all cells "
                 << "have to be in a cellZone." << endl
                 << "Cell " << unzonedCellI
@@ -1615,7 +1620,7 @@ int main(int argc, char *argv[])
         label unzonedCellI = findIndex(newZoneID, -1);
         if (unzonedCellI != -1)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "For the cellZonesFileOnly option all cells "
                 << "have to be in a cellZone." << endl
                 << "Cell " << unzonedCellI
@@ -2012,7 +2017,7 @@ int main(int argc, char *argv[])
 
             if (regionI == -1)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Point " << insidePoint
                     << " is not inside the mesh." << nl
                     << "Bounding box of the mesh:" << mesh.bounds()
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 8e64c28a38..2e1fc21747 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -177,7 +177,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
 
     if (patchI == -1)
     {
-        FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+        FatalErrorInFunction
             << "Cannot find patch " << name << endl
             << "It should be present and of non-zero size" << endl
             << "Valid patches are " << bMesh.names()
@@ -186,7 +186,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
 
     if (bMesh[patchI].empty())
     {
-        FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+        FatalErrorInFunction
             << "Patch " << name << " is present but zero size"
             << exit(FatalError);
     }
@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
 
     if (partialCover && perfectCover)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot supply both partial and perfect." << endl
             << "Use perfect match option if the patches perfectly align"
             << " (both vertex positions and face centres)" << endl
@@ -487,7 +487,7 @@ int main(int argc, char *argv[])
         )
     )
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing polyMesh."
             << exit(FatalError);
     }
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
     // Write fields
     runTime.write();
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl <<  endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
index a5e7a3297f..8ca3668d8d 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
+++ b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/Make/options b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
index 52519d4f3b..024b277190 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
@@ -1,11 +1,10 @@
 EXE_INC = \
-    -IcellSelection \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -ldynamicMesh \
     -lmeshTools \
+    -ldynamicMesh \
     -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 63d91ac178..358cbb3ddf 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,11 +41,86 @@ Description
 #include "cellSet.H"
 #include "IOobjectList.H"
 #include "volFields.H"
+#include "topoDistanceData.H"
+#include "FaceCellWave.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+labelList nearestPatch(const polyMesh& mesh, const labelList& patchIDs)
+{
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    // Count number of faces in exposedPatchIDs
+    label nFaces = 0;
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = pbm[patchIDs[i]];
+        nFaces += pp.size();
+    }
+
+    // Field on cells and faces.
+    List<topoDistanceData> cellData(mesh.nCells());
+    List<topoDistanceData> faceData(mesh.nFaces());
+
+    // Start of changes
+    labelList patchFaces(nFaces);
+    List<topoDistanceData> patchData(nFaces);
+    nFaces = 0;
+    forAll(patchIDs, i)
+    {
+        label patchI = patchIDs[i];
+        const polyPatch& pp = pbm[patchI];
+
+        forAll(pp, i)
+        {
+            patchFaces[nFaces] = pp.start()+i;
+            patchData[nFaces] = topoDistanceData(patchI, 0);
+            nFaces++;
+        }
+    }
+
+    // Propagate information inwards
+    FaceCellWave<topoDistanceData> deltaCalc
+    (
+        mesh,
+        patchFaces,
+        patchData,
+        faceData,
+        cellData,
+        mesh.globalData().nTotalCells()+1
+    );
+
+    // And extract
+
+    labelList nearest(mesh.nFaces());
+
+    bool haveWarned = false;
+    forAll(faceData, faceI)
+    {
+        if (!faceData[faceI].valid(deltaCalc.data()))
+        {
+            if (!haveWarned)
+            {
+                WarningInFunction
+                    << "Did not visit some faces, e.g. face " << faceI
+                    << " at " << mesh.faceCentres()[faceI] << endl
+                    << "Using patch " << patchIDs[0] << " as nearest"
+                    << endl;
+                haveWarned = true;
+            }
+            nearest[faceI] = patchIDs[0];
+        }
+        else
+        {
+            nearest[faceI] = faceData[faceI].data();
+        }
+    }
+
+    return nearest;
+}
+
 
 template<class Type>
 void subsetVolFields
@@ -150,6 +225,40 @@ void subsetPointFields
 }
 
 
+template<class Type>
+void subsetDimensionedFields
+(
+    const fvMeshSubset& subsetter,
+    const wordList& fieldNames,
+    PtrList<DimensionedField<Type, volMesh> >& subFields
+)
+{
+    const fvMesh& baseMesh = subsetter.baseMesh();
+
+    forAll(fieldNames, i)
+    {
+        const word& fieldName = fieldNames[i];
+
+        Info<< "Subsetting field " << fieldName << endl;
+
+        DimensionedField<Type, volMesh> fld
+        (
+            IOobject
+            (
+                fieldName,
+                baseMesh.time().timeName(),
+                baseMesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            baseMesh
+        );
+
+        subFields.set(i, subsetter.interpolate(fld));
+    }
+}
+
+
 
 int main(int argc, char *argv[])
 {
@@ -169,6 +278,13 @@ int main(int argc, char *argv[])
         "'oldInternalFaces'"
     );
     argList::addOption
+    (
+        "patches",
+        "names",
+        "add exposed internal faces to nearest of specified patches"
+        " instead of to 'oldInternalFaces'"
+    );
+    argList::addOption
     (
         "resultTime",
         "time",
@@ -207,17 +323,21 @@ int main(int argc, char *argv[])
     // Create mesh subsetting engine
     fvMeshSubset subsetter(mesh);
 
-    label patchI = -1;
+    labelList exposedPatchIDs;
 
     if (args.optionFound("patch"))
     {
         const word patchName = args["patch"];
 
-        patchI = mesh.boundaryMesh().findPatchID(patchName);
+        exposedPatchIDs = labelList
+        (
+            1,
+            mesh.boundaryMesh().findPatchID(patchName)
+        );
 
-        if (patchI == -1)
+        if (exposedPatchIDs[0] == -1)
         {
-            FatalErrorIn(args.executable()) << "Illegal patch " << patchName
+            FatalErrorInFunction
                 << nl << "Valid patches are " << mesh.boundaryMesh().names()
                 << exit(FatalError);
         }
@@ -225,17 +345,53 @@ int main(int argc, char *argv[])
         Info<< "Adding exposed internal faces to patch " << patchName << endl
             << endl;
     }
+    else if (args.optionFound("patches"))
+    {
+        const wordReList patchNames(args.optionRead<wordReList>("patches"));
+
+        exposedPatchIDs = mesh.boundaryMesh().patchSet(patchNames).sortedToc();
+
+        Info<< "Adding exposed internal faces to nearest of patches "
+            << patchNames << endl << endl;
+    }
     else
     {
         Info<< "Adding exposed internal faces to a patch called"
             << " \"oldInternalFaces\" (created if necessary)" << endl
             << endl;
+        exposedPatchIDs = labelList(1, label(-1));
     }
 
 
     cellSet currentSet(mesh, setName);
 
-    subsetter.setLargeCellSubset(currentSet, patchI, true);
+    if (exposedPatchIDs.size() == 1)
+    {
+        subsetter.setLargeCellSubset(currentSet, exposedPatchIDs[0], true);
+    }
+    else
+    {
+
+        // Find per face the nearest patch
+        labelList nearestExposedPatch(nearestPatch(mesh, exposedPatchIDs));
+
+        labelList region(mesh.nCells(), 0);
+        forAllConstIter(cellSet, currentSet, iter)
+        {
+            region[iter.key()] = 1;
+        }
+
+        labelList exposedFaces(subsetter.getExposedFaces(region, 1, true));
+        subsetter.setLargeCellSubset
+        (
+            region,
+            1,
+            exposedFaces,
+            UIndirectList<label>(nearestExposedPatch, exposedFaces)(),
+            true
+        );
+    }
+
 
     IOobjectList objects(mesh, runTime.timeName());
 
@@ -361,6 +517,42 @@ int main(int argc, char *argv[])
     subsetPointFields(subsetter, pMesh, pointTensorNames, pointTensorFlds);
 
 
+    // Read dimensioned fields and subset
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    typedef volScalarField::DimensionedInternalField dimScalType;
+    wordList scalarDimNames(objects.names(dimScalType::typeName));
+    PtrList<dimScalType> scalarDimFlds(scalarDimNames.size());
+    subsetDimensionedFields(subsetter, scalarDimNames, scalarDimFlds);
+
+    typedef volVectorField::DimensionedInternalField dimVecType;
+    wordList vectorDimNames(objects.names(dimVecType::typeName));
+    PtrList<dimVecType> vectorDimFlds(vectorDimNames.size());
+    subsetDimensionedFields(subsetter, vectorDimNames, vectorDimFlds);
+
+    typedef volSphericalTensorField::DimensionedInternalField dimSphereType;
+    wordList sphericalTensorDimNames(objects.names(dimSphereType::typeName));
+    PtrList<dimSphereType> sphericalTensorDimFlds
+    (
+        sphericalTensorDimNames.size()
+    );
+    subsetDimensionedFields
+    (
+        subsetter,
+        sphericalTensorDimNames,
+        sphericalTensorDimFlds
+    );
+
+    typedef volSymmTensorField::DimensionedInternalField dimSymmTensorType;
+    wordList symmTensorDimNames(objects.names(dimSymmTensorType::typeName));
+    PtrList<dimSymmTensorType> symmTensorDimFlds(symmTensorDimNames.size());
+    subsetDimensionedFields(subsetter, symmTensorDimNames, symmTensorDimFlds);
+
+    typedef volTensorField::DimensionedInternalField dimTensorType;
+    wordList tensorDimNames(objects.names(dimTensorType::typeName));
+    PtrList<dimTensorType> tensorDimFlds(tensorDimNames.size());
+    subsetDimensionedFields(subsetter, tensorDimNames, tensorDimFlds);
+
 
     // Write mesh and fields to new time
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -461,6 +653,33 @@ int main(int argc, char *argv[])
         pointTensorFlds[i].write();
     }
 
+    // DimensionedFields
+    forAll(scalarDimFlds, i)
+    {
+        scalarDimFlds[i].rename(scalarDimNames[i]);
+        scalarDimFlds[i].write();
+    }
+    forAll(vectorDimFlds, i)
+    {
+        vectorDimFlds[i].rename(vectorDimNames[i]);
+        vectorDimFlds[i].write();
+    }
+    forAll(sphericalTensorDimFlds, i)
+    {
+        sphericalTensorDimFlds[i].rename(sphericalTensorDimNames[i]);
+        sphericalTensorDimFlds[i].write();
+    }
+    forAll(symmTensorDimFlds, i)
+    {
+        symmTensorDimFlds[i].rename(symmTensorDimNames[i]);
+        symmTensorDimFlds[i].write();
+    }
+    forAll(tensorDimFlds, i)
+    {
+        tensorDimFlds[i].rename(tensorDimNames[i]);
+        tensorDimFlds[i].write();
+    }
+
 
     Info<< "\nEnd\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index a64c051a09..4112e4df19 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
         }
         default:
         {
-            FatalErrorIn("meshReadUpdate(polyMesh&)")
+            FatalErrorInFunction
                 << "Illegal mesh update state "
                 << stat  << abort(FatalError);
             break;
@@ -354,7 +354,7 @@ int main(int argc, char *argv[])
 
 
                 default:
-                    WarningIn(args.executable())
+                    WarningInFunction
                         << "Unhandled action " << action << endl;
                 break;
             }
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 5f0e5c0b39..8be3ade6a2 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -372,19 +372,22 @@ FoamFile
 //                          //           is the master side)
 //    }
 //
-//    // Select based on surface. Orientation from normals on surface
+//    // Select based on faceSet, using supplied normal to determine orientation
+//    source setAndNormalToFaceZone;
+//    sourceInfo
 //    {
-//        name    fz0;
-//        type    faceZoneSet;
-//        action  new;
-//        source  searchableSurfaceToFaceZone;
-//        sourceInfo
-//        {
-//            surface searchableSphere;
-//            centre  (0.05 0.05 0.005);
-//            radius  0.025;
-//            //name  sphere.stl; // Optional name if surface triSurfaceMesh
-//        }
+//        faceSet f0;       // name of faceSet
+//        normal (1 0 0);   // normal orientation
+//    }
+//
+//    // Select based on surface. Orientation from normals on surface
+//    source  searchableSurfaceToFaceZone;
+//    sourceInfo
+//    {
+//        surface searchableSphere;
+//        centre  (0.05 0.05 0.005);
+//        radius  0.025;
+//        //name  sphere.stl; // Optional name if surface triSurfaceMesh
 //    }
 //
 //
@@ -413,7 +416,7 @@ actions
         name    c0;
         type    cellSet;
         action  new;
-        source labelToCell;
+        source  labelToCell;
         sourceInfo
         {
             value (12 13 56);
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 692cfd76db..21d4770b49 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
     // this is not actually stringent enough:
     if (args.options().empty())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "No options supplied, please use one or more of "
                "-translate, -rotate or -scale options."
             << exit(FatalError);
@@ -308,6 +308,8 @@ int main(int argc, char *argv[])
     Info<< "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
index 1943b7d631..1b5670fc83 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,9 +158,7 @@ int main(int argc, char *argv[])
         Info<< "OptimisationSwitches: " << currOpt << endl;
     }
 
-
-
-    Info<< "done" << endl;
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/miscellaneous/foamHelp/Make/options b/applications/utilities/miscellaneous/foamHelp/Make/options
index b5098371d2..280fed9692 100644
--- a/applications/utilities/miscellaneous/foamHelp/Make/options
+++ b/applications/utilities/miscellaneous/foamHelp/Make/options
@@ -5,10 +5,10 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lhelpTypes \
+    -lfiniteVolume \
+    -lmeshTools \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lcompressibleTurbulenceModels \
     -lradiationModels \
-    -lfluidThermophysicalModels \
-    -lfiniteVolume \
-    -lmeshTools
+    -lfluidThermophysicalModels
diff --git a/applications/utilities/miscellaneous/foamHelp/foamHelp.C b/applications/utilities/miscellaneous/foamHelp/foamHelp.C
index 39e0cb9130..277b7a024a 100644
--- a/applications/utilities/miscellaneous/foamHelp/foamHelp.C
+++ b/applications/utilities/miscellaneous/foamHelp/foamHelp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,6 +62,8 @@ int main(int argc, char *argv[])
     utility().execute(args, mesh);
 
     Info<< "End\n" << endl;
+
+    return 0;
 }
 
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/files b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/files
index 1f7de8d62e..35a5b81857 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/files
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/files
@@ -2,6 +2,7 @@ helpType/helpType.C
 helpType/helpTypeNew.C
 helpBoundary/helpBoundary.C
 helpFunctionObject/helpFunctionObject.C
+helpSolver/helpSolver.C
 
 doxygenXmlParser/doxygenXmlParser.C
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
index b3cc2da3e6..b77feaff34 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,6 @@ License
 #include "doxygenXmlParser.H"
 #include "wordRe.H"
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::doxygenXmlParser::doxygenXmlParser
@@ -34,11 +33,15 @@ Foam::doxygenXmlParser::doxygenXmlParser
     const fileName& fName,
     const string& startTag,
     const string& searchStr,
-    const bool exactMatch
+    const bool exactMatch,
+    const word& ext
 )
 :
     dictionary(dictionary::null)
 {
+    const wordRe nameRegEx(".*." + ext, wordRe::DETECT);
+    const wordRe searchRegEx(searchStr, wordRe::DETECT);
+
     IFstream is(fName);
 
     char c;
@@ -95,7 +98,8 @@ Foam::doxygenXmlParser::doxygenXmlParser
                     if (entryName == "name")
                     {
                         getValue<word>(is, name);
-                        if (wordRe(".*.H", wordRe::DETECT).match(name))
+
+                        if (nameRegEx.match(name))
                         {
                             foundName = true;
                         }
@@ -110,7 +114,7 @@ Foam::doxygenXmlParser::doxygenXmlParser
                         getValue<fileName>(is, path);
 
                         // filter path on regExp
-                        if (wordRe(searchStr, wordRe::DETECT).match(path))
+                        if (searchRegEx.match(path))
                         {
                             foundPath = true;
                         }
@@ -139,7 +143,7 @@ Foam::doxygenXmlParser::doxygenXmlParser
                     // NOTE: not ideal for cases where there are multiple types
                     //    but contained within different namespaces
                     //    preferentially take exact match if it exists
-                    if (exactMatch && (tName + ".H") == name)
+                    if (exactMatch && (tName + "." + ext) == name)
                     {
                         dictionary dict(dictionary::null);
                         dict.add("name", name);
@@ -150,7 +154,7 @@ Foam::doxygenXmlParser::doxygenXmlParser
                     else if
                     (
                         !exactMatch
-                     && !found(tName)
+                     && !found(tName) // not already added
                      && wordRe(".*" + tName + ".*", wordRe::DETECT).match(name)
                     )
                     {
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.H b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.H
index 9853589fa3..09af25c57f 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.H
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,8 @@ public:
         const fileName& fName,
         const string& startTag,
         const string& searchStr,
-        const bool exactMatch
+        const bool exactMatch,
+        const word& ext
     );
 
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
index 9fd46f35c1..c47a661cef 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,20 +89,7 @@ void Foam::helpTypes::helpBoundary::execute
     const fvMesh& mesh
 )
 {
-    bool abortVar(env("FOAM_ABORT"));
-    if (abortVar)
-    {
-        FatalErrorIn
-        (
-            "void Foam::helpTypes::helpBoundary::execute"
-            "("
-                "const argList&, "
-                "const fvMesh&"
-            ")"
-        )
-            << "Please unset FOAM_ABORT to use this utlity"
-            << exit(FatalError);
-    }
+    setEnv("FOAM_ABORT", "", true);
 
     word condition(word::null);
     word fieldName(word::null);
@@ -112,7 +99,7 @@ void Foam::helpTypes::helpBoundary::execute
         // TODO: strip scoping info if present?
         // e.g. conditions with leading "compressible::" will not be found
         // ".*[fF]vPatchField.*" + className + ".*"
-        displayDoc(condition, ".*[fF]vPatchField.*", false);
+        displayDoc(condition, ".*[fF]vPatchField.*", false, "H");
     }
     else if (args.optionFound("constraint"))
     {
@@ -134,6 +121,7 @@ void Foam::helpTypes::helpBoundary::execute
             IOobject::MUST_READ
         );
 
+        // Check for any type of volField
         if (fieldHeader.headerOk())
         {
             if (args.optionFound("fixedValue"))
@@ -155,27 +143,13 @@ void Foam::helpTypes::helpBoundary::execute
         }
         else
         {
-            FatalErrorIn
-            (
-                "void Foam::helpTypes::helpBoundary::execute"
-                "("
-                    "const argList&, "
-                    "const fvMesh&"
-                ")"
-            )
+            FatalErrorInFunction
                 << "Unable to read field " << fieldName << exit(FatalError);
         }
     }
     else if (args.optionReadIfPresent("fixedValue", fieldName))
     {
-        FatalErrorIn
-        (
-            "void Foam::helpTypes::helpBoundary::execute"
-            "("
-                "const argList&, "
-                "const fvMesh&"
-            ")"
-        )
+        FatalErrorInFunction
             << "-field option must be specified when using the -fixedValue "
             << "option" << exit(FatalError);
     }
@@ -184,7 +158,7 @@ void Foam::helpTypes::helpBoundary::execute
         // TODO: strip scoping info if present?
         // e.g. conditions with leading "compressible::" will not be found
         // ".*[fF]vPatchField.*" + className + ".*"
-        displayDocOptions(".*[fF]vPatchField.*", false);
+        displayDocOptions(".*[fF]vPatchField.*", false, "H");
     }
 }
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C
index 631a1210ff..c42a430a06 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,11 +76,11 @@ void Foam::helpTypes::helpFunctionObject::execute
 
     if (args.optionReadIfPresent("browse", function))
     {
-        displayDoc(function, ".*[fF]unctionObject.*", true);
+        displayDoc(function, ".*[fF]unctionObject.*", true, "H");
     }
     else
     {
-        displayDocOptions(".*[fF]unctionObject.*", true);
+        displayDocOptions(".*[fF]unctionObject.*", true, "H");
     }
 }
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C
new file mode 100644
index 0000000000..116be3f552
--- /dev/null
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "helpSolver.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace helpTypes
+    {
+        defineTypeNameAndDebug(helpSolver, 0);
+        addNamedToRunTimeSelectionTable
+        (
+            helpType,
+            helpSolver,
+            dictionary,
+            solver
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::helpTypes::helpSolver::helpSolver()
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::helpTypes::helpSolver::~helpSolver()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::helpTypes::helpSolver::init()
+{
+    helpType::init();
+
+    argList::validArgs.append("solver");
+}
+
+
+void Foam::helpTypes::helpSolver::execute
+(
+    const argList& args,
+    const fvMesh& mesh
+)
+{
+    word solver(word::null);
+
+    if (args.optionReadIfPresent("browse", solver))
+    {
+        displayDoc(solver, ".*solvers/.*Foam/", true, "C");
+    }
+    else
+    {
+        displayDocOptions(".*solvers/.*Foam/", true, "C");
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.H b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.H
new file mode 100644
index 0000000000..2fb702309d
--- /dev/null
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.H
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::helpSolver
+
+Description
+    This class provides help for solvers.  When no additional arguments
+    are given, the utility outputs all known solvers.
+
+    Usage:
+    \plaintable
+        \c -browse \<patch type\> | open documentation for object in browser
+    \endplaintable
+
+SeeAlso
+    Foam::helpType
+
+SourceFiles
+    helpSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef helpSolver_H
+#define helpSolver_H
+
+#include "helpType.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace helpTypes
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class helpSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class helpSolver
+:
+    public helpType
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("helpSolver");
+
+    //- Constructor
+    helpSolver();
+
+    //- Destructor
+    virtual ~helpSolver();
+
+
+    // Member Functions
+
+        //- Initialise - typically setting static variables,
+        //  e.g. command line arguments
+        virtual void init();
+
+        //- Execute the help
+        virtual void execute(const argList& args, const fvMesh& mesh);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace helpTypes
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
index 65c3fcaca6..68ae82fa50 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,8 @@ Foam::fileName Foam::helpType::doxygenPath() const
 void Foam::helpType::displayDocOptions
 (
     const string& searchStr,
-    const bool exactMatch
+    const bool exactMatch,
+    const word& ext
 ) const
 {
     fileName doxyPath(doxygenPath());
@@ -83,9 +84,15 @@ void Foam::helpType::displayDocOptions
         doxyPath/"../DTAGS",
         "tagfile",
         searchStr,
-        exactMatch
+        exactMatch,
+        ext
     );
 
+    if (debug)
+    {
+        Info<< parser;
+    }
+
     Info<< "Valid types include:" << nl << SortableList<word>(parser.toc());
 }
 
@@ -94,7 +101,8 @@ void Foam::helpType::displayDoc
 (
     const word& className,
     const string& searchStr,
-    const bool exactMatch
+    const bool exactMatch,
+    const word& ext
 ) const
 {
     fileName doxyPath(doxygenPath());
@@ -119,7 +127,8 @@ void Foam::helpType::displayDoc
         doxyPath/"../DTAGS",
         "tagfile",
         searchStr,
-        exactMatch
+        exactMatch,
+        ext
     );
 
     if (debug)
@@ -146,15 +155,7 @@ void Foam::helpType::displayDoc
     }
     else
     {
-        FatalErrorIn
-        (
-            "void Foam::helpType::displayDoc"
-            "("
-                "const word&, "
-                "const string&, "
-                "const bool"
-            ")"
-        )
+        FatalErrorInFunction
             << "No help for type " << className << " found."
             << "  Valid options include:" << SortableList<word>(parser.toc())
             << exit(FatalError);
@@ -182,7 +183,7 @@ void Foam::helpType::init()
     (
         "browse",
         "word",
-        "display documentation for boundary condition in browser"
+        "display documentation in browser"
     );
 }
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H
index f5e65709c6..a3e2449233 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,8 @@ protected:
     void displayDocOptions
     (
         const string& searchStr,
-        const bool exactMatch
+        const bool exactMatch,
+        const word& ext
     ) const;
 
     //- Display the help documentation in a browser
@@ -73,7 +74,8 @@ protected:
     (
         const word& className,
         const string& searchStr,
-        const bool exactMatch
+        const bool exactMatch,
+        const word& ext
     ) const;
 
 
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
index 607ca9b435..c6e45dd688 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,14 +43,14 @@ Foam::autoPtr<Foam::helpType> Foam::helpType::New
         // exit without stack trace
         if (helpTypeName == "-help")
         {
-            FatalErrorIn("helpType::New()")
+            FatalErrorInFunction
                 << "Valid helpType selections are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
                 << exit(FatalError);
         }
         else
         {
-            FatalErrorIn("helpType::New()")
+            FatalErrorInFunction
                 << "Unknown helpType type " << helpTypeName << nl
                 << "Valid helpType selections are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index e0dda32b2a..74d9028c2b 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
                             }
                             else
                             {
-                                FatalErrorIn(args.executable())
+                                FatalErrorInFunction
                                     << "Cannot find sub-entry " << entryNames[i]
                                     << " in entry " << args["entry"]
                                     << " in dictionary " << dictFileName;
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
                         /*
                         if (ent[1] != token::BEGIN_BLOCK)
                         {
-                            FatalErrorIn(args.executable())
+                            FatalErrorInFunction
                                 << "Cannot find entry "
                                 << args["entry"]
                                 << " in dictionary " << dictFileName
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
                 }
                 else
                 {
-                    FatalErrorIn(args.executable())
+                    FatalErrorInFunction
                         << "Cannot find entry "
                         << entryName
                         << " in dictionary " << dictFileName;
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Cannot open file " << dictFileName;
             FatalError.exit(1);
         }
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 5d5d67f989..cd78de0d1e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
@@ -12,5 +13,6 @@ EXE_LIBS = \
     -lgenericPatchFields \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp \
     -llagrangian \
+    -ldynamicMesh \
     -lmeshTools \
     -lregionModels
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 6020608541..21a38d80be 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -96,6 +96,7 @@ Usage
 #include "fvFieldDecomposer.H"
 #include "pointFieldDecomposer.H"
 #include "lagrangianFieldDecomposer.H"
+#include "decompositionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -142,6 +143,12 @@ int main(int argc, char *argv[])
     );
 
     argList::noParallel();
+    argList::addOption
+    (
+        "decomposeParDict",
+        "file",
+        "read decomposePar dictionary from specified location"
+    );
     #include "addRegionOption.H"
     argList::addBoolOption
     (
@@ -199,6 +206,17 @@ int main(int argc, char *argv[])
     instantList times = timeSelector::selectIfPresent(runTime, args);
 
 
+    // Allow override of decomposeParDict location
+    fileName decompDictFile;
+    if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
+    {
+        if (isDir(decompDictFile))
+        {
+            decompDictFile = decompDictFile/"decomposeParDict";
+        }
+    }
+
+
     wordList regionNames;
     wordList regionDirs;
     if (allRegions)
@@ -260,21 +278,27 @@ int main(int argc, char *argv[])
             ++nProcs;
         }
 
-        // get requested numberOfSubdomains
+        // get requested numberOfSubdomains. Note: have no mesh yet so
+        // cannot use decompositionModel::New
         const label nDomains = readLabel
         (
             IOdictionary
             (
-                IOobject
+                decompositionModel::selectIO
                 (
-                    "decomposeParDict",
-                    runTime.time().system(),
-                    regionDir,          // use region if non-standard
-                    runTime,
-                    IOobject::MUST_READ_IF_MODIFIED,
-                    IOobject::NO_WRITE,
-                    false
+                    IOobject
+                    (
+                        "decomposeParDict",
+                        runTime.time().system(),
+                        regionDir,          // use region if non-standard
+                        runTime,
+                        IOobject::MUST_READ_IF_MODIFIED,
+                        IOobject::NO_WRITE,
+                        false
+                    ),
+                    decompDictFile
                 )
+
             ).lookup("numberOfSubdomains")
         );
 
@@ -283,13 +307,12 @@ int main(int argc, char *argv[])
             // Sanity check on previously decomposed case
             if (nProcs != nDomains)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Specified -fields, but the case was decomposed with "
                     << nProcs << " domains"
                     << nl
                     << "instead of " << nDomains
-                    << " domains as specified in decomposeParDict"
-                    << nl
+                    << " domains as specified in decomposeParDict" << nl
                     << exit(FatalError);
             }
         }
@@ -329,7 +352,7 @@ int main(int argc, char *argv[])
 
             if (procDirsProblem)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Case is already decomposed with " << nProcs
                     << " domains, use the -force option or manually" << nl
                     << "remove processor directories before decomposing. e.g.,"
@@ -351,7 +374,8 @@ int main(int argc, char *argv[])
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 false
-            )
+            ),
+            decompDictFile
         );
 
         // Decompose the mesh
@@ -447,15 +471,15 @@ int main(int argc, char *argv[])
             // Construct the vol fields
             // ~~~~~~~~~~~~~~~~~~~~~~~~
             PtrList<volScalarField> volScalarFields;
-            readFields(mesh, objects, volScalarFields);
+            readFields(mesh, objects, volScalarFields, false);
             PtrList<volVectorField> volVectorFields;
-            readFields(mesh, objects, volVectorFields);
+            readFields(mesh, objects, volVectorFields, false);
             PtrList<volSphericalTensorField> volSphericalTensorFields;
-            readFields(mesh, objects, volSphericalTensorFields);
+            readFields(mesh, objects, volSphericalTensorFields, false);
             PtrList<volSymmTensorField> volSymmTensorFields;
-            readFields(mesh, objects, volSymmTensorFields);
+            readFields(mesh, objects, volSymmTensorFields, false);
             PtrList<volTensorField> volTensorFields;
-            readFields(mesh, objects, volTensorFields);
+            readFields(mesh, objects, volTensorFields, false);
 
 
             // Construct the dimensioned fields
@@ -476,15 +500,15 @@ int main(int argc, char *argv[])
             // Construct the surface fields
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             PtrList<surfaceScalarField> surfaceScalarFields;
-            readFields(mesh, objects, surfaceScalarFields);
+            readFields(mesh, objects, surfaceScalarFields, false);
             PtrList<surfaceVectorField> surfaceVectorFields;
-            readFields(mesh, objects, surfaceVectorFields);
+            readFields(mesh, objects, surfaceVectorFields, false);
             PtrList<surfaceSphericalTensorField> surfaceSphericalTensorFields;
-            readFields(mesh, objects, surfaceSphericalTensorFields);
+            readFields(mesh, objects, surfaceSphericalTensorFields, false);
             PtrList<surfaceSymmTensorField> surfaceSymmTensorFields;
-            readFields(mesh, objects, surfaceSymmTensorFields);
+            readFields(mesh, objects, surfaceSymmTensorFields, false);
             PtrList<surfaceTensorField> surfaceTensorFields;
-            readFields(mesh, objects, surfaceTensorFields);
+            readFields(mesh, objects, surfaceTensorFields, false);
 
 
             // Construct the point fields
@@ -492,15 +516,15 @@ int main(int argc, char *argv[])
             const pointMesh& pMesh = pointMesh::New(mesh);
 
             PtrList<pointScalarField> pointScalarFields;
-            readFields(pMesh, objects, pointScalarFields);
+            readFields(pMesh, objects, pointScalarFields, false);
             PtrList<pointVectorField> pointVectorFields;
-            readFields(pMesh, objects, pointVectorFields);
+            readFields(pMesh, objects, pointVectorFields, false);
             PtrList<pointSphericalTensorField> pointSphericalTensorFields;
-            readFields(pMesh, objects, pointSphericalTensorFields);
+            readFields(pMesh, objects, pointSphericalTensorFields, false);
             PtrList<pointSymmTensorField> pointSymmTensorFields;
-            readFields(pMesh, objects, pointSymmTensorFields);
+            readFields(pMesh, objects, pointSymmTensorFields, false);
             PtrList<pointTensorField> pointTensorFields;
-            readFields(pMesh, objects, pointTensorFields);
+            readFields(pMesh, objects, pointTensorFields, false);
 
 
             // Construct the Lagrangian fields
@@ -640,7 +664,7 @@ int main(int argc, char *argv[])
                         // Check
                         if (celli < 0 || celli >= mesh.nCells())
                         {
-                            FatalErrorIn(args.executable())
+                            FatalErrorInFunction
                                 << "Illegal cell number " << celli
                                 << " for particle with index " << iter().index()
                                 << " at position " << iter().position() << nl
@@ -820,16 +844,6 @@ int main(int argc, char *argv[])
 
                 processorDb.setTime(runTime);
 
-                // remove files remnants that can cause horrible problems
-                // - mut and nut are used to mark the new turbulence models,
-                //   their existence prevents old models from being upgraded
-                {
-                    fileName timeDir(processorDb.path()/processorDb.timeName());
-
-                    rm(timeDir/"mut");
-                    rm(timeDir/"nut");
-                }
-
                 // read the mesh
                 if (!procMeshList.set(procI))
                 {
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
index 39483a01e3..ada8eb7e16 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -17,11 +17,61 @@ FoamFile
 
 numberOfSubdomains  2;
 
+
+// Optional decomposition constraints
+//constraints
+//{
+//    preserveBaffles
+//    {
+//        //- Keep owner and neighbour of baffles on same processor (i.e.
+//        // keep it detectable as a baffle). Baffles are two boundary face
+//        // sharing the same points
+//        type    preserveBaffles;
+//    }
+//    preserveFaceZones
+//    {
+//        //- Keep owner and neighbour on same processor for faces in zones
+//        type    preserveFaceZones;
+//        zones   (".*");
+//    }
+//    preservePatches
+//    {
+//        //- Keep owner and neighbour on same processor for faces in patches
+//        //  (only makes sense for cyclic patches. Not suitable for e.g.
+//        //   cyclicAMI since these are not coupled on the patch level. Use
+//        //   singleProcessorFaceSets for those)
+//        type    preservePatches;
+//        patches (".*");
+//    }
+//    singleProcessorFaceSets
+//    {
+//        //- Keep all of faceSet on a single processor. This puts all cells
+//        //  connected with a point, edge or face on the same processor.
+//        //  (just having face connected cells might not guarantee a balanced
+//        //  decomposition)
+//        // The processor can be -1 (the decompositionMethod chooses the
+//        // processor for a good load balance) or explicitly provided (upsets
+//        // balance)
+//        type    singleProcessorFaceSets;
+//        singleProcessorFaceSets ((f1 -1));
+//    }
+//    refinementHistory
+//    {
+//        //- Decompose cells such that all cell originating from single cell
+//        //  end up on same processor
+//        type    refinementHistory;
+//    }
+//}
+
+
+// Deprecated form of specifying decomposition constraints:
 //- Keep owner and neighbour on same processor for faces in zones:
 // preserveFaceZones (heater solid1 solid3);
 
 //- Keep owner and neighbour on same processor for faces in patches:
-//  (makes sense only for cyclic patches)
+//  (makes sense only for cyclic patches. Not suitable for e.g. cyclicAMI
+//   since these are not coupled on the patch level. Use
+//   singleProcessorFaceSets for those)
 //preservePatches (cyclic_half0 cyclic_half1);
 
 //- Keep all of faceSet on a single processor. This puts all cells
@@ -32,12 +82,13 @@ numberOfSubdomains  2;
 // for a good load balance) or explicitly provided (upsets balance).
 //singleProcessorFaceSets ((f0 -1));
 
-
 //- Keep owner and neighbour of baffles on same processor (i.e. keep it
 //  detectable as a baffle). Baffles are two boundary face sharing the
 //  same points.
 //preserveBaffles true;
 
+
+
 //- Use the volScalarField named here as a weight for each cell in the
 //  decomposition.  For example, use a particle population field to decompose
 //  for a balanced number of particles in a lagrangian simulation.
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 7d86369398..b27f7628c8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,14 +31,14 @@ License
 #include "fvMesh.H"
 #include "OSspecific.H"
 #include "Map.H"
-#include "globalMeshData.H"
 #include "DynamicList.H"
 #include "fvFieldDecomposer.H"
 #include "IOobjectList.H"
 #include "cellSet.H"
 #include "faceSet.H"
 #include "pointSet.H"
-#include "uniformDimensionedFields.H"
+#include "decompositionModel.H"
+#include "hexRef8Data.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -69,7 +69,12 @@ void Foam::domainDecomposition::mark
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::domainDecomposition::domainDecomposition(const IOobject& io)
+// from components
+Foam::domainDecomposition::domainDecomposition
+(
+    const IOobject& io,
+    const fileName& decompDictFile
+)
 :
     fvMesh(io),
     facesInstancePointsPtr_
@@ -90,18 +95,18 @@ Foam::domainDecomposition::domainDecomposition(const IOobject& io)
         )
       : NULL
     ),
-    decompositionDict_
+    decompDictFile_(decompDictFile),
+    nProcs_
     (
-        IOobject
+        readInt
         (
-            "decomposeParDict",
-            time().system(),
-            *this,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
+            decompositionModel::New
+            (
+                *this,
+                decompDictFile
+            ).lookup("numberOfSubdomains")
         )
     ),
-    nProcs_(readInt(decompositionDict_.lookup("numberOfSubdomains"))),
     distributed_(false),
     cellToProc_(nCells()),
     procPointAddressing_(nProcs_),
@@ -115,7 +120,11 @@ Foam::domainDecomposition::domainDecomposition(const IOobject& io)
     procProcessorPatchSubPatchIDs_(nProcs_),
     procProcessorPatchSubPatchStarts_(nProcs_)
 {
-    decompositionDict_.readIfPresent("distributed", distributed_);
+    decompositionModel::New
+    (
+        *this,
+        decompDictFile
+    ).readIfPresent("distributed", distributed_);
 }
 
 
@@ -195,57 +204,20 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
     }
 
 
-    autoPtr<labelIOList> cellLevelPtr;
-    {
-        IOobject io
+    // Load refinement data (if any)
+    hexRef8Data baseMeshData
+    (
+        IOobject
         (
-            "cellLevel",
+            "dummy",
             facesInstance(),
             polyMesh::meshSubDir,
             *this,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        );
-        if (io.headerOk())
-        {
-            Info<< "Reading hexRef8 data : " << io.name() << endl;
-            cellLevelPtr.reset(new labelIOList(io));
-        }
-    }
-    autoPtr<labelIOList> pointLevelPtr;
-    {
-        IOobject io
-        (
-            "pointLevel",
-            facesInstance(),
-            polyMesh::meshSubDir,
-            *this,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        );
-        if (io.headerOk())
-        {
-            Info<< "Reading hexRef8 data : " << io.name() << endl;
-            pointLevelPtr.reset(new labelIOList(io));
-        }
-    }
-    autoPtr<uniformDimensionedScalarField> level0EdgePtr;
-    {
-        IOobject io
-        (
-            "level0Edge",
-            facesInstance(),
-            polyMesh::meshSubDir,
-            *this,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        );
-        if (io.headerOk())
-        {
-            Info<< "Reading hexRef8 data : " << io.name() << endl;
-            level0EdgePtr.reset(new uniformDimensionedScalarField(io));
-        }
-    }
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
 
 
 
@@ -816,8 +788,8 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             }
         }
 
-        // Set the precision of the points data to 10
-        IOstream::defaultPrecision(10);
+        // Set the precision of the points data to be min 10
+        IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
 
         procMesh.write();
 
@@ -887,64 +859,23 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
         }
 
 
-        // hexRef8 data
-        if (cellLevelPtr.valid())
-        {
-            labelIOList
+        // Optional hexRef8 data
+        hexRef8Data
+        (
+            IOobject
             (
-                IOobject
-                (
-                    cellLevelPtr().name(),
-                    facesInstance(),
-                    polyMesh::meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                UIndirectList<label>
-                (
-                    cellLevelPtr(),
-                    procCellAddressing_[procI]
-                )()
-            ).write();
-        }
-        if (pointLevelPtr.valid())
-        {
-            labelIOList
-            (
-                IOobject
-                (
-                    pointLevelPtr().name(),
-                    facesInstance(),
-                    polyMesh::meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                UIndirectList<label>
-                (
-                    pointLevelPtr(),
-                    procPointAddressing_[procI]
-                )()
-            ).write();
-        }
-        if (level0EdgePtr.valid())
-        {
-            uniformDimensionedScalarField
-            (
-                IOobject
-                (
-                    level0EdgePtr().name(),
-                    facesInstance(),
-                    polyMesh::meshSubDir,
-                    procMesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                level0EdgePtr()
-            ).write();
-        }
-
+                "dummy",
+                facesInstance(),
+                polyMesh::meshSubDir,
+                procMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            baseMeshData,
+            procCellAddressing_[procI],
+            procPointAddressing_[procI]
+        ).write();
 
 
         // Statistics
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 21bc8e6169..f5b7376997 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,8 +61,8 @@ class domainDecomposition
         //- Optional: points at the facesInstance
         autoPtr<pointIOField> facesInstancePointsPtr_;
 
-        //- Mesh decomposition control dictionary
-        IOdictionary decompositionDict_;
+        //- Optional non-standard file for decomposeParDict
+        const fileName decompDictFile_;
 
         //- Number of processors in decomposition
         label nProcs_;
@@ -159,8 +159,13 @@ public:
 
     // Constructors
 
-        //- Construct from IOobject
-        domainDecomposition(const IOobject& io);
+        //- Construct from IOobjects (for mesh and optional non-standard
+        //  decomposeParDict location)
+        domainDecomposition
+        (
+            const IOobject& io,
+            const fileName& decompDictFile = ""
+        );
 
 
     //- Destructor
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
index 944853ad95..0b1d5fb143 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +30,7 @@ License
 #include "regionSplit.H"
 #include "Tuple2.H"
 #include "faceSet.H"
+#include "decompositionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,15 +40,17 @@ void Foam::domainDecomposition::distributeCells()
 
     cpuTime decompositionTime;
 
-    autoPtr<decompositionMethod> decomposePtr = decompositionMethod::New
+    const decompositionModel& method = decompositionModel::New
     (
-        decompositionDict_
+        *this,
+        decompDictFile_
     );
 
+
     scalarField cellWeights;
-    if (decompositionDict_.found("weightField"))
+    if (method.found("weightField"))
     {
-        word weightName = decompositionDict_.lookup("weightField");
+        word weightName = method.lookup("weightField");
 
         volScalarField weights
         (
@@ -64,7 +67,7 @@ void Foam::domainDecomposition::distributeCells()
         cellWeights = weights.internalField();
     }
 
-    cellToProc_ = decomposePtr().decompose(*this, cellWeights);
+    cellToProc_ = method.decomposer().decompose(*this, cellWeights);
 
     Info<< "\nFinished decomposition in "
         << decompositionTime.elapsedCpuTime()
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index 817d0a9f64..361c930ad2 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ Description
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
 (
     const polyMesh& mesh,
@@ -77,22 +76,8 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
 
                 // if (mappedTetFace == -1)
                 // {
-                //     FatalErrorIn
-                //     (
-                //         "Foam::lagrangianFieldDecomposer"
-                //         "::lagrangianFieldDecomposer"
-                //         "("
-                //             "const polyMesh& mesh, "
-                //             "const polyMesh& procMesh, "
-                //             "const labelList& faceProcAddressing, "
-                //             "const labelList& cellProcAddressing, "
-                //             "const word& cloudName, "
-                //             "const Cloud<indexedParticle>& "
-                //             "lagrangianPositions, "
-                //             "const List<SLList<indexedParticle*>*>& "
-                //             "cellParticles"
-                //         ")"
-                //     )   << "Face lookup failure." << nl
+                //     FatalErrorInFunction
+                //         << "Face lookup failure." << nl
                 //         << abort(FatalError);
                 // }
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
index 3934fdc021..92b9a4c4e4 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,10 +67,8 @@ Foam::pointFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
     {
         hasUnmapped_ = true;
 
-        FatalErrorIn
-        (
-            "pointFieldDecomposer::patchFieldDecomposer()"
-        )   << "Incomplete patch point addressing"
+        FatalErrorInFunction
+            << "Incomplete patch point addressing"
             << abort(FatalError);
     }
 }
diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.C b/applications/utilities/parallelProcessing/decomposePar/readFields.C
index e949e0c2fa..546756caa6 100644
--- a/applications/utilities/parallelProcessing/decomposePar/readFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/readFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,10 +23,48 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "GeometricField.H"
 #include "readFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::readFields
+(
+    const typename GeoMesh::Mesh& mesh,
+    const IOobjectList& objects,
+    PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
+    const bool readOldTime
+)
+{
+    typedef GeometricField<Type, PatchField, GeoMesh> GeoField;
+
+    // Search list of objects for fields of type GeomField
+    IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
+
+    // Remove the cellDist field
+    IOobjectList::iterator celDistIter = fieldObjects.find("cellDist");
+    if (celDistIter != fieldObjects.end())
+    {
+        fieldObjects.erase(celDistIter);
+    }
+
+    // Get sorted set of names (different processors might read objects in
+    // different order)
+    const wordList masterNames(fieldObjects.sortedNames());
+
+    // Construct the fields
+    fields.setSize(masterNames.size());
+
+    forAll(masterNames, i)
+    {
+        const IOobject& io = *fieldObjects[masterNames[i]];
+
+        fields.set(i, new GeoField(io, mesh, readOldTime));
+    }
+}
+
+
 template<class Mesh, class GeoField>
 void Foam::readFields
 (
@@ -38,24 +76,21 @@ void Foam::readFields
     // Search list of objects for fields of type GeomField
     IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
 
-    // Remove the cellDist field
-    IOobjectList::iterator celDistIter = fieldObjects.find("cellDist");
-    if (celDistIter != fieldObjects.end())
-    {
-        fieldObjects.erase(celDistIter);
-    }
-
     // Construct the fields
     fields.setSize(fieldObjects.size());
 
-    label fieldI = 0;
-    forAllIter(IOobjectList, fieldObjects, iter)
+    // Get sorted set of names (different processors might read objects in
+    // different order)
+    const wordList masterNames(fieldObjects.sortedNames());
+
+    // Construct the fields
+    fields.setSize(masterNames.size());
+
+    forAll(masterNames, i)
     {
-        fields.set
-        (
-            fieldI++,
-            new GeoField(*iter(), mesh)
-        );
+        const IOobject& io = *fieldObjects[masterNames[i]];
+
+        fields.set(i, new GeoField(io, mesh));
     }
 }
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.H b/applications/utilities/parallelProcessing/decomposePar/readFields.H
index 0ff4c1f92b..35eae28882 100644
--- a/applications/utilities/parallelProcessing/decomposePar/readFields.H
+++ b/applications/utilities/parallelProcessing/decomposePar/readFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,6 +41,16 @@ SourceFiles
 
 namespace Foam
 {
+    // Read the fields and hold on the pointer list
+    template<class Type, template<class> class PatchField, class GeoMesh>
+    void readFields
+    (
+        const typename GeoMesh::Mesh& mesh,
+        const IOobjectList& objects,
+        PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
+        const bool readOldTime
+    );
+
     // Read the fields and hold on the pointer list
     template<class Mesh, class GeoField>
     void readFields
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options
index ece7c8b030..1ebb8c02d3 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
@@ -9,6 +10,7 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -llagrangian \
+    -ldynamicMesh \
     -lmeshTools \
     -lreconstruct \
     -lregionModels
diff --git a/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H b/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
index 733d64f5ff..03458a2964 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
@@ -23,7 +23,7 @@
 
     if (minFaceIndex < 1)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "parallel decomposition addressing." << endl
             << "It looks like you are trying to reconstruct the case "
             << "decomposed with an earlier version of FOAM, which could\n"
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index db2df9eecc..47fc4aacce 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,8 @@ Description
 #include "faceSet.H"
 #include "pointSet.H"
 
+#include "hexRef8Data.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 bool haveAllTimes
@@ -145,7 +147,7 @@ int main(int argc, char *argv[])
     {
         if (noLagrangian)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Cannot specify noLagrangian and lagrangianFields "
                 << "options together."
                 << exit(FatalError);
@@ -168,7 +170,7 @@ int main(int argc, char *argv[])
 
     if (!nProcs)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "No processor* directories found"
             << exit(FatalError);
     }
@@ -207,7 +209,7 @@ int main(int argc, char *argv[])
 
     if (timeDirs.empty())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "No times selected"
             << exit(FatalError);
     }
@@ -347,7 +349,7 @@ int main(int argc, char *argv[])
             }
             else if (meshStat != procStat)
             {
-                WarningIn(args.executable())
+                WarningInFunction
                     << "readUpdate for the reconstructed mesh:"
                     << meshStat << nl
                     << "readUpdate for the processor meshes  :"
@@ -792,6 +794,7 @@ int main(int argc, char *argv[])
                             );
                         }
                         cellSet& cSet = cellSets[setI];
+                        cSet.instance() = runTime.timeName();
 
                         forAllConstIter(cellSet, procSet, iter)
                         {
@@ -818,6 +821,7 @@ int main(int argc, char *argv[])
                             );
                         }
                         faceSet& fSet = faceSets[setI];
+                        fSet.instance() = runTime.timeName();
 
                         forAllConstIter(faceSet, procSet, iter)
                         {
@@ -843,6 +847,7 @@ int main(int argc, char *argv[])
                             );
                         }
                         pointSet& pSet = pointSets[setI];
+                        pSet.instance() = runTime.timeName();
 
                         forAllConstIter(pointSet, propSet, iter)
                         {
@@ -865,6 +870,78 @@ int main(int argc, char *argv[])
                     pointSets[i].write();
                 }
             }
+
+
+            // Reconstruct refinement data
+            {
+                PtrList<hexRef8Data> procData(procMeshes.meshes().size());
+
+                forAll(procMeshes.meshes(), procI)
+                {
+                    const fvMesh& procMesh = procMeshes.meshes()[procI];
+
+                    procData.set
+                    (
+                        procI,
+                        new hexRef8Data
+                        (
+                            IOobject
+                            (
+                                "dummy",
+                                procMesh.time().timeName(),
+                                polyMesh::meshSubDir,
+                                procMesh,
+                                IOobject::READ_IF_PRESENT,
+                                IOobject::NO_WRITE,
+                                false
+                            )
+                        )
+                    );
+                }
+
+                // Combine individual parts
+
+                const PtrList<labelIOList>& cellAddr =
+                    procMeshes.cellProcAddressing();
+
+                UPtrList<const labelList> cellMaps(cellAddr.size());
+                forAll(cellAddr, i)
+                {
+                    cellMaps.set(i, &cellAddr[i]);
+                }
+
+                const PtrList<labelIOList>& pointAddr =
+                    procMeshes.pointProcAddressing();
+
+                UPtrList<const labelList> pointMaps(pointAddr.size());
+                forAll(pointAddr, i)
+                {
+                    pointMaps.set(i, &pointAddr[i]);
+                }
+
+                UPtrList<const hexRef8Data> procRefs(procData.size());
+                forAll(procData, i)
+                {
+                    procRefs.set(i, &procData[i]);
+                }
+
+                hexRef8Data
+                (
+                    IOobject
+                    (
+                        "dummy",
+                        mesh.time().timeName(),
+                        polyMesh::meshSubDir,
+                        mesh,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    ),
+                    cellMaps,
+                    pointMaps,
+                    procRefs
+                ).write();
+            }
         }
     }
 
@@ -882,7 +959,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "End.\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index cfa77f7023..050be984c0 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -268,7 +268,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
             }
             else
             {
-                FatalErrorIn("fvMeshDistribute::mergeSharedPoints()")
+                FatalErrorInFunction
                     << "Problem. oldPointI:" << oldPointI
                     << " newPointI:" << newPointI << abort(FatalError);
             }
@@ -301,7 +301,7 @@ boundBox procBounds
 
         if (pointsInstance != databases[procI].timeName())
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Your time was specified as " << databases[procI].timeName()
                 << " but there is no polyMesh/points in that time." << endl
                 << "(there is a points file in " << pointsInstance
@@ -497,7 +497,7 @@ int main(int argc, char *argv[])
 
     if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Your current settings specify ASCII writing with "
             << IOstream::defaultPrecision() << " digits precision." << endl
             << "Your merging tolerance (" << mergeTol << ") is finer than this."
@@ -726,7 +726,7 @@ int main(int argc, char *argv[])
 
             if (!masterMesh.write())
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Failed writing polyMesh."
                     << exit(FatalError);
             }
@@ -899,7 +899,7 @@ int main(int argc, char *argv[])
     }
 
 
-    Info<< "End.\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/parallelProcessing/redistributePar/Make/files b/applications/utilities/parallelProcessing/redistributePar/Make/files
index 8bf23d0895..1dfb53f307 100644
--- a/applications/utilities/parallelProcessing/redistributePar/Make/files
+++ b/applications/utilities/parallelProcessing/redistributePar/Make/files
@@ -1,3 +1,5 @@
+parLagrangianRedistributor.C
+parFvFieldReconstructor.C
 loadOrCreateMesh.C
 redistributePar.C
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/Make/options b/applications/utilities/parallelProcessing/redistributePar/Make/options
index a23979358b..08d24a07f7 100644
--- a/applications/utilities/parallelProcessing/redistributePar/Make/options
+++ b/applications/utilities/parallelProcessing/redistributePar/Make/options
@@ -1,13 +1,17 @@
 EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -ldecompositionMethods \
-    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
+    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \
+    -ldecompose \
     -lmeshTools \
+    -llagrangian \
     -ldynamicMesh
diff --git a/applications/utilities/parallelProcessing/redistributePar/distributedUnallocatedDirectFieldMapper.H b/applications/utilities/parallelProcessing/redistributePar/distributedUnallocatedDirectFieldMapper.H
new file mode 100644
index 0000000000..c3a21fe586
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/distributedUnallocatedDirectFieldMapper.H
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::distributedUnallocatedDirectFieldMapper
+
+Description
+    FieldMapper with direct mapping from remote quantities.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef distributedUnallocatedDirectFieldMapper_H
+#define distributedUnallocatedDirectFieldMapper_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+           Class distributedUnallocatedDirectFieldMapper Declaration
+\*---------------------------------------------------------------------------*/
+
+class distributedUnallocatedDirectFieldMapper
+:
+    public FieldMapper
+{
+    const labelUList& directAddressing_;
+
+    const mapDistributeBase& distMap_;
+
+    bool hasUnmapped_;
+
+public:
+
+    // Constructors
+
+        //- Construct given addressing
+        distributedUnallocatedDirectFieldMapper
+        (
+            const labelUList& directAddressing,
+            const mapDistributeBase& distMap
+        )
+        :
+            directAddressing_(directAddressing),
+            distMap_(distMap),
+            hasUnmapped_(false)
+        {
+            if
+            (
+                notNull(directAddressing_)
+             && directAddressing_.size()
+             && min(directAddressing_) < 0
+            )
+            {
+                hasUnmapped_ = true;
+            }
+        }
+
+    //- Destructor
+    virtual ~distributedUnallocatedDirectFieldMapper()
+    {}
+
+
+    // Member Functions
+
+        virtual label size() const
+        {
+            return
+            (
+                notNull(directAddressing_)
+              ? directAddressing_.size()
+              : distMap_.constructSize()
+            );
+        }
+
+        virtual bool direct() const
+        {
+            return true;
+        }
+
+        virtual bool distributed() const
+        {
+            return true;
+        }
+
+        virtual const mapDistributeBase& distributeMap() const
+        {
+            return distMap_;
+        }
+
+        virtual bool hasUnmapped() const
+        {
+            return hasUnmapped_;
+        }
+
+        virtual const labelUList& directAddressing() const
+        {
+            return directAddressing_;
+        }
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/distributedUnallocatedDirectFvPatchFieldMapper.H b/applications/utilities/parallelProcessing/redistributePar/distributedUnallocatedDirectFvPatchFieldMapper.H
new file mode 100644
index 0000000000..b9f7102bf1
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/distributedUnallocatedDirectFvPatchFieldMapper.H
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::distributedUnallocatedDirectFvPatchFieldMapper
+
+Description
+    FieldMapper with direct mapping from remote quantities.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef distributedUnallocatedDirectFvPatchFieldMapper_H
+#define distributedUnallocatedDirectFvPatchFieldMapper_H
+
+#include "fvPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+        Class distributedUnallocatedDirectFvPatchFieldMapper Declaration
+\*---------------------------------------------------------------------------*/
+
+class distributedUnallocatedDirectFvPatchFieldMapper
+:
+    public fvPatchFieldMapper
+{
+    const labelUList& directAddressing_;
+
+    const mapDistributeBase& distMap_;
+
+    bool hasUnmapped_;
+
+public:
+
+    // Constructors
+
+        //- Construct given addressing
+        distributedUnallocatedDirectFvPatchFieldMapper
+        (
+            const labelUList& directAddressing,
+            const mapDistributeBase& distMap
+        )
+        :
+            directAddressing_(directAddressing),
+            distMap_(distMap),
+            hasUnmapped_(false)
+        {
+            if
+            (
+                notNull(directAddressing_)
+             && directAddressing_.size()
+             && min(directAddressing_) < 0
+            )
+            {
+                hasUnmapped_ = true;
+            }
+        }
+
+    //- Destructor
+    virtual ~distributedUnallocatedDirectFvPatchFieldMapper()
+    {}
+
+
+    // Member Functions
+
+        virtual label size() const
+        {
+            return
+            (
+                notNull(directAddressing_)
+              ? directAddressing_.size()
+              : distMap_.constructSize()
+            );
+        }
+
+        virtual bool direct() const
+        {
+            return true;
+        }
+
+        virtual bool distributed() const
+        {
+            return true;
+        }
+
+        virtual const mapDistributeBase& distributeMap() const
+        {
+            return distMap_;
+        }
+
+        virtual bool hasUnmapped() const
+        {
+            return hasUnmapped_;
+        }
+
+        virtual const labelUList& directAddressing() const
+        {
+            return directAddressing_;
+        }
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
index aa79271210..b298d69bc7 100644
--- a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
+++ b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,14 +27,15 @@ License
 #include "processorPolyPatch.H"
 #include "processorCyclicPolyPatch.H"
 #include "Time.H"
-#include "IOPtrList.H"
+//#include "IOPtrList.H"
+#include "polyBoundaryMeshEntries.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTemplateTypeNameAndDebug(IOPtrList<entry>, 0);
-}
+//namespace Foam
+//{
+//    defineTemplateTypeNameAndDebug(IOPtrList<entry>, 0);
+//}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +47,9 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
     const IOobject& io
 )
 {
+    // Region name
+    // ~~~~~~~~~~~
+
     fileName meshSubDir;
 
     if (io.name() == polyMesh::defaultRegion)
@@ -58,24 +62,52 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
     }
 
 
-    // Scatter master patches
+    // Patch types
+    // ~~~~~~~~~~~
+    // Read and scatter master patches (without reading master mesh!)
+
     PtrList<entry> patchEntries;
     if (Pstream::master())
     {
-        // Read PtrList of dictionary as dictionary.
-        const word oldTypeName = IOPtrList<entry>::typeName;
-        const_cast<word&>(IOPtrList<entry>::typeName) = word::null;
-        IOPtrList<entry> dictList
+        //// Read PtrList of dictionary as dictionary.
+        //const word oldTypeName = IOPtrList<entry>::typeName;
+        //const_cast<word&>(IOPtrList<entry>::typeName) = word::null;
+        //IOPtrList<entry> dictList
+        //(
+        //    IOobject
+        //    (
+        //        "boundary",
+        //        io.time().findInstance
+        //        (
+        //            meshSubDir,
+        //            "boundary",
+        //            IOobject::MUST_READ
+        //        ),
+        //        meshSubDir,
+        //        io.db(),
+        //        IOobject::MUST_READ,
+        //        IOobject::NO_WRITE,
+        //        false
+        //    )
+        //);
+        //const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
+        //// Fake type back to what was in field
+        //const_cast<word&>(dictList.type()) = dictList.headerClassName();
+        //
+        //patchEntries.transfer(dictList);
+        const fileName facesInstance = io.time().findInstance
+        (
+            meshSubDir,
+            "faces",
+            IOobject::MUST_READ
+        );
+
+        patchEntries = polyBoundaryMeshEntries
         (
             IOobject
             (
                 "boundary",
-                io.time().findInstance
-                (
-                    meshSubDir,
-                    "boundary",
-                    IOobject::MUST_READ
-                ),
+                facesInstance,
                 meshSubDir,
                 io.db(),
                 IOobject::MUST_READ,
@@ -83,11 +115,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
                 false
             )
         );
-        const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
-        // Fake type back to what was in field
-        const_cast<word&>(dictList.type()) = dictList.headerClassName();
-
-        patchEntries.transfer(dictList);
 
         // Send patches
         for
@@ -110,8 +137,16 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
 
 
 
+    // Dummy meshes
+    // ~~~~~~~~~~~~
+
     // Check who has a mesh
-    const bool haveMesh = isDir(io.time().path()/io.instance()/meshSubDir);
+    //const bool haveMesh = isDir(io.time().path()/io.instance()/meshSubDir);
+    const bool haveMesh = isFile
+    (
+        io.time().path()/io.instance()/meshSubDir/"faces"
+    );
+
 
     if (!haveMesh)
     {
@@ -164,6 +199,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
         patches.setSize(nPatches);
         dummyMesh.addFvPatches(patches, false);  // no parallel comms
 
+
         // Add some dummy zones so upon reading it does not read them
         // from the undecomposed case. Should be done as extra argument to
         // regIOobject::readStream?
@@ -202,6 +238,9 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
             )
         );
         dummyMesh.addZones(pz, fz, cz);
+        dummyMesh.pointZones().clear();
+        dummyMesh.faceZones().clear();
+        dummyMesh.cellZones().clear();
         //Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath()
         //    << endl;
         dummyMesh.write();
@@ -209,11 +248,19 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
         Pstream::parRun() = oldParRun;
     }
 
+
+
+    // Read mesh
+    // ~~~~~~~~~
+    // Now all processors have a (possibly zero size) mesh so read in
+    // parallel
+
     //Pout<< "Reading mesh from " << io.objectPath() << endl;
     autoPtr<fvMesh> meshPtr(new fvMesh(io));
     fvMesh& mesh = meshPtr();
 
 
+
     // Sync patches
     // ~~~~~~~~~~~~
 
@@ -236,10 +283,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
 
             if (patchI >= patches.size())
             {
-                FatalErrorIn
-                (
-                    "createMesh(const Time&, const fileName&, const bool)"
-                )   << "Non-processor patches not synchronised."
+                FatalErrorInFunction
+                    << "Non-processor patches not synchronised."
                     << endl
                     << "Processor " << Pstream::myProcNo()
                     << " has only " << patches.size()
@@ -254,10 +299,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
              || name != patches[patchI].name()
             )
             {
-                FatalErrorIn
-                (
-                    "createMesh(const Time&, const fileName&, const bool)"
-                )   << "Non-processor patches not synchronised."
+                FatalErrorInFunction
+                    << "Non-processor patches not synchronised."
                     << endl
                     << "Master patch " << patchI
                     << " name:" << type
@@ -327,17 +370,17 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
     }
 
 
-    if (!haveMesh)
-    {
-        // We created a dummy mesh file above. Delete it.
-        const fileName meshFiles = io.time().path()/io.instance()/meshSubDir;
-        //Pout<< "Removing dummy mesh " << meshFiles << endl;
-        mesh.removeFiles();
-        rmDir(meshFiles);
-    }
-
+//    if (!haveMesh)
+//    {
+//        // We created a dummy mesh file above. Delete it.
+//        const fileName meshFiles = io.time().path()/io.instance()/meshSubDir;
+//        //Pout<< "Removing dummy mesh " << meshFiles << endl;
+//        mesh.removeFiles();
+//        rmDir(meshFiles);
+//    }
+//
     // Force recreation of globalMeshData.
-    mesh.clearOut();
+//    mesh.clearOut();
     mesh.globalData();
 
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.C b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.C
new file mode 100644
index 0000000000..c9f8926c82
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.C
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "parFvFieldReconstructor.H"
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::parFvFieldReconstructor::createPatchFaceMaps()
+{
+    const fvBoundaryMesh& fvb = procMesh_.boundary();
+
+    patchFaceMaps_.setSize(fvb.size());
+    forAll(fvb, patchI)
+    {
+        if (!isA<processorFvPatch>(fvb[patchI]))
+        {
+            // Create map for patch faces only
+
+            // Mark all used elements (i.e. destination patch faces)
+            boolList faceIsUsed(distMap_.faceMap().constructSize(), false);
+            const polyPatch& basePatch = baseMesh_.boundaryMesh()[patchI];
+            forAll(basePatch, i)
+            {
+                faceIsUsed[basePatch.start()+i] = true;
+            }
+
+            // Copy face map
+            patchFaceMaps_.set
+            (
+                patchI,
+                new mapDistributeBase(distMap_.faceMap())
+            );
+
+            // Compact out unused elements
+            labelList oldToNewSub;
+            labelList oldToNewConstruct;
+            patchFaceMaps_[patchI].compact
+            (
+                faceIsUsed,
+                procMesh_.nFaces(),      // maximum index of subMap
+                oldToNewSub,
+                oldToNewConstruct,
+                UPstream::msgType()
+            );
+            //Pout<< "patchMap:" << patchFaceMaps_[patchI] << endl;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::parFvFieldReconstructor::parFvFieldReconstructor
+(
+    fvMesh& baseMesh,
+    const fvMesh& procMesh,
+    const mapDistributePolyMesh& distMap,
+    const bool isWriteProc
+)
+:
+    baseMesh_(baseMesh),
+    procMesh_(procMesh),
+    distMap_(distMap),
+    isWriteProc_(isWriteProc)
+{
+    createPatchFaceMaps();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::parFvFieldReconstructor::reconstructPoints()
+{
+    // Reconstruct the points for moving mesh cases and write
+    // them out
+    distributedUnallocatedDirectFieldMapper mapper
+    (
+        labelUList::null(),
+        distMap_.pointMap()
+    );
+    pointField basePoints(procMesh_.points(), mapper);
+    baseMesh_.movePoints(basePoints);
+    if (Pstream::master())
+    {
+        baseMesh_.write();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H
new file mode 100644
index 0000000000..a0e7d99223
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::parFvFieldReconstructor
+
+Description
+    Finite volume reconstructor for volume and surface fields.
+
+    Runs in parallel. Reconstructs from procMesh to baseMesh. baseMesh
+    is non-zero cells on processor0 only.
+
+SourceFiles
+    parFvFieldReconstructor.C
+    parFvFieldReconstructorReconstructFields.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef parFvFieldReconstructor_H
+#define parFvFieldReconstructor_H
+
+#include "PtrList.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class mapDistributePolyMesh;
+class mapDistributeBase;
+class IOobjectList;
+
+/*---------------------------------------------------------------------------*\
+                    Class parFvFieldReconstructor Declaration
+\*---------------------------------------------------------------------------*/
+
+class parFvFieldReconstructor
+{
+    // Private data
+
+        //- Reconstructed mesh reference
+        fvMesh& baseMesh_;
+
+        //- Processor mesh reference
+        const fvMesh& procMesh_;
+
+        //- Distribution map reference
+        const mapDistributePolyMesh& distMap_;
+
+        //- Do I need to to write (usually master only)
+        const bool isWriteProc_;
+
+        //- Patch mappers
+        PtrList<mapDistributeBase> patchFaceMaps_;
+
+
+    // Private Member Functions
+
+        //- Construct per-patch addressing
+        void createPatchFaceMaps();
+
+        //- Disallow default bitwise copy construct
+        parFvFieldReconstructor(const parFvFieldReconstructor&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const parFvFieldReconstructor&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        parFvFieldReconstructor
+        (
+            fvMesh& baseMesh,
+            const fvMesh& procMesh,
+            const mapDistributePolyMesh& distMap,
+            const bool isWriteProc
+        );
+
+
+    // Member Functions
+
+        //- Reconstruct volume internal field
+        template<class Type>
+        tmp<DimensionedField<Type, volMesh> >
+        reconstructFvVolumeInternalField
+        (
+            const DimensionedField<Type, volMesh>&
+        ) const;
+
+        //- Read and reconstruct volume internal field
+        template<class Type>
+        tmp<DimensionedField<Type, volMesh> >
+        reconstructFvVolumeInternalField(const IOobject& fieldIoObject) const;
+
+
+
+        //- Reconstruct volume field
+        template<class Type>
+        tmp<GeometricField<Type, fvPatchField, volMesh> >
+        reconstructFvVolumeField
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& fld
+        ) const;
+
+        //- Read and reconstruct volume field
+        template<class Type>
+        tmp<GeometricField<Type, fvPatchField, volMesh> >
+        reconstructFvVolumeField(const IOobject& fieldIoObject) const;
+
+
+
+        //- Reconstruct surface field
+        template<class Type>
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        reconstructFvSurfaceField
+        (
+            const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        ) const;
+
+        //- Read and reconstruct surface field
+        template<class Type>
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        reconstructFvSurfaceField(const IOobject& fieldIoObject) const;
+
+
+        //- Read, reconstruct and write all/selected volume internal fields
+        template<class Type>
+        void reconstructFvVolumeInternalFields
+        (
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        ) const;
+
+        //- Read, reconstruct and write all/selected volume fields
+        template<class Type>
+        void reconstructFvVolumeFields
+        (
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        ) const;
+
+        //- Read, reconstruct and write all/selected surface fields
+        template<class Type>
+        void reconstructFvSurfaceFields
+        (
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        ) const;
+
+        //- Helper: reconstruct and write mesh points
+        //  (note: should be moved to something like processorMeshes class)
+        void reconstructPoints();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "parFvFieldReconstructorReconstructFields.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C
new file mode 100644
index 0000000000..a56c5fdde1
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C
@@ -0,0 +1,543 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "parFvFieldReconstructor.H"
+#include "Time.H"
+#include "PtrList.H"
+#include "fvPatchFields.H"
+#include "emptyFvPatch.H"
+#include "emptyFvPatchField.H"
+#include "emptyFvsPatchField.H"
+#include "IOobjectList.H"
+#include "mapDistributePolyMesh.H"
+#include "processorFvPatch.H"
+
+#include "directFvPatchFieldMapper.H"
+#include "distributedUnallocatedDirectFieldMapper.H"
+#include "distributedUnallocatedDirectFvPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
+(
+    const DimensionedField<Type, volMesh>& fld
+) const
+{
+    distributedUnallocatedDirectFieldMapper mapper
+    (
+        labelUList::null(),
+        distMap_.cellMap()
+    );
+
+    Field<Type> internalField(fld, mapper);
+
+    // Construct a volField
+    IOobject baseIO
+    (
+        fld.name(),
+        baseMesh_.time().timeName(),
+        fld.local(),
+        baseMesh_,
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    );
+
+    return tmp<DimensionedField<Type, volMesh> >
+    (
+        new DimensionedField<Type, volMesh>
+        (
+            baseIO,
+            baseMesh_,
+            fld.dimensions(),
+            internalField
+        )
+    );
+}
+
+
+template<class Type>
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField
+(
+    const IOobject& fieldIoObject
+) const
+{
+    // Read the field
+    DimensionedField<Type, volMesh> fld
+    (
+        fieldIoObject,
+        procMesh_
+    );
+
+    // Distribute onto baseMesh
+    return reconstructFvVolumeInternalField(fld);
+}
+
+
+// Reconstruct a field onto the baseMesh
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::parFvFieldReconstructor::reconstructFvVolumeField
+(
+    const GeometricField<Type, fvPatchField, volMesh>& fld
+) const
+{
+    // Create the internalField by remote mapping
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    distributedUnallocatedDirectFieldMapper mapper
+    (
+        labelUList::null(),
+        distMap_.cellMap()
+    );
+
+    Field<Type> internalField(fld.internalField(), mapper);
+
+
+
+    // Create the patchFields by remote mapping
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Note: patchFields still on mesh, not baseMesh
+
+    PtrList<fvPatchField<Type> > patchFields(fld.mesh().boundary().size());
+
+    const typename GeometricField
+    <
+        Type,
+        fvPatchField,
+        volMesh
+    >::GeometricBoundaryField& bfld = fld.boundaryField();
+
+    forAll(bfld, patchI)
+    {
+        if (patchFaceMaps_.set(patchI))
+        {
+            // Clone local patch field
+            patchFields.set(patchI, bfld[patchI].clone());
+
+            distributedUnallocatedDirectFvPatchFieldMapper mapper
+            (
+                labelUList::null(),
+                patchFaceMaps_[patchI]
+            );
+
+            // Map into local copy
+            patchFields[patchI].autoMap(mapper);
+        }
+    }
+
+
+    PtrList<fvPatchField<Type> > basePatchFields
+    (
+        baseMesh_.boundary().size()
+    );
+
+    // Clone the patchFields onto the base patches. This is just to reset
+    // the reference to the patch, size and content stay the same.
+    forAll(patchFields, patchI)
+    {
+        if (patchFields.set(patchI))
+        {
+            const fvPatch& basePatch = baseMesh_.boundary()[patchI];
+
+            const fvPatchField<Type>& pfld = patchFields[patchI];
+
+            labelList dummyMap(identity(pfld.size()));
+            directFvPatchFieldMapper dummyMapper(dummyMap);
+
+            basePatchFields.set
+            (
+                patchI,
+                fvPatchField<Type>::New
+                (
+                    pfld,
+                    basePatch,
+                    DimensionedField<Type, volMesh>::null(),
+                    dummyMapper
+                )
+            );
+        }
+    }
+
+    // Add some empty patches on remaining patches (tbd.probably processor
+    // patches)
+    forAll(basePatchFields, patchI)
+    {
+        if (patchI >= patchFields.size() || !patchFields.set(patchI))
+        {
+            basePatchFields.set
+            (
+                patchI,
+                fvPatchField<Type>::New
+                (
+                    emptyFvPatchField<Type>::typeName,
+                    baseMesh_.boundary()[patchI],
+                    DimensionedField<Type, volMesh>::null()
+                )
+            );
+        }
+    }
+
+    // Construct a volField
+    IOobject baseIO
+    (
+        fld.name(),
+        baseMesh_.time().timeName(),
+        fld.local(),
+        baseMesh_,
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    );
+
+    return tmp<GeometricField<Type, fvPatchField, volMesh> >
+    (
+        new GeometricField<Type, fvPatchField, volMesh>
+        (
+            baseIO,
+            baseMesh_,
+            fld.dimensions(),
+            internalField,
+            basePatchFields
+        )
+    );
+}
+
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::parFvFieldReconstructor::reconstructFvVolumeField
+(
+    const IOobject& fieldIoObject
+) const
+{
+    // Read the field
+    GeometricField<Type, fvPatchField, volMesh> fld
+    (
+        fieldIoObject,
+        procMesh_
+    );
+
+    // Distribute onto baseMesh
+    return reconstructFvVolumeField(fld);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::parFvFieldReconstructor::reconstructFvSurfaceField
+(
+    const GeometricField<Type, fvsPatchField, surfaceMesh>& fld
+) const
+{
+    // Create the internalField by remote mapping
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    distributedUnallocatedDirectFieldMapper mapper
+    (
+        labelUList::null(),
+        distMap_.faceMap()
+    );
+
+    // Create flat field of internalField + all patch fields
+    Field<Type> flatFld(fld.mesh().nFaces(), pTraits<Type>::zero);
+    SubList<Type>(flatFld, fld.internalField().size()).assign
+    (
+        fld.internalField()
+    );
+    forAll(fld.boundaryField(), patchI)
+    {
+        const fvsPatchField<Type>& fvp = fld.boundaryField()[patchI];
+
+        SubList<Type>(flatFld, fvp.size(), fvp.patch().start()).assign(fvp);
+    }
+
+    // Map all faces
+    Field<Type> internalField(flatFld, mapper);
+
+    // Trim to internal faces (note: could also have special mapper)
+    internalField.setSize
+    (
+        min
+        (
+            internalField.size(),
+            baseMesh_.nInternalFaces()
+        )
+    );
+
+
+    // Create the patchFields by remote mapping
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Note: patchFields still on mesh, not baseMesh
+
+    PtrList<fvsPatchField<Type> > patchFields(fld.mesh().boundary().size());
+
+    const typename GeometricField
+    <
+        Type,
+        fvsPatchField,
+        surfaceMesh
+    >::GeometricBoundaryField& bfld = fld.boundaryField();
+
+    forAll(bfld, patchI)
+    {
+        if (patchFaceMaps_.set(patchI))
+        {
+            // Clone local patch field
+            patchFields.set(patchI, bfld[patchI].clone());
+
+            distributedUnallocatedDirectFvPatchFieldMapper mapper
+            (
+                labelUList::null(),
+                patchFaceMaps_[patchI]
+            );
+
+            // Map into local copy
+            patchFields[patchI].autoMap(mapper);
+        }
+    }
+
+
+    PtrList<fvsPatchField<Type> > basePatchFields
+    (
+        baseMesh_.boundary().size()
+    );
+
+    // Clone the patchFields onto the base patches. This is just to reset
+    // the reference to the patch, size and content stay the same.
+    forAll(patchFields, patchI)
+    {
+        if (patchFields.set(patchI))
+        {
+            const fvPatch& basePatch = baseMesh_.boundary()[patchI];
+
+            const fvsPatchField<Type>& pfld = patchFields[patchI];
+
+            labelList dummyMap(identity(pfld.size()));
+            directFvPatchFieldMapper dummyMapper(dummyMap);
+
+            basePatchFields.set
+            (
+                patchI,
+                fvsPatchField<Type>::New
+                (
+                    pfld,
+                    basePatch,
+                    DimensionedField<Type, surfaceMesh>::null(),
+                    dummyMapper
+                )
+            );
+        }
+    }
+
+    // Add some empty patches on remaining patches (tbd.probably processor
+    // patches)
+    forAll(basePatchFields, patchI)
+    {
+        if (patchI >= patchFields.size() || !patchFields.set(patchI))
+        {
+            basePatchFields.set
+            (
+                patchI,
+                fvsPatchField<Type>::New
+                (
+                    emptyFvsPatchField<Type>::typeName,
+                    baseMesh_.boundary()[patchI],
+                    DimensionedField<Type, surfaceMesh>::null()
+                )
+            );
+        }
+    }
+
+    // Construct a volField
+    IOobject baseIO
+    (
+        fld.name(),
+        baseMesh_.time().timeName(),
+        fld.local(),
+        baseMesh_,
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    );
+
+    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+    (
+        new GeometricField<Type, fvsPatchField, surfaceMesh>
+        (
+            baseIO,
+            baseMesh_,
+            fld.dimensions(),
+            internalField,
+            basePatchFields
+        )
+    );
+}
+
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::parFvFieldReconstructor::reconstructFvSurfaceField
+(
+    const IOobject& fieldIoObject
+) const
+{
+    // Read the field
+    GeometricField<Type, fvsPatchField, surfaceMesh> fld
+    (
+        fieldIoObject,
+        procMesh_
+    );
+
+    return reconstructFvSurfaceField(fld);
+}
+
+
+template<class Type>
+void Foam::parFvFieldReconstructor::reconstructFvVolumeInternalFields
+(
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+) const
+{
+    const word& fieldClassName = DimensionedField<Type, volMesh>::typeName;
+
+    IOobjectList fields = objects.lookupClass(fieldClassName);
+
+    if (fields.size())
+    {
+        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
+
+        forAllConstIter(IOobjectList, fields, fieldIter)
+        {
+            if
+            (
+                selectedFields.empty()
+             || selectedFields.found(fieldIter()->name())
+            )
+            {
+                Info<< "        " << fieldIter()->name() << endl;
+
+                tmp<DimensionedField<Type, volMesh> > tfld
+                (
+                    reconstructFvVolumeInternalField<Type>(*fieldIter())
+                );
+
+                if (isWriteProc_)
+                {
+                    tfld().write();
+                }
+            }
+        }
+        Info<< endl;
+    }
+}
+
+
+template<class Type>
+void Foam::parFvFieldReconstructor::reconstructFvVolumeFields
+(
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+) const
+{
+    const word& fieldClassName =
+        GeometricField<Type, fvPatchField, volMesh>::typeName;
+
+    IOobjectList fields = objects.lookupClass(fieldClassName);
+
+    if (fields.size())
+    {
+        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
+
+        forAllConstIter(IOobjectList, fields, fieldIter)
+        {
+            const word& name = fieldIter()->name();
+
+            if
+            (
+                (selectedFields.empty() || selectedFields.found(name))
+             && name != "cellDist"
+            )
+            {
+                Info<< "        " << name << endl;
+
+                tmp<GeometricField<Type, fvPatchField, volMesh> > tfld
+                (
+                    reconstructFvVolumeField<Type>(*fieldIter())
+                );
+                if (isWriteProc_)
+                {
+                    tfld().write();
+                }
+            }
+        }
+        Info<< endl;
+    }
+}
+
+
+template<class Type>
+void Foam::parFvFieldReconstructor::reconstructFvSurfaceFields
+(
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+) const
+{
+    const word& fieldClassName =
+        GeometricField<Type, fvsPatchField, surfaceMesh>::typeName;
+
+    IOobjectList fields = objects.lookupClass(fieldClassName);
+
+    if (fields.size())
+    {
+        Info<< "    Reconstructing " << fieldClassName << "s\n" << endl;
+
+        forAllConstIter(IOobjectList, fields, fieldIter)
+        {
+            if
+            (
+                selectedFields.empty()
+             || selectedFields.found(fieldIter()->name())
+            )
+            {
+                Info<< "        " << fieldIter()->name() << endl;
+
+                tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tfld
+                (
+                    reconstructFvSurfaceField<Type>(*fieldIter())
+                );
+                if (isWriteProc_)
+                {
+                    tfld().write();
+                }
+            }
+        }
+        Info<< endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
new file mode 100644
index 0000000000..2e775f2ef8
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
@@ -0,0 +1,321 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ListOps.H"
+#include "parLagrangianRedistributor.H"
+#include "passiveParticleCloud.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::parLagrangianRedistributor::parLagrangianRedistributor
+(
+    const fvMesh& srcMesh,
+    const fvMesh& tgtMesh,
+    const label nSrcCells,
+    const mapDistributePolyMesh& distMap
+)
+:
+    srcMesh_(srcMesh),
+    tgtMesh_(tgtMesh),
+    distMap_(distMap)
+{
+    const mapDistribute& cellMap = distMap_.cellMap();
+
+    // Get destination processors and cells
+    destinationProcID_ = labelList(tgtMesh_.nCells(), Pstream::myProcNo());
+    cellMap.reverseDistribute(nSrcCells, destinationProcID_);
+
+    destinationCell_ = identity(tgtMesh_.nCells());
+    cellMap.reverseDistribute(nSrcCells, destinationCell_);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// Find all clouds (on all processors) and for each cloud all the objects.
+// Result will be synchronised on all processors
+void Foam::parLagrangianRedistributor::findClouds
+(
+    const fvMesh& mesh,
+    wordList& cloudNames,
+    List<wordList>& objectNames
+)
+{
+    fileNameList localCloudDirs
+    (
+        readDir
+        (
+            mesh.time().timePath()
+          / mesh.dbDir()
+          / cloud::prefix,
+            fileName::DIRECTORY
+        )
+    );
+
+    cloudNames.setSize(localCloudDirs.size());
+    forAll(localCloudDirs, i)
+    {
+        cloudNames[i] = localCloudDirs[i];
+    }
+
+    // Synchronise cloud names
+    Pstream::combineGather(cloudNames, ListUniqueEqOp<word>());
+    Pstream::combineScatter(cloudNames);
+
+    objectNames.setSize(cloudNames.size());
+
+    forAll(localCloudDirs, i)
+    {
+        // Do local scan for valid cloud objects
+        IOobjectList sprayObjs
+        (
+            mesh,
+            mesh.time().timeName(),
+            cloud::prefix/localCloudDirs[i]
+        );
+
+        if (sprayObjs.lookup(word("positions")))
+        {
+            // One of the objects is positions so must be valid cloud
+
+            label cloudI = findIndex(cloudNames, localCloudDirs[i]);
+
+            objectNames[cloudI].setSize(sprayObjs.size());
+            label objectI = 0;
+            forAllConstIter(IOobjectList, sprayObjs, iter)
+            {
+                const word& name = iter.key();
+                if (name != "positions")
+                {
+                    objectNames[cloudI][objectI++] = name;
+                }
+            }
+            objectNames[cloudI].setSize(objectI);
+        }
+    }
+
+    // Synchronise objectNames
+    forAll(objectNames, cloudI)
+    {
+        Pstream::combineGather(objectNames[cloudI], ListUniqueEqOp<word>());
+        Pstream::combineScatter(objectNames[cloudI]);
+    }
+}
+
+
+Foam::autoPtr<Foam::mapDistributeBase>
+Foam::parLagrangianRedistributor::redistributeLagrangianPositions
+(
+    passiveParticleCloud& lpi
+) const
+{
+    //Debug(lpi.size());
+
+    labelListList subMap;
+
+
+    // Allocate transfer buffers
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    {
+        // List of lists of particles to be transfered for all of the
+        // neighbour processors
+        List<IDLList<passiveParticle> > particleTransferLists
+        (
+            Pstream::nProcs()
+        );
+
+        // Per particle the destination processor
+        labelList destProc(lpi.size());
+
+        label particleI = 0;
+        forAllIter(passiveParticleCloud, lpi, iter)
+        {
+            passiveParticle& ppi = iter();
+
+            label destProcI = destinationProcID_[ppi.cell()];
+            label destCellI = destinationCell_[ppi.cell()];
+
+            ppi.cell() = destCellI;
+            destProc[particleI++] = destProcI;
+            //Pout<< "Sending particle:" << ppi << " to processor " << destProcI
+            //    << " to cell " << destCellI << endl;
+            particleTransferLists[destProcI].append(lpi.remove(&ppi));
+        }
+
+
+        // Per processor the indices of the particles to send
+        subMap = invertOneToMany(Pstream::nProcs(), destProc);
+
+
+        // Stream into send buffers
+        forAll(particleTransferLists, procI)
+        {
+            //Pout<< "To proc " << procI << " sending "
+            //    << particleTransferLists[procI] << endl;
+            if (particleTransferLists[procI].size())
+            {
+                UOPstream particleStream(procI, pBufs);
+                particleStream << particleTransferLists[procI];
+            }
+        }
+    }
+
+
+    // Start sending. Sets number of bytes transferred
+    labelListList allNTrans(Pstream::nProcs());
+    pBufs.finishedSends(allNTrans);
+
+
+    {
+        // Temporarily rename original cloud so we can construct a new one
+        // (to distribute the positions) without getting a duplicate
+        // registration warning
+        const word cloudName = lpi.name();
+        lpi.rename(cloudName + "_old");
+
+        // New cloud on tgtMesh
+        passiveParticleCloud lagrangianPositions
+        (
+            tgtMesh_,
+            cloudName,
+            IDLList<passiveParticle>()
+        );
+
+
+        // Retrieve from receive buffers
+        forAll(allNTrans, procI)
+        {
+            label nRec = allNTrans[procI][Pstream::myProcNo()];
+
+            //Pout<< "From processor " << procI << " receiving bytes " << nRec
+            //    << endl;
+
+            if (nRec)
+            {
+                UIPstream particleStream(procI, pBufs);
+
+                IDLList<passiveParticle> newParticles
+                (
+                    particleStream,
+                    passiveParticle::iNew(tgtMesh_)
+                );
+
+                forAllIter
+                (
+                    IDLList<passiveParticle>,
+                    newParticles,
+                    newpIter
+                )
+                {
+                    passiveParticle& newp = newpIter();
+
+                    lagrangianPositions.addParticle(newParticles.remove(&newp));
+                }
+            }
+        }
+
+
+        //OFstream::debug = 1;
+        //Debug(lagrangianPositions.size());
+        IOPosition<passiveParticleCloud>(lagrangianPositions).write();
+        //OFstream::debug = 0;
+
+        // Restore cloud name
+        lpi.rename(cloudName);
+    }
+
+    // Work the send indices (subMap) into a mapDistributeBase
+    labelListList sizes(Pstream::nProcs());
+    labelList& nsTransPs = sizes[Pstream::myProcNo()];
+    nsTransPs.setSize(Pstream::nProcs());
+    forAll(subMap, sendProcI)
+    {
+        nsTransPs[sendProcI] = subMap[sendProcI].size();
+    }
+    // Send sizes across. Note: blocks.
+    combineReduce(sizes, Pstream::listEq());
+
+    labelListList constructMap(Pstream::nProcs());
+    label constructSize = 0;
+    forAll(constructMap, procI)
+    {
+        label nRecv = sizes[procI][UPstream::myProcNo()];
+
+        labelList& map = constructMap[procI];
+
+        map.setSize(nRecv);
+        forAll(map, i)
+        {
+            map[i] = constructSize++;
+        }
+    }
+
+
+    // Construct map
+    return autoPtr<mapDistributeBase>
+    (
+        new mapDistributeBase
+        (
+            constructSize,
+            subMap.xfer(),
+            constructMap.xfer()
+        )
+    );
+}
+
+
+Foam::autoPtr<Foam::mapDistributeBase>
+Foam::parLagrangianRedistributor::redistributeLagrangianPositions
+(
+    const word& cloudName
+) const
+{
+    (void)srcMesh_.tetBasePtIs();
+    (void)tgtMesh_.tetBasePtIs();
+
+    // Temporarily: override master-only checking
+    regIOobject::fileCheckTypes oldCheckType =
+        regIOobject::fileModificationChecking;
+
+    if (oldCheckType == regIOobject::timeStampMaster)
+    {
+        regIOobject::fileModificationChecking = regIOobject::timeStamp;
+    }
+    else if (oldCheckType == regIOobject::inotifyMaster)
+    {
+        regIOobject::fileModificationChecking = regIOobject::inotify;
+    }
+
+    // Load cloud and send particle
+    passiveParticleCloud lpi(srcMesh_, cloudName, false);
+
+    regIOobject::fileModificationChecking = oldCheckType;
+
+    return redistributeLagrangianPositions(lpi);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H
new file mode 100644
index 0000000000..29fdb5e7aa
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::parLagrangianRedistributor
+
+Description
+    Lagrangian field redistributor.
+
+    Runs in parallel. Redistributes from fromMesh to toMesh.
+
+SourceFiles
+    parLagrangianRedistributor.C
+    parLagrangianRedistributorRedistributeFields.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef parLagrangianRedistributor_H
+#define parLagrangianRedistributor_H
+
+#include "PtrList.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class mapDistributePolyMesh;
+class mapDistributeBase;
+class IOobjectList;
+class passiveParticleCloud;
+
+/*---------------------------------------------------------------------------*\
+                    Class parLagrangianRedistributor Declaration
+\*---------------------------------------------------------------------------*/
+
+class parLagrangianRedistributor
+{
+    // Private data
+
+        //- Source mesh reference
+        const fvMesh& srcMesh_;
+
+        //- Destination mesh reference
+        const fvMesh& tgtMesh_;
+
+        //- Distribution map reference
+        const mapDistributePolyMesh& distMap_;
+
+        //- For every src cell the target processor
+        labelList destinationProcID_;
+
+        //- For every src cell the target cell
+        labelList destinationCell_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        parLagrangianRedistributor(const parLagrangianRedistributor&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const parLagrangianRedistributor&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        parLagrangianRedistributor
+        (
+            const fvMesh& srcMesh,
+            const fvMesh& tgtMesh,
+            const label nOldCells,
+            const mapDistributePolyMesh& distMap
+        );
+
+
+    // Member Functions
+
+        //- Find all clouds (on all processors) and for each cloud all
+        //  the objects. Result will be synchronised on all processors
+        static void findClouds
+        (
+            const fvMesh&,
+            wordList& cloudNames,
+            List<wordList>& objectNames
+        );
+
+        //- Redistribute and write lagrangian positions
+        autoPtr<mapDistributeBase> redistributeLagrangianPositions
+        (
+            passiveParticleCloud& cloud
+        ) const;
+
+        //- Read, redistribute and write lagrangian positions
+        autoPtr<mapDistributeBase> redistributeLagrangianPositions
+        (
+            const word& cloudName
+        ) const;
+
+        //- Pick up any fields of a given type
+        template<class Type>
+        static wordList filterObjects
+        (
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        );
+
+        //- Read, redistribute and write all/selected lagrangian fields
+        template<class Type>
+        void redistributeLagrangianFields
+        (
+            const mapDistributeBase& map,
+            const word& cloudName,
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        ) const;
+
+        //- Read, redistribute and write all/selected lagrangian fieldFields
+        template<class Type>
+        void redistributeLagrangianFieldFields
+        (
+            const mapDistributeBase& map,
+            const word& cloudName,
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        ) const;
+
+        //- Read and store all fields of a cloud
+        template<class Container>
+        static void readLagrangianFields
+        (
+            const passiveParticleCloud& cloud,
+            const IOobjectList& objects,
+            const HashSet<word>& selectedFields
+        );
+
+        //- Redistribute and write stored lagrangian fields
+        template<class Container>
+        void redistributeStoredLagrangianFields
+        (
+            const mapDistributeBase& map,
+            passiveParticleCloud& cloud
+        ) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "parLagrangianRedistributorRedistributeFields.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
new file mode 100644
index 0000000000..bc17570d3c
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
@@ -0,0 +1,320 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "parLagrangianRedistributor.H"
+#include "Time.H"
+#include "IOobjectList.H"
+#include "mapDistributePolyMesh.H"
+#include "cloud.H"
+#include "CompactIOField.H"
+#include "passiveParticleCloud.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Container>
+Foam::wordList Foam::parLagrangianRedistributor::filterObjects
+(
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+)
+{
+    const word fieldClassName(Container::typeName);
+
+    // Parallel synchronise
+    wordList fieldNames(objects.names(fieldClassName));
+    Pstream::combineGather(fieldNames, ListUniqueEqOp<word>());
+    Pstream::combineScatter(fieldNames);
+
+    if (!selectedFields.empty())
+    {
+        DynamicList<word> selectedNames(fieldNames.size());
+        forAll(fieldNames, i)
+        {
+            if (selectedFields.found(fieldNames[i]))
+            {
+                selectedNames.append(fieldNames[i]);
+            }
+        }
+        fieldNames.transfer(selectedNames);
+    }
+    return fieldNames;
+}
+
+
+template<class Type>
+void Foam::parLagrangianRedistributor::redistributeLagrangianFields
+(
+    const mapDistributeBase& map,
+    const word& cloudName,
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+) const
+{
+    const wordList objectNames
+    (
+        filterObjects<IOField<Type> >
+        (
+            objects,
+            selectedFields
+        )
+    );
+
+    if (objectNames.size())
+    {
+        const word fieldClassName(IOField<Type>::typeName);
+
+        Info<< "    Redistributing lagrangian "
+            << fieldClassName << "s\n" << endl;
+
+        forAll(objectNames, i)
+        {
+            Info<< "        " <<  objectNames[i] << endl;
+
+            // Read if present
+            IOField<Type> field
+            (
+                IOobject
+                (
+                    objectNames[i],
+                    srcMesh_.time().timeName(),
+                    cloud::prefix/cloudName,
+                    srcMesh_,
+                    IOobject::READ_IF_PRESENT,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                0
+            );
+
+            map.distribute(field);
+
+
+            if (field.size())
+            {
+                IOField<Type>
+                (
+                    IOobject
+                    (
+                        objectNames[i],
+                        tgtMesh_.time().timeName(),
+                        cloud::prefix/cloudName,
+                        tgtMesh_,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    ),
+                    xferMove<Field<Type> >(field)
+                ).write();
+            }
+        }
+
+        Info<< endl;
+    }
+}
+
+
+template<class Type>
+void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
+(
+    const mapDistributeBase& map,
+    const word& cloudName,
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+) const
+{
+    wordList objectNames
+    (
+        filterObjects<CompactIOField<Field<Type>, Type> >
+        (
+            objects,
+            selectedFields
+        )
+    );
+
+    // Append IOField names
+    {
+        const wordList ioFieldNames
+        (
+            filterObjects<IOField<Field<Type> > >
+            (
+                objects,
+                selectedFields
+            )
+        );
+        objectNames.append(ioFieldNames);
+    }
+
+
+    if (objectNames.size())
+    {
+        const word fieldClassName(CompactIOField<Field<Type>, Type>::typeName);
+
+        Info<< "    Redistributing lagrangian "
+            << fieldClassName << "s\n" << endl;
+
+        forAll(objectNames, i)
+        {
+            Info<< "        " <<  objectNames[i] << endl;
+
+            // Read if present
+            CompactIOField<Field<Type>, Type > field
+            (
+                IOobject
+                (
+                    objectNames[i],
+                    srcMesh_.time().timeName(),
+                    cloud::prefix/cloudName,
+                    srcMesh_,
+                    IOobject::READ_IF_PRESENT,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                0
+            );
+
+            // Distribute
+            map.distribute(field);
+
+            // Write
+            if (field.size())
+            {
+                CompactIOField<Field<Type>, Type>
+                (
+                    IOobject
+                    (
+                        objectNames[i],
+                        tgtMesh_.time().timeName(),
+                        cloud::prefix/cloudName,
+                        tgtMesh_,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    ),
+                    xferMove<Field<Field<Type> > >(field)
+                ).write();
+            }
+        }
+    }
+}
+
+
+template<class Container>
+void Foam::parLagrangianRedistributor::readLagrangianFields
+(
+    const passiveParticleCloud& cloud,
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+)
+{
+    const wordList objectNames
+    (
+        filterObjects<Container>
+        (
+            objects,
+            selectedFields
+        )
+    );
+
+    if (objectNames.size())
+    {
+        const word fieldClassName(Container::typeName);
+
+        Info<< "    Reading lagrangian "
+            << fieldClassName << "s\n" << endl;
+
+        forAll(objectNames, i)
+        {
+            Info<< "        " <<  objectNames[i] << endl;
+
+            // Read if present
+            Container* fieldPtr = new Container
+            (
+                IOobject
+                (
+                    objectNames[i],
+                    cloud.time().timeName(),
+                    cloud,
+                    IOobject::READ_IF_PRESENT,
+                    IOobject::NO_WRITE
+                ),
+                0
+            );
+
+            fieldPtr->store();
+        }
+    }
+}
+
+
+template<class Container>
+void Foam::parLagrangianRedistributor::redistributeStoredLagrangianFields
+(
+    const mapDistributeBase& map,
+    passiveParticleCloud& cloud
+) const
+{
+    HashTable<Container*> fields
+    (
+        cloud.lookupClass<Container >()
+    );
+
+    if (fields.size())
+    {
+        const word fieldClassName(Container::typeName);
+
+        Info<< "    Redistributing lagrangian "
+            << fieldClassName << "s\n" << endl;
+
+        forAllIter(typename HashTable<Container*>, fields, iter)
+        {
+            Container& field = *iter();
+
+            Info<< "        " <<  field.name() << endl;
+
+            map.distribute(field);
+
+            if (field.size())
+            {
+                Container
+                (
+                    IOobject
+                    (
+                        field.name(),
+                        tgtMesh_.time().timeName(),
+                        cloud::prefix/cloud.name(),
+                        tgtMesh_,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    ),
+                    xferMove<Field<typename Container::value_type> >(field)
+                ).write();
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 7cc21c4adc..c2667c60d7 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,30 +31,54 @@ Description
     Must be run on maximum number of source and destination processors.
     Balances mesh and writes new mesh to new time directory.
 
-    Can also work like decomposePar:
-    \verbatim
-        # Create empty processor directories (have to exist for argList)
-        mkdir processor0
-                ..
-        mkdir processorN
+Usage
 
-        # Copy undecomposed polyMesh
-        cp -r constant processor0
+    - redistributePar [OPTION]
+
+    \param -region regionName \n
+    Distribute named region.
+
+    \param -decompose \n
+    Remove any existing \a processor subdirectories and decomposes the
+    geometry. Equivalent to running without processor subdirectories.
+
+    \param -reconstruct \n
+    Reconstruct geometry (like reconstructParMesh). Equivalent to setting
+    numberOfSubdomains 1 in the decomposeParDict.
+
+    \param -newTimes \n
+    (in combination with -reconstruct) reconstruct only new times.
+
+    \param -cellDist \n
+    Write the cell distribution as a labelList, for use with 'manual'
+    decomposition method or as a volScalarField for post-processing.
 
-        # Distribute
-        mpirun -np ddd redistributePar -parallel
-    \endverbatim
 \*---------------------------------------------------------------------------*/
 
+#include "argList.H"
+#include "Time.H"
 #include "fvMesh.H"
-#include "decompositionMethod.H"
-#include "PstreamReduceOps.H"
-#include "fvCFD.H"
+#include "fvMeshTools.H"
 #include "fvMeshDistribute.H"
-#include "mapDistributePolyMesh.H"
+#include "decompositionMethod.H"
+#include "timeSelector.H"
+#include "PstreamReduceOps.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "IOmapDistributePolyMesh.H"
 #include "IOobjectList.H"
 #include "globalIndex.H"
 #include "loadOrCreateMesh.H"
+#include "processorFvPatchField.H"
+#include "zeroGradientFvPatchFields.H"
+#include "decompositionModel.H"
+
+#include "parFvFieldReconstructor.H"
+#include "parLagrangianRedistributor.H"
+#include "unmappedPassiveParticleCloud.H"
+#include "hexRef8Data.H"
+
+using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,7 +106,7 @@ scalar getMergeDistance
 
     if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
     {
-        FatalErrorIn("getMergeDistance")
+        FatalErrorInFunction
             << "Your current settings specify ASCII writing with "
             << IOstream::defaultPrecision() << " digits precision." << endl
             << "Your merging tolerance (" << mergeTol << ") is finer than this."
@@ -104,19 +128,6 @@ scalar getMergeDistance
 }
 
 
-//void printMeshData(Ostream& os, const polyMesh& mesh)
-//{
-//    os  << "Number of points:           " << mesh.points().size() << nl
-//        << "          faces:            " << mesh.faces().size() << nl
-//        << "          internal faces:   " << mesh.faceNeighbour().size() << nl
-//        << "          cells:            " << mesh.cells().size() << nl
-//        << "          boundary patches: " << mesh.boundaryMesh().size() << nl
-//        << "          point zones:      " << mesh.pointZones().size() << nl
-//        << "          face zones:       " << mesh.faceZones().size() << nl
-//        << "          cell zones:       " << mesh.cellZones().size() << nl;
-//}
-
-
 void printMeshData(const polyMesh& mesh)
 {
     // Collect all data on master
@@ -173,7 +184,7 @@ void printMeshData(const polyMesh& mesh)
         Info<< "    Number of processor patches = " << nei.size() << nl
             << "    Number of processor faces = " << nProcFaces << nl
             << "    Number of boundary faces = "
-            << globalBoundaryFaces.localSize(procI) << endl;
+            << globalBoundaryFaces.localSize(procI)-nProcFaces << endl;
 
         maxProcCells = max(maxProcCells, globalCells.localSize(procI));
         totProcFaces += nProcFaces;
@@ -221,6 +232,23 @@ void writeDecomposition
     const labelList& decomp
 )
 {
+    // Write the decomposition as labelList for use with 'manual'
+    // decomposition method.
+    labelIOList cellDecomposition
+    (
+        IOobject
+        (
+            "cellDecomposition",
+            mesh.facesInstance(),  // mesh read from facesInstance
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        decomp
+    );
+    cellDecomposition.write();
+
     Info<< "Writing wanted cell distribution to volScalarField " << name
         << " for postprocessing purposes." << nl << endl;
 
@@ -248,8 +276,317 @@ void writeDecomposition
 }
 
 
+void determineDecomposition
+(
+    const Time& baseRunTime,
+    const fileName& decompDictFile, // optional location for decomposeParDict
+    const bool decompose,       // decompose, i.e. read from undecomposed case
+    const fileName& proc0CaseName,
+    const fvMesh& mesh,
+    const bool writeCellDist,
+
+    label& nDestProcs,
+    labelList& decomp
+)
+{
+    // Read decomposeParDict (on all processors)
+    const decompositionModel& method = decompositionModel::New
+    (
+        mesh,
+        decompDictFile
+    );
+
+    decompositionMethod& decomposer = method.decomposer();
+
+    if (!decomposer.parallelAware())
+    {
+        WarningInFunction
+            << "You have selected decomposition method "
+            << decomposer.typeName
+            << " which does" << endl
+            << "not synchronise the decomposition across"
+            << " processor patches." << endl
+            << "    You might want to select a decomposition method"
+            << " which is aware of this. Continuing."
+            << endl;
+    }
+
+    if (Pstream::master() && decompose)
+    {
+        Info<< "Setting caseName to " << baseRunTime.caseName()
+            << " to read decomposeParDict" << endl;
+        const_cast<Time&>(mesh.time()).TimePaths::caseName() =
+            baseRunTime.caseName();
+    }
+
+    scalarField cellWeights;
+    if (method.found("weightField"))
+    {
+        word weightName = method.lookup("weightField");
+
+        volScalarField weights
+        (
+            IOobject
+            (
+                weightName,
+                mesh.time().timeName(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh
+        );
+        cellWeights = weights.internalField();
+    }
+
+    nDestProcs = decomposer.nDomains();
+    decomp = decomposer.decompose(mesh, cellWeights);
+
+    if (Pstream::master() && decompose)
+    {
+        Info<< "Restoring caseName to " << proc0CaseName << endl;
+        const_cast<Time&>(mesh.time()).TimePaths::caseName() =
+            proc0CaseName;
+    }
+
+    // Dump decomposition to volScalarField
+    if (writeCellDist)
+    {
+        // Note: on master make sure to write to processor0
+        if (decompose)
+        {
+            if (Pstream::master())
+            {
+                Info<< "Setting caseName to " << baseRunTime.caseName()
+                    << " to write undecomposed cellDist" << endl;
+
+                Time& tm = const_cast<Time&>(mesh.time());
+
+                tm.TimePaths::caseName() = baseRunTime.caseName();
+                writeDecomposition("cellDist", mesh, decomp);
+                Info<< "Restoring caseName to " << proc0CaseName << endl;
+                tm.TimePaths::caseName() = proc0CaseName;
+            }
+        }
+        else
+        {
+            writeDecomposition("cellDist", mesh, decomp);
+        }
+    }
+}
+
+
+// Write addressing if decomposing (1 to many) or reconstructing (many to 1)
+void writeProcAddressing
+(
+    const bool decompose,
+    const fileName& meshSubDir,
+    const fvMesh& mesh,
+    const mapDistributePolyMesh& map
+)
+{
+    Info<< "Writing procAddressing files to " << mesh.facesInstance()
+        << endl;
+
+    labelIOList cellMap
+    (
+        IOobject
+        (
+            "cellProcAddressing",
+            mesh.facesInstance(),
+            meshSubDir,
+            mesh,
+            IOobject::NO_READ
+        ),
+        0
+    );
+
+    labelIOList faceMap
+    (
+        IOobject
+        (
+            "faceProcAddressing",
+            mesh.facesInstance(),
+            meshSubDir,
+            mesh,
+            IOobject::NO_READ
+        ),
+        0
+    );
+
+    labelIOList pointMap
+    (
+        IOobject
+        (
+            "pointProcAddressing",
+            mesh.facesInstance(),
+            meshSubDir,
+            mesh,
+            IOobject::NO_READ
+        ),
+        0
+    );
+
+    labelIOList patchMap
+    (
+        IOobject
+        (
+            "boundaryProcAddressing",
+            mesh.facesInstance(),
+            meshSubDir,
+            mesh,
+            IOobject::NO_READ
+        ),
+        0
+    );
+
+    // Decomposing: see how cells moved from undecomposed case
+    if (decompose)
+    {
+        cellMap = identity(map.nOldCells());
+        map.distributeCellData(cellMap);
+
+        faceMap = identity(map.nOldFaces());
+        {
+            const mapDistribute& faceDistMap = map.faceMap();
+
+            if (faceDistMap.subHasFlip() || faceDistMap.constructHasFlip())
+            {
+                // Offset by 1
+                faceMap = faceMap + 1;
+            }
+            // Apply face flips
+            mapDistributeBase::distribute
+            (
+                Pstream::nonBlocking,
+                List<labelPair>(),
+                faceDistMap.constructSize(),
+                faceDistMap.subMap(),
+                faceDistMap.subHasFlip(),
+                faceDistMap.constructMap(),
+                faceDistMap.constructHasFlip(),
+                faceMap,
+                flipLabelOp()
+            );
+        }
+
+        pointMap = identity(map.nOldPoints());
+        map.distributePointData(pointMap);
+
+        patchMap = identity(map.oldPatchSizes().size());
+        const mapDistribute& patchDistMap = map.patchMap();
+        // Use explicit distribute since we need to provide a null value
+        // (for new patches) and this is the only call that allow us to
+        // provide one ...
+        mapDistributeBase::distribute
+        (
+            Pstream::nonBlocking,
+            List<labelPair>(),
+            patchDistMap.constructSize(),
+            patchDistMap.subMap(),
+            patchDistMap.subHasFlip(),
+            patchDistMap.constructMap(),
+            patchDistMap.constructHasFlip(),
+            patchMap,
+            eqOp<label>(),
+            flipOp(),
+            label(-1),
+            UPstream::msgType()
+        );
+    }
+    else    // if (nDestProcs == 1)
+    {
+        cellMap = identity(mesh.nCells());
+        map.cellMap().reverseDistribute(map.nOldCells(), cellMap);
+
+        faceMap = identity(mesh.nFaces());
+        {
+            const mapDistribute& faceDistMap = map.faceMap();
+
+            if (faceDistMap.subHasFlip() || faceDistMap.constructHasFlip())
+            {
+                // Offset by 1
+                faceMap = faceMap + 1;
+            }
+
+            mapDistributeBase::distribute
+            (
+                Pstream::nonBlocking,
+                List<labelPair>(),
+                map.nOldFaces(),
+                faceDistMap.constructMap(),
+                faceDistMap.constructHasFlip(),
+                faceDistMap.subMap(),
+                faceDistMap.subHasFlip(),
+                faceMap,
+                flipLabelOp()
+            );
+        }
+
+        pointMap = identity(mesh.nPoints());
+        map.pointMap().reverseDistribute(map.nOldPoints(), pointMap);
+
+        const mapDistribute& patchDistMap = map.patchMap();
+        patchMap = identity(mesh.boundaryMesh().size());
+        patchDistMap.reverseDistribute
+        (
+            map.oldPatchSizes().size(),
+            label(-1),
+            patchMap
+        );
+    }
+
+    bool cellOk = cellMap.write();
+    bool faceOk = faceMap.write();
+    bool pointOk = pointMap.write();
+    bool patchOk = patchMap.write();
+
+    if (!cellOk || !faceOk || !pointOk || !patchOk)
+    {
+        WarningInFunction
+            << "Failed to write " << cellMap.objectPath()
+            << ", " << faceMap.objectPath()
+            << ", " << pointMap.objectPath()
+            << ", " << patchMap.objectPath()
+            << endl;
+    }
+}
+
+
+
+// Generic mesh-based field reading
+template<class GeoField>
+void readField
+(
+    const IOobject& io,
+    const fvMesh& mesh,
+    const label i,
+    PtrList<GeoField>& fields
+)
+{
+    fields.set(i, new GeoField(io, mesh));
+}
+
+
+// Definition of readField for GeometricFields only
+template<class Type, template<class> class PatchField, class GeoMesh>
+void readField
+(
+    const IOobject& io,
+    const fvMesh& mesh,
+    const label i,
+    PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields
+)
+{
+    fields.set
+    (
+        i,
+        new GeometricField<Type, PatchField, GeoMesh>(io, mesh, false)
+    );
+}
+
+
 // Read vol or surface fields
-//template<class T, class Mesh>
 template<class GeoField>
 void readFields
 (
@@ -265,14 +602,14 @@ void readFields
     // Get my objects of type
     IOobjectList objects(allObjects.lookupClass(GeoField::typeName));
     // Check that we all have all objects
-    wordList objectNames = objects.toc();
+    wordList objectNames = objects.sortedNames();
     // Get master names
     wordList masterNames(objectNames);
     Pstream::scatter(masterNames);
 
     if (haveMesh[Pstream::myProcNo()] && objectNames != masterNames)
     {
-        FatalErrorIn("readFields()")
+        FatalErrorInFunction
             << "differing fields of type " << GeoField::typeName
             << " on processors." << endl
             << "Master has:" << masterNames << endl
@@ -291,9 +628,8 @@ void readFields
             IOobject& io = *objects[name];
             io.writeOpt() = IOobject::AUTO_WRITE;
 
-            // Load field
-            fields.set(i, new GeoField(io, mesh));
-
+            // Load field (but not oldTime)
+            readField(io, mesh, i, fields);
             // Create zero sized field and send
             if (subsetterPtr.valid())
             {
@@ -354,79 +690,1448 @@ void readFields
             IOobject& io = *objects[name];
             io.writeOpt() = IOobject::AUTO_WRITE;
 
-            // Load field
-            fields.set(i, new GeoField(io, mesh));
+            // Load field (but not oldtime)
+            readField(io, mesh, i, fields);
         }
     }
 }
 
 
-// Debugging: compare two fields.
-void compareFields
-(
-    const scalar tolDim,
-    const volVectorField& a,
-    const volVectorField& b
-)
+// Variant of GeometricField::correctBoundaryConditions that only
+// evaluates selected patch fields
+template<class GeoField, class CoupledPatchType>
+void correctCoupledBoundaryConditions(fvMesh& mesh)
 {
-    forAll(a, cellI)
+    HashTable<GeoField*> flds
+    (
+        mesh.objectRegistry::lookupClass<GeoField>()
+    );
+
+    forAllIter(typename HashTable<GeoField*>, flds, iter)
     {
-        if (mag(b[cellI] - a[cellI]) > tolDim)
+        GeoField& fld = *iter();
+
+        typename GeoField::GeometricBoundaryField& bfld =
+            fld.boundaryField();
+        if
+        (
+            Pstream::defaultCommsType == Pstream::blocking
+         || Pstream::defaultCommsType == Pstream::nonBlocking
+        )
         {
-            FatalErrorIn
-            (
-                "compareFields"
-                "(const scalar, const volVectorField&, const volVectorField&)"
-            )   << "Did not map volVectorField correctly:" << nl
-                << "cell:" << cellI
-                << " transfer b:" << b[cellI]
-                << " real cc:" << a[cellI]
-                << abort(FatalError);
-        }
-    }
-    forAll(a.boundaryField(), patchI)
-    {
-        // We have real mesh cellcentre and
-        // mapped original cell centre.
+            label nReq = Pstream::nRequests();
 
-        const fvPatchVectorField& aBoundary =
-            a.boundaryField()[patchI];
-
-        const fvPatchVectorField& bBoundary =
-            b.boundaryField()[patchI];
-
-        if (!bBoundary.coupled())
-        {
-            forAll(aBoundary, i)
+            forAll(bfld, patchi)
             {
-                if (mag(aBoundary[i] - bBoundary[i]) > tolDim)
+                typename GeoField::PatchFieldType& pfld = bfld[patchi];
+
+                //if (pfld.coupled())
+                //if (isA<CoupledPatchType>(pfld))
+                if (pfld.patch().coupled())
                 {
-                    WarningIn
-                    (
-                        "compareFields"
-                        "(const scalar, const volVectorField&"
-                        ", const volVectorField&)"
-                    )   << "Did not map volVectorField correctly:"
-                        << endl
-                        << "patch:" << patchI << " patchFace:" << i
-                        << " cc:" << endl
-                        << "    real    :" << aBoundary[i] << endl
-                        << "    mapped  :" << bBoundary[i] << endl
-                        << "This might be just a precision entry"
-                        << " on writing the mesh." << endl;
-                        //<< abort(FatalError);
+                    pfld.initEvaluate(Pstream::defaultCommsType);
+                }
+            }
+
+            // Block for any outstanding requests
+            if
+            (
+                Pstream::parRun()
+             && Pstream::defaultCommsType == Pstream::nonBlocking
+            )
+            {
+                Pstream::waitRequests(nReq);
+            }
+
+            forAll(bfld, patchi)
+            {
+                typename GeoField::PatchFieldType& pfld = bfld[patchi];
+
+                //if (pfld.coupled())
+                //if (isA<CoupledPatchType>(pfld))
+                if (pfld.patch().coupled())
+                {
+                    pfld.evaluate(Pstream::defaultCommsType);
                 }
             }
         }
+        else if (Pstream::defaultCommsType == Pstream::scheduled)
+        {
+            const lduSchedule& patchSchedule =
+                fld.mesh().globalData().patchSchedule();
+
+            forAll(patchSchedule, patchEvali)
+            {
+                label patchi = patchSchedule[patchEvali].patch;
+                typename GeoField::PatchFieldType& pfld = bfld[patchi];
+
+                //if (pfld.coupled())
+                //if (isA<CoupledPatchType>(pfld))
+                if (pfld.patch().coupled())
+                {
+                    if (patchSchedule[patchEvali].init)
+                    {
+                        pfld.initEvaluate(Pstream::scheduled);
+                    }
+                    else
+                    {
+                        pfld.evaluate(Pstream::scheduled);
+                    }
+                }
+            }
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Unsuported communications type "
+                << Pstream::commsTypeNames[Pstream::defaultCommsType]
+                << exit(FatalError);
+        }
     }
 }
 
 
+// Inplace redistribute mesh and any fields
+autoPtr<mapDistributePolyMesh> redistributeAndWrite
+(
+    const Time& baseRunTime,
+    const scalar tolDim,
+    const boolList& haveMesh,
+    const fileName& meshSubDir,
+    const bool doReadFields,
+    const bool decompose,       // decompose, i.e. read from undecomposed case
+    const bool overwrite,
+    const fileName& proc0CaseName,
+    const label nDestProcs,
+    const labelList& decomp,
+    const fileName& masterInstDir,
+    fvMesh& mesh
+)
+{
+    Time& runTime = const_cast<Time&>(mesh.time());
+
+    //// Print some statistics
+    //Info<< "Before distribution:" << endl;
+    //printMeshData(mesh);
+
+
+    PtrList<volScalarField> volScalarFields;
+    PtrList<volVectorField> volVectorFields;
+    PtrList<volSphericalTensorField> volSphereTensorFields;
+    PtrList<volSymmTensorField> volSymmTensorFields;
+    PtrList<volTensorField> volTensorFields;
+
+    PtrList<surfaceScalarField> surfScalarFields;
+    PtrList<surfaceVectorField> surfVectorFields;
+    PtrList<surfaceSphericalTensorField> surfSphereTensorFields;
+    PtrList<surfaceSymmTensorField> surfSymmTensorFields;
+    PtrList<surfaceTensorField> surfTensorFields;
+
+    PtrList<DimensionedField<scalar, volMesh> > dimScalarFields;
+    PtrList<DimensionedField<vector, volMesh> > dimVectorFields;
+    PtrList<DimensionedField<sphericalTensor, volMesh> > dimSphereTensorFields;
+    PtrList<DimensionedField<symmTensor, volMesh> > dimSymmTensorFields;
+    PtrList<DimensionedField<tensor, volMesh> > dimTensorFields;
+
+
+    if (doReadFields)
+    {
+        // Create 0 sized mesh to do all the generation of zero sized
+        // fields on processors that have zero sized meshes. Note that this is
+        // only nessecary on master but since polyMesh construction with
+        // Pstream::parRun does parallel comms we have to do it on all
+        // processors
+        autoPtr<fvMeshSubset> subsetterPtr;
+
+        const bool allHaveMesh = (findIndex(haveMesh, false) == -1);
+        if (!allHaveMesh)
+        {
+            // Find last non-processor patch.
+            const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+            label nonProcI = -1;
+
+            forAll(patches, patchI)
+            {
+                if (isA<processorPolyPatch>(patches[patchI]))
+                {
+                    break;
+                }
+                nonProcI++;
+            }
+
+            if (nonProcI == -1)
+            {
+                FatalErrorInFunction
+                    << "Cannot find non-processor patch on processor "
+                    << Pstream::myProcNo() << endl
+                    << " Current patches:" << patches.names()
+                    << abort(FatalError);
+            }
+
+            // Subset 0 cells, no parallel comms. This is used to create
+            // zero-sized fields.
+            subsetterPtr.reset(new fvMeshSubset(mesh));
+            subsetterPtr().setLargeCellSubset(labelHashSet(0), nonProcI, false);
+        }
+
+
+        // Get original objects (before incrementing time!)
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = baseRunTime.caseName();
+        }
+        IOobjectList objects(mesh, runTime.timeName());
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = proc0CaseName;
+        }
+
+        Info<< "From time " << runTime.timeName()
+            << " have objects:" << objects.names() << endl;
+
+        // We don't want to map the decomposition (mapping already tested when
+        // mapping the cell centre field)
+        IOobjectList::iterator iter = objects.find("cellDist");
+        if (iter != objects.end())
+        {
+            objects.erase(iter);
+        }
+
+
+        // volFields
+
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = baseRunTime.caseName();
+        }
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            volScalarFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            volVectorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            volSphereTensorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            volSymmTensorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            volTensorFields
+        );
+
+
+        // surfaceFields
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            surfScalarFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            surfVectorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            surfSphereTensorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            surfSymmTensorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            surfTensorFields
+        );
+
+
+        // Dimensioned internal fields
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            dimScalarFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            dimVectorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            dimSphereTensorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            dimSymmTensorFields
+        );
+
+        readFields
+        (
+            haveMesh,
+            mesh,
+            subsetterPtr,
+            objects,
+            dimTensorFields
+        );
+
+
+
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = proc0CaseName;
+        }
+    }
+
+
+    // Mesh distribution engine
+    fvMeshDistribute distributor(mesh, tolDim);
+
+    // Do all the distribution of mesh and fields
+    autoPtr<mapDistributePolyMesh> rawMap = distributor.distribute(decomp);
+
+    // Print some statistics
+    Info<< "After distribution:" << endl;
+    printMeshData(mesh);
+
+    // Get other side of processor boundaries
+    correctCoupledBoundaryConditions
+    <
+        volScalarField,
+        processorFvPatchField<scalar>
+    >(mesh);
+    correctCoupledBoundaryConditions
+    <
+        volVectorField,
+        processorFvPatchField<vector>
+    >(mesh);
+    correctCoupledBoundaryConditions
+    <
+        volSphericalTensorField,
+        processorFvPatchField<sphericalTensor>
+    >(mesh);
+    correctCoupledBoundaryConditions
+    <
+        volSymmTensorField,
+        processorFvPatchField<symmTensor>
+    >(mesh);
+    correctCoupledBoundaryConditions
+    <
+        volTensorField,
+        processorFvPatchField<tensor>
+    >(mesh);
+    // No update surface fields
+
+
+    // Set the minimum write precision
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
+
+
+    if (!overwrite)
+    {
+        runTime++;
+        mesh.setInstance(runTime.timeName());
+    }
+    else
+    {
+        mesh.setInstance(masterInstDir);
+    }
+
+
+    IOmapDistributePolyMesh map
+    (
+        IOobject
+        (
+            "procAddressing",
+            mesh.facesInstance(),
+            meshSubDir,
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        )
+    );
+    map.transfer(rawMap());
+
+
+    if (nDestProcs == 1)
+    {
+        if (Pstream::master())
+        {
+            Info<< "Setting caseName to " << baseRunTime.caseName()
+                << " to write reconstructed mesh and fields." << endl;
+            runTime.TimePaths::caseName() = baseRunTime.caseName();
+
+            mesh.write();
+
+            // Now we've written all. Reset caseName on master
+            Info<< "Restoring caseName to " << proc0CaseName << endl;
+            runTime.TimePaths::caseName() = proc0CaseName;
+        }
+    }
+    else
+    {
+        mesh.write();
+    }
+    Info<< "Written redistributed mesh to " << mesh.facesInstance() << nl
+        << endl;
+
+
+    if (decompose || nDestProcs == 1)
+    {
+        writeProcAddressing(decompose, meshSubDir, mesh, map);
+    }
+
+
+    // Refinement data
+    {
+
+        // Read refinement data
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = baseRunTime.caseName();
+        }
+        IOobject io
+        (
+            "dummy",
+            mesh.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE,
+            false
+        );
+
+        hexRef8Data refData(io);
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = proc0CaseName;
+        }
+        // Make sure all processors have valid data (since only some will
+        // read)
+        refData.sync(io);
+
+
+        // Distribute
+        refData.distribute(map);
+
+        if (nDestProcs == 1)
+        {
+            if (Pstream::master())
+            {
+                Info<< "Setting caseName to " << baseRunTime.caseName()
+                    << " to write reconstructed refinement data." << endl;
+                runTime.TimePaths::caseName() = baseRunTime.caseName();
+
+                refData.write();
+
+                // Now we've written all. Reset caseName on master
+                Info<< "Restoring caseName to " << proc0CaseName << endl;
+                runTime.TimePaths::caseName() = proc0CaseName;
+            }
+        }
+        else
+        {
+            refData.write();
+        }
+    }
+
+
+    return autoPtr<mapDistributePolyMesh>
+    (
+        new mapDistributePolyMesh(map.xfer())
+    );
+}
+
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Field Mapping
+//
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+autoPtr<mapDistributePolyMesh> createReconstructMap
+(
+    const autoPtr<fvMesh>& baseMeshPtr,
+    const fvMesh& mesh,
+    const labelList& cellProcAddressing,
+    const labelList& faceProcAddressing,
+    const labelList& pointProcAddressing,
+    const labelList& boundaryProcAddressing
+)
+{
+    // Send addressing to master
+    labelListList cellAddressing(Pstream::nProcs());
+    cellAddressing[Pstream::myProcNo()] = cellProcAddressing;
+    Pstream::gatherList(cellAddressing);
+
+    labelListList faceAddressing(Pstream::nProcs());
+    faceAddressing[Pstream::myProcNo()] = faceProcAddressing;
+    Pstream::gatherList(faceAddressing);
+
+    labelListList pointAddressing(Pstream::nProcs());
+    pointAddressing[Pstream::myProcNo()] = pointProcAddressing;
+    Pstream::gatherList(pointAddressing);
+
+    labelListList boundaryAddressing(Pstream::nProcs());
+    {
+        // Remove -1 entries
+        DynamicList<label> patchProcAddressing(boundaryProcAddressing.size());
+        forAll(boundaryProcAddressing, i)
+        {
+            if (boundaryProcAddressing[i] != -1)
+            {
+                patchProcAddressing.append(boundaryProcAddressing[i]);
+            }
+        }
+        boundaryAddressing[Pstream::myProcNo()] = patchProcAddressing;
+        Pstream::gatherList(boundaryAddressing);
+    }
+
+
+    autoPtr<mapDistributePolyMesh> mapPtr;
+
+    if (baseMeshPtr.valid() && baseMeshPtr().nCells())    //baseMeshPtr.valid())
+    {
+        const fvMesh& baseMesh = baseMeshPtr();
+
+        labelListList cellSubMap(Pstream::nProcs());
+        cellSubMap[Pstream::masterNo()] = identity(mesh.nCells());
+
+        mapDistribute cellMap
+        (
+            baseMesh.nCells(),
+            cellSubMap.xfer(),
+            cellAddressing.xfer()
+        );
+
+        labelListList faceSubMap(Pstream::nProcs());
+        faceSubMap[Pstream::masterNo()] = identity(mesh.nFaces());
+
+        mapDistribute faceMap
+        (
+            baseMesh.nFaces(),
+            faceSubMap.xfer(),
+            faceAddressing.xfer(),
+            false,          //subHasFlip
+            true            //constructHasFlip
+        );
+
+        labelListList pointSubMap(Pstream::nProcs());
+        pointSubMap[Pstream::masterNo()] = identity(mesh.nPoints());
+
+        mapDistribute pointMap
+        (
+            baseMesh.nPoints(),
+            pointSubMap.xfer(),
+            pointAddressing.xfer()
+        );
+
+        labelListList patchSubMap(Pstream::nProcs());
+        // Send (filtered) patches to master
+        patchSubMap[Pstream::masterNo()] =
+            boundaryAddressing[Pstream::myProcNo()];
+
+        mapDistribute patchMap
+        (
+            baseMesh.boundaryMesh().size(),
+            patchSubMap.xfer(),
+            boundaryAddressing.xfer()
+        );
+
+        const label nOldPoints = mesh.nPoints();
+        const label nOldFaces = mesh.nFaces();
+        const label nOldCells = mesh.nCells();
+
+        const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+        labelList oldPatchStarts(pbm.size());
+        labelList oldPatchNMeshPoints(pbm.size());
+        forAll(pbm, patchI)
+        {
+            oldPatchStarts[patchI] = pbm[patchI].start();
+            oldPatchNMeshPoints[patchI] = pbm[patchI].nPoints();
+        }
+
+        mapPtr.reset
+        (
+            new mapDistributePolyMesh
+            (
+                nOldPoints,
+                nOldFaces,
+                nOldCells,
+                oldPatchStarts.xfer(),
+                oldPatchNMeshPoints.xfer(),
+                pointMap.xfer(),
+                faceMap.xfer(),
+                cellMap.xfer(),
+                patchMap.xfer()
+            )
+        );
+    }
+    else
+    {
+        labelListList cellSubMap(Pstream::nProcs());
+        cellSubMap[Pstream::masterNo()] = identity(mesh.nCells());
+        labelListList cellConstructMap(Pstream::nProcs());
+
+        mapDistribute cellMap
+        (
+            0,
+            cellSubMap.xfer(),
+            cellConstructMap.xfer()
+        );
+
+        labelListList faceSubMap(Pstream::nProcs());
+        faceSubMap[Pstream::masterNo()] = identity(mesh.nFaces());
+        labelListList faceConstructMap(Pstream::nProcs());
+
+        mapDistribute faceMap
+        (
+            0,
+            faceSubMap.xfer(),
+            faceConstructMap.xfer(),
+            false,          //subHasFlip
+            true            //constructHasFlip
+        );
+
+        labelListList pointSubMap(Pstream::nProcs());
+        pointSubMap[Pstream::masterNo()] = identity(mesh.nPoints());
+        labelListList pointConstructMap(Pstream::nProcs());
+
+        mapDistribute pointMap
+        (
+            0,
+            pointSubMap.xfer(),
+            pointConstructMap.xfer()
+        );
+
+        labelListList patchSubMap(Pstream::nProcs());
+        // Send (filtered) patches to master
+        patchSubMap[Pstream::masterNo()] =
+            boundaryAddressing[Pstream::myProcNo()];
+        labelListList patchConstructMap(Pstream::nProcs());
+
+        mapDistribute patchMap
+        (
+            0,
+            patchSubMap.xfer(),
+            patchConstructMap.xfer()
+        );
+
+        const label nOldPoints = mesh.nPoints();
+        const label nOldFaces = mesh.nFaces();
+        const label nOldCells = mesh.nCells();
+
+        const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+        labelList oldPatchStarts(pbm.size());
+        labelList oldPatchNMeshPoints(pbm.size());
+        forAll(pbm, patchI)
+        {
+            oldPatchStarts[patchI] = pbm[patchI].start();
+            oldPatchNMeshPoints[patchI] = pbm[patchI].nPoints();
+        }
+
+        mapPtr.reset
+        (
+            new mapDistributePolyMesh
+            (
+                nOldPoints,
+                nOldFaces,
+                nOldCells,
+                oldPatchStarts.xfer(),
+                oldPatchNMeshPoints.xfer(),
+                pointMap.xfer(),
+                faceMap.xfer(),
+                cellMap.xfer(),
+                patchMap.xfer()
+            )
+        );
+    }
+
+    return mapPtr;
+}
+
+
+void readProcAddressing
+(
+    const fvMesh& mesh,
+    const autoPtr<fvMesh>& baseMeshPtr,
+    autoPtr<mapDistributePolyMesh>& distMap
+)
+{
+    //IOobject io
+    //(
+    //    "procAddressing",
+    //    mesh.facesInstance(),
+    //    polyMesh::meshSubDir,
+    //    mesh,
+    //    IOobject::MUST_READ
+    //);
+    //if (io.headerOk())
+    //{
+    //    Pout<< "Reading addressing from " << io.name() << " at "
+    //        << mesh.facesInstance() << nl << endl;
+    //    distMap.clear();
+    //    distMap.reset(new IOmapDistributePolyMesh(io));
+    //}
+    //else
+    {
+        Info<< "Reading addressing from procXXXAddressing at "
+            << mesh.facesInstance() << nl << endl;
+        labelIOList cellProcAddressing
+        (
+            IOobject
+            (
+                "cellProcAddressing",
+                mesh.facesInstance(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::READ_IF_PRESENT
+            ),
+            labelList(0)
+        );
+        labelIOList faceProcAddressing
+        (
+            IOobject
+            (
+                "faceProcAddressing",
+                mesh.facesInstance(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::READ_IF_PRESENT
+            ),
+            labelList(0)
+        );
+        labelIOList pointProcAddressing
+        (
+            IOobject
+            (
+                "pointProcAddressing",
+                mesh.facesInstance(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::READ_IF_PRESENT
+            ),
+            labelList(0)
+        );
+        labelIOList boundaryProcAddressing
+        (
+            IOobject
+            (
+                "boundaryProcAddressing",
+                mesh.facesInstance(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::READ_IF_PRESENT
+            ),
+            labelList(0)
+        );
+
+
+        if
+        (
+            mesh.nCells() != cellProcAddressing.size()
+         || mesh.nPoints() != pointProcAddressing.size()
+         || mesh.nFaces() != faceProcAddressing.size()
+         || mesh.boundaryMesh().size() != boundaryProcAddressing.size()
+        )
+        {
+            FatalErrorInFunction
+                << "Read addressing inconsistent with mesh sizes" << nl
+                << "cells:" << mesh.nCells()
+                << " addressing:" << cellProcAddressing.objectPath()
+                << " size:" << cellProcAddressing.size() << nl
+                << "faces:" << mesh.nFaces()
+                << " addressing:" << faceProcAddressing.objectPath()
+                << " size:" << faceProcAddressing.size() << nl
+                << "points:" << mesh.nPoints()
+                << " addressing:" << pointProcAddressing.objectPath()
+                << " size:" << pointProcAddressing.size()
+                << "patches:" << mesh.boundaryMesh().size()
+                << " addressing:" << boundaryProcAddressing.objectPath()
+                << " size:" << boundaryProcAddressing.size()
+                << exit(FatalError);
+        }
+
+        distMap.clear();
+        distMap = createReconstructMap
+        (
+            baseMeshPtr,
+            mesh,
+            cellProcAddressing,
+            faceProcAddressing,
+            pointProcAddressing,
+            boundaryProcAddressing
+        );
+    }
+}
+
+
+void reconstructMeshFields
+(
+    const parFvFieldReconstructor& fvReconstructor,
+    const IOobjectList& objects,
+    const HashSet<word>& selectedFields
+)
+{
+    // Dimensioned fields
+
+    fvReconstructor.reconstructFvVolumeInternalFields<scalar>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeInternalFields<vector>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeInternalFields<sphericalTensor>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeInternalFields<symmTensor>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeInternalFields<tensor>
+    (
+        objects,
+        selectedFields
+    );
+
+
+    // volFields
+
+    fvReconstructor.reconstructFvVolumeFields<scalar>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeFields<vector>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeFields<sphericalTensor>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeFields<symmTensor>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvVolumeFields<tensor>
+    (
+        objects,
+        selectedFields
+    );
+
+
+    // surfaceFields
+
+    fvReconstructor.reconstructFvSurfaceFields<scalar>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvSurfaceFields<vector>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvSurfaceFields<sphericalTensor>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvSurfaceFields<symmTensor>
+    (
+        objects,
+        selectedFields
+    );
+    fvReconstructor.reconstructFvSurfaceFields<tensor>
+    (
+        objects,
+        selectedFields
+    );
+}
+
+
+void reconstructLagrangian
+(
+    autoPtr<parLagrangianRedistributor>& lagrangianReconstructorPtr,
+    const fvMesh& baseMesh,
+    const fvMesh& mesh,
+    const mapDistributePolyMesh& distMap,
+    const HashSet<word>& selectedLagrangianFields
+)
+{
+    // Clouds (note: might not be present on all processors)
+
+    wordList cloudNames;
+    List<wordList> fieldNames;
+    // Find all cloudNames on all processors
+    parLagrangianRedistributor::findClouds(mesh, cloudNames, fieldNames);
+
+    if (cloudNames.size())
+    {
+        if (!lagrangianReconstructorPtr.valid())
+        {
+            lagrangianReconstructorPtr.reset
+            (
+                new parLagrangianRedistributor
+                (
+                    mesh,
+                    baseMesh,
+                    mesh.nCells(),      // range of cell indices in clouds
+                    distMap
+                )
+            );
+        }
+        const parLagrangianRedistributor& lagrangianReconstructor =
+            lagrangianReconstructorPtr();
+
+        forAll(cloudNames, i)
+        {
+            Info<< "Reconstructing lagrangian fields for cloud "
+                << cloudNames[i] << nl << endl;
+
+            autoPtr<mapDistributeBase> lagrangianMap =
+            lagrangianReconstructor.redistributeLagrangianPositions
+            (
+                cloudNames[i]
+            );
+            IOobjectList sprayObjs
+            (
+                mesh,
+                mesh.time().timeName(),
+                cloud::prefix/cloudNames[i]
+            );
+
+            lagrangianReconstructor.redistributeLagrangianFields<label>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFieldFields<label>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFields<scalar>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFieldFields<scalar>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFields<vector>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFieldFields<vector>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFields
+            <sphericalTensor>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFieldFields
+            <sphericalTensor>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFields<symmTensor>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFieldFields
+            <symmTensor>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFields<tensor>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+            lagrangianReconstructor.redistributeLagrangianFieldFields<tensor>
+            (
+                lagrangianMap,
+                cloudNames[i],
+                sprayObjs,
+                selectedLagrangianFields
+            );
+        }
+    }
+}
+
+// Read clouds (note: might not be present on all processors)
+void readLagrangian
+(
+    const fvMesh& mesh,
+    const wordList& cloudNames,
+    const HashSet<word>& selectedLagrangianFields,
+    PtrList<unmappedPassiveParticleCloud>& clouds
+)
+{
+    (void)mesh.tetBasePtIs();
+
+    forAll(cloudNames, i)
+    {
+        {
+            // Note: disable master-only reading of uniform/cloudProperties
+            regIOobject::fileCheckTypes oldCheckType =
+                regIOobject::fileModificationChecking;
+
+            if (oldCheckType == regIOobject::timeStampMaster)
+            {
+                regIOobject::fileModificationChecking = regIOobject::timeStamp;
+            }
+            else if (oldCheckType == regIOobject::inotifyMaster)
+            {
+                regIOobject::fileModificationChecking = regIOobject::inotify;
+            }
+
+            clouds.set
+            (
+                i,
+                new unmappedPassiveParticleCloud(mesh, cloudNames[i], false)
+            );
+
+            regIOobject::fileModificationChecking = oldCheckType;
+        }
+
+
+        //forAllConstIter
+        //(
+        //    unmappedPassiveParticleCloud,
+        //    clouds[i],
+        //    iter
+        //)
+        //{
+        //    Pout<< "Particle position:" << iter().position()
+        //        << " cell:" << iter().cell()
+        //        << " with cc:" << mesh.cellCentres()[iter().cell()]
+        //        << endl;
+        //}
+
+
+        IOobjectList sprayObjs(clouds[i], clouds[i].time().timeName());
+
+        //Pout<< "Found clould objects:" << sprayObjs.names() << endl;
+
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<label> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<Field<label> > >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <CompactIOField<Field<label>, label> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+
+
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<scalar> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<Field<scalar> > >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <CompactIOField<Field<scalar>, scalar> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+
+
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<vector> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<Field<vector> > >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <CompactIOField<Field<vector>, vector> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+
+
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<sphericalTensor> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<Field<sphericalTensor> > >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <CompactIOField<Field<sphericalTensor>, sphericalTensor> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+
+
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<symmTensor> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<Field<symmTensor> > >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <CompactIOField<Field<symmTensor>, symmTensor> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+
+
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<tensor> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <IOField<Field<tensor> > >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+        parLagrangianRedistributor::readLagrangianFields
+        <CompactIOField<Field<tensor>, tensor> >
+        (
+            clouds[i],
+            sprayObjs,
+            selectedLagrangianFields
+        );
+    }
+}
+
+
+void redistributeLagrangian
+(
+    autoPtr<parLagrangianRedistributor>& lagrangianReconstructorPtr,
+    const fvMesh& mesh,
+    const label nOldCells,
+    const mapDistributePolyMesh& distMap,
+    PtrList<unmappedPassiveParticleCloud>& clouds
+)
+{
+    if (clouds.size())
+    {
+        if (!lagrangianReconstructorPtr.valid())
+        {
+            lagrangianReconstructorPtr.reset
+            (
+                new parLagrangianRedistributor
+                (
+                    mesh,
+                    mesh,
+                    nOldCells,  // range of cell indices in clouds
+                    distMap
+                )
+            );
+        }
+        const parLagrangianRedistributor& distributor =
+            lagrangianReconstructorPtr();
+
+        forAll(clouds, i)
+        {
+            autoPtr<mapDistributeBase> lagrangianMap =
+            distributor.redistributeLagrangianPositions(clouds[i]);
+
+            distributor.redistributeStoredLagrangianFields
+            <IOField<label> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <IOField<Field<label> > >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <CompactIOField<Field<label>, label> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+
+
+            distributor.redistributeStoredLagrangianFields
+            <IOField<scalar> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <IOField<Field<scalar> > >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <CompactIOField<Field<scalar>, scalar> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+
+
+            distributor.redistributeStoredLagrangianFields
+            <IOField<vector> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <IOField<Field<vector> > >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <CompactIOField<Field<vector>, vector> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+
+
+            distributor.redistributeStoredLagrangianFields
+            <IOField<sphericalTensor> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <IOField<Field<sphericalTensor> > >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <CompactIOField<Field<sphericalTensor>, sphericalTensor> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+
+
+            distributor.redistributeStoredLagrangianFields
+            <IOField<symmTensor> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <IOField<Field<symmTensor> > >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <CompactIOField<Field<symmTensor>, symmTensor> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+
+
+            distributor.redistributeStoredLagrangianFields
+            <IOField<tensor> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <IOField<Field<tensor> > >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+            distributor.redistributeStoredLagrangianFields
+            <CompactIOField<Field<tensor>, tensor> >
+            (
+                lagrangianMap,
+                clouds[i]
+            );
+        }
+    }
+}
+
 
 int main(int argc, char *argv[])
 {
+    // enable -constant ... if someone really wants it
+    // enable -zeroTime to prevent accidentally trashing the initial fields
+    timeSelector::addOptions(true, true);
     #include "addRegionOption.H"
     #include "addOverwriteOption.H"
+    argList::addBoolOption("decompose", "decompose case");
+    argList::addBoolOption("reconstruct", "reconstruct case");
     argList::addOption
     (
         "mergeTol",
@@ -434,14 +2139,35 @@ int main(int argc, char *argv[])
         "specify the merge distance relative to the bounding box size "
         "(default 1e-6)"
     );
-    // Include explicit constant options, have zero from time range
-    timeSelector::addOptions();
+    argList::addBoolOption
+    (
+        "cellDist",
+        "write cell distribution as a labelList - for use with 'manual' "
+        "decomposition method or as a volScalarField for post-processing."
+    );
+    argList::addBoolOption
+    (
+        "newTimes",
+        "only reconstruct new times (i.e. that do not exist already)"
+    );
+
+
+    // Handle arguments
+    // ~~~~~~~~~~~~~~~~
+    // (replacement for setRootCase that does not abort)
+
+    Foam::argList args(argc, argv);
+    bool decompose = args.optionFound("decompose");
+    const bool reconstruct = args.optionFound("reconstruct");
+    bool overwrite = args.optionFound("overwrite");
+    bool writeCellDist = args.optionFound("cellDist");
+    bool newTimes = args.optionFound("newTimes");
+
 
-    #include "setRootCase.H"
 
     if (env("FOAM_SIGFPE"))
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Detected floating point exception trapping (FOAM_SIGFPE)."
             << " This might give" << nl
             << "    problems when mapping fields. Switch it off in case"
@@ -449,23 +2175,171 @@ int main(int argc, char *argv[])
     }
 
 
-    // Create processor directory if non-existing
-    if (!Pstream::master() && !isDir(args.path()))
+
+    const HashSet<word> selectedFields(0);
+    const HashSet<word> selectedLagrangianFields(0);
+
+
+    if (decompose)
     {
-        Pout<< "Creating case directory " << args.path() << endl;
-        mkDir(args.path());
+        Info<< "Decomposing case (like decomposePar)" << nl << endl;
+        if (reconstruct)
+        {
+            FatalErrorInFunction
+                << "Cannot specify both -decompose and -reconstruct"
+                << exit(FatalError);
+        }
+    }
+    else if (reconstruct)
+    {
+        Info<< "Reconstructing case (like reconstructParMesh)" << nl << endl;
     }
 
 
-    // Make sure we do not use the master-only reading.
-    regIOobject::fileModificationChecking = regIOobject::timeStamp;
-    #include "createTime.H"
-    // Allow override of time
-    instantList times = timeSelector::selectIfPresent(runTime, args);
-    runTime.setTime(times[0], 0);
+    if (decompose || reconstruct)
+    {
+        if (!overwrite)
+        {
+            WarningInFunction
+                << "Working in decompose or reconstruction mode automatically"
+                << " implies -overwrite" << nl << endl;
+            overwrite = true;
+        }
+    }
 
+
+    if (!Pstream::parRun())
+    {
+        FatalErrorInFunction
+            << ": This utility can only be run parallel"
+            << exit(FatalError);
+    }
+
+
+    if (!isDir(args.rootPath()))
+    {
+        FatalErrorInFunction
+            << ": cannot open root directory " << args.rootPath()
+            << exit(FatalError);
+    }
+
+    // Detect if running data-distributed (multiple roots)
+    bool nfs = true;
+    {
+        List<fileName> roots(1, args.rootPath());
+        combineReduce(roots, ListUniqueEqOp<fileName>());
+        nfs = (roots.size() == 1);
+    }
+
+    if (!nfs)
+    {
+        Info<< "Detected multiple roots i.e. non-nfs running"
+            << nl << endl;
+    }
+
+    if (isDir(args.path()))
+    {
+        if (decompose)
+        {
+            Info<< "Removing existing processor directories" << endl;
+            rmDir(args.path());
+        }
+    }
+    else
+    {
+        // Directory does not exist. If this happens on master -> decompose mode
+        decompose = true;
+        Info<< "No processor directories; switching on decompose mode"
+            << nl << endl;
+    }
+    // If master changed to decompose mode make sure all nodes know about
+    // it
+    Pstream::scatter(decompose);
+
+
+
+
+    // If running distributed we have problem of new processors not finding
+    // a system/controlDict. However if we switch on the master-only reading
+    // the problem becomes that the time directories are differing sizes and
+    // e.g. latestTime will pick up a different time (which causes createTime.H
+    // to abort). So for now make sure to have master times on all
+    // processors
+    {
+        Info<< "Creating time directories on all processors" << nl << endl;
+        instantList timeDirs;
+        if (Pstream::master())
+        {
+            timeDirs = Time::findTimes(args.path(), "constant");
+        }
+        Pstream::scatter(timeDirs);
+        forAll(timeDirs, i)
+        {
+            mkDir(args.path()/timeDirs[i].name());
+        }
+    }
+
+
+    // Construct time
+    // ~~~~~~~~~~~~~~
+
+    #include "createTime.H"
     runTime.functionObjects().off();
 
+
+    // Save local processor0 casename
+    const fileName proc0CaseName = runTime.caseName();
+
+
+    // Construct undecomposed Time
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // This will read the same controlDict but might have a different
+    // set of times so enforce same times
+
+    if (!nfs)
+    {
+        Info<< "Creating time directories for undecomposed Time"
+            << " on all processors" << nl << endl;
+        instantList timeDirs;
+
+        const fileName basePath(args.rootPath()/args.globalCaseName());
+
+        if (Pstream::master())
+        {
+            timeDirs = Time::findTimes(basePath, "constant");
+        }
+        Pstream::scatter(timeDirs);
+        forAll(timeDirs, i)
+        {
+            mkDir(basePath/timeDirs[i].name());
+        }
+    }
+
+
+    Info<< "Create undecomposed database"<< nl << endl;
+    Time baseRunTime
+    (
+        runTime.controlDict(),
+        runTime.rootPath(),
+        runTime.globalCaseName(),
+        runTime.system(),
+        runTime.constant(),
+        false                   // enableFunctionObjects
+    );
+
+
+    HashSet<word> masterTimeDirSet;
+    if (newTimes)
+    {
+        instantList baseTimeDirs(baseRunTime.times());
+        forAll(baseTimeDirs, i)
+        {
+            masterTimeDirSet.insert(baseTimeDirs[i].name());
+        }
+    }
+
+
+    // Determine any region
     word regionName = polyMesh::defaultRegion;
     fileName meshSubDir;
 
@@ -479,336 +2353,540 @@ int main(int argc, char *argv[])
     }
     Info<< "Using mesh subdirectory " << meshSubDir << nl << endl;
 
-    const bool overwrite = args.optionFound("overwrite");
 
 
-    // Get time instance directory. Since not all processors have meshes
-    // just use the master one everywhere.
+    // Demand driven lagrangian mapper
+    autoPtr<parLagrangianRedistributor> lagrangianReconstructorPtr;
 
-    fileName masterInstDir;
-    if (Pstream::master())
+
+
+    if (reconstruct)
     {
-        masterInstDir = runTime.findInstance(meshSubDir, "points");
-    }
-    Pstream::scatter(masterInstDir);
+        // use the times list from the master processor
+        // and select a subset based on the command-line options
+        instantList timeDirs = timeSelector::select(runTime.times(), args);
+        Pstream::scatter(timeDirs);
 
-    // Check who has a mesh
-    const fileName meshPath = runTime.path()/masterInstDir/meshSubDir;
-
-    Info<< "Found points in " << meshPath << nl << endl;
+        if (timeDirs.empty())
+        {
+            FatalErrorInFunction
+                << "No times selected"
+                << exit(FatalError);
+        }
 
 
-    boolList haveMesh(Pstream::nProcs(), false);
-    haveMesh[Pstream::myProcNo()] = isDir(meshPath);
-    Pstream::gatherList(haveMesh);
-    Pstream::scatterList(haveMesh);
-    Info<< "Per processor mesh availability : " << haveMesh << endl;
-    const bool allHaveMesh = (findIndex(haveMesh, false) == -1);
-
-    autoPtr<fvMesh> meshPtr = loadOrCreateMesh
-    (
-        IOobject
-        (
-            regionName,
-            masterInstDir,
-            runTime,
-            Foam::IOobject::MUST_READ
-        )
-    );
-
-    fvMesh& mesh = meshPtr();
-
-    // Print some statistics
-    Info<< "Before distribution:" << endl;
-    printMeshData(mesh);
+        // Pass1 : reconstruct mesh and addressing
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
+        Info<< nl
+            << "Pass1 : reconstructing mesh and addressing" << nl << endl;
 
-    IOdictionary decompositionDict
-    (
-        IOobject
-        (
-            "decomposeParDict",
-            runTime.system(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
+        // Loop over all times
+        forAll(timeDirs, timeI)
+        {
+            // Set time for global database
+            runTime.setTime(timeDirs[timeI], timeI);
+            baseRunTime.setTime(timeDirs[timeI], timeI);
 
-    labelList finalDecomp;
+            Info<< "Time = " << runTime.timeName() << endl << endl;
 
-    // Create decompositionMethod and new decomposition
-    {
-        autoPtr<decompositionMethod> decomposer
-        (
-            decompositionMethod::New
+
+            // See where the mesh is
+            fileName facesInstance = runTime.findInstance
             (
-                decompositionDict
+                meshSubDir,
+                "faces",
+                IOobject::READ_IF_PRESENT
+            );
+            //Pout<< "facesInstance:" << facesInstance << endl;
+
+            Pstream::scatter(facesInstance);
+
+            // Check who has a mesh
+            const fileName meshPath =
+                runTime.path()/facesInstance/meshSubDir/"faces";
+
+            Info<< "Checking for mesh in " << meshPath << nl << endl;
+
+            boolList haveMesh(Pstream::nProcs(), false);
+            haveMesh[Pstream::myProcNo()] = isFile(meshPath);
+            Pstream::gatherList(haveMesh);
+            Pstream::scatterList(haveMesh);
+            Info<< "Per processor mesh availability : " << haveMesh << endl;
+
+
+            // Addressing back to reconstructed mesh as xxxProcAddressing.
+            // - all processors have consistent faceProcAddressing
+            // - processors with no mesh don't need faceProcAddressing
+
+
+            // Note: filePath searches up on processors that don't have
+            //       processor if instance = constant so explicitly check found
+            //       filename.
+            bool haveAddressing = false;
+            if (haveMesh[Pstream::myProcNo()])
+            {
+                haveAddressing = IOobject
+                (
+                    "faceProcAddressing",
+                    facesInstance,
+                    meshSubDir,
+                    runTime,
+                    IOobject::READ_IF_PRESENT
+                ).headerOk();
+            }
+            else
+            {
+                // Have no mesh. Don't need addressing
+                haveAddressing = true;
+            }
+
+            if (!returnReduce(haveAddressing, andOp<bool>()))
+            {
+                Info<< "loading mesh from " << facesInstance << endl;
+                autoPtr<fvMesh> meshPtr = loadOrCreateMesh
+                (
+                    IOobject
+                    (
+                        regionName,
+                        facesInstance,
+                        runTime,
+                        Foam::IOobject::MUST_READ
+                    )
+                );
+                fvMesh& mesh = meshPtr();
+
+                // Global matching tolerance
+                const scalar tolDim = getMergeDistance
+                (
+                    args,
+                    runTime,
+                    mesh.bounds()
+                );
+
+
+                // Determine decomposition
+                // ~~~~~~~~~~~~~~~~~~~~~~~
+
+                Info<< "Reconstructing mesh for time " << facesInstance << endl;
+
+                label nDestProcs = 1;
+                labelList finalDecomp = labelList(mesh.nCells(), 0);
+
+                redistributeAndWrite
+                (
+                    baseRunTime,
+                    tolDim,
+                    haveMesh,
+                    meshSubDir,
+                    false,      // do not read fields
+                    false,      // do not read undecomposed case on processor0
+                    overwrite,
+                    proc0CaseName,
+                    nDestProcs,
+                    finalDecomp,
+                    facesInstance,
+                    mesh
+                );
+            }
+        }
+
+
+        // Pass2 : read mesh and addressing and reconstruct fields
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        Info<< nl
+            << "Pass2 : reconstructing fields" << nl << endl;
+
+        runTime.setTime(timeDirs[0], 0);
+        baseRunTime.setTime(timeDirs[0], 0);
+        Info<< "Time = " << runTime.timeName() << endl << endl;
+
+
+        Info<< "Reading undecomposed mesh (on master)" << endl;
+        autoPtr<fvMesh> baseMeshPtr = fvMeshTools::newMesh
+        (
+            IOobject
+            (
+                regionName,
+                baseRunTime.timeName(),
+                baseRunTime,
+                IOobject::MUST_READ
+            ),
+            true            // read on master only
+        );
+
+        Info<< "Reading local, decomposed mesh" << endl;
+        autoPtr<fvMesh> meshPtr = loadOrCreateMesh
+        (
+            IOobject
+            (
+                regionName,
+                baseMeshPtr().facesInstance(),
+                runTime,
+                Foam::IOobject::MUST_READ
+            )
+        );
+        fvMesh& mesh = meshPtr();
+
+
+        // Read addressing back to base mesh
+        autoPtr<mapDistributePolyMesh> distMap;
+        readProcAddressing(mesh, baseMeshPtr, distMap);
+
+        // Construct field mapper
+        autoPtr<parFvFieldReconstructor> fvReconstructorPtr
+        (
+            new parFvFieldReconstructor
+            (
+                baseMeshPtr(),
+                mesh,
+                distMap,
+                Pstream::master()       // do I need to write?
             )
         );
 
-        if (!decomposer().parallelAware())
+
+
+        // Since we start from Times[0] and not runTime.timeName() we
+        // might overlook point motion in the first timestep
+        // (since mesh.readUpdate() below will not be triggered). Instead
+        // detect points by hand
+        if (mesh.pointsInstance() != mesh.facesInstance())
         {
-            WarningIn(args.executable())
-                << "You have selected decomposition method "
-                << decomposer().typeName
-                << " which does" << endl
-                << "not synchronise the decomposition across"
-                << " processor patches." << endl
-                << "    You might want to select a decomposition method which"
-                << " is aware of this. Continuing."
+            Info<< "    Dected initial mesh motion; reconstructing points" << nl
                 << endl;
+            fvReconstructorPtr().reconstructPoints();
         }
 
-        finalDecomp = decomposer().decompose(mesh, mesh.cellCentres());
-    }
 
-    // Dump decomposition to volScalarField
-    if (!overwrite)
-    {
-        writeDecomposition("decomposition", mesh, finalDecomp);
-    }
-
-
-    // Create 0 sized mesh to do all the generation of zero sized
-    // fields on processors that have zero sized meshes. Note that this is
-    // only nessecary on master but since polyMesh construction with
-    // Pstream::parRun does parallel comms we have to do it on all
-    // processors
-    autoPtr<fvMeshSubset> subsetterPtr;
-
-    if (!allHaveMesh)
-    {
-        // Find last non-processor patch.
-        const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-        label nonProcI = -1;
-
-        forAll(patches, patchI)
+        // Loop over all times
+        forAll(timeDirs, timeI)
         {
-            if (isA<processorPolyPatch>(patches[patchI]))
+            if (newTimes && masterTimeDirSet.found(timeDirs[timeI].name()))
             {
-                break;
+                Info<< "Skipping time " << timeDirs[timeI].name()
+                    << endl << endl;
+                continue;
+            }
+
+            // Set time for global database
+            runTime.setTime(timeDirs[timeI], timeI);
+            baseRunTime.setTime(timeDirs[timeI], timeI);
+
+            Info<< "Time = " << runTime.timeName() << endl << endl;
+
+
+            // Check if any new meshes need to be read.
+            fvMesh::readUpdateState procStat = mesh.readUpdate();
+
+            if (procStat == fvMesh::POINTS_MOVED)
+            {
+                Info<< "    Dected mesh motion; reconstructing points" << nl
+                    << endl;
+                fvReconstructorPtr().reconstructPoints();
+            }
+            else if
+            (
+                procStat == fvMesh::TOPO_CHANGE
+             || procStat == fvMesh::TOPO_PATCH_CHANGE
+            )
+            {
+                Info<< "   Detected topology change; reconstructing addressing"
+                    << nl << endl;
+
+                if (baseMeshPtr.valid())
+                {
+                    // Cannot do a baseMesh::readUpdate() since not all
+                    // processors will have mesh files. So instead just
+                    // recreate baseMesh
+                    baseMeshPtr.clear();
+                    baseMeshPtr = fvMeshTools::newMesh
+                    (
+                        IOobject
+                        (
+                            regionName,
+                            baseRunTime.timeName(),
+                            baseRunTime,
+                            IOobject::MUST_READ
+                        ),
+                        true            // read on master only
+                    );
+                }
+
+                // Re-read procXXXaddressing
+                readProcAddressing(mesh, baseMeshPtr, distMap);
+
+                // Reset field mapper
+                fvReconstructorPtr.reset
+                (
+                    new parFvFieldReconstructor
+                    (
+                        baseMeshPtr(),
+                        mesh,
+                        distMap,
+                        Pstream::master()
+                    )
+                );
+                lagrangianReconstructorPtr.clear();
+            }
+
+
+            // Get list of objects
+            IOobjectList objects(mesh, runTime.timeName());
+
+
+            // Mesh fields (vol, surface, volInternal)
+            reconstructMeshFields
+            (
+                fvReconstructorPtr(),
+                objects,
+                selectedFields
+            );
+
+            // Clouds (note: might not be present on all processors)
+            reconstructLagrangian
+            (
+                lagrangianReconstructorPtr,
+                baseMeshPtr(),
+                mesh,
+                distMap,
+                selectedLagrangianFields
+            );
+
+            // If there are any "uniform" directories copy them from
+            // the master processor
+            if (Pstream::master())
+            {
+                fileName uniformDir0 = runTime.timePath()/"uniform";
+                if (isDir(uniformDir0))
+                {
+                    Info<< "Detected additional non-decomposed files in "
+                        << uniformDir0 << endl;
+                    cp(uniformDir0, baseRunTime.timePath());
+                }
             }
-            nonProcI++;
         }
-
-        if (nonProcI == -1)
-        {
-            FatalErrorIn(args.executable())
-                << "Cannot find non-processor patch on processor "
-                << Pstream::myProcNo() << endl
-                << " Current patches:" << patches.names() << abort(FatalError);
-        }
-
-        // Subset 0 cells, no parallel comms. This is used to create zero-sized
-        // fields.
-        subsetterPtr.reset(new fvMeshSubset(mesh));
-        subsetterPtr().setLargeCellSubset(labelHashSet(0), nonProcI, false);
-    }
-
-
-    // Get original objects (before incrementing time!)
-    IOobjectList objects(mesh, runTime.timeName());
-    // We don't want to map the decomposition (mapping already tested when
-    // mapping the cell centre field)
-    IOobjectList::iterator iter = objects.find("decomposition");
-    if (iter != objects.end())
-    {
-        objects.erase(iter);
-    }
-
-
-    // volFields
-
-    PtrList<volScalarField> volScalarFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        volScalarFields
-    );
-
-    PtrList<volVectorField> volVectorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        volVectorFields
-    );
-
-    PtrList<volSphericalTensorField> volSphereTensorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        volSphereTensorFields
-    );
-
-    PtrList<volSymmTensorField> volSymmTensorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        volSymmTensorFields
-    );
-
-    PtrList<volTensorField> volTensorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        volTensorFields
-    );
-
-
-    // surfaceFields
-
-    PtrList<surfaceScalarField> surfScalarFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        surfScalarFields
-    );
-
-    PtrList<surfaceVectorField> surfVectorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        surfVectorFields
-    );
-
-    PtrList<surfaceSphericalTensorField> surfSphereTensorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        surfSphereTensorFields
-    );
-
-    PtrList<surfaceSymmTensorField> surfSymmTensorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        surfSymmTensorFields
-    );
-
-    PtrList<surfaceTensorField> surfTensorFields;
-    readFields
-    (
-        haveMesh,
-        mesh,
-        subsetterPtr,
-        objects,
-        surfTensorFields
-    );
-
-
-    // Debugging: Create additional volField that will be mapped.
-    // Used to test correctness of mapping
-    //volVectorField mapCc("mapCc", 1*mesh.C());
-
-    // Global matching tolerance
-    const scalar tolDim = getMergeDistance
-    (
-        args,
-        runTime,
-        mesh.bounds()
-    );
-
-    // Mesh distribution engine
-    fvMeshDistribute distributor(mesh, tolDim);
-
-    //Pout<< "Wanted distribution:"
-    //    << distributor.countCells(finalDecomp) << nl << endl;
-
-    // Do actual sending/receiving of mesh
-    autoPtr<mapDistributePolyMesh> map = distributor.distribute(finalDecomp);
-
-    //// Distribute any non-registered data accordingly
-    //map().distributeFaceData(faceCc);
-
-
-    // Print some statistics
-    Info<< "After distribution:" << endl;
-    printMeshData(mesh);
-
-
-    if (!overwrite)
-    {
-        runTime++;
     }
     else
     {
-        mesh.setInstance(masterInstDir);
-    }
-    Info<< "Writing redistributed mesh to " << runTime.timeName() << nl << endl;
-    mesh.write();
-
-
-    // Debugging: test mapped cellcentre field.
-    //compareFields(tolDim, mesh.C(), mapCc);
-
-    // Print nice message
-    // ~~~~~~~~~~~~~~~~~~
-
-    // Determine which processors remain so we can print nice final message.
-    labelList nFaces(Pstream::nProcs());
-    nFaces[Pstream::myProcNo()] = mesh.nFaces();
-    Pstream::gatherList(nFaces);
-    Pstream::scatterList(nFaces);
-
-    Info<< nl
-        << "You can pick up the redecomposed mesh from the polyMesh directory"
-        << " in " << runTime.timeName() << "." << nl
-        << "If you redecomposed the mesh to less processors you can delete"
-        << nl
-        << "the processor directories with 0 sized meshes in them." << nl
-        << "Below is a sample set of commands to do this."
-        << " Take care when issuing these" << nl
-        << "commands." << nl << endl;
-
-    forAll(nFaces, procI)
-    {
-        fileName procDir = "processor" + name(procI);
-
-        if (nFaces[procI] == 0)
+        // Time coming from processor0 (or undecomposed if no processor0)
+        scalar masterTime;
+        if (decompose)
         {
-            Info<< "    rm -r " << procDir.c_str() << nl;
+            // Use base time. This is to handle e.g. startTime = latestTime
+            // which will not do anything if there are no processor directories
+            masterTime = timeSelector::selectIfPresent
+            (
+                baseRunTime,
+                args
+            )[0].value();
         }
         else
         {
-            fileName timeDir = procDir/runTime.timeName()/meshSubDir;
-            fileName constDir = procDir/runTime.constant()/meshSubDir;
+            masterTime = timeSelector::selectIfPresent
+            (
+                runTime,
+                args
+            )[0].value();
+        }
+        Pstream::scatter(masterTime);
+        Info<< "Setting time to that of master or undecomposed case : "
+            << masterTime << endl;
+        runTime.setTime(masterTime, 0);
 
-            Info<< "    rm -r " << constDir.c_str() << nl
-                << "    mv " << timeDir.c_str()
-                << ' ' << constDir.c_str() << nl;
+
+        // Get time instance directory
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // At this point we should be able to read at least a mesh on
+        // processor0. Note the changing of the processor0 casename to
+        // enforce it to read/write from the undecomposed case
+
+        fileName masterInstDir;
+        if (Pstream::master())
+        {
+            if (decompose)
+            {
+                Info<< "Setting caseName to " << baseRunTime.caseName()
+                    << " to find undecomposed mesh" << endl;
+                runTime.TimePaths::caseName() = baseRunTime.caseName();
+            }
+
+            masterInstDir = runTime.findInstance
+            (
+                meshSubDir,
+                "faces",
+                IOobject::READ_IF_PRESENT
+            );
+
+            if (decompose)
+            {
+                Info<< "Restoring caseName to " << proc0CaseName << endl;
+                runTime.TimePaths::caseName() = proc0CaseName;
+            }
+        }
+        Pstream::scatter(masterInstDir);
+
+        // Check who has a mesh
+        const fileName meshPath =
+            runTime.path()/masterInstDir/meshSubDir/"faces";
+
+        Info<< "Checking for mesh in " << meshPath << nl << endl;
+
+
+        boolList haveMesh(Pstream::nProcs(), false);
+        haveMesh[Pstream::myProcNo()] = isFile(meshPath);
+        Pstream::gatherList(haveMesh);
+        Pstream::scatterList(haveMesh);
+        Info<< "Per processor mesh availability : " << haveMesh << endl;
+
+        // Load mesh (or create dummy one)
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if (Pstream::master() && decompose)
+        {
+            Info<< "Setting caseName to " << baseRunTime.caseName()
+                << " to read undecomposed mesh" << endl;
+            runTime.TimePaths::caseName() = baseRunTime.caseName();
+        }
+
+        autoPtr<fvMesh> meshPtr = loadOrCreateMesh
+        (
+            IOobject
+            (
+                regionName,
+                masterInstDir,
+                runTime,
+                Foam::IOobject::MUST_READ
+            )
+        );
+
+        if (Pstream::master() && decompose)
+        {
+            Info<< "Restoring caseName to " << proc0CaseName << endl;
+            runTime.TimePaths::caseName() = proc0CaseName;
+        }
+
+        fvMesh& mesh = meshPtr();
+
+
+        label nOldCells = mesh.nCells();
+        //Pout<< "Loaded mesh : nCells:" << nOldCells
+        //    << " nPatches:" << mesh.boundaryMesh().size() << endl;
+
+
+        // Global matching tolerance
+        const scalar tolDim = getMergeDistance
+        (
+            args,
+            runTime,
+            mesh.bounds()
+        );
+
+        // Allow override of decomposeParDict location
+        fileName decompDictFile;
+        if (args.optionReadIfPresent("decomposeParDict", decompDictFile))
+        {
+            if (isDir(decompDictFile))
+            {
+                decompDictFile = decompDictFile / "decomposeParDict";
+            }
+        }
+
+
+        // Determine decomposition
+        // ~~~~~~~~~~~~~~~~~~~~~~~
+
+        label nDestProcs;
+        labelList finalDecomp;
+        determineDecomposition
+        (
+            baseRunTime,
+            decompDictFile,
+            decompose,
+            proc0CaseName,
+            mesh,
+            writeCellDist,
+
+            nDestProcs,
+            finalDecomp
+        );
+
+
+        wordList cloudNames;
+        List<wordList> fieldNames;
+
+        // Detect lagrangian fields
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = baseRunTime.caseName();
+        }
+        parLagrangianRedistributor::findClouds
+        (
+            mesh,
+            cloudNames,
+            fieldNames
+        );
+
+        // Read lagrangian fields and store on cloud (objectRegistry)
+        PtrList<unmappedPassiveParticleCloud> clouds(cloudNames.size());
+        readLagrangian
+        (
+            mesh,
+            cloudNames,
+            selectedLagrangianFields,
+            clouds
+        );
+        if (Pstream::master() && decompose)
+        {
+            runTime.TimePaths::caseName() = proc0CaseName;
+        }
+
+
+        // Load fields, do all distribution (mesh and fields - but not
+        // lagrangian fields; these are done later)
+        autoPtr<mapDistributePolyMesh> distMap = redistributeAndWrite
+        (
+            baseRunTime,
+            tolDim,
+            haveMesh,
+            meshSubDir,
+            true,           // read fields
+            decompose,      // decompose, i.e. read from undecomposed case
+            overwrite,
+            proc0CaseName,
+            nDestProcs,
+            finalDecomp,
+            masterInstDir,
+            mesh
+        );
+
+
+        // Redistribute any clouds
+        redistributeLagrangian
+        (
+            lagrangianReconstructorPtr,
+            mesh,
+            nOldCells,
+            distMap,
+            clouds
+        );
+
+
+        // Copy any uniform data
+        const fileName uniformDir("uniform");
+        if (isDir(baseRunTime.timePath()/uniformDir))
+        {
+            Info<< "Detected additional non-decomposed files in "
+                << baseRunTime.timePath()/uniformDir << endl;
+            cp
+            (
+                baseRunTime.timePath()/uniformDir,
+                runTime.timePath()/uniformDir
+            );
         }
     }
-    Info<< endl;
 
 
     Info<< "End\n" << endl;
diff --git a/applications/utilities/parallelProcessing/redistributePar/unmappedPassiveParticleCloud.H b/applications/utilities/parallelProcessing/redistributePar/unmappedPassiveParticleCloud.H
new file mode 100644
index 0000000000..37049552d5
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/unmappedPassiveParticleCloud.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::unmappedPassiveParticleCloud
+
+Description
+    passiveParticleCloud but with autoMap and writing disabled. Only used
+    for its objectRegistry to store lagrangian fields
+
+SourceFiles
+    unmappedPassiveParticleCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef unmappedPassiveParticleCloud_H
+#define unmappedPassiveParticleCloud_H
+
+#include "passiveParticleCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class unmappedPassiveParticleCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class unmappedPassiveParticleCloud
+:
+    public passiveParticleCloud
+{
+
+public:
+
+    // Constructors
+
+        //- Construct given mesh
+        unmappedPassiveParticleCloud
+        (
+            const polyMesh& mesh,
+            const word& cloudName = "defaultCloud",
+            bool readFields = true
+        )
+        :
+            passiveParticleCloud(mesh, cloudName, readFields)
+        {}
+
+        //- Construct from mesh, cloud name, and a list of particles
+        unmappedPassiveParticleCloud
+        (
+            const polyMesh& mesh,
+            const word& cloudName,
+            const IDLList<passiveParticle>& particles
+        )
+        :
+            passiveParticleCloud(mesh, cloudName, particles)
+        {}
+
+        //- Destructor
+        virtual ~unmappedPassiveParticleCloud()
+        {}
+
+        //- Switch off remapping of cells of particles when
+        //  mesh topology changes
+        virtual void autoMap(const mapPolyMesh&)
+        {}
+
+        //- Switch off writing the objects
+        virtual bool writeObject
+        (
+            IOstream::streamFormat fmt,
+            IOstream::versionNumber ver,
+            IOstream::compressionType cmp
+        ) const
+        {
+            return true;
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
index 3a6924710e..4f7811d979 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
index 7799242880..c818403451 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
@@ -2,12 +2,15 @@ EXE_INC = \
     /* -DFULLDEBUG -g -O0 */ \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
+    -lfileFormats \
     -lsampling \
     -lgenericPatchFields \
     -llagrangian
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
index 18f3deabf0..b7780b2382 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,7 @@ License
 #include "IOField.H"
 #include "OFstream.H"
 #include "IOmanip.H"
+#include "ensightPTraits.H"
 
 using namespace Foam;
 
@@ -105,8 +106,10 @@ void ensightCloudField
                 v = pTraits<Type>::zero;
             }
 
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            for (direction i=0; i < pTraits<Type>::nComponents; ++i)
             {
+                label cmpt = ensightPTraits<Type>::componentOrder[i];
+
                 ensightFile << setw(12) << component(v, cmpt);
                 if (++count % 6 == 0)
                 {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index ae90704fd3..81e20c00bd 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ License
 #include "ensightAsciiStream.H"
 #include "globalIndex.H"
 #include "ensightPTraits.H"
+#include "zeroGradientFvPatchField.H"
 
 using namespace Foam;
 
@@ -64,6 +65,85 @@ volField
 }
 
 
+template<class Type>
+tmp<GeometricField<Type, fvPatchField, volMesh> >
+volField
+(
+    const fvMeshSubset& meshSubsetter,
+    const typename GeometricField
+    <
+        Type,
+        fvPatchField,
+        volMesh
+    >::DimensionedInternalField& df
+)
+{
+    // Construct volField (with zeroGradient) from dimensioned field
+
+    IOobject io(df);
+    io.readOpt() = IOobject::NO_READ;
+
+    tmp<GeometricField<Type, fvPatchField, volMesh> > tvf
+    (
+        new GeometricField<Type, fvPatchField, volMesh>
+        (
+            io,
+            df.mesh(),
+            df.dimensions(),
+            zeroGradientFvPatchField<scalar>::typeName
+        )
+    );
+    tvf().internalField() = df;
+    tvf().correctBoundaryConditions();
+    const GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
+
+    if (meshSubsetter.hasSubMesh())
+    {
+        tmp<GeometricField<Type, fvPatchField, volMesh> > tfld
+        (
+            meshSubsetter.interpolate(vf)
+        );
+        tfld().checkOut();
+        tfld().rename(vf.name());
+        return tfld;
+    }
+    else
+    {
+        return tvf;
+    }
+}
+
+
+//template<class Container>
+//void readAndConvertField
+//(
+//    const fvMeshSubset& meshSubsetter,
+//    const IOobject& io,
+//    const fvMesh& mesh,
+//    const ensightMesh& eMesh,
+//    const fileName& postProcPath,
+//    const word& prepend,
+//    const label timeIndex,
+//    const bool binary,
+//    const bool nodeValues,
+//    Ostream& ensightCaseFile
+//)
+//{
+//    Container fld(io, mesh);
+//    ensightField<typename Container::value_type>
+//    (
+//        volField<typename Container::value_type>(meshSubsetter, fld),
+//        eMesh,
+//        postProcPath,
+//        prepend,
+//        timeIndex,
+//        binary,
+//        nodeValues,
+//        ensightCaseFile
+//    );
+//}
+
+
 template<class Type>
 Field<Type> map
 (
@@ -104,8 +184,10 @@ void writeField
         {
             ensightFile.write(key);
 
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            for (direction i=0; i < pTraits<Type>::nComponents; ++i)
             {
+                label cmpt = ensightPTraits<Type>::componentOrder[i];
+
                 ensightFile.write(vf.component(cmpt));
 
                 for (int slave=1; slave<Pstream::nProcs(); slave++)
@@ -118,8 +200,10 @@ void writeField
         }
         else
         {
-            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            for (direction i=0; i < pTraits<Type>::nComponents; ++i)
             {
+                label cmpt = ensightPTraits<Type>::componentOrder[i];
+
                 OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
                 toMaster<< vf.component(cmpt);
             }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
index b3469e3572..7b909bb4e0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
@@ -49,6 +49,21 @@ volField
 );
 
 
+//- Wrapper to convert dimensionedInternalField to volField
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+volField
+(
+    const Foam::fvMeshSubset&,
+    const typename Foam::GeometricField
+    <
+        Type,
+        Foam::fvPatchField,
+        Foam::volMesh
+    >::DimensionedInternalField& df
+);
+
+
 template<class Type>
 void ensightField
 (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 64ce70b679..da9f080aa0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,12 @@ void Foam::ensightMesh::correct()
     meshCellSets_.setSize(mesh_.nCells());
 
     boundaryFaceSets_.setSize(mesh_.boundary().size());
+    boundaryFaceSets_ = faceSets(); // if number of patches changes
     allPatchNames_.clear();
     patchNames_.clear();
     nPatchPrims_ = 0;
     faceZoneFaceSets_.setSize(mesh_.faceZones().size());
+    faceZoneFaceSets_ = faceSets(); // if number of patches changes
     faceZoneNames_.clear();
     nFaceZonePrims_ = 0;
     boundaryFaceToBeIncluded_.clear();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 1e2df86039..efddb780e8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -167,14 +167,20 @@ int main(int argc, char *argv[])
         regionPrefix = regionName;
     }
 
-    const label nVolFieldTypes = 5;
+    const label nVolFieldTypes = 10;
     const word volFieldTypes[] =
     {
         volScalarField::typeName,
         volVectorField::typeName,
         volSphericalTensorField::typeName,
         volSymmTensorField::typeName,
-        volTensorField::typeName
+        volTensorField::typeName,
+
+        volScalarField::DimensionedInternalField::typeName,
+        volVectorField::DimensionedInternalField::typeName,
+        volSphericalTensorField::DimensionedInternalField::typeName,
+        volSymmTensorField::DimensionedInternalField::typeName,
+        volTensorField::DimensionedInternalField::typeName
     };
 
     // Path to EnSight directory at case level only
@@ -543,6 +549,122 @@ int main(int argc, char *argv[])
                         ensightCaseFile
                     );
                 }
+                // DimensionedFields
+                else if
+                (
+                    volFieldTypes[i]
+                 == volScalarField::DimensionedInternalField::typeName
+                )
+                {
+                    volScalarField::DimensionedInternalField df
+                    (
+                        fieldObject,
+                        mesh
+                    );
+                    ensightField<scalar>
+                    (
+                        volField<scalar>(meshSubsetter, df),
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        nodeValues,
+                        ensightCaseFile
+                    );
+                }
+                else if
+                (
+                    volFieldTypes[i]
+                 == volVectorField::DimensionedInternalField::typeName
+                )
+                {
+                    volVectorField::DimensionedInternalField df
+                    (
+                        fieldObject,
+                        mesh
+                    );
+                    ensightField<vector>
+                    (
+                        volField<vector>(meshSubsetter, df),
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        nodeValues,
+                        ensightCaseFile
+                    );
+                }
+                else if
+                (
+                    volFieldTypes[i]
+                 == volSphericalTensorField::DimensionedInternalField::typeName
+                )
+                {
+                    volSphericalTensorField::DimensionedInternalField df
+                    (
+                        fieldObject,
+                        mesh
+                    );
+                    ensightField<sphericalTensor>
+                    (
+                        volField<sphericalTensor>(meshSubsetter, df),
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        nodeValues,
+                        ensightCaseFile
+                    );
+                }
+                else if
+                (
+                    volFieldTypes[i]
+                 == volSymmTensorField::DimensionedInternalField::typeName
+                )
+                {
+                    volSymmTensorField::DimensionedInternalField df
+                    (
+                        fieldObject,
+                        mesh
+                    );
+                    ensightField<symmTensor>
+                    (
+                        volField<symmTensor>(meshSubsetter, df),
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        nodeValues,
+                        ensightCaseFile
+                    );
+                }
+                else if
+                (
+                    volFieldTypes[i]
+                 == volTensorField::DimensionedInternalField::typeName
+                )
+                {
+                    volTensorField::DimensionedInternalField df
+                    (
+                        fieldObject,
+                        mesh
+                    );
+                    ensightField<tensor>
+                    (
+                        volField<tensor>(meshSubsetter, df),
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        nodeValues,
+                        ensightCaseFile
+                    );
+                }
             }
         }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
index 40a58886bf..09a58c1559 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/conversion/lnInclude
 
@@ -8,5 +9,6 @@ EXE_LIBS = \
     -lfiniteVolume \
     -llagrangian \
     -lmeshTools \
+    -lfileFormats \
     -lgenericPatchFields \
     -lconversion
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options
index 97a2251f7b..e087302bf9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options
@@ -2,12 +2,14 @@ EXE_INC = \
     -I$(WM_THIRD_PARTY_DIR)/tecio/tecsrc/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 
 EXE_LIBS = \
     -llagrangian \
     -lfiniteVolume \
+    -ldynamicMesh \
     -lgenericPatchFields \
     -lmeshTools \
     -L$(FOAM_EXT_LIBBIN) -ltecio
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 617811cfec..3cf58fde37 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -224,14 +224,14 @@ int main(int argc, char *argv[])
 
     if (nearCellValue)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Using neighbouring cell value instead of patch value"
             << nl << endl;
     }
 
     if (noPointValues)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Outputting cell values only" << nl << endl;
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
index f545c8d203..f19ebf36f4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ Pout<< endl
         )
     )
     {
-//        FatalErrorIn("tecplotWriter::writeInit(..) const")
+//        FatalErrorInFunction
 //            << "Error in TECINI112." << exit(FatalError);
     }
 }
@@ -148,7 +148,7 @@ Pout<< "zoneName:" << zoneName
         )
     )
     {
-//        FatalErrorIn("tecplotWriter::writePolyhedralZone(..) const")
+//        FatalErrorInFunction
 //            << "Error in TECZNE112." << exit(FatalError);
     }
 }
@@ -228,7 +228,7 @@ Pout<< "zoneName:" << zoneName
         )
     )
     {
-//        FatalErrorIn("tecplotWriter::writePolygonalZone(..) const")
+//        FatalErrorInFunction
 //            << "Error in TECZNE112." << exit(FatalError);
     }
 }
@@ -308,7 +308,7 @@ Pout<< "zoneName:" << zoneName
         )
     )
     {
-//        FatalErrorIn("tecplotWriter::writePolygonalZone(..) const")
+//        FatalErrorInFunction
 //            << "Error in TECZNE112." << exit(FatalError);
     }
 }
@@ -379,7 +379,7 @@ void Foam::tecplotWriter::writeConnectivity(const fvMesh& mesh) const
         )
     )
     {
-//        FatalErrorIn("tecplotWriter::writeConnectivity(const fvMesh&) const")
+//        FatalErrorInFunction
 //            << "Error in TECPOLY112." << exit(FatalError);
     }
 }
@@ -493,7 +493,7 @@ void Foam::tecplotWriter::writeConnectivity
         )
     )
     {
-//        FatalErrorIn("tecplotWriter::writeConnectivity(..) const")
+//        FatalErrorInFunction
 //            << "Error in TECPOLY112." << exit(FatalError);
     }
 }
@@ -505,7 +505,7 @@ Pout<< "writeEnd" << endl;
 
     if (!TECEND112())
     {
-//        FatalErrorIn("tecplotWriter::writeEnd() const")
+//        FatalErrorInFunction
 //            << "Error in TECEND112." << exit(FatalError);
     }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
index 95095cdff1..16416593cb 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ void Foam::tecplotWriter::writeField(const Field<Type>& fld) const
 
         if (!TECDAT112(&size, floats.begin(), &IsDouble))
         {
-//            FatalErrorIn("tecplotWriter::writeField(..) const")
+//            FatalErrorInFunction
 //                << "Error in TECDAT112." << exit(FatalError);
         }
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 2fe59bdc5a..888d274dea 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -29,7 +29,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-
 #include "argList.H"
 #include "fvMesh.H"
 #include "volFields.H"
@@ -120,7 +119,7 @@ void ReadAndMapFields
                 }
                 //else
                 //{
-                //    FatalErrorIn("ReadAndMapFields(..)")
+                //    FatalErrorInFunction
                 //        << "Face " << faceI << " from index " << index
                 //        << " is not a boundary face." << abort(FatalError);
                 //}
@@ -128,7 +127,7 @@ void ReadAndMapFields
             }
             //else
             //{
-            //    WarningIn("ReadAndMapFields(..)")
+            //    WarningInFunction
             //        << "Point " << pointI << " at "
             //        << tetDualMesh.points()[pointI]
             //        << " has no dual correspondence." << endl;
@@ -188,7 +187,7 @@ int main(int argc, char *argv[])
 
     if (pointDualAddressing.size() != tetDualMesh.nPoints())
     {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Size " << pointDualAddressing.size()
                 << " of addressing map " << pointDualAddressing.objectPath()
                 << " differs from number of points in mesh "
@@ -218,7 +217,7 @@ int main(int argc, char *argv[])
             label faceI = -index-1;
             if (faceI < mesh.nInternalFaces())
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Face " << faceI << " from index " << index
                     << " is not a boundary face."
                     << " nInternalFaces:" << mesh.nInternalFaces()
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
index 2b32e21ed0..7cd106bdd0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
@@ -1,10 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -ldynamicMesh \
     -llagrangian \
     -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 2ef824b169..1b747f5498 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
 
     if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "floatScalar and/or label are not 4 bytes in size" << nl
             << "Hence cannot use binary VTK format. Please use -ascii"
             << exit(FatalError);
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
 
     if (nearCellValue)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Using neighbouring cell value instead of patch value"
             << nl << endl;
     }
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
 
     if (noPointValues)
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "Outputting cell values only" << nl << endl;
     }
 
@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
     mkDir(fvPath);
 
 
-    // mesh wrapper; does subsetting and decomposition
+    // Mesh wrapper; does subsetting and decomposition
     vtkMesh vMesh(mesh, cellSetName);
 
 
@@ -601,6 +601,53 @@ int main(int argc, char *argv[])
               + vtf.size();
 
 
+        // Construct dimensioned fields
+        PtrList<volScalarField::DimensionedInternalField> dsf;
+        PtrList<volVectorField::DimensionedInternalField> dvf;
+        PtrList<volSphericalTensorField::DimensionedInternalField> dSpheretf;
+        PtrList<volSymmTensorField::DimensionedInternalField> dSymmtf;
+        PtrList<volTensorField::DimensionedInternalField> dtf;
+
+        if (!specifiedFields || selectedFields.size())
+        {
+            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dsf);
+            print("    volScalarFields::Internal          :", Info, dsf);
+
+            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dvf);
+            print("    volVectorFields::Internal          :", Info, dvf);
+
+            readFields
+            (
+                vMesh,
+                vMesh.baseMesh(),
+                objects,
+                selectedFields,
+                dSpheretf
+            );
+            print("    volSphericalTensorFields::Internal :", Info, dSpheretf);
+
+            readFields
+            (
+                vMesh,
+                vMesh.baseMesh(),
+                objects,
+                selectedFields,
+                dSymmtf
+            );
+            print("    volSymmTensorFields::Internal      :", Info, dSymmtf);
+
+            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dtf);
+            print("    volTensorFields::Internal          :", Info, dtf);
+        }
+
+        label nDimFields =
+                dsf.size()
+              + dvf.size()
+              + dSpheretf.size()
+              + dSymmtf.size()
+              + dtf.size();
+
+
         // Construct pointMesh only if nessecary since constructs edge
         // addressing (expensive on polyhedral meshes)
         if (noPointValues)
@@ -701,7 +748,7 @@ int main(int argc, char *argv[])
             (
                 writer.os(),
                 vMesh.nFieldCells(),
-                1+nVolFields
+                1 + nVolFields + nDimFields
             );
 
             // Write cellID field
@@ -714,13 +761,20 @@ int main(int argc, char *argv[])
             writer.write(vSymmtf);
             writer.write(vtf);
 
+            // Write dimensionedFields
+            writer.write<scalar, volMesh>(dsf);
+            writer.write<vector, volMesh>(dvf);
+            writer.write<sphericalTensor, volMesh>(dSpheretf);
+            writer.write<symmTensor, volMesh>(dSymmtf);
+            writer.write<tensor, volMesh>(dtf);
+
             if (!noPointValues)
             {
                 writeFuns::writePointDataHeader
                 (
                     writer.os(),
                     vMesh.nFieldPoints(),
-                    nVolFields+nPointFields
+                    nVolFields + nDimFields + nPointFields
                 );
 
                 // pointFields
@@ -737,6 +791,12 @@ int main(int argc, char *argv[])
                 writer.write(pInterp, vSpheretf);
                 writer.write(pInterp, vSymmtf);
                 writer.write(pInterp, vtf);
+
+                writer.write<scalar, volMesh>(pInterp, dsf);
+                writer.write<vector, volMesh>(pInterp, dvf);
+                writer.write<sphericalTensor, volMesh>(pInterp, dSpheretf);
+                writer.write<symmTensor, volMesh>(pInterp, dSymmtf);
+                writer.write<tensor, volMesh>(pInterp, dtf);
             }
         }
 
@@ -1235,7 +1295,7 @@ int main(int argc, char *argv[])
                     );
                     if (system(cmd.c_str()) == -1)
                     {
-                        WarningIn(args.executable())
+                        WarningInFunction
                             << "Could not execute command " << cmd << endl;
                     }
                 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
index 9c456f843c..fa805c37b7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
@@ -94,6 +94,13 @@ public:
             const PtrList<GeometricField<Type, PatchField, GeoMesh> >&
         );
 
+        //- Write generic internal fields
+        template<class Type, class GeoMesh>
+        void write
+        (
+            const PtrList<DimensionedField<Type, volMesh> >& flds
+        );
+
         //- Interpolate and write volFields
         template<class Type>
         void write
@@ -101,6 +108,14 @@ public:
             const volPointInterpolation&,
             const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
         );
+
+        //- Interpolate and internal fields
+        template<class Type, class GeoMesh>
+        void write
+        (
+            const volPointInterpolation&,
+            const PtrList<DimensionedField<Type, volMesh> >&
+        );
 };
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
index 853caca75b..797f2d5661 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,19 @@ void Foam::internalWriter::write
 }
 
 
+template<class Type, class GeoMesh>
+void Foam::internalWriter::write
+(
+    const PtrList<DimensionedField<Type, volMesh> >& flds
+)
+{
+    forAll(flds, i)
+    {
+        writeFuns::write(os_, binary_, flds[i], vMesh_);
+    }
+}
+
+
 template<class Type>
 void Foam::internalWriter::write
 (
@@ -62,4 +75,25 @@ void Foam::internalWriter::write
 }
 
 
+template<class Type, class GeoMesh>
+void Foam::internalWriter::write
+(
+    const volPointInterpolation& pInterp,
+    const PtrList<DimensionedField<Type, volMesh> >& flds
+)
+{
+    forAll(flds, i)
+    {
+        writeFuns::write
+        (
+            os_,
+            binary_,
+            flds[i],
+            pInterp.interpolate(flds[i])(),
+            vMesh_
+        );
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
index 11f18b3d76..56df1d5237 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
@@ -113,7 +113,7 @@ public:
     (
         std::ostream&,
         const bool binary,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const DimensionedField<Type, volMesh>&,
         const vtkMesh&
     );
 
@@ -135,8 +135,8 @@ public:
     (
         std::ostream&,
         const bool binary,
-        const GeometricField<Type, fvPatchField, volMesh>&,
-        const GeometricField<Type, pointPatchField, pointMesh>&,
+        const DimensionedField<Type, volMesh>&,
+        const DimensionedField<Type, pointMesh>&,
         const vtkMesh&
     );
 
@@ -150,6 +150,16 @@ public:
         const vtkMesh&
     );
 
+    //- Write generic dimensioned internal fields
+    template<class Type>
+    static void write
+    (
+        std::ostream&,
+        const bool binary,
+        const PtrList<DimensionedField<Type, volMesh> >&,
+        const vtkMesh&
+    );
+
     //- Interpolate and write volFields
     template<class Type>
     static void write
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
index 5fe5d076dd..3082da1e61 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    const GeometricField<Type, fvPatchField, volMesh>& vvf,
+    const DimensionedField<Type, volMesh>& vvf,
     const vtkMesh& vMesh
 )
 {
@@ -79,7 +79,7 @@ void Foam::writeFuns::write
 
     DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nValues);
 
-    insert(vvf.internalField(), fField);
+    insert(vvf, fField);
 
     forAll(superCells, superCellI)
     {
@@ -128,8 +128,8 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    const GeometricField<Type, fvPatchField, volMesh>& vvf,
-    const GeometricField<Type, pointPatchField, pointMesh>& pvf,
+    const DimensionedField<Type, volMesh>& vvf,
+    const DimensionedField<Type, pointMesh>& pvf,
     const vtkMesh& vMesh
 )
 {
@@ -164,6 +164,22 @@ void Foam::writeFuns::write
     const PtrList<GeometricField<Type, PatchField, GeoMesh> >& flds,
     const vtkMesh& vMesh
 )
+{
+    forAll(flds, i)
+    {
+        write(os, binary, flds[i].dimensionedInternalField(), vMesh);
+    }
+}
+
+
+template<class Type>
+void Foam::writeFuns::write
+(
+    std::ostream& os,
+    const bool binary,
+    const PtrList<DimensionedField<Type, volMesh> >& flds,
+    const vtkMesh& vMesh
+)
 {
     forAll(flds, i)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
index 7c6c462a39..2b186d88ba 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     if (!smapFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot open SMAP file " << smapFile.name()
             << exit(FatalError);
     }
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
          && fieldName.wordToken() != "CELL"
         )
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Expected first CELL, found "
                 << fieldName
                 << exit(FatalError);
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
 
         if (cell != 0)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Expected first SMAP dummy entry to be cell 0, found "
                 << cell
                 << exit(FatalError);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
index fe7cdae8a9..842a301ed7 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ public:
 
         bool writeData(Ostream&) const
         {
-            notImplemented("zonesEntries::writeData(Ostream&) const");
+            NotImplemented;
             return false;
         }
 };
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C
index 10551b1ad9..00430a6144 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::vtkPV3Foam::AddToBlock
     {
         if (blockDO)
         {
-            FatalErrorIn("Foam::vtkPV3Foam::AddToBlock")
+            FatalErrorInFunction
                 << "Block already has a vtkDataSet assigned to it"
                 << endl;
             return;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C
index da8a942a62..fb26fceba1 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void Foam::vtkPV3blockMesh::AddToBlock
     {
         if (blockDO)
         {
-            FatalErrorIn("Foam::vtkPV3blockMesh::AddToBlock")
+            FatalErrorInFunction
                 << "Block already has a vtkDataSet assigned to it"
                 << endl;
             return;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
index 4daf45fc48..5740476e66 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ void Foam::vtkPV3Readers::AddToBlock
     {
         if (blockDO)
         {
-            FatalErrorIn("Foam::vtkPV3Readers::AddToBlock")
+            FatalErrorInFunction
                 << "Block already has a vtkDataSet assigned to it"
                 << endl;
             return;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
index 1ed6a9e569..2ca47f135d 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/Make/options
@@ -3,6 +3,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I../../vtkPV4Readers/lnInclude \
     -I../PV4FoamReader \
@@ -15,6 +16,7 @@ EXE_INC = \
 LIB_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
+    -ldynamicMesh \
     -lgenericPatchFields \
     -llagrangian \
     -L$(FOAM_LIBBIN) -lvtkPV4Readers \
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
index 0bd35573e1..78e4496f17 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
@@ -390,15 +390,6 @@ class vtkPV4Foam
             //- Reduce memory footprint after conversion
             void reduceMemory();
 
-            //- Volume fields
-            void updateVolFields(vtkMultiBlockDataSet*);
-
-            //- Point fields
-            void updatePointFields(vtkMultiBlockDataSet*);
-
-            //- Lagrangian fields
-            void updateLagrangianFields(vtkMultiBlockDataSet*);
-
 
         // Mesh conversion functions
 
@@ -492,6 +483,16 @@ class vtkPV4Foam
 
         // Convert OpenFOAM fields
 
+            //- Volume field - all types
+            template<class Type>
+            void convertVolField
+            (
+                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const GeometricField<Type, fvPatchField, volMesh>&,
+                const bool interpFields,
+                vtkMultiBlockDataSet* output
+            );
+
             //- Volume fields - all types
             template<class Type>
             void convertVolFields
@@ -503,6 +504,17 @@ class vtkPV4Foam
                 vtkMultiBlockDataSet* output
             );
 
+            //- Volume internal fields (DimensionedField)- all types
+            template<class Type>
+            void convertDimFields
+            (
+                const fvMesh&,
+                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const IOobjectList&,
+                const bool interpFields,
+                vtkMultiBlockDataSet* output
+            );
+
             //- Volume field - all selected parts
             template<class Type>
             void convertVolFieldBlock
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
index 127f49d306..ec28f4dfe8 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,6 +143,27 @@ void Foam::vtkPV4Foam::convertVolFields
         mesh, ppInterpList, objects, interpFields, output
     );
 
+    convertDimFields<scalar>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<vector>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<sphericalTensor>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<symmTensor>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<tensor>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+
     if (debug)
     {
         Info<< "<end> Foam::vtkPV4Foam::convertVolFields" << endl;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
index 9ed89ff9e3..9598d5de4a 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ public:
 
         bool writeData(Ostream&) const
         {
-            notImplemented("zonesEntries::writeData(Ostream&) const");
+            NotImplemented;
             return false;
         }
 };
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
index b191e1c52b..784432ea4b 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
@@ -99,6 +99,34 @@ void Foam::vtkPV4Foam::updateInfoFields
         objects
     );
 
+    //- Add dimensioned fields to GUI
+    addToSelection<DimensionedField<scalar, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<vector, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<sphericalTensor, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<symmTensor, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<tensor, meshType> >
+    (
+        select,
+        objects
+    );
+
+
     // restore the enabled selections
     setSelectedArrayEntries(select, enabledEntries);
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
index 707914711b..18573ec94f 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::vtkPV4Foam::AddToBlock
     {
         if (blockDO)
         {
-            FatalErrorIn("Foam::vtkPV4Foam::AddToBlock")
+            FatalErrorInFunction
                 << "Block already has a vtkDataSet assigned to it"
                 << endl;
             return;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
index f4757a6137..fbc51aeaa1 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ InClass
 #include "wallPolyPatch.H"
 #include "faceSet.H"
 #include "volPointInterpolation.H"
+#include "zeroGradientFvPatchField.H"
 
 #include "vtkPV4FoamFaceField.H"
 #include "vtkPV4FoamPatchField.H"
@@ -42,6 +43,224 @@ InClass
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::vtkPV4Foam::convertVolField
+(
+    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const GeometricField<Type, fvPatchField, volMesh>& tf,
+    const bool interpFields,
+    vtkMultiBlockDataSet* output
+)
+{
+    const fvMesh& mesh = tf.mesh();
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    // Interpolated field (demand driven)
+    autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
+    if (interpFields)
+    {
+        if (debug)
+        {
+            Info<< "convertVolFieldBlock interpolating:" << tf.name()
+                << endl;
+        }
+
+        ptfPtr.reset
+        (
+            volPointInterpolation::New(mesh).interpolate(tf).ptr()
+        );
+    }
+
+
+    // Convert activated internalMesh regions
+    convertVolFieldBlock
+    (
+        tf,
+        ptfPtr,
+        output,
+        arrayRangeVolume_,
+        regionPolyDecomp_
+    );
+
+    // Convert activated cellZones
+    convertVolFieldBlock
+    (
+        tf,
+        ptfPtr,
+        output,
+        arrayRangeCellZones_,
+        zonePolyDecomp_
+    );
+
+    // Convert activated cellSets
+    convertVolFieldBlock
+    (
+        tf,
+        ptfPtr,
+        output,
+        arrayRangeCellSets_,
+        csetPolyDecomp_
+    );
+
+
+    //
+    // Convert patches - if activated
+    //
+    for
+    (
+        int partId = arrayRangePatches_.start();
+        partId < arrayRangePatches_.end();
+        ++partId
+    )
+    {
+        const word patchName = getPartName(partId);
+        const label datasetNo = partDataset_[partId];
+        const label patchId = patches.findPatchID(patchName);
+
+        if (!partStatus_[partId] || datasetNo < 0 || patchId < 0)
+        {
+            continue;
+        }
+
+        const fvPatchField<Type>& ptf = tf.boundaryField()[patchId];
+
+        if
+        (
+            isType<emptyFvPatchField<Type> >(ptf)
+         ||
+            (
+                reader_->GetExtrapolatePatches()
+            && !polyPatch::constraintType(patches[patchId].type())
+            )
+        )
+        {
+            fvPatch p(ptf.patch().patch(), mesh.boundary());
+
+            tmp<Field<Type> > tpptf
+            (
+                fvPatchField<Type>(p, tf).patchInternalField()
+            );
+
+            convertPatchField
+            (
+                tf.name(),
+                tpptf(),
+                output,
+                arrayRangePatches_,
+                datasetNo
+            );
+
+            if (interpFields)
+            {
+                convertPatchPointField
+                (
+                    tf.name(),
+                    ppInterpList[patchId].faceToPointInterpolate(tpptf)(),
+                    output,
+                    arrayRangePatches_,
+                    datasetNo
+                );
+            }
+        }
+        else
+        {
+            convertPatchField
+            (
+                tf.name(),
+                ptf,
+                output,
+                arrayRangePatches_,
+                datasetNo
+            );
+
+            if (interpFields)
+            {
+                convertPatchPointField
+                (
+                    tf.name(),
+                    ppInterpList[patchId].faceToPointInterpolate(ptf)(),
+                    output,
+                    arrayRangePatches_,
+                    datasetNo
+                );
+            }
+        }
+    }
+
+    //
+    // Convert face zones - if activated
+    //
+    for
+    (
+        int partId = arrayRangeFaceZones_.start();
+        partId < arrayRangeFaceZones_.end();
+        ++partId
+    )
+    {
+        const word zoneName = getPartName(partId);
+        const label datasetNo = partDataset_[partId];
+
+        if (!partStatus_[partId] || datasetNo < 0)
+        {
+            continue;
+        }
+
+        const faceZoneMesh& zMesh = mesh.faceZones();
+        const label zoneId = zMesh.findZoneID(zoneName);
+
+        if (zoneId < 0)
+        {
+            continue;
+        }
+
+        convertFaceField
+        (
+            tf,
+            output,
+            arrayRangeFaceZones_,
+            datasetNo,
+            mesh,
+            zMesh[zoneId]
+        );
+
+        // TODO: points
+    }
+
+    //
+    // Convert face sets - if activated
+    //
+    for
+    (
+        int partId = arrayRangeFaceSets_.start();
+        partId < arrayRangeFaceSets_.end();
+        ++partId
+    )
+    {
+        const word selectName = getPartName(partId);
+        const label datasetNo = partDataset_[partId];
+
+        if (!partStatus_[partId] || datasetNo < 0)
+        {
+            continue;
+        }
+
+        const faceSet fSet(mesh, selectName);
+
+        convertFaceField
+        (
+            tf,
+            output,
+            arrayRangeFaceSets_,
+            datasetNo,
+            mesh,
+            fSet.toc()
+        );
+
+        // TODO: points
+    }
+}
+
+
 template<class Type>
 void Foam::vtkPV4Foam::convertVolFields
 (
@@ -52,8 +271,6 @@ void Foam::vtkPV4Foam::convertVolFields
     vtkMultiBlockDataSet* output
 )
 {
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
     forAllConstIter(IOobjectList, objects, iter)
     {
         // restrict to GeometricField<Type, ...>
@@ -73,209 +290,69 @@ void Foam::vtkPV4Foam::convertVolFields
             mesh
         );
 
-        // Interpolated field (demand driven)
-        autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
-        if (interpFields)
-        {
-            if (debug)
-            {
-                Info<< "convertVolFieldBlock interpolating:" << tf.name()
-                    << endl;
-            }
-
-            ptfPtr.reset
-            (
-                volPointInterpolation::New(tf.mesh()).interpolate(tf).ptr()
-            );
-        }
+        // Convert
+        convertVolField(ppInterpList, tf, interpFields, output);
+    }
+}
 
 
-        // Convert activated internalMesh regions
-        convertVolFieldBlock
+template<class Type>
+void Foam::vtkPV4Foam::convertDimFields
+(
+    const fvMesh& mesh,
+    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const IOobjectList& objects,
+    const bool interpFields,
+    vtkMultiBlockDataSet* output
+)
+{
+    forAllConstIter(IOobjectList, objects, iter)
+    {
+        // restrict to DimensionedField<Type, ...>
+        if
         (
-            tf,
-            ptfPtr,
-            output,
-            arrayRangeVolume_,
-            regionPolyDecomp_
-        );
-
-        // Convert activated cellZones
-        convertVolFieldBlock
-        (
-            tf,
-            ptfPtr,
-            output,
-            arrayRangeCellZones_,
-            zonePolyDecomp_
-        );
-
-        // Convert activated cellSets
-        convertVolFieldBlock
-        (
-            tf,
-            ptfPtr,
-            output,
-            arrayRangeCellSets_,
-            csetPolyDecomp_
-        );
-
-
-        //
-        // Convert patches - if activated
-        //
-        for
-        (
-            int partId = arrayRangePatches_.start();
-            partId < arrayRangePatches_.end();
-            ++partId
+            iter()->headerClassName()
+         != DimensionedField<Type, volMesh>::typeName
         )
         {
-            const word patchName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
-            const label patchId = patches.findPatchID(patchName);
+            continue;
+        }
 
-            if (!partStatus_[partId] || datasetNo < 0 || patchId < 0)
-            {
-                continue;
-            }
+        // Load field
+        DimensionedField<Type, volMesh> dimFld(*iter(), mesh);
 
-            const fvPatchField<Type>& ptf = tf.boundaryField()[patchId];
 
-            if
+        // Construct volField with zero-gradient patch fields
+
+        IOobject io(dimFld);
+        io.readOpt() = IOobject::NO_READ;
+
+        PtrList<fvPatchField<Type> > patchFields(mesh.boundary().size());
+        forAll(patchFields, patchI)
+        {
+            patchFields.set
             (
-                isType<emptyFvPatchField<Type> >(ptf)
-             ||
+                patchI,
+                fvPatchField<Type>::New
                 (
-                    reader_->GetExtrapolatePatches()
-                && !polyPatch::constraintType(patches[patchId].type())
+                    zeroGradientFvPatchField<scalar>::typeName,
+                    mesh.boundary()[patchI],
+                    dimFld
                 )
-            )
-            {
-                fvPatch p(ptf.patch().patch(), tf.mesh().boundary());
-
-                tmp<Field<Type> > tpptf
-                (
-                    fvPatchField<Type>(p, tf).patchInternalField()
-                );
-
-                convertPatchField
-                (
-                    tf.name(),
-                    tpptf(),
-                    output,
-                    arrayRangePatches_,
-                    datasetNo
-                );
-
-                if (interpFields)
-                {
-                    convertPatchPointField
-                    (
-                        tf.name(),
-                        ppInterpList[patchId].faceToPointInterpolate(tpptf)(),
-                        output,
-                        arrayRangePatches_,
-                        datasetNo
-                    );
-                }
-            }
-            else
-            {
-                convertPatchField
-                (
-                    tf.name(),
-                    ptf,
-                    output,
-                    arrayRangePatches_,
-                    datasetNo
-                );
-
-                if (interpFields)
-                {
-                    convertPatchPointField
-                    (
-                        tf.name(),
-                        ppInterpList[patchId].faceToPointInterpolate(ptf)(),
-                        output,
-                        arrayRangePatches_,
-                        datasetNo
-                    );
-                }
-            }
-        }
-
-        //
-        // Convert face zones - if activated
-        //
-        for
-        (
-            int partId = arrayRangeFaceZones_.start();
-            partId < arrayRangeFaceZones_.end();
-            ++partId
-        )
-        {
-            const word zoneName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
-
-            if (!partStatus_[partId] || datasetNo < 0)
-            {
-                continue;
-            }
-
-            const faceZoneMesh& zMesh = mesh.faceZones();
-            const label zoneId = zMesh.findZoneID(zoneName);
-
-            if (zoneId < 0)
-            {
-                continue;
-            }
-
-            convertFaceField
-            (
-                tf,
-                output,
-                arrayRangeFaceZones_,
-                datasetNo,
-                mesh,
-                zMesh[zoneId]
             );
-
-            // TODO: points
         }
 
-        //
-        // Convert face sets - if activated
-        //
-        for
+        GeometricField<Type, fvPatchField, volMesh> volFld
         (
-            int partId = arrayRangeFaceSets_.start();
-            partId < arrayRangeFaceSets_.end();
-            ++partId
-        )
-        {
-            const word selectName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
+            io,
+            dimFld.mesh(),
+            dimFld.dimensions(),
+            dimFld,
+            patchFields
+        );
+        volFld.correctBoundaryConditions();
 
-            if (!partStatus_[partId] || datasetNo < 0)
-            {
-                continue;
-            }
-
-            const faceSet fSet(mesh, selectName);
-
-            convertFaceField
-            (
-                tf,
-                output,
-                arrayRangeFaceSets_,
-                datasetNo,
-                mesh,
-                fSet.toc()
-            );
-
-            // TODO: points
-        }
+        convertVolField(ppInterpList, volFld, interpFields, output);
     }
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
index d0a55bbd7b..7cb1073058 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void Foam::vtkPV4blockMesh::AddToBlock
     {
         if (blockDO)
         {
-            FatalErrorIn("Foam::vtkPV4blockMesh::AddToBlock")
+            FatalErrorInFunction
                 << "Block already has a vtkDataSet assigned to it"
                 << endl;
             return;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
index 710fcc361b..dfb9511999 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ void Foam::vtkPV4Readers::AddToBlock
     {
         if (blockDO)
         {
-            FatalErrorIn("Foam::vtkPV4Readers::AddToBlock")
+            FatalErrorInFunction
                 << "Block already has a vtkDataSet assigned to it"
                 << endl;
             return;
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
index 03e6c8c243..3c8a6edd86 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 4988fc969f..83f9bc2ebb 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -247,6 +247,8 @@ int main(int argc, char *argv[])
         );
     }
 
+    Info<< "End\n" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict
index 0545734a44..98c16ebe4e 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 4d2ab943ac..0f279d3358 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,9 @@ Application
 Description
     Generates a VTK file of particle tracks for cases that were computed using
     a steady-state cloud
-    NOTE: case must be re-constructed (if running in parallel) before use
+
+    Note:
+    - Case must be re-constructed (if running in parallel) before use
 
 \*---------------------------------------------------------------------------*/
 
@@ -331,7 +333,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    Info<< "\ndone" << endl;
+    Info<< "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
index 3dcc365c1d..edf43c9a29 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,15 +57,7 @@ tmp<Field<Type> > readParticleField
         return tmp<Field<Type> >(new Field<Type>(newField.xfer()));
     }
 
-    FatalErrorIn
-    (
-        "template<class Type>"
-        "void readParticleField"
-        "("
-            "const word&, "
-            "const IOobjectList"
-        ")"
-    )
+    FatalErrorInFunction
         << "error: cloud field name " << name << " not found"
         << abort(FatalError);
 
@@ -94,16 +86,7 @@ void readFields
         }
         else
         {
-            FatalErrorIn
-            (
-                "template<class Type>"
-                "void readFields"
-                "("
-                    "PtrList<List<Type> >&, "
-                    "const List<word>&, "
-                    "const IOobjectList&"
-                ")"
-            )
+            FatalErrorInFunction
                 << "Unable to read field " << fieldNames[j]
                 << abort(FatalError);
         }
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
index 9754e76402..42904e4c68 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
@@ -26,8 +26,9 @@ Application
 
 Description
     Calculate the geometric compression ratio.
-    Note that if you have valves and/or extra volumes it will not work,
-    since it calculates the volume at BDC and TCD.
+
+    Note: if you have valves and/or extra volumes it will not work,
+          since it calculates the volume at BDC and TCD.
 
 \*---------------------------------------------------------------------------*/
 
@@ -68,9 +69,9 @@ int main(int argc, char *argv[])
 
     scalar Vmax = sum(mesh.V().field());
 
-    while (mag(runTime.theta()-ca1) > eps)
+    while (mag(runTime.theta() - ca1) > eps)
     {
-        scalar t1 = runTime.userTimeToTime(ca1-runTime.theta());
+        scalar t1 = runTime.userTimeToTime(ca1 - runTime.theta());
         runTime.setDeltaT(t1);
         runTime++;
         Info<< "CA = " << runTime.theta() << endl;
@@ -79,9 +80,10 @@ int main(int argc, char *argv[])
 
     scalar Vmin = sum(mesh.V().field());
 
-    Info<< "\nVmax = " << Vmax;
-    Info<< ", Vmin = " << Vmin << endl;
-    Info<< "Vmax/Vmin = " << Vmax/Vmin << endl;
+    Info<< "\nVmax = " << Vmax
+        << ", Vmin = " << Vmin << nl
+        << "Vmax/Vmin = " << Vmax/Vmin << endl;
+    
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index 33c0f0a171..8f3674d513 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 8e0c2ce7cf..6882b0f7ee 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -43,7 +43,7 @@ Description
 #include "pointFields.H"
 #include "uniformDimensionedFields.H"
 #include "ReadFields.H"
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
@@ -84,12 +84,8 @@ wordList ReadUniformFields
 
             if (iter == localNamesSet.end())
             {
-                FatalErrorIn
-                (
-                    "ReadFields<class GeoField>"
-                    "(const IOobjectList&, PtrList<GeoField>&"
-                    ", const bool)"
-                )   << "Fields not synchronised across processors." << endl
+                FatalErrorInFunction
+                    << "Fields not synchronised across processors." << endl
                     << "Master has fields " << masterNames
                     << "  processor " << Pstream::myProcNo()
                     << " has fields " << localNames << exit(FatalError);
@@ -102,12 +98,8 @@ wordList ReadUniformFields
 
         forAllConstIter(HashSet<word>, localNamesSet, iter)
         {
-            FatalErrorIn
-            (
-                "ReadFields<class GeoField>"
-                "(const IOobjectList&, PtrList<GeoField>&"
-                ", const bool)"
-            )   << "Fields not synchronised across processors." << endl
+            FatalErrorInFunction
+                << "Fields not synchronised across processors." << endl
                 << "Master has fields " << masterNames
                 << "  processor " << Pstream::myProcNo()
                 << " has fields " << localNames << exit(FatalError);
@@ -156,7 +148,11 @@ void calc
     functionObjectList& fol
 )
 {
-    if (args.optionFound("noFlow"))
+    if (args.optionFound("noRead"))
+    {
+        fol.execute(true);
+    }
+    else if (args.optionFound("noFlow"))
     {
         Info<< "    Operating in no-flow mode; no models will be loaded."
             << " All vol, surface and point fields will be loaded." << endl;
@@ -294,8 +290,6 @@ void calc
             mesh
         );
 
-        #include "createFvOptions.H"
-
         if (phi.dimensions() == dimVolume/dimTime)
         {
             IOobject turbulencePropertiesHeader
@@ -400,7 +394,7 @@ void calc
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Incorrect dimensions of phi: " << phi.dimensions()
                 << nl << exit(FatalError);
         }
diff --git a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
index 8659f0205f..88be47e53d 100644
--- a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
+++ b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
 
         if (!nProcs)
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "No processor* directories found"
                 << exit(FatalError);
         }
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
index b818bb8dcd..b25ff63614 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
index bd1c302481..501fea6203 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ void Foam::channelIndex::walkOppositeFaces
 
                 if (oppositeFaceI == -1)
                 {
-                    FatalErrorIn("channelIndex::walkOppositeFaces(..)")
+                    FatalErrorInFunction
                         << "Face:" << faceI << " owner cell:" << ownCell
                         << " is not a hex?" << abort(FatalError);
                 }
@@ -135,7 +135,7 @@ void Foam::channelIndex::walkOppositeFaces
 
                 if (oppositeFaceI == -1)
                 {
-                    FatalErrorIn("channelIndex::walkOppositeFaces(..)")
+                    FatalErrorInFunction
                         << "Face:" << faceI << " neighbour cell:" << neiCell
                         << " is not a hex?" << abort(FatalError);
                 }
@@ -247,7 +247,7 @@ Foam::channelIndex::channelIndex
 
         if (patchI == -1)
         {
-            FatalErrorIn("channelIndex::channelIndex(const polyMesh&)")
+            FatalErrorInFunction
                 << "Illegal patch " << patchNames[i]
                 << ". Valid patches are " << patches.name()
                 << exit(FatalError);
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
index 2cb45a484a..32961a5d45 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 41ca210179..3f3213cd3e 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -138,6 +138,8 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
+    Info<< "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
index e670d9150f..873bb53a72 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
@@ -49,6 +49,8 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(timeDirs[timeI], timeI);
 
+        Info<< "Time = " << runTime.timeName() << endl;
+
         mesh.readUpdate();
 
         volScalarField mgb
@@ -114,8 +116,12 @@ int main(int argc, char *argv[])
         );
 
         wdot.write();
+
+        Info<< endl;
     }
 
+    Info<< "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 6b6628f080..4f4cb599ff 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -107,7 +107,7 @@ Foam::scalar checkUniformTimeStep(const scalarField& t)
 
             if (mag(deltaT - dT) > SMALL)
             {
-                FatalErrorIn("checkUniformTimeStep(const scalarField&)")
+                FatalErrorInFunction
                     << "Unable to process data with a variable time step"
                     << exit(FatalError);
             }
@@ -115,7 +115,7 @@ Foam::scalar checkUniformTimeStep(const scalarField& t)
     }
     else
     {
-        FatalErrorIn("checkUniformTimeStep(const scalarField&)")
+        FatalErrorInFunction
             << "Unable to create FFT with a single value"
             << exit(FatalError);
     }
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
 
     if (t.size() < N)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Block size N = " << N
             << " is larger than number of data = " << t.size()
             << exit(FatalError);
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probesDict b/applications/utilities/postProcessing/sampling/probeLocations/probesDict
index b9c5eedc6d..af047efe7a 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/probesDict
+++ b/applications/utilities/postProcessing/sampling/probeLocations/probesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 92b1c02e35..ef20e8e3f3 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -31,18 +31,66 @@ setFormat raw;
 //      dx          : DX scalar or vector format
 //      vtk         : VTK ascii format
 //      raw         : x y z value format for use with e.g. gnuplot 'splot'.
+//      boundaryData: written in a form that can be used with timeVaryingMapped
+//                    boundary conditions (move to constant/boundaryData)
+//      starcd      : Star-CD format (geometry in .cel/.vrt, data in .usr)
+//      nastran     : Nastran (.nas) format
 //
 // Note:
-// other formats such as obj, stl, etc can also be written (by proxy)
-// but without any values!
+// - other formats such as obj, stl, etc can also be written (by proxy)
+//   but without any values!
+// - boundaryData format: typical use:
+//      - use a surfaces functionObject to sample a patch:
+//            type            surfaces;
+//            surfaceFormat   boundaryData;
+//            fields          ( p );
+//            surfaces
+//            (
+//                inlet
+//                {
+//                    type            patch;
+//                    patches         (inpletPatch);
+//                    interpolate     false;
+//                }
+//            );
+//      - the boundaryData writer will write postProcessing/surfaces/inlet/
+//      - move this to constant/boundaryData/inlet of the destination case
+//      - use a timeVaryingMappedFixedValue bc to read&interpolate and use
+//        as fixedValue.
+// - boundaryData: 'interpolate false' writes face centres, 'interpolate true'
+//   writes points. For 2D case the face centres might only be a single column
+//   so cannot be used in timeVaryingMapped with standard mapping (since
+//   uses triangulation to do interpolation).
+
 surfaceFormat vtk;
 
-// optionally define extra controls for the output formats
+// Optionally define extra controls for the output formats
 formatOptions
 {
     ensight
     {
+        // ascii/binary format
         format  ascii;
+        //collateTimes true;  // write single file containing multiple timesteps
+                              // (only for static surfaces)
+    }
+    nastran
+    {
+        // From OpenFOAM field name to Nastran field name
+        fields
+        (
+            (U      PLOAD4)
+            (p      PLOAD2)
+        );
+        // Optional scale
+        scale 1.0;
+        // Optional format
+        // short/long/free format
+        // short: scalar field width 8. default.
+        // long : scalar field width 16
+        // free : comma separated, field width according to writePrecision
+        //        setting
+        format  short;      // short/long/free
     }
 }
 
@@ -143,9 +191,19 @@ sets
         type        patchSeed;
         axis        xyz;
         patches     (".*Wall.*");
-        // Number of points to seed. Divided amongst all processors according
-        // to fraction of patches they hold.
+
+        // Subset patch faces by:
+
+        // 1. Number of points to seed. Divided amongst all processors
+        //   according to fraction of patches they hold.
         maxPoints   100;
+
+        // 2. Specified set of locations. This selects for every the specified
+        //    point the nearest patch face. (in addition the number of points
+        //    is also truncated by the maxPoints setting)
+        //    The difference with patchCloud is that this selects patch
+        //    face centres, not an arbitrary location on the face.
+        points   ((0.049 0.099 0.005)(0.051 0.054 0.005));
     }
 
 );
@@ -249,8 +307,10 @@ surfaces
         isoValue        0.5;
         interpolate     true;
 
-        //zone            ABC;          // Optional: zone only
-        //exposedPatchName fixedWalls;  // Optional: zone only
+        // zone            ABC;         // Optional: zone only
+        // exposedPatchName fixedWalls; // Optional: zone only
+
+        // bounds       (1 1 1)(2 2 2); // Optional: limit extent
 
         // regularise      false;    // Optional: do not simplify
         // mergeTol        1e-10;    // Optional: fraction of mesh bounding box
@@ -265,6 +325,9 @@ surfaces
         isoValue        0.5;
         interpolate     false;
         regularise      false;              // do not simplify
+
+        // bounds       (1 1 1)(2 2 2); // Optional: limit extent
+
         // mergeTol        1e-10;    // Optional: fraction of mesh bounding box
                                      // to merge points (default=1e-6)
     }
@@ -281,8 +344,10 @@ surfaces
         }
         interpolate     true;
 
-        //zone            ABC;          // Optional: zone only
-        //exposedPatchName fixedWalls;  // Optional: zone only
+        // zone             ABC;          // Optional: zone only
+        // exposedPatchName fixedWalls;  // Optional: zone only
+
+        // bounds       (1 1 1)(2 2 2); // Optional: limit extent
 
         // regularise      false;    // Optional: do not simplify
         // mergeTol        1e-10;    // Optional: fraction of mesh bounding box
@@ -305,6 +370,8 @@ surfaces
                                 // of isoSurfaceCell
         interpolate     false;
         regularise      false;  // Optional: do not simplify
+        // bounds       (1 1 1)(2 2 2); // Optional: limit extent
+
         // mergeTol 1e-10;      // Optional: fraction of mesh bounding box
                                 // to merge points (default=1e-6)
     }
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index 7848679a25..f03ed13570 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -105,6 +105,8 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index f9c82ba46f..accfb3afd5 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -17,6 +17,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lfiniteVolume \
+    -lfvOptions \
     -lgenericPatchFields \
     -lmeshTools \
     -lsampling
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index 9778b15c09..9443f06071 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -12,4 +12,5 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lgenericPatchFields \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
index 7c07f44f8b..08f2c28606 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H
@@ -18,5 +18,5 @@
 
     autoPtr<incompressible::RASModel> RASModel
     (
-        incompressible::RASModel::New(U, phi, laminarTransport)
+        incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
     );
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index be63b2a5f7..f1d37ed6a5 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -44,11 +44,26 @@ int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
 
+    argList::addOption
+    (
+        "fields",
+        "wordReList",
+        "specify which turbulence fields (k, epsilon, omega, R) to write"
+        " - eg '(k omega)' or '(R)' or '(.*)'."
+    );
+
     #include "setRootCase.H"
     #include "createTime.H"
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
+    const bool selectedFields = args.optionFound("fields");
+    wordReList fieldPatterns;
+    if (selectedFields)
+    {
+        fieldPatterns = wordReList(args.optionLookup("fields")());
+    }
+
     #include "createMesh.H"
 
     forAll(timeDirs, timeI)
@@ -59,69 +74,77 @@ int main(int argc, char *argv[])
 
         #include "createFields.H"
 
-        Info<< "\nRetrieving field k from turbulence model" << endl;
-        const volScalarField k(RASModel->k());
-
-        Info<< "\nRetrieving field epsilon from turbulence model" << endl;
-        const volScalarField epsilon(RASModel->epsilon());
-
-        Info<< "\nRetrieving field R from turbulence model" << endl;
-        const volSymmTensorField R(RASModel->R());
-
-        // Check availability of tubulence fields
-
-        if (!IOobject("k", runTime.timeName(), mesh).headerOk())
+        if (findStrings(fieldPatterns, "k"))
         {
-            Info<< "\nWriting turbulence field k" << endl;
-            k.write();
-        }
-        else
-        {
-            Info<< "\nTurbulence k field already exists" << endl;
+            if (!IOobject("k", runTime.timeName(), mesh).headerOk())
+            {
+                Info<< "    Writing turbulence field k" << endl;
+                const volScalarField k(RASModel->k());
+                k.write();
+            }
+            else
+            {
+                Info<< "    Turbulence k field already exists" << endl;
+            }
         }
 
-        if (!IOobject("epsilon", runTime.timeName(), mesh).headerOk())
+        if (findStrings(fieldPatterns, "epsilon"))
         {
-            Info<< "\nWriting turbulence field epsilon" << endl;
-            epsilon.write();
-        }
-        else
-        {
-            Info<< "\nTurbulence epsilon field already exists" << endl;
+            if (!IOobject("epsilon", runTime.timeName(), mesh).headerOk())
+            {
+                Info<< "    Writing turbulence field epsilon" << endl;
+                const volScalarField epsilon(RASModel->epsilon());
+                epsilon.write();
+            }
+            else
+            {
+                Info<< "    Turbulence epsilon field already exists" << endl;
+            }
         }
 
-        if (!IOobject("R", runTime.timeName(), mesh).headerOk())
+        if (findStrings(fieldPatterns, "R"))
         {
-            Info<< "\nWriting turbulence field R" << endl;
-            R.write();
-        }
-        else
-        {
-            Info<< "\nTurbulence R field already exists" << endl;
+            if (!IOobject("R", runTime.timeName(), mesh).headerOk())
+            {
+                Info<< "    Writing turbulence field R" << endl;
+                const volSymmTensorField R(RASModel->R());
+                R.write();
+            }
+            else
+            {
+                Info<< "    Turbulence R field already exists" << endl;
+            }
         }
 
-        if (!IOobject("omega", runTime.timeName(), mesh).headerOk())
+        if (findStrings(fieldPatterns, "omega"))
         {
-            const scalar Cmu = 0.09;
+            if (!IOobject("omega", runTime.timeName(), mesh).headerOk())
+            {
+                const scalar Cmu = 0.09;
 
-            Info<< "creating omega" << endl;
-            volScalarField omega
-            (
-                IOobject
+                // Assume k and epsilon are available
+                const volScalarField k(RASModel->k());
+                const volScalarField epsilon(RASModel->epsilon());
+
+                volScalarField omega
                 (
-                    "omega",
-                    runTime.timeName(),
-                    mesh
-                ),
-                epsilon/(Cmu*k),
-                epsilon.boundaryField().types()
-            );
-            Info<< "\nWriting turbulence field omega" << endl;
-            omega.write();
-        }
-        else
-        {
-            Info<< "\nTurbulence omega field already exists" << endl;
+                    IOobject
+                    (
+                        "omega",
+                        runTime.timeName(),
+                        mesh
+                    ),
+                    epsilon/(Cmu*k),
+                    epsilon.boundaryField().types()
+                );
+
+                Info<< "    Writing turbulence field omega" << endl;
+                omega.write();
+            }
+            else
+            {
+                Info<< "    Turbulence omega field already exists" << endl;
+            }
         }
     }
 
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 9e6d6d2485..03718ef523 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Incorrect dimensions of phi: " << phi.dimensions()
                 << abort(FatalError);
         }
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 39136a389b..a65eb0a07c 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -144,7 +144,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
         Info<< "    Missing U or T" << endl;
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< nl << "End" << nl << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index 628f2fab13..94361e9687 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -20,6 +20,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lfiniteVolume \
+    -lfvOptions \
     -lgenericPatchFields \
     -lmeshTools \
     -lsampling
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index a82837d83c..9c115c078d 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -241,7 +241,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Incorrect dimensions of phi: " << phi.dimensions()
                     << abort(FatalError);
         }
@@ -274,6 +274,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No phi" << endl;
     }
+
+    Info<< "End" << nl << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index 2c59611d31..620c4fdb78 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 
     if (nD != 2)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Case is not 2D, stream-function cannot be computed"
             << exit(FatalError);
     }
@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
                         }
                         else
                         {
-                            FatalErrorIn(args.executable())
+                            FatalErrorInFunction
                                 << "Cannot find initialisation face or a cell."
                                 << abort(FatalError);
                         }
@@ -476,7 +476,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            WarningIn(args.executable())
+            WarningInFunction
                 << "Flux field does not exist."
                 << " Stream function not calculated" << endl;
         }
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index fdcd3d7b8d..1d4a46267a 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lsolidThermo \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
index da7585b831..e88cc7b37f 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/createFields.H
@@ -42,6 +42,7 @@ if (isA<fluidThermo>(thermo()))
     const volVectorField& U = UPtr();
 
     #include "compressibleCreatePhi.H"
+
     // Copy phi to autoPtr. Rename to make sure copy is now registered as 'phi'.
     phi.rename("phiFluid");
     phiPtr.reset(new surfaceScalarField("phi", phi));
@@ -54,3 +55,18 @@ if (isA<fluidThermo>(thermo()))
         refCast<const fluidThermo>(thermo())
     );
 }
+
+// Read radiative heat-flux if available
+volScalarField Qr
+(
+    IOobject
+    (
+        "Qr",
+        runTime.timeName(),
+        mesh,
+        IOobject::READ_IF_PRESENT,
+        IOobject::NO_WRITE
+    ),
+    mesh,
+    dimensionedScalar("Qr", dimMass/pow3(dimTime), 0.0)
+);
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
index 8c80f0cf21..d1c37e70cc 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
@@ -70,19 +70,24 @@ int main(int argc, char *argv[])
         const surfaceScalarField::GeometricBoundaryField& patchHeatFlux =
             heatFlux.boundaryField();
 
+        const volScalarField::GeometricBoundaryField& patchRadHeatFlux =
+            Qr.boundaryField();
+
+        const surfaceScalarField::GeometricBoundaryField& magSf =
+            mesh.magSf().boundaryField();
+
         Info<< "\nWall heat fluxes [W]" << endl;
         forAll(patchHeatFlux, patchi)
         {
             if (isA<wallFvPatch>(mesh.boundary()[patchi]))
             {
-                Info<< mesh.boundary()[patchi].name()
-                    << " "
-                    << gSum
-                       (
-                           mesh.magSf().boundaryField()[patchi]
-                          *patchHeatFlux[patchi]
-                       )
-                    << endl;
+                scalar convFlux = gSum(magSf[patchi]*patchHeatFlux[patchi]);
+                scalar radFlux = -gSum(magSf[patchi]*patchRadHeatFlux[patchi]);
+
+                Info<< mesh.boundary()[patchi].name() << endl
+                    << "    convective: " << convFlux << endl
+                    << "    radiative:  " << radFlux << endl
+                    << "    total:      " << convFlux + radFlux << endl;
             }
         }
         Info<< endl;
@@ -105,6 +110,36 @@ int main(int argc, char *argv[])
         }
 
         wallHeatFlux.write();
+
+        // Write the total heat-flux including the radiative contribution
+        // if available
+        if (Qr.headerOk())
+        {
+            volScalarField totalWallHeatFlux
+            (
+                IOobject
+                (
+                    "totalWallHeatFlux",
+                    runTime.timeName(),
+                    mesh
+                ),
+                mesh,
+                dimensionedScalar
+                (
+                    "totalWallHeatFlux",
+                    heatFlux.dimensions(),
+                    0.0
+                )
+            );
+
+            forAll(totalWallHeatFlux.boundaryField(), patchi)
+            {
+                totalWallHeatFlux.boundaryField()[patchi] =
+                    patchHeatFlux[patchi] - patchRadHeatFlux[patchi];
+            }
+
+            totalWallHeatFlux.write();
+        }
     }
 
     Info<< "End" << endl;
@@ -112,4 +147,5 @@ int main(int argc, char *argv[])
     return 0;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 24f457bb65..0128cf8401 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
     -lspecie \
     -lgenericPatchFields \
     -lfiniteVolume \
+    -lfvOptions \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index 958bfdc48c..6f6609c2fd 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -55,7 +55,7 @@ void calcIncompressible
 
     autoPtr<incompressible::RASModel> model
     (
-        incompressible::RASModel::New(U, phi, laminarTransport)
+        incompressible::New<incompressible::RASModel>(U, phi, laminarTransport)
     );
 
     const volSymmTensorField Reff(model->devReff());
@@ -104,7 +104,7 @@ void calcCompressible
 
     autoPtr<compressible::RASModel> model
     (
-        compressible::RASModel::New
+        compressible::New<compressible::RASModel>
         (
             rho,
             U,
diff --git a/applications/utilities/postProcessing/wall/yPlus/Make/options b/applications/utilities/postProcessing/wall/yPlus/Make/options
index d46a9cbb90..bca86c931d 100644
--- a/applications/utilities/postProcessing/wall/yPlus/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlus/Make/options
@@ -18,6 +18,7 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lfiniteVolume \
+    -lfvOptions \
     -lgenericPatchFields \
     -lmeshTools \
     -lsampling
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
index 9778b15c09..9de89cd9ae 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -9,7 +12,10 @@ EXE_INC = \
 EXE_LIBS = \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
+    -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
+    -lcompressibleTransportModels \
     -lgenericPatchFields \
     -lfiniteVolume \
-    -lmeshTools
+    -lmeshTools \
+    -lfvOptions
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 4f2a30fb5f..94c7f53f84 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,12 +33,18 @@ Description
     the thickness coefficient supplied via the option -Cbl.  If both options
     are provided -ybl is used.
 
+    Compressible modes is automatically selected based on the existence of the
+    "thermophysicalProperties" dictionary required to construct the
+    thermodynamics package.
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
 #include "wallDist.H"
+#include "processorFvPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +52,266 @@ Description
 static const scalar Cmu(0.09);
 static const scalar kappa(0.41);
 
+void correctProcessorPatches(volScalarField& vf)
+{
+    if (!Pstream::parRun())
+    {
+        return;
+    }
+
+    // Not possible to use correctBoundaryConditions on fields as they may
+    // use local info as opposed to the constraint values employed here,
+    // but still need to update processor patches
+
+    volScalarField::GeometricBoundaryField& bf = vf.boundaryField();
+
+    forAll(bf, patchI)
+    {
+        if (isA<processorFvPatchField<scalar> >(bf[patchI]))
+        {
+            bf[patchI].initEvaluate();
+        }
+    }
+
+    forAll(bf, patchI)
+    {
+        if (isA<processorFvPatchField<scalar> >(bf[patchI]))
+        {
+            bf[patchI].evaluate();
+        }
+    }
+}
+
+
+template<class TurbulenceModel>
+Foam::tmp<Foam::volScalarField> calcK
+(
+    TurbulenceModel& turbulence,
+    const volScalarField& mask,
+    const volScalarField& nut,
+    const volScalarField& y,
+    const dimensionedScalar& ybl,
+    const scalar Cmu,
+    const scalar kappa
+)
+{
+    // Turbulence k
+    tmp<volScalarField> tk = turbulence->k();
+    volScalarField& k = tk();
+    scalar ck0 = pow025(Cmu)*kappa;
+    k = (1 - mask)*k + mask*sqr(nut/(ck0*min(y, ybl)));
+
+    // Do not correct BC
+    // - operation may use inconsistent fields wrt these local manipulations
+    // k.correctBoundaryConditions();
+    correctProcessorPatches(k);
+
+    Info<< "Writing k\n" << endl;
+    k.write();
+
+    return tk;
+}
+
+
+template<class TurbulenceModel>
+Foam::tmp<Foam::volScalarField> calcEpsilon
+(
+    TurbulenceModel& turbulence,
+    const volScalarField& mask,
+    const volScalarField& k,
+    const volScalarField& y,
+    const dimensionedScalar& ybl,
+    const scalar Cmu,
+    const scalar kappa
+)
+{
+    // Turbulence epsilon
+    tmp<volScalarField> tepsilon = turbulence->epsilon();
+    volScalarField& epsilon = tepsilon();
+    scalar ce0 = ::pow(Cmu, 0.75)/kappa;
+    epsilon = (1 - mask)*epsilon + mask*ce0*k*sqrt(k)/min(y, ybl);
+    epsilon.max(SMALL);
+
+    // Do not correct BC
+    // - operation may use inconsistent fields wrt these local manipulations
+    // epsilon.correctBoundaryConditions();
+    correctProcessorPatches(epsilon);
+
+    Info<< "Writing epsilon\n" << endl;
+    epsilon.write();
+
+    return tepsilon;
+}
+
+
+void calcOmega
+(
+    const fvMesh& mesh,
+    const volScalarField& mask,
+    const volScalarField& k,
+    const volScalarField& epsilon
+)
+{
+    // Turbulence omega
+    IOobject omegaHeader
+    (
+        "omega",
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (omegaHeader.headerOk())
+    {
+        volScalarField omega(omegaHeader, mesh);
+        dimensionedScalar k0("SMALL", k.dimensions(), SMALL);
+
+        omega = (1 - mask)*omega + mask*epsilon/(Cmu*k + k0);
+        omega.max(SMALL);
+
+        // Do not correct BC
+        // - operation may use inconsistent fields wrt these local
+        //   manipulations
+        // omega.correctBoundaryConditions();
+        correctProcessorPatches(omega);
+
+        Info<< "Writing omega\n" << endl;
+        omega.write();
+    }
+}
+
+
+void setField
+(
+    const fvMesh& mesh,
+    const word& fieldName,
+    const volScalarField& value
+)
+{
+    IOobject fldHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (fldHeader.headerOk())
+    {
+        volScalarField fld(fldHeader, mesh);
+        fld = value;
+
+        // Do not correct BC
+        // - operation may use inconsistent fields wrt these local
+        //   manipulations
+        // fld.correctBoundaryConditions();
+        correctProcessorPatches(fld);
+
+        Info<< "Writing " << fieldName << nl << endl;
+        fld.write();
+    }
+}
+
+
+void calcCompressible
+(
+    const fvMesh& mesh,
+    const volScalarField& mask,
+    const volVectorField& U,
+    const volScalarField& y,
+    const dimensionedScalar& ybl
+)
+{
+    const Time& runTime = mesh.time();
+
+    autoPtr<fluidThermo> pThermo(fluidThermo::New(mesh));
+    fluidThermo& thermo = pThermo();
+    volScalarField rho(thermo.rho());
+
+    // Update/re-write phi
+    #include "compressibleCreatePhi.H"
+    phi.write();
+
+    autoPtr<compressible::turbulenceModel> turbulence
+    (
+        compressible::turbulenceModel::New
+        (
+            rho,
+            U,
+            phi,
+            thermo
+        )
+    );
+
+    // Calculate nut - reference nut is calculated by the turbulence model
+    // on its construction
+    tmp<volScalarField> tnut = turbulence->nut();
+
+    volScalarField& nut = tnut();
+    volScalarField S(mag(dev(symm(fvc::grad(U)))));
+    nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
+
+    // Do not correct BC - wall functions will 'undo' manipulation above
+    // by using nut from turbulence model
+    correctProcessorPatches(nut);
+    nut.write();
+
+    tmp<volScalarField> k =
+        calcK(turbulence, mask, nut, y, ybl, Cmu, kappa);
+    tmp<volScalarField> epsilon =
+        calcEpsilon(turbulence, mask, k, y, ybl, Cmu, kappa);
+    calcOmega(mesh, mask, k, epsilon);
+    setField(mesh, "nuTilda", nut);
+}
+
+
+void calcIncompressible
+(
+    const fvMesh& mesh,
+    const volScalarField& mask,
+    const volVectorField& U,
+    const volScalarField& y,
+    const dimensionedScalar& ybl
+)
+{
+    const Time& runTime = mesh.time();
+
+    // Update/re-write phi
+    #include "createPhi.H"
+    phi.write();
+
+    singlePhaseTransportModel laminarTransport(U, phi);
+
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    );
+
+    tmp<volScalarField> tnut = turbulence->nut();
+
+    // Calculate nut - reference nut is calculated by the turbulence model
+    // on its construction
+    volScalarField& nut = tnut();
+    volScalarField S(mag(dev(symm(fvc::grad(U)))));
+    nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
+
+    // Do not correct BC - wall functions will 'undo' manipulation above
+    // by using nut from turbulence model
+    correctProcessorPatches(nut);
+    nut.write();
+
+    tmp<volScalarField> k =
+        calcK(turbulence, mask, nut, y, ybl, Cmu, kappa);
+    tmp<volScalarField> epsilon =
+        calcEpsilon(turbulence, mask, k, y, ybl, Cmu, kappa);
+    calcOmega(mesh, mask, k, epsilon);
+    setField(mesh, "nuTilda", nut);
+}
+
 
 int main(int argc, char *argv[])
 {
@@ -55,6 +321,8 @@ int main(int argc, char *argv[])
         "turbulence fields based on the 1/7th power-law."
     );
 
+    #include "addRegionOption.H"
+
     argList::addOption
     (
         "ybl",
@@ -67,17 +335,12 @@ int main(int argc, char *argv[])
         "scalar",
         "boundary-layer thickness as Cbl * mean distance to wall"
     );
-    argList::addBoolOption
-    (
-        "writenut",
-        "write nut field"
-    );
 
     #include "setRootCase.H"
 
     if (!args.optionFound("ybl") && !args.optionFound("Cbl"))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Neither option 'ybl' or 'Cbl' have been provided to calculate "
             << "the boundary-layer thickness.\n"
             << "Please choose either 'ybl' OR 'Cbl'."
@@ -85,7 +348,7 @@ int main(int argc, char *argv[])
     }
     else if (args.optionFound("ybl") && args.optionFound("Cbl"))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Both 'ybl' and 'Cbl' have been provided to calculate "
             << "the boundary-layer thickness.\n"
             << "Please choose either 'ybl' OR 'Cbl'."
@@ -93,7 +356,7 @@ int main(int argc, char *argv[])
     }
 
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -117,113 +380,24 @@ int main(int argc, char *argv[])
     Info<< "Writing U\n" << endl;
     U.write();
 
-    // Update/re-write phi
-    #include "createPhi.H"
-    phi.write();
 
-    singlePhaseTransportModel laminarTransport(U, phi);
-
-    autoPtr<incompressible::turbulenceModel> turbulence
+    if
     (
-        incompressible::turbulenceModel::New(U, phi, laminarTransport)
-    );
-
-    if (isA<incompressible::RASModel>(turbulence()))
+        IOobject
+        (
+            basicThermo::dictName,
+            runTime.constant(),
+            mesh
+        ).headerOk()
+    )
     {
-        // Calculate nut - reference nut is calculated by the turbulence model
-        // on its construction
-        tmp<volScalarField> tnut = turbulence->nut();
-        volScalarField& nut = tnut();
-        volScalarField S(mag(dev(symm(fvc::grad(U)))));
-        nut = (1 - mask)*nut + mask*sqr(kappa*min(y, ybl))*::sqrt(2)*S;
-
-        // do not correct BC - wall functions will 'undo' manipulation above
-        // by using nut from turbulence model
-
-        if (args.optionFound("writenut"))
-        {
-            Info<< "Writing nut" << endl;
-            nut.write();
-        }
-
-
-        //--- Read and modify turbulence fields
-
-        // Turbulence k
-        tmp<volScalarField> tk = turbulence->k();
-        volScalarField& k = tk();
-        scalar ck0 = pow025(Cmu)*kappa;
-        k = (1 - mask)*k + mask*sqr(nut/(ck0*min(y, ybl)));
-
-        // do not correct BC - operation may use inconsistent fields wrt these
-        // local manipulations
-        // k.correctBoundaryConditions();
-
-        Info<< "Writing k\n" << endl;
-        k.write();
-
-
-        // Turbulence epsilon
-        tmp<volScalarField> tepsilon = turbulence->epsilon();
-        volScalarField& epsilon = tepsilon();
-        scalar ce0 = ::pow(Cmu, 0.75)/kappa;
-        epsilon = (1 - mask)*epsilon + mask*ce0*k*sqrt(k)/min(y, ybl);
-
-        // do not correct BC - wall functions will use non-updated k from
-        // turbulence model
-        // epsilon.correctBoundaryConditions();
-
-        Info<< "Writing epsilon\n" << endl;
-        epsilon.write();
-
-        // Turbulence omega
-        IOobject omegaHeader
-        (
-            "omega",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        if (omegaHeader.headerOk())
-        {
-            volScalarField omega(omegaHeader, mesh);
-            dimensionedScalar k0("VSMALL", k.dimensions(), VSMALL);
-            omega = (1 - mask)*omega + mask*epsilon/(Cmu*k + k0);
-
-            // do not correct BC - wall functions will use non-updated k from
-            // turbulence model
-            // omega.correctBoundaryConditions();
-
-            Info<< "Writing omega\n" << endl;
-            omega.write();
-        }
-
-        // Turbulence nuTilda
-        IOobject nuTildaHeader
-        (
-            "nuTilda",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        if (nuTildaHeader.headerOk())
-        {
-            volScalarField nuTilda(nuTildaHeader, mesh);
-            nuTilda = nut;
-
-            // do not correct BC
-            // nuTilda.correctBoundaryConditions();
-
-            Info<< "Writing nuTilda\n" << endl;
-            nuTilda.write();
-        }
+        calcCompressible(mesh, mask, U, y, ybl);
     }
+    else
+    {
+        calcIncompressible(mesh, mask, U, y, ybl);
+    }
+
 
     Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
         << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 55a35322ab..4ed0356e1c 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
         runTime.graphFormat()
     );
 
-    Info<< "end" << endl;
+    Info<< "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index a6b18b6114..8f8bdcbaba 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -420,7 +420,7 @@ int main(int argc, char *argv[])
     instantList times = timeSelector::selectIfPresent(runTime, args);
     if (times.size() < 1)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "No times selected." << exit(FatalError);
     }
     runTime.setTime(times[0], 0);
@@ -612,41 +612,51 @@ int main(int argc, char *argv[])
         }
         else
         {
-            // Read dictionary. (disable class type checking so we can load
-            // field)
+            // Read dictionary
+            // Note: disable class type checking so we can load field
             Info<< "Loading dictionary " << fieldName << endl;
             const word oldTypeName = IOdictionary::typeName;
             const_cast<word&>(IOdictionary::typeName) = word::null;
 
-            IOdictionary fieldDict
+            IOobject fieldHeader
             (
-                IOobject
-                (
-                    fieldName,
-                    instance,
-                    mesh,
-                    IOobject::MUST_READ_IF_MODIFIED,
-                    IOobject::NO_WRITE,
-                    false
-                )
+                fieldName,
+                instance,
+                mesh,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE,
+                false
             );
 
-            const_cast<word&>(IOdictionary::typeName) = oldTypeName;
-            // Fake type back to what was in field
-            const_cast<word&>(fieldDict.type()) = fieldDict.headerClassName();
+            if (fieldHeader.headerOk())
+            {
+                IOdictionary fieldDict(fieldHeader);
 
-            Info<< "Loaded dictionary " << fieldName
-                << " with entries " << fieldDict.toc() << endl;
+                const_cast<word&>(IOdictionary::typeName) = oldTypeName;
 
-            // Get the replacement dictionary for the field
-            const dictionary& replaceDict = fieldIter().dict();
-            Info<< "Merging entries from " << replaceDict.toc() << endl;
+                // Fake type back to what was in field
+                const_cast<word&>(fieldDict.type()) =
+                    fieldDict.headerClassName();
 
-            // Merge the replacements in
-            merge(fieldDict, replaceDict, literalRE, patchGroups);
+                Info<< "Loaded dictionary " << fieldName
+                    << " with entries " << fieldDict.toc() << endl;
 
-            Info<< "Writing modified fieldDict " << fieldName << endl;
-            fieldDict.regIOobject::write();
+                // Get the replacement dictionary for the field
+                const dictionary& replaceDict = fieldIter().dict();
+                Info<< "Merging entries from " << replaceDict.toc() << endl;
+
+                // Merge the replacements in
+                merge(fieldDict, replaceDict, literalRE, patchGroups);
+
+                Info<< "Writing modified fieldDict " << fieldName << endl;
+                fieldDict.regIOobject::write();
+            }
+            else
+            {
+                WarningInFunction
+                    << "Requested field to change " << fieldName
+                    << " does not exist in " << fieldHeader.path() << endl;
+            }
         }
     }
 
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
index 34a2be07d2..d3e8eca858 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
index 518432cbd9..0d74d0b44c 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
@@ -1,9 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/postProcessing/functionObjects/jobControl/lnInclude
 
 EXE_LIBS = \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
     -lfiniteVolume \
-    -lmeshTools
+    -ljobControl
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/addRegionsOption.H b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/addRegionsOption.H
new file mode 100644
index 0000000000..9f57e35a40
--- /dev/null
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/addRegionsOption.H
@@ -0,0 +1,10 @@
+//
+// addRegionOption.H
+// ~~~~~~~~~~~~~~~~~
+
+    Foam::argList::addOption
+    (
+        "regions",
+        "(name1 .. nameN)",
+        "specify alternative mesh regions"
+    );
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index 3b9ed64abb..6a8b78c683 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,24 @@ Application
 
 Description
     Application to generate the patch geometry (points and faces) for use
-    with the externalCoupled boundary condition.
+    with the externalCoupled functionObject.
 
-    Usage:
+Usage
+    - createExternalCoupledPatchGeometry \<patchGroup\> [OPTION]
 
-        createExternalCoupledPatchGeometry \<fieldName\>
+    \param -commsDir \<commsDir\> \n
+    Specify an alternative communications directory (default is comms
+    in the case directory)
 
-    On execution, the field \<fieldName\> is read, and its boundary conditions
-    interrogated for the presence of an \c externalCoupled type.  If found,
-    the patch geometry (points and faces) for the coupled patches are output
+    \param -region \<name\> \n
+    Specify an alternative mesh region.
+
+    \param -regions (\<name1\> \<name2\> .. \<namen\>) \n
+    Specify alternative mesh regions. The region names will be sorted
+    alphabetically and a single composite name will be created
+        \<nameX\>_\<nameY\>.._\<nameZ\>
+
+    On execution, the combined patch geometry (points and faces) are output
     to the communications directory.
 
 Note:
@@ -42,12 +51,12 @@ Note:
     used for face addressing starts at index 0.
 
 SeeAlso
-    externalCoupledMixedFvPatchField
+    externalCoupledFunctionObject
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "createExternalCoupledPatchGeometryTemplates.H"
+#include "externalCoupledFunctionObject.H"
 #include "IOobjectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,29 +64,63 @@ SeeAlso
 int main(int argc, char *argv[])
 {
     #include "addRegionOption.H"
-    argList::validArgs.append("fieldName");
+    #include "addRegionsOption.H"
+    argList::validArgs.append("patchGroup");
+    argList::addOption
+    (
+        "commsDir",
+        "dir",
+        "specify alternate communications directory. default is 'comms'"
+    );
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createNamedMesh.H"
 
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    const word fieldName = args[1];
-
-    IOobjectList objects(IOobjectList(mesh, mesh.time().timeName()));
-
-    label processed = -1;
-    processField<scalar>(mesh, objects, fieldName, processed);
-    processField<vector>(mesh, objects, fieldName, processed);
-    processField<sphericalTensor>(mesh, objects, fieldName, processed);
-    processField<symmTensor>(mesh, objects, fieldName, processed);
-    processField<tensor>(mesh, objects, fieldName, processed);
-
-    if (processed == -1)
+    wordList regionNames(1, fvMesh::defaultRegion);
+    if (!args.optionReadIfPresent("region", regionNames[0]))
     {
-        Info<< "Field " << fieldName << " not found" << endl;
+        args.optionReadIfPresent("regions", regionNames);
     }
 
+    const wordRe patchGroup(args.argRead<wordRe>(1));
+
+    fileName commsDir(runTime.path()/"comms");
+    args.optionReadIfPresent("commsDir", commsDir);
+
+
+    // Make sure region names are in canonical order
+    stableSort(regionNames);
+
+
+    PtrList<const fvMesh> meshes(regionNames.size());
+    forAll(regionNames, i)
+    {
+        Info<< "Create mesh " << regionNames[i] << " for time = "
+            << runTime.timeName() << nl << endl;
+
+        meshes.set
+        (
+            i,
+            new fvMesh
+            (
+                Foam::IOobject
+                (
+                    regionNames[i],
+                    runTime.timeName(),
+                    runTime,
+                    Foam::IOobject::MUST_READ
+                )
+            )
+        );
+    }
+
+
+    externalCoupledFunctionObject::writeGeometry
+    (
+        UPtrList<const fvMesh>(meshes),
+        commsDir,
+        patchGroup
+    );
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
deleted file mode 100644
index c5d842237e..0000000000
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
+++ /dev/null
@@ -1,90 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "createExternalCoupledPatchGeometryTemplates.H"
-#include "externalCoupledMixedFvPatchField.H"
-#include "IOobjectList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-void processField
-(
-    const fvMesh& mesh,
-    const IOobjectList& objects,
-    const word& fieldName,
-    label& processed
-)
-{
-    if (processed != -1)
-    {
-        return;
-    }
-
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
-
-    const word timeName(mesh.time().timeName());
-
-    IOobjectList fieldObjbjects(objects.lookupClass(fieldType::typeName));
-
-    if (fieldObjbjects.lookup(fieldName) != NULL)
-    {
-        fieldType vtf(*fieldObjbjects.lookup(fieldName), mesh);
-        const typename fieldType::GeometricBoundaryField& bf =
-            vtf.boundaryField();
-
-        forAll(bf, patchI)
-        {
-            if (isA<externalCoupledMixedFvPatchField<Type> >(bf[patchI]))
-            {
-                Info<< "Generating external coupled geometry for field "
-                    << fieldName << endl;
-
-                const externalCoupledMixedFvPatchField<Type>& pf =
-                    refCast<const externalCoupledMixedFvPatchField<Type> >
-                    (
-                        bf[patchI]
-                    );
-
-                pf.writeGeometry();
-                processed = 1;
-
-                break;
-            }
-        }
-
-        if (processed != 1)
-        {
-            processed = 0;
-
-            Info<< "Field " << fieldName << " found, but does not have any "
-                << externalCoupledMixedFvPatchField<Type>::typeName
-                << " boundary conditions" << endl;
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/Make/files b/applications/utilities/preProcessing/createZeroDirectory/Make/files
new file mode 100644
index 0000000000..379802af21
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/Make/files
@@ -0,0 +1,7 @@
+boundaryInfo.C
+boundaryTemplates.C
+caseInfo.C
+solverTemplate.C
+createZeroDirectory.C
+
+EXE = $(FOAM_APPBIN)/createZeroDirectory
diff --git a/applications/utilities/preProcessing/createZeroDirectory/Make/options b/applications/utilities/preProcessing/createZeroDirectory/Make/options
new file mode 100644
index 0000000000..b6e5516b59
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/Make/options
@@ -0,0 +1,11 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/regionModels/regionModel/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume \
+    -ldynamicMesh \
+    -lmeshTools \
+    -lregionModels
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
new file mode 100644
index 0000000000..6dd055b6a3
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "boundaryInfo.H"
+#include "Time.H"
+#include "polyMesh.H"
+#include "processorPolyPatch.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebug(IOPtrList<entry>, 0);
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::IOPtrList<Foam::entry> Foam::boundaryInfo::readBoundaryDict
+(
+    const Time& runTime,
+    const word& regionName
+) const
+{
+    Info<< "    Reading mesh boundaries" << endl;
+
+    const_cast<word&>(IOPtrList<entry>::typeName) = polyBoundaryMesh::typeName;
+    IOPtrList<entry> boundaryPatchList
+    (
+        IOobject
+        (
+            "boundary",
+            runTime.findInstance(regionName/polyMesh::meshSubDir, "boundary"),
+            regionName/polyMesh::meshSubDir,
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    // remove zero-sized patches
+    PtrList<entry> boundaryPatchListNew;
+    forAll(boundaryPatchList, patchI)
+    {
+        const dictionary& dict = boundaryPatchList[patchI].dict();
+        const word pType = dict.lookup("type");
+        bool procPatch = pType == processorPolyPatch::typeName;
+
+        bool addPatch = true;
+        if (!procPatch)
+        {
+            label nFaces = readLabel(dict.lookup("nFaces"));
+            reduce(nFaces, sumOp<label>());
+            if (nFaces == 0)
+            {
+                addPatch = false;
+            }
+        }
+
+        if (addPatch)
+        {
+            boundaryPatchListNew.append(boundaryPatchList[patchI].clone());
+        }
+    }
+
+    boundaryPatchList.transfer(boundaryPatchListNew);
+
+    return boundaryPatchList;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::boundaryInfo::boundaryInfo(const Time& runTime, const word& regionName)
+:
+    boundaryDict_(readBoundaryDict(runTime, regionName)),
+    names_(),
+    types_(),
+    constraint_(),
+    groups_(),
+    allGroupNames_()
+{
+    names_.setSize(boundaryDict_.size());
+    types_.setSize(boundaryDict_.size());
+    constraint_.setSize(boundaryDict_.size(), false);
+    groups_.setSize(boundaryDict_.size());
+
+    forAll(boundaryDict_, patchI)
+    {
+        const dictionary& dict = boundaryDict_[patchI].dict();
+
+        names_[patchI] = dict.dictName();
+        dict.lookup("type") >> types_[patchI];
+        if (polyPatch::constraintType(types_[patchI]))
+        {
+            constraint_[patchI] = true;
+        }
+
+        if (dict.found("inGroups"))
+        {
+            dict.lookup("inGroups") >> groups_[patchI];
+            allGroupNames_.insert(groups_[patchI]);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::wordList& Foam::boundaryInfo::names() const
+{
+    return names_;
+}
+
+
+const Foam::wordList& Foam::boundaryInfo::types() const
+{
+    return types_;
+}
+
+
+const Foam::boolList& Foam::boundaryInfo::constraint() const
+{
+    return constraint_;
+}
+
+
+const Foam::List<Foam::wordList>& Foam::boundaryInfo::groups() const
+{
+    return groups_;
+}
+
+
+const Foam::wordHashSet& Foam::boundaryInfo::allGroupNames() const
+{
+    return allGroupNames_;
+}
+
+
+void Foam::boundaryInfo::setType(const label patchI, const word& condition)
+{
+    if (constraint_[patchI])
+    {
+        // not overriding constraint types
+        return;
+    }
+
+    if (wordRe(".*[mM]apped.*", wordRe::DETECT).match(types_[patchI]))
+    {
+        // ugly hack to avoid overriding mapped types
+        return;
+    }
+
+    if (condition == "wall")
+    {
+        types_[patchI] = condition;
+    }
+    else
+    {
+        types_[patchI] = "patch";
+    }
+
+    dictionary& patchDict = boundaryDict_[patchI].dict();
+    patchDict.add("type", types_[patchI], true);
+}
+
+
+void Foam::boundaryInfo::write() const
+{
+    boundaryDict_.write();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.H b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.H
new file mode 100644
index 0000000000..27911e90a6
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::boundaryInfo
+
+Description
+    Class to interrogate the polyMesh/boundary file to provide mesh patching
+    information, without the need to read the mesh.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef boundaryInfo_H
+#define boundaryInfo_H
+
+#include "boolList.H"
+#include "wordList.H"
+#include "HashSet.H"
+#include "IOPtrList.H"
+#include "entry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Time;
+
+/*---------------------------------------------------------------------------*\
+                        Class boundaryInfo Declaration
+\*---------------------------------------------------------------------------*/
+
+class boundaryInfo
+{
+    // Private data
+
+        //- Boundary dictionary
+        IOPtrList<entry> boundaryDict_;
+
+        //- Patch names
+        wordList names_;
+
+        //- Patch types
+        wordList types_;
+
+        //- Constraint flag
+        boolList constraint_;
+
+        //- Groups per patch
+        List<wordList> groups_;
+
+        //- Set of all group names
+        wordHashSet allGroupNames_;
+
+
+    // Private member functions
+
+        //- Read the boundary dict
+        IOPtrList<entry> readBoundaryDict
+        (
+            const Time& runTime,
+            const word& regionName
+        ) const;
+
+
+public:
+
+    //- Constructor
+    boundaryInfo(const Time& runTime, const word& regionName);
+
+
+    // Public member functions
+
+        //- Patch names
+        const wordList& names() const;
+
+        //- Patch types
+        const wordList& types() const;
+
+        //- Constraint flag
+        const boolList& constraint() const;
+
+        //- Groups
+        const List<wordList>& groups() const;
+
+        //- Set of all group names
+        const wordHashSet& allGroupNames() const;
+
+        //- Set the patch type based on the condition
+        void setType(const label patchI, const word& condition);
+
+        //- Write the boundary dictionary
+        void write() const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.C b/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.C
new file mode 100644
index 0000000000..193334e37d
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.C
@@ -0,0 +1,381 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "boundaryTemplates.H"
+#include "Time.H"
+#include "IFstream.H"
+#include "OStringStream.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::boundaryTemplates::boundaryTemplates
+(
+    const fileName& baseDir,
+    const Time& runTime,
+    const word& solverType
+)
+:
+    templates_(dictionary::null),
+    options_(dictionary::null)
+{
+    Info<< "    Reading boundary templates" << endl;
+
+    fileName BCDir(baseDir/"boundaryConditions");
+
+    IOdictionary regionBCs
+    (
+        IOobject
+        (
+            fileName(BCDir/"boundaries"),
+            runTime,
+            IOobject::MUST_READ
+        )
+    );
+
+    forAllConstIter(dictionary, regionBCs, iter)
+    {
+        const word& regionType = iter().keyword();
+        wordList patchTypes(regionBCs.lookup(regionType));
+
+        dictionary regionTemplate = dictionary::null;
+        dictionary regionOptions = dictionary::null;
+
+        // read general boundary types
+        forAll(patchTypes, i)
+        {
+            IOdictionary dict
+            (
+                IOobject
+                (
+                    fileName(BCDir/regionType/patchTypes[i]),
+                    runTime,
+                    IOobject::MUST_READ
+                )
+            );
+
+            regionTemplate.add(patchTypes[i], dictionary(dict));
+        }
+
+        // add solver type boundary types
+        forAll(patchTypes, i)
+        {
+            IOobject io
+            (
+                fileName(BCDir/regionType/solverType/patchTypes[i]),
+                runTime,
+                IOobject::MUST_READ
+            );
+
+            if (io.headerOk())
+            {
+                IOdictionary dict(io);
+                regionTemplate.subDict(patchTypes[i]).merge(dict);
+            }
+        }
+
+        // read general boundary options
+        forAll(patchTypes, i)
+        {
+            fileName optFile(BCDir/regionType/patchTypes[i] + "Options");
+
+            IFstream is(optFile);
+
+            if (is.good())
+            {
+                IOdictionary dict
+                (
+                    IOobject
+                    (
+                        optFile,
+                        runTime,
+                        IOobject::MUST_READ
+                    )
+                );
+
+                regionOptions.add(patchTypes[i], dictionary(dict));
+            }
+        }
+
+        // add solver type boundary options
+        forAll(patchTypes, i)
+        {
+            // options are optional - however, if file exists, assume that it
+            // is to be read
+            fileName optFile
+            (
+                BCDir/regionType/solverType/patchTypes[i] + "Options"
+            );
+
+            IFstream is(optFile);
+
+            if (is.good())
+            {
+                IOdictionary dict
+                (
+                    IOobject
+                    (
+                        optFile,
+                        runTime,
+                        IOobject::MUST_READ
+                    )
+                );
+
+                regionOptions.subDict(patchTypes[i]).merge(dict);
+            }
+        }
+
+        templates_.add(regionType, regionTemplate);
+        options_.add(regionType, regionOptions);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::dictionary& Foam::boundaryTemplates::templates() const
+{
+    return templates_;
+}
+
+
+Foam::dictionary Foam::boundaryTemplates::generatePatchDict
+(
+    const word& regionPrefix,
+    const word& fieldName,
+    const word& condition,
+    const word& category,
+    const word& patchType,
+    const dictionary& conditionOptions
+) const
+{
+    const dictionary& regionTemplates = templates_.subDict(regionPrefix);
+
+    // look for inlet, outlet, wall etc
+    if (regionTemplates.found(category))
+    {
+        const dictionary& categoryDict(regionTemplates.subDict(category));
+
+        // look for subSonic, slip etc
+        if (categoryDict.found(patchType))
+        {
+            dictionary patchDict = categoryDict.subDict(patchType);
+
+            // add any options
+            if (patchDict.found("OPTIONS"))
+            {
+                const dictionary& regionOptions =
+                    options_.subDict(regionPrefix);
+
+                if (!regionOptions.found(category))
+                {
+                    FatalErrorInFunction
+                        << "No options available for category "
+                        << category << exit(FatalError);
+                }
+
+                const dictionary& dict = regionOptions.subDict(category);
+
+                const wordList requiredOptions(patchDict.lookup("OPTIONS"));
+
+                forAll(requiredOptions, i)
+                {
+                    const word& option = requiredOptions[i];
+
+                    word selected;
+                    if (!conditionOptions.readIfPresent(option, selected))
+                    {
+                        FatalErrorInFunction
+                            << "Condition " << condition << ": "
+                            << "No option '" << option
+                            << "' available for category '" << category
+                            << "' and patch type '" << patchType
+                            << "'.  Valid options are: "
+                            << conditionOptions.toc()
+                            << exit(FatalError);
+                    }
+
+                    if (!dict.found(option))
+                    {
+                        FatalErrorInFunction
+                            << "Condition " << condition << ": "
+                            << "No option '" << option
+                            << "' available for category '" << category
+                            << "' and patch type '" << patchType
+                            << "'.  Valid options are " << dict.toc()
+                            << exit(FatalError);
+                    }
+
+                    const dictionary& optionDict = dict.subDict(option);
+
+                    if (!optionDict.found(selected))
+                    {
+                        FatalErrorInFunction
+                            << "Condition " << condition << ": "
+                            << "No option '" << selected
+                            << "' available for category '" << category
+                            << "' and patch type '" << patchType
+                            << "'.  Valid options are " << optionDict.toc()
+                            << exit(FatalError);
+                    }
+
+                    const dictionary& dict = optionDict.subDict(selected);
+
+                    patchDict.merge(dict);
+                }
+            }
+
+            // look for field name
+            if (patchDict.found(fieldName))
+            {
+                dictionary dict(dictionary::null);
+                const dictionary& fieldDict(patchDict.subDict(fieldName));
+
+                forAllConstIter(IDLList<entry>, fieldDict, iter)
+                {
+                    OStringStream oss;
+                    oss << iter();
+                    string s(oss.str());
+                    s.replace(iter().keyword(), "");
+                    s.replace
+                    (
+                        "VALUE",
+                        "boundaryConditions." + condition + ".values"
+                    );
+                    dict.add(iter().keyword(), s.c_str());
+                }
+
+                return dict;
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Condition " << condition << ": "
+                    << "No '" << patchType
+                    << "' condition found for field '" << fieldName
+                    << "' in category type '" << category << "'"
+                    << exit(FatalError);
+            }
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Condition " << condition << ": "
+                << "No '" << patchType << "' boundary types defined in "
+                << categoryDict.dictName() << " templates.  "
+                << "Available types are: " << categoryDict.toc()
+                << exit(FatalError);
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Condition " << condition << ": "
+            << "Invalid boundary condition type '" << patchType
+            << "'.  Valid types are:" << regionTemplates.toc()
+            << exit(FatalError);
+    }
+
+    return dictionary::null;
+}
+
+
+void Foam::boundaryTemplates::checkPatch
+(
+    const word& regionPrefix,
+    const word& condition,
+    const word& category,
+    const word& patchType
+) const
+{
+    const dictionary& regionTemplates = templates_.subDict(regionPrefix);
+
+    if (!regionTemplates.found(category))
+    {
+        FatalErrorInFunction
+            << "Condition " << condition << ": "
+            << "Unknown category '" << category
+            << "'.  Valid categories are: " << regionTemplates.toc()
+            << exit(FatalError);
+    }
+
+    const dictionary& categoryDict = regionTemplates.subDict(category);
+
+    if (!categoryDict.found(patchType))
+    {
+        FatalErrorInFunction
+            << "Condition " << condition << ": "
+            << "Unknown type '" << patchType << "' in category '"
+            << category << "'.  Valid types are: " << categoryDict.toc()
+            << exit(FatalError);
+    }
+}
+
+
+bool Foam::boundaryTemplates::optionsRequired
+(
+    const word& regionPrefix,
+    const word& category,
+    const word& patchType
+) const
+{
+    const dictionary& regionTemplates = templates_.subDict(regionPrefix);
+
+    if (regionTemplates.found(category))
+    {
+        const dictionary& categoryDict(regionTemplates.subDict(category));
+
+        if (categoryDict.found(patchType))
+        {
+            const dictionary& patchDict = categoryDict.subDict(patchType);
+
+            if (patchDict.found("OPTIONS"))
+            {
+                return true;
+            }
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "No type '" << patchType << "' found in category '"
+                << category << "'.  Valid types are "
+                << categoryDict.toc()
+                << exit(FatalError);
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "No category '" << category << "' found in templates.  "
+            << "Valid categories are " << templates_.toc()
+            << exit(FatalError);
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.H b/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.H
new file mode 100644
index 0000000000..c8598de17a
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.H
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::boundaryTemplates
+
+Description
+    Class to store boundary template specifications
+
+    Templates are typically stored centrally, and constructed in a hierarchical
+    manner.  The main use is to convert the (user) specified conditions into
+    a form which can be inserted into each field file as dictionary entries.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef boundaryTemplates_H
+#define boundaryTemplates_H
+
+#include "dictionary.H"
+#include "wordList.H"
+#include "wordReList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Time;
+
+/*---------------------------------------------------------------------------*\
+                      Class boundaryTemplates Declaration
+\*---------------------------------------------------------------------------*/
+
+class boundaryTemplates
+{
+    // Private data
+
+        //- Dictionary of boundary templates
+        dictionary templates_;
+
+        //- Dictionary of boundary template options
+        dictionary options_;
+
+
+public:
+
+    //- Constructor
+    boundaryTemplates
+    (
+        const fileName& baseDir,
+        const Time& runTime,
+        const word& solverType
+    );
+
+
+    // Public member functions
+
+        //- Return the dictionary of boundary templates
+        const dictionary& templates() const;
+
+        //- Generate a dictionary representation of patch boundary condition
+        dictionary generatePatchDict
+        (
+            const word& regionPrefix,
+            const word& fieldName,
+            const word& condition,
+            const word& category,
+            const word& patchType,
+            const dictionary& conditionOptions
+        ) const;
+
+        //- Check that user supplied patch info is valid
+        void checkPatch
+        (
+            const word& regionPrefix,
+            const word& condition,
+            const word& category,
+            const word& patchType
+        ) const;
+
+        //- Return true if condition requires additional user options
+        bool optionsRequired
+        (
+            const word& regionPrefix,
+            const word& category,
+            const word& patchType
+        ) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/caseInfo.C b/applications/utilities/preProcessing/createZeroDirectory/caseInfo.C
new file mode 100644
index 0000000000..d48b7c2da5
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/caseInfo.C
@@ -0,0 +1,256 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "caseInfo.H"
+#include "Time.H"
+#include "boundaryInfo.H"
+#include "boundaryTemplates.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::caseInfo::findPatchConditionID
+(
+    const label patchI,
+    const word& patchName
+) const
+{
+    const wordList& patchGroups = boundaryInfo_.groups()[patchI];
+
+    // Assign condition according to last condition applied, wins
+    forAllReverse(conditionNames_, conditionI)
+    {
+        const wordReList& patchNames = patchNames_[conditionI];
+
+        forAll(patchNames, nameI)
+        {
+            if (patchNames[nameI] == patchName)
+            {
+                // Check for explicit match
+                return conditionI;
+            }
+            else if (patchNames[nameI].match(patchName))
+            {
+                // Check wildcards
+                return conditionI;
+            }
+            else
+            {
+                // Check for group match
+                forAll(patchGroups, groupI)
+                {
+                    if (patchNames[nameI] == patchGroups[groupI])
+                    {
+                        return conditionI;
+                    }
+                }
+            }
+        }
+    }
+
+    FatalErrorInFunction
+        << "Boundary patch " << patchName << " not defined"
+        << exit(FatalError);
+
+    return -1;
+}
+
+
+void Foam::caseInfo::updateGeometricBoundaryField()
+{
+    forAll(boundaryInfo_.names(), i)
+    {
+        const word& patchName = boundaryInfo_.names()[i];
+
+        if (!boundaryInfo_.constraint()[i])
+        {
+            // Condition ID to apply to mesh boundary patch name
+            const label conditionI = findPatchConditionID(i, patchName);
+
+            const word& category = patchCategories_[conditionI];
+
+            boundaryInfo_.setType(i, category);
+        }
+    }
+
+    boundaryInfo_.write();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::caseInfo::caseInfo(const Time& runTime, const word& regionName)
+:
+    properties_
+    (
+        IOobject
+        (
+            "caseProperties",
+            runTime.system(),
+            regionName,
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    boundaryInfo_(runTime, regionName),
+    bcDict_(properties_.subDict("boundaryConditions")),
+    conditionNames_(bcDict_.toc()),
+    patchNames_(conditionNames_.size()),
+    patchCategories_(conditionNames_.size()),
+    patchTypes_(conditionNames_.size())
+{
+    // Read the (user-supplied) boundary condition information
+    Info<< "    Reading case properties" << endl;
+
+    forAll(conditionNames_, i)
+    {
+        const dictionary& dict = bcDict_.subDict(conditionNames_[i]);
+        dict.lookup("category") >> patchCategories_[i];
+        dict.lookup("type") >> patchTypes_[i];
+        dict.lookup("patches") >> patchNames_[i];
+    }
+
+    updateGeometricBoundaryField();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::caseInfo::checkPatches
+(
+    const word& regionPrefix,
+    const boundaryTemplates& bcTemplates
+) const
+{
+    // Check that all conditions have been specified correctly wrt templates
+    forAll(conditionNames_, i)
+    {
+        bcTemplates.checkPatch
+        (
+            regionPrefix,
+            conditionNames_[i],
+            patchCategories_[i],
+            patchTypes_[i]
+        );
+    }
+}
+
+
+const Foam::List<Foam::wordReList>& Foam::caseInfo::patchNames() const
+{
+    return patchNames_;
+}
+
+
+const Foam::word& Foam::caseInfo::conditionName(const label patchI) const
+{
+    return conditionNames_[patchI];
+}
+
+
+const Foam::word& Foam::caseInfo::patchCategory(const label patchI) const
+{
+    return patchCategories_[patchI];
+}
+
+
+const Foam::word& Foam::caseInfo::patchType(const label patchI) const
+{
+    return patchTypes_[patchI];
+}
+
+
+Foam::dictionary Foam::caseInfo::generateBoundaryField
+(
+    const word& regionPrefix,
+    const word& fieldName,
+    const boundaryTemplates& bcTemplates
+) const
+{
+    dictionary boundaryField = dictionary::null;
+
+    forAll(boundaryInfo_.names(), j)
+    {
+        const word& patchName = boundaryInfo_.names()[j];
+
+        if (boundaryInfo_.constraint()[j])
+        {
+            dictionary patchDict = dictionary::null;
+            patchDict.add("type", boundaryInfo_.types()[j]);
+
+            // Add value for processor patches
+            patchDict.add("value", "${:internalField}");
+            boundaryField.add(patchName.c_str(), patchDict);
+        }
+        else
+        {
+            // Condition ID to apply to mesh boundary patch name
+            const label conditionI = findPatchConditionID(j, patchName);
+
+            if (conditionI == -1)
+            {
+                FatalErrorInFunction
+                    << "Unable to find patch " << patchName
+                    << " in list of boundary conditions"
+                    << exit(FatalError);
+            }
+
+            const word& condition = conditionNames_[conditionI];
+
+            const word& category = patchCategories_[conditionI];
+
+            const word& patchType = patchTypes_[conditionI];
+
+            dictionary optionDict = dictionary::null;
+            if (bcTemplates.optionsRequired(regionPrefix, category, patchType))
+            {
+                optionDict = bcDict_.subDict(condition).subDict("options");
+            }
+
+            // Create the patch dictionary entry
+            dictionary patchDict
+            (
+                bcTemplates.generatePatchDict
+                (
+                    regionPrefix,
+                    fieldName,
+                    condition,
+                    category,
+                    patchType,
+                    optionDict
+                )
+            );
+
+            boundaryField.add(patchName.c_str(), patchDict);
+        }
+    }
+
+    return boundaryField;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/caseInfo.H b/applications/utilities/preProcessing/createZeroDirectory/caseInfo.H
new file mode 100644
index 0000000000..dc1a0c45bc
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/caseInfo.H
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::caseInfo
+
+Description
+    Class to hold information related to the simaulation case.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef caseInfo_H
+#define caseInfo_H
+
+#include "boolList.H"
+#include "labelList.H"
+#include "wordList.H"
+#include "HashSet.H"
+#include "wordReList.H"
+#include "IOdictionary.H"
+#include "boundaryInfo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Time;
+class boundaryTemplates;
+
+/*---------------------------------------------------------------------------*\
+                          Class caseInfo Declaration
+\*---------------------------------------------------------------------------*/
+
+class caseInfo
+{
+    // Private data
+
+        //- Properties dictionary
+        IOdictionary properties_;
+
+        //- Mesh boundary information (read from mesh boundary file)
+        boundaryInfo boundaryInfo_;
+
+        //- Boundary conditions dictionary
+        const dictionary& bcDict_;
+
+        //- List of condition names
+        wordList conditionNames_;
+
+
+        // Per-condition information
+
+            //- List of patch names
+            List<wordReList> patchNames_;
+
+            //- Patch category
+            wordList patchCategories_;
+
+            //- Patch type
+            wordList patchTypes_;
+
+
+    // Private member functions
+
+        //- Update the polyMesh boundary based on the patch categories
+        void updateGeometricBoundaryField();
+
+
+public:
+
+    //- Constructor
+    caseInfo(const Time& runTime, const word& regionName);
+
+
+    // Public member functions
+
+        //- Check patches
+        void checkPatches
+        (
+            const word& regionPrefix,
+            const boundaryTemplates& bcTemplates
+        ) const;
+
+        //- Return the list of patch names
+        const List<wordReList>& patchNames() const;
+
+        //- Return the condition name for patch with index patchI
+        const word& conditionName(const label patchI) const;
+
+        //- Return the category name for patch with index patchI
+        const word& patchCategory(const label patchI) const;
+
+        //- Return the type name for patch with index patchI
+        const word& patchType(const label patchI) const;
+
+        //- Return the condition ID for a boundary patch
+        label findPatchConditionID
+        (
+            const label patchI,
+            const word& patchName
+        ) const;
+
+        //- Generate boundary field (dictionary)
+        dictionary generateBoundaryField
+        (
+            const word& regionPrefix,
+            const word& fieldName,
+            const boundaryTemplates& bcTemplates
+        ) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
new file mode 100644
index 0000000000..e7da840547
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
@@ -0,0 +1,311 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    createZeroDirectory
+
+Description
+    Creates a zero directory with fields appropriate for the chosen solver and
+    turbulence model. Operates on both single and multi-region cases.
+
+Usage
+    The set-up is configured using a 'caseProperties' dictionary, located under
+    the $FOAM_CASE/system (or system/regionName if multi-region) directory.
+    This consists of a lists of initial and boundary conditions, e.g.
+
+    \verbatim
+    initialConditions
+    {
+        U           uniform (0 0 0);
+        p           uniform 0;
+    }
+
+    boundaryConditions
+    {
+        topWall
+        {
+            category        wall;
+            patches         (movingWall);
+            type            noSlip;
+            options
+            {
+                wallFunction    highReynolds;
+                motion          moving;
+            };
+            values
+            {
+                U           uniform (1 0 0);
+            }
+        }
+
+        walls
+        {
+            category        wall;
+            patches         (fixedWalls);
+            type            noSlip;
+            options
+            {
+                wallFunction    highReynolds;
+                motion          stationary;
+            };
+        }
+    }
+    \endverbatim
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "volFields.H"
+#include "IOdictionary.H"
+#include "caseInfo.H"
+#include "boundaryTemplates.H"
+#include "solverTemplate.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const word getClassType(const word& pType)
+{
+    if (pType == pTraits<scalar>::typeName)
+    {
+        return GeometricField<scalar, fvPatchField, volMesh>::typeName;
+    }
+    else if (pType == pTraits<vector>::typeName)
+    {
+        return GeometricField<vector, fvPatchField, volMesh>::typeName;
+    }
+    else if (pType == pTraits<sphericalTensor>::typeName)
+    {
+        return GeometricField<sphericalTensor, fvPatchField, volMesh>::typeName;
+    }
+    else if (pType == pTraits<symmTensor>::typeName)
+    {
+        return GeometricField<symmTensor, fvPatchField, volMesh>::typeName;
+    }
+    else if (pType == pTraits<tensor>::typeName)
+    {
+        return GeometricField<tensor, fvPatchField, volMesh>::typeName;
+    }
+    else
+    {
+        // Error
+        return word::null;
+    }
+}
+
+
+void createFieldFiles
+(
+    const Time& runTime,
+    const word& regionName,
+    const word& regionPrefix,
+    const wordList& fieldNames,
+    const wordList& fieldTypes,
+    const PtrList<dimensionSet>& fieldDimensions,
+    const caseInfo& cInfo,
+    const boundaryTemplates& bcTemplates
+)
+{
+    Info<< "    Generating field files" << nl << endl;
+
+    // Create files
+    mkDir(runTime.path()/runTime.timeName()/regionName);
+    forAll(fieldNames, i)
+    {
+        const_cast<word&>(IOdictionary::typeName) =
+            getClassType(fieldTypes[i]);
+
+        dictionary field;
+
+        fileName regionPath = "/";
+
+        if (regionName != word::null)
+        {
+            regionPath += regionName + '/';
+        }
+
+        field.add
+        (
+            "#include",
+            "${FOAM_CASE}/system" + regionPath + "caseProperties"
+        );
+
+        field.add("dimensions", fieldDimensions[i]);
+
+        string iField("${:initialConditions." + fieldNames[i] + '}');
+        field.add("internalField", iField.c_str());
+
+        dictionary boundaryField =
+            cInfo.generateBoundaryField
+            (
+                regionPrefix,
+                fieldNames[i],
+                bcTemplates
+            );
+
+        field.add("boundaryField", boundaryField);
+
+        // Expand all of the dictionary redirections and remove unnecessary
+        // entries
+        OStringStream os;
+        os  << field;
+
+        entry::disableFunctionEntries = 0;
+        dictionary field2(IStringStream(os.str())());
+        entry::disableFunctionEntries = 1;
+        field2.remove("#include");
+        field2.remove("initialConditions");
+        field2.remove("boundaryConditions");
+
+        // Construct and write field dictionary
+        IOdictionary fieldOut
+        (
+            IOobject
+            (
+                fieldNames[i],
+                "0",
+                regionName,
+                runTime,
+                IOobject::NO_READ
+            ),
+            field2
+        );
+
+        fieldOut.regIOobject::writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            IOstream::UNCOMPRESSED
+        );
+    }
+}
+
+
+// Main program:
+int main(int argc, char *argv[])
+{
+    Foam::argList::addOption
+    (
+        "templateDir",
+        "file",
+        "read case set-up templates from specified location"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    Info<< "Reading controlDict" << nl << endl;
+
+    IOdictionary controlDict
+    (
+        IOobject
+        (
+            "controlDict",
+            runTime.system(),
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
+
+    fileName baseDir
+    (
+        "${WM_PROJECT_DIR}/etc/caseDicts/createZeroDirectoryTemplates"
+    );
+    if (args.optionFound("templateDir"))
+    {
+        baseDir = args["templateDir"];
+    }
+
+    baseDir.expand();
+    baseDir.toAbsolute();
+
+    if (!isDir(baseDir))
+    {
+        FatalErrorInFunction
+            << "templateDir " << baseDir
+            << " should point to the folder containing the "
+            << "case set-up templates" << exit(FatalError);
+    }
+
+    // Keep variable substitutions - delay until after creation of controlDict
+    // to allow #include files to be processed
+    entry::disableFunctionEntries = 1;
+
+    // Read the solver
+    const word& solverName = controlDict.lookup("application");
+
+    // Generate solver template
+    const solverTemplate solver(baseDir, runTime, solverName);
+
+    // Read the boundary condition templates
+    const boundaryTemplates bcTemplates
+    (
+        baseDir,
+        runTime,
+        solver.type()
+    );
+
+    Info<< endl;
+
+    const label nRegion = solver.nRegion();
+    for (label regionI = 0; regionI < nRegion; regionI++)
+    {
+        const word& regionName = solver.regionName(regionI);
+
+        if (regionName == word::null)
+        {
+            Info<< "Region: " << polyMesh::defaultRegion << " (default)"
+                << endl;
+        }
+        else
+        {
+            Info<< "Region: " << regionName << endl;
+        }
+
+        // Read the case set-up info for the current region
+        const caseInfo cInfo(runTime, regionName);
+
+        cInfo.checkPatches(solver.regionType(regionI), bcTemplates);
+
+        createFieldFiles
+        (
+            runTime,
+            regionName,
+            solver.regionType(regionI),
+            solver.fieldNames(regionI),
+            solver.fieldTypes(regionI),
+            solver.fieldDimensions(regionI),
+            cInfo,
+            bcTemplates
+        );
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
new file mode 100644
index 0000000000..becbc614ad
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
@@ -0,0 +1,414 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "solverTemplate.H"
+#include "Time.H"
+#include "IOPtrList.H"
+#include "polyMesh.H"
+#include "regionProperties.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* Foam::NamedEnum<Foam::solverTemplate::solverType, 4>::names[] =
+    {
+        "compressible",
+        "incompressible",
+        "buoyant",
+        "unknown"
+    };
+}
+
+const Foam::NamedEnum<Foam::solverTemplate::solverType, 4>
+    Foam::solverTemplate::solverTypeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::word Foam::solverTemplate::readFromDict
+(
+    IOobject& dictHeader,
+    const word& entryName
+) const
+{
+    if (!dictHeader.headerOk())
+    {
+        FatalErrorInFunction
+            << "Unable to open file "
+            << dictHeader.objectPath()
+            << exit(FatalError);
+    }
+
+    IOdictionary dict(dictHeader);
+    return dict.lookup(entryName);
+}
+
+
+Foam::dictionary Foam::solverTemplate::readFluidFieldTemplates
+(
+    const word& regionName,
+    const fileName& baseDir,
+    const dictionary& solverDict,
+    const Time& runTime
+) const
+{
+    Info<< "    Reading fluid field templates";
+
+    if (regionName == word::null)
+    {
+        Info<< endl;
+    }
+    else
+    {
+        Info<< " for region " << regionName << endl;
+    }
+
+    dictionary fieldTemplates = solverDict.subDict("fluidFields");
+
+    const fileName turbModelDir(baseDir/"models"/"turbulence");
+    word turbulenceModel("laminar"); // default to laminar
+
+    const dictionary fieldModels(solverDict.subDict("fluidModels"));
+
+    word turbulenceType = "none";
+    if (fieldModels.readIfPresent("turbulenceModel", turbulenceType))
+    {
+        word simulationType(word::null);
+
+        if (turbulenceType == "turbulenceModel")
+        {
+            IOdictionary turbulenceProperties
+            (
+                IOobject
+                (
+                    "turbulenceProperties",
+                    runTime.constant(),
+                    regionName,
+                    runTime,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                )
+            );
+
+            turbulenceProperties.lookup("simulationType") >> simulationType;
+
+            if (simulationType == "laminar")
+            {
+                // Leave turbulenceModel as laminar
+            }
+            else if (simulationType == "RAS")
+            {
+                turbulenceProperties.subDict(simulationType).lookup("RASModel")
+                    >> turbulenceModel;
+            }
+            else if (simulationType == "LES")
+            {
+                turbulenceProperties.subDict(simulationType).lookup("LESModel")
+                    >> turbulenceModel;
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Unhandled turbulence model option " << simulationType
+                    << ". Valid options are laminar, RAS, LES"
+                    << exit(FatalError);
+            }
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Unhandled turbulence model option " << simulationType
+                << ". Valid options are turbulenceModel"
+                << exit(FatalError);
+        }
+    }
+
+    Info<< "    Selecting " << turbulenceType << ": " << turbulenceModel
+        << endl;
+
+    IOdictionary turbModelDict
+    (
+        IOobject
+        (
+            fileName(turbModelDir/turbulenceModel),
+            runTime,
+            IOobject::MUST_READ
+        )
+    );
+
+    // Merge common fluid fields
+    fieldTemplates.merge(turbModelDict.subDict("fluidFields"));
+
+    // Merge specific compressible or incompressible fluid fields
+    switch (solverType_)
+    {
+        case stIncompressible:
+        {
+            fieldTemplates.merge(turbModelDict.subDict("incompressibleFields"));
+            break;
+        }
+        case stCompressible:
+        case stBuoyant:
+        {
+            fieldTemplates.merge(turbModelDict.subDict("compressibleFields"));
+            break;
+        }
+        default:
+        {
+            // do nothing
+        }
+    }
+
+    return fieldTemplates;
+}
+
+
+Foam::dictionary Foam::solverTemplate::readSolidFieldTemplates
+(
+    const word& regionName,
+    const dictionary& solverDict
+) const
+{
+    Info<< "    Reading solid field templates for region " << regionName
+        << endl;
+
+    // nothing more to do for solids
+    return solverDict.subDict("solidFields");
+}
+
+
+void Foam::solverTemplate::setRegionProperties
+(
+    const dictionary& fieldDict,
+    const word& regionType,
+    const word& regionName,
+    const label regionI
+)
+{
+    regionTypes_[regionI] = regionType,
+    regionNames_[regionI] = regionName,
+    fieldNames_[regionI] = fieldDict.toc();
+    fieldTypes_[regionI].setSize(fieldNames_[regionI].size());
+    fieldDimensions_[regionI].setSize(fieldNames_[regionI].size());
+
+    forAll(fieldNames_[regionI], i)
+    {
+        const word& fieldName = fieldNames_[regionI][i];
+        const dictionary& dict = fieldDict.subDict(fieldName);
+
+        dict.lookup("type") >> fieldTypes_[regionI][i];
+        fieldDimensions_[regionI].set
+        (
+            i,
+            new dimensionSet(dict.lookup("dimensions"))
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::solverTemplate::solverTemplate
+(
+    const fileName& baseDir,
+    const Time& runTime,
+    const word& solverName
+)
+:
+    solverType_(stUnknown),
+    multiRegion_(false),
+    regionTypes_(),
+    fieldNames_(),
+    fieldTypes_(),
+    fieldDimensions_()
+{
+    IOdictionary solverDict
+    (
+        IOobject
+        (
+            fileName(baseDir/"solvers"/solverName),
+            runTime,
+            IOobject::MUST_READ
+        )
+    );
+
+    Info<< "Selecting " << solverName << ": ";
+
+    solverType_ = solverTypeNames_.read(solverDict.lookup("solverType"));
+    Info<< solverTypeNames_[solverType_];
+
+    multiRegion_ = readBool(solverDict.lookup("multiRegion"));
+    if (multiRegion_)
+    {
+        Info<< ", multi-region";
+    }
+    else
+    {
+        Info<< ", single-region";
+    }
+
+    Info<< " case" << endl;
+
+    if (multiRegion_)
+    {
+        // read regionProperties
+        regionProperties rp(runTime);
+
+        const wordList fluidNames(rp["fluid"]);
+        const wordList solidNames(rp["solid"]);
+
+        const label nRegion = fluidNames.size() + solidNames.size();
+
+        regionTypes_.setSize(nRegion);
+        regionNames_.setSize(nRegion);
+        fieldNames_.setSize(nRegion);
+        fieldTypes_.setSize(nRegion);
+        fieldDimensions_.setSize(nRegion);
+
+        // read templates for solver lists of avaliable
+        // - fields and dimensions required for the solver
+        // - models
+        label regionI = 0;
+        forAll(fluidNames, i)
+        {
+            const dictionary fieldDict
+            (
+                readFluidFieldTemplates
+                (
+                    fluidNames[i],
+                    baseDir,
+                    solverDict,
+                    runTime
+                )
+            );
+
+            setRegionProperties(fieldDict, "fluid", fluidNames[i], regionI++);
+        }
+
+        forAll(solidNames, i)
+        {
+            const dictionary fieldDict
+            (
+                readSolidFieldTemplates
+                (
+                    solidNames[i],
+                    solverDict
+                )
+            );
+            setRegionProperties(fieldDict, "solid", solidNames[i], regionI++);
+        }
+    }
+    else
+    {
+        regionTypes_.setSize(1);
+        regionNames_.setSize(1);
+        fieldNames_.setSize(1);
+        fieldTypes_.setSize(1);
+        fieldDimensions_.setSize(1);
+
+        // read templates for solver lists of avaliable
+        // - fields and dimensions required for the solver
+        // - models
+        const dictionary fieldDict
+        (
+            readFluidFieldTemplates
+            (
+                word::null, // use region = null for single-region cases
+                baseDir,
+                solverDict,
+                runTime
+            )
+        );
+
+        setRegionProperties(fieldDict, "fluid", word::null, 0);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::word Foam::solverTemplate::type() const
+{
+    return solverTypeNames_[solverType_];
+}
+
+
+bool Foam::solverTemplate::multiRegion() const
+{
+    return multiRegion_;
+}
+
+
+label Foam::solverTemplate::nRegion() const
+{
+    return regionTypes_.size();
+}
+
+
+const Foam::word& Foam::solverTemplate::regionType(const label regionI) const
+{
+    return regionTypes_[regionI];
+}
+
+
+const Foam::word& Foam::solverTemplate::regionName(const label regionI) const
+{
+    return regionNames_[regionI];
+}
+
+
+const Foam::wordList& Foam::solverTemplate::fieldNames
+(
+    const label regionI
+) const
+{
+    return fieldNames_[regionI];
+}
+
+
+const Foam::wordList& Foam::solverTemplate::fieldTypes
+(
+    const label regionI
+) const
+{
+    return fieldTypes_[regionI];
+}
+
+
+const Foam::PtrList<Foam::dimensionSet>& Foam::solverTemplate::fieldDimensions
+(
+    const label regionI
+) const
+{
+    return fieldDimensions_[regionI];
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
new file mode 100644
index 0000000000..128806c023
--- /dev/null
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::solverTemplate
+
+Description
+    Class to store solver template specifications
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef solverTemplate_H
+#define solverTemplate_H
+
+#include "boolList.H"
+#include "wordList.H"
+#include "dimensionSet.H"
+#include "IOobject.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Time;
+
+/*---------------------------------------------------------------------------*\
+                       Class solverTemplate Declaration
+\*---------------------------------------------------------------------------*/
+
+class solverTemplate
+{
+public:
+
+    // Public enumerations
+
+        //- Solver type
+        enum solverType
+        {
+            stCompressible,
+            stIncompressible,
+            stBuoyant,
+            stUnknown
+        };
+
+        //- Solver type names
+        static const NamedEnum<solverType, 4> solverTypeNames_;
+
+
+private:
+
+    // Private data
+
+        //- Solver type
+        solverType solverType_;
+
+        //- Multi-region flag
+        bool multiRegion_;
+
+
+        // Per-region info
+
+            //- Region types
+            wordList regionTypes_;
+
+            //- Region names
+            wordList regionNames_;
+
+            //- Field names
+            List<wordList> fieldNames_;
+
+            //- Field types
+            List<wordList> fieldTypes_;
+
+            //- Field dimensions
+            List<PtrList<dimensionSet> > fieldDimensions_;
+
+
+    // Public member functions
+
+        //- Read a word from a dictionary (offers some protection...)
+        word readFromDict
+        (
+            IOobject& dictHeader,
+            const word& entryName
+        ) const;
+
+        //- Read fluid region templates
+        dictionary readFluidFieldTemplates
+        (
+            const word& regionName,
+            const fileName& baseDir,
+            const dictionary& solverDict,
+            const Time& runTime
+        ) const;
+
+        //- Read solid region templates
+        dictionary readSolidFieldTemplates
+        (
+            const word& regionName,
+            const dictionary& solverDict
+        ) const;
+
+        //- Set the properties for region with index regionI
+        void setRegionProperties
+        (
+            const dictionary& dict,
+            const word& regionType,
+            const word& regionName,
+            const label regionI
+        );
+
+
+public:
+
+    //- Constructor
+    solverTemplate
+    (
+        const fileName& baseDir,
+        const Time& runTime,
+        const word& regionName
+    );
+
+
+    // Public member functions
+
+        //- Solver type name
+        word type() const;
+
+        //- Return the multi-region flag
+        bool multiRegion() const;
+
+        //- Return the number of regions
+        label nRegion() const;
+
+
+        // Per-region info
+
+            //- Return the region type
+            const word& regionType(const label regionI) const;
+
+            //- Return the region name
+            const word& regionName(const label regionI) const;
+
+            //- Return the field names
+            const wordList& fieldNames(const label regionI) const;
+
+            //- Return the field types
+            const wordList& fieldTypes(const label regionI) const;
+
+            //- Return the field dimensions
+            const PtrList<dimensionSet>& fieldDimensions
+            (
+                const label regionI
+            ) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
index 4502594826..e873f10d77 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
+++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
     if (!mesh.write())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing dsmcCloud."
             << nl << exit(FatalError);
     }
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index 43e86814c3..4652cb2afd 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
     U.write();
 
-    Info<< "\n end\n";
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index be2310aabe..163c9fa8c1 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
@@ -25,10 +25,13 @@ Application
     faceAgglomerate
 
 Description
-
     Agglomerate boundary faces using the pairPatchAgglomeration algorithm.
+
     It writes a map from the fine to coarse grid.
 
+SeeAlso
+    pairPatchAgglomeration.H
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
diff --git a/applications/utilities/preProcessing/faceAgglomerate/viewFactorsDict b/applications/utilities/preProcessing/faceAgglomerate/viewFactorsDict
index 931511380f..7cc906c675 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/viewFactorsDict
+++ b/applications/utilities/preProcessing/faceAgglomerate/viewFactorsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/preProcessing/mapFields/Make/options b/applications/utilities/preProcessing/mapFields/Make/options
index 7bd964094e..383ac3c12c 100644
--- a/applications/utilities/preProcessing/mapFields/Make/options
+++ b/applications/utilities/preProcessing/mapFields/Make/options
@@ -2,6 +2,8 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
@@ -9,4 +11,5 @@ EXE_LIBS = \
     -lmeshTools \
     -llagrangian \
     -lfiniteVolume \
+    -ldecompose \
     -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 929776d9df..6e3f4ef06b 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -27,6 +27,7 @@ Application
 Description
     Maps volume fields from one mesh to another, reading and
     interpolating all fields present in the time directory of both cases.
+
     Parallel and non-parallel cases are handled without the need to reconstruct
     them first.
 
@@ -36,9 +37,48 @@ Description
 #include "meshToMesh0.H"
 #include "processorFvPatch.H"
 #include "MapMeshes.H"
+#include "decompositionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+int readNumProcs
+(
+    const argList& args,
+    const word& optionName,
+    const Time& runTime
+)
+{
+    fileName dictFile;
+    if (args.optionReadIfPresent(optionName, dictFile))
+    {
+        if (isDir(dictFile))
+        {
+            dictFile = dictFile/"decomposeParDict";
+        }
+    }
+
+    return readInt
+    (
+        IOdictionary
+        (
+            decompositionModel::selectIO
+            (
+                IOobject
+                (
+                    "decomposeParDict",
+                    runTime.system(),
+                    runTime,
+                    IOobject::MUST_READ_IF_MODIFIED,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                dictFile
+            )
+        ).lookup("numberOfSubdomains")
+    );
+}
+
+
 void mapConsistentMesh
 (
     const fvMesh& meshSource,
@@ -225,6 +265,19 @@ int main(int argc, char *argv[])
         "subtract",
         "subtract mapped source from target"
     );
+    argList::addOption
+    (
+        "sourceDecomposeParDict",
+        "file",
+        "read decomposePar dictionary from specified location"
+    );
+    argList::addOption
+    (
+        "targetDecomposeParDict",
+        "file",
+        "read decomposePar dictionary from specified location"
+    );
+
 
     argList args(argc, argv);
 
@@ -278,7 +331,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "Unknown mapMethod " << mapMethod << ". Valid options are: "
                 << "mapNearest, interpolate and cellPointInterpolate"
                 << exit(FatalError);
@@ -320,20 +373,13 @@ int main(int argc, char *argv[])
 
     if (parallelSource && !parallelTarget)
     {
-        IOdictionary decompositionDict
+        int nProcs = readNumProcs
         (
-            IOobject
-            (
-                "decomposeParDict",
-                runTimeSource.system(),
-                runTimeSource,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
+            args,
+            "sourceDecomposeParDict",
+            runTimeSource
         );
 
-        int nProcs(readInt(decompositionDict.lookup("numberOfSubdomains")));
-
         Info<< "Create target mesh\n" << endl;
 
         fvMesh meshTarget
@@ -399,19 +445,13 @@ int main(int argc, char *argv[])
     }
     else if (!parallelSource && parallelTarget)
     {
-        IOdictionary decompositionDict
+        int nProcs = readNumProcs
         (
-            IOobject
-            (
-                "decomposeParDict",
-                runTimeTarget.system(),
-                runTimeTarget,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
+            args,
+            "targetDecomposeParDict",
+            runTimeTarget
         );
 
-        int nProcs(readInt(decompositionDict.lookup("numberOfSubdomains")));
 
         Info<< "Create source mesh\n" << endl;
 
@@ -478,39 +518,17 @@ int main(int argc, char *argv[])
     }
     else if (parallelSource && parallelTarget)
     {
-        IOdictionary decompositionDictSource
+        int nProcsSource = readNumProcs
         (
-            IOobject
-            (
-                "decomposeParDict",
-                runTimeSource.system(),
-                runTimeSource,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
+            args,
+            "sourceDecomposeParDict",
+            runTimeSource
         );
-
-        int nProcsSource
+        int nProcsTarget = readNumProcs
         (
-            readInt(decompositionDictSource.lookup("numberOfSubdomains"))
-        );
-
-
-        IOdictionary decompositionDictTarget
-        (
-            IOobject
-            (
-                "decomposeParDict",
-                runTimeTarget.system(),
-                runTimeTarget,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE
-            )
-        );
-
-        int nProcsTarget
-        (
-            readInt(decompositionDictTarget.lookup("numberOfSubdomains"))
+            args,
+            "targetDecomposeParDict",
+            runTimeTarget
         );
 
         List<boundBox> bbsTarget(nProcsTarget);
diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict
index 925c20d864..39e471e381 100644
--- a/applications/utilities/preProcessing/mapFields/mapFieldsDict
+++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  2.2.2                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
index e045522145..d1a010ce21 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
@@ -104,6 +104,8 @@ void MapLagrangianFields
             Info<< "    mapping lagrangian fieldField " << fieldName << endl;
 
             // Read field (does not need mesh)
+            // Note: some fieldFields are 0 size (e.g. collision records) if
+            //       not used
             IOField<Field<Type> > fieldSource(*fieldIter());
 
             // Map - use CompactIOField to automatically write in
@@ -120,12 +122,22 @@ void MapLagrangianFields
                     IOobject::NO_WRITE,
                     false
                 ),
-                addParticles.size()
+                min(fieldSource.size(), addParticles.size()) // handle 0 size
             );
 
-            forAll(addParticles, i)
+            if (fieldSource.size())
             {
-                fieldTarget[i] = fieldSource[addParticles[i]];
+                forAll(addParticles, i)
+                {
+                    fieldTarget[i] = fieldSource[addParticles[i]];
+                }
+            }
+            else if (cloud::debug)
+            {
+                Pout<< "Not mapping " << fieldName << " since source size "
+                    << fieldSource.size() << " different to"
+                    << " cloud size " << addParticles.size()
+                    << endl;
             }
 
             // Write field
@@ -139,8 +151,9 @@ void MapLagrangianFields
 
         forAllIter(IOobjectList, fieldFields, fieldIter)
         {
-            Info<< "    mapping lagrangian fieldField "
-                << fieldIter()->name() << endl;
+            const word& fieldName = fieldIter()->name();
+
+            Info<< "    mapping lagrangian fieldField " << fieldName << endl;
 
             // Read field (does not need mesh)
             CompactIOField<Field<Type>, Type> fieldSource(*fieldIter());
@@ -150,7 +163,7 @@ void MapLagrangianFields
             (
                 IOobject
                 (
-                    fieldIter()->name(),
+                    fieldName,
                     meshTarget.time().timeName(),
                     cloud::prefix/cloudName,
                     meshTarget,
@@ -158,12 +171,22 @@ void MapLagrangianFields
                     IOobject::NO_WRITE,
                     false
                 ),
-                addParticles.size()
+                min(fieldSource.size(), addParticles.size()) // handle 0 size
             );
 
-            forAll(addParticles, i)
+            if (fieldSource.size())
             {
-                fieldTarget[i] = fieldSource[addParticles[i]];
+                forAll(addParticles, i)
+                {
+                    fieldTarget[i] = fieldSource[addParticles[i]];
+                }
+            }
+            else if (cloud::debug)
+            {
+                Pout<< "Not mapping " << fieldName << " since source size "
+                    << fieldSource.size() << " different to"
+                    << " cloud size " << addParticles.size()
+                    << endl;
             }
 
             // Write field
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsDict b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsDict
index 470250179f..2bdc2dd20e 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsDict
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
index 1ef16c7d22..515dc66459 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapFieldsPar.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,8 @@ void mapConsistentMesh
 (
     const fvMesh& meshSource,
     const fvMesh& meshTarget,
-    const meshToMesh::interpolationMethod& mapMethod,
+    const word& mapMethod,
+    const word& AMIMapMethod,
     const bool subtract,
     const HashSet<word>& selectedFields,
     const bool noLagrangian
@@ -50,7 +51,7 @@ void mapConsistentMesh
     Info<< nl << "Consistently creating and mapping fields for time "
         << meshSource.time().timeName() << nl << endl;
 
-    meshToMesh interp(meshSource, meshTarget, mapMethod);
+    meshToMesh interp(meshSource, meshTarget, mapMethod, AMIMapMethod);
 
     if (subtract)
     {
@@ -79,7 +80,8 @@ void mapSubMesh
     const fvMesh& meshTarget,
     const HashTable<word>& patchMap,
     const wordList& cuttingPatches,
-    const meshToMesh::interpolationMethod& mapMethod,
+    const word& mapMethod,
+    const word& AMIMapMethod,
     const bool subtract,
     const HashSet<word>& selectedFields,
     const bool noLagrangian
@@ -93,6 +95,7 @@ void mapSubMesh
         meshSource,
         meshTarget,
         mapMethod,
+        AMIMapMethod,
         patchMap,
         cuttingPatches
     );
@@ -184,7 +187,14 @@ int main(int argc, char *argv[])
     (
         "mapMethod",
         "word",
-        "specify the mapping method"
+        "specify the mapping method "
+        "(direct|mapNearest|cellVolumeWeight|correctedCellVolumeWeight)"
+    );
+    argList::addOption
+    (
+        "patchMapMethod",
+        "word",
+        "specify the patch mapping method (direct|mapNearest|faceAreaWeight)"
     );
     argList::addBoolOption
     (
@@ -231,15 +241,46 @@ int main(int argc, char *argv[])
 
     const bool consistent = args.optionFound("consistent");
 
-    meshToMesh::interpolationMethod mapMethod =
-        meshToMesh::imCellVolumeWeight;
 
-    if (args.optionFound("mapMethod"))
+    word mapMethod = meshToMesh::interpolationMethodNames_
+    [
+        meshToMesh::imCellVolumeWeight
+    ];
+
+    if  (args.optionReadIfPresent("mapMethod", mapMethod))
     {
-        mapMethod = meshToMesh::interpolationMethodNames_[args["mapMethod"]];
+        Info<< "Mapping method: " << mapMethod << endl;
+    }
 
-        Info<< "Mapping method: "
-            << meshToMesh::interpolationMethodNames_[mapMethod] << endl;
+
+    word patchMapMethod;
+    if (meshToMesh::interpolationMethodNames_.found(mapMethod))
+    {
+        // Lookup corresponding AMI method
+        meshToMesh::interpolationMethod method =
+            meshToMesh::interpolationMethodNames_[mapMethod];
+
+        patchMapMethod = AMIPatchToPatchInterpolation::interpolationMethodToWord
+        (
+            meshToMesh::interpolationMethodAMI(method)
+        );
+    }
+
+    // Optionally override
+    if (args.optionFound("patchMapMethod"))
+    {
+        patchMapMethod = args["patchMapMethod"];
+
+        Info<< "Patch mapping method: " << patchMapMethod << endl;
+    }
+
+
+    if (patchMapMethod.empty())
+    {
+        FatalErrorInFunction
+            << "No valid patchMapMethod for method " << mapMethod
+            << ". Please supply one through the 'patchMapMethod' option"
+            << exit(FatalError);
     }
 
     const bool subtract = args.optionFound("subtract");
@@ -304,8 +345,9 @@ int main(int argc, char *argv[])
         )
     );
 
-    Info<< "Source mesh size: " << meshSource.nCells() << tab
-        << "Target mesh size: " << meshTarget.nCells() << nl << endl;
+    Info<< "Source mesh size: " << meshSource.globalData().nTotalCells() << tab
+        << "Target mesh size: " << meshTarget.globalData().nTotalCells()
+        << nl << endl;
 
     if (consistent)
     {
@@ -314,6 +356,7 @@ int main(int argc, char *argv[])
             meshSource,
             meshTarget,
             mapMethod,
+            patchMapMethod,
             subtract,
             selectedFields,
             noLagrangian
@@ -328,6 +371,7 @@ int main(int argc, char *argv[])
             patchMap,
             addProcessorPatches(meshTarget, cuttingPatches),
             mapMethod,
+            patchMapMethod,
             subtract,
             selectedFields,
             noLagrangian
diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapLagrangian.C b/applications/utilities/preProcessing/mapFieldsPar/mapLagrangian.C
index d2ed7da591..6196b5e5e5 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFieldsPar/mapLagrangian.C
@@ -110,9 +110,10 @@ void mapLagrangian(const meshToMesh& interp)
             cloud::prefix/cloudDirs[cloudI]
         );
 
-        IOobject* positionsPtr = objects.lookup(word("positions"));
+        bool foundPositions =
+            returnReduce(objects.found("positions"), orOp<bool>());;
 
-        if (positionsPtr)
+        if (foundPositions)
         {
             Info<< nl << "    processing cloud " << cloudDirs[cloudI] << endl;
 
diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
index ef2686f3b7..7af246cb25 100644
--- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
+++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
 
     if (!mesh.write())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing moleculeCloud."
             << nl << exit(FatalError);
     }
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 0dbc03540f..eedce844bc 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,22 +106,14 @@ bool setCellFieldType
 
         if (!field.write())
         {
-            FatalErrorIn
-            (
-                "void setCellFieldType"
-                "(const fvMesh& mesh, const labelList& selectedCells,"
-                "Istream& fieldValueStream)"
-            ) << "Failed writing field " << fieldName << endl;
+            FatalErrorInFunction
+              << "Failed writing field " << fieldName << endl;
         }
     }
     else
     {
-        WarningIn
-        (
-            "void setCellFieldType"
-            "(const fvMesh& mesh, const labelList& selectedCells,"
-            "Istream& fieldValueStream)"
-        ) << "Field " << fieldName << " not found" << endl;
+        WarningInFunction
+          << "Field " << fieldName << " not found" << endl;
 
         // Consume value
         (void)pTraits<Type>(fieldValueStream);
@@ -177,7 +169,7 @@ public:
                 )
             )
             {
-                WarningIn("setCellField::iNew::operator()(Istream& is)")
+                WarningInFunction
                     << "field type " << fieldType << " not currently supported"
                     << endl;
             }
@@ -266,7 +258,7 @@ bool setFaceFieldType
                 if (!hasWarned)
                 {
                     hasWarned = true;
-                    WarningIn("setFaceFieldType(..)")
+                    WarningInFunction
                         << "Ignoring internal face " << facei
                         << ". Suppressing further warnings." << endl;
                 }
@@ -302,22 +294,14 @@ bool setFaceFieldType
 
         if (!field.write())
         {
-            FatalErrorIn
-            (
-                "void setFaceFieldType"
-                "(const fvMesh& mesh, const labelList& selectedFaces,"
-                "Istream& fieldValueStream)"
-            )   << "Failed writing field " << field.name() << exit(FatalError);
+            FatalErrorInFunction
+                << "Failed writing field " << field.name() << exit(FatalError);
         }
     }
     else
     {
-        WarningIn
-        (
-            "void setFaceFieldType"
-            "(const fvMesh& mesh, const labelList& selectedFaces,"
-            "Istream& fieldValueStream)"
-        ) << "Field " << fieldName << " not found" << endl;
+        WarningInFunction
+          << "Field " << fieldName << " not found" << endl;
 
         // Consume value
         (void)pTraits<Type>(fieldValueStream);
@@ -373,7 +357,7 @@ public:
                 )
             )
             {
-                WarningIn("setFaceField::iNew::operator()(Istream& is)")
+                WarningInFunction
                     << "field type " << fieldType << " not currently supported"
                     << endl;
             }
diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict
index 695ab38383..72ca4ae9c2 100644
--- a/applications/utilities/preProcessing/setFields/setFieldsDict
+++ b/applications/utilities/preProcessing/setFields/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
index daa3425395..973c1cb946 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
+++ b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
@@ -60,10 +60,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
                         endAgg.append(globalNumbering.toGlobal(procI, remAgg));
                         if (startIndex.size() > maxDynListLength)
                         {
-                            FatalErrorIn
-                            (
-                                "shootRays"
-                            )   << "Dynamic list need from capacity."
+                            FatalErrorInFunction
+                                << "Dynamic list need from capacity."
                                 << "Actual size maxDynListLength : "
                                 <<  maxDynListLength
                                 << abort(FatalError);
@@ -89,8 +87,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
 
     DynamicList<label> dRayIs;
 
-    // Collect the rays which has not obstacle in bettween in rayStartFace
-    // and rayEndFace. If the ray hit itself get stored in dRayIs
+    // Collect the rays which have no obstacle in between rayStartFace
+    // and rayEndFace. If the ray hit itself, it gets stored in dRayIs
     forAll(hitInfo, rayI)
     {
         if (!hitInfo[rayI].hit())
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
index fc0df720ba..24834c227f 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ void Foam::tabulatedWallFunctions::SpaldingsLaw::invertFunction()
 
         if (iter == maxIters_)
         {
-            WarningIn("SpaldingsLaw::invertFunction()")
+            WarningInFunction
                 << "Newton iterations not converged:" << nl
                 << "    iters = " << iter << ", error = " << error << endl;
         }
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index 3ef4cdfd24..73d87c004b 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,15 +119,8 @@ Foam::scalar Foam::tabulatedWallFunctions::general::interpolate
         }
         default:
         {
-            FatalErrorIn
-            (
-                "tabulatedWallFunctions::general::interpolate"
-                "("
-                    "const scalar, "
-                    "const scalarList&, "
-                    "const scalarList&"
-                ")"
-            )   << "Unknown interpolation method" << nl
+            FatalErrorInFunction
+                << "Unknown interpolation method" << nl
                 << abort(FatalError);
         }
     }
@@ -154,14 +147,8 @@ Foam::tabulatedWallFunctions::general::general
     List<Tuple2<scalar, scalar> > inputTable = coeffDict_.lookup("inputTable");
     if (inputTable.size() < 2)
     {
-        FatalErrorIn
-        (
-            "tabulatedWallFunctions::general::general"
-            "("
-                "const dictionary&, "
-                "const polyMesh&"
-            ")"
-        )   << "Input table must have at least 2 values" << nl
+        FatalErrorInFunction
+            << "Input table must have at least 2 values" << nl
             << exit(FatalError);
     }
 
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
index 89c6a95fb0..0c2c1a1924 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,10 +49,8 @@ autoPtr<tabulatedWallFunction> tabulatedWallFunction::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "tabulatedWallFunction::New(const dictionary&, const polyMesh&)"
-        )   << "Unknown tabulatedWallFunction type " << twfTypeName
+        FatalErrorInFunction
+            << "Unknown tabulatedWallFunction type " << twfTypeName
             << nl << nl << "Valid tabulatedWallFunction types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict
index d6d57b1b14..d0fb404f60 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict
+++ b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/surface/surfaceAutoPatch/Make/files b/applications/utilities/surface/surfaceAutoPatch/Make/files
deleted file mode 100644
index 38a0ebbbf2..0000000000
--- a/applications/utilities/surface/surfaceAutoPatch/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-surfaceAutoPatch.C
-
-EXE = $(FOAM_APPBIN)/surfaceAutoPatch
diff --git a/applications/utilities/surface/surfaceAutoPatch/Make/options b/applications/utilities/surface/surfaceAutoPatch/Make/options
deleted file mode 100644
index 9f08e8d2a8..0000000000
--- a/applications/utilities/surface/surfaceAutoPatch/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude
-
-EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface
diff --git a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
deleted file mode 100644
index f53ec82963..0000000000
--- a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    surfaceAutoPatch
-
-Description
-    Patches surface according to feature angle. Like autoPatch.
-
-\*---------------------------------------------------------------------------*/
-
-#include "triangle.H"
-#include "triSurface.H"
-#include "argList.H"
-#include "surfaceFeatures.H"
-#include "treeBoundBox.H"
-#include "meshTools.H"
-#include "OFstream.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-int main(int argc, char *argv[])
-{
-    argList::noParallel();
-    argList::validArgs.append("input surfaceFile");
-    argList::validArgs.append("output surfaceFile");
-    argList::validArgs.append("includedAngle [0..180]");
-    argList args(argc, argv);
-
-    const fileName inFileName  = args[1];
-    const fileName outFileName = args[2];
-    const scalar includedAngle = args.argRead<scalar>(3);
-
-    Info<< "Surface        : " << inFileName << nl << endl;
-
-
-    // Read
-    // ~~~~
-
-    Info<< "Reading : " << inFileName << endl;
-    triSurface surf(inFileName);
-
-    Info<< "Read surface:" << endl;
-    surf.writeStats(Info);
-    Info<< endl;
-
-
-
-    // Construct features from surface&featureangle
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Info<< "Constructing feature set from included angle " << includedAngle
-        << endl;
-
-    surfaceFeatures set(surf, includedAngle);
-
-    Info<< nl
-        << "Feature set:" << nl
-        << "    feature points : " << set.featurePoints().size() << nl
-        << "    feature edges  : " << set.featureEdges().size() << nl
-        << "    of which" << nl
-        << "        region edges   : " << set.nRegionEdges() << nl
-        << "        external edges : " << set.nExternalEdges() << nl
-        << "        internal edges : " << set.nInternalEdges() << nl
-        << endl;
-
-    // Get per-edge status.
-    boolList borderEdge(surf.nEdges(), false);
-    forAll(set.featureEdges(), i)
-    {
-        borderEdge[set.featureEdges()[i]] = true;
-    }
-
-    labelList faceRegion(surf.size());
-    label nRegions = surf.markZones(borderEdge, faceRegion);
-
-    // Reregion triangles.
-    forAll(surf, i)
-    {
-        surf[i].region() = faceRegion[i];
-    }
-
-    // Create some patches
-    surf.patches().setSize(nRegions);
-
-    forAll(surf.patches(), patchI)
-    {
-        surf.patches()[patchI].name() = "patch" + Foam::name(patchI);
-        surf.patches()[patchI].geometricType() = "empty";
-    }
-
-
-    Info<< "Writing : " << outFileName << endl;
-    surf.write(outFileName, true);
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Allwmake b/applications/utilities/surface/surfaceBooleanFeatures/Allwmake
new file mode 100755
index 0000000000..50d640f2b2
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Allwmake
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+set -x
+
+if [ -z "$CGAL_ARCH_PATH" ]
+then
+    export COMPILE_FLAGS="-DNO_CGAL"
+else
+    wmake PolyhedronReader
+    export COMPILE_FLAGS='-IPolyhedronReader'
+    export LINK_FLAGS='${CGAL_LIBS} -lPolyhedronReader'
+fi
+wmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H b/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H
new file mode 100644
index 0000000000..7fda691d05
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedefs
+    CGAL3DKernel
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CGAL3DKernel_H
+#define CGAL3DKernel_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef CGAL_INEXACT
+
+    // Fast kernel using a double as the storage type
+    #include "CGAL/Exact_predicates_inexact_constructions_kernel.h"
+    typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
+
+#else
+
+    // Very robust but expensive kernel
+    #include "CGAL/Exact_predicates_exact_constructions_kernel.h"
+    typedef CGAL::Exact_predicates_exact_constructions_kernel K;
+
+#endif
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H b/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H
new file mode 100644
index 0000000000..e17039cd03
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedefs
+    IndexedPolyhedron
+
+Description
+    CGAL data structures used for triSurface handling
+
+    Define CGAL_INEXACT to use Exact_predicates_inexact_constructions kernel
+    otherwise the more robust but much less efficient
+    Exact_predicates_exact_constructions will be used.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IndexedPolyhedron_H
+#define IndexedPolyhedron_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
+#include "uint.H"
+
+#include "CGAL3DKernel.H"
+#include <CGAL/Polyhedron_3.h>
+#include <CGAL/Nef_polyhedron_3.h>
+
+#include "label.H"
+
+
+typedef CGAL::Point_3<K>  Point;
+typedef CGAL::Segment_3<K> Segment;
+typedef CGAL::Direction_3<K>  Direction;
+typedef CGAL::Plane_3<K>  Plane;
+typedef CGAL::Triangle_3<K>  Triangle;
+
+// Define new class with color and define the polyhedron types
+template<class Refs>
+struct IndexedFace
+:
+    public CGAL::HalfedgeDS_face_base<Refs>
+{
+    Foam::label index;
+    Foam::label region;
+};
+struct My_items
+:
+    public CGAL::Polyhedron_items_3
+{
+    template<class Refs, class Traits>
+    struct Face_wrapper
+    {
+        typedef IndexedFace<Refs> Face;
+    };
+};
+
+
+//typedef CGAL::Polyhedron_3<K>  Polyhedron;
+typedef CGAL::Polyhedron_3<K, My_items>  Polyhedron;
+
+typedef Polyhedron::HalfedgeDS HalfedgeDS;
+typedef Polyhedron::Edge_iterator Edge_iterator;
+typedef Polyhedron::Vertex Vertex;
+typedef Polyhedron::Vertex_iterator Vertex_iterator;
+typedef Polyhedron::Halfedge_handle Halfedge_handle;
+typedef Polyhedron::Edge_iterator Edge_iterator;
+typedef Polyhedron::Facet_iterator Facet_iterator;
+typedef Polyhedron::Halfedge_around_facet_const_circulator HFCC;
+typedef Polyhedron::Vertex_const_iterator                  VCI;
+
+typedef CGAL::Nef_polyhedron_3<K>  Nef_polyhedron;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
index 727dbd1c2b..ed05fef039 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
@@ -1,9 +1,29 @@
+EXE_NDEBUG = -DNDEBUG
+/* EXE_NDEBUG = -g -O0 -DFULLDEBUG */
+
+
+c++CGALWARN = -Wno-old-style-cast
+
+/*-- Define NO_CGAL to avoid using CGAL altogether */
+/*-- Define CGAL_INEXACT to use inexact CGAL constructions */
+
+include $(GENERAL_RULES)/CGAL
+
 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    ${ROUNDING_MATH} \
+    ${EXE_NDEBUG} \
+    ${CGAL_INC} \
+    ${c++CGALWARN} \
+    $(COMPILE_FLAGS) \
+    -IPolyhedronReader \
+    -I$(FOAM_SRC)/surfMesh/lnInclude \
+    -I$(FOAM_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
+    -lsurfMesh \
     -ltriSurface \
     -ledgeMesh \
-    -lmeshTools
+    -lmeshTools \
+    $(LINK_FLAGS)
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/files b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/files
new file mode 100644
index 0000000000..d0e01d2747
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/files
@@ -0,0 +1,3 @@
+PolyhedronReader.C
+
+LIB = $(FOAM_LIBBIN)/libPolyhedronReader
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
new file mode 100644
index 0000000000..6603adda0f
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
@@ -0,0 +1,25 @@
+EXE_NDEBUG = -DNDEBUG
+/* EXE_NDEBUG = -g -O0 -DFULLDEBUG */
+
+
+c++CGALWARN = -Wno-old-style-cast
+
+/*-- Define CGAL_INEXACT to use inexact CGAL constructions */
+
+include $(GENERAL_RULES)/CGAL
+
+EXE_INC = \
+    ${ROUNDING_MATH} \
+    ${EXE_NDEBUG} \
+    ${CGAL_INC} \
+    ${c++CGALWARN} \
+    -I.. \
+    -I$(FOAM_SRC)/surfMesh/lnInclude \
+    -I$(FOAM_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I/usr/include/Qt
+
+LIB_LIBS = \
+    -L${CGAL_ARCH_PATH}/lib \
+    -ltriSurface
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C
new file mode 100644
index 0000000000..693237a7ea
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PolyhedronReader.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::PolyhedronReader::PolyhedronReader(const triSurface& s, Polyhedron& p)
+{
+    Build_triangle<HalfedgeDS> triangle(s);
+    p.delegate(triangle);
+    // Populate index and region
+    Foam::label nTris = 0;
+    for
+    (
+        Facet_iterator fi = p.facets_begin();
+        fi != p.facets_end();
+        ++fi
+    )
+    {
+        fi->index = nTris++;
+        fi->region = s[fi->index].region();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
new file mode 100644
index 0000000000..bf1abc1e2a
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::PolyhedronReader
+
+Description
+
+SourceFiles
+    PolyhedronReader.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PolyhedronReader_H
+#define PolyhedronReader_H
+
+#include "CGALIndexedPolyhedron.H"
+#include "triSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class PolyhedronReader Declaration
+\*---------------------------------------------------------------------------*/
+
+class PolyhedronReader
+{
+    // Private Classes
+
+        template<class HDS>
+        class Build_triangle
+        :
+            public CGAL::Modifier_base<HDS>
+        {
+            const triSurface& s_;
+
+        public:
+
+            Build_triangle(const triSurface& s);
+
+            void operator()(HDS& hds);
+        };
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        PolyhedronReader(const PolyhedronReader&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const PolyhedronReader&);
+
+
+public:
+
+    // Constructors
+
+        //- Populate polyhedron from surface
+        PolyhedronReader(const triSurface& s, Polyhedron& p);
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PolyhedronReaderTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C
new file mode 100644
index 0000000000..76a192c108
--- /dev/null
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PolyhedronReader.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class HDS>
+Foam::PolyhedronReader::Build_triangle<HDS>::Build_triangle
+(
+    const triSurface& s
+)
+:
+    s_(s)
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+template<class HDS>
+void Foam::PolyhedronReader::Build_triangle<HDS>::operator()(HDS& hds)
+{
+    // Postcondition: hds is a valid polyhedral surface.
+    CGAL::Polyhedron_incremental_builder_3<HDS> B(hds, true);
+
+    B.begin_surface(s_.nPoints(), s_.size());
+
+    typedef typename HDS::Vertex Vertex;
+    typedef typename Vertex::Point Point;
+
+    const Foam::pointField& pts = s_.points();
+    forAll(pts, i)
+    {
+        const Foam::point& pt = pts[i];
+        B.add_vertex(Point(pt.x(), pt.y(), pt.z()));
+    }
+    forAll(s_, i)
+    {
+        const Foam::labelledTri& t = s_[i];
+        B.begin_facet();
+        B.add_vertex_to_facet(t[0]);
+        B.add_vertex_to_facet(t[1]);
+        B.add_vertex_to_facet(t[2]);
+        B.end_facet();
+    }
+    B.end_surface();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 6c4e67dd7d..91918be9e9 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -25,16 +25,15 @@ Application
     surfaceBooleanFeatures
 
 Description
-
     Generates the extendedFeatureEdgeMesh for the interface between a boolean
-    operation on two surfaces.  Assumes that the orientation of the surfaces is
-    correct:
+    operation on two surfaces.
 
-    + if the operation is union or intersection, that both surface's normals
+    Assumes that the orientation of the surfaces iscorrect:
+    - if the operation is union or intersection, that both surface's normals
       (n) have the same orientation with respect to a point, i.e. surfaces and b
       are orientated the same with respect to point x:
 
-    @verbatim
+    \verbatim
        _______
       |       |--> n
       |    ___|___             x
@@ -43,14 +42,14 @@ Description
           |       |
           |_______|
 
-    @endverbatim
+    \endverbatim
 
-    + if the operation is a subtraction, the surfaces should be oppositely
+    - if the operation is a subtraction, the surfaces should be oppositely
     oriented with respect to a point, i.e. for (a - b), then b's orientation
     should be such that x is "inside", and a's orientation such that x is
     "outside"
 
-    @verbatim
+    \verbatim
        _______
       |       |--> n
       |    ___|___             x
@@ -59,7 +58,7 @@ Description
           |  n <--|
           |_______|
 
-    @endverbatim
+    \endverbatim
 
     When the operation is peformed - for union, all of the edges generates where
     one surfaces cuts another are all "internal" for union, and "external" for
@@ -74,11 +73,34 @@ Description
 #include "featureEdgeMesh.H"
 #include "extendedFeatureEdgeMesh.H"
 #include "triSurfaceSearch.H"
+#include "triSurfaceMesh.H"
 #include "OFstream.H"
+#include "OBJstream.H"
 #include "booleanSurface.H"
 #include "edgeIntersections.H"
 #include "meshTools.H"
-#include "labelPair.H"
+#include "DynamicField.H"
+
+
+#ifndef NO_CGAL
+
+#include <CGAL/AABB_tree.h>
+#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_face_graph_triangle_primitive.h>
+#include "CGALIndexedPolyhedron.H"
+#include "PolyhedronReader.H"
+typedef CGAL::AABB_face_graph_triangle_primitive
+<
+    Polyhedron, CGAL::Default, CGAL::Tag_false
+> Primitive;
+typedef CGAL::AABB_traits<K, Primitive> Traits;
+typedef CGAL::AABB_tree<Traits> Tree;
+
+typedef boost::optional<Tree::Intersection_and_primitive_id<Segment>::Type >
+Segment_intersection;
+
+#endif // NO_CGAL
+
 
 using namespace Foam;
 
@@ -105,7 +127,7 @@ bool intersectSurfaces
 
             scalarField surfPointTol
             (
-                1e-3*edgeIntersections::minEdgeLength(surf)
+                max(1e-3*edgeIntersections::minEdgeLength(surf), SMALL)
             );
 
             // Determine raw intersections
@@ -178,7 +200,7 @@ bool intersectSurfaces
 
             scalarField surf1PointTol
             (
-                1e-3*edgeIntersections::minEdgeLength(surf1)
+                max(1e-3*edgeIntersections::minEdgeLength(surf1), SMALL)
             );
 
             // Determine raw intersections
@@ -221,7 +243,7 @@ bool intersectSurfaces
 
             scalarField surf2PointTol
             (
-                1e-3*edgeIntersections::minEdgeLength(surf2)
+                max(1e-3*edgeIntersections::minEdgeLength(surf2), SMALL)
             );
 
             // Determine raw intersections
@@ -311,8 +333,8 @@ void calcEdgeCuts
     triSurface& surf1,
     triSurface& surf2,
     const bool perturb,
-    edgeIntersections& edge1Cuts,
-    edgeIntersections& edge2Cuts
+    edgeIntersections& edgeCuts1,
+    edgeIntersections& edgeCuts2
 )
 {
     if (perturb)
@@ -320,9 +342,9 @@ void calcEdgeCuts
         intersectSurfaces
         (
             surf1,
-            edge1Cuts,
+            edgeCuts1,
             surf2,
-            edge2Cuts
+            edgeCuts2
         );
     }
     else
@@ -332,11 +354,11 @@ void calcEdgeCuts
         Info<< "Determining intersections of surf1 edges with surf2 faces"
             << endl;
 
-        edge1Cuts = edgeIntersections
+        edgeCuts1 = edgeIntersections
         (
             surf1,
             querySurf2,
-            1e-3*edgeIntersections::minEdgeLength(surf1)
+            max(1e-3*edgeIntersections::minEdgeLength(surf1), SMALL)
         );
 
         triSurfaceSearch querySurf1(surf1);
@@ -344,161 +366,877 @@ void calcEdgeCuts
         Info<< "Determining intersections of surf2 edges with surf1 faces"
             << endl;
 
-        edge2Cuts = edgeIntersections
+        edgeCuts2 = edgeIntersections
         (
             surf2,
             querySurf1,
-            1e-3*edgeIntersections::minEdgeLength(surf2)
+            max(1e-3*edgeIntersections::minEdgeLength(surf2), SMALL)
         );
     }
 }
 
 
-void calcFeaturePoints(const pointField& points, const edgeList& edges)
+// CGAL variants
+
+#ifndef NO_CGAL
+
+void visitPointRegion
+(
+    const triSurface& s,
+    const label zoneI,
+    const label pointI,
+    const label startEdgeI,
+    const label startFaceI,
+    labelList& pFacesZone
+)
 {
-    edgeMesh eMesh(points, edges);
+    const labelList& eFaces = s.edgeFaces()[startEdgeI];
 
-    const labelListList& pointEdges = eMesh.pointEdges();
-
-    // Get total number of feature points
-    label nFeaturePoints = 0;
-    forAll(pointEdges, pI)
+    if (eFaces.size() == 2)
     {
-        const labelList& pEdges = pointEdges[pI];
-
-        if (pEdges.size() == 1)
+        label nextFaceI;
+        if (eFaces[0] == startFaceI)
         {
-            nFeaturePoints++;
+            nextFaceI = eFaces[1];
         }
-    }
-
-
-    // Calculate addressing from feature point to cut point and cut edge
-    labelList featurePointToCutPoint(nFeaturePoints);
-    labelList featurePointToCutEdge(nFeaturePoints);
-
-    label nFeatPts = 0;
-    forAll(pointEdges, pI)
-    {
-        const labelList& pEdges = pointEdges[pI];
-
-        if (pEdges.size() == 1)
+        else if (eFaces[1] == startFaceI)
         {
-            featurePointToCutPoint[nFeatPts] = pI;
-            featurePointToCutEdge[nFeatPts] = pEdges[0];
-            nFeatPts++;
+            nextFaceI = eFaces[0];
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "problem" << exit(FatalError);
+
+            nextFaceI = -1;
+        }
+
+
+
+        label index = findIndex(s.pointFaces()[pointI], nextFaceI);
+
+        if (pFacesZone[index] == -1)
+        {
+            // Mark face as been visited.
+            pFacesZone[index] = zoneI;
+
+            // Step to next edge on face which is still using pointI
+            const labelList& fEdges = s.faceEdges()[nextFaceI];
+
+            label nextEdgeI = -1;
+
+            forAll(fEdges, i)
+            {
+                label edgeI = fEdges[i];
+                const edge& e = s.edges()[edgeI];
+
+                if (edgeI != startEdgeI && (e[0] == pointI || e[1] == pointI))
+                {
+                    nextEdgeI = edgeI;
+
+                    break;
+                }
+            }
+
+            if (nextEdgeI == -1)
+            {
+                FatalErrorInFunction
+                    << "Problem: cannot find edge out of " << fEdges
+                    << "on face " << nextFaceI << " that uses point " << pointI
+                    << " and is not edge " << startEdgeI << abort(FatalError);
+            }
+
+
+            visitPointRegion
+            (
+                s,
+                zoneI,
+                pointI,
+                nextEdgeI,
+                nextFaceI,
+                pFacesZone
+            );
         }
     }
 }
 
 
-int main(int argc, char *argv[])
+label dupNonManifoldPoints(triSurface& s, labelList& pointMap)
 {
-    argList::noParallel();
-    argList::validArgs.append("action");
-    argList::validArgs.append("surface file");
-    argList::validArgs.append("surface file");
+    const labelListList& pf = s.pointFaces();
+    const labelListList& fe = s.faceEdges();
+    const edgeList& edges = s.edges();
 
-    argList::addBoolOption
-    (
-        "surf1Baffle",
-        "Mark surface 1 as a baffle"
-    );
 
-    argList::addBoolOption
-    (
-        "surf2Baffle",
-        "Mark surface 2 as a baffle"
-    );
+    DynamicField<point> newPoints(s.points());
+    // From dupSurf back to s.pointa
+    DynamicList<label> newPointMap(identity(newPoints.size()));
+    List<labelledTri> newFaces(s);
+    label nNonManifold = 0;
 
-    argList::addBoolOption
-    (
-        "perturb",
-        "Perturb surface points to escape degenerate intersections"
-    );
 
-    argList::addBoolOption
-    (
-        "invertedSpace",
-        "do the surfaces have inverted space orientation, "
-        "i.e. a point at infinity is considered inside. "
-        "This is only sensible for union and intersection."
-    );
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-
-    word action(args.args()[1]);
-
-    HashTable<booleanSurface::booleanOpType> validActions;
-    validActions.insert("intersection", booleanSurface::INTERSECTION);
-    validActions.insert("union", booleanSurface::UNION);
-    validActions.insert("difference", booleanSurface::DIFFERENCE);
-
-    if (!validActions.found(action))
+    forAll(pf, pointI)
     {
-        FatalErrorIn(args.executable())
-            << "Unsupported action " << action << endl
-            << "Supported actions:" << validActions.toc() << abort(FatalError);
+        const labelList& pFaces = pf[pointI];
+
+        // Visited faces (as indices into pFaces)
+        labelList pFacesZone(pFaces.size(), -1);
+
+        label nZones = 0;
+        label index = 0;
+        for (; index < pFacesZone.size(); index++)
+        {
+            if (pFacesZone[index] == -1)
+            {
+                label zoneI = nZones++;
+                pFacesZone[index] = zoneI;
+
+                label faceI = pFaces[index];
+                const labelList& fEdges = fe[faceI];
+
+                // Find starting edge
+                forAll(fEdges, fEdgeI)
+                {
+                    label edgeI = fEdges[fEdgeI];
+                    const edge& e = edges[edgeI];
+
+                    if (e[0] == pointI || e[1] == pointI)
+                    {
+                        visitPointRegion
+                        (
+                            s,
+                            zoneI,
+                            pointI,
+                            edgeI,
+                            faceI,
+                            pFacesZone
+                        );
+                    }
+                }
+            }
+        }
+
+
+        // Subset
+        if (nZones > 1)
+        {
+            for (label zoneI = 1; zoneI < nZones; zoneI++)
+            {
+                label newPointI = newPoints.size();
+                newPointMap.append(s.meshPoints()[pointI]);
+                newPoints.append(s.points()[s.meshPoints()[pointI]]);
+
+                forAll(pFacesZone, index)
+                {
+                    if (pFacesZone[index] == zoneI)
+                    {
+                        label faceI = pFaces[index];
+                        const labelledTri& localF = s.localFaces()[faceI];
+                        forAll(localF, fp)
+                        {
+                            if (localF[fp] == pointI)
+                            {
+                                newFaces[faceI][fp] = newPointI;
+                            }
+                        }
+                    }
+                }
+            }
+            nNonManifold++;
+        }
     }
 
-    fileName surf1Name(args.args()[2]);
-    Info<< "Reading surface " << surf1Name << endl;
-    triSurface surf1(surf1Name);
 
-    Info<< surf1Name << " statistics:" << endl;
-    surf1.writeStats(Info);
-    Info<< endl;
-
-    fileName surf2Name(args[3]);
-    Info<< "Reading surface " << surf2Name << endl;
-    triSurface surf2(surf2Name);
-
-    Info<< surf2Name << " statistics:" << endl;
-    surf2.writeStats(Info);
-    Info<< endl;
-
-    const bool surf1Baffle = args.optionFound("surf1Baffle");
-    const bool surf2Baffle = args.optionFound("surf2Baffle");
-
-    edgeIntersections edge1Cuts;
-    edgeIntersections edge2Cuts;
-
-    bool invertedSpace = args.optionFound("invertedSpace");
-
-    if (invertedSpace && validActions[action] == booleanSurface::DIFFERENCE)
+    Info<< "Duplicating " << nNonManifold << " points out of " << s.nPoints()
+        << endl;
+    if (nNonManifold > 0)
     {
-        FatalErrorIn(args.executable())
-            << "Inverted space only makes sense for union or intersection."
-            << exit(FatalError);
+        triSurface dupSurf(newFaces, s.patches(), newPoints, true);
+
+        // Create map from dupSurf localPoints to s.localPoints
+        const Map<label> mpm = s.meshPointMap();
+
+        const labelList& dupMp = dupSurf.meshPoints();
+
+        labelList dupPointMap(dupMp.size());
+        forAll(dupMp, pointI)
+        {
+            label dupMeshPointI = dupMp[pointI];
+            label meshPointI = newPointMap[dupMeshPointI];
+            dupPointMap[pointI] = mpm[meshPointI];
+        }
+
+
+        forAll(dupPointMap, pointI)
+        {
+            const point& dupPt = dupSurf.points()[dupMp[pointI]];
+            label sLocalPointI = dupPointMap[pointI];
+            label sMeshPointI = s.meshPoints()[sLocalPointI];
+            const point& sPt = s.points()[sMeshPointI];
+
+            if (mag(dupPt-sPt) > SMALL)
+            {
+                FatalErrorInFunction
+                    << "dupPt:" << dupPt
+                    << " sPt:" << sPt
+                    << exit(FatalError);
+            }
+        }
+
+
+        //s.transfer(dupSurf);
+        s = dupSurf;
+        pointMap = UIndirectList<label>(pointMap, dupPointMap)();
     }
 
-    // Calculate the points where the edges are cut by the other surface
-    calcEdgeCuts
-    (
-        surf1,
-        surf2,
-        args.optionFound("perturb"),
-        edge1Cuts,
-        edge2Cuts
-    );
+    return nNonManifold;
+}
 
+
+// Find intersections of surf1 by edges of surf2. Return number of degenerate
+// cuts (cuts through faces/edges/points)
+labelPair edgeIntersectionsCGAL
+(
+    const Tree& tree,
+    const triSurface& surf,
+    const pointField& points,
+    edgeIntersections& edgeCuts
+)
+{
+    const edgeList& edges = surf.edges();
+    const labelList& meshPoints = surf.meshPoints();
+
+    //Info<< "Intersecting CGAL surface ..." << endl;
+    List<List<pointIndexHit> > intersections(edges.size());
+    labelListList classifications(edges.size());
+
+    label nPoints = 0;
+    label nSegments = 0;
+
+    std::vector<Segment_intersection> segments;
+    forAll(edges, edgeI)
+    {
+        const edge& e = edges[edgeI];
+
+        const point& a = points[meshPoints[e[0]]];
+        const point& b = points[meshPoints[e[1]]];
+
+        K::Segment_3 segment_query
+        (
+            Point(a.x(), a.y(), a.z()),
+            Point(b.x(), b.y(), b.z())
+        );
+
+        segments.clear();
+        tree.all_intersections(segment_query, std::back_inserter(segments));
+
+        for
+        (
+            std::vector<Segment_intersection>::const_iterator iter =
+                segments.begin(),
+            end = segments.end();
+            iter != end;
+            ++iter
+        )
+        {
+            // Get intersection object
+            if (const Point* ptPtr = boost::get<Point>(&((*iter)->first)))
+            {
+                point pt
+                (
+                    CGAL::to_double(ptPtr->x()),
+                    CGAL::to_double(ptPtr->y()),
+                    CGAL::to_double(ptPtr->z())
+                );
+
+                Polyhedron::Face_handle f = (*iter)->second;
+
+                intersections[edgeI].append
+                (
+                    pointIndexHit
+                    (
+                        true,
+                        pt,
+                        f->index
+                    )
+                );
+                // Intersection on edge interior
+                classifications[edgeI].append(-1);
+                nPoints++;
+            }
+            else if
+            (
+                const Segment* sPtr = boost::get<Segment>(&((*iter)->first))
+            )
+            {
+                //std::cout
+                //    << "intersection object is a segment:" << sPtr->source()
+                //    << " " << sPtr->target() << std::endl;
+
+                Polyhedron::Face_handle f = (*iter)->second;
+                //std::cout<< "triangle:" << f->index
+                //    << " region:" << f->region << std::endl;
+
+                const point source
+                (
+                    CGAL::to_double(sPtr->source().x()),
+                    CGAL::to_double(sPtr->source().y()),
+                    CGAL::to_double(sPtr->source().z())
+                );
+
+                const point target
+                (
+                    CGAL::to_double(sPtr->target().x()),
+                    CGAL::to_double(sPtr->target().y()),
+                    CGAL::to_double(sPtr->target().z())
+                );
+
+                // Make up some intersection point
+                intersections[edgeI].append
+                (
+                    pointIndexHit
+                    (
+                        true,
+                        0.5*(source+target),
+                        f->index
+                    )
+                );
+                // Intersection aligned with face. Tbd: enums
+                classifications[edgeI].append(2);
+                nSegments++;
+            }
+        }
+    }
+
+    edgeCuts = edgeIntersections(intersections, classifications);
+
+    return labelPair(nPoints, nSegments);
+}
+
+
+// Intersect edges of surf1 until no more degenerate intersections. Return
+// number of degenerates
+labelPair edgeIntersectionsAndShuffleCGAL
+(
+    Random& rndGen,
+    const triSurface& surf2,
+    const scalarField& surf1PointTol,
+    triSurface& surf1,
+    edgeIntersections& edgeCuts1
+)
+{
+    //Info<< "Constructing CGAL surface ..." << endl;
+    Polyhedron p;
+    PolyhedronReader(surf2, p);
+
+
+    //Info<< "Constructing CGAL tree ..." << endl;
+    const Tree tree(p.facets_begin(), p.facets_end(), p);
+
+
+    labelPair cuts(0, 0);
+
+    // Update surface1 points until no longer intersecting
+    pointField surf1Points(surf1.points());
+
+    for (label iter = 0; iter < 5; iter++)
+    {
+        // See which edges of 1 intersect 2
+        Info<< "Determining intersections of " << surf1.nEdges()
+            << " edges with surface of " << label(tree.size()) << " triangles"
+            << endl;
+        cuts = edgeIntersectionsCGAL
+        (
+            tree,
+            surf1,
+            surf1Points,
+            edgeCuts1
+        );
+        Info<< "Determined intersections:" << nl
+            << "    edges               : " << surf1.nEdges() << nl
+            << "    non-degenerate cuts : " << cuts.first() << nl
+            << "    degenerate cuts     : " << cuts.second() << nl
+            << endl;
+
+        if (cuts.second() == 0)
+        {
+            break;
+        }
+
+        Info<< "Shuffling conflicting points" << endl;
+
+        const labelListList& edgeStat = edgeCuts1.classification();
+        const edgeList& edges = surf1.edges();
+        const labelList& mp = surf1.meshPoints();
+        const point p05(0.5, 0.5, 0.5);
+
+        forAll(edgeStat, edgeI)
+        {
+            const labelList& stat = edgeStat[edgeI];
+            forAll(stat, i)
+            {
+                if (stat[i] == 2)
+                {
+                    const edge& e = edges[edgeI];
+                    forAll(e, eI)
+                    {
+                        vector d = rndGen.vector01()-p05;
+                        surf1Points[mp[e[eI]]] += surf1PointTol[e[eI]]*d;
+                    }
+                }
+            }
+        }
+    }
+    surf1.movePoints(surf1Points);
+
+    return cuts;
+}
+
+
+// Return map from subSurf.edges() back to surf.edges()
+labelList matchEdges
+(
+    const triSurface& surf,
+    const triSurface& subSurf,
+    const labelList& pointMap
+)
+{
+    if (pointMap.size() != subSurf.nPoints())
+    {
+        FatalErrorInFunction
+            << "problem" << exit(FatalError);
+    }
+
+    labelList edgeMap(subSurf.nEdges(), -1);
+
+    const edgeList& edges = surf.edges();
+    const labelListList& pointEdges = surf.pointEdges();
+
+    const edgeList& subEdges = subSurf.edges();
+
+
+    forAll(subEdges, subEdgeI)
+    {
+        const edge& subE = subEdges[subEdgeI];
+
+        // Match points on edge to those on surf
+        label start = pointMap[subE[0]];
+        label end = pointMap[subE[1]];
+        const labelList& pEdges = pointEdges[start];
+        forAll(pEdges, pEdgeI)
+        {
+            label edgeI = pEdges[pEdgeI];
+            const edge& e = edges[edgeI];
+
+            if (e.otherVertex(start) == end)
+            {
+                if (edgeMap[subEdgeI] == -1)
+                {
+                    edgeMap[subEdgeI] = edgeI;
+                }
+                else if (edgeMap[subEdgeI] != edgeI)
+                {
+                    FatalErrorInFunction
+                        << subE << " points:"
+                        << subE.line(subSurf.localPoints())
+                        << " matches to " << edgeI
+                        << " points:" << e.line(surf.localPoints())
+                        << " but also " << edgeMap[subEdgeI]
+                        << " points:"
+                        << edges[edgeMap[subEdgeI]].line(surf.localPoints())
+                        << exit(FatalError);
+                }
+                break;
+            }
+        }
+
+        if (edgeMap[subEdgeI] == -1)
+        {
+            FatalErrorInFunction
+                << subE << " at:" << subSurf.localPoints()[subE[0]]
+                << subSurf.localPoints()[subE[1]]
+                << exit(FatalError);
+        }
+    }
+
+    return edgeMap;
+}
+
+
+void calcEdgeCutsCGAL
+(
+    triSurface& surf1,
+    triSurface& surf2,
+    const bool perturb,
+    edgeIntersections& edgeCuts1,
+    edgeIntersections& edgeCuts2
+)
+{
+    if (!perturb)
+    {
+        // See which edges of 1 intersect 2
+        {
+            Info<< "Constructing CGAL surface ..." << endl;
+            Polyhedron p;
+            PolyhedronReader(surf2, p);
+
+            Info<< "Constructing CGAL tree ..." << endl;
+            const Tree tree(p.facets_begin(), p.facets_end(), p);
+
+            edgeIntersectionsCGAL
+            (
+                tree,
+                surf1,
+                surf1.points(),
+                edgeCuts1
+            );
+        }
+        // See which edges of 2 intersect 1
+        {
+            Info<< "Constructing CGAL surface ..." << endl;
+            Polyhedron p;
+            PolyhedronReader(surf1, p);
+
+            Info<< "Constructing CGAL tree ..." << endl;
+            const Tree tree(p.facets_begin(), p.facets_end(), p);
+
+            edgeIntersectionsCGAL
+            (
+                tree,
+                surf2,
+                surf2.points(),
+                edgeCuts2
+            );
+        }
+    }
+    else
+    {
+        const scalarField surf1PointTol
+        (
+            max(1e-8*edgeIntersections::minEdgeLength(surf1), SMALL)
+        );
+        const scalarField surf2PointTol
+        (
+            max(1e-8*edgeIntersections::minEdgeLength(surf2), SMALL)
+        );
+
+
+        Random rndGen(0);
+
+        labelPair cuts1;
+        labelPair cuts2;
+
+        for (label iter = 0; iter < 10; iter++)
+        {
+            // Find intersections of surf1 edges with surf2 triangles
+            cuts1 = edgeIntersectionsAndShuffleCGAL
+            (
+                rndGen,
+                surf2,
+                surf1PointTol,
+                surf1,
+                edgeCuts1
+            );
+
+            // Find intersections of surf2 edges with surf1 triangles
+            cuts2 = edgeIntersectionsAndShuffleCGAL
+            (
+                rndGen,
+                surf1,
+                surf2PointTol,
+                surf2,
+                edgeCuts2
+            );
+
+            if (cuts1.second() + cuts2.second() == 0)
+            {
+                break;
+            }
+        }
+    }
+}
+
+
+void calcEdgeCutsBitsCGAL
+(
+    triSurface& surf1,
+    triSurface& surf2,
+    const bool perturb,
+    edgeIntersections& edgeCuts1,
+    edgeIntersections& edgeCuts2
+)
+{
+    label nZones1 = 1;
+    labelList zone1;
+    {
+        labelHashSet orientationEdge(surf1.size()/1000);
+        PatchTools::checkOrientation(surf1, false, &orientationEdge);
+        nZones1 = PatchTools::markZones(surf1, orientationEdge, zone1);
+
+        Info<< "Surface triangles " << surf1.size()
+            << " number of zones (orientation or non-manifold):"
+            << nZones1 << endl;
+    }
+
+    label nZones2 = 1;
+    labelList zone2;
+    {
+        labelHashSet orientationEdge(surf2.size()/1000);
+        PatchTools::checkOrientation(surf2, false, &orientationEdge);
+        nZones2 = PatchTools::markZones(surf2, orientationEdge, zone2);
+
+        Info<< "Surface triangles " << surf2.size()
+            << " number of zones (orientation or non-manifold):"
+            << nZones2 << endl;
+    }
+
+
+    if (nZones1 == 1 && nZones2 == 1)
+    {
+        calcEdgeCutsCGAL
+        (
+            surf1,
+            surf2,
+            perturb,
+            edgeCuts1,
+            edgeCuts2
+        );
+    }
+    else
+    {
+        edgeCuts1 = edgeIntersections
+        (
+            List<List<pointIndexHit> >(surf1.nEdges()),
+            labelListList(surf1.nEdges())
+        );
+        edgeCuts2 = edgeIntersections
+        (
+            List<List<pointIndexHit> >(surf2.nEdges()),
+            labelListList(surf2.nEdges())
+        );
+
+
+        for (label zone1I = 0; zone1I < nZones1; zone1I++)
+        {
+            // Generate sub surface for zone1I
+            boolList includeMap1(surf1.size(), false);
+
+            forAll(zone1, faceI)
+            {
+                if (zone1[faceI] == zone1I)
+                {
+                    includeMap1[faceI] = true;
+                }
+            }
+
+            // Subset. Map from local points on subset to local points on
+            // original
+            labelList pointMap1;
+            labelList faceMap1;
+            triSurface subSurf1
+            (
+                surf1.subsetMesh
+                (
+                    includeMap1,
+                    pointMap1,
+                    faceMap1
+                )
+            );
+
+            // Split non-manifold points; update pointMap
+            dupNonManifoldPoints(subSurf1, pointMap1);
+
+            const boundBox subBb1
+            (
+                subSurf1.points(),
+                subSurf1.meshPoints(),
+                false
+            );
+
+            const labelList edgeMap1
+            (
+                matchEdges
+                (
+                    surf1,
+                    subSurf1,
+                    pointMap1
+                )
+            );
+
+
+            for (label zone2I = 0; zone2I < nZones2; zone2I++)
+            {
+                // Generate sub surface for zone2I
+                boolList includeMap2(surf2.size(), false);
+
+                forAll(zone2, faceI)
+                {
+                    if (zone2[faceI] == zone2I)
+                    {
+                        includeMap2[faceI] = true;
+                    }
+                }
+
+                labelList pointMap2;
+                labelList faceMap2;
+                triSurface subSurf2
+                (
+                    surf2.subsetMesh
+                    (
+                        includeMap2,
+                        pointMap2,
+                        faceMap2
+                    )
+                );
+
+
+                const boundBox subBb2
+                (
+                    subSurf2.points(),
+                    subSurf2.meshPoints(),
+                    false
+                );
+
+                // Short-circuit expensive calculations
+                if (!subBb2.overlaps(subBb1))
+                {
+                    continue;
+                }
+
+
+                // Split non-manifold points; update pointMap
+                dupNonManifoldPoints(subSurf2, pointMap2);
+
+                const labelList edgeMap2
+                (
+                    matchEdges
+                    (
+                        surf2,
+                        subSurf2,
+                        pointMap2
+                    )
+                );
+
+
+                // Do cuts
+                edgeIntersections subEdgeCuts1;
+                edgeIntersections subEdgeCuts2;
+                calcEdgeCutsCGAL
+                (
+                    subSurf1,
+                    subSurf2,
+                    perturb,
+                    subEdgeCuts1,
+                    subEdgeCuts2
+                );
+
+                // Move original surface
+                {
+                    pointField points2(surf2.points());
+                    forAll(pointMap2, i)
+                    {
+                        label subMeshPointI = subSurf2.meshPoints()[i];
+                        label meshPointI = surf2.meshPoints()[pointMap2[i]];
+                        points2[meshPointI] = subSurf2.points()[subMeshPointI];
+                    }
+                    surf2.movePoints(points2);
+                }
+
+                // Insert into main structure
+                edgeCuts1.merge(subEdgeCuts1, edgeMap1, faceMap2);
+                edgeCuts2.merge(subEdgeCuts2, edgeMap2, faceMap1);
+            }
+
+
+            // Move original surface
+            {
+                pointField points1(surf1.points());
+                forAll(pointMap1, i)
+                {
+                    label subMeshPointI = subSurf1.meshPoints()[i];
+                    label meshPointI = surf1.meshPoints()[pointMap1[i]];
+                    points1[meshPointI] = subSurf1.points()[subMeshPointI];
+                }
+                surf1.movePoints(points1);
+            }
+        }
+    }
+}
+
+
+#endif // NO_CGAL
+
+
+//void calcFeaturePoints(const pointField& points, const edgeList& edges)
+//{
+//    edgeMesh eMesh(points, edges);
+//
+//    const labelListList& pointEdges = eMesh.pointEdges();
+//
+//
+//    // Get total number of feature points
+//    label nFeaturePoints = 0;
+//    forAll(pointEdges, pI)
+//    {
+//        const labelList& pEdges = pointEdges[pI];
+//
+//        if (pEdges.size() == 1)
+//        {
+//            nFeaturePoints++;
+//        }
+//    }
+//
+//
+//    // Calculate addressing from feature point to cut point and cut edge
+//    labelList featurePointToCutPoint(nFeaturePoints);
+//    labelList featurePointToCutEdge(nFeaturePoints);
+//
+//    label nFeatPts = 0;
+//    forAll(pointEdges, pI)
+//    {
+//        const labelList& pEdges = pointEdges[pI];
+//
+//        if (pEdges.size() == 1)
+//        {
+//            featurePointToCutPoint[nFeatPts] = pI;
+//            featurePointToCutEdge[nFeatPts] = pEdges[0];
+//            nFeatPts++;
+//        }
+//    }
+//
+//
+//
+//    label concaveStart = 0;
+//    label mixedStart = 0;
+//    label nonFeatureStart = nFeaturePoints;
+//
+//
+//    labelListList featurePointNormals(nFeaturePoints);
+//    labelListList featurePointEdges(nFeaturePoints);
+//    labelList regionEdges;
+//}
+
+
+autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
+(
+    const IOobject& io,
+    const booleanSurface::booleanOpType action,
+    const bool surf1Baffle,
+    const bool surf2Baffle,
+    const bool invertedSpace,
+    const triSurface& surf1,
+    const edgeIntersections& edgeCuts1,
+    const triSurface& surf2,
+    const edgeIntersections& edgeCuts2
+)
+{
     // Determine intersection edges from the edge cuts
     surfaceIntersection inter
     (
         surf1,
-        edge1Cuts,
+        edgeCuts1,
         surf2,
-        edge2Cuts
-    );
-
-    fileName sFeatFileName
-    (
-        surf1Name.lessExt().name()
-      + "_"
-      + surf2Name.lessExt().name()
-      + "_"
-      + action
+        edgeCuts2
     );
 
     label nFeatEds = inter.cutEdges().size();
@@ -512,6 +1250,10 @@ int main(int argc, char *argv[])
     List<DynamicList<label> > edgeNormals(nFeatEds);
     List<DynamicList<label> > normalDirections(nFeatEds);
 
+
+    const triSurface& s1 = surf1;
+    const triSurface& s2 = surf2;
+
     forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
     {
         const label& cutEdgeI = iter();
@@ -519,8 +1261,8 @@ int main(int argc, char *argv[])
 
         const edge& fE = inter.cutEdges()[cutEdgeI];
 
-        const vector& norm1 = surf1.faceNormals()[facePair.first()];
-        const vector& norm2 = surf2.faceNormals()[facePair.second()];
+        const vector& norm1 = s1.faceNormals()[facePair.first()];
+        const vector& norm2 = s2.faceNormals()[facePair.second()];
 
         DynamicList<label>& eNormals = edgeNormals[cutEdgeI];
         DynamicList<label>& nDirections = normalDirections[cutEdgeI];
@@ -546,7 +1288,7 @@ int main(int argc, char *argv[])
                     norm1,
                     norm2,
                     edgeDirections[cutEdgeI],
-                    surf1[facePair.first()].centre(surf1.points()),
+                    s1[facePair.first()].centre(s1.points()),
                     inter.cutPoints()[fE.start()]
                 )
             );
@@ -572,7 +1314,7 @@ int main(int argc, char *argv[])
                     norm2,
                     norm1,
                     edgeDirections[cutEdgeI],
-                    surf2[facePair.second()].centre(surf2.points()),
+                    s2[facePair.second()].centre(s2.points()),
                     inter.cutPoints()[fE.start()]
                 )
             );
@@ -600,7 +1342,7 @@ int main(int argc, char *argv[])
                         norm2,
                         norm1,
                         edgeDirections[cutEdgeI],
-                        surf2[facePair.second()].centre(surf2.points()),
+                        s2[facePair.second()].centre(s2.points()),
                         inter.cutPoints()[fE.start()]
                     )
                 );
@@ -630,7 +1372,7 @@ int main(int argc, char *argv[])
                         norm1,
                         norm2,
                         edgeDirections[cutEdgeI],
-                        surf1[facePair.first()].centre(surf1.points()),
+                        s1[facePair.first()].centre(s1.points()),
                         inter.cutPoints()[fE.start()]
                     )
                 );
@@ -675,7 +1417,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (validActions[action] == booleanSurface::UNION)
+    if (action == booleanSurface::UNION)
     {
         if (!invertedSpace)
         {
@@ -688,7 +1430,7 @@ int main(int argc, char *argv[])
             internalStart = nIntOrExt;
         }
     }
-    else if (validActions[action] == booleanSurface::INTERSECTION)
+    else if (action == booleanSurface::INTERSECTION)
     {
         if (!invertedSpace)
         {
@@ -701,14 +1443,14 @@ int main(int argc, char *argv[])
             internalStart = 0;
         }
     }
-    else if (validActions[action] == booleanSurface::DIFFERENCE)
+    else if (action == booleanSurface::DIFFERENCE)
     {
         // All edges are external
         internalStart = nIntOrExt;
     }
     else
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Unsupported booleanSurface:booleanOpType and space "
             << action << " " << invertedSpace
             << abort(FatalError);
@@ -734,42 +1476,257 @@ int main(int argc, char *argv[])
         normalDirectionsTmp[i] = normalDirections[i];
     }
 
-    calcFeaturePoints(inter.cutPoints(), inter.cutEdges());
+    //calcFeaturePoints(inter.cutPoints(), inter.cutEdges());
 
-    extendedFeatureEdgeMesh feMesh
+    return autoPtr<extendedFeatureEdgeMesh>
+    (
+        new extendedFeatureEdgeMesh
+        (
+            io,
+            inter.cutPoints(),
+            inter.cutEdges(),
+
+            0,                  // concaveStart,
+            0,                  // mixedStart,
+            0,                  // nonFeatureStart,
+
+            internalStart,      // internalStart,
+            nIntOrExt,           // flatStart,
+            nIntOrExt + nFlat,   // openStart,
+            nIntOrExt + nFlat + nOpen,   // multipleStart,
+
+            normalsTmp,
+            normalVolumeTypesTmp,
+            edgeDirections,
+            normalDirectionsTmp,
+            edgeNormalsTmp,
+
+            labelListList(0),   // featurePointNormals,
+            labelListList(0),   // featurePointEdges,
+            labelList(0)        // regionEdges
+        )
+    );
+}
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validArgs.append("action");
+    argList::validArgs.append("surface file");
+    argList::validArgs.append("surface file");
+
+    argList::addBoolOption
+    (
+        "surf1Baffle",
+        "Mark surface 1 as a baffle"
+    );
+
+    argList::addBoolOption
+    (
+        "surf2Baffle",
+        "Mark surface 2 as a baffle"
+    );
+
+    argList::addBoolOption
+    (
+        "perturb",
+        "Perturb surface points to escape degenerate intersections"
+    );
+
+    argList::addBoolOption
+    (
+        "invertedSpace",
+        "do the surfaces have inverted space orientation, "
+        "i.e. a point at infinity is considered inside. "
+        "This is only sensible for union and intersection."
+    );
+
+    argList::addOption
+    (
+        "trim",
+        "((surface1 volumeType) .. (surfaceN volumeType))",
+        "Trim resulting intersection with additional surfaces;"
+        " volumeType is 'inside' (keep (parts of) edges that are inside)"
+        ", 'outside' (keep (parts of) edges that are outside) or"
+        " 'mixed' (keep all)"
+    );
+
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    word action(args.args()[1]);
+
+    HashTable<booleanSurface::booleanOpType> validActions;
+    validActions.insert("intersection", booleanSurface::INTERSECTION);
+    validActions.insert("union", booleanSurface::UNION);
+    validActions.insert("difference", booleanSurface::DIFFERENCE);
+
+    if (!validActions.found(action))
+    {
+        FatalErrorInFunction
+            << "Unsupported action " << action << endl
+            << "Supported actions:" << validActions.toc() << abort(FatalError);
+    }
+
+
+    List<Pair<word> > surfaceAndSide;
+    if (args.optionReadIfPresent("trim", surfaceAndSide))
+    {
+        Info<< "Trimming edges with " << surfaceAndSide << endl;
+    }
+
+
+    const word surf1Name(args.args()[2]);
+    Info<< "Reading surface " << surf1Name << endl;
+    triSurfaceMesh surf1
     (
         IOobject
         (
-            sFeatFileName + ".extendedFeatureEdgeMesh",
+            surf1Name,
             runTime.constant(),
-            "extendedFeatureEdgeMesh",
-            runTime,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        inter.cutPoints(),
-        inter.cutEdges(),
-
-        0,                  // concaveStart,
-        0,                  // mixedStart,
-        0,                  // nonFeatureStart,
-
-        internalStart,      // internalStart,
-        nIntOrExt,           // flatStart,
-        nIntOrExt + nFlat,   // openStart,
-        nIntOrExt + nFlat + nOpen,   // multipleStart,
-
-        normalsTmp,
-        normalVolumeTypesTmp,
-        edgeDirections,
-        normalDirectionsTmp,
-        edgeNormalsTmp,
-
-        labelListList(0),   // featurePointNormals,
-        labelListList(0),   // featurePointEdges,
-        labelList(0)        // regionEdges
+            triSurfaceMesh::meshSubDir,
+            runTime
+        )
     );
 
+    Info<< surf1Name << " statistics:" << endl;
+    surf1.writeStats(Info);
+    Info<< endl;
+
+    const word surf2Name(args[3]);
+    Info<< "Reading surface " << surf2Name << endl;
+    triSurfaceMesh surf2
+    (
+        IOobject
+        (
+            surf2Name,
+            runTime.constant(),
+            triSurfaceMesh::meshSubDir,
+            runTime
+        )
+    );
+
+    Info<< surf2Name << " statistics:" << endl;
+    surf2.writeStats(Info);
+    Info<< endl;
+
+    const bool surf1Baffle = args.optionFound("surf1Baffle");
+    const bool surf2Baffle = args.optionFound("surf2Baffle");
+
+    edgeIntersections edgeCuts1;
+    edgeIntersections edgeCuts2;
+
+    bool invertedSpace = args.optionFound("invertedSpace");
+
+    if (invertedSpace && validActions[action] == booleanSurface::DIFFERENCE)
+    {
+        FatalErrorInFunction
+            << "Inverted space only makes sense for union or intersection."
+            << exit(FatalError);
+    }
+
+
+#ifdef NO_CGAL
+    // Calculate the points where the edges are cut by the other surface
+    calcEdgeCuts
+    (
+        surf1,
+        surf2,
+        args.optionFound("perturb"),
+        edgeCuts1,
+        edgeCuts2
+    );
+#else
+    //calcEdgeCutsCGAL
+    calcEdgeCutsBitsCGAL
+    (
+        surf1,
+        surf2,
+        args.optionFound("perturb"),
+        edgeCuts1,
+        edgeCuts2
+    );
+#endif // NO_CGAL
+
+
+    const fileName sFeatFileName
+    (
+        fileName(surf1Name).lessExt().name()
+      + "_"
+      + fileName(surf2Name).lessExt().name()
+      + "_"
+      + action
+    );
+
+    autoPtr<extendedFeatureEdgeMesh> feMeshPtr
+    (
+        createEdgeMesh
+        (
+            IOobject
+            (
+                sFeatFileName + ".extendedFeatureEdgeMesh",
+                runTime.constant(),
+                "extendedFeatureEdgeMesh",
+                runTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            booleanSurface::booleanOpTypeNames[action],
+            surf1Baffle,
+            surf2Baffle,
+            invertedSpace,
+            surf1,
+            edgeCuts1,
+            surf2,
+            edgeCuts2
+        )
+    );
+
+
+    // Trim intersections
+    forAll(surfaceAndSide, trimI)
+    {
+        const word& trimName = surfaceAndSide[trimI].first();
+        const volumeType trimType
+        (
+            volumeType::names[surfaceAndSide[trimI].second()]
+        );
+
+        Info<< "Reading trim surface " << trimName << endl;
+        const triSurfaceMesh trimSurf
+        (
+            IOobject
+            (
+                trimName,
+                runTime.constant(),
+                triSurfaceMesh::meshSubDir,
+                runTime,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        Info<< trimName << " statistics:" << endl;
+        trimSurf.writeStats(Info);
+        Info<< endl;
+
+        labelList pointMap;
+        labelList edgeMap;
+        feMeshPtr().trim
+        (
+            trimSurf,
+            trimType,
+            pointMap,
+            edgeMap
+        );
+    }
+
+
+    const extendedFeatureEdgeMesh& feMesh = feMeshPtr();
+
+    feMesh.writeStats(Info);
+
     feMesh.write();
 
     feMesh.writeObj(feMesh.path()/sFeatFileName);
@@ -782,7 +1739,7 @@ int main(int argc, char *argv[])
             (
                 sFeatFileName + ".eMesh",   // name
                 runTime.constant(),                         // instance
-                "triSurface",
+                triSurfaceMesh::meshSubDir,
                 runTime,                                    // registry
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 6ec067aa84..16989e4771 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -57,7 +57,7 @@ bool validTri
     {
         if (f[fp] < 0 || f[fp] >= surf.points().size())
         {
-            WarningIn("validTri(const triSurface&, const label)")
+            WarningInFunction
                 << "triangle " << faceI << " vertices " << f
                 << " uses point indices outside point range 0.."
                 << surf.points().size()-1 << endl;
@@ -67,7 +67,7 @@ bool validTri
 
     if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
     {
-        WarningIn("validTri(const triSurface&, const label)")
+        WarningInFunction
             << "triangle " << faceI
             << " uses non-unique vertices " << f
             << " coords:" << f.points(surf.points())
@@ -100,7 +100,7 @@ bool validTri
          && ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
         )
         {
-            WarningIn("validTri(const triSurface&, const label)")
+            WarningInFunction
                 << "triangle " << faceI << " vertices " << f
                 << " has the same vertices as triangle " << nbrFaceI
                 << " vertices " << nbrF
@@ -146,11 +146,8 @@ labelList countBins
 
             if ((index < 0) || (index >= nBins))
             {
-                WarningIn
-                (
-                    "countBins(const scalar, const scalar, const label"
-                    ", const scalarField&)"
-                )   << "value " << val << " at index " << i
+                WarningInFunction
+                    << "value " << val << " at index " << i
                     << " outside range " << min << " .. " << max << endl;
 
                 if (index < 0)
@@ -170,6 +167,101 @@ labelList countBins
 }
 
 
+
+void writeZoning
+(
+    const triSurface& surf,
+    const labelList& faceZone,
+    const word& fieldName,
+    const fileName& surfFilePath,
+    const fileName& surfFileNameBase
+)
+{
+    Info<< "Writing zoning to "
+        <<  fileName
+            (
+                surfFilePath
+              / fieldName
+              + '_'
+              + surfFileNameBase
+              + '.'
+              + vtkSurfaceWriter::typeName
+            )
+        << "..." << endl << endl;
+
+    // Convert data
+    scalarField scalarFaceZone(faceZone.size());
+    forAll(faceZone, i)
+    {
+        scalarFaceZone[i] = faceZone[i];
+    }
+    faceList faces(surf.size());
+    forAll(surf, i)
+    {
+        faces[i] = surf[i].triFaceFace();
+    }
+
+    vtkSurfaceWriter().write
+    (
+        surfFilePath,
+        surfFileNameBase,
+        surf.points(),
+        faces,
+        fieldName,
+        scalarFaceZone,
+        false               // face based data
+    );
+}
+
+
+void writeParts
+(
+    const triSurface& surf,
+    const label nFaceZones,
+    const labelList& faceZone,
+    const fileName& surfFilePath,
+    const fileName& surfFileNameBase
+)
+{
+    for (label zone = 0; zone < nFaceZones; zone++)
+    {
+        boolList includeMap(surf.size(), false);
+
+        forAll(faceZone, faceI)
+        {
+            if (faceZone[faceI] == zone)
+            {
+                includeMap[faceI] = true;
+            }
+        }
+
+        labelList pointMap;
+        labelList faceMap;
+
+        triSurface subSurf
+        (
+            surf.subsetMesh
+            (
+                includeMap,
+                pointMap,
+                faceMap
+            )
+        );
+
+        fileName subName
+        (
+            surfFilePath
+           /surfFileNameBase + "_" + name(zone) + ".obj"
+        );
+
+        Info<< "writing part " << zone << " size " << subSurf.size()
+            << " to " << subName << endl;
+
+        subSurf.write(subName);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
@@ -218,6 +310,20 @@ int main(int argc, char *argv[])
     surf.writeStats(Info);
     Info<< endl;
 
+
+    // Determine path and extension
+    fileName surfFileNameBase(surfFileName.name());
+    const word fileType = surfFileNameBase.ext();
+    // Strip extension
+    surfFileNameBase = surfFileNameBase.lessExt();
+    // If extension was .gz strip original extension
+    if (fileType == "gz")
+    {
+        surfFileNameBase = surfFileNameBase.lessExt();
+    }
+    const fileName surfFilePath(surfFileName.path());
+
+
     // write bounding box corners
     if (args.optionFound("blockMesh"))
     {
@@ -257,7 +363,7 @@ int main(int argc, char *argv[])
 
             if (region < 0 || region >= regionSize.size())
             {
-                WarningIn(args.executable())
+                WarningInFunction
                     << "Triangle " << faceI << " vertices " << surf[faceI]
                     << " has region " << region << " which is outside the range"
                     << " of regions 0.." << surf.patches().size()-1
@@ -324,7 +430,7 @@ int main(int argc, char *argv[])
 
             if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
             {
-                //WarningIn(args.executable())
+                //WarningInFunction
                 //    << "Illegal triangle " << faceI << " vertices " << f
                 //    << " coords " << f.points(surf.points()) << endl;
             }
@@ -371,7 +477,7 @@ int main(int argc, char *argv[])
 
         if (triQ[minIndex] < SMALL)
         {
-            WarningIn(args.executable()) << "Minimum triangle quality is "
+            WarningInFunction
                 << triQ[minIndex] << ". This might give problems in"
                 << " self-intersection testing later on." << endl;
         }
@@ -515,12 +621,12 @@ int main(int argc, char *argv[])
 
     DynamicList<label> problemFaces(surf.size()/100 + 1);
 
-    const labelListList& eFaces = surf.edgeFaces();
+    const labelListList& edgeFaces = surf.edgeFaces();
 
     label nSingleEdges = 0;
-    forAll(eFaces, edgeI)
+    forAll(edgeFaces, edgeI)
     {
-        const labelList& myFaces = eFaces[edgeI];
+        const labelList& myFaces = edgeFaces[edgeI];
 
         if (myFaces.size() == 1)
         {
@@ -531,9 +637,9 @@ int main(int argc, char *argv[])
     }
 
     label nMultEdges = 0;
-    forAll(eFaces, edgeI)
+    forAll(edgeFaces, edgeI)
     {
-        const labelList& myFaces = eFaces[edgeI];
+        const labelList& myFaces = edgeFaces[edgeI];
 
         if (myFaces.size() > 2)
         {
@@ -549,7 +655,8 @@ int main(int argc, char *argv[])
 
     if ((nSingleEdges != 0) || (nMultEdges != 0))
     {
-        Info<< "Surface is not closed since not all edges connected to "
+        Info<< "Surface is not closed since not all edges ("
+            << edgeFaces.size() << ") connected to "
             << "two faces:" << endl
             << "    connected to one face : " << nSingleEdges << endl
             << "    connected to >2 faces : " << nMultEdges << endl;
@@ -578,10 +685,9 @@ int main(int argc, char *argv[])
         boolList borderEdge(surf.nEdges(), false);
         if (splitNonManifold)
         {
-            const labelListList& eFaces = surf.edgeFaces();
-            forAll(eFaces, edgeI)
+            forAll(edgeFaces, edgeI)
             {
-                if (eFaces[edgeI].size() > 2)
+                if (edgeFaces[edgeI].size() > 2)
                 {
                     borderEdge[edgeI] = true;
                 }
@@ -597,85 +703,15 @@ int main(int argc, char *argv[])
         {
             Info<< "Splitting surface into parts ..." << endl << endl;
 
-            fileName surfFileNameBase(surfFileName.name());
-            const word fileType = surfFileNameBase.ext();
-            // Strip extension
-            surfFileNameBase = surfFileNameBase.lessExt();
-            // If extension was .gz strip original extension
-            if (fileType == "gz")
-            {
-                surfFileNameBase = surfFileNameBase.lessExt();
-            }
-
-
-            {
-                Info<< "Writing zoning to "
-                    <<  fileName
-                        (
-                            "zone_"
-                          + surfFileNameBase
-                          + '.'
-                          + vtkSurfaceWriter::typeName
-                        )
-                    << "..." << endl << endl;
-
-                // Convert data
-                scalarField scalarFaceZone(faceZone.size());
-                forAll(faceZone, i)
-                {
-                    scalarFaceZone[i] = faceZone[i];
-                }
-                faceList faces(surf.size());
-                forAll(surf, i)
-                {
-                    faces[i] = surf[i].triFaceFace();
-                }
-
-                vtkSurfaceWriter().write
-                (
-                    surfFileName.path(),
-                    surfFileNameBase,
-                    surf.points(),
-                    faces,
-                    "zone",
-                    scalarFaceZone,
-                    false               // face based data
-                );
-            }
-
-
-            for (label zone = 0; zone < numZones; zone++)
-            {
-                boolList includeMap(surf.size(), false);
-
-                forAll(faceZone, faceI)
-                {
-                    if (faceZone[faceI] == zone)
-                    {
-                        includeMap[faceI] = true;
-                    }
-                }
-
-                labelList pointMap;
-                labelList faceMap;
-
-                triSurface subSurf
-                (
-                    surf.subsetMesh
-                    (
-                        includeMap,
-                        pointMap,
-                        faceMap
-                    )
-                );
-
-                fileName subName(surfFileNameBase + "_" + name(zone) + ".obj");
-
-                Info<< "writing part " << zone << " size " << subSurf.size()
-                    << " to " << subName << endl;
-
-                subSurf.write(subName);
-            }
+            writeZoning(surf, faceZone, "zone", surfFilePath, surfFileNameBase);
+            writeParts
+            (
+                surf,
+                numZones,
+                faceZone,
+                surfFilePath,
+                surfFileNameBase
+            );
         }
     }
 
@@ -700,6 +736,15 @@ int main(int argc, char *argv[])
     if (numNormalZones > 1)
     {
         Info<< "More than one normal orientation." << endl;
+        writeZoning(surf, normalZone, "normal", surfFilePath, surfFileNameBase);
+        writeParts
+        (
+            surf,
+            numNormalZones,
+            normalZone,
+            surfFilePath,
+            surfFileNameBase + "_normal"
+        );
     }
     Info<< endl;
 
diff --git a/applications/utilities/surface/surfaceClean/collapseBase.C b/applications/utilities/surface/surfaceClean/collapseBase.C
index ceb834b56f..0bf6717628 100644
--- a/applications/utilities/surface/surfaceClean/collapseBase.C
+++ b/applications/utilities/surface/surfaceClean/collapseBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,7 +175,7 @@ static void splitTri
     }
     else
     {
-        FatalErrorIn("splitTri(..)")
+        FatalErrorInFunction
             << "Edge " << e << " not part of triangle " << f
             << " fp:" << fp
             << " fp1:" << fp1
@@ -206,14 +206,14 @@ static bool insertSorted
 {
     if (findIndex(sortedVerts, vertI) != -1)
     {
-        FatalErrorIn("insertSorted(..)") << "Trying to insert vertex " << vertI
+        FatalErrorInFunction
             << " which is already in list of sorted vertices "
             << sortedVerts << abort(FatalError);
     }
 
     if (weight <= 0 || weight >= 1)
     {
-        FatalErrorIn("insertSorted(..)") << "Trying to insert vertex " << vertI
+        FatalErrorInFunction
             << " with illegal weight " << weight
             << " into list of sorted vertices "
             << sortedVerts << abort(FatalError);
@@ -228,7 +228,7 @@ static bool insertSorted
 
         if (mag(w - weight) < SMALL)
         {
-            WarningIn("insertSorted(..)")
+            WarningInFunction
                 << "Trying to insert weight " << weight << " which is close to"
                 << " existing weight " << w << " in " << sortedWeights
                 << endl;
@@ -359,7 +359,7 @@ static void markCollapsedFaces
                 // Mark face as being collapsed
                 if (faceToEdge[faceI] != -1)
                 {
-                    FatalErrorIn("markCollapsedFaces(..)")
+                    FatalErrorInFunction
                         << "Cannot collapse face " << faceI << " since "
                         << " is marked to be collapsed both to edge "
                         << faceToEdge[faceI] << " and " << edgeI
@@ -386,7 +386,7 @@ static void markRegion
 {
     if (faceToEdge[faceI] == -1 || collapseRegion[faceI] != -1)
     {
-        FatalErrorIn("markRegion(..)")
+        FatalErrorInFunction
             << "Problem : crossed into uncollapsed/regionized face"
             << abort(FatalError);
     }
@@ -422,7 +422,7 @@ static void markRegion
                 }
                 else if (collapseRegion[nbrFaceI] != regionI)
                 {
-                    FatalErrorIn("markRegion(..)")
+                    FatalErrorInFunction
                         << "Edge:" << edgeI << " between face " << faceI
                         << " with region " << regionI
                         << " and face " << nbrFaceI
@@ -494,7 +494,7 @@ static label edgeType
         }
         else if (usesRegion != region)
         {
-            FatalErrorIn("edgeRegion") << abort(FatalError);
+            FatalErrorInFunction << abort(FatalError);
         }
         else
         {
@@ -519,7 +519,7 @@ static label edgeType
     {
         if (usesRegion == -1)
         {
-            FatalErrorIn("edgeRegion") << abort(FatalError);
+            FatalErrorInFunction << abort(FatalError);
             return -2;
         }
         else
@@ -640,7 +640,7 @@ static void projectNonSpanPoints
 
             if (!pHit.hit())
             {
-                FatalErrorIn("projectNonSpanPoints")
+                FatalErrorInFunction
                     << abort(FatalError);
             }
 
@@ -737,7 +737,7 @@ static void getSplitVerts
 
         if (i0 == -1 || i1 == -1)
         {
-            FatalErrorIn("getSplitVerts")
+            FatalErrorInFunction
                 << "Did not find edge in projected vertices." << nl
                 << "region:" << regionI << nl
                 << "spanPoints:" << spanPoints
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index acea21f0be..eecdbb5155 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -25,6 +25,9 @@ Application
     surfaceClean
 
 Description
+    Utility to clean surfaces.
+
+    Current functionality
     - removes baffles
     - collapses small edges, removing triangles.
     - converts sliver triangles into split edges by projecting point onto
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 4fcb9b1978..05f4001409 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,12 +25,15 @@ Application
     surfaceCoarsen
 
 Description
-    Surface coarsening using 'bunnylod':
+    Surface coarsening using `bunnylod'
 
+    Reference:
+    \verbatim
         Polygon Reduction Demo
         By Stan Melax (c) 1998
         mailto:melax@cs.ualberta.ca
         http://www.cs.ualberta.ca/~melax
+    \endverbatim
 
 \*---------------------------------------------------------------------------*/
 
@@ -77,7 +80,7 @@ int main(int argc, char *argv[])
 
     if (reduction <= 0 || reduction > 1)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Reduction factor " << reduction
             << " should be within 0..1" << endl
             << "(it is the reduction in number of vertices)"
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index 5d826824d0..1d79b08059 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     if (importName == exportName)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Output file " << exportName << " would overwrite input file."
             << exit(FatalError);
     }
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index fadf9a7ec7..1263b7813a 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,15 +61,15 @@ int main(int argc, char *argv[])
     const fileName importName = args[1];
     const fileName exportName = args[2];
 
-    // disable inplace editing
+    // Disable inplace editing
     if (importName == exportName)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Output file " << exportName << " would overwrite input file."
             << exit(FatalError);
     }
 
-    // check that reading/writing is supported
+    // Check that reading/writing is supported
     if
     (
         !edgeMesh::canReadType(importName.ext(), true)
@@ -99,7 +99,6 @@ int main(int argc, char *argv[])
 
     mesh.write(exportName);
     mesh.writeStats(Info);
-    Info<< endl;
 
     Info<< "\nEnd\n" << endl;
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index db28d8fbe1..0ee2abbfbd 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,7 +73,7 @@ scalar calcVertexNormalWeight
 
     if (index == -1)
     {
-        FatalErrorIn("calcVertexNormals()")
+        FatalErrorInFunction
             << "Point not in face" << abort(FatalError);
     }
 
@@ -853,7 +853,7 @@ surfaceFeatures::edgeStatus checkFlatRegionEdge
             }
             else if (dir == 0)
             {
-                FatalErrorIn("problem.")
+                FatalErrorInFunction
                     << exit(FatalError);
             }
             else
@@ -1083,7 +1083,7 @@ int main(int argc, char *argv[])
         }
         else
         {
-            FatalErrorIn(args.executable())
+            FatalErrorInFunction
                 << "No initial feature set. Provide either one"
                 << " of extractFromFile (to read existing set)" << nl
                 << " or extractFromSurface (to construct new set from angle)"
@@ -1454,7 +1454,7 @@ int main(int argc, char *argv[])
                 {
                     drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
 
-                    // FatalErrorIn(args.executable())
+                    // FatalErrorInFunction
                     //     << "findLineAll did not hit its own face."
                     //     << exit(FatalError);
                 }
@@ -1462,7 +1462,7 @@ int main(int argc, char *argv[])
                 {
                     if (!hitInfo[0].hit())
                     {
-                        // FatalErrorIn(args.executable())
+                        // FatalErrorInFunction
                         //     << "findLineAll did not hit any face."
                         //     << exit(FatalError);
                     }
@@ -1478,7 +1478,7 @@ int main(int argc, char *argv[])
                             hitInfo
                         );
 
-                        // FatalErrorIn(args.executable())
+                        // FatalErrorInFunction
                         //     << "findLineAll did not hit its own face."
                         //     << exit(FatalError);
                     }
@@ -1511,7 +1511,7 @@ int main(int argc, char *argv[])
                             hitInfo
                         );
 
-                        // FatalErrorIn(args.executable())
+                        // FatalErrorInFunction
                         //     << "findLineAll did not hit its own face."
                         //     << exit(FatalError);
                     }
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index 4928b881a0..82bca3965b 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 7813eaba79..4c5a91d108 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
 
                     if (eFaces.size() != 1)
                     {
-                        WarningIn(args.executable())
+                        WarningInFunction
                             << "Edge is attached to " << eFaces.size()
                             << " faces." << endl;
 
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUpDict b/applications/utilities/surface/surfaceHookUp/surfaceHookUpDict
index b25f21b5d8..bd39aa8ab0 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUpDict
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUpDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 6b30f610b1..2bd44076a8 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -2,8 +2,8 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2013 OpenFOAM Foundation
-    \\/      M anipulation   |
+   \\  /     A nd            | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\/      M anipulation   | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,8 +26,9 @@ Application
 
 Description
     Calculates the inertia tensor, principal axes and moments of a
-    command line specified triSurface. Inertia can either be of the
-    solid body or of a thin shell.
+    command line specified triSurface.
+
+    Inertia can either be of the solid body or of a thin shell.
 
 \*---------------------------------------------------------------------------*/
 
@@ -103,7 +104,7 @@ int main(int argc, char *argv[])
 
     if (m < 0)
     {
-        WarningIn(args.executable() + "::main")
+        WarningInFunction
             << "Negative mass detected, the surface may be inside-out." << endl;
     }
 
@@ -117,7 +118,7 @@ int main(int argc, char *argv[])
 
     while ((magSqr(eVal) < VSMALL) && pertI < 10)
     {
-        WarningIn(args.executable() + "::main")
+        WarningInFunction
             << "No eigenValues found, shape may have symmetry, "
             << "perturbing inertia tensor diagonal" << endl;
 
@@ -320,7 +321,7 @@ int main(int argc, char *argv[])
     }
     else
     {
-        WarningIn(args.executable() + "::main")
+        WarningInFunction
             << "Non-unique eigenvectors, cannot compute transformation "
             << "from Cartesian axes" << endl;
 
@@ -337,7 +338,7 @@ int main(int argc, char *argv[])
 
         if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
         {
-            WarningIn(args.executable())
+            WarningInFunction
                << "Illegal triangle " << faceI << " vertices " << f
                << " coords " << f.points(surf.points()) << endl;
         }
@@ -406,7 +407,7 @@ int main(int argc, char *argv[])
         str << "l " << 1 << ' ' << i + 1 << endl;
     }
 
-    Info<< nl << "End" << nl << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/surface/surfaceInflate/Make/files b/applications/utilities/surface/surfaceInflate/Make/files
new file mode 100644
index 0000000000..8677a01c39
--- /dev/null
+++ b/applications/utilities/surface/surfaceInflate/Make/files
@@ -0,0 +1,3 @@
+surfaceInflate.C
+
+EXE = $(FOAM_APPBIN)/surfaceInflate
diff --git a/applications/utilities/surface/surfaceInflate/Make/options b/applications/utilities/surface/surfaceInflate/Make/options
new file mode 100644
index 0000000000..6c6cd12287
--- /dev/null
+++ b/applications/utilities/surface/surfaceInflate/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+    -I$(FOAM_SRC)/triSurface/lnInclude \
+    -I$(FOAM_SRC)/surfMesh/lnInclude \
+    -I$(FOAM_SRC)/meshTools/lnInclude
+
+
+EXE_LIBS = \
+    -ltriSurface \
+    -lsurfMesh \
+    -lmeshTools
diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
new file mode 100644
index 0000000000..aeb9b87d1c
--- /dev/null
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -0,0 +1,880 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    surfaceInflate
+
+Description
+    Inflates surface. WIP. Checks for overlaps and locally lowers
+    inflation distance
+
+Usage
+    - surfaceInflate [OPTION]
+
+    \param -checkSelfIntersection \n
+    Includes checks for self-intersection.
+
+    \param -nSmooth
+    Specify number of smoothing iterations
+
+    \param -featureAngle
+    Specify a feature angle
+
+
+    E.g. inflate surface by 2cm with 1.5 safety factor:
+        surfaceInflate DTC-scaled.obj 0.02 1.5 -featureAngle 45 -nSmooth 2
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "triSurfaceFields.H"
+#include "triSurfaceMesh.H"
+#include "triSurfaceGeoMesh.H"
+#include "PackedBoolList.H"
+#include "OBJstream.H"
+#include "surfaceFeatures.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scalar calcVertexNormalWeight
+(
+    const triFace& f,
+    const label pI,
+    const vector& fN,
+    const pointField& points
+)
+{
+    label index = findIndex(f, pI);
+
+    if (index == -1)
+    {
+        FatalErrorInFunction
+            << "Point not in face" << abort(FatalError);
+    }
+
+    const vector e1 = points[f[index]] - points[f[f.fcIndex(index)]];
+    const vector e2 = points[f[index]] - points[f[f.rcIndex(index)]];
+
+    return mag(fN)/(magSqr(e1)*magSqr(e2) + VSMALL);
+}
+
+
+tmp<vectorField> calcVertexNormals(const triSurface& surf)
+{
+    // Weighted average of normals of faces attached to the vertex
+    // Weight = fA / (mag(e0)^2 * mag(e1)^2);
+    tmp<vectorField> tpointNormals
+    (
+        new pointField(surf.nPoints(), vector::zero)
+    );
+    vectorField& pointNormals = tpointNormals();
+
+    const pointField& points = surf.points();
+    const labelListList& pointFaces = surf.pointFaces();
+    const labelList& meshPoints = surf.meshPoints();
+
+    forAll(pointFaces, pI)
+    {
+        const labelList& pFaces = pointFaces[pI];
+
+        forAll(pFaces, fI)
+        {
+            const label faceI = pFaces[fI];
+            const triFace& f = surf[faceI];
+
+            vector fN = f.normal(points);
+
+            scalar weight = calcVertexNormalWeight
+            (
+                f,
+                meshPoints[pI],
+                fN,
+                points
+            );
+
+            pointNormals[pI] += weight*fN;
+        }
+
+        pointNormals[pI] /= mag(pointNormals[pI]) + VSMALL;
+    }
+
+    return tpointNormals;
+}
+
+
+tmp<vectorField> calcPointNormals
+(
+    const triSurface& s,
+    const PackedBoolList& isFeaturePoint,
+    const List<surfaceFeatures::edgeStatus>& edgeStat
+)
+{
+    //const pointField pointNormals(s.pointNormals());
+    tmp<vectorField> tpointNormals(calcVertexNormals(s));
+    vectorField& pointNormals = tpointNormals();
+
+
+    // feature edges: create edge normals from edgeFaces only.
+    {
+        const labelListList& edgeFaces = s.edgeFaces();
+
+        labelList nNormals(s.nPoints(), 0);
+        forAll(edgeStat, edgeI)
+        {
+            if (edgeStat[edgeI] != surfaceFeatures::NONE)
+            {
+                const edge& e = s.edges()[edgeI];
+                forAll(e, i)
+                {
+                    if (!isFeaturePoint[e[i]])
+                    {
+                        pointNormals[e[i]] = vector::zero;
+                    }
+                }
+            }
+        }
+
+        forAll(edgeStat, edgeI)
+        {
+            if (edgeStat[edgeI] != surfaceFeatures::NONE)
+            {
+                const labelList& eFaces = edgeFaces[edgeI];
+
+                // Get average edge normal
+                vector n = vector::zero;
+                forAll(eFaces, i)
+                {
+                    n += s.faceNormals()[eFaces[i]];
+                }
+                n /= eFaces.size();
+
+
+                // Sum to points
+                const edge& e = s.edges()[edgeI];
+                forAll(e, i)
+                {
+                    if (!isFeaturePoint[e[i]])
+                    {
+                        pointNormals[e[i]] += n;
+                        nNormals[e[i]]++;
+                    }
+                }
+            }
+        }
+
+        forAll(nNormals, pointI)
+        {
+            if (nNormals[pointI] > 0)
+            {
+                pointNormals[pointI] /= mag(pointNormals[pointI]);
+            }
+        }
+    }
+
+
+    forAll(pointNormals, pointI)
+    {
+        if (mag(mag(pointNormals[pointI])-1) > SMALL)
+        {
+            FatalErrorInFunction
+                << "unitialised"
+                << exit(FatalError);
+        }
+    }
+
+    return tpointNormals;
+}
+
+
+void detectSelfIntersections
+(
+    const triSurfaceMesh& s,
+    PackedBoolList& isEdgeIntersecting
+)
+{
+    const edgeList& edges = s.edges();
+    const indexedOctree<treeDataTriSurface>& tree = s.tree();
+    const labelList& meshPoints = s.meshPoints();
+    const pointField& points = s.points();
+
+    isEdgeIntersecting.setSize(edges.size());
+    isEdgeIntersecting = false;
+
+    forAll(edges, edgeI)
+    {
+        const edge& e = edges[edgeI];
+
+        pointIndexHit hitInfo
+        (
+            tree.findLine
+            (
+                points[meshPoints[e[0]]],
+                points[meshPoints[e[1]]],
+                treeDataTriSurface::findSelfIntersectOp(tree, edgeI)
+            )
+        );
+
+        if (hitInfo.hit())
+        {
+            isEdgeIntersecting[edgeI] = true;
+        }
+    }
+}
+
+
+label detectIntersectionPoints
+(
+    const scalar tolerance,
+    const triSurfaceMesh& s,
+
+    const scalar extendFactor,
+    const pointField& initialPoints,
+    const vectorField& displacement,
+
+    const bool checkSelfIntersect,
+    const PackedBoolList& initialIsEdgeIntersecting,
+
+    PackedBoolList& isPointOnHitEdge,
+    scalarField& scale
+)
+{
+    const pointField initialLocalPoints(initialPoints, s.meshPoints());
+    const List<labelledTri>& localFaces = s.localFaces();
+
+
+    label nHits = 0;
+    isPointOnHitEdge.setSize(s.nPoints());
+    isPointOnHitEdge = false;
+
+
+    // 1. Extrusion offset vectors intersecting new surface location
+    {
+        scalar tol = max(tolerance, 10*s.tolerance());
+
+        // Collect all the edge vectors. Slightly shorten the edges to prevent
+        // finding lots of intersections. The fast triangle intersection routine
+        // has problems with rays passing through a point of the
+        // triangle.
+        pointField start(initialLocalPoints+tol*displacement);
+        pointField end(initialLocalPoints+extendFactor*displacement);
+
+        List<pointIndexHit> hits;
+        s.findLineAny(start, end, hits);
+
+        forAll(hits, pointI)
+        {
+            if
+            (
+                hits[pointI].hit()
+            &&  findIndex(localFaces[hits[pointI].index()], pointI) == -1
+            )
+            {
+                scale[pointI] = max(0.0, scale[pointI]-0.2);
+
+                isPointOnHitEdge[pointI] = true;
+                nHits++;
+            }
+        }
+    }
+
+
+    // 2. (new) surface self intersections
+    if (checkSelfIntersect)
+    {
+        PackedBoolList isEdgeIntersecting;
+        detectSelfIntersections(s, isEdgeIntersecting);
+
+        const edgeList& edges = s.edges();
+        const pointField& points = s.points();
+
+        forAll(edges, edgeI)
+        {
+            const edge& e = edges[edgeI];
+
+            if (isEdgeIntersecting[edgeI] && !initialIsEdgeIntersecting[edgeI])
+            {
+                if (isPointOnHitEdge.set(e[0]))
+                {
+                    label start = s.meshPoints()[e[0]];
+                    const point& pt = points[start];
+
+                    Pout<< "Additional self intersection at "
+                        << pt
+                        << endl;
+
+                    scale[e[0]] = max(0.0, scale[e[0]]-0.2);
+                    nHits++;
+                }
+                if (isPointOnHitEdge.set(e[1]))
+                {
+                    label end = s.meshPoints()[e[1]];
+                    const point& pt = points[end];
+
+                    Pout<< "Additional self intersection at "
+                        << pt
+                        << endl;
+
+                    scale[e[1]] = max(0.0, scale[e[1]]-0.2);
+                    nHits++;
+                }
+            }
+        }
+    }
+
+    return nHits;
+}
+
+
+tmp<scalarField> avg
+(
+    const triSurface& s,
+    const scalarField& fld,
+    const scalarField& edgeWeights
+)
+{
+    tmp<scalarField> tres(new scalarField(s.nPoints(), 0.0));
+    scalarField& res = tres();
+
+    scalarField sumWeight(s.nPoints(), 0.0);
+
+    const edgeList& edges = s.edges();
+
+    forAll(edges, edgeI)
+    {
+        const edge& e = edges[edgeI];
+        const scalar w = edgeWeights[edgeI];
+
+        res[e[0]] += w*fld[e[1]];
+        sumWeight[e[0]] += w;
+
+        res[e[1]] += w*fld[e[0]];
+        sumWeight[e[1]] += w;
+    }
+
+    // Average
+    // ~~~~~~~
+
+    forAll(res, pointI)
+    {
+        if (mag(sumWeight[pointI]) < VSMALL)
+        {
+            // Unconnected point. Take over original value
+            res[pointI] = fld[pointI];
+        }
+        else
+        {
+            res[pointI] /= sumWeight[pointI];
+        }
+    }
+
+    return tres;
+}
+
+
+void minSmooth
+(
+    const triSurface& s,
+    const PackedBoolList& isAffectedPoint,
+    const scalarField& fld,
+    scalarField& newFld
+)
+{
+
+    const edgeList& edges = s.edges();
+    const pointField& points = s.points();
+    const labelList& mp = s.meshPoints();
+
+    scalarField edgeWeights(edges.size());
+    forAll(edges, edgeI)
+    {
+        const edge& e = edges[edgeI];
+        scalar w = mag(points[mp[e[0]]]-points[mp[e[1]]]);
+
+        edgeWeights[edgeI] = 1.0/(max(w, SMALL));
+    }
+
+    tmp<scalarField> tavgFld = avg(s, fld, edgeWeights);
+
+    const scalarField& avgFld = tavgFld();
+
+    forAll(fld, pointI)
+    {
+        if (isAffectedPoint.get(pointI) == 1)
+        {
+            newFld[pointI] = min
+            (
+                fld[pointI],
+                0.5*fld[pointI] + 0.5*avgFld[pointI]
+                //avgFld[pointI]
+            );
+        }
+    }
+}
+
+
+void lloydsSmoothing
+(
+    const label nSmooth,
+    triSurface& s,
+    const PackedBoolList& isFeaturePoint,
+    const List<surfaceFeatures::edgeStatus>& edgeStat,
+    const PackedBoolList& isAffectedPoint
+)
+{
+    const labelList& meshPoints = s.meshPoints();
+    const edgeList& edges = s.edges();
+
+
+    PackedBoolList isSmoothPoint(isAffectedPoint);
+    // Extend isSmoothPoint
+    {
+        PackedBoolList newIsSmoothPoint(isSmoothPoint);
+        forAll(edges, edgeI)
+        {
+            const edge& e = edges[edgeI];
+            if (isSmoothPoint[e[0]])
+            {
+                newIsSmoothPoint[e[1]] = true;
+            }
+            if (isSmoothPoint[e[1]])
+            {
+                newIsSmoothPoint[e[0]] = true;
+            }
+        }
+        Info<< "From points-to-smooth " << isSmoothPoint.count()
+            << " to " << newIsSmoothPoint.count()
+            << endl;
+        isSmoothPoint.transfer(newIsSmoothPoint);
+    }
+
+    // Do some smoothing (Lloyds algorithm) around problematic points
+    for (label i = 0; i < nSmooth; i++)
+    {
+        const labelListList& pointFaces = s.pointFaces();
+        const pointField& faceCentres = s.faceCentres();
+
+        pointField newPoints(s.points());
+        forAll(isSmoothPoint, pointI)
+        {
+            if (isSmoothPoint[pointI] && !isFeaturePoint[pointI])
+            {
+                const labelList& pFaces = pointFaces[pointI];
+
+                point avg = point::zero;
+                forAll(pFaces, pFaceI)
+                {
+                    avg += faceCentres[pFaces[pFaceI]];
+                }
+                avg /= pFaces.size();
+                newPoints[meshPoints[pointI]] = avg;
+            }
+        }
+
+
+        // Move points on feature edges only according to feature edges.
+
+        const pointField& points = s.points();
+
+        vectorField pointSum(s.nPoints(), vector::zero);
+        labelList nPointSum(s.nPoints(), 0);
+
+        forAll(edges, edgeI)
+        {
+            if (edgeStat[edgeI] != surfaceFeatures::NONE)
+            {
+                const edge& e = edges[edgeI];
+                const point& start = points[meshPoints[e[0]]];
+                const point& end = points[meshPoints[e[1]]];
+                point eMid = 0.5*(start+end);
+                pointSum[e[0]] += eMid;
+                nPointSum[e[0]]++;
+                pointSum[e[1]] += eMid;
+                nPointSum[e[1]]++;
+            }
+        }
+
+        forAll(pointSum, pointI)
+        {
+            if
+            (
+                isSmoothPoint[pointI]
+             && isFeaturePoint[pointI]
+             && nPointSum[pointI] >= 2
+            )
+            {
+                newPoints[meshPoints[pointI]] =
+                    pointSum[pointI]/nPointSum[pointI];
+            }
+        }
+
+
+        s.movePoints(newPoints);
+
+
+        // Extend isSmoothPoint
+        {
+            PackedBoolList newIsSmoothPoint(isSmoothPoint);
+            forAll(edges, edgeI)
+            {
+                const edge& e = edges[edgeI];
+                if (isSmoothPoint[e[0]])
+                {
+                    newIsSmoothPoint[e[1]] = true;
+                }
+                if (isSmoothPoint[e[1]])
+                {
+                    newIsSmoothPoint[e[0]] = true;
+                }
+            }
+            Info<< "From points-to-smooth " << isSmoothPoint.count()
+                << " to " << newIsSmoothPoint.count()
+                << endl;
+            isSmoothPoint.transfer(newIsSmoothPoint);
+        }
+    }
+}
+
+
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::addNote("Inflates surface according to point normals.");
+
+    argList::noParallel();
+    argList::addNote
+    (
+        "Creates inflated version of surface using point normals."
+        " Takes surface, distance to inflate and additional safety factor"
+    );
+    argList::addBoolOption
+    (
+        "checkSelfIntersection",
+        "also check for self-intersection"
+    );
+    argList::addOption
+    (
+        "nSmooth",
+        "integer",
+        "number of smoothing iterations (default 20)"
+    );
+    argList::addOption
+    (
+        "featureAngle",
+        "scalar",
+        "feature angle"
+    );
+    argList::addBoolOption
+    (
+        "debug",
+        "switch on additional debug information"
+    );
+
+    argList::validArgs.append("inputFile");
+    argList::validArgs.append("distance");
+    argList::validArgs.append("safety factor [1..]");
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    runTime.functionObjects().off();
+
+    const word inputName(args.args()[1]);
+    const scalar distance(args.argRead<scalar>(2));
+    const scalar extendFactor(args.argRead<scalar>(3));
+    const bool checkSelfIntersect = args.optionFound("checkSelfIntersection");
+    const label nSmooth = args.optionLookupOrDefault("nSmooth", 10);
+    const scalar featureAngle = args.optionLookupOrDefault<scalar>
+    (
+        "featureAngle",
+        180
+    );
+    const bool debug = args.optionFound("debug");
+
+
+    Info<< "Inflating surface " << inputName
+        << " according to point normals" << nl
+        << "    distance               : " << distance << nl
+        << "    safety factor          : " << extendFactor << nl
+        << "    self intersection test : " << checkSelfIntersect << nl
+        << "    smoothing iterations   : " << nSmooth << nl
+        << "    feature angle          : " << featureAngle << nl
+        << endl;
+
+
+    if (extendFactor < 1 || extendFactor > 10)
+    {
+        FatalErrorInFunction
+            << "Illegal safety factor " << extendFactor
+            << ". It is usually 1..2"
+            << exit(FatalError);
+    }
+
+
+
+    // Load triSurfaceMesh
+    triSurfaceMesh s
+    (
+        IOobject
+        (
+            inputName,                          // name
+            runTime.constant(),                 // instance
+            "triSurface",                       // local
+            runTime,                            // registry
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        )
+    );
+
+    // Mark features
+    const surfaceFeatures features(s, 180.0-featureAngle);
+
+    Info<< "Detected features:" << nl
+        << "    feature points : " << features.featurePoints().size()
+        << " out of " << s.nPoints() << nl
+        << "    feature edges : " << features.featureEdges().size()
+        << " out of " << s.nEdges() << nl
+        << endl;
+
+    PackedBoolList isFeaturePoint(s.nPoints());
+    forAll(features.featurePoints(), i)
+    {
+        label pointI = features.featurePoints()[i];
+        isFeaturePoint[pointI] = true;
+    }
+    const List<surfaceFeatures::edgeStatus> edgeStat(features.toStatus());
+
+
+
+
+    const pointField initialPoints(s.points());
+
+
+    // Construct scale
+    Info<< "Constructing field scale\n" << endl;
+    triSurfacePointScalarField scale
+    (
+        IOobject
+        (
+            "scale",                            // name
+            runTime.timeName(),                 // instance
+            s,                                  // registry
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        s,
+        dimensionedScalar("scale", dimLength, 1.0)
+    );
+
+
+    // Construct unit normals
+
+    Info<< "Calculating vertex normals\n" << endl;
+    const pointField pointNormals
+    (
+        calcPointNormals
+        (
+            s,
+            isFeaturePoint,
+            edgeStat
+        )
+    );
+
+
+    // Construct pointDisplacement
+    Info<< "Constructing field pointDisplacement\n" << endl;
+    triSurfacePointVectorField pointDisplacement
+    (
+        IOobject
+        (
+            "pointDisplacement",                // name
+            runTime.timeName(),                 // instance
+            s,                                  // registry
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        s,
+        dimLength,
+        distance*scale*pointNormals
+    );
+
+
+    const labelList& meshPoints = s.meshPoints();
+
+
+    // Any point on any intersected edge in any of the iterations
+    PackedBoolList isScaledPoint(s.nPoints());
+
+
+    // Detect any self intersections on initial mesh
+    PackedBoolList initialIsEdgeIntersecting;
+    if (checkSelfIntersect)
+    {
+        detectSelfIntersections(s, initialIsEdgeIntersecting);
+    }
+    else
+    {
+        // Mark all edges as already self intersecting so avoid detecting any
+        // new ones
+        initialIsEdgeIntersecting.setSize(s.nEdges(), true);
+    }
+
+
+    // Inflate
+    while (runTime.loop())
+    {
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        // Move to new location
+        pointField newPoints(initialPoints);
+        forAll(meshPoints, i)
+        {
+            newPoints[meshPoints[i]] += pointDisplacement[i];
+        }
+        s.movePoints(newPoints);
+        Info<< "Bounding box : " << s.bounds() << endl;
+
+
+        // Work out scale from pointDisplacement
+        forAll(scale, pointI)
+        {
+            if (s.pointFaces()[pointI].size())
+            {
+                scale[pointI] = mag(pointDisplacement[pointI])/distance;
+            }
+            else
+            {
+                scale[pointI] = 1.0;
+            }
+        }
+
+
+        Info<< "Scale        : " << gAverage(scale) << endl;
+        Info<< "Displacement : " << gAverage(pointDisplacement) << endl;
+
+
+
+        // Detect any intersections and scale back
+        PackedBoolList isAffectedPoint;
+        label nIntersections = detectIntersectionPoints
+        (
+            1e-9,       // intersection tolerance
+            s,
+            extendFactor,
+            initialPoints,
+            pointDisplacement,
+
+            checkSelfIntersect,
+            initialIsEdgeIntersecting,
+
+            isAffectedPoint,
+            scale
+        );
+        Info<< "Detected " << nIntersections << " intersections" << nl
+            << endl;
+
+        if (nIntersections == 0)
+        {
+            runTime.write();
+            break;
+        }
+
+
+        // Accumulate all affected points
+        forAll(isAffectedPoint, pointI)
+        {
+            if (isAffectedPoint[pointI])
+            {
+                isScaledPoint[pointI] = true;
+            }
+        }
+
+        // Smear out lowering of scale so any edges not found are
+        // still included
+        for (label i = 0; i < nSmooth; i++)
+        {
+            triSurfacePointScalarField oldScale(scale);
+            oldScale.rename("oldScale");
+            minSmooth
+            (
+                s,
+                PackedBoolList(s.nPoints(), true),
+                oldScale,
+                scale
+            );
+        }
+
+
+        // From scale update the pointDisplacement
+        pointDisplacement *= distance*scale/mag(pointDisplacement);
+
+
+        // Do some smoothing (Lloyds algorithm)
+        lloydsSmoothing(nSmooth, s, isFeaturePoint, edgeStat, isAffectedPoint);
+
+
+        // Update pointDisplacement
+        const pointField& pts = s.points();
+        forAll(meshPoints, i)
+        {
+            label meshPointI = meshPoints[i];
+            pointDisplacement[i] = pts[meshPointI]-initialPoints[meshPointI];
+        }
+
+
+        // Write
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+
+    Info<< "Detected overall intersecting points " << isScaledPoint.count()
+        << " out of " << s.nPoints() << nl << endl;
+
+
+    if (debug)
+    {
+        OBJstream str(runTime.path()/"isScaledPoint.obj");
+        forAll(isScaledPoint, pointI)
+        {
+            if (isScaledPoint[pointI])
+            {
+                str.write(initialPoints[meshPoints[pointI]]);
+            }
+        }
+    }
+
+
+    Info << "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index d1e725faee..eaac3f4c6d 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -109,7 +109,7 @@ void getFixedPoints
 
     if (!matchedAll)
     {
-        WarningIn("getFixedPoints(const edgeMesh&, const pointField&)")
+        WarningInFunction
             << "Did not match all feature points to points on the surface"
             << endl;
     }
@@ -150,14 +150,14 @@ int main(int argc, char *argv[])
 
     if (lambda < 0 || lambda > 1)
     {
-        FatalErrorIn(args.executable()) << "Illegal relaxation factor "
+        FatalErrorInFunction
             << lambda << endl
             << "0: no change   1: move vertices to average of neighbours"
             << exit(FatalError);
     }
     if (mu < 0 || mu > 1)
     {
-        FatalErrorIn(args.executable()) << "Illegal relaxation factor "
+        FatalErrorInFunction
             << mu << endl
             << "0: no change   1: move vertices to average of neighbours"
             << exit(FatalError);
@@ -189,8 +189,6 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    pointField newPoints(surf1.localPoints());
-
     for (label iter = 0; iter < iters; iter++)
     {
         // Lambda
diff --git a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
index e6315a060e..4096fe1daa 100644
--- a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
+++ b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 849cf6ea71..17e22f8c07 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
     // disable inplace editing
     if (importName == exportName)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Output file " << exportName << " would overwrite input file."
             << exit(FatalError);
     }
@@ -196,8 +196,7 @@ int main(int argc, char *argv[])
 
         if (!csDictIoPtr->headerOk())
         {
-            FatalErrorIn(args.executable())
-                << "Cannot open coordinateSystems file\n    "
+            FatalErrorInFunction
                 << csDictIoPtr->objectPath() << nl
                 << exit(FatalError);
         }
@@ -211,7 +210,7 @@ int main(int argc, char *argv[])
             const label csIndex = csLst.findIndex(csName);
             if (csIndex < 0)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot find -from " << csName << nl
                     << "available coordinateSystems: " << csLst.toc() << nl
                     << exit(FatalError);
@@ -227,7 +226,7 @@ int main(int argc, char *argv[])
             const label csIndex = csLst.findIndex(csName);
             if (csIndex < 0)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot find -to " << csName << nl
                     << "available coordinateSystems: " << csLst.toc() << nl
                     << exit(FatalError);
@@ -240,8 +239,7 @@ int main(int argc, char *argv[])
         // maybe fix this later
         if (fromCsys.valid() && toCsys.valid())
         {
-            FatalErrorIn(args.executable())
-                << "Only allowed  '-from' or '-to' option at the moment."
+            FatalErrorInFunction
                 << exit(FatalError);
         }
     }
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index 896f2b2745..12bd9f32e2 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
     if (importName == exportName)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Output file " << exportName << " would overwrite input file."
             << exit(FatalError);
     }
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index bfc46ccd75..4b8d230080 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,8 +176,7 @@ int main(int argc, char *argv[])
 
         if (!ioPtr->headerOk())
         {
-            FatalErrorIn(args.executable())
-                << "Cannot open coordinateSystems file\n    "
+            FatalErrorInFunction
                 << ioPtr->objectPath() << nl
                 << exit(FatalError);
         }
@@ -191,7 +190,7 @@ int main(int argc, char *argv[])
             const label csIndex = csLst.findIndex(csName);
             if (csIndex < 0)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot find -from " << csName << nl
                     << "available coordinateSystems: " << csLst.toc() << nl
                     << exit(FatalError);
@@ -207,7 +206,7 @@ int main(int argc, char *argv[])
             const label csIndex = csLst.findIndex(csName);
             if (csIndex < 0)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot find -to " << csName << nl
                     << "available coordinateSystems: " << csLst.toc() << nl
                     << exit(FatalError);
@@ -220,8 +219,7 @@ int main(int argc, char *argv[])
         // maybe fix this later
         if (fromCsys.valid() && toCsys.valid())
         {
-            FatalErrorIn(args.executable())
-                << "Only allowed  '-from' or '-to' option at the moment."
+            FatalErrorInFunction
                 << exit(FatalError);
         }
     }
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index a8a0938681..2bf0c9c014 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -189,8 +189,7 @@ int main(int argc, char *argv[])
 
         if (!ioPtr->headerOk())
         {
-            FatalErrorIn(args.executable())
-                << "Cannot open coordinateSystems file\n    "
+            FatalErrorInFunction
                 << ioPtr->objectPath() << nl
                 << exit(FatalError);
         }
@@ -204,7 +203,7 @@ int main(int argc, char *argv[])
             const label csIndex = csLst.findIndex(csName);
             if (csIndex < 0)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot find -from " << csName << nl
                     << "available coordinateSystems: " << csLst.toc() << nl
                     << exit(FatalError);
@@ -220,7 +219,7 @@ int main(int argc, char *argv[])
             const label csIndex = csLst.findIndex(csName);
             if (csIndex < 0)
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Cannot find -to " << csName << nl
                     << "available coordinateSystems: " << csLst.toc() << nl
                     << exit(FatalError);
@@ -233,8 +232,7 @@ int main(int argc, char *argv[])
         // maybe fix this later
         if (fromCsys.valid() && toCsys.valid())
         {
-            FatalErrorIn(args.executable())
-                << "Only allowed  '-from' or '-to' option at the moment."
+            FatalErrorInFunction
                 << exit(FatalError);
         }
     }
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 098f9e019c..580411eda6 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
 
             if (zoneIDs.empty())
             {
-                WarningIn(args.executable())
+                WarningInFunction
                     << "Cannot find any faceZone name matching "
                     << zoneName << endl;
             }
diff --git a/applications/utilities/surface/surfacePatch/Make/files b/applications/utilities/surface/surfacePatch/Make/files
new file mode 100644
index 0000000000..d983714ab3
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/Make/files
@@ -0,0 +1,7 @@
+searchableSurfaceModifier/searchableSurfaceModifier.C
+searchableSurfaceModifier/autoPatch.C
+searchableSurfaceModifier/cut.C
+
+surfacePatch.C
+
+EXE = $(FOAM_APPBIN)/surfacePatch
diff --git a/applications/utilities/surface/surfacePatch/Make/options b/applications/utilities/surface/surfacePatch/Make/options
new file mode 100644
index 0000000000..a8173dc045
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+    -IsearchableSurfaceModifier \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+
+EXE_LIBS = \
+    -ltriSurface \
+    -lmeshTools
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C
new file mode 100644
index 0000000000..5ff45cecc0
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "autoPatch.H"
+#include "addToRunTimeSelectionTable.H"
+#include "surfaceFeatures.H"
+#include "triSurfaceMesh.H"
+#include "PatchTools.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace searchableSurfaceModifiers
+{
+    defineTypeNameAndDebug(autoPatch, 0);
+    addToRunTimeSelectionTable
+    (
+        searchableSurfaceModifier,
+        autoPatch,
+        dictionary
+    );
+}
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::searchableSurfaceModifiers::autoPatch::autoPatch
+(
+    const searchableSurfaces& geometry,
+    const dictionary& dict
+)
+:
+    searchableSurfaceModifier(geometry, dict),
+    featureAngle_(readScalar(dict.lookup("featureAngle")))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::searchableSurfaceModifiers::autoPatch::~autoPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::searchableSurfaceModifiers::autoPatch::modify
+(
+    const labelList& regions,
+    searchableSurface& geom
+) const
+{
+    triSurface& surf = refCast<triSurfaceMesh>(geom);
+
+    surfaceFeatures set(surf, 180.0-featureAngle_);
+
+    Info<< nl
+        << "Feature set:" << nl
+        << "    feature points : " << set.featurePoints().size() << nl
+        << "    feature edges  : " << set.featureEdges().size() << nl
+        << "    of which" << nl
+        << "        region edges   : " << set.nRegionEdges() << nl
+        << "        external edges : " << set.nExternalEdges() << nl
+        << "        internal edges : " << set.nInternalEdges() << nl
+        << endl;
+
+
+    // Get per-edge status.
+    boolList borderEdge(surf.nEdges(), false);
+    forAll(set.featureEdges(), i)
+    {
+        borderEdge[set.featureEdges()[i]] = true;
+    }
+
+
+    bool changed = false;
+
+    forAll(regions, i)
+    {
+        label regionI = regions[i];
+
+        labelList subRegion(surf.size(), -1);
+        label nSub = 0;
+
+        forAll(surf, faceI)
+        {
+            if (surf[faceI].region() == regionI && subRegion[faceI] == -1)
+            {
+                PatchTools::markZone(surf, borderEdge, faceI, nSub, subRegion);
+                nSub++;
+            }
+        }
+
+        Info<< "For region " << surf.patches()[regionI].name()
+            << " detected sub regions " << nSub << endl;
+
+
+        if (nSub > 1)
+        {
+            label nOldPatches = surf.patches().size();
+
+            for (label subI = 0; subI < nSub; subI++)
+            {
+                geometricSurfacePatch patch
+                (
+                    surf.patches()[regionI].geometricType(),
+                    surf.patches()[regionI].name() + Foam::name(subI),
+                    surf.patches().size()
+                );
+
+
+                Info<< "For region " << surf.patches()[regionI].name()
+                    << " creating region " << patch.name() << endl;
+
+                surf.patches().append(patch);
+            }
+
+            forAll(subRegion, faceI)
+            {
+                if (subRegion[faceI] != -1)
+                {
+                    surf[faceI].region() = nOldPatches + subRegion[faceI];
+                }
+            }
+            changed = true;
+        }
+    }
+
+    return changed;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
new file mode 100644
index 0000000000..6c27cc1e10
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::searchableSurfaceModifier::autoPatch
+
+Description
+    Patchify triangles based on a feature angle. Replacement of surfaceAutoPatch
+
+SourceFiles
+    autoPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef autoPatch_H
+#define autoPatch_H
+
+#include "searchableSurfaceModifier.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace searchableSurfaceModifiers
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class autoPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class autoPatch
+:
+    public searchableSurfaceModifier
+{
+    // Private data
+
+        //- Feature angle
+        const scalar featureAngle_;
+
+
+   // Private Member Functions
+
+public:
+
+    //- Runtime type information
+    TypeName("autoPatch");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        autoPatch(const searchableSurfaces&, const dictionary&);
+
+        //- Clone
+        autoPtr<searchableSurfaceModifier> clone() const
+        {
+            NotImplemented;
+            return autoPtr<searchableSurfaceModifier>(NULL);
+        }
+
+
+    //- Destructor
+    virtual ~autoPatch();
+
+
+    // Member Functions
+
+        //- Apply this selector
+        virtual bool modify(const labelList& regions, searchableSurface&) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace searchableSurfaceModifiers
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
new file mode 100644
index 0000000000..39e3a2e29a
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
@@ -0,0 +1,384 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cut.H"
+#include "addToRunTimeSelectionTable.H"
+#include "searchableSurfaces.H"
+#include "triSurfaceMesh.H"
+#include "searchableBox.H"
+#include "searchableRotatedBox.H"
+#include "surfaceIntersection.H"
+#include "intersectedSurface.H"
+#include "edgeIntersections.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace searchableSurfaceModifiers
+{
+    defineTypeNameAndDebug(cut, 0);
+    addToRunTimeSelectionTable(searchableSurfaceModifier, cut, dictionary);
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::searchableSurfaceModifiers::cut::triangulate
+(
+    const faceList& fcs,
+    pointField& pts,
+    triSurface& cutSurf
+) const
+{
+    label nTris = 0;
+    forAll(fcs, i)
+    {
+        nTris += fcs[i].size()-2;
+    }
+
+    DynamicList<labelledTri> tris(nTris);
+
+    forAll(fcs, i)
+    {
+        const face& f = fcs[i];
+        // Triangulate around vertex 0
+        for (label fp = 1; fp < f.size()-1; fp++)
+        {
+            tris.append(labelledTri(f[0], f[fp], f[f.fcIndex(fp)], i));
+        }
+    }
+    geometricSurfacePatchList patches(fcs.size());
+    forAll(patches, patchI)
+    {
+        patches[patchI] = geometricSurfacePatch
+        (
+            "",
+            "patch" + Foam::name(patchI),
+            patchI
+        );
+    }
+    cutSurf = triSurface(tris.xfer(), patches, pts.xfer());
+}
+
+
+Foam::triSurface& Foam::searchableSurfaceModifiers::cut::triangulate
+(
+    const searchableSurface& cutter,
+    triSurface& cutSurf
+) const
+{
+    if (isA<searchableBox>(cutter))
+    {
+        const searchableBox& bb = refCast<const searchableBox>(cutter);
+
+        pointField pts(bb.points());
+        triangulate(treeBoundBox::faces, pts, cutSurf);
+
+        return cutSurf;
+    }
+    else if (isA<searchableRotatedBox>(cutter))
+    {
+        const searchableRotatedBox& bb =
+            refCast<const searchableRotatedBox>(cutter);
+
+        pointField pts(bb.points());
+        triangulate(treeBoundBox::faces, pts, cutSurf);
+
+        return cutSurf;
+    }
+    else if (isA<triSurfaceMesh>(cutter))
+    {
+        return const_cast<triSurfaceMesh&>
+        (
+            refCast<const triSurfaceMesh>(cutter)
+        );
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Triangulation only supported for triSurfaceMesh, searchableBox"
+            << ", not for surface " << cutter.name()
+            << " of type " << cutter.type()
+            << exit(FatalError);
+        return const_cast<triSurfaceMesh&>
+        (
+            refCast<const triSurfaceMesh>(cutter)
+        );
+    }
+}
+
+
+// Keep on shuffling surface points until no more degenerate intersections.
+// Moves both surfaces and updates set of edge cuts.
+bool Foam::searchableSurfaceModifiers::cut::intersectSurfaces
+(
+    triSurface& surf1,
+    edgeIntersections& edgeCuts1,
+    triSurface& surf2,
+    edgeIntersections& edgeCuts2
+) const
+{
+    bool hasMoved1 = false;
+    bool hasMoved2 = false;
+
+    for (label iter = 0; iter < 10; iter++)
+    {
+        Info<< "Determining intersections of surf1 edges with surf2"
+            << " faces" << endl;
+
+        // Determine surface1 edge intersections. Allow surface to be moved.
+
+        // Number of iterations needed to resolve degenerates
+        label nIters1 = 0;
+        {
+            triSurfaceSearch querySurf2(surf2);
+
+            scalarField surf1PointTol
+            (
+                1E-6*edgeIntersections::minEdgeLength(surf1)
+            );
+
+            // Determine raw intersections
+            edgeCuts1 = edgeIntersections
+            (
+                surf1,
+                querySurf2,
+                surf1PointTol
+            );
+
+            // Shuffle a bit to resolve degenerate edge-face hits
+            {
+                pointField points1(surf1.points());
+
+                nIters1 =
+                    edgeCuts1.removeDegenerates
+                    (
+                        5,              // max iterations
+                        surf1,
+                        querySurf2,
+                        surf1PointTol,
+                        points1         // work array
+                    );
+
+                if (nIters1 != 0)
+                {
+                    // Update geometric quantities
+                    surf1.movePoints(points1);
+                    hasMoved1 = true;
+                }
+            }
+        }
+
+        Info<< "Determining intersections of surf2 edges with surf1"
+            << " faces" << endl;
+
+        label nIters2 = 0;
+        {
+            triSurfaceSearch querySurf1(surf1);
+
+            scalarField surf2PointTol
+            (
+                1E-6*edgeIntersections::minEdgeLength(surf2)
+            );
+
+            // Determine raw intersections
+            edgeCuts2 = edgeIntersections
+            (
+                surf2,
+                querySurf1,
+                surf2PointTol
+            );
+
+            // Shuffle a bit to resolve degenerate edge-face hits
+            {
+                pointField points2(surf2.points());
+
+                nIters2 =
+                    edgeCuts2.removeDegenerates
+                    (
+                        5,              // max iterations
+                        surf2,
+                        querySurf1,
+                        surf2PointTol,
+                        points2         // work array
+                    );
+
+                if (nIters2 != 0)
+                {
+                    // Update geometric quantities
+                    surf2.movePoints(points2);
+                    hasMoved2 = true;
+                }
+            }
+        }
+
+
+        if (nIters1 == 0 && nIters2 == 0)
+        {
+            //Info<< "** Resolved all intersections to be proper"
+            //    << "edge-face pierce" << endl;
+            break;
+        }
+    }
+
+    //if (hasMoved1)
+    //{
+    //    fileName newFile("surf1.ftr");
+    //    Info<< "Surface 1 has been moved. Writing to " << newFile
+    //        << endl;
+    //    surf1.write(newFile);
+    //}
+    //
+    //if (hasMoved2)
+    //{
+    //    fileName newFile("surf2.ftr");
+    //    Info<< "Surface 2 has been moved. Writing to " << newFile
+    //        << endl;
+    //    surf2.write(newFile);
+    //}
+
+    return hasMoved1 || hasMoved2;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::searchableSurfaceModifiers::cut::cut
+(
+    const searchableSurfaces& geometry,
+    const dictionary& dict
+)
+:
+    searchableSurfaceModifier(geometry, dict),
+    cutterNames_(dict_.lookup("cutters"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::searchableSurfaceModifiers::cut::~cut()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::searchableSurfaceModifiers::cut::modify
+(
+    const labelList& regions,
+    searchableSurface& geom
+) const
+{
+    triSurface& surf = refCast<triSurfaceMesh>(geom);
+
+    bool changed = false;
+
+    // Find the surfaces to cut with
+    forAll(cutterNames_, cutNameI)
+    {
+        labelList geomIDs =
+            findStrings(cutterNames_[cutNameI], geometry_.names());
+
+        forAll(geomIDs, j)
+        {
+            label geomI = geomIDs[j];
+            const searchableSurface& cutter = geometry_[geomI];
+
+            // Triangulate
+            triSurface work;
+            triSurface& cutSurf = triangulate(cutter, work);
+
+            // Determine intersection (with perturbation)
+            edgeIntersections edge1Cuts;
+            edgeIntersections edge2Cuts;
+            intersectSurfaces
+            (
+                surf,
+                edge1Cuts,
+                cutSurf,
+                edge2Cuts
+            );
+
+
+            // Determine intersection edges
+            surfaceIntersection inter(surf, edge1Cuts, cutSurf, edge2Cuts);
+
+
+            // Use intersection edges to cut up faces. (does all the hard work)
+            intersectedSurface surf3(surf, true, inter);
+
+
+            // Mark triangles based on whether they are inside or outside
+            List<volumeType> volTypes;
+            cutter.getVolumeType(surf3.faceCentres(), volTypes);
+
+            label nInside = 0;
+            forAll(volTypes, i)
+            {
+                if (volTypes[i] == volumeType::INSIDE)
+                {
+                    nInside++;
+                }
+            }
+
+            // Add a patch for inside the box
+            if (nInside > 0 && surf3.patches().size() > 0)
+            {
+                geometricSurfacePatchList newPatches(surf3.patches());
+                label sz = newPatches.size();
+                newPatches.setSize(sz+1);
+                newPatches[sz] = geometricSurfacePatch
+                (
+                    newPatches[sz-1].geometricType(),
+                    newPatches[sz-1].name() + "_inside",
+                    newPatches[sz-1].index()
+                );
+
+                Info<< "Moving " << nInside << " out of " << surf3.size()
+                    << " triangles to region "
+                    << newPatches[sz].name() << endl;
+
+
+                List<labelledTri> newTris(surf3);
+                forAll(volTypes, i)
+                {
+                    if (volTypes[i] == volumeType::INSIDE)
+                    {
+                        newTris[i].region() = sz;
+                    }
+                }
+                pointField newPoints(surf3.points());
+                surf = triSurface(newTris.xfer(), newPatches, newPoints.xfer());
+
+                changed = true;
+            }
+        }
+    }
+
+    return changed;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
new file mode 100644
index 0000000000..f794d5e87b
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::searchableSurfaceModifier::cut
+
+Description
+    Patchify triangles based on orientation w.r.t other (triangulated or
+    triangulatable) surfaces
+
+SourceFiles
+    cut.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cut_H
+#define cut_H
+
+#include "searchableSurfaceModifier.H"
+#include "wordReList.H"
+#include "faceList.H"
+#include "pointField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class edgeIntersections;
+
+namespace searchableSurfaceModifiers
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class cut Declaration
+\*---------------------------------------------------------------------------*/
+
+class cut
+:
+    public searchableSurfaceModifier
+{
+    // Private data
+
+        //- Name of surfaces to cut with
+        const wordReList cutterNames_;
+
+
+   // Private Member Functions
+
+        //- Triangulate faces around 0th vertex
+        void triangulate(const faceList&, pointField&, triSurface&) const;
+
+        //- Triangulate searchableSurface (currently only supported for
+        //  searchableBox and triSurfaceMesh)
+        triSurface& triangulate(const searchableSurface&, triSurface&) const;
+
+        //- Intersect surfaces. Perturb to avoid degenerates.
+        bool intersectSurfaces
+        (
+            triSurface& surf1,
+            edgeIntersections& edgeCuts1,
+            triSurface& surf2,
+            edgeIntersections& edgeCuts2
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cut");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        cut(const searchableSurfaces&, const dictionary&);
+
+        //- Clone
+        autoPtr<searchableSurfaceModifier> clone() const
+        {
+            NotImplemented;
+            return autoPtr<searchableSurfaceModifier>(NULL);
+        }
+
+
+    //- Destructor
+    virtual ~cut();
+
+
+    // Member Functions
+
+        //- Apply this selector
+        virtual bool modify(const labelList& regions, searchableSurface&) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace searchableSurfaceModifiers
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
new file mode 100644
index 0000000000..d62fb05927
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "searchableSurfaceModifier.H"
+#include "triSurface.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(searchableSurfaceModifier, 0);
+    defineRunTimeSelectionTable(searchableSurfaceModifier, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::searchableSurfaceModifier::searchableSurfaceModifier
+(
+    const searchableSurfaces& geometry,
+    const dictionary& dict
+)
+:
+    geometry_(geometry),
+    dict_(dict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::searchableSurfaceModifier::~searchableSurfaceModifier()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::searchableSurfaceModifier>
+Foam::searchableSurfaceModifier::New
+(
+    const word& type,
+    const searchableSurfaces& geometry,
+    const dictionary& dict
+)
+{
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(type);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown searchableSurfaceModifier type "
+            << type << nl << nl
+            << "Valid searchableSurfaceModifier types : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<searchableSurfaceModifier>(cstrIter()(geometry, dict));
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
new file mode 100644
index 0000000000..effe81d2a8
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::searchableSurfaceModifier
+
+Description
+    Changing a surface
+
+SourceFiles
+    searchableSurfaceModifier.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef searchableSurfaceModifier_H
+#define searchableSurfaceModifier_H
+
+#include "dictionary.H"
+#include "typeInfo.H"
+#include "runTimeSelectionTables.H"
+#include "autoPtr.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class triSurface;
+class searchableSurface;
+class searchableSurfaces;
+
+/*---------------------------------------------------------------------------*\
+                     Class searchableSurfaceModifier Declaration
+\*---------------------------------------------------------------------------*/
+
+class searchableSurfaceModifier
+{
+protected:
+
+    // Protected data
+
+        const searchableSurfaces& geometry_;
+
+        //- Input dictionary
+        const dictionary dict_;
+
+public:
+
+    //- Runtime type information
+    TypeName("searchableSurfaceModifier");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            searchableSurfaceModifier,
+            dictionary,
+            (
+                const searchableSurfaces& geometry,
+                const dictionary& dict
+            ),
+            (geometry, dict)
+        );
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        searchableSurfaceModifier(const searchableSurfaces&, const dictionary&);
+
+        //- Clone
+        autoPtr<searchableSurfaceModifier> clone() const
+        {
+            NotImplemented;
+            return autoPtr<searchableSurfaceModifier>(NULL);
+        }
+
+
+    // Selectors
+
+        //- Return a reference to the selected searchableSurfaceModifier
+        static autoPtr<searchableSurfaceModifier> New
+        (
+            const word& type,
+            const searchableSurfaces&,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~searchableSurfaceModifier();
+
+
+    // Member Functions
+
+        //- Do any operation on surface. Return true if anything changed
+        virtual bool modify(const labelList&, searchableSurface&) const = 0;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/surfacePatch.C b/applications/utilities/surface/surfacePatch/surfacePatch.C
new file mode 100644
index 0000000000..3df36f6ec6
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/surfacePatch.C
@@ -0,0 +1,169 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    surfacePatch
+
+Description
+    Patches (regionises) a surface using a user-selectable method.
+
+    The current methods are either based on a geometric feature angle
+    (a replacement for the surfaceAutoPatch functionality) or on intersecting
+    a set of searchableSurfaces - this will re-triangulate the intersecting
+    triangles and regonise the resulting triangles according to being
+    inside/outside the surface.
+
+\*---------------------------------------------------------------------------*/
+
+#include "triSurface.H"
+#include "argList.H"
+#include "Time.H"
+#include "triSurfaceMesh.H"
+#include "searchableSurfaces.H"
+#include "searchableSurfaceModifier.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::validArgs.clear();
+    argList::noParallel();
+    #include "addDictOption.H"
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+
+    const word dictName("surfacePatchDict");
+    #include "setSystemRunTimeDictionaryIO.H"
+    const IOdictionary meshDict(dictIO);
+
+
+    // Read geometry
+    // ~~~~~~~~~~~~~
+
+    searchableSurfaces allGeometry
+    (
+        IOobject
+        (
+            "abc",                      // dummy name
+            runTime.constant(),         // instance
+            triSurfaceMesh::meshSubDir, // local
+            runTime,                    // registry
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        ),
+        meshDict.subDict("geometry"),
+        meshDict.lookupOrDefault("singleRegionName", true)
+    );
+
+
+    const dictionary& surfacesDict = meshDict.subDict("surfaces");
+
+    forAllConstIter(dictionary, surfacesDict, surfacesIter)
+    {
+        if (surfacesIter().isDict())
+        {
+            const word& surfName = surfacesIter().keyword();
+            const dictionary& surfDict = surfacesIter().dict();
+
+            // Look up surface
+            searchableSurface& surf = allGeometry[surfName];
+
+
+            bool changed = false;
+
+            // Check for modifier on global level
+            if (surfDict.found("type"))
+            {
+                autoPtr<searchableSurfaceModifier> modifier
+                (
+                    searchableSurfaceModifier::New
+                    (
+                        surfDict.lookup("type"),
+                        allGeometry,
+                        surfDict
+                    )
+                );
+
+                if (modifier().modify(identity(surf.regions().size()), surf))
+                {
+                    changed = true;
+                }
+            }
+
+            // Check for modifier on a per-region level
+            if (surfDict.found("regions"))
+            {
+                const dictionary& regionsDict = surfDict.subDict("regions");
+                forAllConstIter(dictionary, regionsDict, regionsIter)
+                {
+                    const dictionary& regionDict = regionsIter().dict();
+                    const keyType& regionName = regionsIter().keyword();
+
+                    autoPtr<searchableSurfaceModifier> modifier
+                    (
+                        searchableSurfaceModifier::New
+                        (
+                            regionDict.lookup("type"),
+                            allGeometry,
+                            regionDict
+                        )
+                    );
+
+                    labelList regionIDs =
+                        findStrings(regionName, surf.regions());
+                    if (modifier().modify(regionIDs, surf))
+                    {
+                        changed = true;
+                    }
+                }
+            }
+
+
+            if (changed)
+            {
+                const fileName name(surf.name());
+                surf.rename(name.lessExt() + "_patched." + name.ext());
+
+                Info<< "Writing repatched surface " << name << " to "
+                    << surf.name() << nl << endl;
+
+                surf.write();
+            }
+            else
+            {
+                Info<< "Surface " << surf.name() << " unchanged" << nl << endl;
+            }
+        }
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfacePatch/surfacePatchDict b/applications/utilities/surface/surfacePatch/surfacePatchDict
new file mode 100644
index 0000000000..db857a9ae1
--- /dev/null
+++ b/applications/utilities/surface/surfacePatch/surfacePatchDict
@@ -0,0 +1,69 @@
+/*--------------------------------*- 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      createPatchDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+geometry
+{
+    box
+    {
+        type    searchableRotatedBox;
+
+        // box rotated 45 degrees around z axis
+        span    (1 1 1);
+        origin  (0 0 0);
+        e1      (1 1 0);
+        e3      (0 0 1);
+    }
+
+    singleTri.obj
+    {
+        type triSurfaceMesh;
+    }
+
+    unitCube_me.stl
+    {
+        type triSurfaceMesh;
+    }
+};
+
+
+
+surfaces
+{
+    unitCube_me.stl
+    {
+        regions
+        {
+            // Divide region 'maxZ' into multiple regions according to
+            // a geometric feature angle
+            maxZ
+            {
+                type            autoPatch;
+                featureAngle    60;
+            }
+        }
+    }
+
+    singleTri.obj
+    {
+        // Regionise surface according to triangles (after cutting) being
+        // inside or outside the 'box' geometry
+        type        cut;
+        cutters     (box);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 6e4db35a0b..87deafe8ac 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,21 +31,17 @@ Description
 
 Note
     - best decomposition option is hierarchGeomDecomp since
-    guarantees square decompositions.
+      guarantees square decompositions.
     - triangles might be present on multiple processors.
     - merging uses geometric tolerance so take care with writing precision.
 
 \*---------------------------------------------------------------------------*/
 
-#include "treeBoundBox.H"
-#include "FixedList.H"
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "distributedTriSurfaceMesh.H"
 #include "mapDistribute.H"
-#include "triSurfaceFields.H"
-#include "Pair.H"
 
 using namespace Foam;
 
@@ -137,7 +133,7 @@ int main(int argc, char *argv[])
 
     if (!Pstream::parRun())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Please run this program on the decomposed case."
             << " It will read surface " << surfFileName
             << " and decompose it such that it overlaps the mesh bounding box."
@@ -164,6 +160,23 @@ int main(int argc, char *argv[])
         Pstream::scatterList(meshBb);
     }
 
+
+
+    // Temporarily: override master-only checking
+    regIOobject::fileCheckTypes oldCheckType =
+        regIOobject::fileModificationChecking;
+
+    if (oldCheckType == regIOobject::timeStampMaster)
+    {
+        regIOobject::fileModificationChecking = regIOobject::timeStamp;
+    }
+    else if (oldCheckType == regIOobject::inotifyMaster)
+    {
+        regIOobject::fileModificationChecking = regIOobject::inotify;
+    }
+
+
+
     IOobject io
     (
         surfFileName,         // name
@@ -172,7 +185,7 @@ int main(int argc, char *argv[])
         "triSurface",         // local
         runTime,              // registry
         IOobject::MUST_READ,
-        IOobject::NO_WRITE
+        IOobject::AUTO_WRITE
     );
 
     const fileName actualPath(io.filePath());
@@ -215,6 +228,7 @@ int main(int argc, char *argv[])
         Info<< "Writing dummy bounds dictionary to " << ioDict.name()
             << nl << endl;
 
+        // Force writing in ascii
         ioDict.regIOobject::writeObject
         (
             IOstream::ASCII,
@@ -239,23 +253,18 @@ int main(int argc, char *argv[])
             (
                 IOobject
                 (
-                    surfMesh.searchableSurface::name(),     // name
-                    surfMesh.searchableSurface::instance(), // instance
+                    "faceCentres",                                  // name
+                    surfMesh.searchableSurface::time().timeName(),  // instance
                     surfMesh.searchableSurface::local(),    // local
                     surfMesh,
                     IOobject::NO_READ,
                     IOobject::AUTO_WRITE
                 ),
                 surfMesh,
-                dimLength
+                dimLength,
+                s.faceCentres()
             )
         );
-        triSurfaceVectorField& fc = fcPtr();
-
-        forAll(fc, triI)
-        {
-            fc[triI] = s[triI].centre(s.points());
-        }
 
         // Steal pointer and store object on surfMesh
         fcPtr.ptr()->store();
@@ -290,7 +299,11 @@ int main(int argc, char *argv[])
 
 
     Info<< "Writing surface." << nl << endl;
-    surfMesh.searchableSurface::write();
+    surfMesh.objectRegistry::write();
+
+
+    regIOobject::fileModificationChecking = oldCheckType;
+
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
index c10397bc01..d5d1dccd20 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
+++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
@@ -26,10 +26,16 @@ Application
 
 Description
     Refine by splitting all three edges of triangle ('red' refinement).
+
     Neighbouring triangles (which are not marked for refinement get split
-    in half ('green' refinement). (R. Verfuerth, "A review of a posteriori
+    in half ('green' refinement).
+
+    Reference:
+    \verbatim
+    R. Verfuerth, "A review of a posteriori
     error estimation and adaptive mesh refinement techniques",
     Wiley-Teubner, 1996)
+    \endverbatim
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
index 93a7caa365..4c21e50dc9 100644
--- a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
+++ b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
+    Strips any baffle parts of a surface.
 
-    Strips any baffle parts of a surface.  A baffle region is one which is
-    reached by walking from an open edge, and stopping when a multiply connected
-    edge is reached.
+    A baffle region is one which is reached by walking from an open edge, and
+    stopping when a multiply connected edge is reached.
 
 \*---------------------------------------------------------------------------*/
 
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
 
         if (iterationNo == iterationLimit)
         {
-            WarningIn("surfaceSplitByTopology")
+            WarningInFunction
             << "Iteration limit of " << iterationLimit << "reached" << endl;
         }
 
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 184d326e26..e3a4bc56de 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,14 +152,14 @@ void testSortedEdgeFaces(const triSurface& surf)
         {
             if (findIndex(sortMyFaces, myFaces[i]) == -1)
             {
-                FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
+                FatalErrorInFunction << abort(FatalError);
             }
         }
         forAll(sortMyFaces, i)
         {
             if (findIndex(myFaces, sortMyFaces[i]) == -1)
             {
-                FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
+                FatalErrorInFunction << abort(FatalError);
             }
         }
     }
@@ -299,7 +299,7 @@ label findEdge
     }
 
 
-    FatalErrorIn("findEdge(..)") << "Cannot find edge with labels " << v0
+    FatalErrorInFunction
         << ' ' << v1 << " in candidates " << edgeLabels
         << " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
         << abort(FatalError);
@@ -338,7 +338,7 @@ label otherEdge
         }
     }
 
-    FatalErrorIn("otherEdge(..)") << "Cannot find other edge on face " << faceI
+    FatalErrorInFunction
         << " verts:" << surf.localPoints()[faceI]
         << " connected to point " << pointI
         << " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
@@ -404,7 +404,7 @@ void walkSplitLine
 
             if (eFaces.size() != 2)
             {
-                FatalErrorIn("walkSplitPoint(..)")
+                FatalErrorInFunction
                     << "Can only handle edges with 2 or 4 edges for now."
                     << abort(FatalError);
             }
@@ -419,7 +419,7 @@ void walkSplitLine
             }
             else
             {
-                FatalErrorIn("walkSplitPoint(..)") << abort(FatalError);
+                FatalErrorInFunction << abort(FatalError);
             }
         }
         while (true);
@@ -539,7 +539,7 @@ void calcPointVecs
 
                 surf.write("errorSurf.obj");
 
-                FatalErrorIn("calcPointVecs(..)")
+                FatalErrorInFunction
                     << "Cannot find two faces using border edge " << edgeI
                     << " verts:" << edges[edgeI]
                     << " eFaces:" << eFaces << endl
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index c0ae6bd241..0a77fde05f 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
 
     if (markedZone.size() && markedZone.size() != 2)
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "zone specification should be two points, min and max of "
             << "the boundingbox" << endl
             << "zone:" << markedZone
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
              || markedPoints[pointI] >= surf1.nPoints()
             )
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "localPoint label " << markedPoints[pointI]
                     << "out of range."
                     << " The mesh has got "
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
              || markedEdges[edgeI] >= surf1.nEdges()
             )
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "edge label " << markedEdges[edgeI]
                     << "out of range."
                     << " The mesh has got "
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
              || markedFaces[faceI] >= surf1.size()
             )
             {
-                FatalErrorIn(args.executable())
+                FatalErrorInFunction
                     << "Face label " << markedFaces[faceI] << "out of range."
                     << " The mesh has got "
                     << surf1.size() << " faces."
@@ -387,6 +387,8 @@ int main(int argc, char *argv[])
 
     surf2.write(outFileName);
 
+    Info<< "\nEnd\n" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
index 9fe665f187..91c16080c5 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 8bdcd35741..e4653d1d61 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 
     if (args.options().empty())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "No options supplied, please use one or more of "
                "-translate, -rotate or -scale options."
             << exit(FatalError);
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
index c4e011ba99..e16459c724 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 Build  : dev-27a117d1f441
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 9c51adb8b4..51aaab6669 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
     // Check controlFile stream is OK
     if (!controlFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << controlFileName
             << exit(FatalError);
     }
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
     // Check thermoData stream is OK
     if (!thermoDataFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << thermoDataFileName
             << exit(FatalError);
     }
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
index 21085c8c7f..46cc395780 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/controlDict
+++ b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
index 8399c10856..e91f968a87 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,7 @@ int main(int argc, char *argv[])
 {
     argList::validArgs.append("CHEMKINFile");
     argList::validArgs.append("CHEMKINThermodynamicsFile");
+    argList::validArgs.append("CHEMKINTransport");
     argList::validArgs.append("FOAMChemistryFile");
     argList::validArgs.append("FOAMThermodynamicsFile");
 
@@ -57,16 +58,16 @@ int main(int argc, char *argv[])
 
     speciesTable species;
 
-    chemkinReader cr(args[1], species, args[2], newFormat);
+    chemkinReader cr(species, args[1], args[3], args[2], newFormat);
 
-    OFstream reactionsFile(args[3]);
+    OFstream reactionsFile(args[4]);
     reactionsFile
         << "species" << cr.species() << token::END_STATEMENT << nl << nl;
 
     cr.reactions().write(reactionsFile);
 
 
-    OFstream thermoFile(args[4]);
+    OFstream thermoFile(args[5]);
     cr.speciesThermo().write(thermoFile);
 
     Info<< "End\n" << endl;
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 7af84242b9..7f7994bdf1 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
         Info<< "Kc(EQreactions) = " << iter().Kc(P, T) << endl;
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
index d233b2ef9a..c60149b308 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
+++ b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 Build  : dev-27a117d1f441
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
index 4498b31c27..81713ce02f 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/controlDict
+++ b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 9879031cf8..424cdc629e 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
     // Check controlFile stream is OK
     if (!controlFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << controlFileName
             << abort(FatalError);
     }
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
     // Check thermoData stream is OK
     if (!thermoDataFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << thermoDataFileName
             << abort(FatalError);
     }
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
     }
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/controlDict b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/controlDict
index 59bc2345d4..d721bec641 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/controlDict
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
index f5bd3dcd5a..cf5d7e81b2 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ public:
 
             if (volTot > 1.001 || volTot < 0.999)
             {
-                FatalErrorIn("mixture::mixture(istream& is)")
+                FatalErrorInFunction
                     << "Sum of volume fractions for Mixture " << name_
                     << " = " << volTot << endl
                     << "Should equal one."
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 742de4b807..358bb7ab0f 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
     // Check controlFile stream is OK
     if (!controlFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << controlFileName
             << abort(FatalError);
     }
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     // Check thermoData stream is OK
     if (!thermoDataFile.good())
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Cannot read file " << thermoDataFileName
             << abort(FatalError);
     }
diff --git a/bin/foamEtcFile b/bin/foamEtcFile
index a08167148e..72f1aa4a93 100755
--- a/bin/foamEtcFile
+++ b/bin/foamEtcFile
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -103,7 +103,7 @@ OpenFOAM-*)         # standard naming convention OpenFOAM-<VERSION>
     version="${projectDirName##OpenFOAM-}"
     ;;
 
-openfoam[0-9]*)     # debian naming convention 'openfoam<VERSION>'
+openfoam[0-9]* | openfoamdev)     # debian naming convention 'openfoam<VERSION>'
     versionNum="${projectDirName##openfoam}"
     case "$versionNum" in
     ??)         # convert 2 digit version number to decimal delineated
diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index 3f9ce5242a..d3aa08e221 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -88,7 +88,7 @@ printHeader()
 | =========                 |                                                 |
 | \\\\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\\\    /   O peration     | Version:  $version  |
-|   \\\\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\\\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\\\/     M anipulation  |                                                 |
 \\*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index b5edc19796..be396cd2db 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -2,8 +2,8 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#    \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -52,7 +52,10 @@ cleanTimeDirectories()
         rm -rf ./${timeDir} ./-${timeDir} > /dev/null 2>&1
         zeros="0$zeros"
     done
-    rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM ./*.blockMesh ./.setSet > /dev/null 2>&1
+    rm -rf \
+        ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* \
+        ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM ./*.blockMesh \
+        ./.setSet > /dev/null 2>&1
 }
 
 
@@ -68,6 +71,33 @@ cleanDynamicCode()
 }
 
 
+cleanSnappyFiles()
+{
+    rm -f \
+        constant/polyMesh/cellLevel \
+        constant/polyMesh/pointLevel \
+        constant/polyMesh/refinementHistory \
+        constant/polyMesh/level0Edge \
+        constant/polyMesh/surfaceIndex > /dev/null 2>&1
+    rm -f \
+        processor*/constant/polyMesh/cellLevel \
+        processor*/constant/polyMesh/pointLevel \
+        processor*/constant/polyMesh/refinementHistory \
+        processor*/constant/polyMesh/level0Edge \
+        processor*/constant/polyMesh/surfaceIndex > /dev/null 2>&1
+    rm -f \
+        constant/cellLevel \
+        constant/pointLevel \
+        0/cellLevel \
+        0/pointLevel > /dev/null 2>&1
+    rm -f \
+        processor*/constant/cellLevel \
+        processor*/constant/pointLevel \
+        processor*/0/cellLevel \
+        processor*/0/pointLevel > /dev/null 2>&1
+}
+
+
 cleanCase()
 {
     cleanTimeDirectories
@@ -83,6 +113,10 @@ cleanCase()
     rm -rf cuttingPlane > /dev/null 2>&1
     rm -rf system/machines > /dev/null 2>&1
 
+    # From mpirunDebug
+    rm -f gdbCommands  mpirun.schema
+
+    cleanSnappyFiles
     if [ -d constant/polyMesh ]
     then
         (cd constant/polyMesh && \
@@ -90,23 +124,20 @@ cleanCase()
             allOwner* cell* face* meshModifiers* \
             owner* neighbour* point* edge* \
             cellLevel* pointLevel* refinementHistory* level0Edge* surfaceIndex* sets \
+            boundary \
             > /dev/null 2>&1 \
         )
     fi
-    (cd constant && \
-        rm -rf \
-        cellToRegion cellLevel* pointLevel* \
-        > /dev/null 2>&1 \
-    )
+    (cd constant && rm -rf cellToRegion > /dev/null 2>&1)
 
     rm -rf constant/tetDualMesh > /dev/null 2>&1
 
     rm -rf VTK > /dev/null 2>&1
-    rm -f 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition
+    rm -f 0/cellDist constant/cellDecomposition
 
-    if [ -e constant/polyMesh/blockMeshDict.m4 ]
+    if [ -e system/blockMeshDict.m4 ]
     then
-        rm -f constant/polyMesh/blockMeshDict > /dev/null 2>&1
+        rm -f system/blockMeshDict > /dev/null 2>&1
     fi
 }
 
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 5a254ea43b..f05567c737 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -3,7 +3,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#    \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -40,40 +40,94 @@ getApplication()
 
 runApplication()
 {
-    APP_RUN=$1
-    APP_NAME=${1##*/}
-    shift
+    LOG_NAME=
+    APP_RUN=
+    LOG_IGNORE=false
+    LOG_APPEND=false
 
-    if [ -f log.$APP_NAME ]
+    # Parse options and executable
+    while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
+        key="$1"
+        case "$key" in
+            -append)
+                LOG_IGNORE=true
+                LOG_APPEND=true
+                ;;
+            -overwrite)
+                LOG_IGNORE=true
+                ;;
+            -log)
+                LOG_NAME=$2
+                shift
+                ;;
+            *)
+                APP_RUN="$key"
+                APP_NAME="${key##*/}"
+                ;;
+        esac
+        shift
+    done
+
+    LOG_NAME=${LOG_NAME:="log.$APP_NAME"}
+
+    if [ -f $LOG_NAME ] && [ "$LOG_IGNORE" = "false" ]
     then
-        echo "$APP_NAME already run on $PWD: remove log file to re-run"
+        echo "$APP_NAME already run on $PWD: remove log file $LOG_NAME to re-run"
     else
         echo "Running $APP_RUN on $PWD"
-        $APP_RUN "$@" > log.$APP_NAME 2>&1
+        if [ "$LOG_APPEND" = "true" ]; then
+            $APP_RUN "$@" >> $LOG_NAME 2>&1
+        else
+            $APP_RUN "$@" > $LOG_NAME 2>&1
+        fi
     fi
 }
 
 runParallel()
 {
-    APP_RUN=$1
-    APP_NAME=${1##*/}
+    LOG_NAME=
+    APP_RUN=
+    LOG_IGNORE=false
+    LOG_APPEND=false
+
+    # Parse options and executable
+    while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
+        key="$1"
+        case "$key" in
+            -append)
+                LOG_IGNORE=true
+                LOG_APPEND=true
+                ;;
+            -overwrite)
+                LOG_IGNORE=true
+                ;;
+            -log)
+                LOG_NAME=$2
+                shift
+                ;;
+            *)
+                APP_RUN="$key"
+                APP_NAME="${key##*/}"
+                # also read number of processors
+                nProcs="$2"
+                shift
+                ;;
+        esac
     shift
+    done
 
-    if [ -f log.$APP_NAME ]
+    LOG_NAME=${LOG_NAME:="log.$APP_NAME"}
+
+    if [ -f $LOG_NAME ] && [ "$LOG_IGNORE" = "false" ]
     then
-        echo "$APP_NAME already run on $PWD: remove log file to re-run"
+        echo "$APP_NAME already run on $PWD: remove log file $LOG_NAME to re-run"
     else
-        nProcs=$1
-        shift
         echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
-
-        #if [ "$WM_SCHEDULER" ]
-        #then
-        #    echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
-        #    $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null > log.$APP_NAME 2>&1 )"
-        #else
-            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null > log.$APP_NAME 2>&1 )
-        #fi
+        if [ "$LOG_APPEND" = "true" ]; then
+            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null >> $LOG_NAME 2>&1 )
+        else
+            ( mpirun -np $nProcs $APP_RUN -parallel "$@" < /dev/null > $LOG_NAME 2>&1 )
+        fi
     fi
 }
 
diff --git a/bin/tools/foamListSourceFiles b/bin/tools/foamListSourceFiles
index 56f87bdcff..5fb1b3f893 100755
--- a/bin/tools/foamListSourceFiles
+++ b/bin/tools/foamListSourceFiles
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -85,7 +85,7 @@ find -H $packDir                                                              \
  -e '\@/[Dd]oxygen/html/@d'                                                   \
  -e '\@/download/@d'                                                          \
  -e '\@/libccmio-.*/@d'                                                       \
- -e '\@/debian/@d'
+ -e '\@\./debian/@d'
 
 
 #------------------------------------------------------------------------------
diff --git a/bin/tools/foamLog.db b/bin/tools/foamLog.db
index d2719eb203..08077630c8 100644
--- a/bin/tools/foamLog.db
+++ b/bin/tools/foamLog.db
@@ -15,12 +15,18 @@
 #
 #------------------------------------------------------------------------------
 
+#- Lines to ignore
+Ignore/Solving for .* region /
+
 #- String to recognize new iteration by (usually same as 'Time')
 Separator/^[ \t]*Time = /Time = 
 
 #- Time value:
 Time/^[ \t]*Time = /Time = 
 
+#- DeltaT value:
+deltaT/^[ \t]*deltaT = /deltaT = 
+
 #- Continuity errors:
 contLocal/time step continuity errors :/sum local = 
 contGlobal/time step continuity errors :/ global = 
@@ -33,6 +39,10 @@ minFt/min\(ft\) = /min(ft) =
 #- Execution time:
 executionTime/ExecutionTime = /ExecutionTime = 
 
+#- Interface Courant no:
+IntCourantMax/Interface Courant Number /max: 
+IntCourantMean/Interface Courant Number /mean: 
+
 #- Courant no:
 CourantMax/Courant Number /max: 
 CourantMean/Courant Number /mean: 
@@ -48,8 +58,8 @@ epsMax/bounding epsilon,/max:
 epsAvg/bounding epsilon,/average: 
 
 #- gamma bounding
-alpha1Min/Min\(alpha1\) =/Min(alpha1) =
-alpha1Max/Max\(alpha1\) =/Max(alpha1) =
+alpha1Min/Min\(alpha1\) =/Min(alpha1) = 
+alpha1Max/Max\(alpha1\) =/Max(alpha1) = 
 
 # AMI
 AMIMin/AMI: Patch source sum/average = 
diff --git a/bin/tools/inlineReplace b/bin/tools/inlineReplace
deleted file mode 100755
index 27d19f8164..0000000000
--- a/bin/tools/inlineReplace
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# $0 oldString newString file1 .. fileN
-#
-if [ $# -lt 3 ]
-then
-    echo "Usage: ${0##*/} <oldString> <newString> <file1> [.. fileN]"
-    echo ""
-    echo "Replaces all occurrences of oldString by newString in files."
-    echo "(replacement for sed -i on systems that don't support it)"
-    exit 1
-fi
-
-oldString="$1"
-newString="$2"
-shift 2
-
-for f
-do
-    if grep "$oldString" "$f" >/dev/null
-    then
-        cp "$f" "${f}_bak"
-        sed -e "s@$oldString@$newString@g" "${f}_bak" > "$f"
-        rm -f "${f}_bak"
-    #else
-    #    echo "String $oldString not present in $f"
-    fi
-done
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook
index 2905d7d322..d3bf374e04 100755
--- a/bin/tools/pre-commit-hook
+++ b/bin/tools/pre-commit-hook
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -290,7 +290,7 @@ checkCopyright()
                 then
                     echo "Updated copyright for: $f" 1>&2
                     echo "$f"
-                    sed -i "s/$startYear-$endYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
+                    sed -i -e "s/$startYear-$endYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
                 fi
             else
                 # Date is of type 2011 OpenFOAM Foundation
@@ -298,7 +298,7 @@ checkCopyright()
                 then
                     echo "$f"
                     echo "Updated copyright for: $f" 1>&2
-                    sed -i "s/$startYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
+                    sed -i -e "s/$startYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
                 fi
             fi
         fi
diff --git a/bin/tools/replaceAllShellSun b/bin/tools/replaceAllShellSun
deleted file mode 100755
index d5a0d8db99..0000000000
--- a/bin/tools/replaceAllShellSun
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/xpg4/bin/sh
-
-# Replace all shell script headers with 
-if [ $# -ne 1 -o ! -d "$1" ]
-then
-    echo "Usage: ${0##*/} <dir>"
-    echo ""
-    echo "Replaces all occurrences of #!/bin/sh with #!/usr/xpg4/bin/sh inside a directory tree."
-    exit 1
-fi
-
-#- note that below does not work since {} does not get replaced
-#find $1 -type f -exec /usr/xpg4/bin/sh -c "grep '^#\!/bin/sh' {} >/dev/null && echo {} && mv {} {}_bak && sed -e 's@^#\!/bin/sh@#\!/usr/xpg4/bin/sh@' {}_bak > {}" ';'
-
-find $1 -exec $WM_PROJECT_DIR/bin/tools/inlineReplace '^#\!/bin/sh' '#\!/usr/xpg4/bin/sh' {} \; -print
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile
index eafbe480f0..ddbe275ff9 100644
--- a/doc/Doxygen/Doxyfile
+++ b/doc/Doxygen/Doxyfile
@@ -1,110 +1,129 @@
-# Doxyfile 1.6.3-1.8.1
+# Doxyfile 1.8.10
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = OpenFOAM-$(WM_PROJECT_VERSION)
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER         =
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
 PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       =
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -112,237 +131,276 @@ ALWAYS_DETAILED_SEC    = NO
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        = $(WM_PROJECT_DIR)
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = YES
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                =
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
 TCL_SUBST              =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
 
 MARKDOWN_SUPPORT       = NO
 
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
+# tag is set to YES then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
 
 INLINE_GROUPED_CLASSES = NO
 
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
 
 INLINE_SIMPLE_STRUCTS  = NO
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE      = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
 LOOKUP_CACHE_SIZE      = 0
 
@@ -350,358 +408,404 @@ LOOKUP_CACHE_SIZE      = 0
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PACKAGE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = YES
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = NO
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = NO
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
 
 STRICT_PROTO_MATCHING  = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# 1.6.3-1.7.4 SETTING
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Directory Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Directory Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            =
 
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = $(WM_PROJECT_DIR)/src \
                          $(WM_PROJECT_DIR)/applications/utilities \
                          $(WM_PROJECT_DIR)/applications/solvers
 
-# limit input for testing purposes
-# INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
-#                          $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
-#                          $(WM_PROJECT_DIR)/src/OpenFOAM/primitives \
-#                          $(WM_PROJECT_DIR)/sampling \
-#                          $(WM_PROJECT_DIR)/src/finiteVolume/fvMesh
-
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
+# *.vhdl, *.ucf, *.qsf, *.as and *.js.
 
 FILE_PATTERNS          = *.H \
                          *.C \
                          *.dox
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
@@ -710,14 +814,16 @@ EXCLUDE                =
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = */lnInclude/* \
                          */t/*
@@ -727,775 +833,1114 @@ EXCLUDE_PATTERNS       = */lnInclude/* \
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
 INPUT_FILTER           = $(WM_PROJECT_DIR)/bin/tools/doxyFilter
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
 FILTER_SOURCE_PATTERNS =
 
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = YES
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 1
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# 1.6.3 SETTING
-# If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will
-# add generated date, project name and doxygen version to HTML footer.
-
-HTML_FOOTER_DESCRIPTION= NO
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            = $(WM_PROJECT_DIR)/doc/Doxygen/_Header
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            = $(WM_PROJECT_DIR)/doc/Doxygen/_Footer
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# style sheet in the HTML output directory as well, or it will be erased!
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        =
 
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_FILES       =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = NO
 
-# 1.6.3-1.7.4 SETTING
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_INDEX_NUM_ENTRIES = 100
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output directory.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-directories
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# 1.6.3-1.7.4 SETTING
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 USE_MATHJAX            = NO
 
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         = $(WM_PROJECT_DIR)/doc/Doxygen/Macros/tensorOperator
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1503,106 +1948,129 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = YES
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = NO
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       = DTAGS
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = YES
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1610,222 +2078,312 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = YES
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           =
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = YES
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = YES
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INTERACTIVE_SVG        = NO
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
 
 MSCFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 1
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = YES
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = YES
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = NO
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index e61a00d7d2..29eb59145c 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -28,12 +28,12 @@
         #+END_SRC
         so
         #+BEGIN_SRC C++
-        WarningIn("className::functionName()")
+        WarningInFunction
             << "Warning message"
         #+END_SRC
         *not*
         #+BEGIN_SRC C++
-        WarningIn("className::functionName()")
+        WarningInFunction
         << "Warning message"
         #+END_SRC
 
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries
new file mode 100644
index 0000000000..85ae7a7006
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/boundaries
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      boundaries;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fluid
+(
+    inlet
+    outlet
+    wall
+);
+
+solid
+(
+    wall
+);
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet
new file mode 100644
index 0000000000..e79ee52073
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inlet
@@ -0,0 +1,33 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+    T
+    {
+        type        fixedValue;
+        value       ${:VALUE.T};
+    }
+    alphat
+    {
+        type        calculated;
+        value       ${:VALUE.alphat};
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions
new file mode 100644
index 0000000000..8bc59b6f36
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/inletOptions
@@ -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;
+    location    "templates";
+    object      inletOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flowSpecification
+{
+    fixedPressure
+    {
+        U
+        {
+            type        pressureInletVelocity;
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        calculated;
+            value       ${:VALUE.p};
+        }
+        p_rgh
+        {
+            type        fixedValue;
+            value       ${:VALUE.p_rgh};
+        }
+    }
+    fixedVelocity
+    {
+        U
+        {
+            type        fixedValue;
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        calculated;
+            value       ${:VALUE.p};
+        }
+        p_rgh
+        {
+            type        fixedFluxPressure;
+            value       ${:VALUE.p_rgh};
+        }
+    }
+    flowRate
+    {
+        U
+        {
+            type        flowRateInletVelocity;
+            massFlowRate ${:VALUE.massFlowRate};
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        calculated;
+            value       ${:VALUE.p};
+        }
+        p_rgh
+        {
+            type        fixedFluxPressure;
+            value       ${:VALUE.p_rgh};
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet
new file mode 100644
index 0000000000..3659e3bca3
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outlet
@@ -0,0 +1,39 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+    T
+    {
+        type        inletOutlet;
+        inletValue  ${:VALUE.T};
+        value       ${:VALUE.T};
+    }
+    p
+    {
+        type        calculated;
+        value       ${:VALUE.p};
+    }
+    alphat
+    {
+        type        calculated;
+        value       ${:VALUE.alphat};
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions
new file mode 100644
index 0000000000..577c30d7b1
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/outletOptions
@@ -0,0 +1,67 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outletOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+returnFlow
+{
+    default
+    {
+        p
+        {
+            type        calculated;
+            value       ${:VALUE.p};
+        }
+        p_rgh
+        {
+            type        fixedValue;
+            value       ${:VALUE.p_rgh};
+        }
+    }
+    wall
+    {
+        p
+        {
+            type        calculated;
+            value       ${:VALUE.p};
+        }
+        p_rgh
+        {
+            type        fixedValue;
+            value       ${:VALUE.p_rgh};
+        }
+    }
+    atmosphere
+    {
+        p
+        {
+            type        calculated;
+            value       ${:VALUE.p};
+        }
+        p_rgh
+        {
+            type        totalPressure;
+            U           U;
+            phi         phi;
+            rho         rho;
+            psi         none;
+            gamma       1;
+            p0          ${:VALUE.p_rgh};
+            value       ${:VALUE.p_rgh};
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall
new file mode 100644
index 0000000000..ecbe129ed3
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wall
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wall;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+noSlip
+{
+    p
+    {
+        type        calculated;
+        value       ${:VALUE.p};
+    }
+    p_rgh
+    {
+        type        fixedFluxPressure;
+        value       ${:VALUE.p_rgh};
+    }
+    OPTIONS         (wallFunction motion heatTransfer);
+}
+
+
+slip
+{
+    p
+    {
+        type        calculated;
+        value       ${:VALUE.p};
+    }
+    p_rgh
+    {
+        type        fixedFluxPressure;
+        value       ${:VALUE.p_rgh};
+    }
+    alphat
+    {
+        type        zeroGradient;
+    }
+    OPTIONS         (heatTransfer);
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
new file mode 100644
index 0000000000..0ee2315a40
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wallOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+wallFunction
+{
+}
+
+heatTransfer
+{
+    adiabatic
+    {
+        T
+        {
+            type        zeroGradient;
+        }
+    }
+    fixedTemperature
+    {
+        T
+        {
+            type        fixedValue;
+            value       ${:VALUE.T};
+        }
+    }
+    thermalCoupled
+    {
+        T
+        {
+            type        compressible::turbulentTemperatureCoupledBaffleMixed;
+            value       ${:VALUE.T};
+            Tnbr        T;
+            kappa       fluidThermo;
+            kappaName   none;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet
new file mode 100644
index 0000000000..e79ee52073
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inlet
@@ -0,0 +1,33 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+    T
+    {
+        type        fixedValue;
+        value       ${:VALUE.T};
+    }
+    alphat
+    {
+        type        calculated;
+        value       ${:VALUE.alphat};
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions
new file mode 100644
index 0000000000..f2b33b4997
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/inletOptions
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inletOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flowSpecification
+{
+    fixedTotalPressure
+    {
+        U
+        {
+            type        pressureInletVelocity;
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        totalPressure;
+            U           U;
+            phi         phi;
+            rho         rho;
+            psi         none;
+            gamma       1;
+            p0          ${:VALUE.p};
+            value       ${:VALUE.p};
+        }
+    }
+    flowRate
+    {
+        U
+        {
+            type        flowRateInletVelocity;
+            massFlowRate ${:VALUE.massFlowRate};
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        zeroGradient;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet
new file mode 100644
index 0000000000..8cc8c974ec
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outlet
@@ -0,0 +1,33 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+    T
+    {
+        type        inletOutlet;
+        inletValue  ${:VALUE.T};
+        value       ${:VALUE.T};
+    }
+    alphat
+    {
+        type        zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions
new file mode 100644
index 0000000000..ef33f26e58
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/outletOptions
@@ -0,0 +1,37 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+returnFlow
+{
+    atmosphere
+    {
+        p
+        {
+            type        totalPressure;
+            U           U;
+            phi         phi;
+            rho         rho;
+            psi         none;
+            gamma       1;
+            p0          ${:VALUE.p};
+            value       ${:VALUE.p};
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall
new file mode 100644
index 0000000000..10b2a0f700
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wall
@@ -0,0 +1,35 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wall;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+noSlip
+{
+    OPTIONS         (wallFunction motion heatTransfer);
+}
+
+
+slip
+{
+    alphat
+    {
+        type        zeroGradient;
+    }
+
+    OPTIONS         (heatTransfer);
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
new file mode 100644
index 0000000000..535ce01aa1
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
@@ -0,0 +1,70 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wallOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+wallFunction
+{
+    highReynolds
+    {
+        alphat
+        {
+            type        compressible::alphatWallFunction;
+            value       ${:VALUE.alphat};
+        }
+    }
+    lowReynolds
+    {
+        alphat
+        {
+            type        fixedValue;
+            value       uniform 0;
+        }
+    }
+}
+
+
+heatTransfer
+{
+    adiabatic
+    {
+        T
+        {
+            type        zeroGradient;
+        }
+    }
+    fixedTemperature
+    {
+        T
+        {
+            type        fixedValue;
+            value       ${:VALUE.T};
+        }
+    }
+    thermalCoupled
+    {
+        T
+        {
+            type        compressible::turbulentTemperatureCoupledBaffleMixed;
+            value       ${:VALUE.T};
+            Tnbr        T;
+            kappa       fluidThermo;
+            kappaName   none;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet
new file mode 100644
index 0000000000..bb4a5bd4fa
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inlet
@@ -0,0 +1,23 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions
new file mode 100644
index 0000000000..2da4d29f53
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/inletOptions
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inletOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flowSpecification
+{
+    fixedTotalPressure
+    {
+        U
+        {
+            type        pressureInletVelocity;
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        totalPressure;
+            U           U;
+            phi         phi;
+            rho         none;
+            psi         none;
+            gamma       1;
+            p0          ${:VALUE.p};
+            value       ${:VALUE.p};
+        }
+    }
+    flowRate
+    {
+        U
+        {
+            type        flowRateInletVelocity;
+            volumeFlowRate ${:VALUE.volumeFlowRate};
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        zeroGradient;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet
new file mode 100644
index 0000000000..64b45f69ac
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/outlet
@@ -0,0 +1,23 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall
new file mode 100644
index 0000000000..53eb7668a7
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wall
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wall;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+noSlip
+{}
+
+slip
+{}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions
new file mode 100644
index 0000000000..15e751b548
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/incompressible/wallOptions
@@ -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;
+    location    "templates";
+    object      wallOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+wallFunction
+{
+    highReynolds
+    {
+    }
+    lowReynolds
+    {
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet
new file mode 100644
index 0000000000..5b8fcc24c5
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inlet
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+    nut
+    {
+        type        calculated;
+        value       ${:VALUE.nut};
+    }
+    k
+    {
+        type        fixedValue;
+        value       ${:VALUE.k};
+    }
+    epsilon
+    {
+        type        fixedValue;
+        value       ${:VALUE.epsilon};
+    }
+    omega
+    {
+        type        fixedValue;
+        value       ${:VALUE.omega};
+    }
+
+    OPTIONS         (flowSpecification);
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions
new file mode 100644
index 0000000000..5ae69a9b97
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/inletOptions
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      inletOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flowSpecification
+{
+    fixedPressure
+    {
+        U
+        {
+            type        pressureInletVelocity;
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        fixedValue;
+            value       ${:VALUE.p};
+        }
+    }
+    fixedVelocity
+    {
+        U
+        {
+            type        fixedValue;
+            value       ${:VALUE.U};
+        }
+        p
+        {
+            type        zeroGradient;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet
new file mode 100644
index 0000000000..5834c31087
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outlet
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outlet;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+subSonic
+{
+    nut
+    {
+        type        calculated;
+        value       ${:VALUE.nut};
+    }
+
+    OPTIONS         (returnFlow);
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions
new file mode 100644
index 0000000000..51186b549e
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/outletOptions
@@ -0,0 +1,117 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      outletOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+returnFlow
+{
+    default
+    {
+        p
+        {
+            type        fixedValue;
+            value       ${:VALUE.p};
+        }
+        U
+        {
+            type        pressureInletOutletVelocity;
+            value       ${:VALUE.U};
+        }
+        k
+        {
+            type        inletOutlet;
+            inletValue  ${:VALUE.k};
+            value       ${:VALUE.k};
+        }
+        epsilon
+        {
+            type        inletOutlet;
+            inletValue  ${:VALUE.epsilon};
+            value       ${:VALUE.epsilon};
+        }
+        omega
+        {
+            type        inletOutlet;
+            inletValue  ${:VALUE.omega};
+            value       ${:VALUE.omega};
+        }
+    }
+    wall
+    {
+        p
+        {
+            type        fixedValue;
+            value       ${:VALUE.p};
+        }
+        U
+        {
+            type        inletOutlet;
+            inletValue  uniform (0 0 0);
+            value       ${:VALUE.U};
+        }
+        k
+        {
+            type        zeroGradient;
+        }
+        epsilon
+        {
+            type        zeroGradient;
+        }
+        omega
+        {
+            type        zeroGradient;
+        }
+    }
+    atmosphere
+    {
+        p
+        {
+            type        totalPressure;
+            U           U;
+            phi         phi;
+            rho         none;
+            psi         none;
+            gamma       1;
+            p0          ${:VALUE.p};
+            value       ${:VALUE.p};
+        }
+        U
+        {
+            type        pressureInletOutletVelocity;
+            value       ${:VALUE.U};
+        }
+        k
+        {
+            type        inletOutlet;
+            inletValue  ${:VALUE.k};
+            value       ${:VALUE.k};
+        }
+        epsilon
+        {
+            type        inletOutlet;
+            inletValue  ${:VALUE.epsilon};
+            value       ${:VALUE.epsilon};
+        }
+        omega
+        {
+            type        inletOutlet;
+            inletValue  ${:VALUE.omega};
+            value       ${:VALUE.omega};
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall
new file mode 100644
index 0000000000..cab701c84d
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wall
@@ -0,0 +1,64 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wall;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+noSlip
+{
+    p
+    {
+        type        zeroGradient;
+    }
+    nut
+    {
+        type        calculated;
+        value       ${:VALUE.nut};
+    }
+
+    OPTIONS         (wallFunction motion);
+}
+
+
+slip
+{
+    U
+    {
+        type        slip;
+    }
+    p
+    {
+        type        zeroGradient;
+    }
+    nut
+    {
+        type        calculated;
+        value       ${:VALUE.nut};
+    }
+    k
+    {
+        type        zeroGradient;
+    }
+    epsilon
+    {
+        type        zeroGradient;
+    }
+    omega
+    {
+        type        zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions
new file mode 100644
index 0000000000..5434132712
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/wallOptions
@@ -0,0 +1,98 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wallOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+wallFunction
+{
+    highReynolds
+    {
+        nut
+        {
+            type        nutkWallFunction;
+            value       ${:VALUE.nut};
+        }
+        k
+        {
+            type        kqRWallFunction;
+            value       ${:VALUE.k};
+        }
+        epsilon
+        {
+            type        epsilonWallFunction;
+            value       ${:VALUE.epsilon};
+        }
+        omega
+        {
+            type        omegaWallFunction;
+            value       ${:VALUE.omega};
+        }
+    }
+    lowReynolds
+    {
+        nut
+        {
+            type        fixedValue;
+            value       uniform 0;
+        }
+        k
+        {
+            type        fixedValue;
+            value       uniform 0;
+        }
+        epsilon
+        {
+            type        fixedValue;
+            value       uniform 1e-8;
+        }
+        omega
+        {
+            type        fixedValue;
+            value       uniform 1e-8;
+        }
+    }
+}
+
+
+motion
+{
+    stationary
+    {
+        U
+        {
+            type        fixedValue;
+            value       uniform (0 0 0);
+        }
+    }
+    moving
+    {
+        U
+        {
+            type        fixedValue;
+            value       ${:VALUE.U};
+        }
+    }
+    movingMesh
+    {
+        U
+        {
+            type        movingWallVelocity;
+            value       ${:VALUE.U};
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall
new file mode 100644
index 0000000000..0026357378
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wall
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wall;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermal
+{
+    p
+    {
+        type        calculated;
+        value       ${:VALUE.p};
+    }
+
+    OPTIONS         (heatTransfer);
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
new file mode 100644
index 0000000000..3c11008a44
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      wallOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+heatTransfer
+{
+    adiabatic
+    {
+        T
+        {
+            type        zeroGradient;
+        }
+    }
+    fixedTemperature
+    {
+        T
+        {
+            type        fixedValue;
+            value       ${:VALUE.T};
+        }
+    }
+    thermalCoupled
+    {
+        T
+        {
+            type        compressible::turbulentTemperatureCoupledBaffleMixed;
+            value       ${:VALUE.T};
+            Tnbr        T;
+            kappa       solidThermo;
+            kappaName   none;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon
new file mode 100644
index 0000000000..8a2fc128a9
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kEpsilon
@@ -0,0 +1,52 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      kEpsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fluidFields
+{
+    k
+    {
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
+    }
+    epsilon
+    {
+        type        scalar;
+        dimensions  [0 2 -3 0 0];
+    }
+    nut
+    {
+        type        scalar;
+        dimensions  [0 2 -1 0 0];
+    }
+}
+
+
+incompressibleFields
+{}
+
+
+compressibleFields
+{
+    alphat
+    {
+        type        scalar;
+        dimensions  [1 -1 -1 0 0];
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega
similarity index 59%
rename from tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
rename to etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega
index a4b4e11372..a68f43ea7c 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmega
@@ -2,40 +2,51 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       dictionary;
+    location    "templates";
+    object      kOmega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-3
-(
-    lowValue
+fluidFields
+{
+    k
     {
-        type            patch;
-        nFaces          1;
-        startFace       499;
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
     }
-    highValue
+    omega
     {
-        type            patch;
-        nFaces          1;
-        startFace       500;
+        type        scalar;
+        dimensions  [0 0 -1 0 0];
     }
-    defaultFaces
+    nut
     {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          2000;
-        startFace       501;
+        type        scalar;
+        dimensions  [0 2 -1 0 0];
     }
-)
+}
+
+
+incompressibleFields
+{}
+
+
+compressibleFields
+{
+    alphat
+    {
+        type        scalar;
+        dimensions  [1 -1 -1 0 0];
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST
new file mode 100644
index 0000000000..4bb97f7542
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/kOmegaSST
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      kOmegaSST;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+fluidFields
+{
+    k
+    {
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
+    }
+    omega
+    {
+        type        scalar;
+        dimensions  [0 0 -1 0 0];
+    }
+    nut
+    {
+        type        scalar;
+        dimensions  [0 2 -1 0 0];
+    }
+}
+
+
+incompressibleFields
+{}
+
+
+compressibleFields
+{
+    alphat
+    {
+        type        scalar;
+        dimensions  [1 -1 -1 0 0];
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar
new file mode 100644
index 0000000000..a6b09b6911
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/models/turbulence/laminar
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      laminar;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fluidFields
+{}
+
+
+incompressibleFields
+{}
+
+
+compressibleFields
+{}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary b/etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam
similarity index 52%
rename from tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
rename to etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam
index de0c0bac80..7d29f26cf7 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/chtMultiRegionFoam
@@ -2,51 +2,64 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       dictionary;
+    location    "templates";
+    object      chtMultiRegionFoam;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
-(
-    topSurface
+solverType  buoyant;
+
+multiRegion yes;
+
+fluidModels
+{
+    turbulenceModel  turbulenceModel;
+}
+
+fluidFields
+{
+    U
     {
-        type            patch;
-        nFaces          6;
-        startFace       16;
+        type        vector;
+        dimensions  [0 1 -1 0 0];
     }
-    bottomSurface
+    p
     {
-        type            patch;
-        nFaces          6;
-        startFace       22;
+        type        scalar;
+        dimensions  [1 -1 -2 0 0];
     }
-    fixedEnd
+    p_rgh
     {
-        type            patch;
-        nFaces          2;
-        startFace       28;
+        type        scalar;
+        dimensions  [1 -1 -2 0 0];
     }
-    tractionEnd
+    T
     {
-        type            patch;
-        nFaces          2;
-        startFace       30;
+        type        scalar;
+        dimensions  [0 0 0 1 0];
     }
-    defaultFaces
+}
+
+solidFields
+{
+    p
     {
-        type            empty;
-        nFaces          24;
-        startFace       32;
+        type        scalar;
+        dimensions  [1 -1 -2 0 0];
     }
-)
+    T
+    {
+        type        scalar;
+        dimensions  [0 0 0 1 0];
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam
new file mode 100644
index 0000000000..f1c023c69a
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/icoFoam
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      icoFoam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solverType  incompressible;
+
+multiRegion no;
+
+fluidModels
+{
+}
+
+fluidFields
+{
+    U
+    {
+        type        vector;
+        dimensions  [0 1 -1 0 0];
+    }
+    p
+    {
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam
new file mode 100644
index 0000000000..74484a2780
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pimpleFoam
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      pimpleFoam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solverType  incompressible;
+
+multiRegion no;
+
+fluidModels
+{
+    turbulenceModel  turbulenceModel;
+}
+
+fluidFields
+{
+    U
+    {
+        type        vector;
+        dimensions  [0 1 -1 0 0];
+    }
+    p
+    {
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam
new file mode 100644
index 0000000000..420df15eef
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/pisoFoam
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      pisoFoam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solverType  incompressible;
+
+multiRegion no;
+
+fluidModels
+{
+    turbulenceModel  turbulenceModel;
+}
+
+fluidFields
+{
+    U
+    {
+        type        vector;
+        dimensions  [0 1 -1 0 0];
+    }
+    p
+    {
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleDyMFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleDyMFoam
new file mode 100644
index 0000000000..4e35f052b9
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleDyMFoam
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      rhoPimpleDyMFoam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solverType  compressible;
+
+multiRegion no;
+
+fluidModels
+{
+    turbulenceModel  turbulenceModel;
+}
+
+fluidFields
+{
+    U
+    {
+        type        vector;
+        dimensions  [0 1 -1 0 0];
+    }
+    p
+    {
+        type        scalar;
+        dimensions  [1 -1 -2 0 0];
+    }
+    T
+    {
+        type        scalar;
+        dimensions  [0 0 0 1 0];
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam
new file mode 100644
index 0000000000..038a4fdc93
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/rhoPimpleFoam
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      rhoPimpleFoam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solverType  compressible;
+
+multiRegion no;
+
+fluidModels
+{
+    turbulenceModel  turbulenceModel;
+}
+
+fluidFields
+{
+    U
+    {
+        type        vector;
+        dimensions  [0 1 -1 0 0];
+    }
+    p
+    {
+        type        scalar;
+        dimensions  [1 -1 -2 0 0];
+    }
+    T
+    {
+        type        scalar;
+        dimensions  [0 0 0 1 0];
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam b/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam
new file mode 100644
index 0000000000..06ffcc5d64
--- /dev/null
+++ b/etc/caseDicts/createZeroDirectoryTemplates/solvers/simpleFoam
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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;
+    location    "templates";
+    object      simpleFoam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solverType  incompressible;
+
+multiRegion no;
+
+fluidModels
+{
+    turbulenceModel  turbulenceModel;
+}
+
+fluidFields
+{
+    U
+    {
+        type        vector;
+        dimensions  [0 1 -1 0 0];
+    }
+    p
+    {
+        type        scalar;
+        dimensions  [0 2 -2 0 0];
+    }
+}
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/foamyHexMeshDict b/etc/caseDicts/foamyHexMeshDict
index cb8ac1517b..3cbe6d353b 100644
--- a/etc/caseDicts/foamyHexMeshDict
+++ b/etc/caseDicts/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXY b/etc/caseDicts/general/coordinateSystem/cartesianXY
index 020366c10f..b0b45a48ad 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianXY
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXY
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXZ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
index e1be4c9dd4..ca95fac495 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianXZ
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianYZ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
index e2def70c32..cd018a5f8e 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianYZ
+++ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/general/coordinateSystem/cylindrical b/etc/caseDicts/general/coordinateSystem/cylindrical
index ff5b3559d3..5d8e1f7ef5 100644
--- a/etc/caseDicts/general/coordinateSystem/cylindrical
+++ b/etc/caseDicts/general/coordinateSystem/cylindrical
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/general/fvOptions/porosity/porousZone b/etc/caseDicts/general/fvOptions/porosity/porousZone
index f7ab42ffed..5e7a7f80de 100644
--- a/etc/caseDicts/general/fvOptions/porosity/porousZone
+++ b/etc/caseDicts/general/fvOptions/porosity/porousZone
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -18,12 +18,12 @@ porousZone // Change to something more descriptive
 {
     type           explicitPorositySource;
     active         true;
-    selectionMode  cellZone;
-    cellZone       <cellZoneName>; // Specify the name of the cellZone
 
     explicitPorositySourceCoeffs
     {
         type           DarcyForchheimer;
+        selectionMode  cellZone;
+        cellZone       <cellZoneName>; // Specify the name of the cellZone
 
         DarcyForchheimerCoeffs
         {
diff --git a/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState b/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState
index 634f2bda05..2ba7ed1a74 100644
--- a/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState
+++ b/etc/caseDicts/general/fvSolution/relaxationFactors/steadyState
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/general/fvSolution/relaxationFactors/transient b/etc/caseDicts/general/fvSolution/relaxationFactors/transient
index c8d531e7b2..d8b09a8c8a 100644
--- a/etc/caseDicts/general/fvSolution/relaxationFactors/transient
+++ b/etc/caseDicts/general/fvSolution/relaxationFactors/transient
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/mesh/generation/meshQualityDict.cfg b/etc/caseDicts/mesh/generation/meshQualityDict.cfg
index 7c244e09f2..c6f2c32a50 100644
--- a/etc/caseDicts/mesh/generation/meshQualityDict.cfg
+++ b/etc/caseDicts/mesh/generation/meshQualityDict.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg b/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg
index 71db4d401c..712db76545 100644
--- a/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg
+++ b/etc/caseDicts/mesh/generation/snappyHexMeshDict.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict b/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict
index 780c842fae..933805d75d 100644
--- a/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict
+++ b/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
index 3367c305f8..b8e950fd31 100644
--- a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
+++ b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/meshQualityDict b/etc/caseDicts/meshQualityDict
index 734f368f4f..8ab37b45be 100644
--- a/etc/caseDicts/meshQualityDict
+++ b/etc/caseDicts/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
index 1132a7a33f..a70892ab59 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
index 56d3c16efc..6a50844070 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/faceSource/patchAverage b/etc/caseDicts/postProcessing/faceSource/patchAverage
index 255c751ce1..fc2e9411ef 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchAverage
+++ b/etc/caseDicts/postProcessing/faceSource/patchAverage
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
index a1bd471a08..d03e634b79 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
index 23db54b242..8203a12e94 100644
--- a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2 b/etc/caseDicts/postProcessing/fields/Lambda2
index 31170e2f5b..78416aec67 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2
+++ b/etc/caseDicts/postProcessing/fields/Lambda2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2.cfg b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
index 0722af8f62..f4008b6f37 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2.cfg
+++ b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/fields/Q b/etc/caseDicts/postProcessing/fields/Q
index 539af98d5d..71bdd40042 100644
--- a/etc/caseDicts/postProcessing/fields/Q
+++ b/etc/caseDicts/postProcessing/fields/Q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/fields/Q.cfg b/etc/caseDicts/postProcessing/fields/Q.cfg
index 5def0533fb..7bd9a8d575 100644
--- a/etc/caseDicts/postProcessing/fields/Q.cfg
+++ b/etc/caseDicts/postProcessing/fields/Q.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
index 9e5385a2f2..98916e7ddd 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
index b73dae82ef..7b1e28588b 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
index bcaa82a874..5988de5cde 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
index d8f7546c6e..d3d12658b7 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
index e2021318bc..1e7149b511 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
index 3a45f320e4..0b5100ab90 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
index 513aec09d8..e2be0d699f 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
index fab2280353..e814339fef 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg
index 4d36643c8c..a7632347c0 100644
--- a/etc/caseDicts/postProcessing/forces/forces.cfg
+++ b/etc/caseDicts/postProcessing/forces/forces.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible
index 1c8607be20..1df4fe60d5 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
index a8a630a9c1..efb7bb8bb1 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible
index 8dc16603cf..44601bbbfd 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg
index 629aea0f8c..b614fe42ec 100644
--- a/etc/caseDicts/postProcessing/graphs/graph.cfg
+++ b/etc/caseDicts/postProcessing/graphs/graph.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict b/etc/caseDicts/postProcessing/graphs/sampleDict
index 6b535efd7b..2483a23415 100644
--- a/etc/caseDicts/postProcessing/graphs/sampleDict
+++ b/etc/caseDicts/postProcessing/graphs/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict.cfg b/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
index bdbe894be6..a63de5bdc3 100644
--- a/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
+++ b/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/graphs/singleGraph b/etc/caseDicts/postProcessing/graphs/singleGraph
index dcbd48189e..14c3b5ce0c 100644
--- a/etc/caseDicts/postProcessing/graphs/singleGraph
+++ b/etc/caseDicts/postProcessing/graphs/singleGraph
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/cellMax b/etc/caseDicts/postProcessing/minMax/cellMax
index e0eac71863..aa266c41ff 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMax
+++ b/etc/caseDicts/postProcessing/minMax/cellMax
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin b/etc/caseDicts/postProcessing/minMax/cellMin
index ba20b659de..b8194d40ae 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin
+++ b/etc/caseDicts/postProcessing/minMax/cellMin
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin.cfg b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
index 7cd162d9d6..11ccdab74d 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
index 53374d6a22..e3c0107f24 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/faceMax b/etc/caseDicts/postProcessing/minMax/faceMax
index f1cffd0ff4..847dc92699 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMax
+++ b/etc/caseDicts/postProcessing/minMax/faceMax
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin b/etc/caseDicts/postProcessing/minMax/faceMin
index dd5181eff8..b2c34e1cb0 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin
+++ b/etc/caseDicts/postProcessing/minMax/faceMin
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin.cfg b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
index 111b8368e7..c4414feab2 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
index 620b02cf60..e1ea634e52 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
index 842cbbdf41..b11288c0af 100644
--- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents b/etc/caseDicts/postProcessing/minMax/minMaxComponents
index 999509c934..5316322636 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
index a4b2cdb5b9..5002f10f77 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
index 155d460bdf..02725b5d6a 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
+++ b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/numerical/residuals b/etc/caseDicts/postProcessing/numerical/residuals
index 3719ca29ba..7eee80b259 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals
+++ b/etc/caseDicts/postProcessing/numerical/residuals
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/numerical/residuals.cfg b/etc/caseDicts/postProcessing/numerical/residuals.cfg
index 844c2810f3..1ca10eda8b 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals.cfg
+++ b/etc/caseDicts/postProcessing/numerical/residuals.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
index f8b1ef96db..63610ad52c 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
index 8131375e9d..8b23dec1b7 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
index c13b316702..0c3af2901b 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
index ba981ad7c7..9a808212db 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
index 9d782905cc..634396525e 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
index 331875a431..923c496455 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure b/etc/caseDicts/postProcessing/pressure/staticPressure
index 3aee436f90..cd81112078 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
index 6b7b5b1005..60af533a6c 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
index 8712bb9387..558ddc6bb8 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
index 0e083f2a25..b30f3c791b 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
index 24a50c5637..2e11e0cc33 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
index d90f92a052..062a02831e 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud b/etc/caseDicts/postProcessing/probes/boundaryCloud
index 1f79a97b88..48f2531f0f 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
index 5df71dc2c3..11d8a89000 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg
index 87cd5e7bd8..05937912df 100644
--- a/etc/caseDicts/postProcessing/probes/cloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/cloud.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud b/etc/caseDicts/postProcessing/probes/internalCloud
index 8a914bbd57..95b26833df 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud
+++ b/etc/caseDicts/postProcessing/probes/internalCloud
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud.cfg b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
index e0e60d206a..c3d8dd3e8d 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/postProcessing/probes/probes
index 774deb5d80..ec9106265d 100644
--- a/etc/caseDicts/postProcessing/probes/probes
+++ b/etc/caseDicts/postProcessing/probes/probes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/postProcessing/probes/probes.cfg
index 462851bd10..a0ae8c3b64 100644
--- a/etc/caseDicts/postProcessing/probes/probes.cfg
+++ b/etc/caseDicts/postProcessing/probes/probes.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/scalarTransport/T b/etc/caseDicts/postProcessing/scalarTransport/T
index 44fcc9ac00..c8a82f8259 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/T
+++ b/etc/caseDicts/postProcessing/scalarTransport/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
index 50d63e2cd4..29fb53d4e7 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
index 425b921da9..2f5fd17396 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
index f33d51229d..a2d9a9f8b2 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg
index 010290ff68..dc386d6ae5 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines
index 64ac9ff3f4..416091db35 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines
+++ b/etc/caseDicts/postProcessing/visualization/streamlines
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
index 8673f72217..39f3bb29dd 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg
+++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces b/etc/caseDicts/postProcessing/visualization/surfaces
index 45ce485057..b6f400143b 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces
+++ b/etc/caseDicts/postProcessing/visualization/surfaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index cdd1cefc08..9424768c4d 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/caseDicts/setConstraintTypes b/etc/caseDicts/setConstraintTypes
index 6b075c7382..3c0d6afed9 100644
--- a/etc/caseDicts/setConstraintTypes
+++ b/etc/caseDicts/setConstraintTypes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
@@ -39,11 +39,13 @@ nonuniformTransformCyclic
 processor
 {
     type  processor;
+    value $internalField;
 }
 
 processorCyclic
 {
     type  processorCyclic;
+    value $internalField;
 }
 
 symmetryPlane
diff --git a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
index 52ec5a5c73..3fde714608 100644
--- a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
+++ b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/cellModels b/etc/cellModels
index f4db48e277..41e8f9dea9 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/etc/codeTemplates/foamScript b/etc/codeTemplates/foamScript
old mode 100644
new mode 100755
index 1075782d7f..56f750e175
--- a/etc/codeTemplates/foamScript
+++ b/etc/codeTemplates/foamScript
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/etc/codeTemplates/source/_Template.C b/etc/codeTemplates/source/_Template.C
index 36464dc5f5..a7005f5a20 100644
--- a/etc/codeTemplates/source/_Template.C
+++ b/etc/codeTemplates/source/_Template.C
@@ -87,7 +87,7 @@ void Foam::CLASSNAME::operator=(const CLASSNAME& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn("Foam::CLASSNAME::operator=(const Foam::CLASSNAME&)")
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/etc/codeTemplates/template/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C
index 0cd8a3fbc9..41469f7b13 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.C
+++ b/etc/codeTemplates/template/_TemplateTemplate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,11 +103,8 @@ void Foam::CLASSNAME<TemplateArgument>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::CLASSNAME<TemplateArgument>::operator="
-            "(const Foam::CLASSNAME<TemplateArgument>&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 }
diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh
index 96b5201c86..7269587c30 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config/CGAL.csh
@@ -30,7 +30,7 @@
 ##------------------------------------------------------------------------------
 
 set boost_version=boost-system
-set cgal_version=CGAL-4.6
+set cgal_version=CGAL-4.7
 
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
index 171f5a49f0..7a59fc6e00 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config/CGAL.sh
@@ -30,7 +30,7 @@
 #------------------------------------------------------------------------------
 
 boost_version=boost-system
-cgal_version=CGAL-4.6
+cgal_version=CGAL-4.7
 
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 2d67783b17..f81a894d11 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -52,7 +52,8 @@ end
 #setenv ParaView_VERSION 3.12.0
 #setenv ParaView_VERSION 4.0.1
 #setenv ParaView_VERSION 4.1.0
-setenv ParaView_VERSION 4.3.1
+#setenv ParaView_VERSION 4.3.1
+setenv ParaView_VERSION 4.4.0
 setenv ParaView_MAJOR detect
 
 
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index d1a595a429..6b34500881 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -54,7 +54,8 @@ done
 #export ParaView_VERSION=3.12.0
 #export ParaView_VERSION=4.0.1
 #export ParaView_VERSION=4.1.0
-export ParaView_VERSION=4.3.1
+#export ParaView_VERSION=4.3.1
+export ParaView_VERSION=4.4.0
 export ParaView_MAJOR=detect
 
 
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 864088d6ec..31669ae676 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -379,7 +379,7 @@ case SYSTEMOPENMPI:
     breaksw
 
 case OPENMPI:
-    setenv FOAM_MPI openmpi-1.8.5
+    setenv FOAM_MPI openmpi-1.10.0
     # Optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
 
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 6a7bce43e0..02be26b9d7 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -403,7 +403,7 @@ SYSTEMOPENMPI)
     ;;
 
 OPENMPI)
-    export FOAM_MPI=openmpi-1.8.5
+    export FOAM_MPI=openmpi-1.10.0
     # Optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
 
diff --git a/etc/controlDict b/etc/controlDict
index cfbdf69cb8..d97210d5cb 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -913,60 +913,60 @@ DimensionedConstants
     {
         universal
         {
-            c               c [ 0 1 -1 0 0 0 0 ] 2.99792e+08;
-            G               G [ -1 3 -2 0 0 0 0 ] 6.67429e-11;
-            h               h [ 1 2 -1 0 0 0 0 ] 6.62607e-34;
+            c               c [0 1 -1 0 0 0 0] 2.99792e+08;
+            G               G [-1 3 -2 0 0 0 0] 6.67429e-11;
+            h               h [1 2 -1 0 0 0 0] 6.62607e-34;
         }
         electromagnetic
         {
-            e               e [ 0 0 1 0 0 1 0 ] 1.60218e-19;
+            e               e [0 0 1 0 0 1 0] 1.60218e-19;
         }
         atomic
         {
-            me              me [ 1 0 0 0 0 0 0 ] 9.10938e-31;
-            mp              mp [ 1 0 0 0 0 0 0 ] 1.67262e-27;
+            me              me [1 0 0 0 0 0 0] 9.10938e-31;
+            mp              mp [1 0 0 0 0 0 0] 1.67262e-27;
         }
         physicoChemical
         {
-            mu              mu [ 1 0 0 0 0 0 0 ] 1.66054e-27;
-            k               k [ 1 2 -2 -1 0 0 0 ] 1.38065e-23;
+            mu              mu [1 0 0 0 0 0 0] 1.66054e-27;
+            k               k [1 2 -2 -1 0 0 0] 1.38065e-23;
         }
         standard
         {
             //- Standard pressure [Pa]
-            Pstd            Pstd [ 1 -1 -2 0 0 0 0 ] 100000;
+            Pstd            Pstd [1 -1 -2 0 0 0 0] 1e5;
             //- Standard temperature [degK]
-            Tstd            Tstd [ 0 0 0 1 0 0 0 ] 298.15;
+            Tstd            Tstd [0 0 0 1 0 0 0] 298.15;
         }
     }
     USCSCoeffs
     {
         universal
         {
-            c               c [ 0 1 -1 0 0 0 0 ] 9.83558e+08;
-            G               G [ -1 3 -2 0 0 0 0 ] 1.06909e-09;
-            h               h [ 1 2 -1 0 0 0 0 ] 1.57234e-32;
+            c               c [0 1 -1 0 0 0 0] 9.83558e+08;
+            G               G [-1 3 -2 0 0 0 0] 1.06909e-09;
+            h               h [1 2 -1 0 0 0 0] 1.57234e-32;
         }
         electromagnetic
         {
-            e               e [ 0 0 1 0 0 1 0 ] 1.60218e-19;
+            e               e [0 0 1 0 0 1 0] 1.60218e-19;
         }
         atomic
         {
-            me              me [ 1 0 0 0 0 0 0 ] 2.00825e-30;
-            mp              mp [ 1 0 0 0 0 0 0 ] 3.68746e-27;
+            me              me [1 0 0 0 0 0 0] 2.00825e-30;
+            mp              mp [1 0 0 0 0 0 0] 3.68746e-27;
         }
         physicoChemical
         {
-            mu              mu [ 1 0 0 0 0 0 0 ] 3.66083e-27;
-            k               k [ 1 2 -2 -1 0 0 0 ] 1.82012e-22;
+            mu              mu [1 0 0 0 0 0 0] 3.66083e-27;
+            k               k [1 2 -2 -1 0 0 0] 1.82012e-22;
         }
         standard
         {
             //- Standard pressure [lbm/ft^2]
-            Pstd            Pstd [ 1 -1 -2 0 0 0 0 ] 2088.6;
+            Pstd            Pstd [1 -1 -2 0 0 0 0] 2088.6;
             //- Standard temperature [degR]
-            Tstd            Tstd [ 0 0 0 1 0 0 0 ] 536.67;
+            Tstd            Tstd [0 0 0 1 0 0 0] 536.67;
         }
     }
 }
@@ -979,34 +979,34 @@ DimensionSets
     SICoeffs
     {
         // Basic units
-        kg  kg  [ 1 0 0 0 0 0 0 ] 1.0;
-        m   m   [ 0 1 0 0 0 0 0 ] 1.0;
-        s   s   [ 0 0 1 0 0 0 0 ] 1.0;
-        K   K   [ 0 0 0 1 0 0 0 ] 1.0;
-        mol mol [ 0 0 0 0 1 0 0 ] 1.0;
-        A   A   [ 0 0 0 0 0 1 0 ] 1.0;
-        Cd  Cd  [ 0 0 0 0 0 0 1 ] 1.0;
+        kg  kg  [1 0 0 0 0 0 0] 1.0;
+        m   m   [0 1 0 0 0 0 0] 1.0;
+        s   s   [0 0 1 0 0 0 0] 1.0;
+        K   K   [0 0 0 1 0 0 0] 1.0;
+        mol mol [0 0 0 0 1 0 0] 1.0;
+        A   A   [0 0 0 0 0 1 0] 1.0;
+        Cd  Cd  [0 0 0 0 0 0 1] 1.0;
 
         // Derived units
-        Hz  Hz  [ s^-1 ] 1.0;
-        N   N   [ kg m s^-2 ] 1.0;
-        Pa  Pa  [ N m^-2 ] 1.0;
-        J   J   [ N m ] 1.0;
-        W   W   [ J s^-1 ] 1.0;
+        Hz  Hz  [s^-1] 1.0;
+        N   N   [kg m s^-2] 1.0;
+        Pa  Pa  [N m^-2] 1.0;
+        J   J   [N m] 1.0;
+        W   W   [J s^-1] 1.0;
 
         // Some non-symbolic ones
         area area [m^2] 1.0;
         volume volume [m^3] 1.0;
-        density density [ kg m^-3 ] 1.0;
-        acceleration acceleration  [ m s^-2 ] 1.0;
-        kinematicPressure kinematicPressure [ Pa density^-1 ] 1.0;
+        density density [kg m^-3] 1.0;
+        acceleration acceleration  [m s^-2] 1.0;
+        kinematicPressure kinematicPressure [Pa density^-1] 1.0;
 
         // Scaled units. Only allowed in dimensionedType (dimensionedScalar,
         // dimensionedVector etc.) and UniformDimensionedField, not
         // in DimensionedField or GeometricField
-        cm  cm  [ m ] 1e-2;
-        mm  mm  [ m ] 1e-3;
-        km  km  [ m ] 1e3;
+        cm  cm  [m] 1e-2;
+        mm  mm  [m] 1e-3;
+        km  km  [m] 1e3;
 
         // Set of units used for printing. Can be any basic or derived
         // but not scaled (only supported for dimensionedScalar, etc)
@@ -1016,13 +1016,13 @@ DimensionSets
     USCSCoeffs
     {
         // Basic units
-        lb  lb  [ 1 0 0 0 0 0 0 ] 1.0;
-        ft  ft  [ 0 1 0 0 0 0 0 ] 1.0;
-        s   s   [ 0 0 1 0 0 0 0 ] 1.0;
-        R   R   [ 0 0 0 1 0 0 0 ] 1.0;
-        mol mol [ 0 0 0 0 1 0 0 ] 1.0;
-        A   A   [ 0 0 0 0 0 1 0 ] 1.0;
-        Cd  Cd  [ 0 0 0 0 0 0 1 ] 1.0;
+        lb  lb  [1 0 0 0 0 0 0] 1.0;
+        ft  ft  [0 1 0 0 0 0 0] 1.0;
+        s   s   [0 0 1 0 0 0 0] 1.0;
+        R   R   [0 0 0 1 0 0 0] 1.0;
+        mol mol [0 0 0 0 1 0 0] 1.0;
+        A   A   [0 0 0 0 0 1 0] 1.0;
+        Cd  Cd  [0 0 0 0 0 0 1] 1.0;
 
         // Set of units used for printing. Can be any basic or derived
         // but not scaled (only supported for dimensionedScalar, etc)
diff --git a/etc/templates/axisymmetricJet/0/U b/etc/templates/axisymmetricJet/0/U
index cc273e6321..be51b0d82f 100644
--- a/etc/templates/axisymmetricJet/0/U
+++ b/etc/templates/axisymmetricJet/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/0/epsilon b/etc/templates/axisymmetricJet/0/epsilon
index 0869fb8b60..5ce7ac0cf2 100644
--- a/etc/templates/axisymmetricJet/0/epsilon
+++ b/etc/templates/axisymmetricJet/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/0/k b/etc/templates/axisymmetricJet/0/k
index a1f6af1feb..d77268531a 100644
--- a/etc/templates/axisymmetricJet/0/k
+++ b/etc/templates/axisymmetricJet/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/0/nut b/etc/templates/axisymmetricJet/0/nut
index 0735995747..938923489e 100644
--- a/etc/templates/axisymmetricJet/0/nut
+++ b/etc/templates/axisymmetricJet/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/0/omega b/etc/templates/axisymmetricJet/0/omega
index 3c40b00c11..7a29fd3e89 100644
--- a/etc/templates/axisymmetricJet/0/omega
+++ b/etc/templates/axisymmetricJet/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/0/p b/etc/templates/axisymmetricJet/0/p
index a7ad7abf89..8986faa40a 100644
--- a/etc/templates/axisymmetricJet/0/p
+++ b/etc/templates/axisymmetricJet/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/constant/transportProperties b/etc/templates/axisymmetricJet/constant/transportProperties
index 2a62bb7f6c..e35d3eb28b 100644
--- a/etc/templates/axisymmetricJet/constant/transportProperties
+++ b/etc/templates/axisymmetricJet/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/constant/turbulenceProperties b/etc/templates/axisymmetricJet/constant/turbulenceProperties
index f0add28ce4..077c4e4828 100644
--- a/etc/templates/axisymmetricJet/constant/turbulenceProperties
+++ b/etc/templates/axisymmetricJet/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/constant/polyMesh/blockMeshDict b/etc/templates/axisymmetricJet/system/blockMeshDict
similarity index 97%
rename from etc/templates/axisymmetricJet/constant/polyMesh/blockMeshDict
rename to etc/templates/axisymmetricJet/system/blockMeshDict
index 253d10ae76..fa3167f078 100644
--- a/etc/templates/axisymmetricJet/constant/polyMesh/blockMeshDict
+++ b/etc/templates/axisymmetricJet/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/system/controlDict b/etc/templates/axisymmetricJet/system/controlDict
index 8ce37aec88..92e6322031 100644
--- a/etc/templates/axisymmetricJet/system/controlDict
+++ b/etc/templates/axisymmetricJet/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/system/extrudeMeshDict b/etc/templates/axisymmetricJet/system/extrudeMeshDict
index 2cd06d3846..ec9223d12a 100644
--- a/etc/templates/axisymmetricJet/system/extrudeMeshDict
+++ b/etc/templates/axisymmetricJet/system/extrudeMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/system/fvSchemes b/etc/templates/axisymmetricJet/system/fvSchemes
index a8260a5f43..9c37059b15 100644
--- a/etc/templates/axisymmetricJet/system/fvSchemes
+++ b/etc/templates/axisymmetricJet/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/system/fvSolution b/etc/templates/axisymmetricJet/system/fvSolution
index f1e5a8fb41..1c252a201b 100644
--- a/etc/templates/axisymmetricJet/system/fvSolution
+++ b/etc/templates/axisymmetricJet/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/axisymmetricJet/system/graph b/etc/templates/axisymmetricJet/system/graph
index b8a7cdf2eb..71035057cf 100644
--- a/etc/templates/axisymmetricJet/system/graph
+++ b/etc/templates/axisymmetricJet/system/graph
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/T b/etc/templates/closedVolume/0/T
index 0ce9d57186..43b43decc6 100644
--- a/etc/templates/closedVolume/0/T
+++ b/etc/templates/closedVolume/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/U b/etc/templates/closedVolume/0/U
index b279dc1f78..d6434d228c 100644
--- a/etc/templates/closedVolume/0/U
+++ b/etc/templates/closedVolume/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/alphat b/etc/templates/closedVolume/0/alphat
index bd91fb69fb..02f3260dfe 100644
--- a/etc/templates/closedVolume/0/alphat
+++ b/etc/templates/closedVolume/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/epsilon b/etc/templates/closedVolume/0/epsilon
index 568d7ae293..6a13cdbd3a 100644
--- a/etc/templates/closedVolume/0/epsilon
+++ b/etc/templates/closedVolume/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/k b/etc/templates/closedVolume/0/k
index 8392b82575..e1d0b63cca 100644
--- a/etc/templates/closedVolume/0/k
+++ b/etc/templates/closedVolume/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/nut b/etc/templates/closedVolume/0/nut
index 65d838bc11..4ff6ef8f6d 100644
--- a/etc/templates/closedVolume/0/nut
+++ b/etc/templates/closedVolume/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/omega b/etc/templates/closedVolume/0/omega
index 0c7b1fc50b..83e90e980c 100644
--- a/etc/templates/closedVolume/0/omega
+++ b/etc/templates/closedVolume/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/p b/etc/templates/closedVolume/0/p
index 13408a92b1..d6301f83cb 100644
--- a/etc/templates/closedVolume/0/p
+++ b/etc/templates/closedVolume/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/0/p_rgh b/etc/templates/closedVolume/0/p_rgh
index 1f21394c57..b5bfaf16b4 100644
--- a/etc/templates/closedVolume/0/p_rgh
+++ b/etc/templates/closedVolume/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/constant/g b/etc/templates/closedVolume/constant/g
index 6f32e33835..2a29484f31 100644
--- a/etc/templates/closedVolume/constant/g
+++ b/etc/templates/closedVolume/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/constant/transportProperties b/etc/templates/closedVolume/constant/transportProperties
index e51fc89833..bfbedf2cd0 100644
--- a/etc/templates/closedVolume/constant/transportProperties
+++ b/etc/templates/closedVolume/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -17,18 +17,18 @@ FoamFile
 transportModel Newtonian;
 
 // Laminar viscosity
-nu              nu [0 2 -1 0 0 0 0] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // Thermal expansion coefficient
-beta            beta [0 0 0 -1 0 0 0] 3e-03;
+beta            [0 0 0 -1 0 0 0] 3e-03;
 
 // Reference temperature
-TRef            TRef [0 0 0 1 0 0 0] 300;
+TRef            [0 0 0 1 0 0 0] 300;
 
 // Laminar Prandtl number
-Pr              Pr [0 0 0 0 0 0 0] 0.9;
+Pr              [0 0 0 0 0 0 0] 0.9;
 
 // Turbulent Prandtl number
-Prt             Prt [0 0 0 0 0 0 0] 0.7;
+Prt             [0 0 0 0 0 0 0] 0.7;
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolume/constant/turbulenceProperties b/etc/templates/closedVolume/constant/turbulenceProperties
index dbb800fa40..2547237650 100644
--- a/etc/templates/closedVolume/constant/turbulenceProperties
+++ b/etc/templates/closedVolume/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict b/etc/templates/closedVolume/system/blockMeshDict
similarity index 96%
rename from etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict
rename to etc/templates/closedVolume/system/blockMeshDict
index de6aabcfd1..c04244aa52 100644
--- a/etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict
+++ b/etc/templates/closedVolume/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/system/controlDict b/etc/templates/closedVolume/system/controlDict
index 097662ad96..44bc8ad360 100644
--- a/etc/templates/closedVolume/system/controlDict
+++ b/etc/templates/closedVolume/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/system/fvSchemes b/etc/templates/closedVolume/system/fvSchemes
index 79274bbee6..e985c789da 100644
--- a/etc/templates/closedVolume/system/fvSchemes
+++ b/etc/templates/closedVolume/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/system/fvSolution b/etc/templates/closedVolume/system/fvSolution
index c00261a959..53119183e3 100644
--- a/etc/templates/closedVolume/system/fvSolution
+++ b/etc/templates/closedVolume/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/system/meshQualityDict b/etc/templates/closedVolume/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/etc/templates/closedVolume/system/meshQualityDict
+++ b/etc/templates/closedVolume/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/system/snappyHexMeshDict b/etc/templates/closedVolume/system/snappyHexMeshDict
index 2bc7718a52..68a7b47e4d 100644
--- a/etc/templates/closedVolume/system/snappyHexMeshDict
+++ b/etc/templates/closedVolume/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/system/surfaceFeatureExtractDict b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
index 24ce03f0f8..e9c54e07e7 100644
--- a/etc/templates/closedVolume/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/0/U b/etc/templates/closedVolumeRotating/0/U
index ca3c572c86..1a6fd4780b 100644
--- a/etc/templates/closedVolumeRotating/0/U
+++ b/etc/templates/closedVolumeRotating/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/0/k b/etc/templates/closedVolumeRotating/0/k
index d7858735b9..a87c20e67d 100644
--- a/etc/templates/closedVolumeRotating/0/k
+++ b/etc/templates/closedVolumeRotating/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/0/nut b/etc/templates/closedVolumeRotating/0/nut
index 65d838bc11..4ff6ef8f6d 100644
--- a/etc/templates/closedVolumeRotating/0/nut
+++ b/etc/templates/closedVolumeRotating/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/0/omega b/etc/templates/closedVolumeRotating/0/omega
index c752ed6d6e..4584c32240 100644
--- a/etc/templates/closedVolumeRotating/0/omega
+++ b/etc/templates/closedVolumeRotating/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/0/p b/etc/templates/closedVolumeRotating/0/p
index 13408a92b1..d6301f83cb 100644
--- a/etc/templates/closedVolumeRotating/0/p
+++ b/etc/templates/closedVolumeRotating/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/constant/MRFProperties b/etc/templates/closedVolumeRotating/constant/MRFProperties
index 34fef0cc71..90d5f65727 100644
--- a/etc/templates/closedVolumeRotating/constant/MRFProperties
+++ b/etc/templates/closedVolumeRotating/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/constant/dynamicMeshDict b/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
index b269d757d5..fa7a3115a5 100644
--- a/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
+++ b/etc/templates/closedVolumeRotating/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties b/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties
index e0a4a97d20..692cfdd083 100644
--- a/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties
+++ b/etc/templates/closedVolumeRotating/constant/rotatingZoneProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/constant/transportProperties b/etc/templates/closedVolumeRotating/constant/transportProperties
index 2a62bb7f6c..e35d3eb28b 100644
--- a/etc/templates/closedVolumeRotating/constant/transportProperties
+++ b/etc/templates/closedVolumeRotating/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/constant/turbulenceProperties b/etc/templates/closedVolumeRotating/constant/turbulenceProperties
index f0add28ce4..077c4e4828 100644
--- a/etc/templates/closedVolumeRotating/constant/turbulenceProperties
+++ b/etc/templates/closedVolumeRotating/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/constant/polyMesh/blockMeshDict b/etc/templates/closedVolumeRotating/system/blockMeshDict
similarity index 96%
rename from etc/templates/closedVolumeRotating/constant/polyMesh/blockMeshDict
rename to etc/templates/closedVolumeRotating/system/blockMeshDict
index de6aabcfd1..c04244aa52 100644
--- a/etc/templates/closedVolumeRotating/constant/polyMesh/blockMeshDict
+++ b/etc/templates/closedVolumeRotating/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/controlDict b/etc/templates/closedVolumeRotating/system/controlDict
index bfda3b05c7..c7a12ab118 100644
--- a/etc/templates/closedVolumeRotating/system/controlDict
+++ b/etc/templates/closedVolumeRotating/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/createBafflesDict b/etc/templates/closedVolumeRotating/system/createBafflesDict
index a7b38ff6b8..b446030159 100644
--- a/etc/templates/closedVolumeRotating/system/createBafflesDict
+++ b/etc/templates/closedVolumeRotating/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/fvSchemes b/etc/templates/closedVolumeRotating/system/fvSchemes
index dfc87f41a4..e42fe5cf49 100644
--- a/etc/templates/closedVolumeRotating/system/fvSchemes
+++ b/etc/templates/closedVolumeRotating/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/fvSolution b/etc/templates/closedVolumeRotating/system/fvSolution
index f1e5a8fb41..1c252a201b 100644
--- a/etc/templates/closedVolumeRotating/system/fvSolution
+++ b/etc/templates/closedVolumeRotating/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/meshQualityDict b/etc/templates/closedVolumeRotating/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/etc/templates/closedVolumeRotating/system/meshQualityDict
+++ b/etc/templates/closedVolumeRotating/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
index 587e4ad23f..29b4099dce 100644
--- a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
+++ b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict b/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict
index 4c48520a07..f0a716bca4 100644
--- a/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolumeRotating/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/0/T b/etc/templates/compressibleInflowOutflow/0/T
index dd7136e69d..4038fb84be 100644
--- a/etc/templates/compressibleInflowOutflow/0/T
+++ b/etc/templates/compressibleInflowOutflow/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/0/U b/etc/templates/compressibleInflowOutflow/0/U
index 8b7d69447a..fa60e9ff87 100644
--- a/etc/templates/compressibleInflowOutflow/0/U
+++ b/etc/templates/compressibleInflowOutflow/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/0/alphat b/etc/templates/compressibleInflowOutflow/0/alphat
index fdf9f66289..8b08d14c3a 100644
--- a/etc/templates/compressibleInflowOutflow/0/alphat
+++ b/etc/templates/compressibleInflowOutflow/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/0/epsilon b/etc/templates/compressibleInflowOutflow/0/epsilon
index 1a2660a9a4..784d9b620a 100644
--- a/etc/templates/compressibleInflowOutflow/0/epsilon
+++ b/etc/templates/compressibleInflowOutflow/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -24,7 +24,7 @@ boundaryField
 {
     inlet
     {
-        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.05;
         value           uniform $epsilonInlet;
     }
@@ -37,7 +37,7 @@ boundaryField
     }
     wall
     {
-        type            compressible::epsilonWallFunction;
+        type            epsilonWallFunction;
         value           uniform $epsilonInlet;
     }
 
diff --git a/etc/templates/compressibleInflowOutflow/0/k b/etc/templates/compressibleInflowOutflow/0/k
index 8eddb30eaf..e07e283c66 100644
--- a/etc/templates/compressibleInflowOutflow/0/k
+++ b/etc/templates/compressibleInflowOutflow/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -37,7 +37,7 @@ boundaryField
 
     wall
     {
-        type            compressible::kqRWallFunction;
+        type            kqRWallFunction;
         value           uniform $kInlet;
     }
 
diff --git a/etc/templates/compressibleInflowOutflow/0/nut b/etc/templates/compressibleInflowOutflow/0/nut
index ab1c5b736d..9e7a35a25c 100644
--- a/etc/templates/compressibleInflowOutflow/0/nut
+++ b/etc/templates/compressibleInflowOutflow/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -1 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/etc/templates/compressibleInflowOutflow/0/omega b/etc/templates/compressibleInflowOutflow/0/omega
index 0cf7e5569b..de99df832d 100644
--- a/etc/templates/compressibleInflowOutflow/0/omega
+++ b/etc/templates/compressibleInflowOutflow/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -37,7 +37,7 @@ boundaryField
 
     wall
     {
-        type            compressible::omegaWallFunction;
+        type            omegaWallFunction;
         value           uniform $omegaInlet;
     }
 
diff --git a/etc/templates/compressibleInflowOutflow/0/p b/etc/templates/compressibleInflowOutflow/0/p
index 0485c7dc94..883e694ddb 100644
--- a/etc/templates/compressibleInflowOutflow/0/p
+++ b/etc/templates/compressibleInflowOutflow/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties b/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
index 691d73fdd7..42b76e5f3a 100644
--- a/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
+++ b/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties b/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
index dc0e00cc54..2547237650 100644
--- a/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
+++ b/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -14,6 +14,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RASModel;
+simulationType RAS;
+
+RAS
+{
+    RASModel            kEpsilon;
+
+    turbulence          on;
+    printCoeffs         on;
+}
+
+LES
+{
+    LESModel            SpalartAllmarasDDES;
+    delta               cubeRootVol;
+
+    turbulence          on;
+    printCoeffs         on;
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+
+    smoothCoeffs
+    {
+        delta           cubeRootVol;
+        cubeRootVolCoeffs
+        {
+            deltaCoeff      1;
+        }
+        maxDeltaRatio   1.1;
+    }
+}
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict b/etc/templates/compressibleInflowOutflow/system/blockMeshDict
similarity index 96%
rename from etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict
rename to etc/templates/compressibleInflowOutflow/system/blockMeshDict
index de6aabcfd1..c04244aa52 100644
--- a/etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict
+++ b/etc/templates/compressibleInflowOutflow/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict.extPatches b/etc/templates/compressibleInflowOutflow/system/blockMeshDict.extPatches
similarity index 97%
rename from etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict.extPatches
rename to etc/templates/compressibleInflowOutflow/system/blockMeshDict.extPatches
index 3286dba7e1..c61cc1d36a 100644
--- a/etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict.extPatches
+++ b/etc/templates/compressibleInflowOutflow/system/blockMeshDict.extPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/system/controlDict b/etc/templates/compressibleInflowOutflow/system/controlDict
index 46bfdfc8ba..839597c074 100644
--- a/etc/templates/compressibleInflowOutflow/system/controlDict
+++ b/etc/templates/compressibleInflowOutflow/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/system/fvSchemes b/etc/templates/compressibleInflowOutflow/system/fvSchemes
index 51dd04c90d..e3e977cae9 100644
--- a/etc/templates/compressibleInflowOutflow/system/fvSchemes
+++ b/etc/templates/compressibleInflowOutflow/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -49,7 +49,7 @@ divSchemes
     div(phid,p)     bounded Gauss upwind;
     div((phi|interpolate(rho)),p)  bounded Gauss upwind;
 
-    div((muEff*dev2(T(grad(U)))))      Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U)))))    Gauss linear;
 }
 
 laplacianSchemes
diff --git a/etc/templates/compressibleInflowOutflow/system/fvSolution b/etc/templates/compressibleInflowOutflow/system/fvSolution
index 2b7d8db02c..7c34c76eb0 100644
--- a/etc/templates/compressibleInflowOutflow/system/fvSolution
+++ b/etc/templates/compressibleInflowOutflow/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/system/meshQualityDict b/etc/templates/compressibleInflowOutflow/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/etc/templates/compressibleInflowOutflow/system/meshQualityDict
+++ b/etc/templates/compressibleInflowOutflow/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
index 7c1659090c..42dfaf6708 100644
--- a/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
+++ b/etc/templates/compressibleInflowOutflow/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
index 24ce03f0f8..e9c54e07e7 100644
--- a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/0/U b/etc/templates/inflowOutflow/0/U
index 8b7d69447a..fa60e9ff87 100644
--- a/etc/templates/inflowOutflow/0/U
+++ b/etc/templates/inflowOutflow/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/0/k b/etc/templates/inflowOutflow/0/k
index 4f402e2f44..e07e283c66 100644
--- a/etc/templates/inflowOutflow/0/k
+++ b/etc/templates/inflowOutflow/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/0/nut b/etc/templates/inflowOutflow/0/nut
index 54a56f319f..ddd53fc4f8 100644
--- a/etc/templates/inflowOutflow/0/nut
+++ b/etc/templates/inflowOutflow/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/0/omega b/etc/templates/inflowOutflow/0/omega
index e8e1424576..de99df832d 100644
--- a/etc/templates/inflowOutflow/0/omega
+++ b/etc/templates/inflowOutflow/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/0/p b/etc/templates/inflowOutflow/0/p
index f2d9ffb3b9..3a1bdf00dc 100644
--- a/etc/templates/inflowOutflow/0/p
+++ b/etc/templates/inflowOutflow/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/constant/transportProperties b/etc/templates/inflowOutflow/constant/transportProperties
index 2a62bb7f6c..e35d3eb28b 100644
--- a/etc/templates/inflowOutflow/constant/transportProperties
+++ b/etc/templates/inflowOutflow/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/constant/turbulenceProperties b/etc/templates/inflowOutflow/constant/turbulenceProperties
index f0add28ce4..077c4e4828 100644
--- a/etc/templates/inflowOutflow/constant/turbulenceProperties
+++ b/etc/templates/inflowOutflow/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/closedVolume/constant/polyMesh/blockMeshDict b/etc/templates/inflowOutflow/system/blockMeshDict
similarity index 96%
rename from etc/templates/closedVolume/constant/polyMesh/blockMeshDict
rename to etc/templates/inflowOutflow/system/blockMeshDict
index de6aabcfd1..c04244aa52 100644
--- a/etc/templates/closedVolume/constant/polyMesh/blockMeshDict
+++ b/etc/templates/inflowOutflow/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict.extPatches b/etc/templates/inflowOutflow/system/blockMeshDict.extPatches
similarity index 97%
rename from etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict.extPatches
rename to etc/templates/inflowOutflow/system/blockMeshDict.extPatches
index 3286dba7e1..c61cc1d36a 100644
--- a/etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict.extPatches
+++ b/etc/templates/inflowOutflow/system/blockMeshDict.extPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/system/controlDict b/etc/templates/inflowOutflow/system/controlDict
index bfda3b05c7..c7a12ab118 100644
--- a/etc/templates/inflowOutflow/system/controlDict
+++ b/etc/templates/inflowOutflow/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/system/fvSchemes b/etc/templates/inflowOutflow/system/fvSchemes
index dfc87f41a4..e42fe5cf49 100644
--- a/etc/templates/inflowOutflow/system/fvSchemes
+++ b/etc/templates/inflowOutflow/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/system/fvSolution b/etc/templates/inflowOutflow/system/fvSolution
index f1e5a8fb41..1c252a201b 100644
--- a/etc/templates/inflowOutflow/system/fvSolution
+++ b/etc/templates/inflowOutflow/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/system/meshQualityDict b/etc/templates/inflowOutflow/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/etc/templates/inflowOutflow/system/meshQualityDict
+++ b/etc/templates/inflowOutflow/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/system/snappyHexMeshDict b/etc/templates/inflowOutflow/system/snappyHexMeshDict
index 7c1659090c..42dfaf6708 100644
--- a/etc/templates/inflowOutflow/system/snappyHexMeshDict
+++ b/etc/templates/inflowOutflow/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
index 24ce03f0f8..e9c54e07e7 100644
--- a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/0/U b/etc/templates/inflowOutflowRotating/0/U
index 8c1cfbebf1..5cab9d20af 100644
--- a/etc/templates/inflowOutflowRotating/0/U
+++ b/etc/templates/inflowOutflowRotating/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/0/k b/etc/templates/inflowOutflowRotating/0/k
index 4f402e2f44..e07e283c66 100644
--- a/etc/templates/inflowOutflowRotating/0/k
+++ b/etc/templates/inflowOutflowRotating/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/0/nut b/etc/templates/inflowOutflowRotating/0/nut
index 54a56f319f..ddd53fc4f8 100644
--- a/etc/templates/inflowOutflowRotating/0/nut
+++ b/etc/templates/inflowOutflowRotating/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/0/omega b/etc/templates/inflowOutflowRotating/0/omega
index e8e1424576..de99df832d 100644
--- a/etc/templates/inflowOutflowRotating/0/omega
+++ b/etc/templates/inflowOutflowRotating/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/0/p b/etc/templates/inflowOutflowRotating/0/p
index f2d9ffb3b9..3a1bdf00dc 100644
--- a/etc/templates/inflowOutflowRotating/0/p
+++ b/etc/templates/inflowOutflowRotating/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/constant/MRFProperties b/etc/templates/inflowOutflowRotating/constant/MRFProperties
index 34fef0cc71..90d5f65727 100644
--- a/etc/templates/inflowOutflowRotating/constant/MRFProperties
+++ b/etc/templates/inflowOutflowRotating/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict b/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
index b269d757d5..fa7a3115a5 100644
--- a/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
+++ b/etc/templates/inflowOutflowRotating/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict b/etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict
deleted file mode 100644
index de6aabcfd1..0000000000
--- a/etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-backgroundMesh
-{
-    xMin    -1;
-    xMax     1;
-    yMin    -1;
-    yMax     1;
-    zMin    -1;
-    zMax     1;
-    xCells  20;
-    yCells  20;
-    zCells  20;
-}
-
-convertToMeters 1;
-
-vertices
-(
-    ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMin)
-    ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMin)
-    ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMin)
-    ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMin)
-
-    ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMax)
-    ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMax)
-    ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMax)
-    ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMax)
-);
-
-blocks
-(
-    hex (0 1 2 3 4 5 6 7)
-    (
-        $:backgroundMesh.xCells
-        $:backgroundMesh.yCells
-        $:backgroundMesh.zCells
-    )
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties b/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties
index e0a4a97d20..692cfdd083 100644
--- a/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties
+++ b/etc/templates/inflowOutflowRotating/constant/rotatingZoneProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/constant/transportProperties b/etc/templates/inflowOutflowRotating/constant/transportProperties
index 2a62bb7f6c..e35d3eb28b 100644
--- a/etc/templates/inflowOutflowRotating/constant/transportProperties
+++ b/etc/templates/inflowOutflowRotating/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties b/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
index f0add28ce4..077c4e4828 100644
--- a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
+++ b/etc/templates/inflowOutflowRotating/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/blockMeshDict b/etc/templates/inflowOutflowRotating/system/blockMeshDict
new file mode 100644
index 0000000000..c04244aa52
--- /dev/null
+++ b/etc/templates/inflowOutflowRotating/system/blockMeshDict
@@ -0,0 +1,68 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+backgroundMesh
+{
+    xMin    -1;
+    xMax     1;
+    yMin    -1;
+    yMax     1;
+    zMin    -1;
+    zMax     1;
+    xCells  20;
+    yCells  20;
+    zCells  20;
+}
+
+convertToMeters 1;
+
+vertices
+(
+    ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMin)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMin)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMin)
+    ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMin)
+
+    ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMax)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMax)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMax)
+    ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMax)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7)
+    (
+        $:backgroundMesh.xCells
+        $:backgroundMesh.yCells
+        $:backgroundMesh.zCells
+    )
+    simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict.extPatches b/etc/templates/inflowOutflowRotating/system/blockMeshDict.extPatches
similarity index 97%
rename from etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict.extPatches
rename to etc/templates/inflowOutflowRotating/system/blockMeshDict.extPatches
index 3286dba7e1..c61cc1d36a 100644
--- a/etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict.extPatches
+++ b/etc/templates/inflowOutflowRotating/system/blockMeshDict.extPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/controlDict b/etc/templates/inflowOutflowRotating/system/controlDict
index bfda3b05c7..c7a12ab118 100644
--- a/etc/templates/inflowOutflowRotating/system/controlDict
+++ b/etc/templates/inflowOutflowRotating/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/createBafflesDict b/etc/templates/inflowOutflowRotating/system/createBafflesDict
index a7b38ff6b8..b446030159 100644
--- a/etc/templates/inflowOutflowRotating/system/createBafflesDict
+++ b/etc/templates/inflowOutflowRotating/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/fvSchemes b/etc/templates/inflowOutflowRotating/system/fvSchemes
index dfc87f41a4..e42fe5cf49 100644
--- a/etc/templates/inflowOutflowRotating/system/fvSchemes
+++ b/etc/templates/inflowOutflowRotating/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/fvSolution b/etc/templates/inflowOutflowRotating/system/fvSolution
index f1e5a8fb41..1c252a201b 100644
--- a/etc/templates/inflowOutflowRotating/system/fvSolution
+++ b/etc/templates/inflowOutflowRotating/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/meshQualityDict b/etc/templates/inflowOutflowRotating/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/etc/templates/inflowOutflowRotating/system/meshQualityDict
+++ b/etc/templates/inflowOutflowRotating/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
index dfcd05a870..9b6fe61b77 100644
--- a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
+++ b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict
index 4c48520a07..f0a716bca4 100644
--- a/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflowRotating/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/Allwmake b/src/Allwmake
index c0ea041c37..6cfda6ea06 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -41,17 +41,20 @@ wmake $targetType edgeMesh
 parallel/decompose/AllwmakeLnInclude
 dummyThirdParty/Allwmake $targetType $*
 
+wmakeLnInclude fvOptions
+
 wmake $targetType finiteVolume
 wmake $targetType lagrangian/basic
 wmake $targetType lagrangian/distributionModels
 wmake $targetType genericPatchFields
 
 wmake $targetType conversion
-wmake $targetType sampling
 wmake $targetType mesh/extrudeModel
 wmake $targetType dynamicMesh
 wmake $targetType dynamicFvMesh
+wmake $targetType sampling
 wmake $targetType topoChangerFvMesh
+wmake $targetType sampling
 
 # Compile scotchDecomp, metisDecomp etc.
 parallel/Allwmake $targetType $*
@@ -59,6 +62,8 @@ parallel/Allwmake $targetType $*
 wmake $targetType ODE
 wmake $targetType randomProcesses
 
+wmake $targetType fvMotionSolver
+
 transportModels/Allwmake $targetType $*
 thermophysicalModels/Allwmake $targetType $*
 TurbulenceModels/Allwmake $targetType $*
@@ -69,7 +74,6 @@ mesh/Allwmake $targetType $*
 renumber/Allwmake $targetType $*
 fvAgglomerationMethods/Allwmake $targetType $*
 
-wmake $targetType fvMotionSolver
 wmake $targetType engine
 wmake $targetType fvOptions
 wmake $targetType regionCoupled
@@ -78,5 +82,7 @@ postProcessing/Allwmake $targetType $*
 
 wmake $targetType sixDoFRigidBodyMotion
 
+# Needs access to Turbulence
+wmake $targetType thermophysicalModels/properties/liquidPropertiesFvPatchFields
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.C b/src/ODE/ODESolvers/ODESolver/ODESolver.C
index 39f38323df..823f159097 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolver.C
+++ b/src/ODE/ODESolvers/ODESolver/ODESolver.C
@@ -145,12 +145,8 @@ void Foam::ODESolver::solve
         }
     }
 
-    FatalErrorIn
-    (
-        "ODESolver::solve"
-        "(const scalar xStart, const scalar xEnd,"
-        "scalarField& y, scalar& dxTry) const"
-    )   << "Integration steps greater than maximum " << maxSteps_
+    FatalErrorInFunction
+        << "Integration steps greater than maximum " << maxSteps_
         << "xStart = " << xStart << ", xEnd = " << xEnd
         << ", x = " << x << ", dxDid = " << step.dxDid
         << exit(FatalError);
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
index ef0d6e3454..0774ac7de0 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
+++ b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,11 +41,8 @@ Foam::autoPtr<Foam::ODESolver> Foam::ODESolver::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "ODESolver::New"
-            "(const dictionary& dict, const ODESystem& odes)"
-        )   << "Unknown ODESolver type "
+        FatalErrorInFunction
+            << "Unknown ODESolver type "
             << ODESolverTypeName << nl << nl
             << "Valid ODESolvers are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/ODE/ODESolvers/SIBS/SIBS.C b/src/ODE/ODESolvers/SIBS/SIBS.C
index dd7d26c9e6..36acb8a6b1 100644
--- a/src/ODE/ODESolvers/SIBS/SIBS.C
+++ b/src/ODE/ODESolvers/SIBS/SIBS.C
@@ -145,7 +145,7 @@ void Foam::SIBS::solve
 
             if (xNew_ == x)
             {
-                FatalErrorIn("ODES::SIBS")
+                FatalErrorInFunction
                     << "step size underflow"
                     << exit(FatalError);
             }
diff --git a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
index ee49a70d88..f868e921d0 100644
--- a/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
+++ b/src/ODE/ODESolvers/adaptiveSolver/adaptiveSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ void Foam::adaptiveSolver::solve
 
             if (dx < VSMALL)
             {
-                FatalErrorIn("adaptiveSolver::solve")
+                FatalErrorInFunction
                     << "stepsize underflow"
                     << exit(FatalError);
             }
diff --git a/src/ODE/ODESolvers/seulex/seulex.C b/src/ODE/ODESolvers/seulex/seulex.C
index cf82d31b02..51389d0779 100644
--- a/src/ODE/ODESolvers/seulex/seulex.C
+++ b/src/ODE/ODESolvers/seulex/seulex.C
@@ -252,7 +252,7 @@ void Foam::seulex::solve
 
         if (mag(dx) <= mag(x)*sqr(SMALL))
         {
-             WarningIn("seulex::solve(scalar& x, scalarField& y, stepState&")
+             WarningInFunction
                     << "step size underflow :"  << dx << endl;
         }
 
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 5374c0b615..44ee3c7088 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -253,7 +253,7 @@ Foam::fileName Foam::cwd()
     }
     else
     {
-        FatalErrorIn("Foam::cwd()")
+        FatalErrorInFunction
             << "Couldn't get the current working directory"
             << exit(FatalError);
 
@@ -437,7 +437,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
         {
             case EPERM:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "The filesystem containing " << pathName
                     << " does not support the creation of directories."
                     << exit(FatalError);
@@ -453,7 +453,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case EFAULT:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "" << pathName
                     << " points outside your accessible address space."
                     << exit(FatalError);
@@ -463,7 +463,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case EACCES:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "The parent directory does not allow write "
                        "permission to the process,"<< nl
                     << "or one of the directories in " << pathName
@@ -475,7 +475,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case ENAMETOOLONG:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "" << pathName << " is too long."
                     << exit(FatalError);
 
@@ -491,7 +491,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
                 }
                 else
                 {
-                    FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                    FatalErrorInFunction
                         << "Couldn't create directory " << pathName
                         << exit(FatalError);
 
@@ -501,7 +501,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case ENOTDIR:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "A component used as a directory in " << pathName
                     << " is not, in fact, a directory."
                     << exit(FatalError);
@@ -511,7 +511,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case ENOMEM:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "Insufficient kernel memory was available to make "
                        "directory " << pathName << '.'
                     << exit(FatalError);
@@ -521,7 +521,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case EROFS:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "" << pathName
                     << " refers to a file on a read-only filesystem."
                     << exit(FatalError);
@@ -531,7 +531,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case ELOOP:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "Too many symbolic links were encountered in resolving "
                     << pathName << '.'
                     << exit(FatalError);
@@ -541,7 +541,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             case ENOSPC:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "The device containing " << pathName
                     << " has no room for the new directory or "
                     << "the user's disk quota is exhausted."
@@ -552,7 +552,7 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
             default:
             {
-                FatalErrorIn("Foam::mkDir(const fileName&, mode_t)")
+                FatalErrorInFunction
                     << "Couldn't create directory " << pathName
                     << exit(FatalError);
 
@@ -862,7 +862,7 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 
     if (exists(dst))
     {
-        WarningIn("ln(const fileName&, const fileName&)")
+        WarningInFunction
             << "destination " << dst << " already exists. Not linking."
             << endl;
         return false;
@@ -870,7 +870,7 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 
     if (src.isAbsolute() && !exists(src))
     {
-        WarningIn("ln(const fileName&, const fileName&)")
+        WarningInFunction
             << "source " << src << " does not exist." << endl;
         return false;
     }
@@ -881,7 +881,7 @@ bool Foam::ln(const fileName& src, const fileName& dst)
     }
     else
     {
-        WarningIn("ln(const fileName&, const fileName&)")
+        WarningInFunction
             << "symlink from " << src << " to " << dst << " failed." << endl;
         return false;
     }
@@ -987,7 +987,7 @@ bool Foam::rmDir(const fileName& directory)
     // Attempt to open directory and set the structure pointer
     if ((source = ::opendir(directory.c_str())) == NULL)
     {
-        WarningIn("rmDir(const fileName&)")
+        WarningInFunction
             << "cannot open directory " << directory << endl;
 
         return false;
@@ -1007,7 +1007,7 @@ bool Foam::rmDir(const fileName& directory)
                 {
                     if (!rmDir(path))
                     {
-                        WarningIn("rmDir(const fileName&)")
+                        WarningInFunction
                             << "failed to remove directory " << fName
                             << " while removing directory " << directory
                             << endl;
@@ -1021,7 +1021,7 @@ bool Foam::rmDir(const fileName& directory)
                 {
                     if (!rm(path))
                     {
-                        WarningIn("rmDir(const fileName&)")
+                        WarningInFunction
                             << "failed to remove file " << fName
                             << " while removing directory " << directory
                             << endl;
@@ -1037,7 +1037,7 @@ bool Foam::rmDir(const fileName& directory)
 
         if (!rm(directory))
         {
-            WarningIn("rmDir(const fileName&)")
+            WarningInFunction
                 << "failed to remove directory " << directory << endl;
 
             ::closedir(source);
@@ -1062,10 +1062,8 @@ void Foam::fdClose(const int fd)
 {
     if (close(fd) != 0)
     {
-        FatalErrorIn
-        (
-            "fdClose(const int fd)"
-        )   << "close error on " << fd << endl
+        FatalErrorInFunction
+            << "close error on " << fd << endl
             << abort(FatalError);
     }
 }
@@ -1085,10 +1083,8 @@ bool Foam::ping
 
     if ((hostPtr = ::gethostbyname(destName.c_str())) == NULL)
     {
-        FatalErrorIn
-        (
-            "Foam::ping(const string&, ...)"
-        )   << "gethostbyname error " << h_errno << " for host " << destName
+        FatalErrorInFunction
+            << "gethostbyname error " << h_errno << " for host " << destName
             << abort(FatalError);
     }
 
@@ -1099,10 +1095,8 @@ bool Foam::ping
     sockfd = ::socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::ping(const string&, const label)"
-        )   << "socket error"
+        FatalErrorInFunction
+            << "socket error"
             << abort(FatalError);
     }
 
@@ -1176,7 +1170,7 @@ void* Foam::dlOpen(const fileName& lib, const bool check)
 
     if (!handle && check)
     {
-        WarningIn("dlOpen(const fileName&, const bool)")
+        WarningInFunction
             << "dlopen error : " << ::dlerror()
             << endl;
     }
@@ -1224,7 +1218,7 @@ void* Foam::dlSym(void* handle, const std::string& symbol)
 
     if (error)
     {
-        WarningIn("dlSym(void*, const std::string&)")
+        WarningInFunction
             << "Cannot lookup symbol " << symbol << " : " << error
             << endl;
     }
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index d15fab273d..e3bddbc78f 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -149,7 +149,7 @@ namespace Foam
                     if (!hasWarned)
                     {
                         hasWarned = true;
-                        WarningIn("fileMonitorWatcher(const bool, const label)")
+                        WarningInFunction
                             << "Failed allocating an inotify descriptor : "
                             << string(strerror(errno)) << endl
                             << "    Please increase the number of allowable "
@@ -166,7 +166,7 @@ namespace Foam
                     }
                 }
                 #else
-                    FatalErrorIn("fileMonitorWatcher(const bool, const label)")
+                    FatalErrorInFunction
                         << "You selected inotify but this file was compiled"
                         << " without FOAM_USE_INOTIFY"
                         << " Please select another fileModification test method"
@@ -191,7 +191,7 @@ namespace Foam
                     {
                         if (inotify_rm_watch(inotifyFd_, int(dirWatches_[i])))
                         {
-                            WarningIn("fileMonitor::~fileMonitor()")
+                            WarningInFunction
                                 << "Failed deleting directory watch "
                                 << dirWatches_[i] << endl;
                         }
@@ -229,7 +229,7 @@ namespace Foam
 
                     if (dirWatchID < 0)
                     {
-                        FatalErrorIn("addWatch(const label, const fileName&)")
+                        FatalErrorInFunction
                             << "Failed adding watch " << watchFd
                             << " to directory " << fName << " due to "
                             << string(strerror(errno))
@@ -240,7 +240,7 @@ namespace Foam
                 if (watchFd < dirWatches_.size() && dirWatches_[watchFd] != -1)
                 {
                     // Reuse of watchFd : should have dir watchID set to -1.
-                    FatalErrorIn("addWatch(const label, const fileName&)")
+                    FatalErrorInFunction
                         << "Problem adding watch " << watchFd
                         << " to file " << fName
                         << abort(FatalError);
@@ -255,7 +255,7 @@ namespace Foam
                 if (watchFd < lastMod_.size() && lastMod_[watchFd] != 0)
                 {
                     // Reuse of watchFd : should have lastMod set to 0.
-                    FatalErrorIn("addWatch(const label, const fileName&)")
+                    FatalErrorInFunction
                         << "Problem adding watch " << watchFd
                         << " to file " << fName
                         << abort(FatalError);
@@ -320,7 +320,7 @@ void Foam::fileMonitor::checkFiles() const
 
             if (ready < 0)
             {
-                FatalErrorIn("fileMonitor::checkFiles()")
+                FatalErrorInFunction
                     << "Problem in issuing select."
                     << abort(FatalError);
             }
@@ -336,7 +336,7 @@ void Foam::fileMonitor::checkFiles() const
 
                 if (nBytes < 0)
                 {
-                    FatalErrorIn("fileMonitor::checkFiles()")
+                    FatalErrorInFunction
                         << "read of " << watcher_->inotifyFd_
                         << " failed with " << label(nBytes)
                         << abort(FatalError);
@@ -473,7 +473,7 @@ Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
 
     if (watchFd < 0)
     {
-        WarningIn("fileMonitor::addWatch(const fileName&)")
+        WarningInFunction
             << "could not add watch for file " << fName << endl;
     }
     else
@@ -593,11 +593,8 @@ void Foam::fileMonitor::updateStates
                             << endl;
                     }
 
-                    WarningIn
-                    (
-                        "fileMonitor::updateStates"
-                        "(const bool, const bool) const"
-                    )   << "Delaying reading " << watchFile_[watchFd]
+                    WarningInFunction
+                        << "Delaying reading " << watchFile_[watchFd]
                         << " due to inconsistent "
                            "file time-stamps between processors" << endl;
                 }
diff --git a/src/OSspecific/POSIX/regExp.C b/src/OSspecific/POSIX/regExp.C
index 0bd52fc5d8..a7177dc048 100644
--- a/src/OSspecific/POSIX/regExp.C
+++ b/src/OSspecific/POSIX/regExp.C
@@ -151,10 +151,8 @@ void Foam::regExp::set(const char* pattern, const bool ignoreCase) const
             char errbuf[200];
             regerror(err, preg_, errbuf, sizeof(errbuf));
 
-            FatalErrorIn
-            (
-                "regExp::set(const char*, const bool ignoreCase)"
-            )   << "Failed to compile regular expression '" << pattern << "'"
+            FatalErrorInFunction
+                << "Failed to compile regular expression '" << pattern << "'"
                 << nl << errbuf
                 << exit(FatalError);
         }
diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
index 5488f2e526..921e1345d7 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.C
+++ b/src/OSspecific/POSIX/signals/sigFpe.C
@@ -45,6 +45,8 @@ License
 
 struct sigaction Foam::sigFpe::oldAction_;
 
+bool Foam::sigFpe::sigFpeActive_ = false;
+
 void Foam::sigFpe::fillNan(UList<scalar>& lst)
 {
     lst = std::numeric_limits<scalar>::signaling_NaN();
@@ -92,10 +94,8 @@ void Foam::sigFpe::sigHandler(int)
     // Reset old handling
     if (sigaction(SIGFPE, &oldAction_, NULL) < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::sigSegv::sigHandler()"
-        )   << "Cannot reset SIGFPE trapping"
+        FatalErrorInFunction
+            << "Cannot reset SIGFPE trapping"
             << abort(FatalError);
     }
 
@@ -114,7 +114,7 @@ void Foam::sigFpe::sigHandler(int)
 
 Foam::sigFpe::sigFpe()
 {
-    oldAction_.sa_handler = NULL;
+    set(false);
 }
 
 
@@ -122,28 +122,7 @@ Foam::sigFpe::sigFpe()
 
 Foam::sigFpe::~sigFpe()
 {
-    if (env("FOAM_SIGFPE"))
-    {
-        #ifdef LINUX_GNUC
-        // Reset signal
-        if (oldAction_.sa_handler && sigaction(SIGFPE, &oldAction_, NULL) < 0)
-        {
-            FatalErrorIn
-            (
-                "Foam::sigFpe::~sigFpe()"
-            )   << "Cannot reset SIGFPE trapping"
-                << abort(FatalError);
-        }
-        #endif
-    }
-
-    if (env("FOAM_SETNAN"))
-    {
-        #ifdef LINUX
-        // Disable initialization to NaN
-        mallocNanActive_ = false;
-        #endif
-    }
+    unset(false);
 }
 
 
@@ -151,16 +130,7 @@ Foam::sigFpe::~sigFpe()
 
 void Foam::sigFpe::set(const bool verbose)
 {
-    if (oldAction_.sa_handler)
-    {
-        FatalErrorIn
-        (
-            "Foam::sigFpe::set()"
-        )   << "Cannot call sigFpe::set() more than once"
-            << abort(FatalError);
-    }
-
-    if (env("FOAM_SIGFPE"))
+    if (!sigFpeActive_ && env("FOAM_SIGFPE"))
     {
         bool supported = false;
 
@@ -180,13 +150,12 @@ void Foam::sigFpe::set(const bool verbose)
         sigemptyset(&newAction.sa_mask);
         if (sigaction(SIGFPE, &newAction, &oldAction_) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::sigFpe::set()"
-            )   << "Cannot set SIGFPE trapping"
+            FatalErrorInFunction
+                << "Cannot set SIGFPE trapping"
                 << abort(FatalError);
         }
 
+        sigFpeActive_ = true;
 
         #elif defined(sgiN32) || defined(sgiN32Gcc)
         supported = true;
@@ -209,6 +178,9 @@ void Foam::sigFpe::set(const bool verbose)
             _ABORT_ON_ERROR,
             NULL
         );
+
+        sigFpeActive_ = true;
+
         #endif
 
 
@@ -251,4 +223,52 @@ void Foam::sigFpe::set(const bool verbose)
 }
 
 
+void Foam::sigFpe::unset(const bool verbose)
+{
+    #ifdef LINUX_GNUC
+    // Reset signal
+    if (sigFpeActive_)
+    {
+        if (verbose)
+        {
+            Info<< "sigFpe : Disabling floating point exception trapping"
+                << endl;
+        }
+
+        if (sigaction(SIGFPE, &oldAction_, NULL) < 0)
+        {
+            FatalErrorIn
+            (
+                "Foam::sigFpe::unset(const bool)"
+            )   << "Cannot reset SIGFPE trapping"
+                << abort(FatalError);
+        }
+
+        // Reset exception raising
+        int oldExcept = fedisableexcept
+        (
+            FE_DIVBYZERO
+          | FE_INVALID
+          | FE_OVERFLOW
+        );
+
+        if (oldExcept == -1)
+        {
+            FatalErrorIn
+            (
+                "sigFpe::unset(const bool)"
+            )   << "Cannot reset SIGFPE trapping"
+                << abort(FatalError);
+        }
+        sigFpeActive_ = false;
+    }
+    #endif
+
+    #ifdef LINUX
+    // Disable initialization to NaN
+    mallocNanActive_ = false;
+    #endif
+}
+
+
 // ************************************************************************* //
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index 603c4b5ea0..ed5e09f904 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -35,6 +35,10 @@ Description
         also set, this will cause usage of uninitialized scalars to trigger
         an abort.
 
+    Can be used either directly through the static member functions or
+    through the scope of the object (constructor sets trapping; destructor
+    restores original).
+
 SourceFiles
     sigFpe.C
 
@@ -72,6 +76,9 @@ class sigFpe
         //- Saved old signal trapping setting
         static struct sigaction oldAction_;
 
+        //- Flag to indicate floating point trapping is enabled
+        static bool sigFpeActive_;
+
 
     // Static data members
 
@@ -98,7 +105,10 @@ public:
 
         //- Activate SIGFPE signal handler when FOAM_SIGFPE is %set
         //  Fill memory with NaN when FOAM_SETNAN is %set
-        void set(const bool verbose);
+        static void set(const bool verbose);
+
+        //- Deactivate SIGFPE signal handler and NaN memory initialisation
+        static void unset(const bool verbose);
 
         //- Flag to indicate mallocNan is enabled
         static bool mallocNanActive_;
diff --git a/src/OSspecific/POSIX/signals/sigInt.C b/src/OSspecific/POSIX/signals/sigInt.C
index 29c71f5ba7..f2864b3714 100644
--- a/src/OSspecific/POSIX/signals/sigInt.C
+++ b/src/OSspecific/POSIX/signals/sigInt.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,8 @@ License
 
 struct sigaction Foam::sigInt::oldAction_;
 
+bool Foam::sigInt::sigActive_ = false;
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -40,10 +42,8 @@ void Foam::sigInt::sigHandler(int)
     // Reset old handling
     if (sigaction(SIGINT, &oldAction_, NULL) < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::sigInt::sigHandler()"
-        )   << "Cannot reset SIGINT trapping"
+        FatalErrorInFunction
+            << "Cannot reset SIGINT trapping"
             << abort(FatalError);
     }
 
@@ -59,7 +59,7 @@ void Foam::sigInt::sigHandler(int)
 
 Foam::sigInt::sigInt()
 {
-    oldAction_.sa_handler = NULL;
+    set(false);
 }
 
 
@@ -67,15 +67,7 @@ Foam::sigInt::sigInt()
 
 Foam::sigInt::~sigInt()
 {
-    // Reset old handling
-    if (sigaction(SIGINT, &oldAction_, NULL) < 0)
-    {
-        FatalErrorIn
-        (
-            "Foam::sigInt::~sigInt()"
-        )   << "Cannot reset SIGINT trapping"
-            << abort(FatalError);
-    }
+    unset(false);
 }
 
 
@@ -83,26 +75,34 @@ Foam::sigInt::~sigInt()
 
 void Foam::sigInt::set(const bool)
 {
-    if (oldAction_.sa_handler)
+    if (!sigActive_)
     {
-        FatalErrorIn
-        (
-            "Foam::sigInt::set()"
-        )   << "Cannot call sigInt::set() more than once"
-            << abort(FatalError);
+        struct sigaction newAction;
+        newAction.sa_handler = sigHandler;
+        newAction.sa_flags = SA_NODEFER;
+        sigemptyset(&newAction.sa_mask);
+        if (sigaction(SIGINT, &newAction, &oldAction_) < 0)
+        {
+            FatalErrorInFunction
+                << "Cannot call sigInt::set() more than once"
+                << abort(FatalError);
+        }
+        sigActive_ = true;
     }
+}
 
-    struct sigaction newAction;
-    newAction.sa_handler = sigHandler;
-    newAction.sa_flags = SA_NODEFER;
-    sigemptyset(&newAction.sa_mask);
-    if (sigaction(SIGINT, &newAction, &oldAction_) < 0)
+
+void Foam::sigInt::unset(const bool)
+{
+    if (sigActive_)
     {
-        FatalErrorIn
-        (
-            "Foam::sigInt::set()"
-        )   << "Cannot set SIGINT trapping"
-            << abort(FatalError);
+        if (sigaction(SIGINT, &oldAction_, NULL) < 0)
+        {
+            FatalErrorInFunction
+                << "Cannot set SIGINT trapping"
+                << abort(FatalError);
+        }
+        sigActive_ = false;
     }
 }
 
diff --git a/src/OSspecific/POSIX/signals/sigInt.H b/src/OSspecific/POSIX/signals/sigInt.H
index f079aa713c..cbfdf3a009 100644
--- a/src/OSspecific/POSIX/signals/sigInt.H
+++ b/src/OSspecific/POSIX/signals/sigInt.H
@@ -30,6 +30,10 @@ Description
     The standard interupt handler is overridden to ensure that the
     runningJob file is removed.
 
+    Can be used either directly through the static member functions or
+    through the scope of the object (constructor sets trapping; destructor
+    restores original).
+
 See Also
     Foam::JobInfo
 
@@ -59,6 +63,9 @@ class sigInt
         //- Saved old signal trapping setting
         static struct sigaction oldAction_;
 
+        //- Flag to indicate signal trapping is enabled
+        static bool sigActive_;
+
 
     // Private Member Functions
 
@@ -80,7 +87,10 @@ public:
     // Member functions
 
         //- Activate SIGINT signal handler
-        void set(const bool verbose);
+        static void set(const bool verbose);
+
+        //- Deactivate SIGINT signal handler
+        static void unset(const bool verbose);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigQuit.C b/src/OSspecific/POSIX/signals/sigQuit.C
index 9c16d3d33d..46fb75cd48 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.C
+++ b/src/OSspecific/POSIX/signals/sigQuit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,8 @@ License
 
 struct sigaction Foam::sigQuit::oldAction_;
 
+bool Foam::sigQuit::sigActive_ = false;
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -40,10 +42,8 @@ void Foam::sigQuit::sigHandler(int)
     // Reset old handling
     if (sigaction(SIGQUIT, &oldAction_, NULL) < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::sigQuit::sigHandler()"
-        )   << "Cannot reset SIGQUIT trapping"
+        FatalErrorInFunction
+            << "Cannot reset SIGQUIT trapping"
             << abort(FatalError);
     }
 
@@ -61,7 +61,7 @@ void Foam::sigQuit::sigHandler(int)
 
 Foam::sigQuit::sigQuit()
 {
-    oldAction_.sa_handler = NULL;
+    set(false);
 }
 
 
@@ -69,15 +69,7 @@ Foam::sigQuit::sigQuit()
 
 Foam::sigQuit::~sigQuit()
 {
-    // Reset old handling
-    if (oldAction_.sa_handler && sigaction(SIGQUIT, &oldAction_, NULL) < 0)
-    {
-        FatalErrorIn
-        (
-            "Foam::sigQuit::~sigQuit()"
-        )   << "Cannot reset SIGQUIT trapping"
-            << abort(FatalError);
-    }
+    unset(false);
 }
 
 
@@ -85,26 +77,34 @@ Foam::sigQuit::~sigQuit()
 
 void Foam::sigQuit::set(const bool verbose)
 {
-    if (oldAction_.sa_handler)
+    if (!sigActive_)
     {
-        FatalErrorIn
-        (
-            "Foam::sigQuit::set()"
-        )   << "Cannot call sigQuit::set() more than once"
-            << abort(FatalError);
+        struct sigaction newAction;
+        newAction.sa_handler = sigHandler;
+        newAction.sa_flags = SA_NODEFER;
+        sigemptyset(&newAction.sa_mask);
+        if (sigaction(SIGQUIT, &newAction, &oldAction_) < 0)
+        {
+            FatalErrorInFunction
+                << "Cannot call sigQuit::set() more than once"
+                << abort(FatalError);
+        }
+        sigActive_ = true;
     }
+}
 
-    struct sigaction newAction;
-    newAction.sa_handler = sigHandler;
-    newAction.sa_flags = SA_NODEFER;
-    sigemptyset(&newAction.sa_mask);
-    if (sigaction(SIGQUIT, &newAction, &oldAction_) < 0)
+
+void Foam::sigQuit::unset(const bool)
+{
+    if (sigActive_)
     {
-        FatalErrorIn
-        (
-            "Foam::sigQuit::set()"
-        )   << "Cannot set SIGQUIT trapping"
+        if (sigaction(SIGQUIT, &oldAction_, NULL) < 0)
+        {
+        FatalErrorInFunction
+            << "Cannot set SIGQUIT trapping"
             << abort(FatalError);
+        }
+        sigActive_ = false;
     }
 }
 
diff --git a/src/OSspecific/POSIX/signals/sigQuit.H b/src/OSspecific/POSIX/signals/sigQuit.H
index 8dc0499351..d90573c1fa 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.H
+++ b/src/OSspecific/POSIX/signals/sigQuit.H
@@ -29,6 +29,9 @@ Description
 
     The standard interupt handler is overridden to ensure that the
     runningJob file is removed.
+    Can be used either directly through the static member functions or
+    through the scope of the object (constructor sets trapping; destructor
+    restores original).
 
 See Also
     Foam::JobInfo
@@ -59,6 +62,9 @@ class sigQuit
         //- Saved old signal trapping setting
         static struct sigaction oldAction_;
 
+        //- Flag to indicate signal trapping is enabled
+        static bool sigActive_;
+
 
     // Private Member Functions
 
@@ -81,7 +87,10 @@ public:
     // Member functions
 
         //- Activate SIGQUIT signal handler
-        void set(const bool verbose);
+        static void set(const bool verbose);
+
+        //- Deactivate SIGQUIT signal handler
+        static void unset(const bool verbose);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigSegv.C b/src/OSspecific/POSIX/signals/sigSegv.C
index 11a3069976..d1136a5e94 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.C
+++ b/src/OSspecific/POSIX/signals/sigSegv.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,8 @@ License
 
 struct sigaction Foam::sigSegv::oldAction_;
 
+bool Foam::sigSegv::sigActive_ = false;
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -40,10 +42,8 @@ void Foam::sigSegv::sigHandler(int)
     // Reset old handling
     if (sigaction(SIGSEGV, &oldAction_, NULL) < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::sigSegv::sigHandler()"
-        )   << "Cannot reset SIGSEGV trapping"
+        FatalErrorInFunction
+            << "Cannot reset SIGSEGV trapping"
             << abort(FatalError);
     }
 
@@ -61,7 +61,7 @@ void Foam::sigSegv::sigHandler(int)
 
 Foam::sigSegv::sigSegv()
 {
-    oldAction_.sa_handler = NULL;
+    set(false);
 }
 
 
@@ -69,15 +69,7 @@ Foam::sigSegv::sigSegv()
 
 Foam::sigSegv::~sigSegv()
 {
-    // Reset old handling
-    if (sigaction(SIGSEGV, &oldAction_, NULL) < 0)
-    {
-        FatalErrorIn
-        (
-            "Foam::sigSegv::~sigSegv()"
-        )   << "Cannot reset SIGSEGV trapping"
-            << abort(FatalError);
-    }
+    unset(false);
 }
 
 
@@ -85,26 +77,34 @@ Foam::sigSegv::~sigSegv()
 
 void Foam::sigSegv::set(const bool)
 {
-    if (oldAction_.sa_handler)
+    if (!sigActive_)
     {
-        FatalErrorIn
-        (
-            "Foam::sigSegv::set()"
-        )   << "Cannot call sigSegv::set() more than once"
-            << abort(FatalError);
+        struct sigaction newAction;
+        newAction.sa_handler = sigHandler;
+        newAction.sa_flags = SA_NODEFER;
+        sigemptyset(&newAction.sa_mask);
+        if (sigaction(SIGSEGV, &newAction, &oldAction_) < 0)
+        {
+            FatalErrorInFunction
+                << "Cannot call sigSegv::set() more than once"
+                << abort(FatalError);
+        }
+        sigActive_ = true;
     }
+}
 
-    struct sigaction newAction;
-    newAction.sa_handler = sigHandler;
-    newAction.sa_flags = SA_NODEFER;
-    sigemptyset(&newAction.sa_mask);
-    if (sigaction(SIGSEGV, &newAction, &oldAction_) < 0)
+
+void Foam::sigSegv::unset(const bool)
+{
+    if (sigActive_)
     {
-        FatalErrorIn
-        (
-            "Foam::sigSegv::set()"
-        )   << "Cannot set SIGSEGV trapping"
-            << abort(FatalError);
+        if (sigaction(SIGSEGV, &oldAction_, NULL) < 0)
+        {
+            FatalErrorInFunction
+                << "Cannot set SIGSEGV trapping"
+                << abort(FatalError);
+        }
+        sigActive_ = false;
     }
 }
 
diff --git a/src/OSspecific/POSIX/signals/sigSegv.H b/src/OSspecific/POSIX/signals/sigSegv.H
index 0cfaf05eee..e4cc7c8d40 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.H
+++ b/src/OSspecific/POSIX/signals/sigSegv.H
@@ -29,6 +29,9 @@ Description
 
     The standard interupt handler is overridden to ensure that the
     runningJob file is removed.
+    Can be used either directly through the static member functions or
+    through the scope of the object (constructor sets trapping; destructor
+    restores original).
 
 See Also
     Foam::JobInfo
@@ -59,6 +62,9 @@ class sigSegv
         //- Saved old signal trapping setting
         static struct sigaction oldAction_;
 
+        //- Flag to indicate signal trapping is enabled
+        static bool sigActive_;
+
 
     // Private Member Functions
 
@@ -81,7 +87,10 @@ public:
     // Member functions
 
         //- Activate SIGSEGV signal handler
-        void set(const bool verbose);
+        static void set(const bool verbose);
+
+        //- Deactivate SIGSEGV signal handler
+        static void unset(const bool verbose);
 };
 
 
diff --git a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
index 94759bfe33..3696eca38b 100644
--- a/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigStopAtWriteNow.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,10 +80,8 @@ void Foam::sigStopAtWriteNow::sigHandler(int)
     // Reset old handling
     if (sigaction(signal_, &oldAction_, NULL) < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::sigStopAtWriteNow::sigHandler(int)"
-        )   << "Cannot reset " << signal_ << " trapping"
+        FatalErrorInFunction
+            << "Cannot reset " << signal_ << " trapping"
             << abort(FatalError);
     }
 
@@ -127,10 +125,8 @@ Foam::sigStopAtWriteNow::~sigStopAtWriteNow()
     {
         if (sigaction(signal_, &oldAction_, NULL) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::sigStopAtWriteNow::~sigStopAtWriteNow()"
-            )   << "Cannot reset " << signal_ << " trapping"
+            FatalErrorInFunction
+                << "Cannot reset " << signal_ << " trapping"
                 << abort(FatalError);
         }
     }
@@ -146,11 +142,8 @@ void Foam::sigStopAtWriteNow::set(const bool verbose)
         // Check that the signal is different from the writeNowSignal
         if (sigWriteNow::signal_ == signal_)
         {
-            FatalErrorIn
-            (
-                "Foam::sigStopAtWriteNow::sigStopAtWriteNow"
-                "(const bool, const Time&)"
-            )   << "stopAtWriteNowSignal : " << signal_
+            FatalErrorInFunction
+                << "stopAtWriteNowSignal : " << signal_
                 << " cannot be the same as the writeNowSignal."
                 << " Please change this in the controlDict ("
                 << findEtcFile("controlDict", false) << ")."
@@ -164,11 +157,8 @@ void Foam::sigStopAtWriteNow::set(const bool verbose)
         sigemptyset(&newAction.sa_mask);
         if (sigaction(signal_, &newAction, &oldAction_) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::sigStopAtWriteNow::sigStopAtWriteNow"
-                "(const bool, const Time&)"
-            )   << "Cannot set " << signal_ << " trapping"
+            FatalErrorInFunction
+                << "Cannot set " << signal_ << " trapping"
                 << abort(FatalError);
         }
 
diff --git a/src/OSspecific/POSIX/signals/sigWriteNow.C b/src/OSspecific/POSIX/signals/sigWriteNow.C
index 29381368a2..2439b3feed 100644
--- a/src/OSspecific/POSIX/signals/sigWriteNow.C
+++ b/src/OSspecific/POSIX/signals/sigWriteNow.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,10 +108,8 @@ Foam::sigWriteNow::~sigWriteNow()
     {
         if (sigaction(signal_, &oldAction_, NULL) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::sigWriteNow::~sigWriteNow()"
-            )   << "Cannot reset " << signal_ << " trapping"
+            FatalErrorInFunction
+                << "Cannot reset " << signal_ << " trapping"
                 << abort(FatalError);
         }
     }
@@ -130,10 +128,8 @@ void Foam::sigWriteNow::set(const bool verbose)
         sigemptyset(&newAction.sa_mask);
         if (sigaction(signal_, &newAction, &oldAction_) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::sigWriteNow::sigWriteNow(const bool, const Time&)"
-            )   << "Cannot set " << signal_ << " trapping"
+            FatalErrorInFunction
+                << "Cannot set " << signal_ << " trapping"
                 << abort(FatalError);
         }
 
diff --git a/src/OSspecific/POSIX/timer.C b/src/OSspecific/POSIX/timer.C
index 8b175332d8..7e1f5886d3 100644
--- a/src/OSspecific/POSIX/timer.C
+++ b/src/OSspecific/POSIX/timer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,10 +67,8 @@ Foam::timer::timer(const unsigned int newTimeOut)
         // Is singleton since handler is static function
         if (oldTimeOut_ != 0)
         {
-            FatalErrorIn
-            (
-                "Foam::timer::timer(const unsigned int)"
-            )   << "timer already used."
+            FatalErrorInFunction
+                << "timer already used."
                 << abort(FatalError);
         }
 
@@ -84,10 +82,8 @@ Foam::timer::timer(const unsigned int newTimeOut)
 
         if (sigaction(SIGALRM, &newAction, &oldAction_) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::timer::timer(const unsigned int)"
-            )   << "sigaction(SIGALRM) error"
+            FatalErrorInFunction
+                << "sigaction(SIGALRM) error"
                 << abort(FatalError);
         }
 
@@ -125,11 +121,8 @@ Foam::timer::~timer()
         // Restore signal handler
         if (sigaction(SIGALRM, &oldAction_, NULL) < 0)
         {
-            FatalErrorIn
-            (
-                "Foam::timer::~timer(const struct sigaction&"
-                "const struct sigaction&)"
-            )   << "sigaction(SIGALRM) error"
+            FatalErrorInFunction
+                << "sigaction(SIGALRM) error"
                 << abort(FatalError);
         }
     }
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 6b271cfc1d..f6d3379ecf 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -91,6 +91,9 @@ $(strings)/wordRe/wordRe.C
 $(strings)/lists/hashedWordList.C
 $(strings)/stringOps/stringOps.C
 
+ops = primitives/ops
+$(ops)/flipOp.C
+
 primitives/hashes/Hasher/Hasher.C
 
 sha1 = primitives/hashes/SHA1
@@ -209,6 +212,7 @@ $(dll)/codedBase/codedBase.C
 db/functionObjects/functionObject/functionObject.C
 db/functionObjects/functionObjectList/functionObjectList.C
 db/functionObjects/functionObjectFile/functionObjectFile.C
+db/functionObjects/functionObjectState/functionObjectState.C
 db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
 
 
@@ -504,6 +508,7 @@ $(mapPolyMesh)/mapPolyMesh.C
 $(mapPolyMesh)/faceMapper/faceMapper.C
 $(mapPolyMesh)/cellMapper/cellMapper.C
 $(mapPolyMesh)/mapDistribute/mapDistribute.C
+$(mapPolyMesh)/mapDistribute/mapDistributeBase.C
 $(mapPolyMesh)/mapDistribute/mapDistributePolyMesh.C
 $(mapPolyMesh)/mapDistribute/IOmapDistribute.C
 $(mapPolyMesh)/mapAddedPolyMesh.C
@@ -617,6 +622,8 @@ $(derivedPointPatchFields)/codedFixedValue/codedFixedValuePointPatchFields.C
 
 fields/GeometricFields/pointFields/pointFields.C
 
+fields/ReadFields/ReadFields.C
+
 meshes/bandCompression/bandCompression.C
 meshes/preservePatchTypes/preservePatchTypes.C
 
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 92b2932510..922a62415f 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,7 +208,7 @@ Foam::dynamicIndexedOctree<Type>::divide
      || bb.min()[2] >= bb.max()[2]
     )
     {
-        FatalErrorIn("dynamicIndexedOctree<Type>::divide(..)")
+        FatalErrorInFunction
             << "Badly formed bounding box:" << bb
             << abort(FatalError);
     }
@@ -436,11 +436,8 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
         {
             // Empty node. Cannot have 'mixed' as its type since not divided
             // up and has no items inside it.
-            FatalErrorIn
-            (
-                "dynamicIndexedOctree<Type>::getVolumeType"
-                "(const label, const point&)"
-            )   << "Sample:" << sample << " node:" << nodeI
+            FatalErrorInFunction
+                << "Sample:" << sample << " node:" << nodeI
                 << " with bb:" << nodes_[nodeI].bb_ << nl
                 << "Empty subnode has invalid volume type MIXED."
                 << abort(FatalError);
@@ -450,11 +447,8 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
     }
     else
     {
-        FatalErrorIn
-        (
-            "dynamicIndexedOctree<Type>::getVolumeType"
-            "(const label, const point&)"
-        )   << "Sample:" << sample << " at node:" << nodeI
+        FatalErrorInFunction
+            << "Sample:" << sample << " at node:" << nodeI
             << " octant:" << octant
             << " with bb:" << nod.bb_.subBbox(octant) << nl
             << "Node has invalid volume type " << octantType
@@ -708,7 +702,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
     {
         if (pushInside != bb.contains(perturbedPt))
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::pushPoint(..)")
+            FatalErrorInFunction
                 << "pushed point:" << pt
                 << " to:" << perturbedPt
                 << " wanted side:" << pushInside
@@ -743,7 +737,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
 
     if (faceID == 0)
     {
-        FatalErrorIn("dynamicIndexedOctree<Type>::pushPoint(..)")
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
@@ -820,7 +814,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
     {
         if (pushInside != bb.contains(perturbedPt))
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::pushPoint(..)")
+            FatalErrorInFunction
                 << "pushed point:" << pt << " on face:" << faceString(faceID)
                 << " to:" << perturbedPt
                 << " wanted side:" << pushInside
@@ -849,7 +843,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
     {
         if (bb.posBits(pt) != 0)
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::pushPointIntoFace(..)")
+            FatalErrorInFunction
                 << " bb:" << bb << endl
                 << "does not contain point " << pt << abort(FatalError);
         }
@@ -971,7 +965,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
     {
         if (faceID != bb.faceBits(facePoint))
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::pushPointIntoFace(..)")
+            FatalErrorInFunction
                 << "Pushed point from " << pt
                 << " on face:" << ptFaceID << " of bb:" << bb << endl
                 << "onto " << facePoint
@@ -982,7 +976,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
         }
         if (bb.posBits(facePoint) != 0)
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::pushPointIntoFace(..)")
+            FatalErrorInFunction
                 << " bb:" << bb << endl
                 << "does not contain perturbed point "
                 << facePoint << abort(FatalError);
@@ -1086,7 +1080,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
 //
 //    if (nFaces == 0 || nFaces == 1 || nFaces > 3)
 //    {
-//        FatalErrorIn("dynamicIndexedOctree<Type>::checkMultipleFaces(..)")
+//        FatalErrorInFunction
 //            << "Problem : nFaces:" << nFaces << abort(FatalError);
 //    }
 //
@@ -1119,7 +1113,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
 //
 //    if (maxIndex == -1)
 //    {
-//        FatalErrorIn("dynamicIndexedOctree<Type>::checkMultipleFaces(..)")
+//        FatalErrorInFunction
 //            << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts
 //            << abort(FatalError);
 //    }
@@ -1179,7 +1173,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
 //    {
 //        if (faceID != bb.faceBits(faceHitInfo.rawPoint()))
 //        {
-//            FatalErrorIn("dynamicIndexedOctree<Type>::checkMultipleFaces(..)")
+//            FatalErrorInFunction
 //                << "Pushed point from " << oldPoint
 //                << " on face:" << oldFaceID << " of bb:" << bb << endl
 //                << "onto " << faceHitInfo.rawPoint()
@@ -1229,7 +1223,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToParent
 
     if (parentOctant == 255)
     {
-        FatalErrorIn("walkToParent(..)")
+        FatalErrorInFunction
             << "Problem: no parent found for octant:" << octant
             << " node:" << nodeI
             << abort(FatalError);
@@ -1426,7 +1420,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
 
         if (!subBb.contains(facePoint))
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::walkToNeighbour(..)")
+            FatalErrorInFunction
                 << "When searching for " << facePoint
                 << " ended up in node:" << nodeI
                 << " octant:" << octant
@@ -1455,7 +1449,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
 
         if (nodeI == oldNodeI && octant == oldOctant)
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::walkToNeighbour(..)")
+            FatalErrorInFunction
                 << "Did not go to neighbour when searching for " << facePoint
                 << endl
                 << "    starting from face:" << faceString(faceID)
@@ -1467,7 +1461,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
 
         if (!subBb.contains(facePoint))
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::walkToNeighbour(..)")
+            FatalErrorInFunction
                 << "When searching for " << facePoint
                 << " ended up in node:" << nodeI
                 << " octant:" << octant
@@ -1555,7 +1549,7 @@ void Foam::dynamicIndexedOctree<Type>::traverseNode
 
         if (octantBb.posBits(start) != 0)
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::traverseNode(..)")
+            FatalErrorInFunction
                 << "Node:" << nodeI << " octant:" << octant
                 << " bb:" << octantBb << endl
                 << "does not contain point " << start << abort(FatalError);
@@ -1863,7 +1857,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
         }
         if (debug)
         {
-            FatalErrorIn("dynamicIndexedOctree<Type>::findLine(..)")
+            FatalErrorInFunction
                 << "Got stuck in loop raytracing from:" << treeStart
                 << " to:" << treeEnd << endl
                 << "inside top box:" << subBbox(startNodeI, startOctant)
@@ -1871,7 +1865,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
         }
         else
         {
-            WarningIn("dynamicIndexedOctree<Type>::findLine(..)")
+            WarningInFunction
                 << "Got stuck in loop raytracing from:" << treeStart
                 << " to:" << treeEnd << endl
                 << "inside top box:" << subBbox(startNodeI, startOctant)
@@ -2493,7 +2487,7 @@ Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode
     {
         if (!nod.bb_.contains(sample))
         {
-            FatalErrorIn("findNode(..)")
+            FatalErrorInFunction
                 << "Cannot find " << sample << " in node " << nodeI
                 << abort(FatalError);
         }
@@ -2627,7 +2621,7 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
                 }
                 else
                 {
-                    FatalErrorIn("getVolumeType") << abort(FatalError);
+                    FatalErrorInFunction << abort(FatalError);
                 }
             }
 
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index ccb929f188..3c1d969c46 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -472,7 +472,7 @@ public:
             {
                 if (nodes_.empty())
                 {
-                    FatalErrorIn("dynamicIndexedOctree<Type>::bb() const")
+                    FatalErrorInFunction
                         << "Tree is empty" << abort(FatalError);
                 }
                 return nodes_[0].bb_;
@@ -500,7 +500,7 @@ public:
             {
                 if (!isContent(i))
                 {
-                    FatalErrorIn("getContent(const label)")
+                    FatalErrorInFunction
                         << abort(FatalError);
                 }
                 return -i.val()-1;
@@ -510,7 +510,7 @@ public:
             {
                 if (!isNode(i))
                 {
-                    FatalErrorIn("getNode(const label)")
+                    FatalErrorInFunction
                         << abort(FatalError);
                 }
                 return i.val() - 1;
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.H
index 529d923b74..516ba34c41 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,11 +149,7 @@ public:
                 point& result
             ) const
             {
-                notImplemented
-                (
-                    "dynamicTreeDataPoint::intersects"
-                    "(const label, const point&, const point&, point&)"
-                );
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 541a008d6b..9706ffc52f 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ Foam::indexedOctree<Type>::divide
      || bb.min()[2] >= bb.max()[2]
     )
     {
-        FatalErrorIn("indexedOctree<Type>::divide(..)")
+        FatalErrorInFunction
             << "Badly formed bounding box:" << bb
             << abort(FatalError);
     }
@@ -456,11 +456,8 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
         {
             // Empty node. Cannot have 'mixed' as its type since not divided
             // up and has no items inside it.
-            FatalErrorIn
-            (
-                "indexedOctree<Type>::getVolumeType"
-                "(const label, const point&)"
-            )   << "Sample:" << sample << " node:" << nodeI
+            FatalErrorInFunction
+                << "Sample:" << sample << " node:" << nodeI
                 << " with bb:" << nodes_[nodeI].bb_ << nl
                 << "Empty subnode has invalid volume type MIXED."
                 << abort(FatalError);
@@ -470,11 +467,8 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
     }
     else
     {
-        FatalErrorIn
-        (
-            "indexedOctree<Type>::getVolumeType"
-            "(const label, const point&)"
-        )   << "Sample:" << sample << " at node:" << nodeI
+        FatalErrorInFunction
+            << "Sample:" << sample << " at node:" << nodeI
             << " octant:" << octant
             << " with bb:" << nod.bb_.subBbox(octant) << nl
             << "Node has invalid volume type " << octantType
@@ -739,7 +733,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
     {
         if (pushInside != bb.contains(perturbedPt))
         {
-            FatalErrorIn("indexedOctree<Type>::pushPoint(..)")
+            FatalErrorInFunction
                 << "pushed point:" << pt
                 << " to:" << perturbedPt
                 << " wanted side:" << pushInside
@@ -774,7 +768,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
 
     if (faceID == 0)
     {
-        FatalErrorIn("indexedOctree<Type>::pushPoint(..)")
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
@@ -851,7 +845,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
     {
         if (pushInside != bb.contains(perturbedPt))
         {
-            FatalErrorIn("indexedOctree<Type>::pushPoint(..)")
+            FatalErrorInFunction
                 << "pushed point:" << pt << " on face:" << faceString(faceID)
                 << " to:" << perturbedPt
                 << " wanted side:" << pushInside
@@ -880,7 +874,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
     {
         if (bb.posBits(pt) != 0)
         {
-            FatalErrorIn("indexedOctree<Type>::pushPointIntoFace(..)")
+            FatalErrorInFunction
                 << " bb:" << bb << endl
                 << "does not contain point " << pt << abort(FatalError);
         }
@@ -1002,7 +996,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
     {
         if (faceID != bb.faceBits(facePoint))
         {
-            FatalErrorIn("indexedOctree<Type>::pushPointIntoFace(..)")
+            FatalErrorInFunction
                 << "Pushed point from " << pt
                 << " on face:" << ptFaceID << " of bb:" << bb << endl
                 << "onto " << facePoint
@@ -1013,7 +1007,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
         }
         if (bb.posBits(facePoint) != 0)
         {
-            FatalErrorIn("indexedOctree<Type>::pushPointIntoFace(..)")
+            FatalErrorInFunction
                 << " bb:" << bb << endl
                 << "does not contain perturbed point "
                 << facePoint << abort(FatalError);
@@ -1117,7 +1111,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
 //
 //    if (nFaces == 0 || nFaces == 1 || nFaces > 3)
 //    {
-//        FatalErrorIn("indexedOctree<Type>::checkMultipleFaces(..)")
+//        FatalErrorInFunction
 //            << "Problem : nFaces:" << nFaces << abort(FatalError);
 //    }
 //
@@ -1150,7 +1144,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
 //
 //    if (maxIndex == -1)
 //    {
-//        FatalErrorIn("indexedOctree<Type>::checkMultipleFaces(..)")
+//        FatalErrorInFunction
 //            << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts
 //            << abort(FatalError);
 //    }
@@ -1210,7 +1204,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
 //    {
 //        if (faceID != bb.faceBits(faceHitInfo.rawPoint()))
 //        {
-//            FatalErrorIn("indexedOctree<Type>::checkMultipleFaces(..)")
+//            FatalErrorInFunction
 //                << "Pushed point from " << oldPoint
 //                << " on face:" << oldFaceID << " of bb:" << bb << endl
 //                << "onto " << faceHitInfo.rawPoint()
@@ -1260,7 +1254,7 @@ bool Foam::indexedOctree<Type>::walkToParent
 
     if (parentOctant == 255)
     {
-        FatalErrorIn("walkToParent(..)")
+        FatalErrorInFunction
             << "Problem: no parent found for octant:" << octant
             << " node:" << nodeI
             << abort(FatalError);
@@ -1457,7 +1451,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
 
         if (!subBb.contains(facePoint))
         {
-            FatalErrorIn("indexedOctree<Type>::walkToNeighbour(..)")
+            FatalErrorInFunction
                 << "When searching for " << facePoint
                 << " ended up in node:" << nodeI
                 << " octant:" << octant
@@ -1486,7 +1480,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
 
         if (nodeI == oldNodeI && octant == oldOctant)
         {
-            FatalErrorIn("indexedOctree<Type>::walkToNeighbour(..)")
+            FatalErrorInFunction
                 << "Did not go to neighbour when searching for " << facePoint
                 << endl
                 << "    starting from face:" << faceString(faceID)
@@ -1498,7 +1492,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
 
         if (!subBb.contains(facePoint))
         {
-            FatalErrorIn("indexedOctree<Type>::walkToNeighbour(..)")
+            FatalErrorInFunction
                 << "When searching for " << facePoint
                 << " ended up in node:" << nodeI
                 << " octant:" << octant
@@ -1589,7 +1583,7 @@ void Foam::indexedOctree<Type>::traverseNode
 
         if (octantBb.posBits(start) != 0)
         {
-            FatalErrorIn("indexedOctree<Type>::traverseNode(..)")
+            FatalErrorInFunction
                 << "Node:" << nodeI << " octant:" << octant
                 << " bb:" << octantBb << endl
                 << "does not contain point " << start << abort(FatalError);
@@ -1897,7 +1891,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
         }
         if (debug)
         {
-            FatalErrorIn("indexedOctree<Type>::findLine(..)")
+            FatalErrorInFunction
                 << "Got stuck in loop raytracing from:" << treeStart
                 << " to:" << treeEnd << endl
                 << "inside top box:" << subBbox(startNodeI, startOctant)
@@ -1905,7 +1899,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
         }
         else
         {
-            WarningIn("indexedOctree<Type>::findLine(..)")
+            WarningInFunction
                 << "Got stuck in loop raytracing from:" << treeStart
                 << " to:" << treeEnd << endl
                 << "inside top box:" << subBbox(startNodeI, startOctant)
@@ -2799,7 +2793,7 @@ Foam::labelBits Foam::indexedOctree<Type>::findNode
     {
         if (!nod.bb_.contains(sample))
         {
-            FatalErrorIn("findNode(..)")
+            FatalErrorInFunction
                 << "Cannot find " << sample << " in node " << nodeI
                 << abort(FatalError);
         }
@@ -2937,7 +2931,7 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
                 }
                 else
                 {
-                    FatalErrorIn("getVolumeType") << abort(FatalError);
+                    FatalErrorInFunction << abort(FatalError);
                 }
             }
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index 96abc1a43f..e111d4f4af 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -470,7 +470,7 @@ public:
             {
                 if (nodes_.empty())
                 {
-                    FatalErrorIn("indexedOctree<Type>::bb() const")
+                    FatalErrorInFunction
                         << "Tree is empty" << abort(FatalError);
                 }
                 return nodes_[0].bb_;
@@ -498,7 +498,7 @@ public:
             {
                 if (!isContent(i))
                 {
-                    FatalErrorIn("getContent(const label)")
+                    FatalErrorInFunction
                         << abort(FatalError);
                 }
                 return -i.val()-1;
@@ -508,7 +508,7 @@ public:
             {
                 if (!isNode(i))
                 {
-                    FatalErrorIn("getNode(const label)")
+                    FatalErrorInFunction
                         << abort(FatalError);
                 }
                 return i.val() - 1;
diff --git a/src/OpenFOAM/algorithms/indexedOctree/labelBits.H b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
index 757fd73621..b2a8907e3c 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,10 +60,8 @@ class labelBits
 #           ifdef FULLDEBUG
             if (bits > 7 || (((val<<3)>>3) != val))
             {
-                FatalErrorIn
-                (
-                    "labelBits::pack(const label, const direction)"
-                )   << "Direction " << bits << " outside range 0..7"
+                FatalErrorInFunction
+                    << "Direction " << bits << " outside range 0..7"
                     << " or value " << val << " negative or larger than "
                     << label(8*sizeof(label)-3) << " bit representation"
                     << abort(FatalError);
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
index b056c909d4..80d5a29b44 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
@@ -232,18 +232,7 @@ void Foam::treeDataCell::findNearestOp::operator()
     point& nearestPoint
 ) const
 {
-    notImplemented
-    (
-        "treeDataCell::findNearestOp::operator()"
-        "("
-        "    const labelUList&,"
-        "    const linePointRef&,"
-        "    treeBoundBox&,"
-        "    label&,"
-        "    point&,"
-        "    point&"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
index 8c85d76999..8f62001330 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H
@@ -203,11 +203,7 @@ public:
                 const point&
             ) const
             {
-                notImplemented
-                (
-                    "treeDataCell::getVolumeType"
-                    "(const indexedOctree<treeDataCell>&, const point&)"
-                );
+                NotImplemented;
                 return volumeType::UNKNOWN;
             }
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/volumeType.H b/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
index 7bdfc043e6..3d845c414b 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/volumeType.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -95,6 +95,12 @@ public:
             t_(t)
         {}
 
+        //- Construct from integer
+        explicit volumeType(const int t)
+        :
+            t_(static_cast<volumeType::type>(t))
+        {}
+
 
     // Member Functions
 
diff --git a/src/OpenFOAM/containers/Circulators/Circulator/CirculatorI.H b/src/OpenFOAM/containers/Circulators/Circulator/CirculatorI.H
index aca31c0d63..65c6ce1dee 100644
--- a/src/OpenFOAM/containers/Circulators/Circulator/CirculatorI.H
+++ b/src/OpenFOAM/containers/Circulators/Circulator/CirculatorI.H
@@ -171,11 +171,8 @@ void Foam::Circulator<ContainerType>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::Circulator<ContainerType>::operator="
-            "(const Foam::Circulator<ContainerType>&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculatorI.H b/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculatorI.H
index 30d66bba2a..bd51a2e4d5 100644
--- a/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculatorI.H
+++ b/src/OpenFOAM/containers/Circulators/ConstCirculator/ConstCirculatorI.H
@@ -174,11 +174,8 @@ void Foam::ConstCirculator<ContainerType>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::ConstCirculator<ContainerType>::operator="
-            "(const Foam::ConstCirculator<ContainerType>&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index 3227e13b21..8ddb9e062d 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,10 +141,8 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
 
     if (iter == hashedTs_.end())
     {
-        FatalErrorIn
-        (
-            "DictionaryBase<IDLListType, T>::lookup(const word&) const"
-        )   << keyword << " is undefined"
+        FatalErrorInFunction
+            << keyword << " is undefined"
             << exit(FatalError);
     }
 
@@ -160,10 +158,8 @@ T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
 
     if (iter == hashedTs_.end())
     {
-        FatalErrorIn
-        (
-            "DictionaryBase<IDLListType, T>::lookup(const word&)"
-        )   << keyword << " is undefined"
+        FatalErrorInFunction
+            << keyword << " is undefined"
             << exit(FatalError);
     }
 
@@ -260,7 +256,7 @@ void Foam::DictionaryBase<IDLListType, T>::operator=
     // Check for assignment to self
     if (this == &dict)
     {
-        FatalErrorIn("DictionaryBase::operator=(const DictionaryBase&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C
index dae34e82fe..71c4abf52d 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C
+++ b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C
@@ -70,10 +70,8 @@ inline Foam::autoPtr<T> Foam::PtrListDictionary<T>::set
 {
     if (!DictionaryBase<PtrList<T>, T>::hashedTs_.insert(key, ptr))
     {
-        FatalErrorIn
-        (
-            "PtrListDictionary<T>::set(const label i, const word& key, T* ptr)"
-        )   << "Cannot insert with key '" << key << "' into hash-table"
+        FatalErrorInFunction
+            << "Cannot insert with key '" << key << "' into hash-table"
             << abort(FatalError);
     }
     return PtrList<T>::set(i, ptr);
@@ -91,11 +89,8 @@ inline Foam::autoPtr<T> Foam::PtrListDictionary<T>::set
     T* ptr = aptr.ptr();
     if (!DictionaryBase<PtrList<T>, T>::hashedTs_.insert(key, ptr))
     {
-        FatalErrorIn
-        (
-            "PtrListDictionary<T>::"
-            "set(const label i, const word& key, autoPtr<T>& aptr)"
-        )   << "Cannot insert with key '" << key << "' into hash-table"
+        FatalErrorInFunction
+            << "Cannot insert with key '" << key << "' into hash-table"
             << abort(FatalError);
     }
     return PtrList<T>::set(i, ptr);
@@ -113,11 +108,8 @@ inline Foam::autoPtr<T> Foam::PtrListDictionary<T>::set
     T* ptr = t.ptr();
     if (!DictionaryBase<PtrList<T>, T>::hashedTs_.insert(key, ptr))
     {
-        FatalErrorIn
-        (
-            "PtrListDictionary<T>::"
-            "set(const label i, const word& key, tmp<T>& t)"
-        )   << "Cannot insert with key '" << key << "' into hash-table"
+        FatalErrorInFunction
+            << "Cannot insert with key '" << key << "' into hash-table"
             << abort(FatalError);
     }
     return PtrList<T>::set(i, ptr);
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index 3b53b1dfa6..4f6ad375ab 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,11 +121,8 @@ void Foam::HashPtrTable<T, Key, Hash>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "HashPtrTable<T, Key, Hash>::operator="
-            "(const HashPtrTable<T, Key, Hash>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
index b6440ac286..283968a9b4 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,9 +76,8 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "HashPtrTable<T, Key, Hash>::read(Istream&, const INew&)",
                     is
                 )   << "incorrect first token, '(', found " << firstToken.info()
                     << exit(FatalIOError);
@@ -92,9 +91,8 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "HashPtrTable<T, Key, Hash>::read(Istream&, const INew&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -125,9 +123,8 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "HashPtrTable<T, Key, Hash>::read(Istream&, const INew&)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 87457c15f7..2ebab1e3a9 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -546,11 +546,8 @@ void Foam::HashTable<T, Key, Hash>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "HashTable<T, Key, Hash>::operator="
-            "(const HashTable<T, Key, Hash>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 9fb7041f0f..9839015f02 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,8 +114,7 @@ inline T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key)
 
     if (iter == this->end())
     {
-        FatalErrorIn("HashTable<T, Key, Hash>::operator[](const Key&)")
-            << key << " not found in table.  Valid entries: "
+        FatalErrorInFunction
             << toc()
             << exit(FatalError);
     }
@@ -131,8 +130,7 @@ inline const T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key) const
 
     if (iter == this->cend())
     {
-        FatalErrorIn("HashTable<T, Key, Hash>::operator[](const Key&) const")
-            << key << " not found in table.  Valid entries: "
+        FatalErrorInFunction
             << toc()
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
index 676c6977c7..f56429ce5e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,9 +145,8 @@ Foam::Istream& Foam::operator>>
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "operator>>(Istream&, HashTable<T, Key, Hash>&)",
                     is
                 )   << "incorrect first token, '(', found " << firstToken.info()
                     << exit(FatalIOError);
@@ -161,9 +160,8 @@ Foam::Istream& Foam::operator>>
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "operator>>(Istream&, HashTable<T, Key, Hash>&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -199,9 +197,8 @@ Foam::Istream& Foam::operator>>
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "operator>>(Istream&, HashTable<T, Key, Hash>&)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index da859652eb..2b1dacbc39 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,10 +71,8 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)
 {
     if (size < 1)
     {
-        FatalErrorIn
-        (
-            "StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)"
-        )   << "Illegal size " << size << " for StaticHashTable."
+        FatalErrorInFunction
+            << "Illegal size " << size << " for StaticHashTable."
             << " Minimum size is 1" << abort(FatalError);
     }
 }
@@ -406,10 +404,8 @@ void Foam::StaticHashTable<T, Key, Hash>::resize(const label sz)
 
     if (newSize < 1)
     {
-        FatalErrorIn
-        (
-            "StaticHashTable<T, Key, Hash>::resize(const label)"
-        )   << "Illegal size " << newSize << " for StaticHashTable."
+        FatalErrorInFunction
+            << "Illegal size " << newSize << " for StaticHashTable."
             << " Minimum size is 1" << abort(FatalError);
     }
 
@@ -486,11 +482,8 @@ void Foam::StaticHashTable<T, Key, Hash>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "StaticHashTable<T, Key, Hash>::operator="
-            "(const StaticHashTable<T, Key, Hash>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index a7b7af4679..49f84be2b4 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,8 +94,7 @@ inline T& Foam::StaticHashTable<T, Key, Hash>::operator[](const Key& key)
 
     if (iter == end())
     {
-        FatalErrorIn("StaticHashTable<T, Key, Hash>::operator[](const Key&)")
-            << key << " not found in table.  Valid entries: "
+        FatalErrorInFunction
             << toc()
             << exit(FatalError);
     }
@@ -114,10 +113,7 @@ inline const T& Foam::StaticHashTable<T, Key, Hash>::operator[]
 
     if (iter == cend())
     {
-        FatalErrorIn
-        (
-            "StaticHashTable<T, Key, Hash>::operator[](const Key&) const"
-        )   << key << " not found in table.  Valid entries: "
+        FatalErrorInFunction
             << toc()
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
index 1164214dfe..7e4b383261 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,8 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 {
     if (size < 1)
     {
-        FatalErrorIn
-        (
-            "StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)"
-        )   << "Illegal size " << size << " for StaticHashTable."
+        FatalErrorInFunction
+            << "Illegal size " << size << " for StaticHashTable."
             << " Minimum size is 1" << abort(FatalError);
     }
 
@@ -142,9 +140,8 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable<T, Key, Hash>& L)
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "operator>>(Istream&, StaticHashTable<T, Key, Hash>&)",
                     is
                 )   << "incorrect first token, '(', found " << firstToken.info()
                     << exit(FatalIOError);
@@ -158,9 +155,8 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable<T, Key, Hash>& L)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "operator>>(Istream&, StaticHashTable<T, Key, Hash>&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -196,9 +192,8 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable<T, Key, Hash>& L)
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "operator>>(Istream&, StaticHashTable<T, Key, Hash>&)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index f7b74ec8a6..ed5edf6c8f 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,10 +94,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
 {
     if (lst.size() != keys.size())
     {
-        FatalErrorIn
-        (
-            "Foam::Keyed<T>::createList(const List<T>&, const labelUList&)"
-        )
+        FatalErrorInFunction
             << "size mismatch adding keys to a list:" << nl
             << "List has size " << lst.size()
             << " and keys has size " << keys.size() << nl
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
index 6a1971bd2a..befc71d1eb 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,9 +89,8 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "operator>>(Istream&, ILList<LListBase, T>&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -117,7 +116,7 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
     }
     else
     {
-        FatalIOErrorIn("operator>>(Istream&, ILList<LListBase, T>&)", is)
+        FatalIOErrorInFunction(is)
             << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
index 9907cbbf70..c14ff358ea 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
@@ -90,9 +90,8 @@ Foam::Istream& Foam::operator>>(Istream& is, LList<LListBase, T>& L)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                " operator>>(Istream&, LList<LListBase, T>&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -120,7 +119,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList<LListBase, T>& L)
     }
     else
     {
-        FatalIOErrorIn(" operator>>(Istream&, LList<LListBase, T>&)", is)
+        FatalIOErrorInFunction(is)
             << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
index 089fd58c2f..6a691c078a 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,8 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "LPtrList<LListBase, T>::read(Istream&, const INew&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -125,9 +124,8 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "LPtrList<LListBase, T>::read(Istream&, const INew&)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
index 9d9b50904b..e8e6b721c3 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ Foam::DLListBase::link* Foam::DLListBase::removeHead()
 
     if (!first_)
     {
-        FatalErrorIn("void DLListBase::removeHead()")
+        FatalErrorInFunction
             << "remove from empty list"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
index fd33c5efac..c13482d30a 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ Foam::DLListBase::first()
 {
     if (!nElmts_)
     {
-        FatalErrorIn("DLListBase::first()")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
@@ -104,7 +104,7 @@ Foam::DLListBase::first() const
 {
     if (!nElmts_)
     {
-        FatalErrorIn("DLListBase::first() const")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
@@ -117,7 +117,7 @@ Foam::DLListBase::last()
 {
     if (!nElmts_)
     {
-        FatalErrorIn("DLListBase::last()")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
@@ -130,7 +130,7 @@ Foam::DLListBase::last() const
 {
     if (!nElmts_)
     {
-        FatalErrorIn("DLListBase::last() const")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
index f230241355..c314cdc752 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ Foam::SLListBase::link* Foam::SLListBase::removeHead()
 
     if (last_ == 0)
     {
-        FatalErrorIn("SLListBase::remove()")
+        FatalErrorInFunction
             << "remove from empty list"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
index 432b183253..21a2fa020c 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ Foam::SLListBase::first()
 {
     if (!nElmts_)
     {
-        FatalErrorIn("SLListBase::first()")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
@@ -94,7 +94,7 @@ Foam::SLListBase::first() const
 {
     if (!nElmts_)
     {
-        FatalErrorIn("SLListBase::first() const")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
@@ -107,7 +107,7 @@ Foam::SLListBase::last()
 {
     if (!nElmts_)
     {
-        FatalErrorIn("SLListBase::last()")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
@@ -120,7 +120,7 @@ Foam::SLListBase::last() const
 {
     if (!nElmts_)
     {
-        FatalErrorIn("SLListBase::last() const")
+        FatalErrorInFunction
             << "list is empty"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index 88eae210a5..dcf70d41a5 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ inline void Foam::BiIndirectList<T>::operator=(const UList<T>& ae)
 {
     if (addressing_.size() != ae.size())
     {
-        FatalErrorIn("BiIndirectList<T>::operator=(const UList<T>&)")
+        FatalErrorInFunction
             << "Addressing and list of addressed elements "
                "have different sizes: "
             << addressing_.size() << " " << ae.size()
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 258aaae9da..4e18ee6176 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,10 +139,8 @@ void Foam::CompactListList<T, Container>::setSize(const label nRows)
     }
     else if (nRows > size())
     {
-        FatalErrorIn
-        (
-            "CompactListList<T, Container>::setSize(const label nRows)"
-        )   << "Cannot be used to extend the list from " << offsets_.size()
+        FatalErrorInFunction
+            << "Cannot be used to extend the list from " << offsets_.size()
             << " to " << nRows << nl
             << "    Please use one of the other setSize member functions"
             << abort(FatalError);
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index 346aba37c8..c426fd151c 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,10 +144,8 @@ const
 {
     if (i < 0 || i >= m_.size())
     {
-        FatalErrorIn
-        (
-            "CompactListList<T, Container>::whichRow(const label) const"
-        )   << "Index " << i << " outside 0.." << m_.size()
+        FatalErrorInFunction
+            << "Index " << i << " outside 0.." << m_.size()
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index 89f0969826..7e8e171556 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -565,11 +565,8 @@ void Foam::Distribution<Type>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::Distribution<Type>::operator="
-            "(const Foam::Distribution<Type>&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 25dfb0ad99..c6ed4d1569 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -328,11 +328,8 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::append
 {
     if (this == &lst)
     {
-        FatalErrorIn
-        (
-            "DynamicList<T, SizeInc, SizeMult, SizeDiv>::append"
-            "(const UList<T>&)"
-        )   << "attempted appending to self" << abort(FatalError);
+        FatalErrorInFunction
+            << "attempted appending to self" << abort(FatalError);
     }
 
     label nextFree = List<T>::size();
@@ -371,10 +368,8 @@ inline T Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::remove()
 
     if (elemI < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::remove()"
-        )   << "List is empty" << abort(FatalError);
+        FatalErrorInFunction
+            << "List is empty" << abort(FatalError);
     }
 
     const T& val = List<T>::operator[](elemI);
@@ -420,11 +415,8 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 {
     if (this == &lst)
     {
-        FatalErrorIn
-        (
-            "DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator="
-            "(const DynamicList<T, SizeInc, SizeMult, SizeDiv>&)"
-        )   << "attempted assignment to self" << abort(FatalError);
+        FatalErrorInFunction
+            << "attempted assignment to self" << abort(FatalError);
     }
 
     if (capacity_ >= lst.size())
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 87bd7b856a..053a4e4e6d 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -131,7 +131,7 @@ inline void Foam::FixedList<T, Size>::checkStart(const label start) const
 {
     if (start < 0 || (start && unsigned(start) >= Size))
     {
-        FatalErrorIn("FixedList<T, Size>::checkStart(const label)")
+        FatalErrorInFunction
             << "start " << start << " out of range 0 ... " << (Size-1)
             << abort(FatalError);
     }
@@ -144,7 +144,7 @@ inline void Foam::FixedList<T, Size>::checkSize(const label size) const
 {
     if (size < 0 || unsigned(size) > Size)
     {
-        FatalErrorIn("FixedList<T, Size>::checkSize(const label)")
+        FatalErrorInFunction
             << "size " << size << " out of range 0 ... " << (Size)
             << abort(FatalError);
     }
@@ -158,7 +158,7 @@ inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
 {
     if (i < 0 || unsigned(i) >= Size)
     {
-        FatalErrorIn("FixedList<T, Size>::checkIndex(const label)")
+        FatalErrorInFunction
             << "index " << i << " out of range 0 ... " << (Size-1)
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
index 76970057a1..62e801dd98 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
@@ -68,7 +68,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
         }
         else if (!firstToken.isPunctuation())
         {
-            FatalIOErrorIn("operator>>(Istream&, FixedList<T, Size>&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect first token, expected <label> "
                    "or '(' or '{', found "
                 << firstToken.info()
diff --git a/src/OpenFOAM/containers/Lists/Histogram/Histogram.C b/src/OpenFOAM/containers/Lists/Histogram/Histogram.C
index 12d3fbb076..d5c1376069 100644
--- a/src/OpenFOAM/containers/Lists/Histogram/Histogram.C
+++ b/src/OpenFOAM/containers/Lists/Histogram/Histogram.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ void Foam::Histogram<List>::count(const List& bins, const List& l)
 {
     if (bins.size() < 2)
     {
-        FatalErrorIn("Histogram<List>::count(const List&, const List&)")
+        FatalErrorInFunction
             << "Should have at least two values in bins. Now:" << bins
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 0ba40cc10f..e184284d82 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -46,7 +46,7 @@ Foam::List<T>::List(const label s)
 {
     if (this->size_ < 0)
     {
-        FatalErrorIn("List<T>::List(const label size)")
+        FatalErrorInFunction
             << "bad size " << this->size_
             << abort(FatalError);
     }
@@ -66,7 +66,7 @@ Foam::List<T>::List(const label s, const T& a)
 {
     if (this->size_ < 0)
     {
-        FatalErrorIn("List<T>::List(const label size, const T&)")
+        FatalErrorInFunction
             << "bad size " << this->size_
             << abort(FatalError);
     }
@@ -319,7 +319,7 @@ void Foam::List<T>::setSize(const label newSize)
 {
     if (newSize < 0)
     {
-        FatalErrorIn("List<T>::setSize(const label)")
+        FatalErrorInFunction
             << "bad set size " << newSize
             << abort(FatalError);
     }
@@ -462,7 +462,7 @@ void Foam::List<T>::operator=(const List<T>& a)
 {
     if (this == &a)
     {
-        FatalErrorIn("List<T>::operator=(const List<T>&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 1220116913..f304da6e21 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,10 +105,8 @@ inline void Foam::List<T>::append(const UList<T>& lst)
 {
     if (this == &lst)
     {
-        FatalErrorIn
-        (
-            "List<T>::append(const UList<T>&)"
-        )   << "attempted appending to self" << abort(FatalError);
+        FatalErrorInFunction
+            << "attempted appending to self" << abort(FatalError);
     }
 
     label nextFree = this->size();
diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C
index 51c7805d72..4480234cd0 100644
--- a/src/OpenFOAM/containers/Lists/List/ListIO.C
+++ b/src/OpenFOAM/containers/Lists/List/ListIO.C
@@ -129,7 +129,7 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn("operator>>(Istream&, List<T>&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect first token, expected '(', found "
                 << firstToken.info()
                 << exit(FatalIOError);
@@ -146,7 +146,7 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
     }
     else
     {
-        FatalIOErrorIn("operator>>(Istream&, List<T>&)", is)
+        FatalIOErrorInFunction(is)
             << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
@@ -167,7 +167,7 @@ Foam::List<T> Foam::readList(Istream& is)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn("readList<T>(Istream&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect first token, expected '(', found "
                 << firstToken.info()
                 << exit(FatalIOError);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
index 18c086f6f0..78c9cbbf3e 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::labelList Foam::invert
         {
             if (inverse[newPos] >= 0)
             {
-                FatalErrorIn("invert(const label, const labelUList&)")
+                FatalErrorInFunction
                     << "Map is not one-to-one. At index " << i
                     << " element " << newPos << " has already occurred before"
                     << nl << "Please use invertOneToMany instead"
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index c322c7856f..cbaf373a44 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -226,7 +226,7 @@ label findLower
 (
     const ListType&,
     typename ListType::const_reference,
-    const label stary,
+    const label start,
     const BinaryOp& bop
 );
 
@@ -263,6 +263,15 @@ public:
 };
 
 
+//- Helper class for list to append unique elelements of y onto the end of x
+template<class T>
+class ListUniqueEqOp
+{
+public:
+    void operator()(List<T>& x, const List<T>& y) const;
+};
+
+
 //- Reverse a list. First element becomes last element etc.
 template<class ListType>
 ListType reverseList(const ListType& list);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 29ea650551..1fb871c8e3 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -296,7 +296,7 @@ ListType Foam::subset
     // select must at least cover the list range
     if (select.size() < lst.size())
     {
-        FatalErrorIn("subset(const UList<T>&, const T&, const ListType&)")
+        FatalErrorInFunction
             << "select is of size " << select.size()
             << "; but it must index a list of size " << lst.size()
             << abort(FatalError);
@@ -332,7 +332,7 @@ void Foam::inplaceSubset
     // select must at least cover the list range
     if (select.size() < lst.size())
     {
-        FatalErrorIn("inplaceSubset(const UList<T>&, const T&, ListType&)")
+        FatalErrorInFunction
             << "select is of size " << select.size()
             << "; but it must index a list of size " << lst.size()
             << abort(FatalError);
@@ -742,6 +742,29 @@ void Foam::ListAppendEqOp<T>::operator()(List<T>& x, const List<T>& y) const
 }
 
 
+template<class T>
+void Foam::ListUniqueEqOp<T>::operator()(List<T>& x, const List<T>& y) const
+{
+    if (y.size())
+    {
+        if (x.size())
+        {
+            forAll(y, i)
+            {
+                if (findIndex(x, y[i]) == -1)
+                {
+                    x.append(y[i]);
+                }
+            }
+        }
+        else
+        {
+            x = y;
+        }
+    }
+}
+
+
 template<class ListType>
 ListType Foam::reverseList(const ListType& list)
 {
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 03a5088f7b..a33a3bac16 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -306,11 +306,7 @@ Foam::Istream& Foam::PackedList<nBits>::read(Istream& is)
                 }
                 else
                 {
-                    FatalIOErrorIn
-                    (
-                        "PackedList<nBits>::read(Istream&)",
-                        is
-                    )
+                    FatalIOErrorInFunction(is)
                         << "incorrect list token, expected '(' or '{', found "
                         << firstTok.info()
                         << exit(FatalIOError);
@@ -380,11 +376,7 @@ Foam::Istream& Foam::PackedList<nBits>::read(Istream& is)
         }
         else
         {
-            FatalIOErrorIn
-            (
-                "PackedList<nBits>::read(Istream&)",
-                is
-            )
+            FatalIOErrorInFunction(is)
                 << "incorrect first token, expected '(', found "
                 << firstTok.info()
                 << exit(FatalIOError);
@@ -392,11 +384,7 @@ Foam::Istream& Foam::PackedList<nBits>::read(Istream& is)
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "PackedList<nBits>::read(Istream&)",
-            is
-        )
+        FatalIOErrorInFunction(is)
             << "incorrect first token, expected <int>, '(' or '{', found "
             << firstTok.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 303b3125be..01f21e37ad 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,11 +107,7 @@ inline unsigned int Foam::PackedList<nBits>::readValue(Istream& is)
 
     if (val > max_value())
     {
-        FatalIOErrorIn
-        (
-            "PackedList<nBits>::readValue(Istream&)",
-            is
-        )
+        FatalIOErrorInFunction(is)
             << "Out-of-range value " << val << " for PackedList<" << nBits
             << ">. Maximum permitted value is " << max_value() << "."
             << exit(FatalIOError);
@@ -133,11 +129,7 @@ inline void Foam::PackedList<nBits>::setPair(Istream& is)
 
     if (val > max_value())
     {
-        FatalIOErrorIn
-        (
-            "PackedList<nBits>::setPair(Istream&)",
-            is
-        )
+        FatalIOErrorInFunction(is)
             << "Out-of-range value " << val << " for PackedList<" << nBits
             << "> at index " << ind
             << ". Maximum permitted value is " << max_value() << "."
@@ -1053,10 +1045,8 @@ inline unsigned int Foam::PackedList<nBits>::remove()
 {
     if (!size_)
     {
-        FatalErrorIn
-        (
-            "Foam::PackedList<nBits>::remove()"
-        )   << "List is empty" << abort(FatalError);
+        FatalErrorInFunction
+            << "List is empty" << abort(FatalError);
     }
 
     label elemI = size_ - 1;
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index ab4eb844a4..db29382769 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -143,7 +143,7 @@ void Foam::PtrList<T>::setSize(const label newSize)
 {
     if (newSize < 0)
     {
-        FatalErrorIn("PtrList<T>::setSize(const label)")
+        FatalErrorInFunction
             << "bad set size " << newSize
             << " for type " << typeid(T).name()
             << abort(FatalError);
@@ -209,7 +209,7 @@ void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
 {
     if (oldToNew.size() != size())
     {
-        FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
+        FatalErrorInFunction
             << "Size of map (" << oldToNew.size()
             << ") not equal to list size (" << size()
             << ") for type " << typeid(T).name()
@@ -224,7 +224,7 @@ void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
 
         if (newI < 0 || newI >= size())
         {
-            FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
+            FatalErrorInFunction
                 << "Illegal index " << newI << nl
                 << "Valid indices are 0.." << size()-1
                 << " for type " << typeid(T).name()
@@ -233,7 +233,7 @@ void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
 
         if (newPtrs_[newI])
         {
-            FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
+            FatalErrorInFunction
                 << "reorder map is not unique; element " << newI
                 << " already set for type " << typeid(T).name()
                 << abort(FatalError);
@@ -245,7 +245,7 @@ void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
     {
         if (!newPtrs_[i])
         {
-            FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
+            FatalErrorInFunction
                 << "Element " << i << " not set after reordering with type "
                 << typeid(T).name() << nl << abort(FatalError);
         }
@@ -262,7 +262,7 @@ Foam::PtrList<T>& Foam::PtrList<T>::operator=(const PtrList<T>& a)
 {
     if (this == &a)
     {
-        FatalErrorIn("PtrList<T>::operator=(const PtrList<T>&)")
+        FatalErrorInFunction
             << "attempted assignment to self for type " << typeid(T).name()
             << abort(FatalError);
     }
@@ -285,7 +285,7 @@ Foam::PtrList<T>& Foam::PtrList<T>::operator=(const PtrList<T>& a)
     }
     else
     {
-        FatalErrorIn("PtrList::operator=(const PtrList<T>&)")
+        FatalErrorInFunction
             << "bad size: " << a.size()
             << " for type " << typeid(T).name()
             << abort(FatalError);
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index a2970eb361..c9065e8c46 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
@@ -155,7 +155,7 @@ inline const T& Foam::PtrList<T>::operator[](const label i) const
 {
     if (!ptrs_[i])
     {
-        FatalErrorIn("PtrList::operator[] const")
+        FatalErrorInFunction
             << "hanging pointer of type " << typeid(T).name()
             << " at index " << i
             << " (size " << size()
@@ -172,7 +172,7 @@ inline T& Foam::PtrList<T>::operator[](const label i)
 {
     if (!ptrs_[i])
     {
-        FatalErrorIn("PtrList::operator[]")
+        FatalErrorInFunction
             << "hanging pointer of type " << typeid(T).name()
             << " at index " << i
             << " (size " << size()
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
index b3728e56ef..81741ed1c6 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
@@ -95,9 +95,8 @@ void Foam::PtrList<T>::read(Istream& is, const INew& inewt)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "PtrList<T>::read(Istream&, const INew&)",
                 is
             )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
@@ -118,9 +117,8 @@ void Foam::PtrList<T>::read(Istream& is, const INew& inewt)
 
             if (is.eof())
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "PtrList<T>::read(Istream&, const INew&)",
                     is
                 )   << "Premature EOF after reading " << lastToken.info()
                     << exit(FatalIOError);
@@ -145,9 +143,8 @@ void Foam::PtrList<T>::read(Istream& is, const INew& inewt)
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "PtrList<T>::read(Istream&, const INew&)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
index 62276afd42..c26efd9ac7 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ inline void Foam::UIndirectList<T>::operator=(const UList<T>& ae)
 {
     if (addressing_.size() != ae.size())
     {
-        FatalErrorIn("UIndirectList<T>::operator=(const UList<T>&)")
+        FatalErrorInFunction
             << "Addressing and list of addressed elements "
                "have different sizes: "
             << addressing_.size() << " " << ae.size()
@@ -149,7 +149,7 @@ inline void Foam::UIndirectList<T>::operator=(const UIndirectList<T>& ae)
 {
     if (addressing_.size() != ae.size())
     {
-        FatalErrorIn("UIndirectList<T>::operator=(const UIndirectList<T>&)")
+        FatalErrorInFunction
             << "Addressing and list of addressed elements "
                "have different sizes: "
             << addressing_.size() << " " << ae.size()
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index c22f774f9f..2bbe09038a 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.C
@@ -38,7 +38,7 @@ void Foam::UList<T>::assign(const UList<T>& a)
 {
     if (a.size_ != this->size_)
     {
-        FatalErrorIn("UList<T>::assign(const UList<T>&)")
+        FatalErrorInFunction
             << "ULists have different sizes: "
             << this->size_ << " " << a.size_
             << abort(FatalError);
@@ -93,7 +93,7 @@ std::streamsize Foam::UList<T>::byteSize() const
 {
     if (!contiguous<T>())
     {
-        FatalErrorIn("UList<T>::byteSize()")
+        FatalErrorInFunction
             << "Cannot return the binary size of a list of "
                "non-primitive elements"
             << abort(FatalError);
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 0fe01c9015..1bb858d796 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -395,49 +395,40 @@ inline void reverse(UList<T>&);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-/**
- * \def forAll(list, i)
- * Loop across all elements in \a list
- * \par Usage
- * \code
- * forAll(anyList, i)
- * {
- *      statements;
- * }
- * \endcode
- * \sa forAllReverse
-*/
-/**
- * \def forAllReverse(list, i)
- * Reverse loop across all elements in \a list
- * \par Usage
- * \code
- * forAllReverse(anyList, i)
- * {
- *      statements;
- * }
- * \endcode
- * \sa forAll
-*/
+//- Loop across all elements in \a list
+// \par Usage
+// \code
+// forAll(anyList, i)
+// {
+//      statements;
+// }
+// \endcode
+// \sa forAllReverse
 #define forAll(list, i) \
     for (Foam::label i=0; i<(list).size(); i++)
 
+//- Reverse loop across all elements in \a list
+//  \par Usage
+//  \code
+//  forAllReverse(anyList, i)
+//  {
+//       statements;
+//  }
+//  \endcode
+//  \sa forAll
 #define forAllReverse(list, i) \
     for (Foam::label i=(list).size()-1; i>=0; i--)
 
-/**
- * \def forAllIter(Container, container, iter)
- * Iterate across all elements in the \a container object of type
- * \a Container.
- * \par Usage
- * \code
- * forAll(ContainerType, container, iter)
- * {
- *     statements;
- * }
- * \endcode
- * \sa forAllConstIter
-*/
+//- Iterate across all elements in the \a container object of type
+//  \a Container.
+//  \par Usage
+//  \code
+//  forAll(ContainerType, container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllConstIter
 #define forAllIter(Container,container,iter)                                   \
     for                                                                        \
     (                                                                          \
@@ -446,19 +437,16 @@ inline void reverse(UList<T>&);
         ++iter                                                                 \
     )
 
-/**
- * \def forAllConstIter(Container, container, iter)
- * Iterate across all elements in the \a container object of type
- * \a Container with const access.
- * \par Usage
- * \code
- * forAllConstIter(ContainerType, container, iter)
- * {
- *     statements;
- * }
- * \endcode
- * \sa forAllIter
-*/
+//- Iterate across all elements in the \a container object of type
+//  \a Container with const access.
+//  \par Usage
+//  \code
+//  forAllConstIter(ContainerType, container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllIter
 #define forAllConstIter(Container,container,iter)                              \
     for                                                                        \
     (                                                                          \
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index 815c9aafcd..5985d4526c 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,7 +74,7 @@ inline void Foam::UList<T>::checkStart(const label start) const
 {
     if (start<0 || (start && start>=size_))
     {
-        FatalErrorIn("UList<T>::checkStart(const label)")
+        FatalErrorInFunction
             << "start " << start << " out of range 0 ... " << max(size_-1, 0)
             << abort(FatalError);
     }
@@ -87,7 +87,7 @@ inline void Foam::UList<T>::checkSize(const label size) const
 {
     if (size<0 || size>size_)
     {
-        FatalErrorIn("UList<T>::checkSize(const label)")
+        FatalErrorInFunction
             << "size " << size << " out of range 0 ... " << size_
             << abort(FatalError);
     }
@@ -100,13 +100,13 @@ inline void Foam::UList<T>::checkIndex(const label i) const
 {
     if (!size_)
     {
-        FatalErrorIn("UList<T>::checkIndex(const label)")
-            << "attempt to access element from zero sized list"
+        FatalErrorInFunction
+            << "attempt to access element " << i << " from zero sized list"
             << abort(FatalError);
     }
     else if (i<0 || i>=size_)
     {
-        FatalErrorIn("UList<T>::checkIndex(const label)")
+        FatalErrorInFunction
             << "index " << i << " out of range 0 ... " << size_-1
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C
index 92ac734cd1..bb888a7fd2 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListIO.C
+++ b/src/OpenFOAM/containers/Lists/UList/UListIO.C
@@ -162,7 +162,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
 
         if (s != L.size())
         {
-            FatalIOErrorIn("operator>>(Istream&, UList<T>&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect length for UList. Read " << s
                 << " expected " << L.size()
                 << exit(FatalIOError);
@@ -179,7 +179,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
         // Set list length to that read
         if (s != L.size())
         {
-            FatalIOErrorIn("operator>>(Istream&, UList<T>&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect length for UList. Read " << s
                 << " expected " << L.size()
                 << exit(FatalIOError);
@@ -244,7 +244,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn("operator>>(Istream&, UList<T>&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect first token, expected '(', found "
                 << firstToken.info()
                 << exit(FatalIOError);
@@ -258,7 +258,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
 
         if (sll.size() != L.size())
         {
-            FatalIOErrorIn("operator>>(Istream&, UList<T>&)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect length for UList. Read " << sll.size()
                 << " expected " << L.size()
                 << exit(FatalIOError);
@@ -279,7 +279,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
     }
     else
     {
-        FatalIOErrorIn("operator>>(Istream&, UList<T>&)", is)
+        FatalIOErrorInFunction(is)
             << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index cc54117f8b..7eff18957b 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,30 @@ Foam::UPtrList<T>::UPtrList(const label s)
 {}
 
 
+template<class T>
+Foam::UPtrList<T>::UPtrList(UList<T>& lst)
+:
+    ptrs_(lst.size())
+{
+    forAll(lst, i)
+    {
+        ptrs_[i] = &lst[i];
+    }
+}
+
+
+template<class T>
+Foam::UPtrList<T>::UPtrList(PtrList<T>& lst)
+:
+    ptrs_(lst.size())
+{
+    forAll(lst, i)
+    {
+        ptrs_[i] = &lst[i];
+    }
+}
+
+
 template<class T>
 Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T> >& lst)
 {
@@ -104,7 +128,7 @@ void Foam::UPtrList<T>::reorder(const labelUList& oldToNew)
 {
     if (oldToNew.size() != size())
     {
-        FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
+        FatalErrorInFunction
             << "Size of map (" << oldToNew.size()
             << ") not equal to list size (" << size()
             << ")." << abort(FatalError);
@@ -118,7 +142,7 @@ void Foam::UPtrList<T>::reorder(const labelUList& oldToNew)
 
         if (newI < 0 || newI >= size())
         {
-            FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
+            FatalErrorInFunction
                 << "Illegal index " << newI << nl
                 << "Valid indices are 0.." << size()-1
                 << abort(FatalError);
@@ -126,7 +150,7 @@ void Foam::UPtrList<T>::reorder(const labelUList& oldToNew)
 
         if (newPtrs_[newI])
         {
-            FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
+            FatalErrorInFunction
                 << "reorder map is not unique; element " << newI
                 << " already set." << abort(FatalError);
         }
@@ -137,7 +161,7 @@ void Foam::UPtrList<T>::reorder(const labelUList& oldToNew)
     {
         if (!newPtrs_[i])
         {
-            FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
+            FatalErrorInFunction
                 << "Element " << i << " not set after reordering." << nl
                 << abort(FatalError);
         }
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index cdf32f630a..4df5a82627 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,6 +42,7 @@ SourceFiles
 #define UPtrList_H
 
 #include "List.H"
+#include "PtrList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -109,6 +110,12 @@ public:
         //- Construct with size specified.
         explicit UPtrList(const label);
 
+        //- Construct from UList
+        explicit UPtrList(UList<T>&);
+
+        //- Construct from PtrList
+        explicit UPtrList(PtrList<T>&);
+
         //- Construct by transferring the parameter contents
         UPtrList(const Xfer<UPtrList<T> >&);
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
index 38bb430931..2f69d16929 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ inline const T& Foam::UPtrList<T>::operator[](const label i) const
 {
     if (!ptrs_[i])
     {
-        FatalErrorIn("UPtrList::operator[] const")
+        FatalErrorInFunction
             << "hanging pointer at index " << i
             << " (size " << size()
             << "), cannot dereference"
@@ -122,7 +122,7 @@ inline T& Foam::UPtrList<T>::operator[](const label i)
 {
     if (!ptrs_[i])
     {
-        FatalErrorIn("UPtrList::operator[]")
+        FatalErrorInFunction
             << "hanging pointer at index " << i
             << " (size " << size()
             << "), cannot dereference"
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
index 825ef0d6c8..ba5bd4999d 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::NamedEnum<Enum, nEnum>::NamedEnum()
                 goodNames[i] = names[i];
             }
 
-            FatalErrorIn("NamedEnum<Enum, nEnum>::NamedEnum()")
+            FatalErrorInFunction
                 << "Illegal enumeration name at position " << enumI << endl
                 << "after entries " << goodNames << ".\n"
                 << "Possibly your NamedEnum<Enum, nEnum>::names array"
@@ -66,10 +66,8 @@ Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
 
     if (iter == HashTable<int>::end())
     {
-        FatalIOErrorIn
-        (
-            "NamedEnum<Enum, nEnum>::read(Istream&) const", is
-        )   << name << " is not in enumeration: "
+        FatalIOErrorInFunction(is)
+            << name << " is not in enumeration: "
             << sortedToc() << exit(FatalIOError);
     }
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 090aea0a01..80a33b94b0 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,16 +52,8 @@ bool Foam::IOobject::fileNameComponents
     // called with directory
     if (isDir(path))
     {
-        WarningIn
-        (
-            "IOobject::fileNameComponents"
-            "("
-                "const fileName&, "
-                "fileName&, "
-                "fileName&, "
-                "word&"
-            ")"
-        )   << " called with directory: " << path << endl;
+        WarningInFunction
+            << " called with directory: " << path << endl;
 
         return false;
     }
@@ -105,16 +97,7 @@ bool Foam::IOobject::fileNameComponents
     // Check for valid (and stripped) name, regardless of the debug level
     if (name.empty() || string::stripInvalid<word>(name))
     {
-        WarningIn
-        (
-            "IOobject::fileNameComponents"
-            "("
-                "const fileName&, "
-                "fileName&, "
-                "fileName&, "
-                "word&"
-            ")"
-        )
+        WarningInFunction
             << "has invalid word for name: \"" << name
             << "\"\nwhile processing path: " << path << endl;
 
@@ -210,17 +193,7 @@ Foam::IOobject::IOobject
 {
     if (!fileNameComponents(path, instance_, local_, name_))
     {
-        FatalErrorIn
-        (
-            "IOobject::IOobject"
-            "("
-                "const fileName&, "
-                "const objectRegistry&, "
-                "readOption, "
-                "writeOption, "
-                "bool"
-            ")"
-        )
+        FatalErrorInFunction
             << " invalid path specification"
             << exit(FatalError);
     }
@@ -234,6 +207,25 @@ Foam::IOobject::IOobject
 }
 
 
+Foam::IOobject::IOobject
+(
+    const IOobject& io,
+    const word& name
+)
+:
+    name_(name),
+    headerClassName_(io.headerClassName_),
+    note_(io.note_),
+    instance_(io.instance_),
+    local_(io.local_),
+    db_(io.db_),
+    rOpt_(io.rOpt_),
+    wOpt_(io.wOpt_),
+    registerObject_(io.registerObject_),
+    objState_(io.objState_)
+{}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 Foam::IOobject::~IOobject()
@@ -447,7 +439,7 @@ bool Foam::IOobject::headerOk()
         {
             if (objectRegistry::debug)
             {
-                IOWarningIn("IOobject::headerOk()", (*isPtr))
+                IOWarningInFunction((*isPtr))
                     << "failed to read header of file " << objectPath()
                     << endl;
             }
@@ -466,7 +458,7 @@ void Foam::IOobject::setBad(const string& s)
 {
     if (objState_ != GOOD)
     {
-        FatalErrorIn("IOobject::setBad(const string&)")
+        FatalErrorInFunction
             << "recurrent failure for object " << s
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index da8f443447..15f4465e9f 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -236,6 +236,13 @@ public:
             bool registerObject=true
         );
 
+        //- Construct as copy resetting name
+        IOobject
+        (
+            const IOobject& io,
+            const word& name
+        );
+
         //- Clone
         Foam::autoPtr<IOobject> clone() const
         {
diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H
index ed831092aa..be0a0760a2 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectI.H
+++ b/src/OpenFOAM/db/IOobject/IOobjectI.H
@@ -84,7 +84,7 @@ inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint)
         "|  \\\\    /   O peration     |"
         " Version:  " << FOAMversion << spaces << "|\n"
         "|   \\\\  /    A nd           |"
-        " Web:      www.OpenFOAM.org                      |\n"
+        " Web:      www.OpenFOAM.com                      |\n"
         "|    \\\\/     M anipulation  |"
         "                                                 |\n"
         "\\*-----------------------------------------"
diff --git a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
index 41f0ff9916..98b5e3e3ee 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ bool Foam::IOobject::readHeader(Istream& is)
     {
         if (rOpt_ == MUST_READ || rOpt_ == MUST_READ_IF_MODIFIED)
         {
-            FatalIOErrorIn("IOobject::readHeader(Istream&)", is)
+            FatalIOErrorInFunction(is)
                 << " stream not open for reading essential object from file "
                 << is.name()
                 << exit(FatalIOError);
@@ -49,7 +49,7 @@ bool Foam::IOobject::readHeader(Istream& is)
 
         if (IOobject::debug)
         {
-            SeriousIOErrorIn("IOobject::readHeader(Istream&)", is)
+            SeriousIOErrorInFunction(is)
                 << " stream not open for reading from file "
                 << is.name() << endl;
         }
@@ -75,7 +75,7 @@ bool Foam::IOobject::readHeader(Istream& is)
         const word headerObject(headerDict.lookup("object"));
         if (IOobject::debug && headerObject != name())
         {
-            IOWarningIn("IOobject::readHeader(Istream&)", is)
+            IOWarningInFunction(is)
                 << " object renamed from "
                 << name() << " to " << headerObject
                 << " for file " << is.name() << endl;
@@ -86,7 +86,7 @@ bool Foam::IOobject::readHeader(Istream& is)
     }
     else
     {
-        IOWarningIn("IOobject::readHeader(Istream&)", is)
+        IOWarningInFunction(is)
             << "First token could not be read or is not the keyword 'FoamFile'"
             << nl << nl << "Check header is of the form:" << nl << endl;
 
@@ -104,7 +104,7 @@ bool Foam::IOobject::readHeader(Istream& is)
     {
         if (rOpt_ == MUST_READ || rOpt_ == MUST_READ_IF_MODIFIED)
         {
-            FatalIOErrorIn("IOobject::readHeader(Istream&)", is)
+            FatalIOErrorInFunction(is)
                 << " stream failure while reading header"
                 << " on line " << is.lineNumber()
                 << " of file " << is.name()
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
index ca6c9fe8d2..9cdaf8de88 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,9 +45,8 @@ void Foam::CompactIOField<T, BaseType>::readFromStream()
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "CompactIOField<T, BaseType>::readFromStream()",
             is
         )   << "unexpected class name " << headerClassName()
             << " expected " << typeName << " or " << IOField<T>::typeName
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index a7ada172d4..6feb58cbc5 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,11 +45,8 @@ void Foam::CompactIOList<T, BaseType>::readFromStream()
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "CompactIOList<T, BaseType>::readFromStream()",
-            is
-        )   << "unexpected class name " << headerClassName()
+        FatalIOErrorInFunction(is)
+            << "unexpected class name " << headerClassName()
             << " expected " << typeName << " or " << IOList<T>::typeName
             << endl
             << "    while reading object " << name()
@@ -58,6 +55,23 @@ void Foam::CompactIOList<T, BaseType>::readFromStream()
 }
 
 
+template<class T, class BaseType>
+bool Foam::CompactIOList<T, BaseType>::overflows() const
+{
+    label size = 0;
+    forAll(*this, i)
+    {
+        label oldSize = size;
+        size += this->operator[](i).size();
+        if (size < oldSize)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
 template<class T, class BaseType>
@@ -178,6 +192,25 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
 
         return good;
     }
+    else if (overflows())
+    {
+        WarningInFunction
+            << "Overall number of elements of CompactIOList of size "
+            << this->size() << " overflows the representation of a label"
+            << endl << "    Switching to ascii writing" << endl;
+
+        // Change type to be non-compact format type
+        const word oldTypeName = typeName;
+
+        const_cast<word&>(typeName) = IOList<T>::typeName;
+
+        bool good = regIOobject::writeObject(IOstream::ASCII, ver, cmp);
+
+        // Change type back
+        const_cast<word&>(typeName) = oldTypeName;
+
+        return good;
+    }
     else
     {
         return regIOobject::writeObject(fmt, ver, cmp);
@@ -264,7 +297,18 @@ Foam::Ostream& Foam::operator<<
         start[0] = 0;
         for (label i = 1; i < start.size(); i++)
         {
-            start[i] = start[i-1]+L[i-1].size();
+            label prev = start[i-1];
+            start[i] = prev+L[i-1].size();
+
+            if (start[i] < prev)
+            {
+                FatalIOErrorInFunction(os)
+                    << "Overall number of elements " << start[i]
+                    << " of CompactIOList of size "
+                    << L.size() << " overflows the representation of a label"
+                    << endl << "Please recompile with a larger representation"
+                    << " for label" << exit(FatalIOError);
+            }
         }
 
         List<BaseType> elems(start[start.size()-1]);
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index dc06092c59..fafcdef52f 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -79,6 +79,9 @@ class CompactIOList
         //- Read according to header type
         void readFromStream();
 
+        //- Has too many elements in it?
+        bool overflows() const;
+
 public:
 
     //- Runtime type information
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 34b4d9bdca..9d47700da8 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::IOField<Type>::IOField(const IOobject& io)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOField::IOField(const IOobject&)")
+        WarningInFunction
             << "IOField " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOField does not support automatic rereading."
@@ -65,7 +65,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const label size)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOField::IOField(const IOobject&, const label)")
+        WarningInFunction
             << "IOField " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOField does not support automatic rereading."
@@ -99,7 +99,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOField::IOField(const IOobject&, const Field<Type>&)")
+        WarningInFunction
             << "IOField " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOField does not support automatic rereading."
@@ -133,10 +133,8 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type> >& f)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn
-        (
-            "IOField::IOField(const IOobject&, const Xfer<Field<Type> >&)"
-        )   << "IOField " << name()
+        WarningInFunction
+            << "IOField " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOField does not support automatic rereading."
             << endl;
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 23760268ef..1bd99eff9a 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::IOList<T>::IOList(const IOobject& io)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOList::IOList(const IOobject&)")
+        WarningInFunction
             << "IOList " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOList does not support automatic rereading."
@@ -64,7 +64,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const label size)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOList::IOList(const IOobject&, const label)")
+        WarningInFunction
             << "IOList " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOList does not support automatic rereading."
@@ -97,7 +97,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOList::IOList(const IOobject&, const List<T>&)")
+        WarningInFunction
             << "IOList " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOList does not support automatic rereading."
@@ -131,10 +131,8 @@ Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T> >& list)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn
-        (
-            "IOList::IOList(const IOobject&, const Xfer<List<T> >&)"
-        )   << "IOList " << name()
+        WarningInFunction
+            << "IOList " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOList does not support automatic rereading."
             << endl;
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index 651684f437..a002e62b2b 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const label s)
 {
     if (io.readOpt() != IOobject::NO_READ)
     {
-        FatalErrorIn("IOPtrList<T>::IOPtrList(const IOobject&, const label)")
+        FatalErrorInFunction
             << "NO_READ must be set if specifying size" << nl
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index 75dbaa8dd4..d14ffb8e0f 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io)
     // Temporary warning
     if (debug && io.readOpt() == IOobject::MUST_READ)
     {
-        WarningIn("IOdictionary::IOdictionary(const IOobject&)")
+        WarningInFunction
             << "Dictionary " << name()
             << " constructed with IOobject::MUST_READ"
             " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
@@ -105,10 +105,8 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
     // Temporary warning
     if (debug && io.readOpt() == IOobject::MUST_READ)
     {
-        WarningIn
-        (
-            "IOdictionary::IOdictionary(const IOobject& const dictionary&)"
-        )   << "Dictionary " << name()
+        WarningInFunction
+            << "Dictionary " << name()
             << " constructed with IOobject::MUST_READ"
             " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
             << "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index 3c62255d97..cb78b01289 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ std::istream& Foam::IFstream::stdStream()
 {
     if (!ifPtr_)
     {
-        FatalErrorIn("IFstream::stdStream()")
+        FatalErrorInFunction
             << "No stream allocated" << abort(FatalError);
     }
     return *ifPtr_;
@@ -149,7 +149,7 @@ const std::istream& Foam::IFstream::stdStream() const
 {
     if (!ifPtr_)
     {
-        FatalErrorIn("IFstream::stdStream() const")
+        FatalErrorInFunction
             << "No stream allocated" << abort(FatalError);
     }
     return *ifPtr_;
@@ -178,7 +178,7 @@ Foam::IFstream& Foam::IFstream::operator()() const
         }
         else
         {
-            FatalIOErrorIn("IFstream::operator()", *this)
+            FatalIOErrorInFunction(*this)
                 << "file " << pathname_ << " does not exist"
                 << exit(FatalIOError);
         }
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index 1a09b7f473..5e9734d915 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ std::ostream& Foam::OFstream::stdStream()
 {
     if (!ofPtr_)
     {
-        FatalErrorIn("OFstream::stdStream()")
+        FatalErrorInFunction
             << "No stream allocated." << abort(FatalError);
     }
     return *ofPtr_;
@@ -145,7 +145,7 @@ const std::ostream& Foam::OFstream::stdStream() const
 {
     if (!ofPtr_)
     {
-        FatalErrorIn("OFstreamAllocator::stdStream() const")
+        FatalErrorInFunction
             << "No stream allocated." << abort(FatalError);
     }
     return *ofPtr_;
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
index 5b8dd83c35..5f80c3a4a3 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
@@ -48,7 +48,7 @@ Foam::IOstream::formatEnum(const word& format)
     }
     else
     {
-        WarningIn("IOstream::formatEnum(const word&)")
+        WarningInFunction
             << "bad format specifier '" << format << "', using 'ascii'"
             << endl;
 
@@ -77,7 +77,7 @@ Foam::IOstream::compressionEnum(const word& compression)
     }
     else
     {
-        WarningIn("IOstream::compressionEnum(const word&)")
+        WarningInFunction
             << "bad compression specifier '" << compression
             << "', using 'uncompressed'"
             << endl;
@@ -93,10 +93,8 @@ bool Foam::IOstream::check(const char* operation) const
 {
     if (bad())
     {
-        FatalIOErrorIn
-        (
-            "IOstream::check(const char*) const", *this
-        )   << "error in IOstream " << name() << " for operation " << operation
+        FatalIOErrorInFunction(*this)
+            << "error in IOstream " << name() << " for operation " << operation
             << exit(FatalIOError);
     }
 
@@ -108,10 +106,8 @@ void Foam::IOstream::fatalCheck(const char* operation) const
 {
     if (bad())
     {
-        FatalIOErrorIn
-        (
-            "IOstream::fatalCheck(const char*) const", *this
-        )   << "error in IOstream " << name() << " for operation " << operation
+        FatalIOErrorInFunction(*this)
+            << "error in IOstream " << name() << " for operation " << operation
             << exit(FatalIOError);
     }
 }
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C
index 070bf9e07b..06dcc9200e 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,13 +31,13 @@ void Foam::Istream::putBack(const token& t)
 {
     if (bad())
     {
-        FatalIOErrorIn("void Istream::putBack(const token&)", *this)
+        FatalIOErrorInFunction(*this)
             << "Attempt to put back onto bad stream"
             << exit(FatalIOError);
     }
     else if (putBack_)
     {
-        FatalIOErrorIn("void Istream::putBack(const token&)", *this)
+        FatalIOErrorInFunction(*this)
             << "Attempt to put back another token"
             << exit(FatalIOError);
     }
@@ -53,7 +53,7 @@ bool Foam::Istream::getBack(token& t)
 {
     if (bad())
     {
-        FatalIOErrorIn("void Istream::getBack(token&)", *this)
+        FatalIOErrorInFunction(*this)
             << "Attempt to get back from bad stream"
             << exit(FatalIOError);
     }
@@ -91,7 +91,7 @@ Foam::Istream& Foam::Istream::readBegin(const char* funcName)
     if (delimiter != token::BEGIN_LIST)
     {
         setBad();
-        FatalIOErrorIn("Istream::readBegin(const char*)", *this)
+        FatalIOErrorInFunction(*this)
             << "Expected a '" << token::BEGIN_LIST
             << "' while reading " << funcName
             << ", found " << delimiter.info()
@@ -108,7 +108,7 @@ Foam::Istream& Foam::Istream::readEnd(const char* funcName)
     if (delimiter != token::END_LIST)
     {
         setBad();
-        FatalIOErrorIn("Istream::readEnd(const char*)", *this)
+        FatalIOErrorInFunction(*this)
             << "Expected a '" << token::END_LIST
             << "' while reading " << funcName
             << ", found " << delimiter.info()
@@ -135,7 +135,7 @@ char Foam::Istream::readBeginList(const char* funcName)
     if (delimiter != token::BEGIN_LIST && delimiter != token::BEGIN_BLOCK)
     {
         setBad();
-        FatalIOErrorIn("Istream::readBeginList(const char*)", *this)
+        FatalIOErrorInFunction(*this)
             << "Expected a '" << token::BEGIN_LIST
             << "' or a '" << token::BEGIN_BLOCK
             << "' while reading " << funcName
@@ -156,7 +156,7 @@ char Foam::Istream::readEndList(const char* funcName)
     if (delimiter != token::END_LIST && delimiter != token::END_BLOCK)
     {
         setBad();
-        FatalIOErrorIn("Istream::readEndList(const char*)", *this)
+        FatalIOErrorInFunction(*this)
             << "Expected a '" << token::END_LIST
             << "' or a '" << token::END_BLOCK
             << "' while reading " << funcName
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
index dfb60891d6..f6ab958e7c 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::PstreamBuffers::~PstreamBuffers()
     {
         if (recvBufPos_[procI] < recvBuf_[procI].size())
         {
-            FatalErrorIn("PstreamBuffers::~PstreamBuffers()")
+            FatalErrorInFunction
                 << "Message from processor " << procI
                 << " not fully consumed. messageSize:" << recvBuf_[procI].size()
                 << " bytes of which only " << recvBufPos_[procI]
@@ -117,10 +117,8 @@ void Foam::PstreamBuffers::finishedSends(labelListList& sizes, const bool block)
     }
     else
     {
-        FatalErrorIn
-        (
-            "PstreamBuffers::finishedSends(labelListList&, const bool)"
-        )   << "Obtaining sizes not supported in "
+        FatalErrorInFunction
+            << "Obtaining sizes not supported in "
             << UPstream::commsTypeNames[commsType_] << endl
             << " since transfers already in progress. Use non-blocking instead."
             << exit(FatalError);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index 833b160bf6..3ed4ee0b0a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,10 +145,7 @@ void reduce
     label& request
 )
 {
-    notImplemented
-    (
-        "reduce(T&, const BinaryOp&, const int, const label, label&"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
index cd3fc4610f..5707d2d5c9 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
@@ -317,7 +317,7 @@ Foam::Istream& Foam::UIPstream::read(char* data, std::streamsize count)
 {
     if (format() != BINARY)
     {
-        FatalErrorIn("UIPstream::read(char*, std::streamsize)")
+        FatalErrorInFunction
             << "stream format not binary"
             << Foam::abort(FatalError);
     }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
index 203c45f5db..0671d69eca 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
@@ -144,7 +144,7 @@ Foam::UOPstream::~UOPstream()
             )
         )
         {
-            FatalErrorIn("UOPstream::~UOPstream()")
+            FatalErrorInFunction
                 << "Failed sending outgoing message of size " << sendBuf_.size()
                 << " to processor " << toProcNo_
                 << Foam::abort(FatalError);
@@ -170,7 +170,7 @@ Foam::Ostream& Foam::UOPstream::write(const token& t)
     }
     else
     {
-        notImplemented("Ostream& UOPstream::write(const token&)");
+        NotImplemented;
         setBad();
     }
     return *this;
@@ -290,7 +290,7 @@ Foam::Ostream& Foam::UOPstream::write(const char* data, std::streamsize count)
 {
     if (format() != BINARY)
     {
-        FatalErrorIn("Ostream::write(const char*, std::streamsize)")
+        FatalErrorInFunction
             << "stream format not binary"
             << Foam::abort(FatalError);
     }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index a721eb2a05..87b21b43b3 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,22 +57,41 @@ const Foam::NamedEnum<Foam::UPstream::commsTypes, 3>
 
 void Foam::UPstream::setParRun(const label nProcs)
 {
-    parRun_ = true;
-
-    // Redo worldComm communicator (this has been created at static
-    // initialisation time)
-    freeCommunicator(UPstream::worldComm);
-    label comm = allocateCommunicator(-1, identity(nProcs), true);
-    if (comm != UPstream::worldComm)
+    if (nProcs == 0)
     {
-        FatalErrorIn("UPstream::setParRun(const label)")
-            << "problem : comm:" << comm
-            << "  UPstream::worldComm:" << UPstream::worldComm
-            << Foam::exit(FatalError);
-    }
+        parRun_ = false;
+        freeCommunicator(UPstream::worldComm);
+        label comm = allocateCommunicator(-1, labelList(1, label(0)), false);
+        if (comm != UPstream::worldComm)
+        {
+            FatalErrorInFunction
+                << "problem : comm:" << comm
+                << "  UPstream::worldComm:" << UPstream::worldComm
+                << Foam::exit(FatalError);
+        }
 
-    Pout.prefix() = '[' +  name(myProcNo(Pstream::worldComm)) + "] ";
-    Perr.prefix() = '[' +  name(myProcNo(Pstream::worldComm)) + "] ";
+        Pout.prefix() = "";
+        Perr.prefix() = "";
+    }
+    else
+    {
+        parRun_ = true;
+
+        // Redo worldComm communicator (this has been created at static
+        // initialisation time)
+        freeCommunicator(UPstream::worldComm);
+        label comm = allocateCommunicator(-1, identity(nProcs), true);
+        if (comm != UPstream::worldComm)
+        {
+            FatalErrorInFunction
+                << "problem : comm:" << comm
+                << "  UPstream::worldComm:" << UPstream::worldComm
+                << Foam::exit(FatalError);
+        }
+
+        Pout.prefix() = '[' +  name(myProcNo(Pstream::worldComm)) + "] ";
+        Perr.prefix() = '[' +  name(myProcNo(Pstream::worldComm)) + "] ";
+    }
 }
 
 
@@ -269,11 +288,8 @@ Foam::label Foam::UPstream::allocateCommunicator
         // Enforce incremental order (so index is rank in next communicator)
         if (i >= 1 && subRanks[i] <= subRanks[i-1])
         {
-            FatalErrorIn
-            (
-                "UPstream::allocateCommunicator"
-                "(const label, const labelList&, const bool)"
-            )   << "subranks not sorted : " << subRanks
+            FatalErrorInFunction
+                << "subranks not sorted : " << subRanks
                 << " when allocating subcommunicator from parent "
                 << parentIndex
                 << Foam::abort(FatalError);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 09706b704d..a2a5648393 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -197,9 +197,6 @@ private:
 
     // Private Member Functions
 
-        //- Set data for parallel running
-        static void setParRun(const label nProcs);
-
         //- Calculate linear communication schedule
         static List<commsStruct> calcLinearComm(const label nProcs);
 
@@ -383,6 +380,10 @@ public:
             return parRun_;
         }
 
+        //- Set data for parallel running. Special case nProcs=0 to switch off
+        //  parallel running
+        static void setParRun(const label nProcs);
+
         //- Number of processes in parallel run
         static label nProcs(const label communicator = 0)
         {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
index b2686ef947..e5412a4ae7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamCommsStruct.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ Foam::UPstream::commsStruct::commsStruct
     }
     if (notI != allNotBelow_.size())
     {
-        FatalErrorIn("commsStruct") << "problem!" << Foam::abort(FatalError);
+        FatalErrorInFunction << "problem!" << Foam::abort(FatalError);
     }
 }
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
index 48036e7c52..ca5a254cd3 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,7 +55,7 @@ void Pstream::combineGather
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -182,7 +182,7 @@ void Pstream::combineScatter
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const UPstream::commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -287,7 +287,7 @@ void Pstream::listCombineGather
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -421,7 +421,7 @@ void Pstream::listCombineScatter
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const UPstream::commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -540,7 +540,7 @@ void Pstream::mapCombineGather
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -640,7 +640,7 @@ void Pstream::mapCombineScatter
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const UPstream::commsStruct& myComm = comms[UPstream::myProcNo(comm)];
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
index ddc39244f6..7abcac134a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,18 +46,14 @@ void Foam::Pstream::exchange
 {
     if (!contiguous<T>())
     {
-        FatalErrorIn
-        (
-            "Pstream::exchange(..)"
-        )   << "Continuous data only." << sizeof(T) << Foam::abort(FatalError);
+        FatalErrorInFunction
+            << "Continuous data only." << sizeof(T) << Foam::abort(FatalError);
     }
 
     if (sendBufs.size() != UPstream::nProcs(comm))
     {
-        FatalErrorIn
-        (
-            "Pstream::exchange(..)"
-        )   << "Size of list:" << sendBufs.size()
+        FatalErrorInFunction
+            << "Size of list:" << sendBufs.size()
             << " does not equal the number of processors:"
             << UPstream::nProcs(comm)
             << Foam::abort(FatalError);
@@ -75,14 +71,15 @@ void Foam::Pstream::exchange
     // Send sizes across. Note: blocks.
     combineReduce(sizes, UPstream::listEq(), tag, comm);
 
-    if (UPstream::nProcs(comm) > 1)
+    recvBufs.setSize(sendBufs.size());
+
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         label startOfRequests = Pstream::nRequests();
 
         // Set up receives
         // ~~~~~~~~~~~~~~~
 
-        recvBufs.setSize(sendBufs.size());
         forAll(sizes, procI)
         {
             label nRecv = sizes[procI][UPstream::myProcNo(comm)];
@@ -123,7 +120,7 @@ void Foam::Pstream::exchange
                     )
                 )
                 {
-                    FatalErrorIn("Pstream::exchange(..)")
+                    FatalErrorInFunction
                         << "Cannot send outgoing message. "
                         << "to:" << procI << " nBytes:"
                         << label(sendBufs[procI].size()*sizeof(T))
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
index 477dbe35f5..25193551df 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +52,7 @@ void Pstream::gather
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
@@ -151,7 +151,7 @@ void Pstream::scatter
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         // Get my communication order
         const commsStruct& myComm = comms[UPstream::myProcNo(comm)];
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
index 3b3133b495..a1330b6b6b 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,15 +53,12 @@ void Pstream::gatherList
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         if (Values.size() != UPstream::nProcs(comm))
         {
-            FatalErrorIn
-            (
-                "UPstream::gatherList(const List<UPstream::commsStruct>&"
-                ", List<T>)"
-            )   << "Size of list:" << Values.size()
+            FatalErrorInFunction
+                << "Size of list:" << Values.size()
                 << " does not equal the number of processors:"
                 << UPstream::nProcs(comm)
                 << Foam::abort(FatalError);
@@ -212,15 +209,12 @@ void Pstream::scatterList
     const label comm
 )
 {
-    if (UPstream::nProcs(comm) > 1)
+    if (UPstream::parRun() && UPstream::nProcs(comm) > 1)
     {
         if (Values.size() != UPstream::nProcs(comm))
         {
-            FatalErrorIn
-            (
-                "UPstream::scatterList(const List<UPstream::commsStruct>&"
-                ", List<T>)"
-            )   << "Size of list:" << Values.size()
+            FatalErrorInFunction
+                << "Size of list:" << Values.size()
                 << " does not equal the number of processors:"
                 << UPstream::nProcs(comm)
                 << Foam::abort(FatalError);
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 119da7dd12..1cfabe128c 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -321,7 +321,7 @@ Foam::Istream& Foam::ISstream::read(token& t)
                     // runaway argument - avoid buffer overflow
                     buf[maxLen-1] = '\0';
 
-                    FatalIOErrorIn("ISstream::read(token&)", *this)
+                    FatalIOErrorInFunction(*this)
                         << "number '" << buf << "...'\n"
                         << "    is too long (max. " << maxLen << " characters)"
                         << exit(FatalIOError);
@@ -440,7 +440,7 @@ Foam::Istream& Foam::ISstream::read(word& str)
         {
             buf[errLen] = '\0';
 
-            FatalIOErrorIn("ISstream::read(word&)", *this)
+            FatalIOErrorInFunction(*this)
                 << "word '" << buf << "...'\n"
                 << "    is too long (max. " << maxLen << " characters)"
                 << exit(FatalIOError);
@@ -454,7 +454,7 @@ Foam::Istream& Foam::ISstream::read(word& str)
     {
         buf[errLen] = buf[nChar] = '\0';
 
-        FatalIOErrorIn("ISstream::read(word&)", *this)
+        FatalIOErrorInFunction(*this)
             << "problem while reading word '" << buf << "...' after "
             << nChar << " characters\n"
             << exit(FatalIOError);
@@ -464,7 +464,7 @@ Foam::Istream& Foam::ISstream::read(word& str)
 
     if (nChar == 0)
     {
-        FatalIOErrorIn("ISstream::read(word&)", *this)
+        FatalIOErrorInFunction(*this)
             << "invalid first character found : " << c
             << exit(FatalIOError);
     }
@@ -488,7 +488,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
 
     if (!get(c))
     {
-        FatalIOErrorIn("ISstream::read(string&)", *this)
+        FatalIOErrorInFunction(*this)
             << "cannot read start of string"
             << exit(FatalIOError);
 
@@ -498,7 +498,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
     // Note, we could also handle single-quoted strings here (if desired)
     if (c != token::BEGIN_STRING)
     {
-        FatalIOErrorIn("ISstream::read(string&)", *this)
+        FatalIOErrorInFunction(*this)
             << "Incorrect start of string character found : " << c
             << exit(FatalIOError);
 
@@ -536,7 +536,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
             {
                 buf[errLen] = buf[nChar] = '\0';
 
-                FatalIOErrorIn("ISstream::read(string&)", *this)
+                FatalIOErrorInFunction(*this)
                     << "found '\\n' while reading string \""
                     << buf << "...\""
                     << exit(FatalIOError);
@@ -558,7 +558,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
         {
             buf[errLen] = '\0';
 
-            FatalIOErrorIn("ISstream::read(string&)", *this)
+            FatalIOErrorInFunction(*this)
                 << "string \"" << buf << "...\"\n"
                 << "    is too long (max. " << maxLen << " characters)"
                 << exit(FatalIOError);
@@ -571,7 +571,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
     // don't worry about a dangling backslash if string terminated prematurely
     buf[errLen] = buf[nChar] = '\0';
 
-    FatalIOErrorIn("ISstream::read(string&)", *this)
+    FatalIOErrorInFunction(*this)
         << "problem while reading string \"" << buf << "...\""
         << exit(FatalIOError);
 
@@ -592,7 +592,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
 
     if (!get(c) || c != '$')
     {
-        FatalIOErrorIn("ISstream::readVariable(string&)", *this)
+        FatalIOErrorInFunction(*this)
             << "invalid first character found : " << c
             << exit(FatalIOError);
     }
@@ -620,7 +620,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
             {
                 buf[errLen] = '\0';
 
-                FatalIOErrorIn("ISstream::readVariable(string&)", *this)
+                FatalIOErrorInFunction(*this)
                     << "word '" << buf << "...'\n"
                     << "    is too long (max. " << maxLen << " characters)"
                     << exit(FatalIOError);
@@ -656,7 +656,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
             {
                 buf[errLen] = '\0';
 
-                FatalIOErrorIn("ISstream::readVariable(string&)", *this)
+                FatalIOErrorInFunction(*this)
                     << "word '" << buf << "...'\n"
                     << "    is too long (max. " << maxLen << " characters)"
                     << exit(FatalIOError);
@@ -671,7 +671,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
     {
         buf[errLen] = buf[nChar] = '\0';
 
-        FatalIOErrorIn("ISstream::readVariable(string&)", *this)
+        FatalIOErrorInFunction(*this)
             << "problem while reading string '" << buf << "...' after "
             << nChar << " characters\n"
             << exit(FatalIOError);
@@ -681,7 +681,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
 
     if (nChar == 0)
     {
-        FatalIOErrorIn("ISstream::readVariable(string&)", *this)
+        FatalIOErrorInFunction(*this)
             << "invalid first character found : " << c
             << exit(FatalIOError);
     }
@@ -733,7 +733,7 @@ Foam::Istream& Foam::ISstream::readVerbatim(string& str)
         {
             buf[errLen] = '\0';
 
-            FatalIOErrorIn("ISstream::readVerbatim(string&)", *this)
+            FatalIOErrorInFunction(*this)
                 << "string \"" << buf << "...\"\n"
                 << "    is too long (max. " << maxLen << " characters)"
                 << exit(FatalIOError);
@@ -746,7 +746,7 @@ Foam::Istream& Foam::ISstream::readVerbatim(string& str)
     // don't worry about a dangling backslash if string terminated prematurely
     buf[errLen] = buf[nChar] = '\0';
 
-    FatalIOErrorIn("ISstream::readVerbatim(string&)", *this)
+    FatalIOErrorInFunction(*this)
         << "problem while reading string \"" << buf << "...\""
         << exit(FatalIOError);
 
@@ -783,7 +783,7 @@ Foam::Istream& Foam::ISstream::read(char* buf, std::streamsize count)
 {
     if (format() != BINARY)
     {
-        FatalIOErrorIn("ISstream::read(char*, std::streamsize)", *this)
+        FatalIOErrorInFunction(*this)
             << "stream format not binary"
             << exit(FatalIOError);
     }
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H
index 6135f51f46..2488bb04e3 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstreamI.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,7 @@ inline Foam::ISstream& Foam::ISstream::get(char& c)
     is_.get(c);
     setState(is_.rdstate());
 
-    if (c == '\n')
+    if (good() && c == '\n')
     {
         lineNumber_++;
     }
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
index 1657e755bc..2d35ae1193 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
@@ -219,7 +219,7 @@ Foam::Ostream& Foam::OSstream::write(const char* buf, std::streamsize count)
 {
     if (format() != BINARY)
     {
-        FatalIOErrorIn("Ostream::write(const char*, std::streamsize)", *this)
+        FatalIOErrorInFunction(*this)
             << "stream format not binary"
             << abort(FatalIOError);
     }
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.C b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.C
index fd1033dd20..2ab4265b1a 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.C
@@ -52,7 +52,7 @@ T Foam::ReadHex(ISstream& is)
 
         if (!isxdigit(c))
         {
-            FatalIOErrorIn("ReadHex(ISstream&)", is)
+            FatalIOErrorInFunction(is)
                 << "Illegal hex digit: '" << c << "'"
                 << exit(FatalIOError);
         }
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C
index 49a278e588..c9dae12294 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,9 +76,8 @@ Foam::Istream& Foam::ITstream::read(token& t)
     {
         if (eof())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "ITstream::read(token&)",
                 *this
             )   << "attempt to read beyond EOF"
                 << exit(FatalIOError);
@@ -108,49 +107,49 @@ Foam::Istream& Foam::ITstream::read(token& t)
 
 Foam::Istream& Foam::ITstream::read(char&)
 {
-    notImplemented("Istream& ITstream::read(char&)");
+    NotImplemented;
     return *this;
 }
 
 
 Foam::Istream& Foam::ITstream::read(word&)
 {
-    notImplemented("Istream& ITstream::read(word&)");
+    NotImplemented;
     return *this;
 }
 
 
 Foam::Istream& Foam::ITstream::read(string&)
 {
-    notImplemented("Istream& ITstream::read(string&)");
+    NotImplemented;
     return *this;
 }
 
 
 Foam::Istream& Foam::ITstream::read(label&)
 {
-    notImplemented("Istream& ITstream::read(label&)");
+    NotImplemented;
     return *this;
 }
 
 
 Foam::Istream& Foam::ITstream::read(floatScalar&)
 {
-    notImplemented("Istream& ITstream::read(floatScalar&)");
+    NotImplemented;
     return *this;
 }
 
 
 Foam::Istream& Foam::ITstream::read(doubleScalar&)
 {
-    notImplemented("Istream& ITstream::read(doubleScalar&)");
+    NotImplemented;
     return *this;
 }
 
 
 Foam::Istream& Foam::ITstream::read(char*, std::streamsize)
 {
-    notImplemented("Istream& ITstream::read(char*, std::streamsize)");
+    NotImplemented;
     return *this;
 }
 
diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index 83b5542c64..857d4f6b48 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn("token::compound::New(const word&, Istream&)", is)
+        FatalIOErrorInFunction(is)
             << "Unknown compound type " << compoundType << nl << nl
             << "Valid compound types:" << endl
             << IstreamConstructorTablePtr_->sortedToc()
@@ -96,11 +96,8 @@ Foam::token::compound& Foam::token::transferCompoundToken(const Istream& is)
     {
         if (compoundTokenPtr_->empty())
         {
-            FatalIOErrorIn
-            (
-                "token::transferCompoundToken(const Istream& is)",
-                is
-            )   << "compound has already been transfered from token\n    "
+            FatalIOErrorInFunction(is)
+                << "compound has already been transfered from token\n    "
                 << info() << abort(FatalIOError);
         }
         else
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index 8c2a024bbf..6d34249a61 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -231,7 +231,7 @@ inline const word& token::wordToken() const
     }
     else
     {
-        parseError("word");
+        parseError(word::typeName);
         return word::null;
     }
 }
@@ -254,7 +254,7 @@ inline const string& token::stringToken() const
     }
     else
     {
-        parseError("string");
+        parseError(string::typeName);
         return string::null;
     }
 }
@@ -272,7 +272,7 @@ inline label token::labelToken() const
     }
     else
     {
-        parseError("label");
+        parseError(pTraits<label>::typeName);
         return 0;
     }
 }
@@ -332,7 +332,7 @@ inline scalar token::scalarToken() const
     }
     else
     {
-        parseError("scalar");
+        parseError(pTraits<scalar>::typeName);
         return 0.0;
     }
 }
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenIO.C b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
index 7dc65240b8..2a2a8a7006 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenIO.C
+++ b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
@@ -54,7 +54,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token& t)
     {
         case token::UNDEFINED:
             os << "UNDEFINED";
-            WarningIn("Ostream& operator<<(Ostream&, const token&)")
+            WarningInFunction
                 << "Undefined token" << endl;
         break;
 
@@ -94,13 +94,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token& t)
 
         case token::ERROR:
             os << "ERROR";
-            WarningIn("Ostream& operator<<(Ostream&, const token&)")
+            WarningInFunction
                 << "Error token" << endl;
         break;
 
         default:
             os << "UNKNOWN";
-            SeriousErrorIn("Ostream& operator<<(Ostream&, const token&)")
+            SeriousErrorInFunction
                 << "Unknown token"
                 << endl;
     }
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 77ca3ca783..c0a867c01f 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -178,7 +178,7 @@ void Foam::Time::setControls()
         }
         else
         {
-            FatalIOErrorIn("Time::setControls()", controlDict_)
+            FatalIOErrorInFunction(controlDict_)
                 << "expected startTime, firstTime or latestTime"
                 << " found '" << startFrom << "'"
                 << exit(FatalIOError);
@@ -225,7 +225,7 @@ void Foam::Time::setControls()
             // Update the time formatting
             setTime(startTime_, 0);
 
-            WarningIn("Time::setControls()")
+            WarningInFunction
                 << "Increasing the timePrecision from " << oldPrecision
                 << " to " << precision_
                 << " to support the formatting of the current time directory "
@@ -251,7 +251,7 @@ void Foam::Time::setControls()
           > Pstream::nProcs()*deltaT_/10.0
         )
         {
-            FatalIOErrorIn("Time::setControls()", controlDict_)
+            FatalIOErrorInFunction(controlDict_)
                 << "Start time is not the same for all processors" << nl
                 << "processor " << Pstream::myProcNo() << " has startTime "
                 << startTime_ << exit(FatalIOError);
@@ -318,7 +318,7 @@ void Foam::Time::setControls()
 
             if (storedTimeName != timeName())
             {
-                IOWarningIn("Time::setControls()", timeDict)
+                IOWarningInFunction(timeDict)
                     << "Time read from time dictionary " << storedTimeName
                     << " differs from actual time " << timeName() << '.' << nl
                     << "    This may cause unexpected database behaviour."
@@ -891,7 +891,10 @@ bool Foam::Time::run() const
         // ie, when exiting the control loop
         if (!running && timeIndex_ != startTimeIndex_)
         {
-            // Note, end() also calls an indirect start() as required
+            // Ensure functionObjects execute on last time step
+            // (and hence write uptodate functionObjectProperties)
+            functionObjects_.execute();
+
             functionObjects_.end();
         }
     }
@@ -1308,7 +1311,7 @@ Foam::Time& Foam::Time::operator++()
 
                 if (precision_ != oldPrecision)
                 {
-                    WarningIn("Time::operator++()")
+                    WarningInFunction
                         << "Increased the timePrecision from " << oldPrecision
                         << " to " << precision_
                         << " to distinguish between timeNames at time "
@@ -1318,7 +1321,7 @@ Foam::Time& Foam::Time::operator++()
                     if (precision_ == maxPrecision_)
                     {
                         // Reached maxPrecision limit
-                        WarningIn("Time::operator++()")
+                        WarningInFunction
                             << "Current time name " << dimensionedScalar::name()
                             << nl
                             << "    The maximum time precision has been reached"
@@ -1338,7 +1341,7 @@ Foam::Time& Foam::Time::operator++()
                         )
                     )
                     {
-                        WarningIn("Time::operator++()")
+                        WarningInFunction
                             << "Current time name " << dimensionedScalar::name()
                             << " is set to an instance prior to the "
                                "previous one "
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 692b83db44..10b00f77f6 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -213,7 +213,7 @@ void Foam::Time::readDict()
     {
         if (writeControl_ == wcTimeStep && label(writeInterval_) < 1)
         {
-            FatalIOErrorIn("Time::readDict()", controlDict_)
+            FatalIOErrorInFunction(controlDict_)
                 << "writeInterval < 1 for writeControl timeStep"
                 << exit(FatalIOError);
         }
@@ -247,7 +247,7 @@ void Foam::Time::readDict()
              && label(secondaryWriteInterval_) < 1
             )
             {
-                FatalIOErrorIn("Time::readDict()", controlDict_)
+                FatalIOErrorInFunction(controlDict_)
                     << "secondaryWriteInterval < 1"
                     << " for secondaryWriteControl timeStep"
                     << exit(FatalIOError);
@@ -307,7 +307,7 @@ void Foam::Time::readDict()
     {
         if (purgeWrite_ < 0)
         {
-            WarningIn("Time::readDict()")
+            WarningInFunction
                 << "invalid value for purgeWrite " << purgeWrite_
                 << ", should be >= 0, setting to 0"
                 << endl;
@@ -320,7 +320,7 @@ void Foam::Time::readDict()
     {
         if (secondaryPurgeWrite_ < 0)
         {
-            WarningIn("Time::readDict()")
+            WarningInFunction
                 << "invalid value for secondaryPurgeWrite "
                 << secondaryPurgeWrite_
                 << ", should be >= 0, setting to 0"
@@ -348,7 +348,7 @@ void Foam::Time::readDict()
         }
         else
         {
-            WarningIn("Time::readDict()")
+            WarningInFunction
                 << "unsupported time format " << formatName
                 << endl;
         }
diff --git a/src/OpenFOAM/db/Time/TimePaths.H b/src/OpenFOAM/db/Time/TimePaths.H
index 0f5e1b11fd..708ab6b166 100644
--- a/src/OpenFOAM/db/Time/TimePaths.H
+++ b/src/OpenFOAM/db/Time/TimePaths.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ class TimePaths
         bool processorCase_;
         const fileName rootPath_;
         fileName globalCaseName_;
-        const fileName case_;
+        fileName case_;
         const word system_;
         const word constant_;
 
@@ -111,6 +111,12 @@ public:
                 return case_;
             }
 
+            //- Return case name
+            fileName& caseName()
+            {
+                return case_;
+            }
+
             //- Return system name
             const word& system() const
             {
diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C
index 556de4c98b..e12b9beca2 100644
--- a/src/OpenFOAM/db/Time/findInstance.C
+++ b/src/OpenFOAM/db/Time/findInstance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,24 +134,16 @@ Foam::word Foam::Time::findInstance
             {
                 if (name.empty())
                 {
-                    FatalErrorIn
-                    (
-                        "Time::findInstance"
-                        "(const fileName&, const word&"
-                        ", const IOobject::readOption, const word&)"
-                    )   << "Cannot find directory "
+                    FatalErrorInFunction
+                        << "Cannot find directory "
                         << dir << " in times " << timeName()
                         << " down to " << stopInstance
                         << exit(FatalError);
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "Time::findInstance"
-                        "(const fileName&, const word&"
-                        ", const IOobject::readOption, const word&)"
-                    )   << "Cannot find file \"" << name << "\" in directory "
+                    FatalErrorInFunction
+                        << "Cannot find file \"" << name << "\" in directory "
                         << dir << " in times " << timeName()
                         << " down to " << stopInstance
                         << exit(FatalError);
@@ -195,12 +187,8 @@ Foam::word Foam::Time::findInstance
 
     if (rOpt == IOobject::MUST_READ || rOpt == IOobject::MUST_READ_IF_MODIFIED)
     {
-        FatalErrorIn
-        (
-            "Time::findInstance"
-            "(const fileName&, const word&"
-            ", const IOobject::readOption, const word&)"
-        )   << "Cannot find file \"" << name << "\" in directory "
+        FatalErrorInFunction
+            << "Cannot find file \"" << name << "\" in directory "
             << dir << " in times " << timeName()
             << " down to " << constant()
             << exit(FatalError);
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index 5b66e7a264..ecffc55dc9 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -267,7 +267,7 @@ Foam::instantList Foam::timeSelector::select0
 
     if (timeDirs.empty())
     {
-        WarningIn(args.executable())
+        WarningInFunction
             << "No time specified or available, selecting 'constant'"
             << endl;
 
diff --git a/src/OpenFOAM/db/Time/timeSelector.H b/src/OpenFOAM/db/Time/timeSelector.H
index 836264f1da..7074e1267a 100644
--- a/src/OpenFOAM/db/Time/timeSelector.H
+++ b/src/OpenFOAM/db/Time/timeSelector.H
@@ -162,7 +162,7 @@ public:
 
         //- Return the set of times selected based on the argList options
         //  including support for \b -newTimes in which times are selected
-        //  if the file <fName> does not exist in the time directory.
+        //  if the file 'fName' does not exist in the time directory.
         //  Also set the runTime to the first instance or the
         //  \c constant/ directory if no instances are specified or available
         static instantList select
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index d8d791a21d..d46f95cd0e 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -221,9 +221,7 @@ Foam::autoPtr<Foam::dictionary> Foam::dictionary::clone() const
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::dictionary::~dictionary()
-{
-    // cerr<< "~dictionary() " << name() << " " << long(this) << std::endl;
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -238,7 +236,7 @@ const Foam::dictionary& Foam::dictionary::topDict() const
     }
     else
     {
-        return p;
+        return *this;
     }
 }
 
@@ -435,9 +433,8 @@ const Foam::entry& Foam::dictionary::lookupEntry
 
     if (entryPtr == NULL)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "dictionary::lookupEntry(const word&, bool, bool) const",
             *this
         )   << "keyword " << keyword << " is undefined in dictionary "
             << name()
@@ -515,10 +512,8 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
                     // Go to parent
                     if (&dictPtr->parent_ == &dictionary::null)
                     {
-                        FatalIOErrorIn
+                        FatalIOErrorInFunction
                         (
-                            "dictionary::lookupScopedEntryPtr"
-                            "(const word&, bool, bool)",
                             *this
                         )   << "No parent of current dictionary"
                             << " when searching for "
@@ -549,10 +544,8 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
 
                 if (!entPtr)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "dictionary::lookupScopedEntryPtr"
-                        "(const word&, bool, bool)",
                         *this
                     )   << "keyword " << firstWord
                         << " is undefined in dictionary "
@@ -641,9 +634,8 @@ const Foam::dictionary& Foam::dictionary::subDict(const word& keyword) const
 
     if (entryPtr == NULL)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "dictionary::subDict(const word& keyword) const",
             *this
         )   << "keyword " << keyword << " is undefined in dictionary "
             << name()
@@ -659,9 +651,8 @@ Foam::dictionary& Foam::dictionary::subDict(const word& keyword)
 
     if (entryPtr == NULL)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "dictionary::subDict(const word& keyword)",
             *this
         )   << "keyword " << keyword << " is undefined in dictionary "
             << name()
@@ -683,9 +674,8 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
     {
         if (mustRead)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "dictionary::subOrEmptyDict(const word& keyword, const bool)",
                 *this
             )   << "keyword " << keyword << " is undefined in dictionary "
                 << name()
@@ -777,7 +767,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
             }
             else
             {
-                IOWarningIn("dictionary::add(entry*, bool)", (*this))
+                IOWarningInFunction((*this))
                     << "problem replacing entry "<< entryPtr->keyword()
                     << " in dictionary " << name() << endl;
 
@@ -806,7 +796,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
     }
     else
     {
-        IOWarningIn("dictionary::add(entry*, bool)", (*this))
+        IOWarningInFunction((*this))
             << "attempt to add entry "<< entryPtr->keyword()
             << " which already exists in dictionary " << name()
             << endl;
@@ -943,9 +933,8 @@ bool Foam::dictionary::changeKeyword
 
     if (iter()->keyword().isPattern())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "dictionary::changeKeyword(const word&, const word&, bool)",
             *this
         )   << "Old keyword "<< oldKeyword
             << " is a pattern."
@@ -984,9 +973,8 @@ bool Foam::dictionary::changeKeyword
         }
         else
         {
-            IOWarningIn
+            IOWarningInFunction
             (
-                "dictionary::changeKeyword(const word&, const word&, bool)",
                 *this
             )   << "cannot rename keyword "<< oldKeyword
                 << " to existing keyword " << newKeyword
@@ -1019,7 +1007,7 @@ bool Foam::dictionary::merge(const dictionary& dict)
     // Check for assignment to self
     if (this == &dict)
     {
-        FatalIOErrorIn("dictionary::merge(const dictionary&)", *this)
+        FatalIOErrorInFunction(*this)
             << "attempted merge to self for dictionary " << name()
             << abort(FatalIOError);
     }
@@ -1100,7 +1088,7 @@ void Foam::dictionary::operator=(const dictionary& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalIOErrorIn("dictionary::operator=(const dictionary&)", *this)
+        FatalIOErrorInFunction(*this)
             << "attempted assignment to self for dictionary " << name()
             << abort(FatalIOError);
     }
@@ -1123,7 +1111,7 @@ void Foam::dictionary::operator+=(const dictionary& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalIOErrorIn("dictionary::operator+=(const dictionary&)", *this)
+        FatalIOErrorInFunction(*this)
             << "attempted addition assignment to self for dictionary " << name()
             << abort(FatalIOError);
     }
@@ -1140,7 +1128,7 @@ void Foam::dictionary::operator|=(const dictionary& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalIOErrorIn("dictionary::operator|=(const dictionary&)", *this)
+        FatalIOErrorInFunction(*this)
             << "attempted assignment to self for dictionary " << name()
             << abort(FatalIOError);
     }
@@ -1160,7 +1148,7 @@ void Foam::dictionary::operator<<=(const dictionary& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalIOErrorIn("dictionary::operator<<=(const dictionary&)", *this)
+        FatalIOErrorInFunction(*this)
             << "attempted assignment to self for dictionary " << name()
             << abort(FatalIOError);
     }
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index bbba527971..b01f9dfb61 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -200,7 +200,7 @@ public:
         dictionary();
 
         //- Construct top-level empty dictionary with given name
-        dictionary(const fileName& name);
+        explicit dictionary(const fileName& name);
 
         //- Construct given the entry name, parent dictionary and Istream,
         //  reading entries until lastEntry or EOF
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.C b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.C
index 26a6a45f57..9ffe101620 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ Foam::label Foam::dictionaryEntry::endLineNumber() const
 
 Foam::ITstream& Foam::dictionaryEntry::stream() const
 {
-    FatalIOErrorIn("ITstream& primitiveEntry::stream() const", *this)
+    FatalIOErrorInFunction(*this)
         << "Attempt to return dictionary entry as a primitive"
         << abort(FatalIOError);
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 48e92e5340..f6beeb1e91 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ bool Foam::dictionary::read(Istream& is, const bool keepHeader)
 
     if (!is.good())
     {
-        FatalIOErrorIn("dictionary::read(Istream&, bool)", is)
+        FatalIOErrorInFunction(is)
             << "Istream not OK for reading dictionary "
             << exit(FatalIOError);
 
@@ -193,7 +193,7 @@ void Foam::dictionary::write(Ostream& os, bool subDict) const
         // Check stream before going to next entry.
         if (!os.good())
         {
-            WarningIn("dictionary::write(Ostream&, bool subDict)")
+            WarningInFunction
                 << "Can't write entry " << iter().keyword()
                 << " for dictionary " << name()
                 << endl;
diff --git a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
index 313c06ccd7..5d2164e52b 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
@@ -47,7 +47,7 @@ T Foam::dictionary::lookupOrDefault
     {
         if (writeOptionalEntries)
         {
-            IOInfoIn("dictionary::lookupOrDefault", *this)
+            IOInfoInFunction(*this)
                 << "Optional entry '" << keyword << "' is not present,"
                 << " returning the default value '" << deflt << "'"
                 << endl;
@@ -77,7 +77,7 @@ T Foam::dictionary::lookupOrAddDefault
     {
         if (writeOptionalEntries)
         {
-            IOInfoIn("dictionary::lookupOrAddDefault", *this)
+            IOInfoInFunction(*this)
                 << "Optional entry '" << keyword << "' is not present,"
                 << " adding and returning the default value '" << deflt << "'"
                 << endl;
@@ -109,7 +109,7 @@ bool Foam::dictionary::readIfPresent
     {
         if (writeOptionalEntries)
         {
-            IOInfoIn("dictionary::readIfPresent", *this)
+            IOInfoInFunction(*this)
                 << "Optional entry '" << keyword << "' is not present,"
                 << " the default value '" << val << "' will be used."
                 << endl;
diff --git a/src/OpenFOAM/db/dictionary/entry/entry.C b/src/OpenFOAM/db/dictionary/entry/entry.C
index 5c12f92231..991a51f1a1 100644
--- a/src/OpenFOAM/db/dictionary/entry/entry.C
+++ b/src/OpenFOAM/db/dictionary/entry/entry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ void Foam::entry::operator=(const entry& e)
     // check for assignment to self
     if (this == &e)
     {
-        FatalErrorIn("entry::operator=(const entry&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 296def78ed..6e7d257688 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,11 +156,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
                 }
                 else
                 {
-                    FatalIOErrorIn
-                    (
-                        "entry::New(const dictionary& parentDict, Istream&)",
-                        is
-                    )
+                    FatalIOErrorInFunction(is)
                         << "Attempt to use undefined variable " << varName
                         << " as keyword"
                         << exit(FatalIOError);
@@ -228,11 +224,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
                 }
                 else if (functionEntries::inputModeEntry::error())
                 {
-                    FatalIOErrorIn
-                    (
-                        "entry::New(const dictionary& parentDict, Istream&)",
-                        is
-                    )
+                    FatalIOErrorInFunction(is)
                         << "ERROR! duplicate entry: " << keyword
                         << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
index 380f5dfd22..f0e90284fb 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,9 +158,8 @@ Foam::functionEntries::codeStream::getFunction
 
                 if (!dynCode.copyOrCreateFiles(true))
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "functionEntries::codeStream::execute(..)",
                         parentDict
                     )   << "Failed writing files for" << nl
                         << dynCode.libRelPath() << nl
@@ -170,9 +169,8 @@ Foam::functionEntries::codeStream::getFunction
 
             if (!dynCode.wmakeLibso())
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "functionEntries::codeStream::execute(..)",
                     parentDict
                 )   << "Failed wmake " << dynCode.libRelPath() << nl
                     << exit(FatalIOError);
@@ -223,9 +221,8 @@ Foam::functionEntries::codeStream::getFunction
 
                 if (mySize < masterSize)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "functionEntries::codeStream::execute(..)",
                         parentDict
                     )   << "Cannot read (NFS mounted) library " << nl
                         << libPath << nl
@@ -262,9 +259,8 @@ Foam::functionEntries::codeStream::getFunction
 
             if (!dlLibs.open(libPath, false))
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "functionEntries::codeStream::execute(..)",
                     parentDict
                 )   << "Failed loading library " << libPath << nl
                     << "Did you add all libraries to the 'libs' entry"
@@ -293,9 +289,8 @@ Foam::functionEntries::codeStream::getFunction
 
     if (!haveLib)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "functionEntries::codeStream::execute(..)",
             parentDict
         )   << "Failed loading library " << libPath
             << " on some processors."
@@ -313,9 +308,8 @@ Foam::functionEntries::codeStream::getFunction
 
     if (!function)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "functionEntries::codeStream::execute(..)",
             parentDict
         )   << "Failed looking up symbol " << dynCode.codeName()
             << " in library " << lib << exit(FatalIOError);
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
index a5378601e7..a758de39a4 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
@@ -76,11 +76,8 @@ bool Foam::functionEntry::execute
 
     if (mfIter == executedictionaryIstreamMemberFunctionTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "functionEntry::execute"
-            "(const word& functionName, dictionary& parentDict, Istream&)"
-        )   << "Unknown functionEntry '" << functionName
+        FatalErrorInFunction
+            << "Unknown functionEntry '" << functionName
             << "' in " << is.name() << " near line " << is.lineNumber()
             << nl << nl
             << "Valid functionEntries are :" << endl
@@ -122,11 +119,8 @@ bool Foam::functionEntry::execute
 
     if (mfIter == executeprimitiveEntryIstreamMemberFunctionTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "functionEntry::execute"
-            "(const word&, const dictionary&, primitiveEntry&, Istream&)"
-        )   << "Unknown functionEntry '" << functionName
+        FatalErrorInFunction
+            << "Unknown functionEntry '" << functionName
             << "' in " << is.name() << " near line " << is.lineNumber()
             << nl << nl
             << "Valid functionEntries are :" << endl
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
index 5a60eadd49..8e836e50f6 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,10 +140,8 @@ bool Foam::functionEntries::includeEntry::execute
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "functionEntries::includeEntry::includeEntry"
-            "(dictionary& parentDict, Istream&)",
             is
         )   << "Cannot open include file "
             << (ifs.name().size() ? ifs.name() : rawFName)
@@ -180,10 +178,8 @@ bool Foam::functionEntries::includeEntry::execute
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "functionEntries::includeEntry::includeEntry"
-            "(dictionary& parentDict, primitiveEntry&, Istream&)",
             is
         )   << "Cannot open include file "
             << (ifs.name().size() ? ifs.name() : rawFName)
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
index f16e159c7f..4831eb85f4 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C
@@ -118,10 +118,8 @@ bool Foam::functionEntries::includeEtcEntry::execute
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "functionEntries::includeEtcEntry::includeEtcEntry"
-            "(dictionary& parentDict, Istream&)",
             is
         )   << "Cannot open etc file "
             << (ifs.name().size() ? ifs.name() : rawFName)
@@ -158,10 +156,8 @@ bool Foam::functionEntries::includeEtcEntry::execute
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "functionEntries::includeEtcEntry::includeEtcEntry"
-            "(dictionary& parentDict, primitiveEntry&, Istream&)",
             is
         )   << "Cannot open etc file "
             << (ifs.name().size() ? ifs.name() : rawFName)
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
index 235a0198c1..96472b71cd 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ void Foam::functionEntries::inputModeEntry::setMode(Istream& is)
     }
     else
     {
-        WarningIn("Foam::functionEntries::inputModeEntry::setMode(Istream&)")
+        WarningInFunction
             << "unsupported input mode '" << mode
             << "' ... defaulting to 'merge'"
             << endl;
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index d605ddc001..5e4d15eb08 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,10 +88,8 @@ bool Foam::primitiveEntry::expandVariable
 
             if (envStr.empty())
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "primitiveEntry::expandVariable"
-                    "(const string&, const dictionary&",
                     dict
                 )   << "Illegal dictionary entry or environment variable name "
                     << varName << endl << "Valid dictionary entries are "
@@ -188,7 +186,7 @@ Foam::ITstream& Foam::primitiveEntry::stream() const
 
 const Foam::dictionary& Foam::primitiveEntry::dict() const
 {
-    FatalErrorIn("const dictionary& primitiveEntry::dict() const")
+    FatalErrorInFunction
         << "Attempt to return primitive entry " << info()
         << " as a sub-dictionary"
         << abort(FatalError);
@@ -199,7 +197,7 @@ const Foam::dictionary& Foam::primitiveEntry::dict() const
 
 Foam::dictionary& Foam::primitiveEntry::dict()
 {
-    FatalErrorIn("const dictionary& primitiveEntry::dict()")
+    FatalErrorInFunction
         << "Attempt to return primitive entry " << info()
         << " as a sub-dictionary"
         << abort(FatalError);
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index 04cb8cf165..8777819d45 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,9 +182,8 @@ void Foam::primitiveEntry::readEntry(const dictionary& dict, Istream& is)
             << " on line " << keywordLineNumber
             << " and ending at line " << is.lineNumber();
 
-        SafeFatalIOErrorIn
+        SafeFatalIOErrorInFunction
         (
-            "primitiveEntry::readEntry(const dictionary&, Istream&)",
             is,
             os.str()
         );
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index c256333cb8..17aad06a00 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,9 +76,8 @@ void* Foam::codedBase::loadLibrary
                     }
                     else
                     {
-                        FatalIOErrorIn
+                        FatalIOErrorInFunction
                         (
-                            "codedBase::updateLibrary()",
                             contextDict
                         )   << "Failed looking up symbol " << globalFuncName
                             << nl << "from " << libPath << exit(FatalIOError);
@@ -86,9 +85,8 @@ void* Foam::codedBase::loadLibrary
                 }
                 else
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "codedBase::loadLibrary()",
                         contextDict
                     )   << "Failed looking up symbol " << globalFuncName << nl
                         << "from " << libPath << exit(FatalIOError);
@@ -96,9 +94,8 @@ void* Foam::codedBase::loadLibrary
                     lib = 0;
                     if (!libs().close(libPath, false))
                     {
-                        FatalIOErrorIn
+                        FatalIOErrorInFunction
                         (
-                            "codedBase::loadLibrary()",
                             contextDict
                         )   << "Failed unloading library "
                             << libPath
@@ -149,9 +146,8 @@ void Foam::codedBase::unloadLibrary
         }
         else
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "codedBase::unloadLibrary()",
                 contextDict
             )   << "Failed looking up symbol " << globalFuncName << nl
                 << "from " << libPath << exit(FatalIOError);
@@ -160,9 +156,8 @@ void Foam::codedBase::unloadLibrary
 
     if (!libs().close(libPath, false))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "codedBase::updateLibrary()",
             contextDict
         )   << "Failed unloading library " << libPath
             << exit(FatalIOError);
@@ -194,9 +189,8 @@ void Foam::codedBase::createLibrary
 
             if (!dynCode.copyOrCreateFiles(true))
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "codedBase::createLibrary(..)",
                     context.dict()
                 )   << "Failed writing files for" << nl
                     << dynCode.libRelPath() << nl
@@ -206,9 +200,8 @@ void Foam::codedBase::createLibrary
 
         if (!dynCode.wmakeLibso())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "codedBase::createLibrary(..)",
                 context.dict()
             )   << "Failed wmake " << dynCode.libRelPath() << nl
                 << exit(FatalIOError);
@@ -257,9 +250,8 @@ void Foam::codedBase::createLibrary
 
             if (mySize < masterSize)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "functionEntries::codeStream::execute(..)",
                     context.dict()
                 )   << "Cannot read (NFS mounted) library " << nl
                     << libPath << nl
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
index d1f2f209d3..a052289eb6 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,10 +93,8 @@ bool Foam::dlLibraryTable::open
         {
             if (verbose)
             {
-                WarningIn
-                (
-                    "dlLibraryTable::open(const fileName&, const bool)"
-                )   << "could not load " << functionLibName
+                WarningInFunction
+                    << "could not load " << functionLibName
                     << endl;
             }
 
@@ -149,10 +147,8 @@ bool Foam::dlLibraryTable::close
         {
             if (verbose)
             {
-                WarningIn
-                (
-                    "dlLibraryTable::close(const fileName&)"
-                )   << "could not close " << functionLibName
+                WarningInFunction
+                    << "could not close " << functionLibName
                     << endl;
             }
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
index db53368a9a..62796ab062 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,22 +59,14 @@ bool Foam::dlLibraryTable::open
 
             if (!opened)
             {
-                WarningIn
-                (
-                    "dlLibraryTable::open"
-                    "(const dictionary&, const word&, "
-                    "const TablePtr&)"
-                )   << "Could not open library " << libName
+                WarningInFunction
+                    << "Could not open library " << libName
                     << endl << endl;
             }
             else if (debug && (!tablePtr || tablePtr->size() <= nEntries))
             {
-                WarningIn
-                (
-                    "dlLibraryTable::open"
-                    "(const dictionary&, const word&, "
-                    "const TablePtr&)"
-                )   << "library " << libName
+                WarningInFunction
+                    << "library " << libName
                     << " did not introduce any new entries"
                     << endl << endl;
             }
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index 2f975771b8..04932fceea 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,11 +61,8 @@ void Foam::dynamicCode::checkSecurity
 {
     if (isAdministrator())
     {
-        FatalIOErrorIn
-        (
-            title,
-            dict
-        )   << "This code should not be executed by someone with administrator"
+        FatalIOErrorInFunction(dict)
+            << "This code should not be executed by someone with administrator"
             << " rights due to security reasons." << nl
             << "(it writes a shared library which then gets loaded "
             << "using dlopen)"
@@ -74,11 +71,8 @@ void Foam::dynamicCode::checkSecurity
 
     if (!allowSystemOperations)
     {
-        FatalIOErrorIn
-        (
-            title,
-            dict
-        )   << "Loading a shared library using case-supplied code is not"
+        FatalIOErrorInFunction(dict)
+            << "Loading a shared library using case-supplied code is not"
             << " enabled by default" << nl
             << "because of security issues. If you trust the code you can"
             << " enable this" << nl
@@ -115,21 +109,15 @@ void Foam::dynamicCode::copyAndFilter
 {
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "dynamicCode::copyAndFilter()"
-            " const"
-        )   << "Failed opening for reading " << is.name()
+        FatalErrorInFunction
+            << "Failed opening for reading " << is.name()
             << exit(FatalError);
     }
 
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "dynamicCode::copyAndFilter()"
-            " const"
-        )   << "Failed writing " << os.name()
+        FatalErrorInFunction
+            << "Failed writing " << os.name()
             << exit(FatalError);
     }
 
@@ -226,11 +214,8 @@ bool Foam::dynamicCode::createMakeFiles() const
     //Info<< "Writing to " << dstFile << endl;
     if (!os.good())
     {
-        FatalErrorIn
-            (
-                "dynamicCode::createMakeFiles()"
-                " const"
-            )   << "Failed writing " << dstFile
+        FatalErrorInFunction
+                << "Failed writing " << dstFile
                 << exit(FatalError);
     }
 
@@ -266,11 +251,8 @@ bool Foam::dynamicCode::createMakeOptions() const
     //Info<< "Writing to " << dstFile << endl;
     if (!os.good())
     {
-        FatalErrorIn
-            (
-                "dynamicCode::createMakeOptions()"
-                " const"
-            )   << "Failed writing " << dstFile
+        FatalErrorInFunction
+                << "Failed writing " << dstFile
                 << exit(FatalError);
     }
 
@@ -432,10 +414,8 @@ bool Foam::dynamicCode::copyOrCreateFiles(const bool verbose) const
 
     if (!badFiles.empty())
     {
-        FatalErrorIn
-        (
-            "dynamicCode::copyFilesContents(..)"
-        )   << "Could not find the code template(s): "
+        FatalErrorInFunction
+            << "Could not find the code template(s): "
             << badFiles << nl
             << "Under the $" << codeTemplateEnvName
             << " directory or via via the ~OpenFOAM/"
@@ -461,11 +441,8 @@ bool Foam::dynamicCode::copyOrCreateFiles(const bool verbose) const
         //Info<< "Reading from " << is.name() << endl;
         if (!is.good())
         {
-            FatalErrorIn
-            (
-                "dynamicCode::copyFilesContents(const fileName&)"
-                " const"
-            )   << "Failed opening " << srcFile
+            FatalErrorInFunction
+                << "Failed opening " << srcFile
                 << exit(FatalError);
         }
 
@@ -473,11 +450,8 @@ bool Foam::dynamicCode::copyOrCreateFiles(const bool verbose) const
         //Info<< "Writing to " << dstFile.name() << endl;
         if (!os.good())
         {
-            FatalErrorIn
-            (
-                "dynamicCode::copyFilesContents(const fileName&)"
-                " const"
-            )   << "Failed writing " << dstFile
+            FatalErrorInFunction
+                << "Failed writing " << dstFile
                 << exit(FatalError);
         }
 
@@ -499,11 +473,8 @@ bool Foam::dynamicCode::copyOrCreateFiles(const bool verbose) const
         //Info<< "Writing to " << createFiles_[fileI].first() << endl;
         if (!os.good())
         {
-            FatalErrorIn
-            (
-                "dynamicCode::copyOrCreateFiles()"
-                " const"
-            )   << "Failed writing " << dstFile
+            FatalErrorInFunction
+                << "Failed writing " << dstFile
                 << exit(FatalError);
         }
         os.writeQuoted(createFiles_[fileI].second(), false) << nl;
diff --git a/src/OpenFOAM/db/error/CocoParserErrors.H b/src/OpenFOAM/db/error/CocoParserErrors.H
index 7f41672075..d693f4efde 100644
--- a/src/OpenFOAM/db/error/CocoParserErrors.H
+++ b/src/OpenFOAM/db/error/CocoParserErrors.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,14 +91,14 @@ public:
         //- Handle a general warning 'msg'
         virtual void Warning(const StringClass& msg)
         {
-            WarningIn(name_)
+            WarningInFunction
                 << msg << endl;
         }
 
         //- Handle a general warning 'msg'
         virtual void Warning(int line, int col, const StringClass& msg)
         {
-            WarningIn(name_)
+            WarningInFunction
                 <<"line " << line << " col " << col << ": "
                 << msg << endl;
         }
@@ -106,7 +106,7 @@ public:
         //- Handle general error 'msg' (eg, a semantic error)
         virtual void Error(int line, int col, const StringClass& msg)
         {
-            FatalErrorIn(name_)
+            FatalErrorInFunction
                 << "line " << line << " col " << col <<": " << msg << endl
                 << exit(FatalError);
         }
@@ -114,7 +114,7 @@ public:
         //- Handle general error 'msg' (eg, a semantic error)
         virtual void Error(const StringClass& msg)
         {
-            FatalErrorIn(name_)
+            FatalErrorInFunction
                 << msg << endl
                 << exit(FatalError);
         }
diff --git a/src/OpenFOAM/db/error/IOerror.C b/src/OpenFOAM/db/error/IOerror.C
index 08f490c0bd..f24b952a99 100644
--- a/src/OpenFOAM/db/error/IOerror.C
+++ b/src/OpenFOAM/db/error/IOerror.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -125,9 +125,8 @@ void Foam::IOerror::SafeFatalIOError
 {
     if (JobInfo::constructed)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "primitiveEntry::readEntry(const dictionary&, Istream&)",
             ioStream
         )   << msg << Foam::exit(FatalIOError);
     }
@@ -174,7 +173,7 @@ void Foam::IOerror::exit(const int)
         jobInfo.exit();
     }
 
-    if (abort_)
+    if (env("FOAM_ABORT"))
     {
         abort();
     }
@@ -215,7 +214,7 @@ void Foam::IOerror::abort()
         jobInfo.abort();
     }
 
-    if (abort_)
+    if (env("FOAM_ABORT"))
     {
         Perr<< endl << *this << endl
             << "\nFOAM aborting (FOAM_ABORT set)\n" << endl;
diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H
index a23aa94077..bfebf929e3 100644
--- a/src/OpenFOAM/db/error/StaticAssert.H
+++ b/src/OpenFOAM/db/error/StaticAssert.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,19 +62,18 @@ class StaticAssertionTest {};
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// internal use:
+// Internal use:
 // ~~~~~~~~~~~~~
-// paste together strings, even if an argument is itself a macro
+
+// Paste together strings, even if an argument is itself a macro
 #define StaticAssertMacro(X,Y)  StaticAssertMacro1(X,Y)
 #define StaticAssertMacro1(X,Y) StaticAssertMacro2(X,Y)
 #define StaticAssertMacro2(X,Y) X##Y
 
-// external use:
+// External use:
 // ~~~~~~~~~~~~~
-/**
- * \def StaticAssert(Test)
- * Assert that some test is true at compile-time
-*/
+
+//- Assert that some test is true at compile-time
 #define StaticAssert(Test)                                                   \
     typedef ::Foam::StaticAssertionTest                                      \
     <                                                                        \
diff --git a/src/OpenFOAM/db/error/error.C b/src/OpenFOAM/db/error/error.C
index 91ec556324..f29eafb486 100644
--- a/src/OpenFOAM/db/error/error.C
+++ b/src/OpenFOAM/db/error/error.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,6 @@ Foam::error::error(const string& title)
     functionName_("unknown"),
     sourceFileName_("unknown"),
     sourceFileLineNumber_(0),
-    abort_(env("FOAM_ABORT")),
     throwExceptions_(false),
     messageStreamPtr_(new OStringStream())
 {
@@ -61,7 +60,6 @@ Foam::error::error(const dictionary& errDict)
     functionName_(errDict.lookup("functionName")),
     sourceFileName_(errDict.lookup("sourceFileName")),
     sourceFileLineNumber_(readLabel(errDict.lookup("sourceFileLineNumber"))),
-    abort_(env("FOAM_ABORT")),
     throwExceptions_(false),
     messageStreamPtr_(new OStringStream())
 {
@@ -83,7 +81,6 @@ Foam::error::error(const error& err)
     functionName_(err.functionName_),
     sourceFileName_(err.sourceFileName_),
     sourceFileLineNumber_(err.sourceFileLineNumber_),
-    abort_(err.abort_),
     throwExceptions_(err.throwExceptions_),
     messageStreamPtr_(new OStringStream(*err.messageStreamPtr_))
 {
@@ -173,7 +170,7 @@ void Foam::error::exit(const int errNo)
         jobInfo.exit();
     }
 
-    if (abort_)
+    if (env("FOAM_ABORT"))
     {
         abort();
     }
@@ -214,7 +211,7 @@ void Foam::error::abort()
         jobInfo.abort();
     }
 
-    if (abort_)
+    if (env("FOAM_ABORT"))
     {
         Perr<< endl << *this << endl
             << "\nFOAM aborting (FOAM_ABORT set)\n" << endl;
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 97a08b175c..df42bf1ce0 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,11 +78,10 @@ protected:
         string sourceFileName_;
         label sourceFileLineNumber_;
 
-        bool abort_;
-
         bool throwExceptions_;
         OStringStream* messageStreamPtr_;
 
+
 public:
 
     // Constructors
@@ -310,46 +309,62 @@ extern IOerror FatalIOError;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Convenience macros to add the file name and line number to the function name
 
-/**
- * \def FatalErrorIn(functionName)
- * Report an error message using Foam::FatalError for functionName in
- * file __FILE__ at line __LINE__
-*/
-#define FatalErrorIn(fn) \
-    ::Foam::FatalError((fn), __FILE__, __LINE__)
+//- Report an error message using Foam::FatalError
+//  for functionName in file __FILE__ at line __LINE__
+#define FatalErrorIn(functionName)                                             \
+    ::Foam::FatalError((functionName), __FILE__, __LINE__)
 
-/**
- * \def FatalIOErrorIn(functionName, ios)
- * Report an error message using Foam::FatalIOError for functionName in
- * file __FILE__ at line __LINE__
- * for a particular IOstream
-*/
-#define FatalIOErrorIn(fn, ios) \
-    ::Foam::FatalIOError((fn), __FILE__, __LINE__, (ios))
+//- Report an error message using Foam::FatalError
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+#define FatalErrorInFunction FatalErrorIn(FUNCTION_NAME)
 
-/**
- * \def SafeFatalIOErrorIn(functionName, ios, msg)
- * Report an error message using Foam::FatalIOError (or cerr if FatalIOError
- * not yet constructed) for functionName in
- * file __FILE__ at line __LINE__
- * for a particular IOstream
-*/
-#define SafeFatalIOErrorIn(fn, ios, msg) \
-    ::Foam::IOerror::SafeFatalIOError((fn), __FILE__, __LINE__, (ios), (msg))
 
-/**
- * \def notImplemented(functionName)
- * Issue a FatalErrorIn for the functionName.
- * This is used for functions that are not currently implemented.
- * The functionName is printed and then abort is called.
- *
- * \note
- * This macro can be particularly useful when methods must be defined to
- * complete the interface of a derived class even if they should never be
- * called for this derived class.
-*/
-#define notImplemented(fn) \
-    FatalErrorIn(fn) << "Not implemented" << ::Foam::abort(FatalError);
+//- Report an error message using Foam::FatalIOError
+//  for functionName in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define FatalIOErrorIn(functionName, ios)                                      \
+    ::Foam::FatalIOError((functionName), __FILE__, __LINE__, (ios))
+
+//- Report an error message using Foam::FatalIOError
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define FatalIOErrorInFunction(ios) FatalIOErrorIn(FUNCTION_NAME, ios)
+
+
+//- Report an error message using Foam::FatalIOError
+//  (or cerr if FatalIOError not yet constructed)
+//  for functionName in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define SafeFatalIOErrorIn(functionName, ios, msg)                             \
+    ::Foam::IOerror::SafeFatalIOError                                          \
+    ((functionName), __FILE__, __LINE__, (ios), (msg))
+
+//- Report an error message using Foam::FatalIOError
+//  (or cerr if FatalIOError not yet constructed)
+//  for functionName in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define SafeFatalIOErrorInFunction(ios, msg)                                   \
+    SafeFatalIOErrorIn(FUNCTION_NAME, ios, msg)
+
+
+//- Issue a FatalErrorIn for a function not currently implemented.
+//  The functionName is printed and then abort is called.
+//
+//  This macro can be particularly useful when methods must be defined to
+//  complete the interface of a derived class even if they should never be
+//  called for this derived class.
+#define notImplemented(functionName)                                           \
+    FatalErrorIn(functionName)                                                 \
+        << "Not implemented" << ::Foam::abort(FatalError);
+
+//- Issue a FatalErrorIn for a function not currently implemented.
+//  The FUNCTION_NAME is printed and then abort is called.
+//
+//  This macro can be particularly useful when methods must be defined to
+//  complete the interface of a derived class even if they should never be
+//  called for this derived class.
+#define NotImplemented notImplemented(FUNCTION_NAME)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/error/messageStream.C b/src/OpenFOAM/db/error/messageStream.C
index 3f738e4280..90d196ac6e 100644
--- a/src/OpenFOAM/db/error/messageStream.C
+++ b/src/OpenFOAM/db/error/messageStream.C
@@ -217,7 +217,7 @@ Foam::messageStream::operator Foam::OSstream&()
 
                 if (errorCount_ >= maxErrors_)
                 {
-                    FatalErrorIn("messageStream::operator OSstream&()")
+                    FatalErrorInFunction
                         << "Too many errors"
                         << abort(FatalError);
                 }
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index f572e64265..c16e811d48 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -218,65 +218,87 @@ extern messageStream Info;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Convenience macros to add the file name and line number to the function name
 
-/**
- * \def SeriousErrorIn(functionName)
- * Report an error message using Foam::SeriousError for functionName in
- * file __FILE__ at line __LINE__
-*/
-#define SeriousErrorIn(fn)                                                    \
-    ::Foam::SeriousError((fn), __FILE__, __LINE__)
+// Compiler provided function name string:
+//     for gcc-compatible compilers use __PRETTY_FUNCTION__
+//     otherwise use the standard __func__
+#ifdef __GNUC__
+    #define FUNCTION_NAME __PRETTY_FUNCTION__
+#else
+    #define FUNCTION_NAME __func__
+#endif
 
-/**
- * \def SeriousIOErrorIn(functionName, ios)
- * Report an IO error message using Foam::SeriousError for functionName in
- * file __FILE__ at line __LINE__
- * for a particular IOstream
-*/
-#define SeriousIOErrorIn(fn, ios)                                             \
-    ::Foam::SeriousError((fn), __FILE__, __LINE__, ios)
 
-/**
- * \def WarningIn(functionName)
- * Report a warning using Foam::Warning for functionName in
- * file __FILE__ at line __LINE__
-*/
-#define WarningIn(fn)                                                         \
-    ::Foam::Warning((fn), __FILE__, __LINE__)
+//- Report an error message using Foam::SeriousError
+//  for functionName in file __FILE__ at line __LINE__
+#define SeriousErrorIn(functionName)                                           \
+    ::Foam::SeriousError((functionName), __FILE__, __LINE__)
 
-/**
- * \def IOWarningIn(functionName, ios)
- * Report an IO warning using Foam::Warning for functionName in
- * file __FILE__ at line __LINE__
- * for a particular IOstream
-*/
-#define IOWarningIn(fn, ios)                                                  \
-    ::Foam::Warning((fn), __FILE__, __LINE__, (ios))
+//- Report an error message using Foam::SeriousError
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+#define SeriousErrorInFunction SeriousErrorIn(FUNCTION_NAME)
 
-/**
- * \def InfoIn(functionName)
- * Report a information message using Foam::Info for functionName in
- * file __FILE__ at line __LINE__
-*/
-#define InfoIn(fn)                                                            \
-    ::Foam::Info((fn), __FILE__, __LINE__)
 
-/**
- * \def IOInfoIn(functionName, ios)
- * Report an IO information message using Foam::Info for functionName in
- * file __FILE__ at line __LINE__
- * for a particular IOstream
-*/
-#define IOInfoIn(fn, ios)                                                     \
-    ::Foam::Info((fn), __FILE__, __LINE__, (ios))
+//- Report an IO error message using Foam::SeriousError
+//  for functionName in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define SeriousIOErrorIn(functionName, ios)                                    \
+    ::Foam::SeriousError((functionName), __FILE__, __LINE__, ios)
 
-/**
- * \def Debug(variable)
- * Report a variable name and value using Foam::Pout in
- * file __FILE__ at line __LINE__
-*/
-#define Debug(var)                                                            \
-    ::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] "                  \
-        << #var " = " << var << ::Foam::endl
+//- Report an IO error message using Foam::SeriousError
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define SeriousIOErrorInFunction(ios) SeriousIOErrorIn(FUNCTION_NAME, ios)
+
+
+//- Report a warning using Foam::Warning
+//  for functionName in file __FILE__ at line __LINE__
+#define WarningIn(functionName)                                                \
+    ::Foam::Warning((functionName), __FILE__, __LINE__)
+
+//- Report a warning using Foam::Warning
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+#define WarningInFunction WarningIn(FUNCTION_NAME)
+
+
+//- Report an IO warning using Foam::Warning
+//  for functionName in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define IOWarningIn(functionName, ios)                                         \
+    ::Foam::Warning((functionName), __FILE__, __LINE__, (ios))
+
+//- Report an IO warning using Foam::Warning
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define IOWarningInFunction(ios) IOWarningIn(FUNCTION_NAME, ios)
+
+
+//- Report a information message using Foam::Info
+//  for functionName in file __FILE__ at line __LINE__
+#define InfoIn(functionName)                                                   \
+    ::Foam::Info((functionName), __FILE__, __LINE__)
+
+//- Report a information message using Foam::Info
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+#define InfoInFunction InfoIn(FUNCTION_NAME)
+
+
+//- Report an IO information message using Foam::Info
+//  for functionName in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define IOInfoIn(functionName, ios)                                            \
+    ::Foam::Info((functionName), __FILE__, __LINE__, (ios))
+
+//- Report an IO information message using Foam::Info
+//  for FUNCTION_NAME in file __FILE__ at line __LINE__
+//  for a particular IOstream
+#define IOInfoInFunction(ios) IOInfoIn(FUNCTION_NAME, ios)
+
+
+//- Report a variable name and value
+//  using Foam::Pout in file __FILE__ at line __LINE__
+#define Debug(var)                                                             \
+    ::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] "                   \
+    << #var " " << var << ::Foam::endl
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
index 100e88f27f..35ad1428d0 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,10 +47,14 @@ void Foam::OutputFilterFunctionObject<OutputFilter>::readDict()
 template<class OutputFilter>
 bool Foam::OutputFilterFunctionObject<OutputFilter>::active() const
 {
+    // The logic here mimics that of Time itself and uses 0.5*deltaT
+    // as the tolerance to account for numerical precision errors
+    // (see e.g. Time::run()) since the current time might be e.g.
+    // 0.3000000000001 instead of exactly 0.3.
     return
         enabled_
-     && time_.value() >= timeStart_
-     && time_.value() <= timeEnd_;
+     && time_.value() >= (timeStart_ - 0.5*time_.deltaTValue())
+     && time_.value() <= (timeEnd_ + 0.5*time_.deltaTValue());
 }
 
 
@@ -179,6 +183,13 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
             destroyFilter();
         }
     }
+    else if (enabled_ && time_.value() > timeEnd_)
+    {
+        // End early if the time is controlled by the user timeEnd entry
+        end();
+
+        enabled_ = false;
+    }
 
     return true;
 }
@@ -196,11 +207,6 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
 
         ptr_->end();
 
-        if (outputControl_.output())
-        {
-            ptr_->write();
-        }
-
         if (!storeFilter_)
         {
             destroyFilter();
@@ -236,6 +242,9 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::adjustTimeStep()
         const label  outputTimeIndex = outputControl_.outputTimeLastDump();
         const scalar writeInterval = outputControl_.writeInterval();
 
+        // Logic mimics that of Time::adjustDeltaT() except we only allow
+        // making the time step lower.
+
         scalar timeToNextWrite = max
         (
             0.0,
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
index 6e874dc52a..3b54ebc779 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,15 @@ Note
     writeInterval to be degrees crank angle, but the functionObject
     execution \a interval would still be in timestep.
 
+    The function object can be limited to operate within a time range using
+    the timeStart and timEnd options.  All objects are read (and the
+    OutputFilter allocated) on construction.  However, if a timeEnd is
+    supplied, the object will call the 'end' function of the filter
+    at the timeEnd time and destroy the filter.
+    Any other callback (execute(), write(), timeSet() etc) will only operate
+    if within the timeStart, timeEnd time range. Note that the time range
+    uses 0.5 * deltaT as a comparison tolerance to account for precision errors.
+
 SourceFiles
     OutputFilterFunctionObject.C
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 2cb5bd0cd1..b6a2a8b192 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,11 +70,8 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
 
     if (!dictionaryConstructorTablePtr_)
     {
-        FatalErrorIn
-        (
-            "functionObject::New"
-            "(const word& name, const Time&, const dictionary&)"
-        )   << "Unknown function type "
+        FatalErrorInFunction
+            << "Unknown function type "
             << functionType << nl << nl
             << "Table of functionObjects is empty" << endl
             << exit(FatalError);
@@ -85,11 +82,8 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "functionObject::New"
-            "(const word& name, const Time&, const dictionary&)"
-        )   << "Unknown function type "
+        FatalErrorInFunction
+            << "Unknown function type "
             << functionType << nl << nl
             << "Valid functions are : " << nl
             << dictionaryConstructorTablePtr_->sortedToc() << endl
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index ef4e6591fb..2d0d3ed1cb 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
         //- Return clone
         autoPtr<functionObject> clone() const
         {
-            notImplemented("functionObject::clone() const");
+            NotImplemented;
             return autoPtr<functionObject>(NULL);
         }
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C
index 847747964d..b8d24fff8a 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,7 @@ Foam::label Foam::functionObjectFile::addChars = 7;
 void Foam::functionObjectFile::initStream(Ostream& os) const
 {
     os.setf(ios_base::scientific, ios_base::floatfield);
+    os.precision(writePrecision_);
     os.width(charWidth());
 }
 
@@ -78,78 +79,44 @@ Foam::fileName Foam::functionObjectFile::baseTimeDir() const
 }
 
 
-void Foam::functionObjectFile::createFiles()
+Foam::autoPtr<Foam::OFstream> Foam::functionObjectFile::createFile
+(
+    const word& name
+) const
 {
-    if (Pstream::master())
+    autoPtr<OFstream> osPtr;
+
+    if (Pstream::master() && writeToFile_)
     {
         const word startTimeName =
             obr_.time().timeName(obr_.time().startTime().value());
 
-        forAll(names_, i)
+        fileName outputDir(baseFileDir()/prefix_/startTimeName);
+
+        mkDir(outputDir);
+
+        word fName(name);
+
+        // Check if file already exists
+        IFstream is(outputDir/(fName + ".dat"));
+        if (is.good())
         {
-            if (!filePtrs_.set(i))
-            {
-                fileName outputDir(baseFileDir()/prefix_/startTimeName);
-                mkDir(outputDir);
-
-                word fName(names_[i]);
-
-                // Check if file already exists
-                IFstream is(outputDir/(fName + ".dat"));
-                if (is.good())
-                {
-                    fName = fName + "_" + obr_.time().timeName();
-                }
-
-                filePtrs_.set(i, new OFstream(outputDir/(fName + ".dat")));
-
-                initStream(filePtrs_[i]);
-
-                writeFileHeader(i);
-
-            }
+            fName = fName + "_" + obr_.time().timeName();
         }
+
+        osPtr.set(new OFstream(outputDir/(fName + ".dat")));
+
+        initStream(osPtr());
     }
+
+    return osPtr;
 }
 
 
-void Foam::functionObjectFile::writeFileHeader(const label i)
-{}
-
-
-void Foam::functionObjectFile::write()
+void Foam::functionObjectFile::resetFile(const word& fileName)
 {
-    createFiles();
-}
-
-
-void Foam::functionObjectFile::resetNames(const wordList& names)
-{
-    names_.clear();
-    names_.append(names);
-
-    if (Pstream::master())
-    {
-        filePtrs_.clear();
-        filePtrs_.setSize(names_.size());
-
-        createFiles();
-    }
-}
-
-
-void Foam::functionObjectFile::resetName(const word& name)
-{
-    names_.clear();
-    names_.append(name);
-
-    if (Pstream::master())
-    {
-        filePtrs_.clear();
-        filePtrs_.setSize(1);
-
-        createFiles();
-    }
+    fileName_ = fileName;
+    filePtr_ = createFile(fileName_);
 }
 
 
@@ -169,8 +136,10 @@ Foam::functionObjectFile::functionObjectFile
 :
     obr_(obr),
     prefix_(prefix),
-    names_(),
-    filePtrs_()
+    fileName_("undefined"),
+    filePtr_(),
+    writePrecision_(IOstream::defaultPrecision()),
+    writeToFile_(true)
 {}
 
 
@@ -178,46 +147,22 @@ Foam::functionObjectFile::functionObjectFile
 (
     const objectRegistry& obr,
     const word& prefix,
-    const word& name
+    const word& fileName,
+    const dictionary& dict
 )
 :
     obr_(obr),
     prefix_(prefix),
-    names_(),
-    filePtrs_()
+    fileName_(fileName),
+    filePtr_(),
+    writePrecision_(IOstream::defaultPrecision()),
+    writeToFile_(true)
 {
-    names_.clear();
-    names_.append(name);
-    if (Pstream::master())
+    read(dict);
+
+    if (writeToFile_)
     {
-        filePtrs_.clear();
-        filePtrs_.setSize(1);
-
-        // Cannot create files - need to access virtual function
-    }
-}
-
-
-Foam::functionObjectFile::functionObjectFile
-(
-    const objectRegistry& obr,
-    const word& prefix,
-    const wordList& names
-)
-:
-    obr_(obr),
-    prefix_(prefix),
-    names_(names),
-    filePtrs_()
-{
-    names_.clear();
-    names_.append(names);
-    if (Pstream::master())
-    {
-        filePtrs_.clear();
-        filePtrs_.setSize(names_.size());
-
-        // Cannot create files - need to access virtual function
+        filePtr_ = createFile(fileName_);
     }
 }
 
@@ -230,72 +175,37 @@ Foam::functionObjectFile::~functionObjectFile()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::wordList& Foam::functionObjectFile::names() const
+void Foam::functionObjectFile::read(const dictionary& dict)
 {
-    return names_;
+    writePrecision_ =
+        dict.lookupOrDefault("writePrecision", IOstream::defaultPrecision());
+
+    // Only write on master process
+    writeToFile_ = dict.lookupOrDefault("writeToFile", true);
+    writeToFile_ = writeToFile_ && Pstream::master();
 }
 
 
 Foam::OFstream& Foam::functionObjectFile::file()
 {
-    if (!Pstream::master())
+    if (!writeToFile_)
     {
-        FatalErrorIn("Foam::OFstream& Foam::functionObjectFile::file()")
-            << "Request for file() can only be done by the master process"
-            << abort(FatalError);
+        return Snull;
     }
 
-    if (filePtrs_.size() != 1)
+    if (!filePtr_.valid())
     {
-        WarningIn("Foam::Ostream& Foam::functionObjectFile::file()")
-            << "Requested single file, but multiple files are present"
-            << endl;
+        FatalErrorInFunction
+            << "File pointer not allocated";
     }
 
-    if (!filePtrs_.set(0))
-    {
-        FatalErrorIn("Foam::OFstream& Foam::functionObjectFile::file()")
-            << "File pointer at index " << 0 << " not allocated"
-            << abort(FatalError);
-    }
-
-    return filePtrs_[0];
+    return filePtr_();
 }
 
 
-Foam::PtrList<Foam::OFstream>& Foam::functionObjectFile::files()
+bool Foam::functionObjectFile::writeToFile() const
 {
-    if (!Pstream::master())
-    {
-        FatalErrorIn("Foam::OFstream& Foam::functionObjectFile::files()")
-            << "Request for files() can only be done by the master process"
-            << abort(FatalError);
-    }
-
-    return filePtrs_;
-}
-
-
-Foam::OFstream& Foam::functionObjectFile::file(const label i)
-{
-    if (!Pstream::master())
-    {
-        FatalErrorIn
-        (
-            "Foam::OFstream& Foam::functionObjectFile::file(const label)"
-        )
-            << "Request for file(i) can only be done by the master process"
-            << abort(FatalError);
-    }
-
-    if (!filePtrs_.set(i))
-    {
-        FatalErrorIn("Foam::OFstream& Foam::functionObjectFile::file()")
-            << "File pointer at index " << i << " not allocated"
-            << abort(FatalError);
-    }
-
-    return filePtrs_[i];
+    return writeToFile_;
 }
 
 
@@ -337,4 +247,10 @@ void Foam::functionObjectFile::writeHeader
 }
 
 
+void Foam::functionObjectFile::writeTime(Ostream& os) const
+{
+    os  << setw(charWidth()) << obr_.time().timeName();
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
index 5b5e3597a1..c07d8df234 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,6 +57,8 @@ namespace Foam
 
 class functionObjectFile
 {
+private:
+
     // Private data
 
         //- Reference to the database
@@ -65,15 +67,24 @@ class functionObjectFile
         //- Prefix
         const word prefix_;
 
-        //- File names
-        wordList names_;
+        //- Name of file
+        word fileName_;
 
         //- File pointer
-        PtrList<OFstream> filePtrs_;
+        autoPtr<OFstream> filePtr_;
+
+        //- Write precision
+        label writePrecision_;
 
 
 protected:
 
+    // Protected Data
+
+        //- Flag to enable/disable writing to file
+        bool writeToFile_;
+
+
     // Protected Member Functions
 
         //- Initialise the output stream for writing
@@ -85,20 +96,11 @@ protected:
         //- Return the base directory for the current time value
         virtual fileName baseTimeDir() const;
 
-        //- Create the output file
-        virtual void createFiles();
+        //- Return an autoPtr to a new file
+        virtual autoPtr<OFstream> createFile(const word& name) const;
 
-        //- File header information
-        virtual void writeFileHeader(const label i = 0);
-
-        //- Write function
-        virtual void write();
-
-        //- Reset the list of names from a wordList
-        virtual void resetNames(const wordList& names);
-
-        //- Reset the list of names to a single name entry
-        virtual void resetName(const word& name);
+        //- Reset internal file pointer to new file with new name
+        virtual void resetFile(const word& name);
 
         //- Return the value width when writing to stream with optional offset
         virtual Omanip<int> valueWidth(const label offset = 0) const;
@@ -118,26 +120,18 @@ public:
     //- Additional characters for writing
     static label addChars;
 
-
     // Constructors
 
         //- Construct null
         functionObjectFile(const objectRegistry& obr, const word& prefix);
 
-        //- Construct from components
+        //- Construct from components and read options from dictionary
         functionObjectFile
         (
             const objectRegistry& obr,
             const word& prefix,
-            const word& name
-        );
-
-        //- Construct from components
-        functionObjectFile
-        (
-            const objectRegistry& obr,
-            const word& prefix,
-            const wordList& names
+            const word& fileName,
+            const dictionary& dict
         );
 
 
@@ -147,17 +141,14 @@ public:
 
     // Member Functions
 
-        //- Return const access to the names
-        const wordList& names() const;
+        //- Read
+        void read(const dictionary& dict);
 
         //- Return access to the file (if only 1)
         OFstream& file();
 
-        //- Return access to the files
-        PtrList<OFstream>& files();
-
-        //- Return file 'i'
-        OFstream& file(const label i);
+        //- Return true if can write to file
+        bool writeToFile() const;
 
         //- Write a commented string to stream
         void writeCommented
@@ -180,6 +171,9 @@ public:
             const string& str
         ) const;
 
+        //- Write the current time to stream
+        void writeTime(Ostream& os) const;
+
         //- Write a (commented) header property and value pair
         template<class Type>
         void writeHeaderValue
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 0c44dbbfbd..7845c5fbc6 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,28 @@ License
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
+void Foam::functionObjectList::createStateDict() const
+{
+    // Cannot set the state dictionary on construction since Time has not
+    // been fully initialised
+    stateDictPtr_.reset
+    (
+        new IOdictionary
+        (
+            IOobject
+            (
+                "functionObjectProperties",
+                time_.timeName(),
+                "uniform"/word("functionObjects"),
+                time_,
+                IOobject::READ_IF_PRESENT,
+                IOobject::NO_WRITE
+            )
+        )
+    );
+}
+
+
 Foam::functionObject* Foam::functionObjectList::remove
 (
     const word& key,
@@ -70,6 +92,7 @@ Foam::functionObjectList::functionObjectList
     indices_(),
     time_(t),
     parentDict_(t.controlDict()),
+    stateDictPtr_(),
     execution_(execution),
     updated_(false)
 {}
@@ -87,6 +110,7 @@ Foam::functionObjectList::functionObjectList
     indices_(),
     time_(t),
     parentDict_(parentDict),
+    stateDictPtr_(),
     execution_(execution),
     updated_(false)
 {}
@@ -100,6 +124,28 @@ Foam::functionObjectList::~functionObjectList()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+Foam::IOdictionary& Foam::functionObjectList::stateDict()
+{
+    if (!stateDictPtr_.valid())
+    {
+        createStateDict();
+    }
+
+    return stateDictPtr_();
+}
+
+
+const Foam::IOdictionary& Foam::functionObjectList::stateDict() const
+{
+    if (!stateDictPtr_.valid())
+    {
+        createStateDict();
+    }
+
+    return stateDictPtr_();
+}
+
+
 void Foam::functionObjectList::clear()
 {
     PtrList<functionObject>::clear();
@@ -165,6 +211,22 @@ bool Foam::functionObjectList::execute(const bool forceWrite)
         }
     }
 
+    // Force writing of state dictionary after function object execution
+    if (time_.outputTime())
+    {
+        label oldPrecision = IOstream::precision_;
+        IOstream::precision_ = 16;
+
+        stateDictPtr_->writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            time_.writeCompression()
+        );
+
+        IOstream::precision_ = oldPrecision;
+    }
+
     return ok;
 }
 
@@ -234,6 +296,11 @@ bool Foam::functionObjectList::adjustTimeStep()
 
 bool Foam::functionObjectList::read()
 {
+    if (!stateDictPtr_.valid())
+    {
+        createStateDict();
+    }
+
     bool ok = true;
     updated_ = execution_;
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 126a1f18bb..6a46de6063 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,7 @@ SourceFiles
 #include "functionObject.H"
 #include "SHA1Digest.H"
 #include "HashTable.H"
+#include "IOdictionary.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -74,6 +75,9 @@ class functionObjectList
         //  functionObject specifications.
         const dictionary& parentDict_;
 
+        //- Function object properties - stores state information
+        mutable autoPtr<IOdictionary> stateDictPtr_;
+
         //- Switch for the execution of the functionObjects
         bool execution_;
 
@@ -83,6 +87,9 @@ class functionObjectList
 
     // Private Member Functions
 
+        //- Create state dictionary
+        void createStateDict() const;
+
         //- Remove and return the function object pointer by name,
         //  and returns the old index via the parameter.
         //  Returns a NULL pointer (and index -1) if it didn't exist.
@@ -136,6 +143,12 @@ public:
         //- Access to the functionObjects
         using PtrList<functionObject>::operator[];
 
+        //- Return the state dictionary
+        IOdictionary& stateDict();
+
+        //- Return const access to the state dictionary
+        const IOdictionary& stateDict() const;
+
         //- Clear the list of function objects
         virtual void clear();
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.C b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.C
new file mode 100644
index 0000000000..ce0b1c850f
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.C
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "functionObjectState.H"
+#include "Time.H"
+
+const Foam::word Foam::functionObjectState::resultsName_ = "results";
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjectState::functionObjectState
+(
+    const objectRegistry& obr,
+    const word& name
+)
+:
+    obr_(obr),
+    name_(name),
+    active_(true),
+    stateDict_
+    (
+        const_cast<IOdictionary&>(obr.time().functionObjects().stateDict())
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjectState::~functionObjectState()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::word& Foam::functionObjectState::name() const
+{
+    return name_;
+}
+
+
+bool Foam::functionObjectState::active() const
+{
+    return active_;
+}
+
+
+const Foam::IOdictionary& Foam::functionObjectState::stateDict() const
+{
+    return stateDict_;
+}
+
+
+Foam::dictionary& Foam::functionObjectState::propertyDict()
+{
+    if (!stateDict_.found(name_))
+    {
+        stateDict_.add(name_, dictionary());
+    }
+
+    return stateDict_.subDict(name_);
+}
+
+
+bool Foam::functionObjectState::foundProperty(const word& entryName) const
+{
+    if (stateDict_.found(name_))
+    {
+        const dictionary& baseDict = stateDict_.subDict(name_);
+        return baseDict.found(entryName);
+    }
+
+    return false;
+}
+
+
+Foam::word Foam::functionObjectState::resultType(const word& entryName) const
+{
+    return objectResultType(name_, entryName);
+}
+
+
+Foam::word Foam::functionObjectState::objectResultType
+(
+    const word& objectName,
+    const word& entryName
+) const
+{
+    word result = word::null;
+
+    if (stateDict_.found(resultsName_))
+    {
+        const dictionary& resultsDict = stateDict_.subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            forAllConstIter(dictionary, objectDict, iter)
+            {
+                const dictionary& dict = iter().dict();
+
+                if (dict.found(entryName))
+                {
+                    return dict.dictName();
+                }
+            }
+        }
+    }
+
+    return result;
+}
+
+
+Foam::List<Foam::word> Foam::functionObjectState::objectResultEntries() const
+{
+    return objectResultEntries(name_);
+}
+
+
+Foam::List<Foam::word> Foam::functionObjectState::objectResultEntries
+(
+    const word& objectName
+) const
+{
+    DynamicList<word> result(2);
+
+    if (stateDict_.found(resultsName_))
+    {
+        const dictionary& resultsDict = stateDict_.subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            forAllConstIter(dictionary, objectDict, iter)
+            {
+                const dictionary& dict = iter().dict();
+                result.append(dict.toc());
+            }
+        }
+    }
+
+    wordList entries;
+    entries.transfer(result);
+
+    return entries;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H
new file mode 100644
index 0000000000..c945451dac
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H
@@ -0,0 +1,255 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::functionObjectState
+
+Description
+    Base class for function objects, adding functionality to read/write state
+    information (data required for smooth restart behaviour) and results
+    to/from the state dictionary
+
+See Also
+    Foam::functionObject
+
+SourceFiles
+    functionObjectState.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjectState_H
+#define functionObjectState_H
+
+#include "objectRegistry.H"
+#include "IOdictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class functionObjectState Declaration
+\*---------------------------------------------------------------------------*/
+
+class functionObjectState
+{
+private:
+
+    // Private data
+
+        //- Name of the results dictionary
+        static const word resultsName_;
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+
+protected:
+
+    // Protected data
+
+        //- Name of model
+        const word name_;
+
+        //- Flag to indicate whether the object is active
+        bool active_;
+
+        //- Reference to the state dictionary
+        IOdictionary& stateDict_;
+
+
+protected:
+
+    // Protected Member Functions
+
+        //- Disallow default bitwise copy construct
+        functionObjectState(const functionObjectState&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionObjectState&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        functionObjectState
+        (
+            const objectRegistry& obr,
+            const word& name
+        );
+
+
+    //- Destructor
+    virtual ~functionObjectState();
+
+
+    // Member Functions
+
+        //- Return the name
+        const word& name() const;
+
+        //- Return the active flag
+        bool active() const;
+
+        //- Return access to the state dictionary
+        const IOdictionary& stateDict() const;
+
+        //- Return access to the property dictionary
+        dictionary& propertyDict();
+
+        //- Set the active status by querying objectRegistry type
+        //  returns new active status
+        template<class Type>
+        bool setActive();
+
+
+        // Properties
+
+            //- Return true if the property exists
+            bool foundProperty(const word& entryName) const;
+
+            //- Retrieve generic property
+            template<class Type>
+            Type getProperty
+            (
+                const word& entryName,
+                const Type& defaultValue = pTraits<Type>::zero
+            ) const;
+
+            //- Retrieve generic property
+            template<class Type>
+            void getProperty(const word& entryName, Type& value) const;
+
+            //- Add generic property
+            template<class Type>
+            void setProperty(const word& entryName, const Type& value);
+
+            //- Retrieve generic property from named object
+            template<class Type>
+            Type getObjectProperty
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& defaultValue = pTraits<Type>::zero
+            ) const;
+
+            //- Retrieve generic property from named object
+            template<class Type>
+            void getObjectProperty
+            (
+                const word& objectName,
+                const word& entryName,
+                Type& value
+            ) const;
+
+            //- Add generic property from named object
+            template<class Type>
+            void setObjectProperty
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& value
+            );
+
+
+        // Results
+
+            //- Add result
+            template<class Type>
+            void setResult
+            (
+                const word& entryName,
+                const Type& value
+            );
+
+            //- Add result from named object
+            template<class Type>
+            void setObjectResult
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& value
+            );
+
+            //- Retrieve result
+            template<class Type>
+            Type getResult
+            (
+                const word& entryName,
+                const Type& defaultValue = pTraits<Type>::zero
+            ) const;
+
+            //- Retrieve result from named object
+            template<class Type>
+            Type getObjectResult
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& defaultValue = pTraits<Type>::zero
+            ) const;
+
+            //- Retrieve result from named object
+            template<class Type>
+            void getObjectResult
+            (
+                const word& objectName,
+                const word& entryName,
+                Type& value
+            ) const;
+
+            //- Retrieve the result type
+            word resultType(const word& entryName) const;
+
+            //- Return the type of result
+            word objectResultType
+            (
+                const word& objectName,
+                const word& entryName
+            ) const;
+
+            //- Retrieve the result entries
+            List<word> objectResultEntries() const;
+
+            //- Return result entries for named object
+            List<word> objectResultEntries(const word& objectName) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "functionObjectStateTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectStateTemplates.C b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectStateTemplates.C
new file mode 100644
index 0000000000..f102eb0a4c
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectStateTemplates.C
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::functionObjectState::setActive()
+{
+    active_ = true;
+
+    if (!isA<Type>(obr_))
+    {
+        WarningInFunction
+            << "No " << Type::typeName << " available, deactivating " << name_
+            << endl;
+
+        active_ = false;
+    }
+
+    return active_;
+}
+
+
+template<class Type>
+Type Foam::functionObjectState::getProperty
+(
+    const word& entryName,
+    const Type& defaultValue
+) const
+{
+    Type result = defaultValue;
+    getProperty(entryName, result);
+    return result;
+}
+
+
+template<class Type>
+void Foam::functionObjectState::getProperty
+(
+    const word& entryName,
+    Type& value
+) const
+{
+    getObjectProperty(name_, entryName, value);
+}
+
+
+template<class Type>
+void Foam::functionObjectState::setProperty
+(
+    const word& entryName,
+    const Type& value
+)
+{
+    setObjectProperty(name_, entryName, value);
+}
+
+
+template<class Type>
+Type Foam::functionObjectState::getObjectProperty
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& defaultValue
+) const
+{
+    Type result = defaultValue;
+    getObjectProperty(objectName, entryName, result);
+    return result;
+}
+
+
+template<class Type>
+void Foam::functionObjectState::getObjectProperty
+(
+    const word& objectName,
+    const word& entryName,
+    Type& value
+) const
+{
+    if (stateDict_.found(objectName))
+    {
+        const dictionary& baseDict = stateDict_.subDict(objectName);
+        if (baseDict.found(entryName))
+        {
+            if (baseDict.isDict(entryName))
+            {
+                value = baseDict.subDict(entryName);
+            }
+            else
+            {
+                baseDict.lookup(entryName) >> value;
+            }
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::functionObjectState::setObjectProperty
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& value
+)
+{
+    if (!stateDict_.found(objectName))
+    {
+        stateDict_.add(objectName, dictionary());
+    }
+
+    dictionary& baseDict = stateDict_.subDict(objectName);
+    baseDict.add(entryName, value, true);
+}
+
+
+template<class Type>
+void Foam::functionObjectState::setResult
+(
+    const word& entryName,
+    const Type& value
+)
+{
+    setObjectResult(name_, entryName, value);
+}
+
+
+template<class Type>
+void Foam::functionObjectState::setObjectResult
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& value
+)
+{
+    if (!stateDict_.found(resultsName_))
+    {
+        stateDict_.add(resultsName_, dictionary());
+    }
+
+    dictionary& resultsDict = stateDict_.subDict(resultsName_);
+
+    if (!resultsDict.found(objectName))
+    {
+        resultsDict.add(name_, dictionary());
+    }
+
+    dictionary& objectDict = resultsDict.subDict(objectName);
+
+    const word& dictTypeName = pTraits<Type>::typeName;
+
+    if (!objectDict.found(dictTypeName))
+    {
+        objectDict.add(dictTypeName, dictionary());
+    }
+
+    dictionary& resultTypeDict = objectDict.subDict(dictTypeName);
+
+    resultTypeDict.add(entryName, value, true);
+}
+
+
+template<class Type>
+Type Foam::functionObjectState::getResult
+(
+    const word& entryName,
+    const Type& defaultValue
+) const
+{
+    return getObjectResult(name_, entryName, defaultValue);
+}
+
+
+template<class Type>
+Type Foam::functionObjectState::getObjectResult
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& defaultValue
+) const
+{
+    Type result = defaultValue;
+    getObjectResult(objectName, entryName, result);
+    return result;
+}
+
+
+template<class Type>
+void Foam::functionObjectState::getObjectResult
+(
+    const word& objectName,
+    const word& entryName,
+    Type& value
+) const
+{
+    if (stateDict_.found(resultsName_))
+    {
+        const dictionary& resultsDict = stateDict_.subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            const word& dictTypeName = pTraits<Type>::typeName;
+
+            if (objectDict.found(dictTypeName))
+            {
+                const dictionary& resultTypeDict =
+                    objectDict.subDict(dictTypeName);
+
+                resultTypeDict.readIfPresent<Type>(entryName, value);
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
index 5ddb9d564b..f7c2417133 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 namespace Foam
 {
     template<>
-    const char* NamedEnum<outputFilterOutputControl::outputControls, 7>::
+    const char* NamedEnum<outputFilterOutputControl::outputControls, 8>::
     names[] =
     {
         "timeStep",
@@ -40,11 +40,12 @@ namespace Foam
         "runTime",
         "clockTime",
         "cpuTime",
+        "onEnd",
         "none"
     };
 }
 
-const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 7>
+const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 8>
     Foam::outputFilterOutputControl::outputControlNames_;
 
 
@@ -113,6 +114,7 @@ void Foam::outputFilterOutputControl::read(const dictionary& dict)
             break;
         }
 
+        case ocOnEnd:
         default:
         {
             // do nothing
@@ -196,6 +198,13 @@ bool Foam::outputFilterOutputControl::output()
             break;
         }
 
+        case ocOnEnd:
+        {
+            scalar endTime = time_.endTime().value() - 0.5*time_.deltaTValue();
+            return time_.value() > endTime;
+            break;
+        }
+
         case ocNone:
         {
             return false;
@@ -204,7 +213,7 @@ bool Foam::outputFilterOutputControl::output()
         default:
         {
             // this error should not actually be possible
-            FatalErrorIn("bool Foam::outputFilterOutputControl::output()")
+            FatalErrorInFunction
                 << "Undefined output control: "
                 << outputControlNames_[outputControl_] << nl
                 << abort(FatalError);
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
index 1818fe1700..6cef209c15 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,6 +62,7 @@ public:
         ocRunTime,        /*!< run time for dumping */
         ocClockTime,      /*!< clock time for dumping */
         ocCpuTime,        /*!< cpu time for dumping */
+        ocOnEnd,          /*!< on end of run*/
         ocNone            /*!< no output */
     };
 
@@ -77,7 +78,7 @@ private:
         const word prefix_;
 
         //- String representation of outputControls enums
-        static const NamedEnum<outputControls, 7> outputControlNames_;
+        static const NamedEnum<outputControls, 8> outputControlNames_;
 
         //- Type of output
         outputControls outputControl_;
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 4903ca4e28..b592d7f7ee 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(objectRegistry, 0);
+    defineTypeNameAndDebug(objectRegistry, 0);
 }
 
 
@@ -185,7 +185,7 @@ Foam::label Foam::objectRegistry::getEvent() const
     {
         if (objectRegistry::debug)
         {
-            WarningIn("objectRegistry::getEvent() const")
+            WarningInFunction
                 << "Event counter has overflowed. "
                 << "Resetting counter on all dependent objects." << nl
                 << "This might cause extra evaluations." << endl;
@@ -195,21 +195,9 @@ Foam::label Foam::objectRegistry::getEvent() const
         curEvent = 1;
         event_ = 2;
 
-        for (const_iterator iter = begin(); iter != end(); ++iter)
-        {
-            const regIOobject& io = *iter();
 
-            if (objectRegistry::debug)
-            {
-                Pout<< "objectRegistry::getEvent() : "
-                    << "resetting count on " << iter.key() << endl;
-            }
-
-            if (io.eventNo() != 0)
-            {
-                const_cast<regIOobject&>(io).eventNo() = curEvent;
-            }
-        }
+        // No need to reset dependent objects; overflow is now handled
+        // in regIOobject::upToDate
     }
 
     return curEvent;
@@ -222,6 +210,7 @@ bool Foam::objectRegistry::checkIn(regIOobject& io) const
     {
         Pout<< "objectRegistry::checkIn(regIOobject&) : "
             << name() << " : checking in " << io.name()
+            << " of type " << io.type()
             << endl;
     }
 
@@ -246,7 +235,7 @@ bool Foam::objectRegistry::checkOut(regIOobject& io) const
         {
             if (objectRegistry::debug)
             {
-                WarningIn("objectRegistry::checkOut(regIOobject&)")
+                WarningInFunction
                     << name() << " : attempt to checkOut copy of "
                     << iter.key()
                     << endl;
@@ -354,6 +343,7 @@ bool Foam::objectRegistry::writeObject
             Pout<< "objectRegistry::write() : "
                 << name() << " : Considering writing object "
                 << iter.key()
+                << " of type " << iter()->type()
                 << " with writeOpt " << iter()->writeOpt()
                 << " to file " << iter()->objectPath()
                 << endl;
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index babb8a5890..2352b3a3bd 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -213,11 +213,7 @@ public:
             //  for this class, write is used instead
             virtual bool writeData(Ostream&) const
             {
-                notImplemented
-                (
-                    "void objectRegistry::writeData(Ostream&) const: "
-                    "use write() instead"
-                );
+                NotImplemented;
 
                 return false;
             }
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 4123c643ad..0c26009482 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -175,10 +175,8 @@ const Type& Foam::objectRegistry::lookupObject(const word& name) const
             return *vpsiPtr_;
         }
 
-        FatalErrorIn
-        (
-            "objectRegistry::lookupObject<Type>(const word&) const"
-        )   << nl
+        FatalErrorInFunction
+            << nl
             << "    lookup of " << name << " from objectRegistry "
             << this->name()
             << " successful\n    but it is not a " << Type::typeName
@@ -192,10 +190,8 @@ const Type& Foam::objectRegistry::lookupObject(const word& name) const
             return parent_.lookupObject<Type>(name);
         }
 
-        FatalErrorIn
-        (
-            "objectRegistry::lookupObject<Type>(const word&) const"
-        )   << nl
+        FatalErrorInFunction
+            << nl
             << "    request for " << Type::typeName
             << " " << name << " from objectRegistry " << this->name()
             << " failed\n    available objects of type " << Type::typeName
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 3a14d5968e..3b3f8a7f17 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -261,7 +261,7 @@ bool Foam::regIOobject::checkIn()
         {
             if (watchIndex_ != -1)
             {
-                FatalErrorIn("regIOobject::checkIn()")
+                FatalErrorInFunction
                     << "Object " << objectPath()
                     << " already watched with index " << watchIndex_
                     << abort(FatalError);
@@ -285,7 +285,7 @@ bool Foam::regIOobject::checkIn()
             {
                 // for ease of finding where attempted duplicate check-in
                 // originated
-                FatalErrorIn("regIOobject::checkIn()")
+                FatalErrorInFunction
                     << "failed to register object " << objectPath()
                     << " the name already exists in the objectRegistry" << endl
                     << "Contents:" << db().sortedToc()
@@ -293,7 +293,7 @@ bool Foam::regIOobject::checkIn()
             }
             else
             {
-                WarningIn("regIOobject::checkIn()")
+                WarningInFunction
                     << "failed to register object " << objectPath()
                     << " the name already exists in the objectRegistry"
                     << endl;
@@ -325,13 +325,41 @@ bool Foam::regIOobject::checkOut()
 
 bool Foam::regIOobject::upToDate(const regIOobject& a) const
 {
-    if (a.eventNo() >= eventNo_)
+    label da = a.eventNo()-eventNo_;
+
+    // In case of overflow *this.event() might be 2G but a.event() might
+    // have overflowed to 0.
+    // Detect this by detecting a massive difference (labelMax/2) between
+    // the two events.
+    //
+    //  a       *this   return
+    //  -       -----   ------
+    // normal operation:
+    //  11      10      false
+    //  11      11      false
+    //  10      11      true
+    // overflow situation:
+    //  0       big     false
+    //  big     0       true
+
+    if (da > labelMax/2)
     {
+        // *this.event overflowed but a.event not yet
+        return true;
+    }
+    else if (da < -labelMax/2)
+    {
+        // a.event overflowed but *this not yet
         return false;
     }
+    else if (da < 0)
+    {
+        // My event number higher than a
+        return true;
+    }
     else
     {
-        return true;
+        return false;
     }
 }
 
@@ -342,18 +370,7 @@ bool Foam::regIOobject::upToDate
     const regIOobject& b
 ) const
 {
-    if
-    (
-        a.eventNo() >= eventNo_
-     || b.eventNo() >= eventNo_
-    )
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
+    return upToDate(a) && upToDate(b);
 }
 
 
@@ -364,19 +381,7 @@ bool Foam::regIOobject::upToDate
     const regIOobject& c
 ) const
 {
-    if
-    (
-        a.eventNo() >= eventNo_
-     || b.eventNo() >= eventNo_
-     || c.eventNo() >= eventNo_
-    )
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
+    return upToDate(a) && upToDate(b) && upToDate(c);
 }
 
 
@@ -388,20 +393,7 @@ bool Foam::regIOobject::upToDate
     const regIOobject& d
 ) const
 {
-    if
-    (
-        a.eventNo() >= eventNo_
-     || b.eventNo() >= eventNo_
-     || c.eventNo() >= eventNo_
-     || d.eventNo() >= eventNo_
-    )
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
+    return upToDate(a) && upToDate(b) && upToDate(c) && upToDate(d);
 }
 
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
index 2808763aeb..ced5ee4865 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ inline Type& Foam::regIOobject::store(Type* tPtr)
 {
     if (!tPtr)
     {
-        FatalErrorIn("Type& regIOobject::store(Type*)")
+        FatalErrorInFunction
             << "object deallocated"
             << abort(FatalError);
     }
@@ -60,10 +60,8 @@ inline Type& Foam::regIOobject::store(autoPtr<Type>& atPtr)
 
     if (!tPtr)
     {
-        FatalErrorIn
-            (
-                "Type& regIOobject::store(autoPtr<Type>&)"
-            )   << "object deallocated"
+        FatalErrorInFunction
+                << "object deallocated"
                 << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index bc950e518f..abb36aa4b1 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,7 +35,7 @@ Foam::Istream& Foam::regIOobject::readStream()
 {
     if (IFstream::debug)
     {
-        Info<< "regIOobject::readStream() : "
+        Pout<< "regIOobject::readStream() : "
             << "reading object " << name()
             << " from file " << objectPath()
             << endl;
@@ -43,7 +43,7 @@ Foam::Istream& Foam::regIOobject::readStream()
 
     if (readOpt() == NO_READ)
     {
-        FatalErrorIn("regIOobject::readStream()")
+        FatalErrorInFunction
             << "NO_READ specified for read-constructor of object " << name()
             << " of class " << headerClassName()
             << abort(FatalError);
@@ -92,7 +92,7 @@ Foam::Istream& Foam::regIOobject::readStream()
         }
         else if (!readHeader(*isPtr_))
         {
-            FatalIOErrorIn("regIOobject::readStream()", *isPtr_)
+            FatalIOErrorInFunction(*isPtr_)
                 << "problem while reading header for object " << name()
                 << exit(FatalIOError);
         }
@@ -112,7 +112,7 @@ Foam::Istream& Foam::regIOobject::readStream(const word& expectName)
 {
     if (IFstream::debug)
     {
-        Info<< "regIOobject::readStream(const word&) : "
+        Pout<< "regIOobject::readStream(const word&) : "
             << "reading object " << name()
             << " from file " << objectPath()
             << endl;
@@ -133,7 +133,7 @@ Foam::Istream& Foam::regIOobject::readStream(const word& expectName)
          && headerClassName() != "dictionary"
         )
         {
-            FatalIOErrorIn("regIOobject::readStream(const word&)", *isPtr_)
+            FatalIOErrorInFunction(*isPtr_)
                 << "unexpected class name " << headerClassName()
                 << " expected " << expectName << endl
                 << "    while reading object " << name()
@@ -149,7 +149,7 @@ void Foam::regIOobject::close()
 {
     if (IFstream::debug)
     {
-        Info<< "regIOobject::close() : "
+        Pout<< "regIOobject::close() : "
             << "finished reading " << filePath()
             << endl;
     }
@@ -288,7 +288,7 @@ bool Foam::regIOobject::readIfModified()
         if (modified())
         {
             const fileName& fName = time().getFile(watchIndex_);
-            Info<< "regIOobject::readIfModified() : " << nl
+            Pout<< "regIOobject::readIfModified() : " << nl
                 << "    Re-reading object " << name()
                 << " from file " << fName << endl;
             return read();
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index bca640ea0a..3b436890fb 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ bool Foam::regIOobject::writeObject
 {
     if (!good())
     {
-        SeriousErrorIn("regIOobject::write()")
+        SeriousErrorInFunction
             << "bad object " << name()
             << endl;
 
@@ -51,7 +51,7 @@ bool Foam::regIOobject::writeObject
 
     if (instance().empty())
     {
-        SeriousErrorIn("regIOobject::write()")
+        SeriousErrorInFunction
             << "instance undefined for object " << name()
             << endl;
 
diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H
index 00981e3605..bd437b4d79 100644
--- a/src/OpenFOAM/db/typeInfo/typeInfo.H
+++ b/src/OpenFOAM/db/typeInfo/typeInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ inline To& dynamicCast(From& r)
     }
     catch (std::bad_cast)
     {
-        FatalErrorIn("dynamicCast<To>(From&)")
+        FatalErrorInFunction
             << "Attempt to cast type " << typeid(r).name()
             << " to type " << typeid(To).name()
             << abort(FatalError);
@@ -111,7 +111,7 @@ inline To& refCast(From& r)
     }
     catch (std::bad_cast)
     {
-        FatalErrorIn("refCast<To>(From&)")
+        FatalErrorInFunction
             << "Attempt to cast type " << r.type()
             << " to type " << To::typeName
             << abort(FatalError);
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index c289689ce9..11279746aa 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.C
@@ -168,7 +168,7 @@ bool Foam::dimensionSet::operator=(const dimensionSet& ds) const
 {
     if (dimensionSet::debug && *this != ds)
     {
-        FatalErrorIn("dimensionSet::operator=(const dimensionSet&) const")
+        FatalErrorInFunction
             << "Different dimensions for =" << endl
             << "     dimensions : " << *this << " = " << ds << endl
             << abort(FatalError);
@@ -182,7 +182,7 @@ bool Foam::dimensionSet::operator+=(const dimensionSet& ds) const
 {
     if (dimensionSet::debug && *this != ds)
     {
-        FatalErrorIn("dimensionSet::operator+=(const dimensionSet&) const")
+        FatalErrorInFunction
             << "Different dimensions for +=" << endl
             << "     dimensions : " << *this << " = " << ds << endl
             << abort(FatalError);
@@ -196,7 +196,7 @@ bool Foam::dimensionSet::operator-=(const dimensionSet& ds) const
 {
     if (dimensionSet::debug && *this != ds)
     {
-        FatalErrorIn("dimensionSet::operator-=(const dimensionSet&) const")
+        FatalErrorInFunction
             << "Different dimensions for -=" << endl
             << "     dimensions : " << *this << " = " << ds << endl
             << abort(FatalError);
@@ -228,7 +228,7 @@ Foam::dimensionSet Foam::max(const dimensionSet& ds1, const dimensionSet& ds2)
 {
     if (dimensionSet::debug && ds1 != ds2)
     {
-        FatalErrorIn("max(const dimensionSet&, const dimensionSet&)")
+        FatalErrorInFunction
             << "Arguments of max have different dimensions" << endl
             << "     dimensions : " << ds1 << " and " << ds2 << endl
             << abort(FatalError);
@@ -242,7 +242,7 @@ Foam::dimensionSet Foam::min(const dimensionSet& ds1, const dimensionSet& ds2)
 {
     if (dimensionSet::debug && ds1 != ds2)
     {
-        FatalErrorIn("min(const dimensionSet&, const dimensionSet&)")
+        FatalErrorInFunction
             << "Arguments of min have different dimensions" << endl
             << "     dimensions : " << ds1 << " and " << ds2 << endl
             << abort(FatalError);
@@ -297,7 +297,7 @@ Foam::dimensionSet Foam::pow
 {
     if (dimensionSet::debug && !dS.dimensions().dimensionless())
     {
-        FatalErrorIn("pow(const dimensionSet&, const dimensionedScalar&)")
+        FatalErrorInFunction
             << "Exponent of pow is not dimensionless"
             << abort(FatalError);
     }
@@ -330,7 +330,7 @@ Foam::dimensionSet Foam::pow
      && !ds.dimensionless()
     )
     {
-        FatalErrorIn("pow(const dimensionedScalar&, const dimensionSet&)")
+        FatalErrorInFunction
             << "Argument or exponent of pow not dimensionless" << endl
             << abort(FatalError);
     }
@@ -439,7 +439,7 @@ Foam::dimensionSet Foam::trans(const dimensionSet& ds)
 {
     if (dimensionSet::debug && !ds.dimensionless())
     {
-        FatalErrorIn("trans(const dimensionSet&)")
+        FatalErrorInFunction
             << "Argument of trancendental function not dimensionless"
             << abort(FatalError);
     }
@@ -452,7 +452,7 @@ Foam::dimensionSet Foam::atan2(const dimensionSet& ds1, const dimensionSet& ds2)
 {
     if (dimensionSet::debug && ds1 != ds2)
     {
-        FatalErrorIn("atan2(const dimensionSet&, const dimensionSet&)")
+        FatalErrorInFunction
             << "Arguments of atan2 have different dimensions" << endl
             << "     dimensions : " << ds1 << " and " << ds2 << endl
             << abort(FatalError);
@@ -486,8 +486,7 @@ Foam::dimensionSet Foam::operator+
 
     if (dimensionSet::debug && ds1 != ds2)
     {
-        FatalErrorIn
-            ("operator+(const dimensionSet&, const dimensionSet&)")
+        FatalErrorInFunction
             << "LHS and RHS of + have different dimensions" << endl
             << "     dimensions : " << ds1 << " + " << ds2 << endl
             << abort(FatalError);
@@ -507,8 +506,7 @@ Foam::dimensionSet Foam::operator-
 
     if (dimensionSet::debug && ds1 != ds2)
     {
-        FatalErrorIn
-            ("operator-(const dimensionSet&, const dimensionSet&)")
+        FatalErrorInFunction
             << "LHS and RHS of - have different dimensions" << endl
             << "     dimensions : " << ds1 << " - " << ds2 << endl
             << abort(FatalError);
diff --git a/src/OpenFOAM/dimensionSet/dimensionSetIO.C b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
index b7a2cbc5ae..7f7648e10d 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSetIO.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSetIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -292,11 +292,8 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
                 token t = tis.nextToken();
                 if (!t.isPunctuation()  || t.pToken() !=  token::END_LIST)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "dimensionSet::parse"
-                        "(const label, tokeniser&"
-                        ", const HashTable<dimensionedScalar>&)",
                         tis.stream()
                     )   << "Illegal token " << t << exit(FatalIOError);
                 }
@@ -364,22 +361,16 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "dimensionSet::parse"
-                    "(const label, tokeniser&"
-                    ", const HashTable<dimensionedScalar>&)",
                     tis.stream()
                 )   << "Illegal token " << nextToken << exit(FatalIOError);
             }
         }
         else
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "dimensionSet::parse"
-                "(const label, tokeniser&"
-                ", const HashTable<dimensionedScalar>&)",
                 tis.stream()
             )   << "Illegal token " << nextToken << exit(FatalIOError);
         }
@@ -422,10 +413,8 @@ Foam::Istream& Foam::dimensionSet::read
 
     if (startToken != token::BEGIN_SQR)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "dimensionSet::read"
-            "(Istream&, scalar&, const HashTable<dimensionedScalar>&)",
             is
         )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
             << endl << "in stream " << is.info()
@@ -480,10 +469,8 @@ Foam::Istream& Foam::dimensionSet::read
         // Check end of dimensionSet
         if (nextToken != token::END_SQR)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "dimensionSet::read"
-                "(Istream&, scalar&, const HashTable<dimensionedScalar>&)",
                 is
             )   << "expected a " << token::END_SQR << " in dimensionSet "
                 << endl << "in stream " << is.info()
@@ -521,10 +508,8 @@ Foam::Istream& Foam::dimensionSet::read
 
     if (startToken != token::BEGIN_SQR)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "dimensionSet::read"
-            "(Istream&, scalar&, const dictionary&)",
             is
         )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
             << endl << "in stream " << is.info()
@@ -623,10 +608,8 @@ Foam::Istream& Foam::dimensionSet::read
         // Check end of dimensionSet
         if (nextToken != token::END_SQR)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "dimensionSet::read"
-                "(Istream&, scalar&, const dictionary&)",
                 is
             )   << "expected a " << token::END_SQR << " in dimensionSet "
                 << endl << "in stream " << is.info()
@@ -734,7 +717,7 @@ Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
 
     if (mag(multiplier-1.0) > dimensionSet::smallExponent)
     {
-        FatalIOErrorIn("Foam::operator>>(Istream&, dimensionSet&)", is)
+        FatalIOErrorInFunction(is)
             << "Cannot use scaled units in dimensionSet"
             << exit(FatalIOError);
     }
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index dde9d17082..a2ad4482dd 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -102,7 +102,7 @@ const HashTable<dimensionedScalar>& unitSet()
 
         if (!dict.found("unitSet"))
         {
-            FatalIOErrorIn("unitSet()", dict)
+            FatalIOErrorInFunction(dict)
                 << "Cannot find unitSet in dictionary " << dict.name()
                 << exit(FatalIOError);
         }
@@ -111,7 +111,7 @@ const HashTable<dimensionedScalar>& unitSet()
 
         if (!dict.found(unitSetCoeffs))
         {
-            FatalIOErrorIn("unitSet()", dict)
+            FatalIOErrorInFunction(dict)
                 << "Cannot find " << unitSetCoeffs << " in dictionary "
                 << dict.name() << exit(FatalIOError);
         }
@@ -129,7 +129,7 @@ const HashTable<dimensionedScalar>& unitSet()
                 bool ok = unitSetPtr_->insert(iter().keyword(), dt);
                 if (!ok)
                 {
-                    FatalIOErrorIn("unitSet()", dict)
+                    FatalIOErrorInFunction(dict)
                         << "Duplicate unit " << iter().keyword()
                         << " in DimensionSets dictionary"
                         << exit(FatalIOError);
@@ -150,7 +150,7 @@ const HashTable<dimensionedScalar>& unitSet()
 
         if (writeUnitNames.size() != 0 && writeUnitNames.size() != 7)
         {
-            FatalIOErrorIn("unitSet()", dict)
+            FatalIOErrorInFunction(dict)
                 << "Cannot find entry \"writeUnits\" in " << unitDict.name()
                 << " or it is not a wordList of size 7"
                 << exit(FatalIOError);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
index fee971a8e8..57d9e6c450 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
@@ -236,7 +236,7 @@ dimensionedScalar func(const dimensionedScalar& ds)                        \
 {                                                                          \
     if (!ds.dimensions().dimensionless())                                  \
     {                                                                      \
-        FatalErrorIn(#func "(const dimensionedScalar& ds)")                \
+        FatalErrorInFunction                                               \
             << "ds not dimensionless"                                      \
             << abort(FatalError);                                          \
     }                                                                      \
@@ -280,14 +280,14 @@ dimensionedScalar func(const int n, const dimensionedScalar& ds)           \
 {                                                                          \
     if (!ds.dimensions().dimensionless())                                  \
     {                                                                      \
-        FatalErrorIn(#func "(const int n, const dimensionedScalar& ds)")   \
+        FatalErrorInFunction                                               \
             << "ds not dimensionless"                                      \
             << abort(FatalError);                                          \
     }                                                                      \
                                                                            \
     return dimensionedScalar                                               \
     (                                                                      \
-        #func "(" + name(n) + ',' + ds.name() + ')',                      \
+        #func "(" + name(n) + ',' + ds.name() + ')',                       \
         dimless,                                                           \
         ::func(n, ds.value())                                              \
     );                                                                     \
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index fdb38737a5..03ee76d7c9 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -54,10 +54,8 @@ void Foam::dimensioned<Type>::initialize(Istream& is)
 
         if (dims != dimensions_)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "dimensioned<Type>::dimensioned"
-                "(const word&, const dimensionSet&, Istream&)",
                 is
             ) << "The dimensions " << dims
               << " provided do not match the required dimensions "
@@ -537,7 +535,7 @@ Foam::dimensioned<Type> Foam::max
 {
     if (dt1.dimensions() != dt2.dimensions())
     {
-        FatalErrorIn("max(const dimensioned<Type>&, const dimensioned<Type>&)")
+        FatalErrorInFunction
             << "dimensions of arguments are not equal"
             << abort(FatalError);
     }
@@ -560,7 +558,7 @@ Foam::dimensioned<Type> Foam::min
 {
     if (dt1.dimensions() != dt2.dimensions())
     {
-        FatalErrorIn("min(const dimensioned<Type>&, const dimensioned<Type>&)")
+        FatalErrorInFunction
             << "dimensions of arguments are not equal"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index a33942e9b9..354805a77f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,10 +37,10 @@ namespace Foam
 #define checkField(df1, df2, op)                                    \
 if (&(df1).mesh() != &(df2).mesh())                                 \
 {                                                                   \
-    FatalErrorIn("checkField(df1, df2, op)")                        \
+    FatalErrorInFunction                                            \
         << "different mesh for fields "                             \
         << (df1).name() << " and " << (df2).name()                  \
-        << " during operatrion " <<  op                             \
+        << " during operation " <<  op                              \
         << abort(FatalError);                                       \
 }
 
@@ -63,12 +63,8 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 {
     if (field.size() && field.size() != GeoMesh::size(mesh))
     {
-        FatalErrorIn
-        (
-            "DimensionedField<Type, GeoMesh>::DimensionedField"
-            "(const IOobject& io,const Mesh& mesh, "
-            "const dimensionSet& dims, const Field<Type>& field)"
-        )   << "size of field = " << field.size()
+        FatalErrorInFunction
+            << "size of field = " << field.size()
             << " is not the same as the size of mesh = "
             << GeoMesh::size(mesh)
             << abort(FatalError);
@@ -433,11 +429,8 @@ void DimensionedField<Type, GeoMesh>::operator=
     // Check for assignment to self
     if (this == &df)
     {
-        FatalErrorIn
-        (
-            "DimensionedField<Type, GeoMesh>::operator="
-            "(const DimensionedField<Type, GeoMesh>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
@@ -459,11 +452,8 @@ void DimensionedField<Type, GeoMesh>::operator=
     // Check for assignment to self
     if (this == &df)
     {
-        FatalErrorIn
-        (
-            "DimensionedField<Type, GeoMesh>::operator="
-            "(const tmp<DimensionedField<Type, GeoMesh> >&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index b3beb9577c..6b86f17c46 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,6 +149,15 @@ public:
             const word& fieldDictEntry="value"
         );
 
+        //- Construct from dictionary
+        DimensionedField
+        (
+            const IOobject&,
+            const Mesh& mesh,
+            const dictionary& fieldDict,
+            const word& fieldDictEntry="value"
+        );
+
         //- Construct as copy
         DimensionedField
         (
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index be049a4be8..6ff8dd2c7f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,6 +80,24 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 }
 
 
+template<class Type, class GeoMesh>
+Foam::DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dictionary& fieldDict,
+    const word& fieldDictEntry
+)
+:
+    regIOobject(io),
+    Field<Type>(0),
+    mesh_(mesh),
+    dimensions_(dimless)
+{
+    readField(fieldDict, fieldDictEntry);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh>
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 019991ea99..8d1429f500 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -678,11 +678,8 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
 {                                                                           \
     if (!dsf.dimensions().dimensionless())                                  \
     {                                                                       \
-        FatalErrorIn                                                        \
-        (                                                                   \
-            #func"(const int n, "                                           \
-            "const DimensionedField<scalar, GeoMesh>& dsf)"                 \
-        )   << "dsf not dimensionless"                                      \
+        FatalErrorInFunction                                                \
+            << "dsf not dimensionless"                                      \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
@@ -717,11 +714,8 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
                                                                             \
     if (!dsf.dimensions().dimensionless())                                  \
     {                                                                       \
-        FatalErrorIn                                                        \
-        (                                                                   \
-            #func"(const int n, "                                           \
-            "const tmp<DimensionedField<scalar, GeoMesh> >& dsf)"           \
-        )   << " : dsf not dimensionless"                                   \
+        FatalErrorInFunction                                                \
+            << " : dsf not dimensionless"                                   \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index c6faf4a7da..6042b20448 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -45,11 +45,7 @@ void checkFields
 {
     if (f1.size() != f2.size())
     {
-        FatalErrorIn
-        (
-            "checkFields(const FieldField<Field, Type1>&, "
-            "const FieldField<Field, Type2>&, const char* op)"
-        )   << "    incompatible fields"
+        FatalErrorInFunction
             << " FieldField<" << pTraits<Type1>::typeName
             << "> f1(" << f1.size() << ')'
             << " and FieldField<" << pTraits<Type2>::typeName
@@ -70,13 +66,7 @@ void checkFields
 {
     if (f1.size() != f2.size() || f1.size() != f3.size())
     {
-        FatalErrorIn
-        (
-            "checkFields(const FieldField<Field, Type1>&, "
-            "const FieldField<Field, Type2>&, "
-            "const FieldField<Field, Type3>&, "
-            "const char* op)"
-        )   << "    incompatible fields"
+        FatalErrorInFunction
             << " FieldField<" << pTraits<Type1>::typeName
             << "> f1(" << f1.size() << ')'
             << ", FieldField<" <<pTraits<Type2>::typeName
@@ -297,11 +287,8 @@ void FieldField<Field, Type>::operator=(const FieldField<Field, Type>& f)
 {
     if (this == &f)
     {
-        FatalErrorIn
-        (
-            "FieldField<Field, Type>::"
-            "operator=(const FieldField<Field, Type>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
@@ -317,10 +304,8 @@ void FieldField<Field, Type>::operator=(const tmp<FieldField>& tf)
 {
     if (this == &(tf()))
     {
-        FatalErrorIn
-        (
-            "FieldField<Field, Type>::operator=(const tmp<FieldField>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 4dfc131e4b..1c6a990f35 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -524,7 +524,7 @@ Type average(const FieldField<Field, Type>& f)
 
         if (n == 0)
         {
-            WarningIn("average(const FieldField<Field, Type>&) const")
+            WarningInFunction
                 << "empty fieldField, returning zero" << endl;
 
             return pTraits<Type>::zero;
@@ -536,7 +536,7 @@ Type average(const FieldField<Field, Type>& f)
     }
     else
     {
-        WarningIn("average(const FieldField<Field, Type>&) const")
+        WarningInFunction
             << "empty fieldField, returning zero" << endl;
 
         return pTraits<Type>::zero;
@@ -587,7 +587,7 @@ Type gAverage(const FieldField<Field, Type>& f)
     }
     else
     {
-        WarningIn("gAverage(const FieldField<Field, Type>&) const")
+        WarningInFunction
             << "empty fieldField, returning zero" << endl;
 
         return pTraits<Type>::zero;
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index b028cc6d97..f185163e3a 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -339,11 +339,8 @@ Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::append
 {
     if (this == &lst)
     {
-        FatalErrorIn
-        (
-            "DynamicField<T, SizeInc, SizeMult, SizeDiv>::append"
-            "(const UList<T>&)"
-        )   << "attempted appending to self" << abort(FatalError);
+        FatalErrorInFunction
+            << "attempted appending to self" << abort(FatalError);
     }
 
     label nextFree = List<T>::size();
@@ -364,10 +361,8 @@ inline T Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::remove()
 
     if (elemI < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::remove()"
-        )   << "List is empty" << abort(FatalError);
+        FatalErrorInFunction
+            << "List is empty" << abort(FatalError);
     }
 
     const T& val = List<T>::operator[](elemI);
@@ -413,11 +408,8 @@ inline void Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::operator=
 {
     if (this == &lst)
     {
-        FatalErrorIn
-        (
-            "DynamicField<T, SizeInc, SizeMult, SizeDiv>::operator="
-            "(const DynamicField<T, SizeInc, SizeMult, SizeDiv>&)"
-        )   << "attempted assignment to self" << abort(FatalError);
+        FatalErrorInFunction
+            << "attempted assignment to self" << abort(FatalError);
     }
 
     if (capacity_ >= lst.size())
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 48fcaacac0..6da675ad87 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,8 @@ License
 #include "FieldM.H"
 #include "dictionary.H"
 #include "contiguous.H"
+#include "mapDistributeBase.H"
+#include "flipOp.H"
 
 // * * * * * * * * * * * * * * * Static Members  * * * * * * * * * * * * * * //
 
@@ -115,12 +117,13 @@ template<class Type>
 Foam::Field<Type>::Field
 (
     const UList<Type>& mapF,
-    const FieldMapper& mapper
+    const FieldMapper& mapper,
+    const bool applyFlip
 )
 :
     List<Type>(mapper.size())
 {
-    map(mapF, mapper);
+    map(mapF, mapper, applyFlip);
 }
 
 
@@ -129,12 +132,13 @@ Foam::Field<Type>::Field
 (
     const UList<Type>& mapF,
     const FieldMapper& mapper,
-    const Type& defaultValue
+    const Type& defaultValue,
+    const bool applyFlip
 )
 :
     List<Type>(mapper.size(), defaultValue)
 {
-    map(mapF, mapper);
+    map(mapF, mapper, applyFlip);
 }
 
 
@@ -143,12 +147,13 @@ Foam::Field<Type>::Field
 (
     const UList<Type>& mapF,
     const FieldMapper& mapper,
-    const UList<Type>& defaultValues
+    const UList<Type>& defaultValues,
+    const bool applyFlip
 )
 :
     List<Type>(defaultValues)
 {
-    map(mapF, mapper);
+    map(mapF, mapper, applyFlip);
 }
 
 
@@ -156,12 +161,13 @@ template<class Type>
 Foam::Field<Type>::Field
 (
     const tmp<Field<Type> >& tmapF,
-    const FieldMapper& mapper
+    const FieldMapper& mapper,
+    const bool applyFlip
 )
 :
     List<Type>(mapper.size())
 {
-    map(tmapF, mapper);
+    map(tmapF, mapper, applyFlip);
 }
 
 
@@ -170,12 +176,13 @@ Foam::Field<Type>::Field
 (
     const tmp<Field<Type> >& tmapF,
     const FieldMapper& mapper,
-    const Type& defaultValue
+    const Type& defaultValue,
+    const bool applyFlip
 )
 :
     List<Type>(mapper.size(), defaultValue)
 {
-    map(tmapF, mapper);
+    map(tmapF, mapper, applyFlip);
 }
 
 
@@ -184,12 +191,13 @@ Foam::Field<Type>::Field
 (
     const tmp<Field<Type> >& tmapF,
     const FieldMapper& mapper,
-    const UList<Type>& defaultValues
+    const UList<Type>& defaultValues,
+    const bool applyFlip
 )
 :
     List<Type>(defaultValues)
 {
-    map(tmapF, mapper);
+    map(tmapF, mapper, applyFlip);
 }
 
 
@@ -275,10 +283,8 @@ Foam::Field<Type>::Field
                 is >> static_cast<List<Type>&>(*this);
                 if (this->size() != s)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "Field<Type>::Field"
-                        "(const word& keyword, const dictionary&, const label)",
                         dict
                     )   << "size " << this->size()
                         << " is not equal to the given value of " << s
@@ -287,10 +293,8 @@ Foam::Field<Type>::Field
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "Field<Type>::Field"
-                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.wordToken()
@@ -301,10 +305,8 @@ Foam::Field<Type>::Field
         {
             if (is.version() == 2.0)
             {
-                IOWarningIn
+                IOWarningInFunction
                 (
-                    "Field<Type>::Field"
-                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', "
                        "assuming deprecated Field format from "
@@ -317,10 +319,8 @@ Foam::Field<Type>::Field
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "Field<Type>::Field"
-                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.info()
@@ -398,15 +398,7 @@ void Foam::Field<Type>::map
 
     if (mapWeights.size() != mapAddressing.size())
     {
-        FatalErrorIn
-        (
-            "void Field<Type>::map\n"
-            "(\n"
-            "    const UList<Type>& mapF,\n"
-            "    const labelListList& mapAddressing,\n"
-            "    const scalarListList& mapWeights\n"
-            ")"
-        ) << "Weights and addressing map have different sizes.  Weights size: "
+        FatalErrorInFunction
             << mapWeights.size() << " map size: " << mapAddressing.size()
             << abort(FatalError);
     }
@@ -443,21 +435,57 @@ template<class Type>
 void Foam::Field<Type>::map
 (
     const UList<Type>& mapF,
-    const FieldMapper& mapper
+    const FieldMapper& mapper,
+    const bool applyFlip
 )
 {
-    if
-    (
-        mapper.direct()
-     && notNull(mapper.directAddressing())
-     && mapper.directAddressing().size()
-    )
+    if (mapper.distributed())
     {
-        map(mapF, mapper.directAddressing());
+        // Fetch remote parts of mapF
+        const mapDistributeBase& distMap = mapper.distributeMap();
+        Field<Type> newMapF(mapF);
+
+        if (applyFlip)
+        {
+            distMap.distribute(newMapF);
+        }
+        else
+        {
+            distMap.distribute(newMapF, noOp());
+        }
+
+        if (mapper.direct() && notNull(mapper.directAddressing()))
+        {
+            map(newMapF, mapper.directAddressing());
+        }
+        else if (!mapper.direct())
+        {
+            map(newMapF, mapper.addressing(), mapper.weights());
+        }
+        else if (mapper.direct() && isNull(mapper.directAddressing()))
+        {
+            // Special case, no local mapper. Assume ordering already correct
+            // from distribution. Note: this behaviour is different compared
+            // to local mapper.
+            this->transfer(newMapF);
+            this->setSize(mapper.size());
+        }
     }
-    else if (!mapper.direct() && mapper.addressing().size())
+    else
     {
-        map(mapF, mapper.addressing(), mapper.weights());
+        if
+        (
+            mapper.direct()
+         && notNull(mapper.directAddressing())
+         && mapper.directAddressing().size()
+        )
+        {
+            map(mapF, mapper.directAddressing());
+        }
+        else if (!mapper.direct() && mapper.addressing().size())
+        {
+            map(mapF, mapper.addressing(), mapper.weights());
+        }
     }
 }
 
@@ -466,10 +494,11 @@ template<class Type>
 void Foam::Field<Type>::map
 (
     const tmp<Field<Type> >& tmapF,
-    const FieldMapper& mapper
+    const FieldMapper& mapper,
+    const bool applyFlip
 )
 {
-    map(tmapF(), mapper);
+    map(tmapF(), mapper, applyFlip);
     tmapF.clear();
 }
 
@@ -477,25 +506,62 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::autoMap
 (
-    const FieldMapper& mapper
+    const FieldMapper& mapper,
+    const bool applyFlip
 )
 {
-    if
-    (
-        (
-            mapper.direct()
-         && notNull(mapper.directAddressing())
-         && mapper.directAddressing().size()
-        )
-     || (!mapper.direct() && mapper.addressing().size())
-    )
+    if (mapper.distributed())
     {
+        // Fetch remote parts of *this
+        const mapDistributeBase& distMap = mapper.distributeMap();
         Field<Type> fCpy(*this);
-        map(fCpy, mapper);
+
+        if (applyFlip)
+        {
+            distMap.distribute(fCpy);
+        }
+        else
+        {
+            distMap.distribute(fCpy, noOp());
+        }
+
+        if
+        (
+            (mapper.direct()
+         && notNull(mapper.directAddressing()))
+         || !mapper.direct()
+        )
+        {
+            this->map(fCpy, mapper);
+        }
+        else if (mapper.direct() && isNull(mapper.directAddressing()))
+        {
+            // Special case, no local mapper. Assume ordering already correct
+            // from distribution. Note: this behaviour is different compared
+            // to local mapper.
+            this->transfer(fCpy);
+            this->setSize(mapper.size());
+        }
     }
     else
     {
-        this->setSize(mapper.size());
+        if
+        (
+            (
+                mapper.direct()
+             && notNull(mapper.directAddressing())
+             && mapper.directAddressing().size()
+            )
+         || (!mapper.direct() && mapper.addressing().size())
+        )
+        {
+            Field<Type> fCpy(*this);
+            map(fCpy, mapper);
+        }
+        else
+        {
+            this->setSize(mapper.size());
+        }
     }
 }
 
@@ -673,7 +739,7 @@ void Foam::Field<Type>::operator=(const Field<Type>& rhs)
 {
     if (this == &rhs)
     {
-        FatalErrorIn("Field<Type>::operator=(const Field<Type>&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
@@ -701,7 +767,7 @@ void Foam::Field<Type>::operator=(const tmp<Field>& rhs)
 {
     if (this == &(rhs()))
     {
-        FatalErrorIn("Field<Type>::operator=(const tmp<Field>&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index f9c340f9bc..8ea48c3f7d 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -157,7 +157,8 @@ public:
         Field
         (
             const UList<Type>& mapF,
-            const FieldMapper& map
+            const FieldMapper& map,
+            const bool applyFlip = true
         );
 
         //- Construct by mapping from the given field
@@ -165,7 +166,8 @@ public:
         (
             const UList<Type>& mapF,
             const FieldMapper& map,
-            const Type& defaultValue
+            const Type& defaultValue,
+            const bool applyFlip = true
         );
 
         //- Construct by mapping from the given field
@@ -173,14 +175,16 @@ public:
         (
             const UList<Type>& mapF,
             const FieldMapper& map,
-            const UList<Type>& defaultValues
+            const UList<Type>& defaultValues,
+            const bool applyFlip = true
         );
 
         //- Construct by mapping from the given tmp field
         Field
         (
             const tmp<Field<Type> >& tmapF,
-            const FieldMapper& map
+            const FieldMapper& map,
+            const bool applyFlip = true
         );
 
         //- Construct by mapping from the given tmp field. Supplied uniform
@@ -189,7 +193,8 @@ public:
         (
             const tmp<Field<Type> >& tmapF,
             const FieldMapper& map,
-            const Type& defaultValue
+            const Type& defaultValue,
+            const bool applyFlip = true
         );
 
         //- Construct by mapping from the given tmp field. Supplied values
@@ -198,7 +203,8 @@ public:
         (
             const tmp<Field<Type> >& tmapF,
             const FieldMapper& map,
-            const UList<Type>& defaultValues
+            const UList<Type>& defaultValues,
+            const bool applyFlip = true
         );
 
         //- Construct as copy
@@ -269,20 +275,23 @@ public:
         void map
         (
             const UList<Type>& mapF,
-            const FieldMapper& map
+            const FieldMapper& map,
+            const bool applyFlip = true
         );
 
         //- Map from the given tmp field
         void map
         (
             const tmp<Field<Type> >& tmapF,
-            const FieldMapper& map
+            const FieldMapper& map,
+            const bool applyFlip = true
         );
 
         //- Map from self
         void autoMap
         (
-            const FieldMapper& map
+            const FieldMapper& map,
+            const bool applyFlip = true
         );
 
         //- 1 to 1 reverse-map from the given field
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index 3566395fb9..f7bd175308 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -517,7 +517,7 @@ Type average(const UList<Type>& f)
     }
     else
     {
-        WarningIn("average(const UList<Type>&)")
+        WarningInFunction
             << "empty field, returning zero" << endl;
 
         return pTraits<Type>::zero;
@@ -594,7 +594,7 @@ Type gAverage
     }
     else
     {
-        WarningIn("gAverage(const UList<Type>&)")
+        WarningInFunction
             << "empty field, returning zero." << endl;
 
         return pTraits<Type>::zero;
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldM.H b/src/OpenFOAM/fields/Fields/Field/FieldM.H
index d44d72506a..ff3861d4e7 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldM.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,11 +53,7 @@ void checkFields
 {
     if (f1.size() != f2.size())
     {
-        FatalErrorIn
-        (
-            "checkFields(const UList<Type1>&, "
-            "const UList<Type2>&, const char*)"
-        )   << "    incompatible fields"
+        FatalErrorInFunction
             << " Field<"<<pTraits<Type1>::typeName<<"> f1("<<f1.size()<<')'
             << " and Field<"<<pTraits<Type2>::typeName<<"> f2("<<f2.size()<<')'
             << endl << " for operation " << op
@@ -76,12 +72,7 @@ void checkFields
 {
     if (f1.size() != f2.size() || f1.size() != f3.size())
     {
-        FatalErrorIn
-        (
-            "checkFields(const UList<Type1>&, "
-            "const UList<Type2>&, const UList<Type3>&, "
-            "const char*)"
-        )   << "    incompatible fields"
+        FatalErrorInFunction
             << " Field<"<<pTraits<Type1>::typeName<<"> f1("<<f1.size()<<')'
             << ", Field<"<<pTraits<Type2>::typeName<<"> f2("<<f2.size()<<')'
             << " and Field<"<<pTraits<Type3>::typeName<<"> f3("<<f3.size()<<')'
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index f463f97c57..32f446cbae 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,8 @@ Description
 namespace Foam
 {
 
+class mapDistributeBase;
+
 /*---------------------------------------------------------------------------*\
                            Class FieldMapper Declaration
 \*---------------------------------------------------------------------------*/
@@ -64,13 +66,26 @@ public:
 
         virtual bool direct() const = 0;
 
+        virtual bool distributed() const
+        {
+            return false;
+        }
+
+        virtual const mapDistributeBase& distributeMap() const
+        {
+            FatalErrorInFunction
+                << "attempt to access null distributeMap"
+                << abort(FatalError);
+            return *reinterpret_cast<mapDistributeBase*>(NULL);
+        }
+
         //- Are there unmapped values? I.e. do all size() elements get
         //  get value
         virtual bool hasUnmapped() const = 0;
 
         virtual const labelUList& directAddressing() const
         {
-            FatalErrorIn("FieldMapper::directAddressing() const")
+            FatalErrorInFunction
                 << "attempt to access null direct addressing"
                 << abort(FatalError);
 
@@ -79,7 +94,7 @@ public:
 
         virtual const labelListList& addressing() const
         {
-            FatalErrorIn("FieldMapper::addressing() const")
+            FatalErrorInFunction
                 << "attempt to access null interpolation addressing"
                 << abort(FatalError);
 
@@ -88,7 +103,7 @@ public:
 
         virtual const scalarListList& weights() const
         {
-            FatalErrorIn("FieldMapper::weights() const")
+            FatalErrorInFunction
                 << "attempt to access null interpolation weights"
                 << abort(FatalError);
 
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.C b/src/OpenFOAM/fields/Fields/transformList/transformList.C
index f962d68990..87f8c05cc1 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.C
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,10 +74,8 @@ void Foam::transformList(const tensorField& rotTensor, UList<T>& field)
     }
     else
     {
-        FatalErrorIn
-        (
-            "transformList(const tensorField&, UList<T>&)"
-        )   << "Sizes of field and transformation not equal. field:"
+        FatalErrorInFunction
+            << "Sizes of field and transformation not equal. field:"
             << field.size() << " transformation:" << rotTensor.size()
             << abort(FatalError);
     }
@@ -106,10 +104,8 @@ void Foam::transformList(const tensorField& rotTensor, Map<T>& field)
     }
     else
     {
-        FatalErrorIn
-        (
-            "transformList(const tensorField&, Map<T>&)"
-        )   << "Multiple transformation tensors not supported. field:"
+        FatalErrorInFunction
+            << "Multiple transformation tensors not supported. field:"
             << field.size() << " transformation:" << rotTensor.size()
             << abort(FatalError);
     }
@@ -138,10 +134,8 @@ void Foam::transformList(const tensorField& rotTensor, EdgeMap<T>& field)
     }
     else
     {
-        FatalErrorIn
-        (
-            "transformList(const tensorField&, EdgeMap<T>&)"
-        )   << "Multiple transformation tensors not supported. field:"
+        FatalErrorInFunction
+            << "Multiple transformation tensors not supported. field:"
             << field.size() << " transformation:" << rotTensor.size()
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index e331062c4d..da522ae426 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,14 +180,8 @@ readField
         {
             if (bmesh_[patchi].type() == cyclicPolyPatch::typeName)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "GeometricField<Type, PatchField, GeoMesh>::"
-                    "GeometricBoundaryField::readField"
-                    "("
-                        "const DimensionedField<Type, GeoMesh>&, "
-                        "const dictionary&"
-                    ")",
                     dict
                 )   << "Cannot find patchField entry for cyclic "
                     << bmesh_[patchi].name() << endl
@@ -197,14 +191,8 @@ readField
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "GeometricField<Type, PatchField, GeoMesh>::"
-                    "GeometricBoundaryField::readField"
-                    "("
-                        "const DimensionedField<Type, GeoMesh>&, "
-                        "const dictionary&"
-                    ")",
                     dict
                 )   << "Cannot find patchField entry for "
                     << bmesh_[patchi].name() << exit(FatalIOError);
@@ -298,18 +286,8 @@ GeometricBoundaryField
      || (constraintTypes.size() && (constraintTypes.size() != this->size()))
     )
     {
-        FatalErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::"
-            "GeometricBoundaryField::"
-            "GeometricBoundaryField"
-            "("
-                "const BoundaryMesh&, "
-                "const DimensionedField<Type>&, "
-                "const wordList&, "
-                "const wordList&"
-            ")"
-        )   << "Incorrect number of patch type specifications given" << nl
+        FatalErrorInFunction
+            << "Incorrect number of patch type specifications given" << nl
             << "    Number of patches in mesh = " << bmesh.size()
             << " number of patch type specifications = "
             << patchFieldTypes.size()
@@ -542,7 +520,7 @@ evaluate()
     }
     else
     {
-        FatalErrorIn("GeometricBoundaryField::evaluate()")
+        FatalErrorInFunction
             << "Unsuported communications type "
             << Pstream::commsTypeNames[Pstream::defaultCommsType]
             << exit(FatalError);
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index d18f24e19f..5e48cd4f26 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,10 +34,10 @@ License
 #define checkField(gf1, gf2, op)                                    \
 if ((gf1).mesh() != (gf2).mesh())                                   \
 {                                                                   \
-    FatalErrorIn("checkField(gf1, gf2, op)")                        \
+    FatalErrorInFunction                                            \
         << "different mesh for fields "                             \
         << (gf1).name() << " and " << (gf2).name()                  \
-        << " during operatrion " <<  op                             \
+        << " during operation " <<  op                              \
         << abort(FatalError);                                       \
 }
 
@@ -100,10 +100,8 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readIfPresent()
      || this->readOpt() == IOobject::MUST_READ_IF_MODIFIED
     )
     {
-        WarningIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::readIfPresent()"
-        )   << "read option IOobject::MUST_READ or MUST_READ_IF_MODIFIED"
+        WarningInFunction
+            << "read option IOobject::MUST_READ or MUST_READ_IF_MODIFIED"
             << " suggests that a read constructor for field " << this->name()
             << " would be more appropriate." << endl;
     }
@@ -114,12 +112,8 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readIfPresent()
         // Check compatibility between field and mesh
         if (this->size() != GeoMesh::size(this->mesh()))
         {
-            FatalIOErrorIn
-            (
-                "GeometricField<Type, PatchField, GeoMesh>::"
-                "readIfPresent()",
-                this->readStream(typeName)
-            )   << "   number of field elements = " << this->size()
+            FatalIOErrorInFunction(this->readStream(typeName))
+                << "   number of field elements = " << this->size()
                 << " number of mesh elements = "
                 << GeoMesh::size(this->mesh())
                 << exit(FatalIOError);
@@ -319,7 +313,8 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
-    const Mesh& mesh
+    const Mesh& mesh,
+    const bool readOldTime
 )
 :
     DimensionedField<Type, GeoMesh>(io, mesh, dimless, false),
@@ -334,17 +329,16 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     if (this->size() != GeoMesh::size(this->mesh()))
     {
-        FatalIOErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::GeometricField"
-            "(const IOobject&, const Mesh&)",
-            this->readStream(typeName)
-        )   << "   number of field elements = " << this->size()
+        FatalIOErrorInFunction(this->readStream(typeName))
+            << "   number of field elements = " << this->size()
             << " number of mesh elements = " << GeoMesh::size(this->mesh())
             << exit(FatalIOError);
     }
 
-    readOldTimeIfPresent();
+    if (readOldTime)
+    {
+        readOldTimeIfPresent();
+    }
 
     if (debug)
     {
@@ -375,17 +369,12 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 
     if (this->size() != GeoMesh::size(this->mesh()))
     {
-        FatalErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::GeometricField"
-            "(const IOobject&, const Mesh&, const dictionary&)"
-        )   << "   number of field elements = " << this->size()
+        FatalErrorInFunction
+            << "   number of field elements = " << this->size()
             << " number of mesh elements = " << GeoMesh::size(this->mesh())
             << exit(FatalIOError);
     }
 
-    readOldTimeIfPresent();
-
     if (debug)
     {
         Info<< "Finishing dictionary-construct of "
@@ -600,7 +589,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     if (debug)
     {
         Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy resetting IO params"
+               "constructing as copy resetting IO params and patch type"
             << endl << this->info() << endl;
     }
 
@@ -833,10 +822,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::prevIter() const
 {
     if (!fieldPrevIterPtr_)
     {
-        FatalErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::prevIter() const"
-        )   << "previous iteration field" << endl << this->info() << endl
+        FatalErrorInFunction
+            << "previous iteration field" << endl << this->info() << endl
             << "  not stored."
             << "  Use field.storePrevIter() at start of iteration."
             << abort(FatalError);
@@ -884,11 +871,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax(const scalar alpha)
 {
     if (debug)
     {
-        InfoIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::relax"
-            "(const scalar alpha)"
-        )  << "Relaxing" << endl << this->info() << " by " << alpha << endl;
+        InfoInFunction
+           << "Relaxing" << endl << this->info() << " by " << alpha << endl;
     }
 
     operator==(prevIter() + alpha*(*this - prevIter()));
@@ -1092,11 +1076,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 {
     if (this == &gf)
     {
-        FatalErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::operator="
-            "(const GeometricField<Type, PatchField, GeoMesh>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
@@ -1117,11 +1098,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 {
     if (this == &(tgf()))
     {
-        FatalErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::operator="
-            "(const tmp<GeometricField<Type, PatchField, GeoMesh> >&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 334bdc2670..18c5c37b2d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -337,7 +337,8 @@ public:
         GeometricField
         (
             const IOobject&,
-            const Mesh&
+            const Mesh&,
+            const bool readOldTime = true
         );
 
         //- Construct from dictionary
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index eb160c0e74..cb34740ca3 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -814,11 +814,8 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
 {                                                                           \
     if (!gsf.dimensions().dimensionless())                                  \
     {                                                                       \
-        FatalErrorIn                                                        \
-        (                                                                   \
-            #func"(const int n, "                                           \
-            "const GeometricField<scalar, PatchField, GeoMesh>& gsf)"       \
-        )   << "gsf not dimensionless"                                      \
+        FatalErrorInFunction                                                \
+            << "gsf not dimensionless"                                      \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
@@ -855,11 +852,8 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
                                                                             \
     if (!gsf.dimensions().dimensionless())                                  \
     {                                                                       \
-        FatalErrorIn                                                        \
-        (                                                                   \
-            #func"(const int n, "                                           \
-            "const tmp<GeometricField<scalar, PatchField, GeoMesh> >& gsf)" \
-        )   << " : gsf not dimensionless"                                   \
+        FatalErrorInFunction                                                \
+            << " : gsf not dimensionless"                                   \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.C b/src/OpenFOAM/fields/ReadFields/ReadFields.C
index a679082b41..fbaecb4c79 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.C
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,19 +32,16 @@ License
 
 // Read all fields of type. Returns names of fields read. Guarantees all
 // processors to read fields in same order.
-template<class GeoField, class Mesh>
-Foam::wordList Foam::ReadFields
+Foam::wordList Foam::fieldNames
 (
-    const Mesh& mesh,
-    const IOobjectList& objects,
-    PtrList<GeoField>& fields,
+    const IOobjectList& fieldObjects,
     const bool syncPar
 )
 {
-    // Search list of objects for wanted type
-    IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
-
-    wordList masterNames(fieldObjects.names());
+    // Get sorted field names. Sorting needed in parallel since different
+    // processors (using different file servers) might pick up the files
+    // in different order.
+    wordList masterNames(fieldObjects.sortedNames());
 
     if (syncPar && Pstream::parRun())
     {
@@ -62,12 +59,8 @@ Foam::wordList Foam::ReadFields
 
             if (iter == localNamesSet.end())
             {
-                FatalErrorIn
-                (
-                    "ReadFields<class GeoField, class Mesh>"
-                    "(const Mesh&, const IOobjectList&, PtrList<GeoField>&"
-                    ", const bool)"
-                )   << "Fields not synchronised across processors." << endl
+                FatalErrorInFunction
+                    << "Fields not synchronised across processors." << endl
                     << "Master has fields " << masterNames
                     << "  processor " << Pstream::myProcNo()
                     << " has fields " << localNames << exit(FatalError);
@@ -80,181 +73,16 @@ Foam::wordList Foam::ReadFields
 
         forAllConstIter(HashSet<word>, localNamesSet, iter)
         {
-            FatalErrorIn
-            (
-                "ReadFields<class GeoField, class Mesh>"
-                "(const Mesh&, const IOobjectList&, PtrList<GeoField>&"
-                ", const bool)"
-            )   << "Fields not synchronised across processors." << endl
+            FatalErrorInFunction
+                << "Fields not synchronised across processors." << endl
                 << "Master has fields " << masterNames
                 << "  processor " << Pstream::myProcNo()
                 << " has fields " << localNames << exit(FatalError);
         }
     }
 
-
-    fields.setSize(masterNames.size());
-
-    // Make sure to read in masterNames order.
-
-    forAll(masterNames, i)
-    {
-        Info<< "Reading " << GeoField::typeName << ' ' << masterNames[i]
-            << endl;
-
-        const IOobject& io = *fieldObjects[masterNames[i]];
-
-        fields.set
-        (
-            i,
-            new GeoField
-            (
-                IOobject
-                (
-                    io.name(),
-                    io.instance(),
-                    io.local(),
-                    io.db(),
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE,
-                    io.registerObject()
-                ),
-                mesh
-            )
-        );
-    }
     return masterNames;
 }
 
 
-template<class GeoField>
-void Foam::ReadFields
-(
-    const word& fieldName,
-    const typename GeoField::Mesh& mesh,
-    const wordList& timeNames,
-    objectRegistry& fieldsCache
-)
-{
-    // Collect all times that are no longer used
-    {
-        HashSet<word> usedTimes(timeNames);
-
-        DynamicList<word> unusedTimes(fieldsCache.size());
-
-        forAllIter(objectRegistry, fieldsCache, timeIter)
-        {
-            const word& tm = timeIter.key();
-            if (!usedTimes.found(tm))
-            {
-                unusedTimes.append(tm);
-            }
-        }
-
-        //Info<< "Unloading times " << unusedTimes << endl;
-
-        forAll(unusedTimes, i)
-        {
-            objectRegistry& timeCache = const_cast<objectRegistry&>
-            (
-                fieldsCache.lookupObject<objectRegistry>(unusedTimes[i])
-            );
-            fieldsCache.checkOut(timeCache);
-        }
-    }
-
-
-    // Load any new fields
-    forAll(timeNames, i)
-    {
-        const word& tm = timeNames[i];
-
-        // Create if not found
-        if (!fieldsCache.found(tm))
-        {
-            //Info<< "Creating registry for time " << tm << endl;
-
-            // Create objectRegistry if not found
-            objectRegistry* timeCachePtr = new objectRegistry
-            (
-                IOobject
-                (
-                    tm,
-                    tm,
-                    fieldsCache,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                )
-            );
-            timeCachePtr->store();
-        }
-
-        // Obtain cache for current time
-        const objectRegistry& timeCache =
-            fieldsCache.lookupObject<objectRegistry>
-            (
-                tm
-            );
-
-        // Store field if not found
-        if (!timeCache.found(fieldName))
-        {
-            //Info<< "Loading field " << fieldName
-            //    << " for time " << tm << endl;
-
-            GeoField loadedFld
-            (
-                IOobject
-                (
-                    fieldName,
-                    tm,
-                    mesh.thisDb(),
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh
-            );
-
-            // Transfer to timeCache (new objectRegistry and store flag)
-            GeoField* fldPtr = new GeoField
-            (
-                IOobject
-                (
-                    fieldName,
-                    tm,
-                    timeCache,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                loadedFld
-            );
-            fldPtr->store();
-        }
-    }
-}
-
-
-template<class GeoField>
-void Foam::ReadFields
-(
-    const word& fieldName,
-    const typename GeoField::Mesh& mesh,
-    const wordList& timeNames,
-    const word& registryName
-)
-{
-    ReadFields<GeoField>
-    (
-        fieldName,
-        mesh,
-        timeNames,
-        const_cast<objectRegistry&>
-        (
-            mesh.thisDb().subRegistry(registryName, true)
-        )
-    );
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.H b/src/OpenFOAM/fields/ReadFields/ReadFields.H
index ac4bdb37c7..c698988c07 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.H
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ Description
 
 SourceFiles
     ReadFields.C
+    ReadFieldsTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -37,6 +38,7 @@ SourceFiles
 
 #include "PtrList.H"
 #include "wordList.H"
+#include "GeometricField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +47,23 @@ namespace Foam
 
 class IOobjectList;
 
-//- Helper routine to read fields
+
+//- Get sorted names of fields of type. If syncPar and running in parallel
+//  check for identical names
+wordList fieldNames(const IOobjectList& objects, const bool syncPar);
+
+//- Helper routine to read Geometric fields
+template<class Type, template<class> class PatchField, class GeoMesh>
+wordList ReadFields
+(
+    const typename GeoMesh::Mesh& mesh,
+    const IOobjectList& objects,
+    PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
+    const bool syncPar = true,
+    const bool readOldTime = false
+);
+
+//- Helper routine to read other mesh fields
 template<class GeoField, class Mesh>
 wordList ReadFields
 (
@@ -55,6 +73,16 @@ wordList ReadFields
     const bool syncPar = true
 );
 
+//- Helper routine to read non-mesh fields (e.g. uniformDimensionedField like
+//  'g')
+template<class GeoField>
+wordList ReadFields
+(
+    const IOobjectList& objects,
+    PtrList<GeoField>& fields,
+    const bool syncPar = true
+);
+
 //- Helper routine to read GeometricFields. The fieldsCache is per time
 //  an objectRegistry of all stored fields
 template<class GeoField>
@@ -82,7 +110,7 @@ static void ReadFields
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ReadFields.C"
+#   include "ReadFieldsTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C b/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C
new file mode 100644
index 0000000000..e01ed92fb8
--- /dev/null
+++ b/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C
@@ -0,0 +1,314 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReadFields.H"
+#include "HashSet.H"
+#include "IOobjectList.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+// Read all GeometricFields of type. Returns names of fields read. Guarantees
+// all processors to read fields in same order.
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::wordList Foam::ReadFields
+(
+    const typename GeoMesh::Mesh& mesh,
+    const IOobjectList& objects,
+    PtrList<GeometricField<Type, PatchField, GeoMesh> >& fields,
+    const bool syncPar,
+    const bool readOldTime
+)
+{
+    typedef GeometricField<Type, PatchField, GeoMesh> GeoField;
+
+    // Search list of objects for wanted type
+    IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
+
+    const wordList masterNames(fieldNames(fieldObjects, syncPar));
+
+    fields.setSize(masterNames.size());
+
+    // Make sure to read in masterNames order.
+
+    forAll(masterNames, i)
+    {
+        Info<< "Reading " << GeoField::typeName << ' ' << masterNames[i]
+            << endl;
+
+        const IOobject& io = *fieldObjects[masterNames[i]];
+
+        fields.set
+        (
+            i,
+            new GeoField
+            (
+                IOobject
+                (
+                    io.name(),
+                    io.instance(),
+                    io.local(),
+                    io.db(),
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE,
+                    io.registerObject()
+                ),
+                mesh,
+                readOldTime
+            )
+        );
+    }
+    return masterNames;
+}
+
+
+// Read all fields of type. Returns names of fields read. Guarantees all
+// processors to read fields in same order.
+template<class GeoField, class Mesh>
+Foam::wordList Foam::ReadFields
+(
+    const Mesh& mesh,
+    const IOobjectList& objects,
+    PtrList<GeoField>& fields,
+    const bool syncPar
+)
+{
+    // Search list of objects for wanted type
+    IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
+
+    const wordList masterNames(fieldNames(fieldObjects, syncPar));
+
+    fields.setSize(masterNames.size());
+
+    // Make sure to read in masterNames order.
+
+    forAll(masterNames, i)
+    {
+        Info<< "Reading " << GeoField::typeName << ' ' << masterNames[i]
+            << endl;
+
+        const IOobject& io = *fieldObjects[masterNames[i]];
+
+        fields.set
+        (
+            i,
+            new GeoField
+            (
+                IOobject
+                (
+                    io.name(),
+                    io.instance(),
+                    io.local(),
+                    io.db(),
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE,
+                    io.registerObject()
+                ),
+                mesh
+            )
+        );
+    }
+    return masterNames;
+}
+
+
+// Read all (non-mesh) fields of type. Returns names of fields read. Guarantees
+// all processors to read fields in same order.
+template<class GeoField>
+Foam::wordList Foam::ReadFields
+(
+    const IOobjectList& objects,
+    PtrList<GeoField>& fields,
+    const bool syncPar
+)
+{
+    // Search list of objects for wanted type
+    IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
+
+    const wordList masterNames(fieldNames(fieldObjects, syncPar));
+
+    fields.setSize(masterNames.size());
+
+    // Make sure to read in masterNames order.
+
+    forAll(masterNames, i)
+    {
+        Info<< "Reading " << GeoField::typeName << ' ' << masterNames[i]
+            << endl;
+
+        const IOobject& io = *fieldObjects[masterNames[i]];
+
+        fields.set
+        (
+            i,
+            new GeoField
+            (
+                IOobject
+                (
+                    io.name(),
+                    io.instance(),
+                    io.local(),
+                    io.db(),
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE,
+                    io.registerObject()
+                )
+            )
+        );
+    }
+    return masterNames;
+}
+
+
+template<class GeoField>
+void Foam::ReadFields
+(
+    const word& fieldName,
+    const typename GeoField::Mesh& mesh,
+    const wordList& timeNames,
+    objectRegistry& fieldsCache
+)
+{
+    // Collect all times that are no longer used
+    {
+        HashSet<word> usedTimes(timeNames);
+
+        DynamicList<word> unusedTimes(fieldsCache.size());
+
+        forAllIter(objectRegistry, fieldsCache, timeIter)
+        {
+            const word& tm = timeIter.key();
+            if (!usedTimes.found(tm))
+            {
+                unusedTimes.append(tm);
+            }
+        }
+
+        //Info<< "Unloading times " << unusedTimes << endl;
+
+        forAll(unusedTimes, i)
+        {
+            objectRegistry& timeCache = const_cast<objectRegistry&>
+            (
+                fieldsCache.lookupObject<objectRegistry>(unusedTimes[i])
+            );
+            fieldsCache.checkOut(timeCache);
+        }
+    }
+
+
+    // Load any new fields
+    forAll(timeNames, i)
+    {
+        const word& tm = timeNames[i];
+
+        // Create if not found
+        if (!fieldsCache.found(tm))
+        {
+            //Info<< "Creating registry for time " << tm << endl;
+
+            // Create objectRegistry if not found
+            objectRegistry* timeCachePtr = new objectRegistry
+            (
+                IOobject
+                (
+                    tm,
+                    tm,
+                    fieldsCache,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                )
+            );
+            timeCachePtr->store();
+        }
+
+        // Obtain cache for current time
+        const objectRegistry& timeCache =
+            fieldsCache.lookupObject<objectRegistry>
+            (
+                tm
+            );
+
+        // Store field if not found
+        if (!timeCache.found(fieldName))
+        {
+            //Info<< "Loading field " << fieldName
+            //    << " for time " << tm << endl;
+
+            GeoField loadedFld
+            (
+                IOobject
+                (
+                    fieldName,
+                    tm,
+                    mesh.thisDb(),
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh
+            );
+
+            // Transfer to timeCache (new objectRegistry and store flag)
+            GeoField* fldPtr = new GeoField
+            (
+                IOobject
+                (
+                    fieldName,
+                    tm,
+                    timeCache,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                loadedFld
+            );
+            fldPtr->store();
+        }
+    }
+}
+
+
+template<class GeoField>
+void Foam::ReadFields
+(
+    const word& fieldName,
+    const typename GeoField::Mesh& mesh,
+    const wordList& timeNames,
+    const word& registryName
+)
+{
+    ReadFields<GeoField>
+    (
+        fieldName,
+        mesh,
+        timeNames,
+        const_cast<objectRegistry&>
+        (
+            mesh.thisDb().subRegistry(registryName, true)
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 1fd8eac973..98934aec31 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,7 +103,7 @@ bool Foam::UniformDimensionedField<Type>::writeData(Ostream& os) const
     os.writeKeyword("value") << this->value()/multiplier << token::END_STATEMENT
         << nl << nl;
 
-    return (os.good());
+    return os.good();
 }
 
 
diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C
index cae1cce299..3a7b98e968 100644
--- a/src/OpenFOAM/fields/cloud/cloud.C
+++ b/src/OpenFOAM/fields/cloud/cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::cloud::~cloud()
 
 void Foam::cloud::autoMap(const mapPolyMesh&)
 {
-    notImplemented("cloud::autoMap(const mapPolyMesh&)");
+    NotImplemented;
 }
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index 6f5c7ef267..747e3daa7f 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,10 +33,8 @@ void Foam::valuePointPatchField<Type>::checkFieldSize() const
 {
     if (this->size() != this->patch().size())
     {
-        FatalErrorIn
-        (
-            "void valuePointPatchField<Type>::checkField() const"
-        )   << "field does not correspond to patch. " << endl
+        FatalErrorInFunction
+            << "field does not correspond to patch. " << endl
             << "Field size: " << size() << " patch size: "
             << this->patch().size()
             << abort(FatalError);
@@ -83,15 +81,8 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "pointPatchField<Type>::pointPatchField"
-            "("
-            "const fvPatch& p,"
-            "const DimensionedField<Type, pointMesh>& iF,"
-            "const dictionary& dict,"
-            "const bool valueRequired"
-            ")",
             dict
         )   << "Essential entry 'value' missing"
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
index 4bc0994526..1ebadbb40c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,14 +55,8 @@ Foam::cyclicPointPatchField<Type>::cyclicPointPatchField
 {
     if (!isType<cyclicPointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicPointPatchField<Type>::cyclicPointPatchField\n"
-            "(\n"
-            "    const pointPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not cyclic type. "
             << "Patch type = " << p.type()
@@ -85,16 +79,8 @@ Foam::cyclicPointPatchField<Type>::cyclicPointPatchField
 {
     if (!isType<cyclicPointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicPointPatchField<Type>::cyclicPointPatchField\n"
-            "(\n"
-            "    const cyclicPointPatchField<Type>& ptf,\n"
-            "    const pointPatch& p,\n"
-            "    const DimensionedField<Type, pointMesh>& iF,\n"
-            "    const pointPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
index 41f97055ae..6435a72c12 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,14 +55,8 @@ emptyPointPatchField<Type>::emptyPointPatchField
 {
     if (!isType<emptyPointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "emptyPointPatchField<Type>::emptyPointPatchField\n"
-            "(\n"
-            "    const pointPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not empty type. "
             << "Patch type = " << p.type()
@@ -84,16 +78,8 @@ emptyPointPatchField<Type>::emptyPointPatchField
 {
     if (!isType<emptyPointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "emptyPointPatchField<Type>::emptyPointPatchField\n"
-            "(\n"
-            "    const emptyPointPatchField<Type>& ptf,\n"
-            "    const pointPatch& p,\n"
-            "    const DimensionedField<Type, pointMesh>& iF,\n"
-            "    const pointPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
index 8e321d6548..4e11109261 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,14 +55,8 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
 {
     if (!isType<symmetryPointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "symmetryPointPatchField<Type>::symmetryPointPatchField\n"
-            "(\n"
-            "    const pointPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not symmetry type. "
             << "Patch type = " << p.type()
@@ -84,16 +78,8 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
 {
     if (!isType<symmetryPointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "symmetryPointPatchField<Type>::symmetryPointPatchField\n"
-            "(\n"
-            "    const symmetryPointPatchField<Type>& ptf,\n"
-            "    const pointPatch& p,\n"
-            "    const DimensionedField<Type, pointMesh>& iF,\n"
-            "    const pointPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
index b91c965e92..c988248e2e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,14 +57,8 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 {
     if (!isType<symmetryPlanePointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField\n"
-            "(\n"
-            "    const pointPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not symmetry type. "
             << "Patch type = " << p.type()
@@ -87,16 +81,8 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 {
     if (!isType<symmetryPlanePointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField\n"
-            "(\n"
-            "    const symmetryPlanePointPatchField<Type>& ptf,\n"
-            "    const pointPatch& p,\n"
-            "    const DimensionedField<Type, pointMesh>& iF,\n"
-            "    const pointPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
index 447c7771cd..52e55ef0cc 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,14 +52,8 @@ Foam::wedgePointPatchField<Type>::wedgePointPatchField
 {
     if (!isType<wedgePointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "wedgePointPatchField<Type>::wedgePointPatchField\n"
-            "(\n"
-            "    const pointPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not wedge type. "
             << "Patch type = " << p.type()
@@ -81,16 +75,8 @@ Foam::wedgePointPatchField<Type>::wedgePointPatchField
 {
     if (!isType<wedgePointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "wedgePointPatchField<Type>::wedgePointPatchField\n"
-            "(\n"
-            "    const wedgePointPatchField<Type>& ptf,\n"
-            "    const pointPatch& p,\n"
-            "    const DimensionedField<Type, pointMesh>& iF,\n"
-            "    const pointPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
index 120f1ffe16..a9f93d1d38 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,7 +149,7 @@ public:
 
         // Access
 
-            //- Return the fluctuation scale
+            //- Return the uniform value
             const DataEntry<Type>& uniformValue() const
             {
                 return uniformValue_;
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index be4b10dfd8..64daf799fd 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,12 +146,8 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
     // Check size
     if (iF.size() != internalField().size())
     {
-        FatalErrorIn
-        (
-            "tmp<Field<Type1> > pointPatchField<"
-            "Type>::"
-            "patchInternalField(const Field<Type1>& iF) const"
-        )   << "given internal field does not correspond to the mesh. "
+        FatalErrorInFunction
+            << "given internal field does not correspond to the mesh. "
             << "Field size: " << iF.size()
             << " mesh size: " << internalField().size()
             << abort(FatalError);
@@ -183,12 +179,8 @@ void pointPatchField<Type>::addToInternalField
     // Check size
     if (iF.size() != internalField().size())
     {
-        FatalErrorIn
-        (
-            "void pointPatchField<Type>::"
-            "addToInternalField("
-            "Field<Type1>& iF, const Field<Type1>& iF) const"
-        )   << "given internal field does not correspond to the mesh. "
+        FatalErrorInFunction
+            << "given internal field does not correspond to the mesh. "
             << "Field size: " << iF.size()
             << " mesh size: " << internalField().size()
             << abort(FatalError);
@@ -196,12 +188,8 @@ void pointPatchField<Type>::addToInternalField
 
     if (pF.size() != size())
     {
-        FatalErrorIn
-        (
-            "void pointPatchField<Type>::"
-            "addToInternalField("
-            "Field<Type1>& iF, const Field<Type1>& iF) const"
-        )   << "given patch field does not correspond to the mesh. "
+        FatalErrorInFunction
+            << "given patch field does not correspond to the mesh. "
             << "Field size: " << pF.size()
             << " mesh size: " << size()
             << abort(FatalError);
@@ -229,12 +217,8 @@ void pointPatchField<Type>::addToInternalField
     // Check size
     if (iF.size() != internalField().size())
     {
-        FatalErrorIn
-        (
-            "void pointPatchField<Type>::"
-            "addToInternalField("
-            "Field<Type1>& iF, const Field<Type1>& iF, const labelList&) const"
-        )   << "given internal field does not correspond to the mesh. "
+        FatalErrorInFunction
+            << "given internal field does not correspond to the mesh. "
             << "Field size: " << iF.size()
             << " mesh size: " << internalField().size()
             << abort(FatalError);
@@ -242,12 +226,8 @@ void pointPatchField<Type>::addToInternalField
 
     if (pF.size() != size())
     {
-        FatalErrorIn
-        (
-            "void pointPatchField<Type>::"
-            "addToInternalField("
-            "Field<Type1>& iF, const Field<Type1>& iF, const labelList&) const"
-        )   << "given patch field does not correspond to the mesh. "
+        FatalErrorInFunction
+            << "given patch field does not correspond to the mesh. "
             << "Field size: " << pF.size()
             << " mesh size: " << size()
             << abort(FatalError);
@@ -276,12 +256,8 @@ void pointPatchField<Type>::setInInternalField
     // Check size
     if (iF.size() != internalField().size())
     {
-        FatalErrorIn
-        (
-            "void pointPatchField<Type>::"
-            "setInInternalField("
-            "Field<Type1>& iF, const Field<Type1>& iF) const"
-        )   << "given internal field does not correspond to the mesh. "
+        FatalErrorInFunction
+            << "given internal field does not correspond to the mesh. "
             << "Field size: " << iF.size()
             << " mesh size: " << internalField().size()
             << abort(FatalError);
@@ -289,12 +265,8 @@ void pointPatchField<Type>::setInInternalField
 
     if (pF.size() != meshPoints.size())
     {
-        FatalErrorIn
-        (
-            "void pointPatchField<Type>::"
-            "setInInternalField("
-            "Field<Type1>& iF, const Field<Type1>& iF) const"
-        )   << "given patch field does not correspond to the meshPoints. "
+        FatalErrorInFunction
+            << "given patch field does not correspond to the meshPoints. "
             << "Field size: " << pF.size()
             << " meshPoints size: " << size()
             << abort(FatalError);
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 50a2105dee..25f955bbce 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         |2011 OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,11 +48,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
     if (cstrIter == pointPatchConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PointPatchField<Type>::New"
-            "(const word&, const word&, const pointPatch&, const Field<Type>&)"
-        )   << "Unknown patchFieldType type "
+        FatalErrorInFunction
+            << "Unknown patchFieldType type "
             << patchFieldType << nl << nl
             << "Valid patchField types are :" << endl
             << pointPatchConstructorTablePtr_->sortedToc()
@@ -75,12 +72,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
             if (patchTypeCstrIter == pointPatchConstructorTablePtr_->end())
             {
-                FatalErrorIn
-                (
-                    "PointPatchField<Type>::New"
-                    "(const word&, const word&"
-                    ", const pointPatch&, const Field<Type>&)"
-                )   << "inconsistent patch and patchField types for \n"
+                FatalErrorInFunction
+                    << "inconsistent patch and patchField types for \n"
                     << "    patch type " << p.type()
                     << " and patchField type " << patchFieldType
                     << exit(FatalError);
@@ -143,10 +136,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "PointPatchField<Type>::"
-                "New(const pointPatch&, const Field<Type>&, const dictionary&)",
                 dict
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << nl << nl
@@ -178,10 +169,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
             if (patchTypeCstrIter == dictionaryConstructorTablePtr_->end())
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "PointPatchField<Type>const pointPatch&, "
-                    "const Field<Type>&, const dictionary&)",
                     dict
                 )   << "inconsistent patch and patchField types for \n"
                     << "    patch type " << p.type()
@@ -223,16 +212,8 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
     if (cstrIter == patchMapperConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PointPatchField<Type>::New"
-            "("
-            "const pointPatchField<Type>&, "
-            "const pointPatch&, "
-            "const DimensionedField<Type, pointMesh>&, "
-            "const pointPatchFieldMapper&"
-            ")"
-        )   << "Unknown patchField type "
+        FatalErrorInFunction
+            << "Unknown patchField type "
             << ptf.type() << nl << nl
             << "Valid patchField types are :" << endl
             << patchMapperConstructorTablePtr_->sortedToc()
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.C b/src/OpenFOAM/global/JobInfo/JobInfo.C
index 1857d92c8d..a37ae7613a 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.C
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,21 +59,21 @@ Foam::JobInfo::JobInfo()
 
         if (baseDir.empty())
         {
-            FatalErrorIn("JobInfo::JobInfo()")
+            FatalErrorInFunction
                 << "Cannot get JobInfo directory $FOAM_JOB_DIR"
                 << Foam::exit(FatalError);
         }
 
         if (!isDir(runningDir) && !mkDir(runningDir))
         {
-            FatalErrorIn("JobInfo::JobInfo()")
+            FatalErrorInFunction
                 << "Cannot make JobInfo directory " << runningDir
                 << Foam::exit(FatalError);
         }
 
         if (!isDir(finishedDir) && !mkDir(finishedDir))
         {
-            FatalErrorIn("JobInfo::JobInfo()")
+            FatalErrorInFunction
                 << "Cannot make JobInfo directory " << finishedDir
                 << Foam::exit(FatalError);
         }
@@ -125,7 +125,7 @@ void Foam::JobInfo::write() const
     {
         if (!write(OFstream(runningJobPath_)()))
         {
-            FatalErrorIn("JobInfo::write() const")
+            FatalErrorInFunction
                 << "Failed to write to JobInfo file "
                 << runningJobPath_
                 << Foam::exit(FatalError);
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 973bc87648..45adb22276 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,6 +33,10 @@ License
 #include "labelList.H"
 #include "regIOobject.H"
 #include "dynamicCode.H"
+#include "sigFpe.H"
+#include "sigInt.H"
+#include "sigQuit.H"
+#include "sigSegv.H"
 
 #include <cctype>
 
@@ -64,6 +68,17 @@ Foam::argList::initValidTables::initValidTables()
     );
     validParOptions.set("roots", "(dir1 .. dirN)");
 
+    argList::addOption
+    (
+        "decomposeParDict", "file",
+        "read decomposePar dictionary from specified location"
+    );
+    validParOptions.set
+    (
+        "decomposeParDict",
+        "file"
+    );
+
     argList::addBoolOption
     (
         "noFunctionObjects",
@@ -147,6 +162,7 @@ void Foam::argList::noParallel()
 {
     removeOption("parallel");
     removeOption("roots");
+    removeOption("decomposeParDict");
     validParOptions.clear();
 }
 
@@ -601,13 +617,23 @@ void Foam::argList::parse
             }
             else
             {
-                source = rootPath_/globalCase_/"system/decomposeParDict";
+                source = rootPath_/globalCase_/"system"/"decomposeParDict";
+                // Override with -decomposeParDict
+                if (options_.found("decomposeParDict"))
+                {
+                    source = options_["decomposeParDict"];
+                    if (isDir(source))
+                    {
+                        source = source/"decomposeParDict";
+                    }
+                }
+
                 IFstream decompDictStream(source);
 
                 if (!decompDictStream.good())
                 {
                     FatalError
-                        << "Cannot read "
+                        << "Cannot read decomposeParDict from "
                         << decompDictStream.name()
                         << exit(FatalError);
                 }
@@ -770,9 +796,6 @@ void Foam::argList::parse
         if (Pstream::master())
         {
             slaveProcs.setSize(Pstream::nProcs() - 1);
-            string  slaveMachine;
-            label slavePid;
-
             label procI = 0;
             for
             (
@@ -782,15 +805,30 @@ void Foam::argList::parse
             )
             {
                 IPstream fromSlave(Pstream::scheduled, slave);
-                fromSlave >> slaveMachine >> slavePid;
+
+                string slaveBuild;
+                string slaveMachine;
+                label slavePid;
+                fromSlave >> slaveBuild >> slaveMachine >> slavePid;
 
                 slaveProcs[procI++] = slaveMachine + "." + name(slavePid);
+
+                // Check build string to make sure all processors are running
+                // the same build
+                if (slaveBuild != Foam::FOAMbuild)
+                {
+                    FatalError
+                        << "Master is running version " << Foam::FOAMbuild
+                        << "; slave " << procI << " is running version "
+                        << slaveBuild
+                        << exit(FatalError);
+                }
             }
         }
         else
         {
             OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
-            toMaster << hostName() << pid();
+            toMaster << string(Foam::FOAMbuild) << hostName() << pid();
         }
     }
 
@@ -834,10 +872,10 @@ void Foam::argList::parse
 
         // Switch on signal trapping. We have to wait until after Pstream::init
         // since this sets up its own ones.
-        sigFpe_.set(bannerEnabled);
-        sigInt_.set(bannerEnabled);
-        sigQuit_.set(bannerEnabled);
-        sigSegv_.set(bannerEnabled);
+        sigFpe::set(bannerEnabled);
+        sigInt::set(bannerEnabled);
+        sigQuit::set(bannerEnabled);
+        sigSegv::set(bannerEnabled);
 
         if (bannerEnabled)
         {
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 12be421f80..e242af2314 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -86,11 +86,6 @@ SourceFiles
 #include "IStringStream.H"
 #include "OSspecific.H"
 
-#include "sigFpe.H"
-#include "sigInt.H"
-#include "sigQuit.H"
-#include "sigSegv.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -118,12 +113,6 @@ class argList
         fileName case_;
         string argListStr_;
 
-        // Signal handlers
-        sigFpe sigFpe_;
-        sigInt sigInt_;
-        sigQuit sigQuit_;
-        sigSegv sigSegv_;
-
 
     // Private Member Functions
 
diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C
index 19b579a460..d7517922c0 100644
--- a/src/OpenFOAM/global/debug/debug.C
+++ b/src/OpenFOAM/global/debug/debug.C
@@ -99,9 +99,8 @@ Foam::dictionary& Foam::debug::controlDict()
 
             if (!ifs.good())
             {
-                SafeFatalIOErrorIn
+                SafeFatalIOErrorInFunction
                 (
-                    "debug::controlDict()",
                     ifs,
                     "Cannot open controlDict"
                 );
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 0ec122dcc3..a7698a20f4 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ const Foam::scalarField& Foam::graph::y() const
 {
     if (size() != 1)
     {
-        FatalErrorIn("const scalarField& graph::y() const")
+        FatalErrorInFunction
             << "y field requested for graph containing " << size()
             << "ys" << exit(FatalError);
     }
@@ -151,7 +151,7 @@ Foam::scalarField& Foam::graph::y()
 {
     if (size() != 1)
     {
-        FatalErrorIn("scalarField& graph::y()")
+        FatalErrorInFunction
             << "y field requested for graph containing " << size()
             << "ys" << exit(FatalError);
     }
@@ -167,10 +167,8 @@ Foam::autoPtr<Foam::graph::writer> Foam::graph::writer::New
 {
     if (!wordConstructorTablePtr_)
     {
-        FatalErrorIn
-        (
-            "graph::writer::New(const word&)"
-        )   << "Graph writer table is empty"
+        FatalErrorInFunction
+            << "Graph writer table is empty"
             << exit(FatalError);
     }
 
@@ -179,10 +177,8 @@ Foam::autoPtr<Foam::graph::writer> Foam::graph::writer::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "graph::writer::New(const word&)"
-        )   << "Unknown graph format " << graphFormat
+        FatalErrorInFunction
+            << "Unknown graph format " << graphFormat
             << endl << endl
             << "Valid graph formats are : " << endl
             << wordConstructorTablePtr_->sortedToc()
@@ -240,7 +236,7 @@ void Foam::graph::write(const fileName& pName, const word& format) const
     }
     else
     {
-        WarningIn("graph::write(const word& format, const fileName& dir)")
+        WarningInFunction
             << "Could not open graph file " << graphFile.name()
             << endl;
     }
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index 98dd6f524a..cfe912888b 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,10 +39,8 @@ void Foam::interpolation2DTable<Type>::readTable()
 
     if (this->empty())
     {
-        FatalErrorIn
-        (
-            "Foam::interpolation2DTable<Type>::readTable()"
-        )   << "table read from " << fName << " is empty" << nl
+        FatalErrorInFunction
+            << "table read from " << fName << " is empty" << nl
             << exit(FatalError);
     }
 
@@ -136,28 +134,16 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
         {
             case interpolation2DTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolation2DTable<Type>::interpolateValue"
-                    "("
-                        "List<Tuple2<scalar, Type> >&, "
-                        "const scalar"
-                    ")"
-                )   << "value (" << lookupValue << ") less than lower "
+                FatalErrorInFunction
+                    << "value (" << lookupValue << ") less than lower "
                     << "bound (" << minLimit << ")" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolation2DTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolation2DTable<Type>::interpolateValue"
-                    "("
-                        "List<Tuple2<scalar, Type> >&, "
-                        "const scalar"
-                    ")"
-                )   << "value (" << lookupValue << ") less than lower "
+                WarningInFunction
+                    << "value (" << lookupValue << ") less than lower "
                     << "bound (" << minLimit << ")" << nl
                     << "    Continuing with the first entry"
                     << endl;
@@ -176,28 +162,16 @@ Type Foam::interpolation2DTable<Type>::interpolateValue
         {
             case interpolation2DTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolation2DTable<Type>::interpolateValue"
-                    "("
-                        "List<Tuple2<scalar, Type> >&, "
-                        "const scalar"
-                    ")"
-                )   << "value (" << lookupValue << ") greater than upper "
+                FatalErrorInFunction
+                    << "value (" << lookupValue << ") greater than upper "
                     << "bound (" << maxLimit << ")" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolation2DTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolation2DTable<Type>::interpolateValue"
-                    "("
-                        "List<Tuple2<scalar, Type> >&, "
-                        "const scalar"
-                    ")"
-                )   << "value (" << lookupValue << ") greater than upper "
+                WarningInFunction
+                    << "value (" << lookupValue << ") greater than upper "
                     << "bound (" << maxLimit << ")" << nl
                     << "    Continuing with the last entry"
                     << endl;
@@ -267,28 +241,15 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
         {
             case interpolation2DTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::label Foam::interpolation2DTable<Type>::Xi"
-                    "("
-                        "const BinaryOp&, "
-                        "const scalar, "
-                        "const bool"
-                    ") const"
-                )   << "value (" << valueX << ") out of bounds"
+                FatalErrorInFunction
+                    << "value (" << valueX << ") out of bounds"
                     << exit(FatalError);
                 break;
             }
             case interpolation2DTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::label Foam::interpolation2DTable<Type>::Xi"
-                    "("
-                        "const BinaryOp&, "
-                        "const scalar, "
-                        "const bool"
-                )   << "value (" << valueX << ") out of bounds"
+                WarningInFunction
+                    << "value (" << valueX << ") out of bounds"
                     << endl;
                 // fall-through to 'CLAMP'
             }
@@ -298,15 +259,7 @@ Foam::label Foam::interpolation2DTable<Type>::Xi
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "Foam::label Foam::interpolation2DTable<Type>::Xi"
-                    "("
-                        "const BinaryOp&, "
-                        "const scalar, "
-                        "const bool"
-                    ") const"
-                )
+                FatalErrorInFunction
                     << "Un-handled enumeration " << boundsHandling_
                     << abort(FatalError);
             }
@@ -352,14 +305,7 @@ Type Foam::interpolation2DTable<Type>::operator()
 
     if (nX == 0)
     {
-        WarningIn
-        (
-            "Type Foam::interpolation2DTable<Type>::operator()"
-            "("
-                "const scalar, "
-                "const scalar"
-            ") const"
-        )
+        WarningInFunction
             << "cannot interpolate a zero-sized table - returning zero" << endl;
 
         return pTraits<Type>::zero;
@@ -450,13 +396,8 @@ Foam::interpolation2DTable<Type>::wordToBoundsHandling
     }
     else
     {
-        WarningIn
-        (
-            "Foam::interpolation2DTable<Type>::wordToBoundsHandling"
-            "("
-            "    const word&"
-            ")"
-        )   << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
+        WarningInFunction
+            << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
 
         return interpolation2DTable::WARN;
     }
@@ -491,10 +432,8 @@ void Foam::interpolation2DTable<Type>::checkOrder() const
         // avoid duplicate values (divide-by-zero error)
         if (currValue <= prevValue)
         {
-            FatalErrorIn
-            (
-                "Foam::interpolation2DTable<Type>::checkOrder() const"
-            )   << "out-of-order value: "
+            FatalErrorInFunction
+                << "out-of-order value: "
                 << currValue << " at index " << i << nl
                 << exit(FatalError);
         }
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index 8159b62c9e..a0ee169188 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,10 +217,8 @@ void Foam::interpolationLookUpTable<Type>::readTable
 
     if (this->size() == 0)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::readTable()"
-        )   << "table is empty" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "table is empty" << nl << exit(FatalError);
     }
 }
 
@@ -324,10 +322,8 @@ void Foam::interpolationLookUpTable<Type>::check() const
         // avoid duplicate values (divide-by-zero error)
         if (currValue <= prevValue)
         {
-            FatalErrorIn
-            (
-                "Foam::interpolationLookUpTable<Type>::checkOrder() const"
-            )   << "out-of-order value: " << currValue
+            FatalErrorInFunction
+                << "out-of-order value: " << currValue
                 << " at index " << index << nl << exit(FatalError);
         }
         prevValue = currValue;
@@ -366,10 +362,8 @@ void Foam::interpolationLookUpTable<Type>::write
 
     if (this->size() == 0)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationTable<Type>::write()"
-        )   << "table is empty" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "table is empty" << nl << exit(FatalError);
     }
     os.writeKeyword("values")
         << *this << token::END_STATEMENT << nl;
@@ -386,24 +380,18 @@ Foam::interpolationLookUpTable<Type>::operator[](const label i)
 
     if (n <= 1)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::operator[](const label)"
-        )   << "table has (" << n << ") columns" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "table has (" << n << ") columns" << nl << exit(FatalError);
     }
     else if (i < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::operator[](const label)"
-        )   << "index (" << i << ") underflow" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "index (" << i << ") underflow" << nl << exit(FatalError);
     }
     else if (i >= n)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::operator[](const label)"
-        )   << "index (" << i << ") overflow" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "index (" << i << ") overflow" << nl << exit(FatalError);
     }
 
     return List<scalarField>::operator[](i);
@@ -418,27 +406,18 @@ Foam::interpolationLookUpTable<Type>::operator[](const label i) const
 
     if (n <= 1)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::operator[]"
-            "(const label) const"
-        )   << "table has (" << n << ") columns" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "table has (" << n << ") columns" << nl << exit(FatalError);
     }
     else if (i < 0)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::operator[]"
-            "(const label) const"
-        )   << "index (" << i << ") underflow" << nl << exit(FatalError);
+        FatalErrorInFunction
+            << "index (" << i << ") underflow" << nl << exit(FatalError);
     }
     else if (i >= n)
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationLookUpTable<Type>::operator[]"
-            "(const label) const"
-        )   << "index (" << i << ") overflow" << nl
+        FatalErrorInFunction
+            << "index (" << i << ") overflow" << nl
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 5e89095498..4fd0b07483 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,10 +43,8 @@ void Foam::interpolationTable<Type>::readTable()
 
     if (this->empty())
     {
-        FatalErrorIn
-        (
-            "Foam::interpolationTable<Type>::readTable()"
-        )   << "table read from " << fName << " is empty" << nl
+        FatalErrorInFunction
+            << "table read from " << fName << " is empty" << nl
             << exit(FatalError);
     }
 
@@ -183,10 +181,8 @@ Foam::interpolationTable<Type>::wordToBoundsHandling
     }
     else
     {
-        WarningIn
-        (
-            "Foam::interpolationTable<Type>::wordToBoundsHandling(const word&)"
-        )   << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
+        WarningInFunction
+            << "bad outOfBounds specifier " << bound << " using 'warn'" << endl;
 
         return interpolationTable::WARN;
     }
@@ -220,10 +216,8 @@ void Foam::interpolationTable<Type>::check() const
         // avoid duplicate values (divide-by-zero error)
         if (currValue <= prevValue)
         {
-            FatalErrorIn
-            (
-                "Foam::interpolationTable<Type>::checkOrder() const"
-            )   << "out-of-order value: "
+            FatalErrorInFunction
+                << "out-of-order value: "
                 << currValue << " at index " << i << nl
                 << exit(FatalError);
         }
@@ -267,21 +261,15 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         {
             case interpolationTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const scalar) const"
-                )   << "value (" << lookupValue << ") underflow" << nl
+                FatalErrorInFunction
+                    << "value (" << lookupValue << ") underflow" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolationTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const scalar) const"
-                )   << "value (" << lookupValue << ") underflow" << nl
+                WarningInFunction
+                    << "value (" << lookupValue << ") underflow" << nl
                     << "    Zero rate of change."
                     << endl;
                 // fall-through to 'CLAMP'
@@ -306,21 +294,15 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         {
             case interpolationTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "value (" << lookupValue << ") overflow" << nl
+                FatalErrorInFunction
+                    << "value (" << lookupValue << ") overflow" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolationTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "value (" << lookupValue << ") overflow" << nl
+                WarningInFunction
+                    << "value (" << lookupValue << ") overflow" << nl
                     << "    Zero rate of change."
                     << endl;
                 // fall-through to 'CLAMP'
@@ -421,21 +403,15 @@ Foam::interpolationTable<Type>::operator[](const label i) const
         {
             case interpolationTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "index (" << ii << ") underflow" << nl
+                FatalErrorInFunction
+                    << "index (" << ii << ") underflow" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolationTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "index (" << ii << ") underflow" << nl
+                WarningInFunction
+                    << "index (" << ii << ") underflow" << nl
                     << "    Continuing with the first entry"
                     << endl;
                 // fall-through to 'CLAMP'
@@ -461,21 +437,15 @@ Foam::interpolationTable<Type>::operator[](const label i) const
         {
             case interpolationTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "index (" << ii << ") overflow" << nl
+                FatalErrorInFunction
+                    << "index (" << ii << ") overflow" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolationTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "index (" << ii << ") overflow" << nl
+                WarningInFunction
+                    << "index (" << ii << ") overflow" << nl
                     << "    Continuing with the last entry"
                     << endl;
                 // fall-through to 'CLAMP'
@@ -520,21 +490,15 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
         {
             case interpolationTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const scalar) const"
-                )   << "value (" << lookupValue << ") underflow" << nl
+                FatalErrorInFunction
+                    << "value (" << lookupValue << ") underflow" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolationTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const scalar) const"
-                )   << "value (" << lookupValue << ") underflow" << nl
+                WarningInFunction
+                    << "value (" << lookupValue << ") underflow" << nl
                     << "    Continuing with the first entry"
                     << endl;
                 // fall-through to 'CLAMP'
@@ -559,21 +523,15 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
         {
             case interpolationTable::ERROR:
             {
-                FatalErrorIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "value (" << lookupValue << ") overflow" << nl
+                FatalErrorInFunction
+                    << "value (" << lookupValue << ") overflow" << nl
                     << exit(FatalError);
                 break;
             }
             case interpolationTable::WARN:
             {
-                WarningIn
-                (
-                    "Foam::interpolationTable<Type>::operator[]"
-                    "(const label) const"
-                )   << "value (" << lookupValue << ") overflow" << nl
+                WarningInFunction
+                    << "value (" << lookupValue << ") overflow" << nl
                     << "    Continuing with the last entry"
                     << endl;
                 // fall-through to 'CLAMP'
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 09faf41fd7..8f544c0709 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::csvTableReader<Type>::csvTableReader(const dictionary& dict)
 {
     if (componentColumns_.size() != pTraits<Type>::nComponents)
     {
-        FatalErrorIn("csvTableReader<Type>::csvTableReader(const dictionary&)")
+        FatalErrorInFunction
             << componentColumns_ << " does not have the expected length "
             << pTraits<Type>::nComponents << endl
             << exit(FatalError);
@@ -65,10 +65,8 @@ namespace Foam
     {
         if (componentColumns_[0] >= splitted.size())
         {
-            FatalErrorIn
-            (
-                "csvTableReader<scalar>::readValue(const List<string>&)"
-            )   << "No column " << componentColumns_[0] << " in "
+            FatalErrorInFunction
+                << "No column " << componentColumns_[0] << " in "
                 << splitted << endl
                 << exit(FatalError);
         }
@@ -86,10 +84,8 @@ namespace Foam
         {
             if (componentColumns_[i] >= splitted.size())
             {
-                FatalErrorIn
-                (
-                    "csvTableReader<Type>::readValue(const List<string>&)"
-                )   << "No column " << componentColumns_[i] << " in "
+                FatalErrorInFunction
+                    << "No column " << componentColumns_[i] << " in "
                     << splitted << endl
                     << exit(FatalError);
             }
@@ -169,7 +165,7 @@ void Foam::csvTableReader<Type>::operator()
     List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& data
 )
 {
-    notImplemented("csvTableReader<Type>::operator()");
+    NotImplemented;
 }
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
index b33ee3eae2..cd27159ec6 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,8 @@ Foam::autoPtr<Foam::tableReader<Type> > Foam::tableReader<Type>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "tableReader::New(const dictionary&)"
-        )   << "Unknown reader type " << readerType
+        FatalErrorInFunction
+            << "Unknown reader type " << readerType
             << nl << nl
             << "Valid reader types : " << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
index 779f134de3..39bfb0bcc3 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ autoPtr<interpolationWeights> interpolationWeights::New
 {
     if (debug)
     {
-        InfoIn("interpolationWeights::New")
+        InfoInFunction
             << "Selecting interpolationWeights "
             << type << endl;
     }
@@ -69,11 +69,8 @@ autoPtr<interpolationWeights> interpolationWeights::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "interpolationWeights::New(const word&, "
-            "const scalarField&)"
-        )   << "Unknown interpolationWeights type "
+        FatalErrorInFunction
+            << "Unknown interpolationWeights type "
             << type
             << endl << endl
             << "Valid interpolationWeights types are :" << endl
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
index 89497fba37..0e40660fd8 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ Foam::Pair<Foam::scalar> linearInterpolationWeights::integrationWeights
 
     if (s < -SMALL || s > 1+SMALL)
     {
-        FatalErrorIn("linearInterpolationWeights::integrationWeights(..)")
+        FatalErrorInFunction
             << "Value " << t << " outside range " << samples_[i]
             << " .. " << samples_[i+1]
             << exit(FatalError);
@@ -161,7 +161,7 @@ bool linearInterpolationWeights::integrationWeights
 {
     if (t2 < t1-VSMALL)
     {
-        FatalErrorIn("linearInterpolationWeights::integrationWeights(..)")
+        FatalErrorInFunction
             << "Integration should be in positive direction."
             <<  " t1:" << t1 << " t2:" << t2
             << exit(FatalError);
@@ -177,7 +177,7 @@ bool linearInterpolationWeights::integrationWeights
     // For now just fail if any outside table
     if (i1 == -1 || i2 == samples_.size()-1)
     {
-        FatalErrorIn("linearInterpolationWeights::integrationWeights(..)")
+        FatalErrorInFunction
             << "Integrating outside table " << samples_[0] << ".."
             << samples_.last() << " not implemented."
             << " t1:" << t1 << " t2:" << t2 << exit(FatalError);
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C
index 854146cdff..5722ac7f92 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,11 +64,8 @@ splineInterpolationWeights::splineInterpolationWeights
 
             if (mag(d-interval) > SMALL)
             {
-                WarningIn
-                (
-                    "splineInterpolationWeights::splineInterpolationWeights"
-                    "(const scalarField&)"
-                )   << "Spline interpolation only valid for constant intervals."
+                WarningInFunction
+                    << "Spline interpolation only valid for constant intervals."
                     << nl
                     << "Interval 0-1 : " << interval << nl
                     << "Interval " << i-1 << '-' << i << " : "
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H
index 15660ff90c..7e92fc8085 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H
+++ b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,10 +100,7 @@ public:
             scalarField& weights
         ) const
         {
-            notImplemented
-            (
-                "splineInterpolationWeights::integrationWeights(..)"
-            );
+            NotImplemented;
             return false;
         }
 
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index 8431a2ec0e..b4242b2305 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,11 +44,8 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 {
     if (pf.size() != fromPatch_.nPoints())
     {
-        FatalErrorIn
-        (
-            "PatchToPatchInterpolation::pointInterpolate"
-            "(const Field<Type> pf)"
-        )   << "given field does not correspond to patch. Patch size: "
+        FatalErrorInFunction
+            << "given field does not correspond to patch. Patch size: "
             << fromPatch_.nPoints() << " field size: " << pf.size()
             << abort(FatalError);
     }
@@ -116,11 +113,8 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 {
     if (ff.size() != fromPatch_.size())
     {
-        FatalErrorIn
-        (
-            "PatchToPatchInterpolation::faceInterpolate"
-            "(const Field<Type> ff)"
-        )   << "given field does not correspond to patch. Patch size: "
+        FatalErrorInFunction
+            << "given field does not correspond to patch. Patch size: "
             << fromPatch_.size() << " field size: " << ff.size()
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index 4da75b1d19..b8b282fa82 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,11 +174,7 @@ public:
         {
             if (t < -VSMALL)
             {
-                FatalErrorIn
-                (
-                    "scalar PatchToPatchInterpolation::"
-                    "setProjectionTol(const scalar t)"
-                )   << "Negative projection tolerance.  This is not allowed."
+                FatalErrorInFunction
                     << abort(FatalError);
             }
 
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index 6f09c755d0..bfd3b4a6d6 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,10 +52,8 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
 {
     if (faceToPointWeightsPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const"
-        )   << "Face-to-edge weights already calculated"
+        FatalErrorInFunction
+            << "Face-to-edge weights already calculated"
             << abort(FatalError);
     }
 
@@ -110,10 +108,8 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
 {
     if (faceToEdgeWeightsPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const"
-        )   << "Face-to-edge weights already calculated"
+        FatalErrorInFunction
+            << "Face-to-edge weights already calculated"
             << abort(FatalError);
     }
 
@@ -182,11 +178,8 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
     // Check size of the given field
     if (ff.size() != patch_.size())
     {
-        FatalErrorIn
-        (
-            "tmp<Field<Type> > PrimitivePatchInterpolation::"
-            "faceToPointInterpolate(const Field<Type> ff)"
-        )   << "given field does not correspond to patch. Patch size: "
+        FatalErrorInFunction
+            << "given field does not correspond to patch. Patch size: "
             << patch_.size() << " field size: " << ff.size()
             << abort(FatalError);
     }
@@ -241,11 +234,8 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 {
     if (pf.size() != patch_.nPoints())
     {
-        FatalErrorIn
-        (
-            "tmp<Field<Type> > PrimitivePatchInterpolation::"
-            "pointToFaceInterpolate(const Field<Type> pf)"
-        )   << "given field does not correspond to patch. Patch size: "
+        FatalErrorInFunction
+            << "given field does not correspond to patch. Patch size: "
             << patch_.nPoints() << " field size: " << pf.size()
             << abort(FatalError);
     }
@@ -302,11 +292,8 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
     // Check size of the given field
     if (pf.size() != patch_.size())
     {
-        FatalErrorIn
-        (
-            "tmp<Field<Type> > PrimitivePatchInterpolation::"
-            "faceToEdgeInterpolate(const Field<Type> ff)"
-        )   << "given field does not correspond to patch. Patch size: "
+        FatalErrorInFunction
+            << "given field does not correspond to patch. Patch size: "
             << patch_.size() << " field size: " << pf.size()
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index e150c64c6a..3ceb1a19ed 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ void Foam::uniformInterpolationTable<Type>::checkTable() const
 {
     if (size() < 2)
     {
-        FatalErrorIn("uniformInterpolationTable<Type>::checkTable()")
+        FatalErrorInFunction
             << "Table " << name() << ": must have at least 2 values." << nl
             << "Table size = " << size() << nl
             << "    min, interval width = " << x0_ << ", " << dx_ << nl
@@ -149,20 +149,16 @@ Type Foam::uniformInterpolationTable<Type>::interpolate(scalar x) const
     {
         if (x < x0_)
         {
-            FatalErrorIn
-            (
-                "uniformInterpolationTable<Type>::interpolate(scalar x)"
-            )   << "Supplied value is less than minimum table value:" << nl
+            FatalErrorInFunction
+                << "Supplied value is less than minimum table value:" << nl
                 << "xMin=" << x0_ << ", xMax=" << xMax() << ", x=" << x << nl
                 << exit(FatalError);
         }
 
         if (x > xMax())
         {
-            FatalErrorIn
-            (
-                "uniformInterpolationTable<Type>::interpolate(scalar x)"
-            )   << "Supplied value is greater than maximum table value:" << nl
+            FatalErrorInFunction
+                << "Supplied value is greater than maximum table value:" << nl
                 << "xMin=" << x0_ << ", xMax=" << xMax() << ", x=" << x << nl
                 << exit(FatalError);
         }
@@ -204,10 +200,8 @@ Type Foam::uniformInterpolationTable<Type>::interpolateLog10
         }
         else
         {
-            FatalErrorIn
-            (
-                "uniformInterpolationTable<Type>::interpolateLog10(scalar x)"
-            )   << "Table " << name() << nl
+            FatalErrorInFunction
+                << "Table " << name() << nl
                 << "Supplied value must be greater than 0 when in log10 mode"
                 << nl << "x=" << x << nl << exit(FatalError);
         }
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
index 5179b5ca3c..b5e37d441b 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C
@@ -352,7 +352,7 @@ void Foam::LUscalarMatrix::convert
 
                 if (neiInterfacei == -1)
                 {
-                    FatalErrorIn("LUscalarMatrix::convert") << exit(FatalError);
+                    FatalErrorInFunction << exit(FatalError);
                 }
 
                 const procLduInterface& neiInterface =
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C
index 23ee38b392..32fabd3429 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,11 +58,8 @@ Foam::procLduInterface::procLduInterface
     }
     else
     {
-        FatalErrorIn
-        (
-            "procLduInterface::procLduInterface"
-            "(const lduInterfaceField&, const scalarField&"
-        )   << "Unknown lduInterface type "
+        FatalErrorInFunction
+            << "Unknown lduInterface type "
             << interface.interface().type()
             << exit(FatalError);
     }
diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
index a2f80a28a1..d113a6b30c 100644
--- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
+++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
 
         autoPtr<procLduInterface> clone()
         {
-            notImplemented("procLduInterface::clone()");
+            NotImplemented;
             return autoPtr<procLduInterface>(NULL);
         }
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
index fb131308b3..8c3d6a79c2 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -261,10 +261,8 @@ const Foam::Field<DType>& Foam::LduMatrix<Type, DType, LUType>::diag() const
 {
     if (!diagPtr_)
     {
-        FatalErrorIn
-        (
-            "const Field<DType>& LduMatrix<Type, DType, LUType>::diag() const"
-        )   << "diagPtr_ unallocated"
+        FatalErrorInFunction
+            << "diagPtr_ unallocated"
             << abort(FatalError);
     }
 
@@ -277,10 +275,8 @@ const Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::upper() const
 {
     if (!lowerPtr_ && !upperPtr_)
     {
-        FatalErrorIn
-        (
-            "const Field<LUType>& LduMatrix<Type, DType, LUType>::upper() const"
-        )   << "lowerPtr_ or upperPtr_ unallocated"
+        FatalErrorInFunction
+            << "lowerPtr_ or upperPtr_ unallocated"
             << abort(FatalError);
     }
 
@@ -300,10 +296,8 @@ const Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::lower() const
 {
     if (!lowerPtr_ && !upperPtr_)
     {
-        FatalErrorIn
-        (
-            "const Field<LUType>& LduMatrix<Type, DType, LUType>::lower() const"
-        )   << "lowerPtr_ or upperPtr_ unallocated"
+        FatalErrorInFunction
+            << "lowerPtr_ or upperPtr_ unallocated"
             << abort(FatalError);
     }
 
@@ -323,10 +317,8 @@ const Foam::Field<Type>& Foam::LduMatrix<Type, DType, LUType>::source() const
 {
     if (!sourcePtr_)
     {
-        FatalErrorIn
-        (
-            "const Field<Type>& LduMatrix<Type, DType, LUType>::source() const"
-        )   << "sourcePtr_ unallocated"
+        FatalErrorInFunction
+            << "sourcePtr_ unallocated"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index 64b925c066..d00069911d 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -449,11 +449,7 @@ public:
                 const Field<Type>& rT
             ) const
             {
-                notImplemented
-                (
-                    type() +"::preconditionT"
-                    "(Field<Type>& wT, const Field<Type>& rT)"
-                );
+                NotImplemented;
             }
     };
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index 321f1f71f8..3685bbe20d 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -168,10 +168,8 @@ void Foam::LduMatrix<Type, DType, LUType>::operator=(const LduMatrix& A)
 {
     if (this == &A)
     {
-        FatalErrorIn
-        (
-            "LduMatrix<Type, DType, LUType>::operator=(const LduMatrix&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 
@@ -305,10 +303,8 @@ void Foam::LduMatrix<Type, DType, LUType>::operator+=(const LduMatrix& A)
     }
     else
     {
-        FatalErrorIn
-        (
-            "LduMatrix<Type, DType, LUType>::operator+=(const LduMatrix& A)"
-        )   << "Unknown matrix type combination"
+        FatalErrorInFunction
+            << "Unknown matrix type combination"
             << abort(FatalError);
     }
 
@@ -384,10 +380,8 @@ void Foam::LduMatrix<Type, DType, LUType>::operator-=(const LduMatrix& A)
     }
     else
     {
-        FatalErrorIn
-        (
-            "LduMatrix<Type, DType, LUType>::operator-=(const LduMatrix& A)"
-        )   << "Unknown matrix type combination"
+        FatalErrorInFunction
+            << "Unknown matrix type combination"
             << abort(FatalError);
     }
 
@@ -433,10 +427,8 @@ void Foam::LduMatrix<Type, DType, LUType>::operator*=
         }
     }
 
-    FatalErrorIn
-    (
-        "LduMatrix<Type, DType, LUType>::operator*=(const scalarField& sf)"
-    )   << "Scaling a matrix by scalarField is not currently supported\n"
+    FatalErrorInFunction
+        << "Scaling a matrix by scalarField is not currently supported\n"
            "because scaling interfacesUpper_ and interfacesLower_ "
            "require special transfers"
         << abort(FatalError);
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
index 230eb0d2b6..aafaf20c09 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,8 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
 
         if (constructorIter == symMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "LduMatrix<Type, DType, LUType>::preconditioner::New"
-                "(const solver&, Istream&)",
                 preconditionerDict
             )   << "Unknown symmetric matrix preconditioner "
                 << preconditionerName << endl << endl
@@ -72,10 +70,8 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
 
         if (constructorIter == asymMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "LduMatrix<Type, DType, LUType>::preconditioner::New"
-                "(const solver&, Istream&)",
                 preconditionerDict
             )   << "Unknown asymmetric matrix preconditioner "
                 << preconditionerName << endl << endl
@@ -95,10 +91,8 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "LduMatrix<Type, DType, LUType>::preconditioner::New"
-            "(const solver&, Istream&)",
             preconditionerDict
         )   << "cannot preconditione incomplete matrix, "
                "no diagonal or off-diagonal coefficient"
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
index 4377f6da94..f15c0fac47 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,8 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
 
         if (constructorIter == symMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "LduMatrix<Type, DType, LUType>::smoother::New", smootherDict
-            )   << "Unknown symmetric matrix smoother " << smootherName
+            FatalIOErrorInFunction(smootherDict)
+                << "Unknown symmetric matrix smoother " << smootherName
                 << endl << endl
                 << "Valid symmetric matrix smoothers are :" << endl
                 << symMatrixConstructorTablePtr_->toc()
@@ -71,10 +69,8 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
 
         if (constructorIter == asymMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "LduMatrix<Type, DType, LUType>::smoother::New", smootherDict
-            )   << "Unknown asymmetric matrix smoother " << smootherName
+            FatalIOErrorInFunction(smootherDict)
+                << "Unknown asymmetric matrix smoother " << smootherName
                 << endl << endl
                 << "Valid asymmetric matrix smoothers are :" << endl
                 << asymMatrixConstructorTablePtr_->toc()
@@ -92,10 +88,8 @@ Foam::LduMatrix<Type, DType, LUType>::smoother::New
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "LduMatrix<Type, DType, LUType>::smoother::New", smootherDict
-        )   << "cannot solve incomplete matrix, no off-diagonal coefficients"
+        FatalIOErrorInFunction(smootherDict)
+            << "cannot solve incomplete matrix, no off-diagonal coefficients"
             << exit(FatalIOError);
 
         return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>(NULL);
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
index fcd1400d59..8aed474b36 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,10 +58,8 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
 
         if (constructorIter == symMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "LduMatrix<Type, DType, LUType>::solver::New", solverDict
-            )   << "Unknown symmetric matrix solver " << solverName
+            FatalIOErrorInFunction(solverDict)
+                << "Unknown symmetric matrix solver " << solverName
                 << endl << endl
                 << "Valid symmetric matrix solvers are :" << endl
                 << symMatrixConstructorTablePtr_->toc()
@@ -85,10 +83,8 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
 
         if (constructorIter == asymMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "LduMatrix<Type, DType, LUType>::solver::New", solverDict
-            )   << "Unknown asymmetric matrix solver " << solverName
+            FatalIOErrorInFunction(solverDict)
+                << "Unknown asymmetric matrix solver " << solverName
                 << endl << endl
                 << "Valid asymmetric matrix solvers are :" << endl
                 << asymMatrixConstructorTablePtr_->toc()
@@ -107,10 +103,8 @@ Foam::LduMatrix<Type, DType, LUType>::solver::New
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "LduMatrix<Type, DType, LUType>::solver::New", solverDict
-        )   << "cannot solve incomplete matrix, "
+        FatalIOErrorInFunction(solverDict)
+            << "cannot solve incomplete matrix, "
                "no diagonal or off-diagonal coefficient"
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index d3d8de20a0..b068e47481 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
     }
     else
     {
-        FatalErrorIn("LduMatrix<Type, DType, LUType>::initMatrixInterfaces")
+        FatalErrorInFunction
             << "Unsuported communications type "
             << Pstream::commsTypeNames[Pstream::defaultCommsType]
             << exit(FatalError);
@@ -189,7 +189,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
     }
     else
     {
-        FatalErrorIn("LduMatrix<Type, DType, LUType>::updateMatrixInterfaces")
+        FatalErrorInFunction
             << "Unsuported communications type "
             << Pstream::commsTypeNames[Pstream::defaultCommsType]
             << exit(FatalError);
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
index 6a4cf06508..e898751fd1 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,6 +126,36 @@ void Foam::SolverPerformance<Type>::print
 }
 
 
+template<class Type>
+void Foam::SolverPerformance<Type>::replace
+(
+    const Foam::label cmpt,
+    const Foam::SolverPerformance<typename pTraits<Type>::cmptType>& sp
+)
+{
+    initialResidual_.replace(cmpt, sp.initialResidual());
+    finalResidual_.replace(cmpt, sp.finalResidual());
+    singular_[cmpt] = sp.singular();
+}
+
+
+template<class Type>
+Foam::SolverPerformance<typename Foam::pTraits<Type>::cmptType>
+Foam::SolverPerformance<Type>::max()
+{
+    return SolverPerformance<typename pTraits<Type>::cmptType>
+    (
+        solverName_,
+        fieldName_,
+        cmptMax(initialResidual_),
+        cmptMax(finalResidual_),
+        noIterations_,
+        converged_,
+        singular()
+    );
+}
+
+
 template<class Type>
 bool Foam::SolverPerformance<Type>::operator!=
 (
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
index 0bc3fb389e..c24fc9c793 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,13 +78,15 @@ Ostream& operator<<
 template<class Type>
 class SolverPerformance
 {
-    word   solverName_;
-    word   fieldName_;
-    Type   initialResidual_;
-    Type   finalResidual_;
-    label  noIterations_;
-    bool   converged_;
-    FixedList<bool, pTraits<Type>::nComponents> singular_;
+    // Private data
+
+        word   solverName_;
+        word   fieldName_;
+        Type   initialResidual_;
+        Type   finalResidual_;
+        label  noIterations_;
+        bool   converged_;
+        FixedList<bool, pTraits<Type>::nComponents> singular_;
 
 
 public:
@@ -220,6 +222,17 @@ public:
         //- Print summary of solver performance to the given stream
         void print(Ostream& os) const;
 
+        //- Replace component based on the minimal SolverPerformance
+        void replace
+        (
+            const label cmpt,
+            const SolverPerformance<typename pTraits<Type>::cmptType>& sp
+        );
+
+        //- Return the summary maximum of SolverPerformance<Type>
+        //  Effectively it will mostly return solverPerformanceScalar
+        SolverPerformance<typename pTraits<Type>::cmptType> max();
+
 
     // Member Operators
 
@@ -229,7 +242,7 @@ public:
     // Friend functions
 
         //- Return the element-wise maximum of two SolverPerformance<Type>s
-        friend SolverPerformance<Type> max <Type>
+        friend SolverPerformance<Type> Foam::max <Type>
         (
             const SolverPerformance<Type>&,
             const SolverPerformance<Type>&
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C
index 5bac12c784..fe022526b5 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,4 +36,12 @@ namespace Foam
 };
 
 
+template<>
+Foam::SolverPerformance<Foam::scalar>
+Foam::SolverPerformance<Foam::scalar>::max()
+{
+    return *this;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H
index 139ab128b1..ccc26daae7 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,13 @@ SourceFiles
 namespace Foam
 {
     typedef SolverPerformance<scalar> solverPerformance;
+
+    // Specialization of the max function for scalar object
+    template<>
+    SolverPerformance<scalar> SolverPerformance<scalar>::max();
 }
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index 0f4abf3698..ec6aba8a09 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -67,7 +67,7 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m)
 {
     if (n_ < 0 || m_ < 0)
     {
-        FatalErrorIn("Matrix<Form, Type>::Matrix(const label n, const label m)")
+        FatalErrorInFunction
             << "bad n, m " << n_ << ", " << m_
             << abort(FatalError);
     }
@@ -85,10 +85,8 @@ Foam::Matrix<Form, Type>::Matrix(const label n, const label m, const Type& a)
 {
     if (n_ < 0 || m_ < 0)
     {
-        FatalErrorIn
-        (
-            "Matrix<Form, Type>::Matrix(const label n, const label m, const T&)"
-        )   << "bad n, m " << n_ << ", " << m_
+        FatalErrorInFunction
+            << "bad n, m " << n_ << ", " << m_
             << abort(FatalError);
     }
 
@@ -202,7 +200,7 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
 {
     if (this == &a)
     {
-        FatalErrorIn("Matrix<Form, Type>::operator=(const Matrix<Form, Type>&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
@@ -253,7 +251,7 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
     }
     else
     {
-        FatalErrorIn("max(const Matrix<Form, Type>&)")
+        FatalErrorInFunction
             << "matrix is empty"
             << abort(FatalError);
 
@@ -285,7 +283,7 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
     }
     else
     {
-        FatalErrorIn("min(const Matrix<Form, Type>&)")
+        FatalErrorInFunction
             << "matrix is empty"
             << abort(FatalError);
 
@@ -323,22 +321,16 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
     if (a.n() != b.n())
     {
-        FatalErrorIn
-        (
-            "Matrix<Form, Type>::operator+"
-            "(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
-        )   << "attempted add matrices with different number of rows: "
+        FatalErrorInFunction
+            << "attempted add matrices with different number of rows: "
             << a.n() << ", " << b.n()
             << abort(FatalError);
     }
 
     if (a.m() != b.m())
     {
-        FatalErrorIn
-        (
-            "Matrix<Form, Type>::operator+"
-            "(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
-        )   << "attempted add matrices with different number of columns: "
+        FatalErrorInFunction
+            << "attempted add matrices with different number of columns: "
             << a.m() << ", " << b.m()
             << abort(FatalError);
     }
@@ -364,22 +356,16 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
     if (a.n() != b.n())
     {
-        FatalErrorIn
-        (
-            "Matrix<Form, Type>::operator-"
-            "(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
-        )   << "attempted add matrices with different number of rows: "
+        FatalErrorInFunction
+            << "attempted add matrices with different number of rows: "
             << a.n() << ", " << b.n()
             << abort(FatalError);
     }
 
     if (a.m() != b.m())
     {
-        FatalErrorIn
-        (
-            "Matrix<Form, Type>::operator-"
-            "(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
-        )   << "attempted add matrices with different number of columns: "
+        FatalErrorInFunction
+            << "attempted add matrices with different number of columns: "
             << a.m() << ", " << b.m()
             << abort(FatalError);
     }
@@ -426,11 +412,8 @@ Form Foam::operator*(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
 {
     if (a.m() != b.n())
     {
-        FatalErrorIn
-        (
-            "Matrix<Form, Type>::operator*"
-            "(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
-        )   << "attempted to multiply incompatible matrices:" << nl
+        FatalErrorInFunction
+            << "attempted to multiply incompatible matrices:" << nl
             << "Matrix A : " << a.n() << " rows, " << a.m() << " columns" << nl
             << "Matrix B : " << b.n() << " rows, " << b.m() << " columns" << nl
             << "In order to multiply matrices, columns of A must equal "
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index 5b99b0d094..ccffa5c3db 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,13 +78,13 @@ inline void Foam::Matrix<Form, Type>::checki(const label i) const
 {
     if (!n_)
     {
-        FatalErrorIn("Matrix<Form, Type>::checki(const label)")
+        FatalErrorInFunction
             << "attempt to access element from zero sized row"
             << abort(FatalError);
     }
     else if (i<0 || i>=n_)
     {
-        FatalErrorIn("Matrix<Form, Type>::checki(const label)")
+        FatalErrorInFunction
             << "index " << i << " out of range 0 ... " << n_-1
             << abort(FatalError);
     }
@@ -96,13 +96,13 @@ inline void Foam::Matrix<Form, Type>::checkj(const label j) const
 {
     if (!m_)
     {
-        FatalErrorIn("Matrix<Form, Type>::checkj(const label)")
+        FatalErrorInFunction
             << "attempt to access element from zero sized column"
             << abort(FatalError);
     }
     else if (j<0 || j>=m_)
     {
-        FatalErrorIn("Matrix<Form, Type>::checkj(const label)")
+        FatalErrorInFunction
             << "index " << j << " out of range 0 ... " << m_-1
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixIO.C b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
index 29c9a237e7..8c52bdebc5 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixIO.C
+++ b/src/OpenFOAM/matrices/Matrix/MatrixIO.C
@@ -138,7 +138,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Matrix<Form, Type>& M)
     }
     else
     {
-        FatalIOErrorIn("operator>>(Istream&, Matrix<Form, Type>&)", is)
+        FatalIOErrorInFunction(is)
             << "incorrect first token, expected <int>, found "
             << firstToken.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index aed773e464..243d31904e 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,8 @@ inline Foam::SquareMatrix<Type>::SquareMatrix(const label m, const label n)
 {
     if (m != n)
     {
-        FatalErrorIn
-        (
-            "SquareMatrix<Type>::SquareMatrix(const label m, const label n)"
-        ) << "m != n for constructing a square matrix" << exit(FatalError);
+        FatalErrorInFunction
+          << "m != n for constructing a square matrix" << exit(FatalError);
     }
 }
 
@@ -63,11 +61,8 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 {
     if (m != n)
     {
-        FatalErrorIn
-        (
-            "SquareMatrix<Type>::SquareMatrix"
-            "(const label m, const label n, const Type&)"
-        ) << "m != n for constructing a square matrix" << exit(FatalError);
+        FatalErrorInFunction
+          << "m != n for constructing a square matrix" << exit(FatalError);
     }
 }
 
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index 1dee0ab9d0..b067cc2669 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,11 +50,8 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
 {
     if (m != n)
     {
-        FatalErrorIn
-        (
-            "SymmetricSquareMatrix<Type>::SymmetricSquareMatrix"
-            "(const label m, const label n)"
-        )   << "m != n for constructing a symmetric square matrix"
+        FatalErrorInFunction
+            << "m != n for constructing a symmetric square matrix"
             << exit(FatalError);
     }
 }
@@ -72,11 +69,8 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix
 {
     if (m != n)
     {
-        FatalErrorIn
-        (
-            "SymmetricSquareMatrix<Type>::SymmetricSquareMatrix"
-            "(const label m, const label n, const Type&)"
-        )   << "m != n for constructing a symmetric square matrix"
+        FatalErrorInFunction
+            << "m != n for constructing a symmetric square matrix"
             << exit(FatalError);
     }
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index 401a3cfa76..b7cb0153c5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ void Foam::lduAddressing::calcLosort() const
 {
     if (losortPtr_)
     {
-        FatalErrorIn("lduAddressing::calcLosort() const")
+        FatalErrorInFunction
             << "losort already calculated"
             << abort(FatalError);
     }
@@ -94,7 +94,7 @@ void Foam::lduAddressing::calcOwnerStart() const
 {
     if (ownerStartPtr_)
     {
-        FatalErrorIn("lduAddressing::calcOwnerStart() const")
+        FatalErrorInFunction
             << "owner start already calculated"
             << abort(FatalError);
     }
@@ -131,7 +131,7 @@ void Foam::lduAddressing::calcLosortStart() const
 {
     if (losortStartPtr_)
     {
-        FatalErrorIn("lduAddressing::calcLosortStart() const")
+        FatalErrorInFunction
             << "losort start already calculated"
             << abort(FatalError);
     }
@@ -238,10 +238,8 @@ Foam::label Foam::lduAddressing::triIndex(const label a, const label b) const
 
     // If neighbour has not been found, something has gone seriously
     // wrong with the addressing mechanism
-    FatalErrorIn
-    (
-        "lduAddressing::triIndex(const label owner, const label nbr) const"
-    )   << "neighbour " << nbr << " not found for owner " << own << ". "
+    FatalErrorInFunction
+        << "neighbour " << nbr << " not found for owner " << own << ". "
         << "Problem with addressing"
         << abort(FatalError);
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index c0ca614a13..645c1de157 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -79,7 +79,7 @@ void Foam::processorLduInterface::send
     }
     else
     {
-        FatalErrorIn("processorLduInterface::send")
+        FatalErrorInFunction
             << "Unsupported communications type " << commsType
             << exit(FatalError);
     }
@@ -111,7 +111,7 @@ void Foam::processorLduInterface::receive
     }
     else
     {
-        FatalErrorIn("processorLduInterface::receive")
+        FatalErrorInFunction
             << "Unsupported communications type " << commsType
             << exit(FatalError);
     }
@@ -196,7 +196,7 @@ void Foam::processorLduInterface::compressedSend
         }
         else
         {
-            FatalErrorIn("processorLduInterface::compressedSend")
+            FatalErrorInFunction
                 << "Unsupported communications type " << commsType
                 << exit(FatalError);
         }
@@ -238,7 +238,7 @@ void Foam::processorLduInterface::compressedReceive
         }
         else if (commsType != Pstream::nonBlocking)
         {
-            FatalErrorIn("processorLduInterface::compressedReceive")
+            FatalErrorInFunction
                 << "Unsupported communications type " << commsType
                 << exit(FatalError);
         }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index b8bc5c930c..1f22e238e0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -260,7 +260,7 @@ const Foam::scalarField& Foam::lduMatrix::lower() const
 {
     if (!lowerPtr_ && !upperPtr_)
     {
-        FatalErrorIn("lduMatrix::lower() const")
+        FatalErrorInFunction
             << "lowerPtr_ or upperPtr_ unallocated"
             << abort(FatalError);
     }
@@ -280,7 +280,7 @@ const Foam::scalarField& Foam::lduMatrix::diag() const
 {
     if (!diagPtr_)
     {
-        FatalErrorIn("const scalarField& lduMatrix::diag() const")
+        FatalErrorInFunction
             << "diagPtr_ unallocated"
             << abort(FatalError);
     }
@@ -293,7 +293,7 @@ const Foam::scalarField& Foam::lduMatrix::upper() const
 {
     if (!lowerPtr_ && !upperPtr_)
     {
-        FatalErrorIn("lduMatrix::upper() const")
+        FatalErrorInFunction
             << "lowerPtr_ or upperPtr_ unallocated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index f9da5b3a99..e9ae3af889 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -500,12 +500,7 @@ public:
                 const direction cmpt=0
             ) const
             {
-                notImplemented
-                (
-                    type() +"::preconditionT"
-                    "(scalarField& wT, const scalarField& rT, "
-                    "const direction cmpt)"
-                );
+                NotImplemented;
             }
     };
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
index fa65a51b6d..3bf180e493 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
@@ -204,7 +204,7 @@ void Foam::lduMatrix::operator+=(const lduMatrix& A)
     {
         if (debug > 1)
         {
-            WarningIn("lduMatrix::operator+=(const lduMatrix& A)")
+            WarningInFunction
                 << "Unknown matrix type combination" << nl
                 << "    this :"
                 << " diagonal:" << diagonal()
@@ -283,7 +283,7 @@ void Foam::lduMatrix::operator-=(const lduMatrix& A)
     {
         if (debug > 1)
         {
-            WarningIn("lduMatrix::operator-=(const lduMatrix& A)")
+            WarningInFunction
                 << "Unknown matrix type combination" << nl
                 << "    this :"
                 << " diagonal:" << diagonal()
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index 3c2131fed4..065079ee2c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,10 +87,8 @@ Foam::lduMatrix::preconditioner::New
 
         if (constructorIter == symMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "lduMatrix::preconditioner::New"
-                "(const solver&, const dictionary&)",
                 controls
             )   << "Unknown symmetric matrix preconditioner "
                 << name << nl << nl
@@ -115,10 +113,8 @@ Foam::lduMatrix::preconditioner::New
 
         if (constructorIter == asymMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "lduMatrix::preconditioner::New"
-                "(const solver&, const dictionary&)",
                 controls
             )   << "Unknown asymmetric matrix preconditioner "
                 << name << nl << nl
@@ -138,10 +134,8 @@ Foam::lduMatrix::preconditioner::New
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "lduMatrix::preconditioner::New"
-            "(const solver&, const dictionary&)",
             controls
         )   << "cannot solve incomplete matrix, "
                "no diagonal or off-diagonal coefficient"
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 730bd869f6..f24a990f9d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,10 +91,8 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
 
         if (constructorIter == symMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "lduMatrix::smoother::New", solverControls
-            )   << "Unknown symmetric matrix smoother "
+            FatalIOErrorInFunction(solverControls)
+                << "Unknown symmetric matrix smoother "
                 << name << nl << nl
                 << "Valid symmetric matrix smoothers are :" << endl
                 << symMatrixConstructorTablePtr_->sortedToc()
@@ -120,10 +118,8 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
 
         if (constructorIter == asymMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "lduMatrix::smoother::New", solverControls
-            )   << "Unknown asymmetric matrix smoother "
+            FatalIOErrorInFunction(solverControls)
+                << "Unknown asymmetric matrix smoother "
                 << name << nl << nl
                 << "Valid asymmetric matrix smoothers are :" << endl
                 << asymMatrixConstructorTablePtr_->sortedToc()
@@ -144,10 +140,8 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "lduMatrix::smoother::New", solverControls
-        )   << "cannot solve incomplete matrix, "
+        FatalIOErrorInFunction(solverControls)
+            << "cannot solve incomplete matrix, "
                "no diagonal or off-diagonal coefficient"
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index aed21fe9f7..1f6bd82d11 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,10 +71,8 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
 
         if (constructorIter == symMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "lduMatrix::solver::New", solverControls
-            )   << "Unknown symmetric matrix solver " << name << nl << nl
+            FatalIOErrorInFunction(solverControls)
+                << "Unknown symmetric matrix solver " << name << nl << nl
                 << "Valid symmetric matrix solvers are :" << endl
                 << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
@@ -100,10 +98,8 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
 
         if (constructorIter == asymMatrixConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
-            (
-                "lduMatrix::solver::New", solverControls
-            )   << "Unknown asymmetric matrix solver " << name << nl << nl
+            FatalIOErrorInFunction(solverControls)
+                << "Unknown asymmetric matrix solver " << name << nl << nl
                 << "Valid asymmetric matrix solvers are :" << endl
                 << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
@@ -124,10 +120,8 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "lduMatrix::solver::New", solverControls
-        )   << "cannot solve incomplete matrix, "
+        FatalIOErrorInFunction(solverControls)
+            << "cannot solve incomplete matrix, "
                "no diagonal or off-diagonal coefficient"
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index afa02c0231..a473b2d637 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -100,7 +100,7 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
     }
     else
     {
-        FatalErrorIn("lduMatrix::faceH(const Field<Type>& psi) const")
+        FatalErrorInFunction
             << "Cannot calculate faceH"
                " the matrix does not have any off-diagonal coefficients."
             << exit(FatalError);
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index f40b23dc87..36db4b5f0f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ void Foam::lduMatrix::initMatrixInterfaces
     }
     else
     {
-        FatalErrorIn("lduMatrix::initMatrixInterfaces(..)")
+        FatalErrorInFunction
             << "Unsuported communications type "
             << Pstream::commsTypeNames[Pstream::defaultCommsType]
             << exit(FatalError);
@@ -258,7 +258,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
     }
     else
     {
-        FatalErrorIn("lduMatrix::updateMatrixInterfaces(..)")
+        FatalErrorInFunction
             << "Unsuported communications type "
             << Pstream::commsTypeNames[Pstream::defaultCommsType]
             << exit(FatalError);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index ce076177ed..eb640e2010 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,17 +47,14 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
 
     if (min(restrictMap) == -1)
     {
-        FatalErrorIn("GAMGAgglomeration::agglomerateLduAddressing")
+        FatalErrorInFunction
             << "min(restrictMap) == -1" << exit(FatalError);
     }
 
     if (restrictMap.size() != fineMeshAddr.size())
     {
-        FatalErrorIn
-        (
-            "GAMGAgglomeration::agglomerateLduAddressing"
-            "(const label fineLevelIndex)"
-        )   << "restrict map does not correspond to fine level. " << endl
+        FatalErrorInFunction
+            << "restrict map does not correspond to fine level. " << endl
             << " Sizes: restrictMap: " << restrictMap.size()
             << " nEqns: " << fineMeshAddr.size()
             << abort(FatalError);
@@ -232,7 +229,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
             }
             else
             {
-                FatalErrorIn("GAMGAgglomeration::agglomerateLduAddressing(..)")
+                FatalErrorInFunction
                     << "problem."
                     << " fineFacei:" << fineFacei
                     << " rmUpperAddr:" << rmUpperAddr
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 6f5e4649af..6092a56a67 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -302,11 +302,8 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 
         if (cstrIter == lduMeshConstructorTablePtr_->end())
         {
-            FatalErrorIn
-            (
-                "GAMGAgglomeration::New"
-                "(const lduMesh& mesh, const dictionary& controlDict)"
-            )   << "Unknown GAMGAgglomeration type "
+            FatalErrorInFunction
+                << "Unknown GAMGAgglomeration type "
                 << agglomeratorType << ".\n"
                 << "Valid matrix GAMGAgglomeration types are :"
                 << lduMatrixConstructorTablePtr_->sortedToc() << endl
@@ -406,12 +403,8 @@ Foam::autoPtr<Foam::GAMGAgglomeration> Foam::GAMGAgglomeration::New
 
     if (cstrIter == geometryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "GAMGAgglomeration::New"
-            "(const lduMesh& mesh, const scalarField&"
-            ", const vectorField&, const dictionary& controlDict)"
-        )   << "Unknown GAMGAgglomeration type "
+        FatalErrorInFunction
+            << "Unknown GAMGAgglomeration type "
             << agglomeratorType << ".\n"
             << "Valid geometric GAMGAgglomeration types are :"
             << geometryConstructorTablePtr_->sortedToc()
@@ -581,10 +574,8 @@ bool Foam::GAMGAgglomeration::checkRestriction
 {
     if (fineAddressing.size() != restrict.size())
     {
-        FatalErrorIn
-        (
-            "checkRestriction(..)"
-        )   << "nCells:" << fineAddressing.size()
+        FatalErrorInFunction
+            << "nCells:" << fineAddressing.size()
             << " agglom:" << restrict.size()
             << abort(FatalError);
     }
@@ -647,7 +638,7 @@ bool Foam::GAMGAgglomeration::checkRestriction
 
     if (nNewCoarse > nCoarse)
     {
-        //WarningIn("GAMGAgglomeration::checkRestriction(..)")
+        //WarningInFunction
         //    << "Have " << nCoarse
         //    << " agglomerated cells but " << nNewCoarse
         //    << " disconnected regions" << endl;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
index e5d45cf24a..645fee617d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,12 +103,8 @@ void Foam::GAMGAgglomeration::restrictField
 
     if (!procAgglom && ff.size() != fineToCoarse.size())
     {
-        FatalErrorIn
-        (
-            "void GAMGAgglomeration::restrictField"
-            "(Field<Type>& cf, const Field<Type>& ff, "
-            "const label fineLevelIndex) const"
-        )   << "field does not correspond to level " << fineLevelIndex
+        FatalErrorInFunction
+            << "field does not correspond to level " << fineLevelIndex
             << " sizes: field = " << ff.size()
             << " level = " << fineToCoarse.size()
             << abort(FatalError);
@@ -150,12 +146,8 @@ void Foam::GAMGAgglomeration::restrictFaceField
 
     if (ff.size() != fineToCoarse.size())
     {
-        FatalErrorIn
-        (
-            "void GAMGAgglomeration::restrictFaceField"
-            "(Field<Type>& cf, const Field<Type>& ff, "
-            "const label fineLevelIndex) const"
-        )   << "field does not correspond to level " << fineLevelIndex
+        FatalErrorInFunction
+            << "field does not correspond to level " << fineLevelIndex
             << " sizes: field = " << ff.size()
             << " level = " << fineToCoarse.size()
             << abort(FatalError);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index 1e34da34b3..9233d11cfc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -369,11 +369,8 @@ Foam::autoPtr<Foam::GAMGProcAgglomeration> Foam::GAMGProcAgglomeration::New
 
     if (cstrIter == GAMGAgglomerationConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "GAMGProcAgglomeration::New(const word&, GAMGAgglomeration&"
-            ", const dictionary&) "
-        )   << "Unknown GAMGProcAgglomeration type "
+        FatalErrorInFunction
+            << "Unknown GAMGProcAgglomeration type "
             << type << " for GAMGAgglomeration " << agglom.type() << nl << nl
             << "Valid GAMGProcAgglomeration types are :" << endl
             << GAMGAgglomerationConstructorTablePtr_->sortedToc()
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
index c67ce2b18b..4c64f2dbfa 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
 
             if (fineLevelIndex >= agglom_.size())
             {
-                WarningIn("manualGAMGProcAgglomeration::agglomerate()")
+                WarningInFunction
                     << "Ignoring specification for level " << fineLevelIndex
                     << " since outside agglomeration." << endl;
 
@@ -141,10 +141,8 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
 
                         if (masterIndex == -1)
                         {
-                            FatalErrorIn
-                            (
-                                "manualGAMGProcAgglomeration::agglomerate()"
-                            )   << "At level " << fineLevelIndex
+                            FatalErrorInFunction
+                                << "At level " << fineLevelIndex
                                 << " the master processor "
                                 << coarseToMaster[coarseI]
                                 << " is not in the cluster "
@@ -165,10 +163,8 @@ bool Foam::manualGAMGProcAgglomeration::agglomerate()
                     // Check that we've done all processors
                     if (findIndex(procAgglomMap, -1) != -1)
                     {
-                        FatalErrorIn
-                        (
-                            "manualGAMGProcAgglomeration::agglomerate()"
-                        )   << "At level " << fineLevelIndex
+                        FatalErrorInFunction
+                            << "At level " << fineLevelIndex
                             << " processor "
                             << findIndex(procAgglomMap, -1)
                             << " is not in any cluster"
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index 6538689b26..a30b67c76a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -276,18 +276,8 @@ Foam::GAMGSolver::GAMGSolver
     }
     else
     {
-        FatalErrorIn
-        (
-            "GAMGSolver::GAMGSolver"
-            "("
-            "const word& fieldName,"
-            "const lduMatrix& matrix,"
-            "const FieldField<Field, scalar>& interfaceBouCoeffs,"
-            "const FieldField<Field, scalar>& interfaceIntCoeffs,"
-            "const lduInterfaceFieldPtrsList& interfaces,"
-            "const dictionary& solverControls"
-            ")"
-        )   << "No coarse levels created, either matrix too small for GAMG"
+        FatalErrorInFunction
+            << "No coarse levels created, either matrix too small for GAMG"
                " or nCellsInCoarsestLevel too large.\n"
                "    Either choose another solver of reduce "
                "nCellsInCoarsestLevel."
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 1e096b2958..d848394675 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -664,7 +664,7 @@ void Foam::GAMGSolver::procAgglomerateMatrix
                         label allFaceI = map[i];
                         if (allFaceI < 0)
                         {
-                            FatalErrorIn("GAMGSolver::GAMGSolver()")
+                            FatalErrorInFunction
                                 << "problem." << abort(FatalError);
                         }
                         allBou[allFaceI] = procBou[i];
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
index 0407aa6051..2a69e4dd00 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,12 +40,8 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
 
     if (cstrIter == lduInterfaceFieldConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "GAMGInterfaceField::New"
-            "(const GAMGInterface& GAMGCp, "
-            "const lduInterfaceField& fineInterface)"
-        )   << "Unknown GAMGInterfaceField type "
+        FatalErrorInFunction
+            << "Unknown GAMGInterfaceField type "
             << coupleType << nl
             << "Valid GAMGInterfaceField types are :"
             << lduInterfaceFieldConstructorTablePtr_->sortedToc()
@@ -70,11 +66,8 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
 
     if (cstrIter == lduInterfaceConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "GAMGInterfaceField::New"
-            "(const word&, const GAMGInterface&, const bool, const int)"
-        )   << "Unknown GAMGInterfaceField type "
+        FatalErrorInFunction
+            << "Unknown GAMGInterfaceField type "
             << coupleType << nl
             << "Valid GAMGInterfaceField types are :"
             << lduInterfaceConstructorTablePtr_->sortedToc()
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
index 5e4065fcf3..cd30d03c75 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,20 +85,16 @@ Foam::tmp<Foam::scalarField> Foam::GAMGInterface::agglomerateCoeffs
 
     if (fineCoeffs.size() != faceRestrictAddressing_.size())
     {
-        FatalErrorIn
-        (
-            "GAMGInterface::agglomerateCoeffs(const scalarField&) const"
-        )   << "Size of coefficients " << fineCoeffs.size()
+        FatalErrorInFunction
+            << "Size of coefficients " << fineCoeffs.size()
             << " does not correspond to the size of the restriction "
             << faceRestrictAddressing_.size()
             << abort(FatalError);
     }
     if (debug && max(faceRestrictAddressing_) > size())
     {
-        FatalErrorIn
-        (
-            "GAMGInterface::agglomerateCoeffs(const scalarField&) const"
-        )   << "Face restrict addressing addresses outside of coarse interface"
+        FatalErrorInFunction
+            << "Face restrict addressing addresses outside of coarse interface"
             << " size. Max addressing:" << max(faceRestrictAddressing_)
             << " coarse size:" << size()
             << abort(FatalError);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
index db7a362419..5130ad12f8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,13 +48,8 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
 
     if (cstrIter == lduInterfaceConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "GAMGInterface::New"
-            "(const lduInterface& fineInterface, "
-            "const labelField& localRestrictAddressing, "
-            "const labelField& neighbourRestrictAddressing)"
-        )   << "Unknown GAMGInterface type " << coupleType << ".\n"
+        FatalErrorInFunction
+            << "Unknown GAMGInterface type " << coupleType << ".\n"
             << "Valid GAMGInterface types are :"
             << lduInterfaceConstructorTablePtr_->sortedToc()
             << exit(FatalError);
@@ -89,11 +84,8 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "GAMGInterface::New"
-            "(const word&, const label, const lduInterfacePtrsList&, Istream&)"
-        )   << "Unknown GAMGInterface type " << coupleType << ".\n"
+        FatalErrorInFunction
+            << "Unknown GAMGInterface type " << coupleType << ".\n"
             << "Valid GAMGInterface types are :"
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalError);
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 9a6ba2f138..3b3092f3a6 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -293,11 +293,8 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             }
             if (its == 34)
             {
-                WarningIn
-                (
-                    "SVD::SVD"
-                    "(scalarRectangularMatrix& A, const scalar minCondition)"
-                )   << "no convergence in 35 SVD iterations"
+                WarningInFunction
+                    << "no convergence in 35 SVD iterations"
                     << endl;
             }
 
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
index 6db54a50da..46f4a3ee1d 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
@@ -66,11 +66,8 @@ void Foam::LUDecompose
 
         if (largestCoeff == 0.0)
         {
-            FatalErrorIn
-            (
-                "LUdecompose"
-                "(scalarSquareMatrix& matrix, labelList& rowIndices)"
-            )   << "Singular matrix" << exit(FatalError);
+            FatalErrorInFunction
+                << "Singular matrix" << exit(FatalError);
         }
 
         vv[i] = 1.0/largestCoeff;
@@ -187,7 +184,7 @@ void Foam::LUDecompose(scalarSymmetricSquareMatrix& matrix)
 
         if (d < 0.0)
         {
-            FatalErrorIn("Foam::LUDecompose(scalarSymmetricSquareMatrix&)")
+            FatalErrorInFunction
                 << "Matrix is not symmetric positive-definite. Unable to "
                 << "decompose."
                 << abort(FatalError);
@@ -210,28 +207,16 @@ void Foam::multiply
 {
     if (A.m() != B.n())
     {
-        FatalErrorIn
-        (
-            "multiply("
-            "const scalarRectangularMatrix& A, "
-            "const scalarRectangularMatrix& B, "
-            "const scalarRectangularMatrix& C, "
-            "scalarRectangularMatrix& answer)"
-        )   << "A and B must have identical inner dimensions but A.m = "
+        FatalErrorInFunction
+            << "A and B must have identical inner dimensions but A.m = "
             << A.m() << " and B.n = " << B.n()
             << abort(FatalError);
     }
 
     if (B.m() != C.n())
     {
-        FatalErrorIn
-        (
-            "multiply("
-            "const scalarRectangularMatrix& A, "
-            "const scalarRectangularMatrix& B, "
-            "const scalarRectangularMatrix& C, "
-            "scalarRectangularMatrix& answer)"
-        )   << "B and C must have identical inner dimensions but B.m = "
+        FatalErrorInFunction
+            << "B and C must have identical inner dimensions but B.m = "
             << B.m() << " and C.n = " << C.n()
             << abort(FatalError);
     }
@@ -266,28 +251,16 @@ void Foam::multiply
 {
     if (A.m() != B.size())
     {
-        FatalErrorIn
-        (
-            "multiply("
-            "const scalarRectangularMatrix& A, "
-            "const DiagonalMatrix<scalar>& B, "
-            "const scalarRectangularMatrix& C, "
-            "scalarRectangularMatrix& answer)"
-        )   << "A and B must have identical inner dimensions but A.m = "
+        FatalErrorInFunction
+            << "A and B must have identical inner dimensions but A.m = "
             << A.m() << " and B.n = " << B.size()
             << abort(FatalError);
     }
 
     if (B.size() != C.n())
     {
-        FatalErrorIn
-        (
-            "multiply("
-            "const scalarRectangularMatrix& A, "
-            "const DiagonalMatrix<scalar>& B, "
-            "const scalarRectangularMatrix& C, "
-            "scalarRectangularMatrix& answer)"
-        )   << "B and C must have identical inner dimensions but B.m = "
+        FatalErrorInFunction
+            << "B and C must have identical inner dimensions but B.m = "
             << B.size() << " and C.n = " << C.n()
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
index fbf8db2685..5f70c83b91 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
@@ -68,7 +68,7 @@ void Foam::solve
         // Check that the system of equations isn't singular
         if (mag(tmpMatrix[i][i]) < 1e-20)
         {
-            FatalErrorIn("solve(scalarSquareMatrix&, Field<Type>& sourceSol)")
+            FatalErrorInFunction
                 << "Singular Matrix"
                 << exit(FatalError);
         }
@@ -245,13 +245,8 @@ void Foam::multiply
 {
     if (A.m() != B.n())
     {
-        FatalErrorIn
-        (
-            "multiply("
-            "Matrix<Form, Type>& answer "
-            "const Matrix<Form, Type>& A, "
-            "const Matrix<Form, Type>& B)"
-        )   << "A and B must have identical inner dimensions but A.m = "
+        FatalErrorInFunction
+            << "A and B must have identical inner dimensions but A.m = "
             << A.m() << " and B.n = " << B.n()
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
index e9cb483fdd..727db535d5 100644
--- a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
+++ b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,21 +101,21 @@ void Foam::simpleMatrix<Type>::operator=(const simpleMatrix<Type>& m)
 {
     if (this == &m)
     {
-        FatalErrorIn("simpleMatrix<Type>::operator=(const simpleMatrix<Type>&)")
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
 
     if (n() != m.n())
     {
-        FatalErrorIn("simpleMatrix<Type>::operator=(const simpleMatrix<Type>&)")
+        FatalErrorInFunction
             << "Different size matrices"
             << abort(FatalError);
     }
 
     if (source_.size() != m.source_.size())
     {
-        FatalErrorIn("simpleMatrix<Type>::operator=(const simpleMatrix<Type>&)")
+        FatalErrorInFunction
             << "Different size source vectors"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index f3251d3c50..6ece7ccc89 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -306,9 +306,8 @@ Foam::scalar Foam::solution::fieldRelaxationFactor(const word& name) const
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "Foam::solution::fieldRelaxationFactor(const word&)",
             fieldRelaxDict_
         )   << "Cannot find variable relaxation factor for '" << name
             << "' or a suitable default value."
@@ -336,9 +335,8 @@ Foam::scalar Foam::solution::equationRelaxationFactor(const word& name) const
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "Foam::solution::eqnRelaxationFactor(const word&)",
             eqnRelaxDict_
         )   << "Cannot find equation relaxation factor for '" << name
             << "' or a suitable default value."
@@ -366,7 +364,7 @@ const Foam::dictionary& Foam::solution::solverDict(const word& name) const
 {
     if (debug)
     {
-        InfoIn("solution::solverDict(const word&)")
+        InfoInFunction
             << "Lookup solver for " << name << endl;
     }
 
@@ -378,7 +376,7 @@ const Foam::dictionary& Foam::solution::solver(const word& name) const
 {
     if (debug)
     {
-        InfoIn("solution::solver(const word&)")
+        InfoInFunction
             << "Lookup solver for " << name << endl;
     }
 
diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
index f8118efd95..ecbb8ed823 100644
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ b/src/OpenFOAM/memory/Xfer/Xfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,6 +90,7 @@ class Xfer
         //- Pointer to underlying datatype
         mutable T* ptr_;
 
+
 public:
 
     // Constructors
@@ -107,14 +108,17 @@ public:
         //- Construct by transferring the contents
         inline Xfer(const Xfer<T>&);
 
+
     //- Destructor
     inline ~Xfer();
 
+
     // Member Functions
 
         //- Return a null object reference
         inline static const Xfer<T>& null();
 
+
     // Member Operators
 
         //- Transfer the contents into the object
@@ -128,67 +132,57 @@ public:
 
         //- Pointer to the underlying datatype
         inline T* operator->() const;
-
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-/**
- * Construct by copying the contents of the \a arg
- *
- * \sa xferCopyTo, xferMove, xferMoveTo, xferTmp and Foam::Xfer
-*/
+//- Construct by copying the contents of the \a arg
+//
+//  \sa xferCopyTo, xferMove, xferMoveTo, xferTmp and Foam::Xfer
 template<class T>
 inline Xfer<T> xferCopy(const T&);
 
-/**
- * Construct by transferring the contents of the \a arg
- *
- * \sa xferCopy, xferCopyTo, xferMoveTo, xferTmp and Foam::Xfer
-*/
+//- Construct by transferring the contents of the \a arg
+//
+//  \sa xferCopy, xferCopyTo, xferMoveTo, xferTmp and Foam::Xfer
 template<class T>
 inline Xfer<T> xferMove(T&);
 
 
-/**
- * Construct by transferring the contents of the \a arg
- *
- * \sa xferCopy, xferCopyTo, xferMove, xferMoveTo and Foam::Xfer
-*/
+//- Construct by transferring the contents of the \a arg
+//
+//  \sa xferCopy, xferCopyTo, xferMove, xferMoveTo and Foam::Xfer
 template<class T>
 inline Xfer<T> xferTmp(Foam::tmp<T>&);
 
 
-/**
- * Construct by copying the contents of the \a arg
- * between dissimilar types
- *
- * \sa xferCopy, xferMove, xferMoveTo, xferTmp and Foam::Xfer
-*/
+//- Construct by copying the contents of the \a arg
+//  between dissimilar types
+//
+//  \sa xferCopy, xferMove, xferMoveTo, xferTmp and Foam::Xfer
 template<class To, class From>
 inline Xfer<To> xferCopyTo(const From&);
 
 
-/**
- * Construct by transferring the contents of the \a arg
- * between dissimilar types
- *
- * \par Example Use
- * \code
- *     DynamicList<label> dynLst;
- *     ...
- *     labelList plainLst( xferMoveTo<labelList>(dynLst) );
- * \endcode
- *
- * \sa xferCopy, xferCopyTo, xferMove, xferTmp and Foam::Xfer
-*/
+//- Construct by transferring the contents of the \a arg
+//  between dissimilar types
+//
+//  \par Example Use
+//  \code
+//      DynamicList<label> dynLst;
+//      ...
+//      labelList plainLst( xferMoveTo<labelList>(dynLst) );
+//  \endcode
+//
+//  \sa xferCopy, xferCopyTo, xferMove, xferTmp and Foam::Xfer
 template<class To, class From>
 inline Xfer<To> xferMoveTo(From&);
 
 
-} // End namespace Foam
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtrI.H b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
index 3557ffc49b..961456e5b8 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtrI.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtrI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ inline void Foam::autoPtr<T>::set(T* p)
 {
     if (ptr_)
     {
-        FatalErrorIn("void Foam::autoPtr<T>::set(T*)")
+        FatalErrorInFunction
             << "object of type " << typeid(T).name()
             << " already allocated"
             << abort(FatalError);
@@ -136,7 +136,7 @@ inline T& Foam::autoPtr<T>::operator()()
 {
     if (!ptr_)
     {
-        FatalErrorIn("T& Foam::autoPtr<T>::operator()()")
+        FatalErrorInFunction
             << "object of type " << typeid(T).name()
             << " is not allocated"
             << abort(FatalError);
@@ -151,7 +151,7 @@ inline const T& Foam::autoPtr<T>::operator()() const
 {
     if (!ptr_)
     {
-        FatalErrorIn("const T& Foam::autoPtr<T>::operator()() const")
+        FatalErrorInFunction
             << "object of type " << typeid(T).name()
             << " is not allocated"
             << abort(FatalError);
@@ -173,7 +173,7 @@ inline T* Foam::autoPtr<T>::operator->()
 {
     if (!ptr_)
     {
-        FatalErrorIn("Foam::autoPtr<T>::operator->()")
+        FatalErrorInFunction
             << "object of type " << typeid(T).name()
             << " is not allocated"
             << abort(FatalError);
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index ad34bb4b17..e289a06ca0 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
         }
         else
         {
-            FatalErrorIn("Foam::tmp<T>::tmp(const tmp<T>&)")
+            FatalErrorInFunction
                 << "attempted copy of a deallocated temporary"
                 << " of type " << typeid(T).name()
                 << abort(FatalError);
@@ -91,10 +91,8 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
             }
             else
             {
-                FatalErrorIn
-                (
-                    "Foam::tmp<T>::tmp(const tmp<T>&, bool allowTransfer)"
-                )   << "attempted copy of a deallocated temporary"
+                FatalErrorInFunction
+                    << "attempted copy of a deallocated temporary"
                     << " of type " << typeid(T).name()
                     << abort(FatalError);
             }
@@ -151,7 +149,7 @@ inline T* Foam::tmp<T>::ptr() const
     {
          if (!ptr_)
          {
-             FatalErrorIn("Foam::tmp<T>::ptr() const")
+             FatalErrorInFunction
                  << "temporary of type " << typeid(T).name() << " deallocated"
                  << abort(FatalError);
          }
@@ -190,7 +188,7 @@ inline T& Foam::tmp<T>::operator()()
     {
         if (!ptr_)
         {
-            FatalErrorIn("T& Foam::tmp<T>::operator()()")
+            FatalErrorInFunction
                 << "temporary of type " << typeid(T).name() << " deallocated"
                 << abort(FatalError);
         }
@@ -219,7 +217,7 @@ inline const T& Foam::tmp<T>::operator()() const
     {
         if (!ptr_)
         {
-            FatalErrorIn("const T& Foam::tmp<T>::operator()() const")
+            FatalErrorInFunction
                 << "temporary of type " << typeid(T).name() << " deallocated"
                 << abort(FatalError);
         }
@@ -247,7 +245,7 @@ inline T* Foam::tmp<T>::operator->()
     {
          if (!ptr_)
          {
-             FatalErrorIn("Foam::tmp<T>::operator->()")
+             FatalErrorInFunction
                  << "temporary of type " << typeid(T).name() << " deallocated"
                  << abort(FatalError);
          }
@@ -295,7 +293,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
         }
         else
         {
-            FatalErrorIn("Foam::tmp<T>::operator=(const tmp<T>&)")
+            FatalErrorInFunction
                 << "attempted copy of a deallocated temporary"
                 << " of type " << typeid(T).name()
                 << abort(FatalError);
@@ -303,7 +301,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
     }
     else
     {
-        FatalErrorIn("Foam::tmp<T>::operator=(const tmp<T>&)")
+        FatalErrorInFunction
             << "attempted to assign to a const reference to constant object"
             << " of type " << typeid(T).name()
             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
index e520c53961..bf01fe7be9 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
+++ b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,10 +39,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
 
     if (!valid())
     {
-        FatalErrorIn
-        (
-            "coupleGroupIdentifier::findOtherPatchID(const polyPatch&) const"
-        )   << "Invalid coupleGroup patch group"
+        FatalErrorInFunction
+            << "Invalid coupleGroup patch group"
             << " on patch " << thisPatch.name()
             << " in region " << pbm.mesh().name()
             << exit(FatalError);
@@ -56,11 +54,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
         if (&mesh == &thisPatch.boundaryMesh().mesh())
         {
             // thisPatch should be in patchGroup
-            FatalErrorIn
-            (
-                "coupleGroupIdentifier::findOtherPatchID"
-                "(const polyMesh&, const polyPatch&) const"
-            )   << "Patch " << thisPatch.name()
+            FatalErrorInFunction
+                << "Patch " << thisPatch.name()
                 << " should be in patchGroup " << name()
                 << " in region " << pbm.mesh().name()
                 << exit(FatalError);
@@ -76,11 +71,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
     {
         if (patchIDs.size() > 2 || patchIDs.size() == 0)
         {
-            FatalErrorIn
-            (
-                "coupleGroupIdentifier::findOtherPatchID"
-                "(const polyMesh&, const polyPatch&) const"
-            )   << "Couple patchGroup " << name()
+            FatalErrorInFunction
+                << "Couple patchGroup " << name()
                 << " with contents " << patchIDs
                 << " not of size < 2"
                 << " on patch " << thisPatch.name()
@@ -94,11 +86,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
 
         if (index == -1)
         {
-            FatalErrorIn
-            (
-                "coupleGroupIdentifier::findOtherPatchID"
-                "(const polyMesh&, const polyPatch&) const"
-            )   << "Couple patchGroup " << name()
+            FatalErrorInFunction
+                << "Couple patchGroup " << name()
                 << " with contents " << patchIDs
                 << " does not contain patch " << thisPatch.name()
                 << " in region " << pbm.mesh().name()
@@ -122,11 +111,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
     {
         if (patchIDs.size() != 1)
         {
-            FatalErrorIn
-            (
-                "coupleGroupIdentifier::findOtherPatchID"
-                "(const polyMesh&, const polyPatch&) const"
-            )   << "Couple patchGroup " << name()
+            FatalErrorInFunction
+                << "Couple patchGroup " << name()
                 << " with contents " << patchIDs
                 << " in region " << mesh.name()
                 << " should only contain a single patch"
@@ -199,11 +185,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
         {
             if (otherPatchID != -1)
             {
-                FatalErrorIn
-                (
-                    "coupleGroupIdentifier::findOtherPatchID"
-                    "(const polyPatch&, word&) const"
-                )   << "Couple patchGroup " << name()
+                FatalErrorInFunction
+                    << "Couple patchGroup " << name()
                     << " should be present on only two patches"
                     << " in any of the meshes in " << meshSet.sortedToc()
                     << endl
@@ -223,11 +206,8 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
 
     if (otherPatchID == -1)
     {
-        FatalErrorIn
-        (
-            "coupleGroupIdentifier::findOtherPatchID"
-            "(const polyPatch&, word&) const"
-        )   << "Couple patchGroup " << name()
+        FatalErrorInFunction
+            << "Couple patchGroup " << name()
             << " not found in any of the other meshes " << meshSet.sortedToc()
             << " on patch " << thisPatch.name()
             << " region " << thisMesh.name()
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
index d285ca5ae4..ca625a2a88 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,11 +82,8 @@ Foam::commSchedule::commSchedule
 
         if (proc0 < 0 || proc0 >= nProcs || proc1 < 0 || proc1 >= nProcs)
         {
-            FatalErrorIn
-            (
-                "commSchedule::commSchedule"
-                "(const label, const List<labelPair>&)"
-            )   << "Illegal processor " << comms[commI] << abort(FatalError);
+            FatalErrorInFunction
+                << "Illegal processor " << comms[commI] << abort(FatalError);
         }
 
         procToComms[proc0].append(commI);
diff --git a/src/OpenFOAM/meshes/data/data.C b/src/OpenFOAM/meshes/data/data.C
index 02366479aa..6ad8116585 100644
--- a/src/OpenFOAM/meshes/data/data.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,6 @@ License
 
 #include "data.H"
 #include "Time.H"
-#include "solverPerformance.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -60,41 +59,4 @@ const Foam::dictionary& Foam::data::solverPerformanceDict() const
 }
 
 
-void Foam::data::setSolverPerformance
-(
-    const word& name,
-    const solverPerformance& sp
-) const
-{
-    dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
-
-    List<solverPerformance> perfs;
-
-    if (prevTimeIndex_ != this->time().timeIndex())
-    {
-        // reset solver performance between iterations
-        prevTimeIndex_ = this->time().timeIndex();
-        dict.clear();
-    }
-    else
-    {
-        dict.readIfPresent(name, perfs);
-    }
-
-    // append to list
-    perfs.setSize(perfs.size()+1, sp);
-
-    dict.set(name, perfs);
-}
-
-
-void Foam::data::setSolverPerformance
-(
-    const solverPerformance& sp
-) const
-{
-    setSolverPerformance(sp.fieldName(), sp);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index e4fd40fb6a..c5b7758e93 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,16 +91,18 @@ public:
             const dictionary& solverPerformanceDict() const;
 
             //- Add/set the solverPerformance entry for the named field
+            template<class Type>
             void setSolverPerformance
             (
                 const word& name,
-                const solverPerformance&
+                const SolverPerformance<Type>&
             ) const;
 
             //- Add/set the solverPerformance entry, using its fieldName
+            template<class Type>
             void setSolverPerformance
             (
-                const solverPerformance&
+                const SolverPerformance<Type>&
             ) const;
 };
 
@@ -111,6 +113,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "dataTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/data/dataTemplates.C b/src/OpenFOAM/meshes/data/dataTemplates.C
new file mode 100644
index 0000000000..8929ee123c
--- /dev/null
+++ b/src/OpenFOAM/meshes/data/dataTemplates.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "data.H"
+#include "Time.H"
+#include "solverPerformance.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::data::setSolverPerformance
+(
+    const word& name,
+    const SolverPerformance<Type>& sp
+) const
+{
+    dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
+
+    List<SolverPerformance<Type> > perfs;
+
+    if (prevTimeIndex_ != this->time().timeIndex())
+    {
+        // Reset solver performance between iterations
+        prevTimeIndex_ = this->time().timeIndex();
+        dict.clear();
+    }
+    else
+    {
+        dict.readIfPresent(name, perfs);
+    }
+
+    // Append to list
+    perfs.setSize(perfs.size()+1, sp);
+
+    dict.set(name, perfs);
+}
+
+
+template<class Type>
+void Foam::data::setSolverPerformance
+(
+    const SolverPerformance<Type>& sp
+) const
+{
+    setSolverPerformance(sp.fieldName(), sp);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.C b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
index 719b587344..200f7e525f 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ defineTypeNameAndDebug(lduMesh, 0);
 
 const Foam::objectRegistry& Foam::lduMesh::thisDb() const
 {
-    notImplemented("lduMesh::thisDb() const");
+    NotImplemented;
     const objectRegistry* orPtr_ = NULL;
     return *orPtr_;
 }
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index 2563ff14bb..13731a858b 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,21 +68,15 @@ void Foam::lduPrimitiveMesh::checkUpperTriangular
     {
         if (u[faceI] < l[faceI])
         {
-            FatalErrorIn
-            (
-                "checkUpperTriangular"
-                "(const label, const labelUList&, const labelUList&)"
-            )   << "Reversed face. Problem at face " << faceI
+            FatalErrorInFunction
+                << "Reversed face. Problem at face " << faceI
                 << " l:" << l[faceI] << " u:" << u[faceI]
                 << abort(FatalError);
         }
         if (l[faceI] < 0 || u[faceI] < 0 || u[faceI] >= size)
         {
-            FatalErrorIn
-            (
-                "checkUpperTriangular"
-                "(const label, const labelUList&, const labelUList&)"
-            )   << "Illegal cell label. Problem at face " << faceI
+            FatalErrorInFunction
+                << "Illegal cell label. Problem at face " << faceI
                 << " l:" << l[faceI] << " u:" << u[faceI]
                 << abort(FatalError);
         }
@@ -92,11 +86,8 @@ void Foam::lduPrimitiveMesh::checkUpperTriangular
     {
         if (l[faceI-1] > l[faceI])
         {
-            FatalErrorIn
-            (
-                "checkUpperTriangular"
-                "(const label, const labelUList&, const labelUList&)"
-            )   << "Lower not in incremental cell order."
+            FatalErrorInFunction
+                << "Lower not in incremental cell order."
                 << " Problem at face " << faceI
                 << " l:" << l[faceI] << " u:" << u[faceI]
                 << " previous l:" << l[faceI-1]
@@ -107,11 +98,8 @@ void Foam::lduPrimitiveMesh::checkUpperTriangular
             // Same cell.
             if (u[faceI-1] > u[faceI])
             {
-                FatalErrorIn
-                (
-                    "checkUpperTriangular"
-                    "(const label, const labelUList&, const labelUList&)"
-                )   << "Upper not in incremental cell order."
+                FatalErrorInFunction
+                    << "Upper not in incremental cell order."
                     << " Problem at face " << faceI
                     << " l:" << l[faceI] << " u:" << u[faceI]
                     << " previous u:" << u[faceI-1]
@@ -151,7 +139,7 @@ Foam::labelList Foam::lduPrimitiveMesh::upperTriOrder
     {
         if (upper[faceI] < lower[faceI])
         {
-            FatalErrorIn("lduPrimitiveMesh::upperTriOrder(..)")
+            FatalErrorInFunction
                 << "Problem at face:" << faceI
                 << " lower:" << lower[faceI]
                 << " upper:" << upper[faceI]
@@ -309,10 +297,8 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
     {
         if (otherMeshes[i].comm() != currentComm)
         {
-            WarningIn
-            (
-                "lduPrimitiveMesh::lduPrimitiveMesh(..)"
-            )   << "Communicator " << otherMeshes[i].comm()
+            WarningInFunction
+                << "Communicator " << otherMeshes[i].comm()
                 << " at index " << i
                 << " differs from that of predecessor "
                 << currentComm
@@ -337,10 +323,8 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
     {
         if (procAgglomMap[procIDs[i]] != procAgglomMap[procIDs[0]])
         {
-            FatalErrorIn
-            (
-                "lduPrimitiveMesh::lduPrimitiveMesh(..)"
-            )   << "Processor " << procIDs[i]
+            FatalErrorInFunction
+                << "Processor " << procIDs[i]
                 << " agglomerates to " << procAgglomMap[procIDs[i]]
                 << " whereas other processors " << procIDs
                 << " agglomerate to "
@@ -423,7 +407,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
 
                     if (agglom0 != myAgglom && agglom1 != myAgglom)
                     {
-                        FatalErrorIn("lduPrimitiveMesh::lduPrimitiveMesh(..)")
+                        FatalErrorInFunction
                             << "At mesh from processor " << procIDs[procMeshI]
                             << " have interface " << intI
                             << " with myProcNo:" << pldui.myProcNo()
@@ -501,7 +485,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
                 else
                 {
                     // Still external (non proc) interface
-                    FatalErrorIn("lduPrimitiveMesh::lduPrimitiveMesh(..)")
+                    FatalErrorInFunction
                         << "At mesh from processor " << procIDs[procMeshI]
                         << " have interface " << intI
                         << " of unhandled type " << interfaces[intI].type()
@@ -691,10 +675,8 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
 
                             if (nbrIntI == -1)
                             {
-                                FatalErrorIn
-                                (
-                                    "lduPrimitiveMesh::lduPrimitiveMesh(..)"
-                                )   << "elems:" << elems << abort(FatalError);
+                                FatalErrorInFunction
+                                    << "elems:" << elems << abort(FatalError);
                             }
 
 
@@ -713,10 +695,8 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
 
                             if (faceCells.size() != nbrFaceCells.size())
                             {
-                                FatalErrorIn
-                                (
-                                    "lduPrimitiveMesh::lduPrimitiveMesh(..)"
-                                )   << "faceCells:" << faceCells
+                                FatalErrorInFunction
+                                    << "faceCells:" << faceCells
                                     << " nbrFaceCells:" << nbrFaceCells
                                     << abort(FatalError);
                             }
@@ -915,10 +895,8 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
         {
             if (iter.key()[1] == myAgglom)
             {
-                FatalErrorIn
-                (
-                    "lduPrimitiveMesh::lduPrimitiveMesh(..)"
-                )   << "problem procEdge:" << iter.key()
+                FatalErrorInFunction
+                    << "problem procEdge:" << iter.key()
                     << exit(FatalError);
             }
 
@@ -928,10 +906,8 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
         {
             if (iter.key()[1] != myAgglom)
             {
-                FatalErrorIn
-                (
-                    "lduPrimitiveMesh::lduPrimitiveMesh(..)"
-                )   << "problem procEdge:" << iter.key()
+                FatalErrorInFunction
+                    << "problem procEdge:" << iter.key()
                     << exit(FatalError);
             }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index f94aef37f9..5d7ff59ba8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,11 +174,8 @@ void Foam::cellMatcher::calcEdgeAddressing(const label numVert)
             }
             else
             {
-                FatalErrorIn
-                (
-                    "calcEdgeAddressing"
-                    "(const faceList&, const label)"
-                )   << "edgeFaces_ full at entry:" << key1
+                FatalErrorInFunction
+                    << "edgeFaces_ full at entry:" << key1
                     << " for edge " << start << " " << end
                     << abort(FatalError);
             }
@@ -239,12 +236,8 @@ Foam::label Foam::cellMatcher::otherFace
     }
     else
     {
-        FatalErrorIn
-        (
-            "otherFace"
-            "(const label, const labelList&, const label, const label, "
-            "const label)"
-        )   << "edgeFaces_ does not contain:" << localFaceI
+        FatalErrorInFunction
+            << "edgeFaces_ does not contain:" << localFaceI
             << " for edge " << v0 << " " << v1 << " at key " << key
             << " edgeFaces_[key, key+1]:" <<  edgeFaces_[key]
             << " , " << edgeFaces_[key+1]
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
index 149d68a717..a8c014b335 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ Foam::vector Foam::cellModel::centre
 
         if (pyrVol > SMALL)
         {
-            WarningIn("cellModel::centre(const labelList&, const pointField&)")
+            WarningInFunction
                 << "zero or negative pyramid volume: " << -pyrVol
                 << " for face " << i
                 << endl;
@@ -125,7 +125,7 @@ Foam::scalar Foam::cellModel::mag
 
         if (pyrVol > SMALL)
         {
-            WarningIn("cellModel::mag(const labelList&, const pointField&)")
+            WarningInFunction
                 << "zero or negative pyramid volume: " << -pyrVol
                 << " for face " << i
                 << endl;
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C
index b3c1f1eaad..c43aa0abaf 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Foam::cellModeller::cellModeller()
 {
     if (modelPtrs_.size())
     {
-        FatalErrorIn("cellModeller::cellModeller(const fileName&)")
+        FatalErrorInFunction
             << "attempt to re-construct cellModeller when it already exists"
             << exit(FatalError);
     }
@@ -56,7 +56,7 @@ Foam::cellModeller::cellModeller()
     {
         if (modelPtrs_[models_[i].index()])
         {
-            FatalErrorIn("cellModeller::cellModeller(const fileName&)")
+            FatalErrorInFunction
                 << "more than one model share the index "
                 << models_[i].index()
                 << exit(FatalError);
@@ -66,7 +66,7 @@ Foam::cellModeller::cellModeller()
 
         if (modelDictionary_.found(models_[i].name()))
         {
-            FatalErrorIn("cellModeller::cellModeller(const fileName&)")
+            FatalErrorInFunction
                 << "more than one model share the name "
                 << models_[i].name()
                 << exit(FatalError);
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
index 9a2854cdb7..d6ecb1723b 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
@@ -46,7 +46,7 @@ Foam::Istream& Foam::operator>>(Istream& is, cellShape& s)
         }
         else
         {
-            FatalIOErrorIn("operator>>(Istream&, cellShape& s)", is)
+            FatalIOErrorInFunction(is)
                 << "incorrect first token, expected '(', found "
                 << t.info()
                 << exit(FatalIOError);
@@ -64,7 +64,7 @@ Foam::Istream& Foam::operator>>(Istream& is, cellShape& s)
     }
     else
     {
-        FatalIOErrorIn("operator>>(Istream& is, cellShape& s)", is)
+        FatalIOErrorInFunction(is)
             << "Bad type of token for cellShape symbol " << t.info()
             << exit(FatalIOError);
         return is;
@@ -73,7 +73,7 @@ Foam::Istream& Foam::operator>>(Istream& is, cellShape& s)
     // Check that a model was found
     if (!s.m)
     {
-        FatalIOErrorIn("operator>>(Istream& is, cellShape& s)", is)
+        FatalIOErrorInFunction(is)
             << "CellShape has unknown model " << t.info()
             << exit(FatalIOError);
         return is;
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 30847ce3ca..b4dd451c90 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -135,12 +135,7 @@ Foam::label Foam::face::split
 
     if (size() <= 2)
     {
-        FatalErrorIn
-        (
-            "face::split"
-            "(const face::splitMode, const pointField&, label&, label&"
-            ", faceList&, faceList&)"
-        )
+        FatalErrorInFunction
             << "Serious problem: asked to split a face with < 3 vertices"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
index d777156ee3..218fa12e9b 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ inline Foam::triFace Foam::tetCell::face(const label faceI) const
 #   ifdef FULLDEBUG
     if (faceI >= 4)
     {
-        FatalErrorIn("tetCell::face(const label faceI) const")
+        FatalErrorInFunction
             << "index out of range 0 -> 3. faceI = " << faceI
             << abort(FatalError);
     }
@@ -98,11 +98,8 @@ inline Foam::label Foam::tetCell::edgeFace(const label edgeI) const
 #   ifdef FULLDEBUG
     if (edgeI >= 6)
     {
-        FatalErrorIn
-        (
-            "tetCell::edgeFace(const label edgeI)"
-            "const"
-        )   << "edge index out of range 0 -> 5. edgeI = " << edgeI
+        FatalErrorInFunction
+            << "edge index out of range 0 -> 5. edgeI = " << edgeI
             << abort(FatalError);
     }
 #   endif
@@ -132,21 +129,15 @@ inline Foam::label Foam::tetCell::edgeAdjacentFace
 #   ifdef FULLDEBUG
     if (faceI >= 4)
     {
-        FatalErrorIn
-        (
-            "tetCell::edgeAdjacentFace(const label edgeI, const label faceI)"
-            "const"
-        )   << "face index out of range 0 -> 3. faceI = " << faceI
+        FatalErrorInFunction
+            << "face index out of range 0 -> 3. faceI = " << faceI
             << abort(FatalError);
     }
 
     if (edgeI >= 6)
     {
-        FatalErrorIn
-        (
-            "tetCell::edgeAdjacentFace(const label edgeI, const label faceI)"
-            "const"
-        )   << "edge index out of range 0 -> 5. edgeI = " << edgeI
+        FatalErrorInFunction
+            << "edge index out of range 0 -> 5. edgeI = " << edgeI
             << abort(FatalError);
     }
 #   endif
@@ -166,7 +157,7 @@ inline Foam::edge Foam::tetCell::tetEdge(const label edgeI) const
 #   ifdef FULLDEBUG
     if (edgeI >= 6)
     {
-        FatalErrorIn("tetCell::tetEdge(const label edgeI) const")
+        FatalErrorInFunction
             << "index out of range 0 -> 5. edgeI = " << edgeI
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/meshTools/matchPoints.C b/src/OpenFOAM/meshes/meshTools/matchPoints.C
index d309e8e501..0afa4e3ae6 100644
--- a/src/OpenFOAM/meshes/meshTools/matchPoints.C
+++ b/src/OpenFOAM/meshes/meshTools/matchPoints.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -187,9 +187,11 @@ bool Foam::matchPoints
 
         // Go through range of equal mag and find nearest vector.
         scalar minDistSqr = VGREAT;
-        scalar minDistNorm = 0;
         label minFaceI = -1;
 
+        // Valid candidate points should have opposite normal
+        const scalar minDistNorm = 0;
+
         for
         (
             label j = startI;
@@ -220,7 +222,6 @@ bool Foam::matchPoints
                 // Check that the normals point in equal and opposite directions
                 if (distNorm < minDistNorm)
                 {
-                    minDistNorm = distNorm;
                     minDistSqr = distSqr;
                     minFaceI = faceI;
                 }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/MapPointField.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/MapPointField.H
index bb824c0f57..8248e5e09c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/MapPointField.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/MapPointField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,14 +69,8 @@ void MapInternalField<Type, MeshMapper, pointMesh>::operator()
 {
     if (field.size() != mapper.pointMap().sizeBeforeMapping())
     {
-        FatalErrorIn
-        (
-            "void MapInternalField<Type, MeshMapper, pointMesh>::operator()\n"
-            "(\n"
-            "    Field<Type>& field,\n"
-            "    const MeshMapper& mapper\n"
-            ") const"
-        )  << "Incompatible size before mapping.  Field size: " << field.size()
+        FatalErrorInFunction
+           << "Incompatible size before mapping.  Field size: " << field.size()
            << " map size: " << mapper.pointMap().sizeBeforeMapping()
            << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index b598acf072..51eaab0d25 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ void Foam::pointMapper::calcAddressing() const
      || insertedPointLabelsPtr_
     )
     {
-        FatalErrorIn("void pointMapper::calcAddressing() const")
+        FatalErrorInFunction
             << "Addressing already calculated."
             << abort(FatalError);
     }
@@ -98,7 +98,7 @@ void Foam::pointMapper::calcAddressing() const
 
             if (addr[pointI].size())
             {
-                FatalErrorIn("void pointMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master point " << pointI
                     << " mapped from points " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -237,10 +237,8 @@ const Foam::labelUList& Foam::pointMapper::directAddressing() const
 {
     if (!direct())
     {
-        FatalErrorIn
-        (
-            "const labelUList& pointMapper::directAddressing() const"
-        )   << "Requested direct addressing for an interpolative mapper."
+        FatalErrorInFunction
+            << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
 
@@ -265,10 +263,8 @@ const Foam::labelListList& Foam::pointMapper::addressing() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const labelListList& pointMapper::addressing() const"
-        )   << "Requested interpolative addressing for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative addressing for a direct mapper."
             << abort(FatalError);
     }
 
@@ -285,10 +281,8 @@ const Foam::scalarListList& Foam::pointMapper::weights() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const scalarListList& pointMapper::weights() const"
-        )   << "Requested interpolative weights for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative weights for a direct mapper."
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
index 624897bc09..1732a7ba0c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,10 +40,8 @@ void Foam::pointPatchMapper::calcAddressing() const
      || weightsPtr_
     )
     {
-        FatalErrorIn
-        (
-            "void pointPatchMapper::calcAddressing() const"
-        )   << "Addressing already calculated"
+        FatalErrorInFunction
+            << "Addressing already calculated"
             << abort(FatalError);
     }
 
@@ -150,10 +148,8 @@ const Foam::labelUList& Foam::pointPatchMapper::directAddressing() const
 {
     if (!direct())
     {
-        FatalErrorIn
-        (
-            "const labelUList& pointPatchMapper::directAddressing() const"
-        )   << "Requested direct addressing for an interpolative mapper."
+        FatalErrorInFunction
+            << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
 
@@ -170,10 +166,8 @@ const Foam::labelListList& Foam::pointPatchMapper::addressing() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const labelListList& pointPatchMapper::addressing() const"
-        )   << "Requested interpolative addressing for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative addressing for a direct mapper."
             << abort(FatalError);
     }
 
@@ -190,10 +184,8 @@ const Foam::scalarListList& Foam::pointPatchMapper::weights() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const scalarListList& pointPatchMapper::weights() const"
-        )   << "Requested interpolative weights for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative weights for a direct mapper."
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
index 073733e5f6..b5a1b29dc9 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,11 +46,8 @@ Foam::autoPtr<Foam::facePointPatch> Foam::facePointPatch::New
 
     if (cstrIter == polyPatchConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "facePointPatch::New(const polyPatch&, "
-            "const pointBoundaryMesh&) : "
-        )   << "Unknown facePointPatch type "
+        FatalErrorInFunction
+            << "Unknown facePointPatch type "
             << patch.type()
             << nl << nl
             << "Valid facePointPatch types are :" << endl
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.C
index 3d6a6fc025..b8dc8896ca 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,11 +54,8 @@ Foam::globalIndex::globalIndex
 
         if (offset < oldOffset)
         {
-            FatalErrorIn
-            (
-                "globalIndex::globalIndex"
-                "(const label, const int, const label, const bool)"
-            )   << "Overflow : sum of sizes " << localSizes
+            FatalErrorInFunction
+                << "Overflow : sum of sizes " << localSizes
                 << " exceeds capability of label (" << labelMax
                 << "). Please recompile with larger datatype for label."
                 << exit(FatalError);
@@ -86,7 +83,7 @@ Foam::globalIndex::globalIndex(const label localSize)
 
         if (offset < oldOffset)
         {
-            FatalErrorIn("globalIndex::globalIndex(const label)")
+            FatalErrorInFunction
                 << "Overflow : sum of sizes " << localSizes
                 << " exceeds capability of label (" << labelMax
                 << "). Please recompile with larger datatype for label."
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexI.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexI.H
index e194d995a8..bd71c2c947 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexI.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ const
 
     if (localI < 0 || i >= offsets_[procI+1])
     {
-        FatalErrorIn("globalIndex::toLocal(const label, const label)")
+        FatalErrorInFunction
             << "Global " << i << " does not belong on processor "
             << procI << endl << "Offsets:" << offsets_
             << abort(FatalError);
@@ -124,7 +124,7 @@ inline Foam::label Foam::globalIndex::whichProcID(const label i) const
 {
     if (i < 0 || i >= size())
     {
-        FatalErrorIn("globalIndex::whichProcID(const label)")
+        FatalErrorInFunction
             << "Global " << i << " does not belong on any processor."
             << " Offsets:" << offsets_
             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C
index 08435991ee..5532969f36 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndexTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ void Foam::globalIndex::gather
 
             if (!contiguous<Type>())
             {
-                FatalErrorIn("globalIndex::gather(..)")
+                FatalErrorInFunction
                     << "nonBlocking not supported for non-contiguous data"
                     << exit(FatalError);
             }
@@ -146,7 +146,7 @@ void Foam::globalIndex::gather
 
             if (!contiguous<Type>())
             {
-                FatalErrorIn("globalIndex::gather(..)")
+                FatalErrorInFunction
                     << "nonBlocking not supported for non-contiguous data"
                     << exit(FatalError);
             }
@@ -252,7 +252,7 @@ void Foam::globalIndex::scatter
 
             if (!contiguous<Type>())
             {
-                FatalErrorIn("globalIndex::scatter(..)")
+                FatalErrorInFunction
                     << "nonBlocking not supported for non-contiguous data"
                     << exit(FatalError);
             }
@@ -319,7 +319,7 @@ void Foam::globalIndex::scatter
 
             if (!contiguous<Type>())
             {
-                FatalErrorIn("globalIndex::scatter(..)")
+                FatalErrorInFunction
                     << "nonBlocking not supported for non-contiguous data"
                     << exit(FatalError);
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index b36a0e9579..d395715150 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -140,7 +140,7 @@ void Foam::globalMeshData::calcSharedPoints() const
      || sharedPointAddrPtr_.valid()
     )
     {
-        FatalErrorIn("globalMeshData::calcSharedPoints()")
+        FatalErrorInFunction
             << "Shared point addressing already done" << abort(FatalError);
     }
 
@@ -307,7 +307,7 @@ void Foam::globalMeshData::calcSharedEdges() const
      || sharedEdgeAddrPtr_.valid()
     )
     {
-        FatalErrorIn("globalMeshData::calcSharedEdges()")
+        FatalErrorInFunction
             << "Shared edge addressing already done" << abort(FatalError);
     }
 
@@ -845,7 +845,7 @@ Foam::label Foam::globalMeshData::findTransform
 
     if (remoteTransformI == -1 || localTransformI == -1)
     {
-        FatalErrorIn("globalMeshData::findTransform(..)")
+        FatalErrorInFunction
             << "Problem. Cannot find " << remotePoint
             << " or " << localPoint  << " "
             << coupledPatch().localPoints()[localPoint]
@@ -1177,10 +1177,8 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
             );
             if (stat == 0)
             {
-                FatalErrorIn
-                (
-                    "globalMeshData::calcGlobalEdgeOrientation() const"
-                )   << "problem : my edge:" << e
+                FatalErrorInFunction
+                    << "problem : my edge:" << e
                     << " in master points:" << masterE
                     << " v.s. masterEdgeVerts:" << masterEdgeVerts[edgeI]
                     << exit(FatalError);
@@ -2748,7 +2746,13 @@ void Foam::globalMeshData::updateMesh()
 
     // *** Temporary hack to avoid problems with overlapping communication
     // *** between these reductions and the calculation of deltaCoeffs
-    label comm = UPstream::worldComm + 1;
+    //label comm = UPstream::worldComm + 1;
+    label comm = UPstream::allocateCommunicator
+    (
+        UPstream::worldComm,
+        identity(UPstream::nProcs(UPstream::worldComm)),
+        true
+    );
 
     // Total number of faces.
     nTotalFaces_ = returnReduce
@@ -2785,6 +2789,8 @@ void Foam::globalMeshData::updateMesh()
         comm
     );
 
+    UPstream::freeCommunicator(comm);
+
     if (debug)
     {
         Pout<< "globalMeshData : nTotalPoints_:" << nTotalPoints_ << endl;
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
index 664dffd55f..01ed808f25 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ void Foam::globalMeshData::syncPointData
 {
     if (pointData.size() != mesh_.nPoints())
     {
-        FatalErrorIn("globalMeshData::syncPointData(..)")
+        FatalErrorInFunction
             << "Number of elements in data:" << pointData.size()
             << " differs from number of points in mesh:" << mesh_.nPoints()
             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 84dfacf47c..ed8f78c259 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ void Foam::cellMapper::calcAddressing() const
      || insertedCellLabelsPtr_
     )
     {
-        FatalErrorIn("void cellMapper::calcAddressing() const")
+        FatalErrorInFunction
             << "Addressing already calculated."
             << abort(FatalError);
     }
@@ -94,7 +94,7 @@ void Foam::cellMapper::calcAddressing() const
 
             if (addr[cellI].size())
             {
-                FatalErrorIn("void cellMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master cell " << cellI
                     << " mapped from point cells " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -116,7 +116,7 @@ void Foam::cellMapper::calcAddressing() const
 
             if (addr[cellI].size())
             {
-                FatalErrorIn("void cellMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master cell " << cellI
                     << " mapped from edge cells " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -138,7 +138,7 @@ void Foam::cellMapper::calcAddressing() const
 
             if (addr[cellI].size())
             {
-                FatalErrorIn("void cellMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master cell " << cellI
                     << " mapped from face cells " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -162,7 +162,7 @@ void Foam::cellMapper::calcAddressing() const
 
             if (addr[cellI].size())
             {
-                FatalErrorIn("void cellMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master cell " << cellI
                     << " mapped from cell cells " << mo
                     << " already destination of mapping."
@@ -181,7 +181,7 @@ void Foam::cellMapper::calcAddressing() const
 
             if (V.size() != sizeBeforeMapping())
             {
-                FatalErrorIn("void cellMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "cellVolumes size " << V.size()
                     << " is not the old number of cells " << sizeBeforeMapping()
                     << ". Are your cellVolumes already mapped?"
@@ -390,10 +390,8 @@ const Foam::labelUList& Foam::cellMapper::directAddressing() const
 {
     if (!direct())
     {
-        FatalErrorIn
-        (
-            "const labelUList& cellMapper::directAddressing() const"
-        )   << "Requested direct addressing for an interpolative mapper."
+        FatalErrorInFunction
+            << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
 
@@ -418,10 +416,8 @@ const Foam::labelListList& Foam::cellMapper::addressing() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const labelListList& cellMapper::addressing() const"
-        )   << "Requested interpolative addressing for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative addressing for a direct mapper."
             << abort(FatalError);
     }
 
@@ -438,10 +434,8 @@ const Foam::scalarListList& Foam::cellMapper::weights() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const scalarListList& cellMapper::weights() const"
-        )   << "Requested interpolative weights for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative weights for a direct mapper."
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index 803e523d41..71ca27fa85 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ void Foam::faceMapper::calcAddressing() const
      || insertedFaceLabelsPtr_
     )
     {
-        FatalErrorIn("void faceMapper::calcAddressing() const")
+        FatalErrorInFunction
             << "Addressing already calculated."
             << abort(FatalError);
     }
@@ -94,7 +94,7 @@ void Foam::faceMapper::calcAddressing() const
 
             if (addr[faceI].size())
             {
-                FatalErrorIn("void faceMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master face " << faceI
                     << " mapped from point faces " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -116,7 +116,7 @@ void Foam::faceMapper::calcAddressing() const
 
             if (addr[faceI].size())
             {
-                FatalErrorIn("void faceMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master face " << faceI
                     << " mapped from edge faces " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -138,7 +138,7 @@ void Foam::faceMapper::calcAddressing() const
 
             if (addr[faceI].size())
             {
-                FatalErrorIn("void faceMapper::calcAddressing() const")
+                FatalErrorInFunction
                     << "Master face " << faceI
                     << " mapped from face faces " << mo
                     << " already destination of mapping." << abort(FatalError);
@@ -303,10 +303,8 @@ const Foam::labelUList& Foam::faceMapper::directAddressing() const
 {
     if (!direct())
     {
-        FatalErrorIn
-        (
-            "const labelUList& faceMapper::directAddressing() const"
-        )   << "Requested direct addressing for an interpolative mapper."
+        FatalErrorInFunction
+            << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
 
@@ -331,10 +329,8 @@ const Foam::labelListList& Foam::faceMapper::addressing() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const labelListList& faceMapper::addressing() const"
-        )   << "Requested interpolative addressing for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative addressing for a direct mapper."
             << abort(FatalError);
     }
 
@@ -351,10 +347,8 @@ const Foam::scalarListList& Foam::faceMapper::weights() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const scalarListList& faceMapper::weights() const"
-        )   << "Requested interpolative weights for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative weights for a direct mapper."
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.H
index 68a7ef6b7d..5e7265f93a 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapAddedPolyMesh.H
@@ -229,10 +229,7 @@ public:
 
             void updateMesh(const mapPolyMesh&)
             {
-                notImplemented
-                (
-                    "mapAddedPolyMesh::updateMesh(const mapPolyMesh&)"
-                );
+                NotImplemented;
             }
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
index bb057b63f4..11421e5183 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOmapDistribute::IOmapDistribute(const IOobject&)")
+        WarningInFunction
             << "IOmapDistribute " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOmapDistribute does not support automatic rereading."
@@ -72,10 +72,10 @@ Foam::IOmapDistribute::IOmapDistribute
 :
     regIOobject(io)
 {
-     // Temporary warning
+    // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOmapDistribute::IOmapDistribute(const IOobject&)")
+        WarningInFunction
             << "IOmapDistribute " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOmapDistribute does not support automatic rereading."
@@ -112,7 +112,7 @@ Foam::IOmapDistribute::IOmapDistribute
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOmapDistribute::IOmapDistribute(const IOobject&)")
+        WarningInFunction
             << "IOmapDistribute " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but IOmapDistribute does not support automatic rereading."
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 8feeefcffe..66b935ea90 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,12 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mapDistribute.H"
-#include "commSchedule.H"
-#include "HashSet.H"
-#include "globalIndex.H"
 #include "globalIndexAndTransform.H"
 #include "transformField.H"
-#include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -134,229 +130,10 @@ void Foam::mapDistribute::transform::operator()
 {}
 
 
-Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
-(
-    const labelListList& subMap,
-    const labelListList& constructMap,
-    const int tag
-)
-{
-    // Communications: send and receive processor
-    List<labelPair> allComms;
-
-    {
-        HashSet<labelPair, labelPair::Hash<> > commsSet(Pstream::nProcs());
-
-        // Find what communication is required
-        forAll(subMap, procI)
-        {
-            if (procI != Pstream::myProcNo())
-            {
-                if (subMap[procI].size())
-                {
-                    // I need to send to procI
-                    commsSet.insert(labelPair(Pstream::myProcNo(), procI));
-                }
-                if (constructMap[procI].size())
-                {
-                    // I need to receive from procI
-                    commsSet.insert(labelPair(procI, Pstream::myProcNo()));
-                }
-            }
-        }
-        allComms = commsSet.toc();
-    }
-
-
-    // Reduce
-    if (Pstream::master())
-    {
-        // Receive and merge
-        for
-        (
-            int slave=Pstream::firstSlave();
-            slave<=Pstream::lastSlave();
-            slave++
-        )
-        {
-            IPstream fromSlave(Pstream::scheduled, slave, 0, tag);
-            List<labelPair> nbrData(fromSlave);
-
-            forAll(nbrData, i)
-            {
-                if (findIndex(allComms, nbrData[i]) == -1)
-                {
-                    label sz = allComms.size();
-                    allComms.setSize(sz+1);
-                    allComms[sz] = nbrData[i];
-                }
-            }
-        }
-        // Send back
-        for
-        (
-            int slave=Pstream::firstSlave();
-            slave<=Pstream::lastSlave();
-            slave++
-        )
-        {
-            OPstream toSlave(Pstream::scheduled, slave, 0, tag);
-            toSlave << allComms;
-        }
-    }
-    else
-    {
-        {
-            OPstream toMaster(Pstream::scheduled, Pstream::masterNo(), 0, tag);
-            toMaster << allComms;
-        }
-        {
-            IPstream fromMaster
-            (
-                Pstream::scheduled,
-                Pstream::masterNo(),
-                0,
-                tag
-            );
-            fromMaster >> allComms;
-        }
-    }
-
-
-    // Determine my schedule.
-    labelList mySchedule
-    (
-        commSchedule
-        (
-            Pstream::nProcs(),
-            allComms
-        ).procSchedule()[Pstream::myProcNo()]
-    );
-
-    // Processors involved in my schedule
-    return List<labelPair>(UIndirectList<labelPair>(allComms, mySchedule));
-
-
-    //if (debug)
-    //{
-    //    Pout<< "I need to:" << endl;
-    //    const List<labelPair>& comms = schedule();
-    //    forAll(comms, i)
-    //    {
-    //        const labelPair& twoProcs = comms[i];
-    //        label sendProc = twoProcs[0];
-    //        label recvProc = twoProcs[1];
-    //
-    //        if (recvProc == Pstream::myProcNo())
-    //        {
-    //            Pout<< "    receive from " << sendProc << endl;
-    //        }
-    //        else
-    //        {
-    //            Pout<< "    send to " << recvProc << endl;
-    //        }
-    //    }
-    //}
-}
-
-
-const Foam::List<Foam::labelPair>& Foam::mapDistribute::schedule() const
-{
-    if (schedulePtr_.empty())
-    {
-        schedulePtr_.reset
-        (
-            new List<labelPair>
-            (
-                schedule(subMap_, constructMap_, Pstream::msgType())
-            )
-        );
-    }
-    return schedulePtr_();
-}
-
-
-void Foam::mapDistribute::checkReceivedSize
-(
-    const label procI,
-    const label expectedSize,
-    const label receivedSize
-)
-{
-    if (receivedSize != expectedSize)
-    {
-        FatalErrorIn
-        (
-            "template<class T>\n"
-            "void mapDistribute::distribute\n"
-            "(\n"
-            "    const Pstream::commsTypes commsType,\n"
-            "    const List<labelPair>& schedule,\n"
-            "    const label constructSize,\n"
-            "    const labelListList& subMap,\n"
-            "    const labelListList& constructMap,\n"
-            "    List<T>& field\n"
-            ")\n"
-        )   << "Expected from processor " << procI
-            << " " << expectedSize << " but received "
-            << receivedSize << " elements."
-            << abort(FatalError);
-    }
-}
-
-
 void Foam::mapDistribute::printLayout(Ostream& os) const
 {
-    // Determine offsets of remote data.
-    labelList minIndex(Pstream::nProcs(), labelMax);
-    labelList maxIndex(Pstream::nProcs(), labelMin);
-    forAll(constructMap_, procI)
-    {
-        const labelList& construct = constructMap_[procI];
-        minIndex[procI] = min(minIndex[procI], min(construct));
-        maxIndex[procI] = max(maxIndex[procI], max(construct));
-    }
+    mapDistributeBase::printLayout(os);
 
-    label localSize;
-    if (maxIndex[Pstream::myProcNo()] == labelMin)
-    {
-        localSize = 0;
-    }
-    else
-    {
-        localSize = maxIndex[Pstream::myProcNo()]+1;
-    }
-
-    os  << "Layout: (constructSize:" << constructSize_ << ")" << endl
-        << "local (processor " << Pstream::myProcNo() << "):" << endl
-        << "    start : 0" << endl
-        << "    size  : " << localSize << endl;
-
-    label offset = localSize;
-    forAll(minIndex, procI)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            if (constructMap_[procI].size() > 0)
-            {
-                if (minIndex[procI] != offset)
-                {
-                    FatalErrorIn("mapDistribute::printLayout(..)")
-                        << "offset:" << offset
-                        << " procI:" << procI
-                        << " minIndex:" << minIndex[procI]
-                        << abort(FatalError);
-                }
-
-                label size = maxIndex[procI]-minIndex[procI]+1;
-                os  << "processor " << procI << ':' << endl
-                    << "    start : " << offset << endl
-                    << "    size  : " << size << endl;
-
-                offset += size;
-            }
-        }
-    }
     forAll(transformElements_, trafoI)
     {
         if (transformElements_[trafoI].size() > 0)
@@ -369,289 +146,12 @@ void Foam::mapDistribute::printLayout(Ostream& os) const
 }
 
 
-// Construct per processor compact addressing of the global elements
-// needed. The ones from the local processor are not included since
-// these are always all needed.
-void Foam::mapDistribute::calcCompactAddressing
-(
-    const globalIndex& globalNumbering,
-    const labelList& elements,
-    List<Map<label> >& compactMap
-) const
-{
-    compactMap.setSize(Pstream::nProcs());
-
-    // Count all (non-local) elements needed. Just for presizing map.
-    labelList nNonLocal(Pstream::nProcs(), 0);
-
-    forAll(elements, i)
-    {
-        label globalIndex = elements[i];
-
-        if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
-        {
-            label procI = globalNumbering.whichProcID(globalIndex);
-            nNonLocal[procI]++;
-        }
-    }
-
-    forAll(compactMap, procI)
-    {
-        compactMap[procI].clear();
-        if (procI != Pstream::myProcNo())
-        {
-            compactMap[procI].resize(2*nNonLocal[procI]);
-        }
-    }
-
-
-    // Collect all (non-local) elements needed.
-    forAll(elements, i)
-    {
-        label globalIndex = elements[i];
-
-        if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
-        {
-            label procI = globalNumbering.whichProcID(globalIndex);
-            label index = globalNumbering.toLocal(procI, globalIndex);
-            label nCompact = compactMap[procI].size();
-            compactMap[procI].insert(index, nCompact);
-        }
-    }
-}
-
-
-void Foam::mapDistribute::calcCompactAddressing
-(
-    const globalIndex& globalNumbering,
-    const labelListList& cellCells,
-    List<Map<label> >& compactMap
-) const
-{
-    compactMap.setSize(Pstream::nProcs());
-
-    // Count all (non-local) elements needed. Just for presizing map.
-    labelList nNonLocal(Pstream::nProcs(), 0);
-
-    forAll(cellCells, cellI)
-    {
-        const labelList& cCells = cellCells[cellI];
-
-        forAll(cCells, i)
-        {
-            label globalIndex = cCells[i];
-
-            if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
-            {
-                label procI = globalNumbering.whichProcID(globalIndex);
-                nNonLocal[procI]++;
-            }
-        }
-    }
-
-    forAll(compactMap, procI)
-    {
-        compactMap[procI].clear();
-        if (procI != Pstream::myProcNo())
-        {
-            compactMap[procI].resize(2*nNonLocal[procI]);
-        }
-    }
-
-
-    // Collect all (non-local) elements needed.
-    forAll(cellCells, cellI)
-    {
-        const labelList& cCells = cellCells[cellI];
-
-        forAll(cCells, i)
-        {
-            label globalIndex = cCells[i];
-
-            if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
-            {
-                label procI = globalNumbering.whichProcID(globalIndex);
-                label index = globalNumbering.toLocal(procI, globalIndex);
-                label nCompact = compactMap[procI].size();
-                compactMap[procI].insert(index, nCompact);
-            }
-        }
-    }
-}
-
-
-void Foam::mapDistribute::exchangeAddressing
-(
-    const int tag,
-    const globalIndex& globalNumbering,
-    labelList& elements,
-    List<Map<label> >& compactMap,
-    labelList& compactStart
-)
-{
-    // The overall compact addressing is
-    // - myProcNo data first (uncompacted)
-    // - all other processors consecutively
-
-    compactStart.setSize(Pstream::nProcs());
-    compactStart[Pstream::myProcNo()] = 0;
-    constructSize_ = globalNumbering.localSize();
-    forAll(compactStart, procI)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            compactStart[procI] = constructSize_;
-            constructSize_ += compactMap[procI].size();
-        }
-    }
-
-
-
-    // Find out what to receive/send in compact addressing.
-
-    // What I want to receive is what others have to send
-    labelListList wantedRemoteElements(Pstream::nProcs());
-    // Compact addressing for received data
-    constructMap_.setSize(Pstream::nProcs());
-    forAll(compactMap, procI)
-    {
-        if (procI == Pstream::myProcNo())
-        {
-            // All my own elements are used
-            label nLocal = globalNumbering.localSize();
-            wantedRemoteElements[procI] = identity(nLocal);
-            constructMap_[procI] = identity(nLocal);
-        }
-        else
-        {
-            // Remote elements wanted from processor procI
-            labelList& remoteElem = wantedRemoteElements[procI];
-            labelList& localElem = constructMap_[procI];
-            remoteElem.setSize(compactMap[procI].size());
-            localElem.setSize(compactMap[procI].size());
-            label i = 0;
-            forAllIter(Map<label>, compactMap[procI], iter)
-            {
-                const label compactI = compactStart[procI] + iter();
-                remoteElem[i] = iter.key();
-                localElem[i]  = compactI;
-                iter() = compactI;
-                i++;
-            }
-        }
-    }
-
-    subMap_.setSize(Pstream::nProcs());
-    labelListList sendSizes;
-    Pstream::exchange<labelList, label>
-    (
-        wantedRemoteElements,
-        subMap_,
-        sendSizes,
-        tag,
-        Pstream::worldComm  //TBD
-    );
-
-    // Renumber elements
-    forAll(elements, i)
-    {
-        elements[i] = renumber(globalNumbering, compactMap, elements[i]);
-    }
-}
-
-
-void Foam::mapDistribute::exchangeAddressing
-(
-    const int tag,
-    const globalIndex& globalNumbering,
-    labelListList& cellCells,
-    List<Map<label> >& compactMap,
-    labelList& compactStart
-)
-{
-    // The overall compact addressing is
-    // - myProcNo data first (uncompacted)
-    // - all other processors consecutively
-
-    compactStart.setSize(Pstream::nProcs());
-    compactStart[Pstream::myProcNo()] = 0;
-    constructSize_ = globalNumbering.localSize();
-    forAll(compactStart, procI)
-    {
-        if (procI != Pstream::myProcNo())
-        {
-            compactStart[procI] = constructSize_;
-            constructSize_ += compactMap[procI].size();
-        }
-    }
-
-
-
-    // Find out what to receive/send in compact addressing.
-
-    // What I want to receive is what others have to send
-    labelListList wantedRemoteElements(Pstream::nProcs());
-    // Compact addressing for received data
-    constructMap_.setSize(Pstream::nProcs());
-    forAll(compactMap, procI)
-    {
-        if (procI == Pstream::myProcNo())
-        {
-            // All my own elements are used
-            label nLocal = globalNumbering.localSize();
-            wantedRemoteElements[procI] = identity(nLocal);
-            constructMap_[procI] = identity(nLocal);
-        }
-        else
-        {
-            // Remote elements wanted from processor procI
-            labelList& remoteElem = wantedRemoteElements[procI];
-            labelList& localElem = constructMap_[procI];
-            remoteElem.setSize(compactMap[procI].size());
-            localElem.setSize(compactMap[procI].size());
-            label i = 0;
-            forAllIter(Map<label>, compactMap[procI], iter)
-            {
-                const label compactI = compactStart[procI] + iter();
-                remoteElem[i] = iter.key();
-                localElem[i]  = compactI;
-                iter() = compactI;
-                i++;
-            }
-        }
-    }
-
-    subMap_.setSize(Pstream::nProcs());
-    labelListList sendSizes;
-    Pstream::exchange<labelList, label>
-    (
-        wantedRemoteElements,
-        subMap_,
-        sendSizes,
-        tag,
-        Pstream::worldComm      //TBD
-    );
-
-    // Renumber elements
-    forAll(cellCells, cellI)
-    {
-        labelList& cCells = cellCells[cellI];
-
-        forAll(cCells, i)
-        {
-            cCells[i] = renumber(globalNumbering, compactMap, cCells[i]);
-        }
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 //- Construct null
 Foam::mapDistribute::mapDistribute()
 :
-    constructSize_(0),
-    schedulePtr_()
+    mapDistributeBase()
 {}
 
 
@@ -660,13 +160,19 @@ Foam::mapDistribute::mapDistribute
 (
     const label constructSize,
     const Xfer<labelListList>& subMap,
-    const Xfer<labelListList>& constructMap
+    const Xfer<labelListList>& constructMap,
+    const bool subHasFlip,
+    const bool constructHasFlip
 )
 :
-    constructSize_(constructSize),
-    subMap_(subMap),
-    constructMap_(constructMap),
-    schedulePtr_()
+    mapDistributeBase
+    (
+        constructSize,
+        subMap,
+        constructMap,
+        subHasFlip,
+        constructHasFlip
+    )
 {}
 
 
@@ -677,15 +183,21 @@ Foam::mapDistribute::mapDistribute
     const Xfer<labelListList>& subMap,
     const Xfer<labelListList>& constructMap,
     const Xfer<labelListList>& transformElements,
-    const Xfer<labelList>& transformStart
+    const Xfer<labelList>& transformStart,
+    const bool subHasFlip,
+    const bool constructHasFlip
 )
 :
-    constructSize_(constructSize),
-    subMap_(subMap),
-    constructMap_(constructMap),
+    mapDistributeBase
+    (
+        constructSize,
+        subMap,
+        constructMap,
+        subHasFlip,
+        constructHasFlip
+    ),
     transformElements_(transformElements),
-    transformStart_(transformStart),
-    schedulePtr_()
+    transformStart_(transformStart)
 {}
 
 
@@ -695,72 +207,8 @@ Foam::mapDistribute::mapDistribute
     const labelList& recvProcs
 )
 :
-    constructSize_(0),
-    schedulePtr_()
-{
-    if (sendProcs.size() != recvProcs.size())
-    {
-        FatalErrorIn
-        (
-            "mapDistribute::mapDistribute(const labelList&, const labelList&)"
-        )   << "The send and receive data is not the same length. sendProcs:"
-            << sendProcs.size() << " recvProcs:" << recvProcs.size()
-            << abort(FatalError);
-    }
-
-    // Per processor the number of samples we have to send/receive.
-    labelList nSend(Pstream::nProcs(), 0);
-    labelList nRecv(Pstream::nProcs(), 0);
-
-    forAll(sendProcs, sampleI)
-    {
-        label sendProc = sendProcs[sampleI];
-        label recvProc = recvProcs[sampleI];
-
-        // Note that also need to include local communication (both
-        // RecvProc and sendProc on local processor)
-
-        if (Pstream::myProcNo() == sendProc)
-        {
-            // I am the sender. Count destination processor.
-            nSend[recvProc]++;
-        }
-        if (Pstream::myProcNo() == recvProc)
-        {
-            // I am the receiver.
-            nRecv[sendProc]++;
-        }
-    }
-
-    subMap_.setSize(Pstream::nProcs());
-    constructMap_.setSize(Pstream::nProcs());
-    forAll(nSend, procI)
-    {
-        subMap_[procI].setSize(nSend[procI]);
-        constructMap_[procI].setSize(nRecv[procI]);
-    }
-    nSend = 0;
-    nRecv = 0;
-
-    forAll(sendProcs, sampleI)
-    {
-        label sendProc = sendProcs[sampleI];
-        label recvProc = recvProcs[sampleI];
-
-        if (Pstream::myProcNo() == sendProc)
-        {
-            // I am the sender. Store index I need to send.
-            subMap_[recvProc][nSend[recvProc]++] = sampleI;
-        }
-        if (Pstream::myProcNo() == recvProc)
-        {
-            // I am the receiver.
-            constructMap_[sendProc][nRecv[sendProc]++] = sampleI;
-            // Largest entry inside constructMap
-            constructSize_ = sampleI+1;
-        }
-    }
-}
+    mapDistributeBase(sendProcs, recvProcs)
+{}
 
 
 Foam::mapDistribute::mapDistribute
@@ -771,54 +219,14 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    constructSize_(0),
-    schedulePtr_()
-{
-    // Construct per processor compact addressing of the global elements
-    // needed. The ones from the local processor are not included since
-    // these are always all needed.
-    calcCompactAddressing
+    mapDistributeBase
     (
-        globalNumbering,
-        elements,
-        compactMap
-    );
-
-    //// Sort remote elements needed (not really necessary)
-    //forAll(compactMap, procI)
-    //{
-    //    if (procI != Pstream::myProcNo())
-    //    {
-    //        Map<label>& globalMap = compactMap[procI];
-    //
-    //        SortableList<label> sorted(globalMap.toc().xfer());
-    //
-    //        forAll(sorted, i)
-    //        {
-    //            Map<label>::iterator iter = globalMap.find(sorted[i]);
-    //            iter() = i;
-    //        }
-    //    }
-    //}
-
-
-    // Exchange what I need with processor that supplies it. Renumber elements
-    // into compact numbering
-    labelList compactStart;
-    exchangeAddressing
-    (
-        tag,
         globalNumbering,
         elements,
         compactMap,
-        compactStart
-    );
-
-    if (debug)
-    {
-        printLayout(Pout);
-    }
-}
+        tag
+    )
+{}
 
 
 Foam::mapDistribute::mapDistribute
@@ -829,54 +237,14 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    constructSize_(0),
-    schedulePtr_()
-{
-    // Construct per processor compact addressing of the global elements
-    // needed. The ones from the local processor are not included since
-    // these are always all needed.
-    calcCompactAddressing
+    mapDistributeBase
     (
-        globalNumbering,
-        cellCells,
-        compactMap
-    );
-
-    //// Sort remote elements needed (not really necessary)
-    //forAll(compactMap, procI)
-    //{
-    //    if (procI != Pstream::myProcNo())
-    //    {
-    //        Map<label>& globalMap = compactMap[procI];
-    //
-    //        SortableList<label> sorted(globalMap.toc().xfer());
-    //
-    //        forAll(sorted, i)
-    //        {
-    //            Map<label>::iterator iter = globalMap.find(sorted[i]);
-    //            iter() = i;
-    //        }
-    //    }
-    //}
-
-
-    // Exchange what I need with processor that supplies it. Renumber elements
-    // into compact numbering
-    labelList compactStart;
-    exchangeAddressing
-    (
-        tag,
         globalNumbering,
         cellCells,
         compactMap,
-        compactStart
-    );
-
-    if (debug)
-    {
-        printLayout(Pout);
-    }
-}
+        tag
+    )
+{}
 
 
 Foam::mapDistribute::mapDistribute
@@ -890,8 +258,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    constructSize_(0),
-    schedulePtr_()
+    mapDistributeBase()
 {
     // Construct per processor compact addressing of the global elements
     // needed. The ones from the local processor are not included since
@@ -996,8 +363,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    constructSize_(0),
-    schedulePtr_()
+    mapDistributeBase()
 {
     // Construct per processor compact addressing of the global elements
     // needed. The ones from the local processor are not included since
@@ -1104,31 +470,51 @@ Foam::mapDistribute::mapDistribute
 }
 
 
-Foam::mapDistribute::mapDistribute(const mapDistribute& map)
+Foam::mapDistribute::mapDistribute
+(
+    const mapDistribute& map
+)
 :
-    constructSize_(map.constructSize_),
-    subMap_(map.subMap_),
-    constructMap_(map.constructMap_),
+    mapDistributeBase(map),
     transformElements_(map.transformElements_),
-    transformStart_(map.transformStart_),
-    schedulePtr_()
+    transformStart_(map.transformStart_)
 {}
 
 
-Foam::mapDistribute::mapDistribute(const Xfer<mapDistribute>& map)
+Foam::mapDistribute::mapDistribute
+(
+    const Xfer<mapDistribute>& map
+)
 :
-    constructSize_(map().constructSize_),
-    subMap_(map().subMap_.xfer()),
-    constructMap_(map().constructMap_.xfer()),
+    mapDistributeBase
+    (
+        map().constructSize_,
+        map().subMap_.xfer(),
+        map().constructMap_.xfer(),
+        map().subHasFlip(),
+        map().constructHasFlip()
+    ),
     transformElements_(map().transformElements_.xfer()),
-    transformStart_(map().transformStart_.xfer()),
-    schedulePtr_()
+    transformStart_(map().transformStart_.xfer())
 {}
 
 
+Foam::mapDistribute::mapDistribute(Istream& is)
+{
+    is  >> *this;
+}
+
+
+Foam::autoPtr<Foam::mapDistribute> Foam::mapDistribute::clone() const
+{
+    return autoPtr<mapDistribute>(new mapDistribute(*this));
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::mapDistribute::whichTransform(const label index) const
+Foam::label Foam::mapDistribute::whichTransform(const label index)
+const
 {
     return findLower(transformStart_, index+1);
 }
@@ -1136,12 +522,9 @@ Foam::label Foam::mapDistribute::whichTransform(const label index) const
 
 void Foam::mapDistribute::transfer(mapDistribute& rhs)
 {
-    constructSize_ = rhs.constructSize_;
-    subMap_.transfer(rhs.subMap_);
-    constructMap_.transfer(rhs.constructMap_);
+    mapDistributeBase::transfer(rhs);
     transformElements_.transfer(rhs.transformElements_);
     transformStart_.transfer(rhs.transformStart_);
-    schedulePtr_.clear();
 }
 
 
@@ -1151,174 +534,6 @@ Foam::Xfer<Foam::mapDistribute> Foam::mapDistribute::xfer()
 }
 
 
-Foam::label Foam::mapDistribute::renumber
-(
-    const globalIndex& globalNumbering,
-    const List<Map<label> >& compactMap,
-    const label globalI
-)
-{
-    if (globalI == -1)
-    {
-        return globalI;
-    }
-    if (globalNumbering.isLocal(globalI))
-    {
-        return globalNumbering.toLocal(globalI);
-    }
-    else
-    {
-        label procI = globalNumbering.whichProcID(globalI);
-        label index = globalNumbering.toLocal(procI, globalI);
-        return compactMap[procI][index];
-    }
-}
-
-
-void Foam::mapDistribute::compact(const boolList& elemIsUsed, const int tag)
-{
-    // 1. send back to sender. Have sender delete the corresponding element
-    //    from the submap and do the same to the constructMap locally
-    //    (and in same order).
-
-    // Send elemIsUsed field to neighbour. Use nonblocking code from
-    // mapDistribute but in reverse order.
-    if (Pstream::parRun())
-    {
-        label startOfRequests = Pstream::nRequests();
-
-        // Set up receives from neighbours
-
-        List<boolList> recvFields(Pstream::nProcs());
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = subMap_[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                recvFields[domain].setSize(map.size());
-                IPstream::read
-                (
-                    Pstream::nonBlocking,
-                    domain,
-                    reinterpret_cast<char*>(recvFields[domain].begin()),
-                    recvFields[domain].size()*sizeof(bool),
-                    tag
-                );
-            }
-        }
-
-
-        List<boolList> sendFields(Pstream::nProcs());
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap_[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                boolList& subField = sendFields[domain];
-                subField.setSize(map.size());
-                forAll(map, i)
-                {
-                    subField[i] = elemIsUsed[map[i]];
-                }
-
-                OPstream::write
-                (
-                    Pstream::nonBlocking,
-                    domain,
-                    reinterpret_cast<const char*>(subField.begin()),
-                    subField.size()*sizeof(bool),
-                    tag
-                );
-            }
-        }
-
-
-
-        // Set up 'send' to myself - write directly into recvFields
-
-        {
-            const labelList& map = constructMap_[Pstream::myProcNo()];
-
-            recvFields[Pstream::myProcNo()].setSize(map.size());
-            forAll(map, i)
-            {
-                recvFields[Pstream::myProcNo()][i] = elemIsUsed[map[i]];
-            }
-        }
-
-
-        // Wait for all to finish
-
-        Pstream::waitRequests(startOfRequests);
-
-
-        // Compact out all submap entries that are referring to unused elements
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = subMap_[domain];
-
-            labelList newMap(map.size());
-            label newI = 0;
-
-            forAll(map, i)
-            {
-                if (recvFields[domain][i])
-                {
-                    // So element is used on destination side
-                    newMap[newI++] = map[i];
-                }
-            }
-            if (newI < map.size())
-            {
-                newMap.setSize(newI);
-                subMap_[domain].transfer(newMap);
-            }
-        }
-    }
-
-
-    // 2. remove from construct map - since end-result (element in elemIsUsed)
-    //    not used.
-
-    label maxConstructIndex = -1;
-
-    for (label domain = 0; domain < Pstream::nProcs(); domain++)
-    {
-        const labelList& map = constructMap_[domain];
-
-        labelList newMap(map.size());
-        label newI = 0;
-
-        forAll(map, i)
-        {
-            label destinationI = map[i];
-
-            // Is element is used on destination side
-            if (elemIsUsed[destinationI])
-            {
-                maxConstructIndex = max(maxConstructIndex, destinationI);
-
-                newMap[newI++] = destinationI;
-            }
-        }
-        if (newI < map.size())
-        {
-            newMap.setSize(newI);
-            constructMap_[domain].transfer(newMap);
-        }
-    }
-
-    constructSize_ = maxConstructIndex+1;
-
-    // Clear the schedule (note:not necessary if nothing changed)
-    schedulePtr_.clear();
-}
-
-
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::mapDistribute::operator=(const mapDistribute& rhs)
@@ -1326,18 +541,13 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::mapDistribute::operator=(const Foam::mapDistribute&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
-    constructSize_ = rhs.constructSize_;
-    subMap_ = rhs.subMap_;
-    constructMap_ = rhs.constructMap_;
+    mapDistributeBase::operator=(rhs);
     transformElements_ = rhs.transformElements_;
     transformStart_ = rhs.transformStart_;
-    schedulePtr_.clear();
 }
 
 
@@ -1347,7 +557,7 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
 {
     is.fatalCheck("operator>>(Istream&, mapDistribute&)");
 
-    is  >> map.constructSize_ >> map.subMap_ >> map.constructMap_
+    is  >> static_cast<mapDistributeBase&>(map)
         >> map.transformElements_ >> map.transformStart_;
 
     return is;
@@ -1358,11 +568,9 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistribute& map)
 {
-    os  << map.constructSize_ << token::NL
-        << map.subMap_ << token::NL
-        << map.constructMap_ << token::NL
+    os  << static_cast<const mapDistributeBase&>(map) << token::NL
         << map.transformElements_ << token::NL
-        << map.transformStart_ << token::NL;
+        << map.transformStart_;
 
     return os;
 }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index 9495302726..bd19e09473 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -118,6 +118,12 @@ Note:
         +------+ 0
 
 
+    When constructing from components optionally a 'flip' on
+    the maps can be specified. This will interpret the map
+    values as index+flip, similar to e.g. faceProcAddressing. The flip
+    will only be applied to fieldTypes (scalar, vector, .. triad)
+
+
 SourceFiles
     mapDistribute.C
     mapDistributeTemplates.C
@@ -127,12 +133,8 @@ SourceFiles
 #ifndef mapDistribute_H
 #define mapDistribute_H
 
+#include "mapDistributeBase.H"
 #include "transformList.H"
-#include "labelList.H"
-#include "labelPair.H"
-#include "Pstream.H"
-#include "boolList.H"
-#include "Map.H"
 #include "vectorTensorTransform.H"
 #include "coupledPolyPatch.H"
 
@@ -141,81 +143,27 @@ SourceFiles
 namespace Foam
 {
 
-class mapPolyMesh;
-class globalIndex;
-class PstreamBuffers;
 class globalIndexAndTransform;
+//class vectorTensorTransform;
 
 /*---------------------------------------------------------------------------*\
                            Class mapDistribute Declaration
 \*---------------------------------------------------------------------------*/
 
 class mapDistribute
+:
+    public mapDistributeBase
 {
     // Private data
 
-        //- Size of reconstructed data
-        label constructSize_;
+        //- For every globalIndexAndTransform::transformPermutations
+        //  gives the elements that need to be transformed
+        labelListList transformElements_;
 
-        //- Maps from subsetted data back to original data
-        labelListList subMap_;
-
-        //- Maps from subsetted data to new reconstructed data
-        labelListList constructMap_;
-
-        // Optional transformation
-
-            //- For every globalIndexAndTransform::transformPermutations
-            //  gives the elements that need to be transformed
-            labelListList transformElements_;
-
-            //- Destination in constructMap for transformed elements
-            labelList transformStart_;
-
-
-        //- Schedule
-        mutable autoPtr<List<labelPair> > schedulePtr_;
-
-
-   // Private Member Functions
-
-        static void checkReceivedSize
-        (
-            const label procI,
-            const label expectedSize,
-            const label receivedSize
-        );
-
-        void calcCompactAddressing
-        (
-            const globalIndex& globalNumbering,
-            const labelList& elements,
-            List<Map<label> >& compactMap
-        ) const;
-        void calcCompactAddressing
-        (
-            const globalIndex& globalNumbering,
-            const labelListList& elements,
-            List<Map<label> >& compactMap
-        ) const;
-
-        void exchangeAddressing
-        (
-            const int tag,
-            const globalIndex& globalNumbering,
-            labelList& elements,
-            List<Map<label> >& compactMap,
-            labelList& compactStart
-        );
-        void exchangeAddressing
-        (
-            const int tag,
-            const globalIndex& globalNumbering,
-            labelListList& elements,
-            List<Map<label> >& compactMap,
-            labelList& compactStart
-        );
+        //- Destination in constructMap for transformed elements
+        labelList transformStart_;
 
+    // Private Member Functions
 
         //- Helper function: copy transformElements without transformation
         template<class T>
@@ -241,7 +189,6 @@ class mapDistribute
             const TransformOp& top
         ) const;
 
-
 public:
 
     // Public classes
@@ -358,7 +305,6 @@ public:
         };
 
 
-
     // Declare name of the class and its debug switch
     ClassName("mapDistribute");
 
@@ -373,7 +319,9 @@ public:
         (
             const label constructSize,
             const Xfer<labelListList>& subMap,
-            const Xfer<labelListList>& constructMap
+            const Xfer<labelListList>& constructMap,
+            const bool subHasFlip = false,
+            const bool constructHasFlip = false
         );
 
         //- Construct from components
@@ -383,7 +331,9 @@ public:
             const Xfer<labelListList>& subMap,
             const Xfer<labelListList>& constructMap,
             const Xfer<labelListList>& transformElements,
-            const Xfer<labelList>& transformStart
+            const Xfer<labelList>& transformStart,
+            const bool subHasFlip = false,
+            const bool constructHasFlip = false
         );
 
         //- Construct from reverse addressing: per data item the send
@@ -453,47 +403,22 @@ public:
         //- Construct copy
         mapDistribute(const mapDistribute&);
 
+        //- Construct from Istream
+        mapDistribute(Istream&);
+
+        //- Clone
+        autoPtr<mapDistribute> clone() const;
+
+
+    //- Destructor
+    virtual ~mapDistribute()
+    {}
+
 
     // Member Functions
 
         // Access
 
-            //- Constructed data size
-            label constructSize() const
-            {
-                return constructSize_;
-            }
-
-            //- Constructed data size
-            label& constructSize()
-            {
-                return constructSize_;
-            }
-
-            //- From subsetted data back to original data
-            const labelListList& subMap() const
-            {
-                return subMap_;
-            }
-
-            //- From subsetted data back to original data
-            labelListList& subMap()
-            {
-                return subMap_;
-            }
-
-            //- From subsetted data to new reconstructed data
-            const labelListList& constructMap() const
-            {
-                return constructMap_;
-            }
-
-            //- From subsetted data to new reconstructed data
-            labelListList& constructMap()
-            {
-                return constructMap_;
-            }
-
             //- For every globalIndexAndTransform::transformPermutations
             //  gives the elements that need to be transformed
             const labelListList& transformElements() const
@@ -510,17 +435,6 @@ public:
             //- Find transform from transformElements
             label whichTransform(const label index) const;
 
-            //- Calculate a schedule. See above.
-            static List<labelPair> schedule
-            (
-                const labelListList& subMap,
-                const labelListList& constructMap,
-                const int tag
-            );
-
-            //- Return a schedule. Demand driven. See above.
-            const List<labelPair>& schedule() const;
-
 
         // Other
 
@@ -530,53 +444,25 @@ public:
             //- Transfer contents to the Xfer container
             Xfer<mapDistribute> xfer();
 
-            //- Helper for construct from globalIndex. Renumbers element
-            //  (in globalIndex numbering) into compact indices.
-            static label renumber
-            (
-                const globalIndex&,
-                const List<Map<label> >& compactMap,
-                const label globalElement
-            );
 
-            //- Compact maps. Gets per field a bool whether it is used (locally)
-            //  and works out itself what this side and sender side can remove
-            //  from maps.
-            void compact
-            (
-                const boolList& elemIsUsed,
-                const int tag = UPstream::msgType()
-            );
-
-            //- Distribute data. Note:schedule only used for Pstream::scheduled
-            //  for now, all others just use send-to-all, receive-from-all.
+            //- Distribute data using default commsType.
             template<class T>
-            static void distribute
+            void distribute
             (
-                const Pstream::commsTypes commsType,
-                const List<labelPair>& schedule,
-                const label constructSize,
-                const labelListList& subMap,
-                const labelListList& constructMap,
-                List<T>&,
+                List<T>& fld,
+                const bool dummyTransform = true,
                 const int tag = UPstream::msgType()
-            );
+            ) const;
 
-            //- Distribute data. If multiple processors writing to same
-            //  position adds contributions using cop.
-            template<class T, class CombineOp>
-            static void distribute
+            //- Distribute data using default commsType.
+            template<class T, class negateOp>
+            void distribute
             (
-                const Pstream::commsTypes commsType,
-                const List<labelPair>& schedule,
-                const label constructSize,
-                const labelListList& subMap,
-                const labelListList& constructMap,
-                List<T>&,
-                const CombineOp& cop,
-                const T& nullValue,
+                List<T>& fld,
+                const negateOp& negOp,
+                const bool dummyTransform = true,
                 const int tag = UPstream::msgType()
-            );
+            ) const;
 
             //- Distribute data using default commsType.
             template<class T>
@@ -587,25 +473,6 @@ public:
                 const int tag = UPstream::msgType()
             ) const;
 
-            //- Distribute data using default commsType.
-            template<class T>
-            void distribute
-            (
-                List<T>& fld,
-                const bool dummyTransform = true,
-                const int tag = UPstream::msgType()
-            ) const;
-
-            //- Same but with transforms
-            template<class T, class TransformOp>
-            void distribute
-            (
-                const globalIndexAndTransform&,
-                List<T>& fld,
-                const TransformOp& top,
-                const int tag = UPstream::msgType()
-            ) const;
-
             //- Reverse distribute data using default commsType.
             template<class T>
             void reverseDistribute
@@ -616,17 +483,6 @@ public:
                 const int tag = UPstream::msgType()
             ) const;
 
-            //- Same but with transforms
-            template<class T, class TransformOp>
-            void reverseDistribute
-            (
-                const globalIndexAndTransform&,
-                const label constructSize,
-                List<T>& fld,
-                const TransformOp& top,
-                const int tag = UPstream::msgType()
-            ) const;
-
             //- Reverse distribute data using default commsType.
             //  Since constructSize might be larger than supplied size supply
             //  a nullValue
@@ -640,7 +496,28 @@ public:
                 const int tag = UPstream::msgType()
             ) const;
 
-            //- Same but with transforms
+            //- Distribute with transforms
+            template<class T, class TransformOp>
+            void distribute
+            (
+                const globalIndexAndTransform&,
+                List<T>& fld,
+                const TransformOp& top,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Reverse distribute with transforms
+            template<class T, class TransformOp>
+            void reverseDistribute
+            (
+                const globalIndexAndTransform&,
+                const label constructSize,
+                List<T>& fld,
+                const TransformOp& top,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Reverse distribute with transforms
             template<class T, class TransformOp>
             void reverseDistribute
             (
@@ -652,13 +529,6 @@ public:
                 const int tag = UPstream::msgType()
             ) const;
 
-            //- Do all sends using PstreamBuffers
-            template<class T>
-            void send(PstreamBuffers&, const List<T>&) const;
-            //- Do all receives using PstreamBuffers
-            template<class T>
-            void receive(PstreamBuffers&, List<T>&) const;
-
             //- Debug: print layout. Can only be used on maps with sorted
             //  storage (local data first, then non-local data)
             void printLayout(Ostream& os) const;
@@ -666,17 +536,13 @@ public:
             //- Correct for topo change.
             void updateMesh(const mapPolyMesh&)
             {
-                notImplemented
-                (
-                    "mapDistribute::updateMesh(const mapPolyMesh&)"
-                );
+                NotImplemented;
             }
 
     // Member Operators
 
         void operator=(const mapDistribute&);
 
-
     // IOstream operators
 
         //- Read dictionary from Istream
@@ -688,6 +554,7 @@ public:
 };
 
 
+// Template specialisation for primitives that do not need transform
 template<>
 void mapDistribute::transform::operator()
 (
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
new file mode 100644
index 0000000000..2cdf3d0af2
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
@@ -0,0 +1,1277 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "mapDistributeBase.H"
+#include "commSchedule.H"
+#include "HashSet.H"
+#include "globalIndex.H"
+#include "ListOps.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(mapDistributeBase, 0);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
+(
+    const labelListList& subMap,
+    const labelListList& constructMap,
+    const int tag
+)
+{
+    // Communications: send and receive processor
+    List<labelPair> allComms;
+
+    {
+        HashSet<labelPair, labelPair::Hash<> > commsSet(Pstream::nProcs());
+
+        // Find what communication is required
+        forAll(subMap, procI)
+        {
+            if (procI != Pstream::myProcNo())
+            {
+                if (subMap[procI].size())
+                {
+                    // I need to send to procI
+                    commsSet.insert(labelPair(Pstream::myProcNo(), procI));
+                }
+                if (constructMap[procI].size())
+                {
+                    // I need to receive from procI
+                    commsSet.insert(labelPair(procI, Pstream::myProcNo()));
+                }
+            }
+        }
+        allComms = commsSet.toc();
+    }
+
+
+    // Reduce
+    if (Pstream::master())
+    {
+        // Receive and merge
+        for
+        (
+            int slave=Pstream::firstSlave();
+            slave<=Pstream::lastSlave();
+            slave++
+        )
+        {
+            IPstream fromSlave(Pstream::scheduled, slave, 0, tag);
+            List<labelPair> nbrData(fromSlave);
+
+            forAll(nbrData, i)
+            {
+                if (findIndex(allComms, nbrData[i]) == -1)
+                {
+                    label sz = allComms.size();
+                    allComms.setSize(sz+1);
+                    allComms[sz] = nbrData[i];
+                }
+            }
+        }
+        // Send back
+        for
+        (
+            int slave=Pstream::firstSlave();
+            slave<=Pstream::lastSlave();
+            slave++
+        )
+        {
+            OPstream toSlave(Pstream::scheduled, slave, 0, tag);
+            toSlave << allComms;
+        }
+    }
+    else
+    {
+        {
+            OPstream toMaster(Pstream::scheduled, Pstream::masterNo(), 0, tag);
+            toMaster << allComms;
+        }
+        {
+            IPstream fromMaster
+            (
+                Pstream::scheduled,
+                Pstream::masterNo(),
+                0,
+                tag
+            );
+            fromMaster >> allComms;
+        }
+    }
+
+
+    // Determine my schedule.
+    labelList mySchedule
+    (
+        commSchedule
+        (
+            Pstream::nProcs(),
+            allComms
+        ).procSchedule()[Pstream::myProcNo()]
+    );
+
+    // Processors involved in my schedule
+    return List<labelPair>(UIndirectList<labelPair>(allComms, mySchedule));
+
+
+    //if (debug)
+    //{
+    //    Pout<< "I need to:" << endl;
+    //    const List<labelPair>& comms = schedule();
+    //    forAll(comms, i)
+    //    {
+    //        const labelPair& twoProcs = comms[i];
+    //        label sendProc = twoProcs[0];
+    //        label recvProc = twoProcs[1];
+    //
+    //        if (recvProc == Pstream::myProcNo())
+    //        {
+    //            Pout<< "    receive from " << sendProc << endl;
+    //        }
+    //        else
+    //        {
+    //            Pout<< "    send to " << recvProc << endl;
+    //        }
+    //    }
+    //}
+}
+
+
+const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
+{
+    if (schedulePtr_.empty())
+    {
+        schedulePtr_.reset
+        (
+            new List<labelPair>
+            (
+                schedule(subMap_, constructMap_, Pstream::msgType())
+            )
+        );
+    }
+    return schedulePtr_();
+}
+
+
+void Foam::mapDistributeBase::checkReceivedSize
+(
+    const label procI,
+    const label expectedSize,
+    const label receivedSize
+)
+{
+    if (receivedSize != expectedSize)
+    {
+        FatalErrorInFunction
+            << "Expected from processor " << procI
+            << " " << expectedSize << " but received "
+            << receivedSize << " elements."
+            << abort(FatalError);
+    }
+}
+
+
+void Foam::mapDistributeBase::printLayout(Ostream& os) const
+{
+    // Determine offsets of remote data.
+    labelList minIndex(Pstream::nProcs(), labelMax);
+    labelList maxIndex(Pstream::nProcs(), labelMin);
+    forAll(constructMap_, procI)
+    {
+        const labelList& construct = constructMap_[procI];
+        if (constructHasFlip_)
+        {
+            forAll(construct, i)
+            {
+                label index = mag(construct[i])-1;
+                minIndex[procI] = min(minIndex[procI], index);
+                maxIndex[procI] = max(maxIndex[procI], index);
+            }
+        }
+        else
+        {
+            forAll(construct, i)
+            {
+                label index = construct[i];
+                minIndex[procI] = min(minIndex[procI], index);
+                maxIndex[procI] = max(maxIndex[procI], index);
+            }
+        }
+    }
+
+    label localSize;
+    if (maxIndex[Pstream::myProcNo()] == labelMin)
+    {
+        localSize = 0;
+    }
+    else
+    {
+        localSize = maxIndex[Pstream::myProcNo()]+1;
+    }
+
+    os  << "Layout: (constructSize:" << constructSize_
+        << " subHasFlip:" << subHasFlip_
+        << " constructHasFlip:" << constructHasFlip_
+        << ")" << endl
+        << "local (processor " << Pstream::myProcNo() << "):" << endl
+        << "    start : 0" << endl
+        << "    size  : " << localSize << endl;
+
+    label offset = localSize;
+    forAll(minIndex, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            if (constructMap_[procI].size() > 0)
+            {
+                if (minIndex[procI] != offset)
+                {
+                    FatalErrorInFunction
+                        << "offset:" << offset
+                        << " procI:" << procI
+                        << " minIndex:" << minIndex[procI]
+                        << abort(FatalError);
+                }
+
+                label size = maxIndex[procI]-minIndex[procI]+1;
+                os  << "processor " << procI << ':' << endl
+                    << "    start : " << offset << endl
+                    << "    size  : " << size << endl;
+
+                offset += size;
+            }
+        }
+    }
+}
+
+
+// Construct per processor compact addressing of the global elements
+// needed. The ones from the local processor are not included since
+// these are always all needed.
+void Foam::mapDistributeBase::calcCompactAddressing
+(
+    const globalIndex& globalNumbering,
+    const labelList& elements,
+    List<Map<label> >& compactMap
+) const
+{
+    compactMap.setSize(Pstream::nProcs());
+
+    // Count all (non-local) elements needed. Just for presizing map.
+    labelList nNonLocal(Pstream::nProcs(), 0);
+
+    forAll(elements, i)
+    {
+        label globalIndex = elements[i];
+
+        if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
+        {
+            label procI = globalNumbering.whichProcID(globalIndex);
+            nNonLocal[procI]++;
+        }
+    }
+
+    forAll(compactMap, procI)
+    {
+        compactMap[procI].clear();
+        if (procI != Pstream::myProcNo())
+        {
+            compactMap[procI].resize(2*nNonLocal[procI]);
+        }
+    }
+
+
+    // Collect all (non-local) elements needed.
+    forAll(elements, i)
+    {
+        label globalIndex = elements[i];
+
+        if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
+        {
+            label procI = globalNumbering.whichProcID(globalIndex);
+            label index = globalNumbering.toLocal(procI, globalIndex);
+            label nCompact = compactMap[procI].size();
+            compactMap[procI].insert(index, nCompact);
+        }
+    }
+}
+
+
+void Foam::mapDistributeBase::calcCompactAddressing
+(
+    const globalIndex& globalNumbering,
+    const labelListList& cellCells,
+    List<Map<label> >& compactMap
+) const
+{
+    compactMap.setSize(Pstream::nProcs());
+
+    // Count all (non-local) elements needed. Just for presizing map.
+    labelList nNonLocal(Pstream::nProcs(), 0);
+
+    forAll(cellCells, cellI)
+    {
+        const labelList& cCells = cellCells[cellI];
+
+        forAll(cCells, i)
+        {
+            label globalIndex = cCells[i];
+
+            if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
+            {
+                label procI = globalNumbering.whichProcID(globalIndex);
+                nNonLocal[procI]++;
+            }
+        }
+    }
+
+    forAll(compactMap, procI)
+    {
+        compactMap[procI].clear();
+        if (procI != Pstream::myProcNo())
+        {
+            compactMap[procI].resize(2*nNonLocal[procI]);
+        }
+    }
+
+
+    // Collect all (non-local) elements needed.
+    forAll(cellCells, cellI)
+    {
+        const labelList& cCells = cellCells[cellI];
+
+        forAll(cCells, i)
+        {
+            label globalIndex = cCells[i];
+
+            if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
+            {
+                label procI = globalNumbering.whichProcID(globalIndex);
+                label index = globalNumbering.toLocal(procI, globalIndex);
+                label nCompact = compactMap[procI].size();
+                compactMap[procI].insert(index, nCompact);
+            }
+        }
+    }
+}
+
+
+void Foam::mapDistributeBase::exchangeAddressing
+(
+    const int tag,
+    const globalIndex& globalNumbering,
+    labelList& elements,
+    List<Map<label> >& compactMap,
+    labelList& compactStart
+)
+{
+    // The overall compact addressing is
+    // - myProcNo data first (uncompacted)
+    // - all other processors consecutively
+
+    compactStart.setSize(Pstream::nProcs());
+    compactStart[Pstream::myProcNo()] = 0;
+    constructSize_ = globalNumbering.localSize();
+    forAll(compactStart, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            compactStart[procI] = constructSize_;
+            constructSize_ += compactMap[procI].size();
+        }
+    }
+
+
+
+    // Find out what to receive/send in compact addressing.
+
+    // What I want to receive is what others have to send
+    labelListList wantedRemoteElements(Pstream::nProcs());
+    // Compact addressing for received data
+    constructMap_.setSize(Pstream::nProcs());
+    forAll(compactMap, procI)
+    {
+        if (procI == Pstream::myProcNo())
+        {
+            // All my own elements are used
+            label nLocal = globalNumbering.localSize();
+            wantedRemoteElements[procI] = identity(nLocal);
+            constructMap_[procI] = identity(nLocal);
+        }
+        else
+        {
+            // Remote elements wanted from processor procI
+            labelList& remoteElem = wantedRemoteElements[procI];
+            labelList& localElem = constructMap_[procI];
+            remoteElem.setSize(compactMap[procI].size());
+            localElem.setSize(compactMap[procI].size());
+            label i = 0;
+            forAllIter(Map<label>, compactMap[procI], iter)
+            {
+                const label compactI = compactStart[procI] + iter();
+                remoteElem[i] = iter.key();
+                localElem[i]  = compactI;
+                iter() = compactI;
+                i++;
+            }
+        }
+    }
+
+    subMap_.setSize(Pstream::nProcs());
+    labelListList sendSizes;
+    Pstream::exchange<labelList, label>
+    (
+        wantedRemoteElements,
+        subMap_,
+        sendSizes,
+        tag,
+        Pstream::worldComm  //TBD
+    );
+
+    // Renumber elements
+    forAll(elements, i)
+    {
+        elements[i] = renumber(globalNumbering, compactMap, elements[i]);
+    }
+}
+
+
+void Foam::mapDistributeBase::exchangeAddressing
+(
+    const int tag,
+    const globalIndex& globalNumbering,
+    labelListList& cellCells,
+    List<Map<label> >& compactMap,
+    labelList& compactStart
+)
+{
+    // The overall compact addressing is
+    // - myProcNo data first (uncompacted)
+    // - all other processors consecutively
+
+    compactStart.setSize(Pstream::nProcs());
+    compactStart[Pstream::myProcNo()] = 0;
+    constructSize_ = globalNumbering.localSize();
+    forAll(compactStart, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            compactStart[procI] = constructSize_;
+            constructSize_ += compactMap[procI].size();
+        }
+    }
+
+
+
+    // Find out what to receive/send in compact addressing.
+
+    // What I want to receive is what others have to send
+    labelListList wantedRemoteElements(Pstream::nProcs());
+    // Compact addressing for received data
+    constructMap_.setSize(Pstream::nProcs());
+    forAll(compactMap, procI)
+    {
+        if (procI == Pstream::myProcNo())
+        {
+            // All my own elements are used
+            label nLocal = globalNumbering.localSize();
+            wantedRemoteElements[procI] = identity(nLocal);
+            constructMap_[procI] = identity(nLocal);
+        }
+        else
+        {
+            // Remote elements wanted from processor procI
+            labelList& remoteElem = wantedRemoteElements[procI];
+            labelList& localElem = constructMap_[procI];
+            remoteElem.setSize(compactMap[procI].size());
+            localElem.setSize(compactMap[procI].size());
+            label i = 0;
+            forAllIter(Map<label>, compactMap[procI], iter)
+            {
+                const label compactI = compactStart[procI] + iter();
+                remoteElem[i] = iter.key();
+                localElem[i]  = compactI;
+                iter() = compactI;
+                i++;
+            }
+        }
+    }
+
+    subMap_.setSize(Pstream::nProcs());
+    labelListList sendSizes;
+    Pstream::exchange<labelList, label>
+    (
+        wantedRemoteElements,
+        subMap_,
+        sendSizes,
+        tag,
+        Pstream::worldComm      //TBD
+    );
+
+    // Renumber elements
+    forAll(cellCells, cellI)
+    {
+        labelList& cCells = cellCells[cellI];
+
+        forAll(cCells, i)
+        {
+            cCells[i] = renumber(globalNumbering, compactMap, cCells[i]);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+//- Construct null
+Foam::mapDistributeBase::mapDistributeBase()
+:
+    constructSize_(0),
+    subHasFlip_(false),
+    constructHasFlip_(false),
+    schedulePtr_()
+{}
+
+
+//- Construct from components
+Foam::mapDistributeBase::mapDistributeBase
+(
+    const label constructSize,
+    const Xfer<labelListList>& subMap,
+    const Xfer<labelListList>& constructMap,
+    const bool subHasFlip,
+    const bool constructHasFlip
+)
+:
+    constructSize_(constructSize),
+    subMap_(subMap),
+    constructMap_(constructMap),
+    subHasFlip_(subHasFlip),
+    constructHasFlip_(constructHasFlip),
+    schedulePtr_()
+{}
+
+
+Foam::mapDistributeBase::mapDistributeBase
+(
+    const labelList& sendProcs,
+    const labelList& recvProcs
+)
+:
+    constructSize_(0),
+    subHasFlip_(false),
+    constructHasFlip_(false),
+    schedulePtr_()
+{
+    if (sendProcs.size() != recvProcs.size())
+    {
+        FatalErrorInFunction
+            << "The send and receive data is not the same length. sendProcs:"
+            << sendProcs.size() << " recvProcs:" << recvProcs.size()
+            << abort(FatalError);
+    }
+
+    // Per processor the number of samples we have to send/receive.
+    labelList nSend(Pstream::nProcs(), 0);
+    labelList nRecv(Pstream::nProcs(), 0);
+
+    forAll(sendProcs, sampleI)
+    {
+        label sendProc = sendProcs[sampleI];
+        label recvProc = recvProcs[sampleI];
+
+        // Note that also need to include local communication (both
+        // RecvProc and sendProc on local processor)
+
+        if (Pstream::myProcNo() == sendProc)
+        {
+            // I am the sender. Count destination processor.
+            nSend[recvProc]++;
+        }
+        if (Pstream::myProcNo() == recvProc)
+        {
+            // I am the receiver.
+            nRecv[sendProc]++;
+        }
+    }
+
+    subMap_.setSize(Pstream::nProcs());
+    constructMap_.setSize(Pstream::nProcs());
+    forAll(nSend, procI)
+    {
+        subMap_[procI].setSize(nSend[procI]);
+        constructMap_[procI].setSize(nRecv[procI]);
+    }
+    nSend = 0;
+    nRecv = 0;
+
+    forAll(sendProcs, sampleI)
+    {
+        label sendProc = sendProcs[sampleI];
+        label recvProc = recvProcs[sampleI];
+
+        if (Pstream::myProcNo() == sendProc)
+        {
+            // I am the sender. Store index I need to send.
+            subMap_[recvProc][nSend[recvProc]++] = sampleI;
+        }
+        if (Pstream::myProcNo() == recvProc)
+        {
+            // I am the receiver.
+            constructMap_[sendProc][nRecv[sendProc]++] = sampleI;
+            // Largest entry inside constructMap
+            constructSize_ = sampleI+1;
+        }
+    }
+}
+
+
+Foam::mapDistributeBase::mapDistributeBase
+(
+    const globalIndex& globalNumbering,
+    labelList& elements,
+    List<Map<label> >& compactMap,
+    const int tag
+)
+:
+    constructSize_(0),
+    subHasFlip_(false),
+    constructHasFlip_(false),
+    schedulePtr_()
+{
+    // Construct per processor compact addressing of the global elements
+    // needed. The ones from the local processor are not included since
+    // these are always all needed.
+    calcCompactAddressing
+    (
+        globalNumbering,
+        elements,
+        compactMap
+    );
+
+    //// Sort remote elements needed (not really necessary)
+    //forAll(compactMap, procI)
+    //{
+    //    if (procI != Pstream::myProcNo())
+    //    {
+    //        Map<label>& globalMap = compactMap[procI];
+    //
+    //        SortableList<label> sorted(globalMap.toc().xfer());
+    //
+    //        forAll(sorted, i)
+    //        {
+    //            Map<label>::iterator iter = globalMap.find(sorted[i]);
+    //            iter() = i;
+    //        }
+    //    }
+    //}
+
+
+    // Exchange what I need with processor that supplies it. Renumber elements
+    // into compact numbering
+    labelList compactStart;
+    exchangeAddressing
+    (
+        tag,
+        globalNumbering,
+        elements,
+        compactMap,
+        compactStart
+    );
+
+    if (debug)
+    {
+        printLayout(Pout);
+    }
+}
+
+
+Foam::mapDistributeBase::mapDistributeBase
+(
+    const globalIndex& globalNumbering,
+    labelListList& cellCells,
+    List<Map<label> >& compactMap,
+    const int tag
+)
+:
+    constructSize_(0),
+    subHasFlip_(false),
+    constructHasFlip_(false),
+    schedulePtr_()
+{
+    // Construct per processor compact addressing of the global elements
+    // needed. The ones from the local processor are not included since
+    // these are always all needed.
+    calcCompactAddressing
+    (
+        globalNumbering,
+        cellCells,
+        compactMap
+    );
+
+    //// Sort remote elements needed (not really necessary)
+    //forAll(compactMap, procI)
+    //{
+    //    if (procI != Pstream::myProcNo())
+    //    {
+    //        Map<label>& globalMap = compactMap[procI];
+    //
+    //        SortableList<label> sorted(globalMap.toc().xfer());
+    //
+    //        forAll(sorted, i)
+    //        {
+    //            Map<label>::iterator iter = globalMap.find(sorted[i]);
+    //            iter() = i;
+    //        }
+    //    }
+    //}
+
+
+    // Exchange what I need with processor that supplies it. Renumber elements
+    // into compact numbering
+    labelList compactStart;
+    exchangeAddressing
+    (
+        tag,
+        globalNumbering,
+        cellCells,
+        compactMap,
+        compactStart
+    );
+
+    if (debug)
+    {
+        printLayout(Pout);
+    }
+}
+
+
+Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
+:
+    constructSize_(map.constructSize_),
+    subMap_(map.subMap_),
+    constructMap_(map.constructMap_),
+    subHasFlip_(map.subHasFlip_),
+    constructHasFlip_(map.constructHasFlip_),
+    schedulePtr_()
+{}
+
+
+Foam::mapDistributeBase::mapDistributeBase(const Xfer<mapDistributeBase>& map)
+:
+    constructSize_(map().constructSize_),
+    subMap_(map().subMap_.xfer()),
+    constructMap_(map().constructMap_.xfer()),
+    subHasFlip_(map().subHasFlip_),
+    constructHasFlip_(map().constructHasFlip_),
+    schedulePtr_()
+{}
+
+
+Foam::mapDistributeBase::mapDistributeBase(Istream& is)
+{
+    is >> *this;
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::mapDistributeBase::transfer(mapDistributeBase& rhs)
+{
+    constructSize_ = rhs.constructSize_;
+    subMap_.transfer(rhs.subMap_);
+    constructMap_.transfer(rhs.constructMap_);
+    subHasFlip_ = rhs.subHasFlip_;
+    constructHasFlip_ = rhs.constructHasFlip_;
+    schedulePtr_.clear();
+}
+
+
+Foam::Xfer<Foam::mapDistributeBase> Foam::mapDistributeBase::xfer()
+{
+    return xferMove(*this);
+}
+
+
+Foam::label Foam::mapDistributeBase::renumber
+(
+    const globalIndex& globalNumbering,
+    const List<Map<label> >& compactMap,
+    const label globalI
+)
+{
+    if (globalI == -1)
+    {
+        return globalI;
+    }
+    if (globalNumbering.isLocal(globalI))
+    {
+        return globalNumbering.toLocal(globalI);
+    }
+    else
+    {
+        label procI = globalNumbering.whichProcID(globalI);
+        label index = globalNumbering.toLocal(procI, globalI);
+        return compactMap[procI][index];
+    }
+}
+
+
+void Foam::mapDistributeBase::compact(const boolList& elemIsUsed, const int tag)
+{
+    // 1. send back to sender. Have sender delete the corresponding element
+    //    from the submap and do the same to the constructMap locally
+    //    (and in same order).
+
+    // Send elemIsUsed field to neighbour. Use nonblocking code from
+    // mapDistributeBase but in reverse order.
+    if (Pstream::parRun())
+    {
+        label startOfRequests = Pstream::nRequests();
+
+        // Set up receives from neighbours
+
+        List<boolList> recvFields(Pstream::nProcs());
+
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = subMap_[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                recvFields[domain].setSize(map.size());
+                IPstream::read
+                (
+                    Pstream::nonBlocking,
+                    domain,
+                    reinterpret_cast<char*>(recvFields[domain].begin()),
+                    recvFields[domain].size()*sizeof(bool),
+                    tag
+                );
+            }
+        }
+
+
+        List<boolList> sendFields(Pstream::nProcs());
+
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = constructMap_[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                boolList& subField = sendFields[domain];
+                subField.setSize(map.size());
+                forAll(map, i)
+                {
+                    subField[i] = accessAndFlip
+                    (
+                        elemIsUsed,
+                        map[i],
+                        constructHasFlip_,
+                        noOp()          // do not flip elemIsUsed value
+                    );
+                }
+
+                OPstream::write
+                (
+                    Pstream::nonBlocking,
+                    domain,
+                    reinterpret_cast<const char*>(subField.begin()),
+                    subField.size()*sizeof(bool),
+                    tag
+                );
+            }
+        }
+
+
+
+        // Set up 'send' to myself - write directly into recvFields
+
+        {
+            const labelList& map = constructMap_[Pstream::myProcNo()];
+
+            recvFields[Pstream::myProcNo()].setSize(map.size());
+            forAll(map, i)
+            {
+                recvFields[Pstream::myProcNo()][i] = accessAndFlip
+                (
+                    elemIsUsed,
+                    map[i],
+                    constructHasFlip_,
+                    noOp()              // do not flip elemIsUsed value
+                );
+            }
+        }
+
+
+        // Wait for all to finish
+
+        Pstream::waitRequests(startOfRequests);
+
+
+        // Compact out all submap entries that are referring to unused elements
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = subMap_[domain];
+
+            labelList newMap(map.size());
+            label newI = 0;
+
+            forAll(map, i)
+            {
+                if (recvFields[domain][i])
+                {
+                    // So element is used on destination side
+                    newMap[newI++] = map[i];
+                }
+            }
+            if (newI < map.size())
+            {
+                newMap.setSize(newI);
+                subMap_[domain].transfer(newMap);
+            }
+        }
+    }
+
+
+    // 2. remove from construct map - since end-result (element in elemIsUsed)
+    //    not used.
+
+    label maxConstructIndex = -1;
+
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& map = constructMap_[domain];
+
+        labelList newMap(map.size());
+        label newI = 0;
+
+        forAll(map, i)
+        {
+            label destinationI = map[i];
+            if (constructHasFlip_)
+            {
+                destinationI = mag(destinationI)-1;
+            }
+
+            // Is element is used on destination side
+            if (elemIsUsed[destinationI])
+            {
+                maxConstructIndex = max(maxConstructIndex, destinationI);
+
+                newMap[newI++] = map[i];
+            }
+        }
+        if (newI < map.size())
+        {
+            newMap.setSize(newI);
+            constructMap_[domain].transfer(newMap);
+        }
+    }
+
+    constructSize_ = maxConstructIndex+1;
+
+    // Clear the schedule (note:not necessary if nothing changed)
+    schedulePtr_.clear();
+}
+
+
+void Foam::mapDistributeBase::compact
+(
+    const boolList& elemIsUsed,
+    const label localSize,            // max index for subMap
+    labelList& oldToNewSub,
+    labelList& oldToNewConstruct,
+    const int tag
+)
+{
+    // 1. send back to sender. Have sender delete the corresponding element
+    //    from the submap and do the same to the constructMap locally
+    //    (and in same order).
+
+    // Send elemIsUsed field to neighbour. Use nonblocking code from
+    // mapDistributeBase but in reverse order.
+    if (Pstream::parRun())
+    {
+        label startOfRequests = Pstream::nRequests();
+
+        // Set up receives from neighbours
+
+        List<boolList> recvFields(Pstream::nProcs());
+
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = subMap_[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                recvFields[domain].setSize(map.size());
+                IPstream::read
+                (
+                    Pstream::nonBlocking,
+                    domain,
+                    reinterpret_cast<char*>(recvFields[domain].begin()),
+                    recvFields[domain].size()*sizeof(bool),
+                    tag
+                );
+            }
+        }
+
+
+        List<boolList> sendFields(Pstream::nProcs());
+
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = constructMap_[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                boolList& subField = sendFields[domain];
+                subField.setSize(map.size());
+                forAll(map, i)
+                {
+                    label index = map[i];
+                    if (constructHasFlip_)
+                    {
+                        index = mag(index)-1;
+                    }
+                    subField[i] = elemIsUsed[index];
+                }
+
+                OPstream::write
+                (
+                    Pstream::nonBlocking,
+                    domain,
+                    reinterpret_cast<const char*>(subField.begin()),
+                    subField.size()*sizeof(bool),
+                    tag
+                );
+            }
+        }
+
+
+
+        // Set up 'send' to myself - write directly into recvFields
+
+        {
+            const labelList& map = constructMap_[Pstream::myProcNo()];
+
+            recvFields[Pstream::myProcNo()].setSize(map.size());
+            forAll(map, i)
+            {
+                label index = map[i];
+                if (constructHasFlip_)
+                {
+                    index = mag(index)-1;
+                }
+                recvFields[Pstream::myProcNo()][i] = elemIsUsed[index];
+            }
+        }
+
+
+        // Wait for all to finish
+
+        Pstream::waitRequests(startOfRequests);
+
+
+
+
+        // Work out which elements on the sending side are needed
+        {
+            oldToNewSub.setSize(localSize, -1);
+
+            boolList sendElemIsUsed(localSize, false);
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap_[domain];
+                forAll(map, i)
+                {
+                    if (recvFields[domain][i])
+                    {
+                        label index = map[i];
+                        if (subHasFlip_)
+                        {
+                            index = mag(index)-1;
+                        }
+                        sendElemIsUsed[index] = true;
+                    }
+                }
+            }
+
+            label newI = 0;
+            forAll(sendElemIsUsed, i)
+            {
+                if (sendElemIsUsed[i])
+                {
+                    oldToNewSub[i] = newI++;
+                }
+            }
+        }
+
+
+        // Compact out all submap entries that are referring to unused elements
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = subMap_[domain];
+
+            labelList newMap(map.size());
+            label newI = 0;
+
+            forAll(map, i)
+            {
+                if (recvFields[domain][i])
+                {
+                    // So element is used on destination side
+                    label index = map[i];
+                    label sign = 1;
+                    if (subHasFlip_)
+                    {
+                        if (index < 0)
+                        {
+                            sign = -1;
+                        }
+                        index = mag(index)-1;
+                    }
+                    label newIndex = oldToNewSub[index];
+                    if (subHasFlip_)
+                    {
+                        newIndex = sign*(newIndex+1);
+                    }
+                    newMap[newI++] = newIndex;
+                }
+            }
+            newMap.setSize(newI);
+            subMap_[domain].transfer(newMap);
+        }
+    }
+
+
+    // 2. remove from construct map - since end-result (element in elemIsUsed)
+    //    not used.
+
+
+    oldToNewConstruct.setSize(elemIsUsed.size(), -1);
+    constructSize_ = 0;
+    forAll(elemIsUsed, i)
+    {
+        if (elemIsUsed[i])
+        {
+            oldToNewConstruct[i] = constructSize_++;
+        }
+    }
+
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& map = constructMap_[domain];
+
+        labelList newMap(map.size());
+        label newI = 0;
+
+        forAll(map, i)
+        {
+            label destinationI = map[i];
+            label sign = 1;
+            if (constructHasFlip_)
+            {
+                if (destinationI < 0)
+                {
+                    sign = -1;
+                }
+                destinationI = mag(destinationI)-1;
+            }
+
+            // Is element is used on destination side
+            if (elemIsUsed[destinationI])
+            {
+                label newIndex = oldToNewConstruct[destinationI];
+                if (constructHasFlip_)
+                {
+                    newIndex = sign*(newIndex+1);
+                }
+                newMap[newI++] = newIndex;
+            }
+        }
+        newMap.setSize(newI);
+        constructMap_[domain].transfer(newMap);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
+{
+    // Check for assignment to self
+    if (this == &rhs)
+    {
+        FatalErrorInFunction
+            << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+    constructSize_ = rhs.constructSize_;
+    subMap_ = rhs.subMap_;
+    constructMap_ = rhs.constructMap_;
+    subHasFlip_ = rhs.subHasFlip_;
+    constructHasFlip_ = rhs.constructHasFlip_;
+    schedulePtr_.clear();
+}
+
+
+// * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map)
+{
+    is.fatalCheck("operator>>(Istream&, mapDistributeBase&)");
+
+    is  >> map.constructSize_ >> map.subMap_ >> map.constructMap_
+        >> map.subHasFlip_ >> map.constructHasFlip_;
+
+    return is;
+}
+
+
+// * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistributeBase& map)
+{
+    os  << map.constructSize_ << token::NL
+        << map.subMap_ << token::NL
+        << map.constructMap_ << token::NL
+        << map.subHasFlip_ << token::SPACE << map.constructHasFlip_
+        << token::NL;
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
new file mode 100644
index 0000000000..80be2a8b9e
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
@@ -0,0 +1,482 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::mapDistributeBase
+
+Description
+    Class containing processor-to-processor mapping information.
+
+    We store mapping from the bits-to-send to the complete starting list
+    (subXXXMap) and from the received bits to their location in the new
+    list (constructXXXMap).
+
+Note:
+    Schedule is a list of processor pairs (one send, one receive. One of
+    them will be myself) which forms a scheduled (i.e. non-buffered) exchange.
+    See distribute on how to use it.
+    Note2: number of items sent on one processor have to equal the number
+    of items received on the other processor.
+
+    To aid constructing these maps there are the constructors from global
+    numbering, either with or without transforms.
+
+    Constructors using compact numbering: layout is
+    - all my own elements first (whether used or not)
+    - followed by used-only remote elements sorted by remote processor.
+    So e.g 4 procs and on proc 1 the compact
+    table will first have all globalIndex.localSize() elements from proc1
+    followed by used-only elements of proc0, proc2, proc3.
+    The constructed mapDistributeBase sends the local elements from and
+    receives the remote elements into their compact position.
+    compactMap[procI] is the position of elements from procI in the compact
+    map. compactMap[myProcNo()] is empty since trivial addressing.
+
+    It rewrites the input global indices into indices into the constructed
+    data.
+
+    When constructing from components optionally a 'flip' on
+    the maps can be specified. This will interpret the map
+    values as index+flip, similar to e.g. faceProcAddressing. The flip
+    will only be applied to fieldTypes (scalar, vector, .. triad)
+
+
+SourceFiles
+    mapDistributeBase.C
+    mapDistributeBaseTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mapDistributeBase_H
+#define mapDistributeBase_H
+
+#include "labelList.H"
+#include "labelPair.H"
+#include "Pstream.H"
+#include "boolList.H"
+#include "Map.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class mapPolyMesh;
+class globalIndex;
+class PstreamBuffers;
+
+/*---------------------------------------------------------------------------*\
+                           Class mapDistributeBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class mapDistributeBase
+{
+protected:
+
+    // Protected data
+
+        //- Size of reconstructed data
+        label constructSize_;
+
+        //- Maps from subsetted data back to original data
+        labelListList subMap_;
+
+        //- Maps from subsetted data to new reconstructed data
+        labelListList constructMap_;
+
+        //- Whether subMap includes flip or not
+        bool subHasFlip_;
+
+        //- Whether constructMap includes flip or not
+        bool constructHasFlip_;
+
+
+        //- Schedule
+        mutable autoPtr<List<labelPair> > schedulePtr_;
+
+
+    // Private Member Functions
+
+        static void checkReceivedSize
+        (
+            const label procI,
+            const label expectedSize,
+            const label receivedSize
+        );
+
+        void calcCompactAddressing
+        (
+            const globalIndex& globalNumbering,
+            const labelList& elements,
+            List<Map<label> >& compactMap
+        ) const;
+        void calcCompactAddressing
+        (
+            const globalIndex& globalNumbering,
+            const labelListList& elements,
+            List<Map<label> >& compactMap
+        ) const;
+
+        void exchangeAddressing
+        (
+            const int tag,
+            const globalIndex& globalNumbering,
+            labelList& elements,
+            List<Map<label> >& compactMap,
+            labelList& compactStart
+        );
+        void exchangeAddressing
+        (
+            const int tag,
+            const globalIndex& globalNumbering,
+            labelListList& elements,
+            List<Map<label> >& compactMap,
+            labelList& compactStart
+        );
+
+        template<class T, class CombineOp, class negateOp>
+        static void flipAndCombine
+        (
+            const UList<label>& map,
+            const bool hasFlip,
+            const UList<T>& rhs,
+            const CombineOp& cop,
+            const negateOp& negOp,
+            List<T>& lhs
+        );
+
+        template<class T, class negateOp>
+        static T accessAndFlip
+        (
+            const UList<T>& fld,
+            const label index,
+            const bool hasFlip,
+            const negateOp& negOp
+        );
+
+public:
+
+    // Declare name of the class and its debug switch
+    ClassName("mapDistributeBase");
+
+
+    // Constructors
+
+        //- Construct null
+        mapDistributeBase();
+
+        //- Construct from components
+        mapDistributeBase
+        (
+            const label constructSize,
+            const Xfer<labelListList>& subMap,
+            const Xfer<labelListList>& constructMap,
+            const bool subHasFlip = false,
+            const bool constructHasFlip = false
+        );
+
+        //- Construct from reverse addressing: per data item the send
+        //  processor and the receive processor. (note: data is not stored
+        //  sorted per processor so cannot use printLayout).
+        mapDistributeBase
+        (
+            const labelList& sendProcs,
+            const labelList& recvProcs
+        );
+
+        //- Construct from list of (possibly) remote elements in globalIndex
+        //  numbering (or -1). Determines compact numbering (see above) and
+        //  distribute map to get data into this ordering and renumbers the
+        //  elements to be in compact numbering.
+        mapDistributeBase
+        (
+            const globalIndex&,
+            labelList& elements,
+            List<Map<label> >& compactMap,
+            const int tag = Pstream::msgType()
+        );
+
+        //- Special variant that works with the info sorted into bins
+        //  according to local indices. E.g. think cellCells where
+        //  cellCells[localCellI] is a list of global cells
+        mapDistributeBase
+        (
+            const globalIndex&,
+            labelListList& cellCells,
+            List<Map<label> >& compactMap,
+            const int tag = Pstream::msgType()
+        );
+
+        //- Construct by transferring parameter content
+        mapDistributeBase(const Xfer<mapDistributeBase>&);
+
+        //- Construct copy
+        mapDistributeBase(const mapDistributeBase&);
+
+        //- Construct from Istream
+        mapDistributeBase(Istream&);
+
+
+    // Member Functions
+
+        // Access
+
+            //- Constructed data size
+            label constructSize() const
+            {
+                return constructSize_;
+            }
+
+            //- Constructed data size
+            label& constructSize()
+            {
+                return constructSize_;
+            }
+
+            //- From subsetted data back to original data
+            const labelListList& subMap() const
+            {
+                return subMap_;
+            }
+
+            //- From subsetted data back to original data
+            labelListList& subMap()
+            {
+                return subMap_;
+            }
+
+            //- From subsetted data to new reconstructed data
+            const labelListList& constructMap() const
+            {
+                return constructMap_;
+            }
+
+            //- From subsetted data to new reconstructed data
+            labelListList& constructMap()
+            {
+                return constructMap_;
+            }
+
+            //- Does subMap include a sign
+            bool subHasFlip() const
+            {
+                return subHasFlip_;
+            }
+
+            //- Does subMap include a sign
+            bool& subHasFlip()
+            {
+                return subHasFlip_;
+            }
+
+            //- Does constructMap include a sign
+            bool constructHasFlip() const
+            {
+                return constructHasFlip_;
+            }
+
+            //- Does constructMap include a sign
+            bool& constructHasFlip()
+            {
+                return constructHasFlip_;
+            }
+
+            //- Calculate a schedule. See above.
+            static List<labelPair> schedule
+            (
+                const labelListList& subMap,
+                const labelListList& constructMap,
+                const int tag
+            );
+
+            //- Return a schedule. Demand driven. See above.
+            const List<labelPair>& schedule() const;
+
+
+        // Other
+
+            //- Transfer the contents of the argument and annul the argument.
+            void transfer(mapDistributeBase&);
+
+            //- Transfer contents to the Xfer container
+            Xfer<mapDistributeBase> xfer();
+
+            //- Helper for construct from globalIndex. Renumbers element
+            //  (in globalIndex numbering) into compact indices.
+            static label renumber
+            (
+                const globalIndex&,
+                const List<Map<label> >& compactMap,
+                const label globalElement
+            );
+
+            //- Compact maps. Gets per field a bool whether it is used (locally)
+            //  and works out itself what this side and sender side can remove
+            //  from maps. Only compacts non-local elements (i.e. the stuff
+            //  that gets sent over), does not change the local layout
+            void compact
+            (
+                const boolList& elemIsUsed,
+                const int tag = UPstream::msgType()
+            );
+
+            //- Compact all maps and layout. Returns compaction maps for
+            //  subMap and constructMap
+            void compact
+            (
+                const boolList& elemIsUsed,
+                const label localSize,            // max index for subMap
+                labelList& oldToNewSub,
+                labelList& oldToNewConstruct,
+                const int tag = UPstream::msgType()
+            );
+
+            //- Distribute data. Note:schedule only used for Pstream::scheduled
+            //  for now, all others just use send-to-all, receive-from-all.
+            template<class T, class negateOp>
+            static void distribute
+            (
+                const Pstream::commsTypes commsType,
+                const List<labelPair>& schedule,
+                const label constructSize,
+                const labelListList& subMap,
+                const bool subHasFlip,
+                const labelListList& constructMap,
+                const bool constructHasFlip,
+                List<T>&,
+                const negateOp& negOp,
+                const int tag = UPstream::msgType()
+            );
+
+            //- Distribute data. If multiple processors writing to same
+            //  position adds contributions using cop.
+            template<class T, class CombineOp, class negateOp>
+            static void distribute
+            (
+                const Pstream::commsTypes commsType,
+                const List<labelPair>& schedule,
+                const label constructSize,
+                const labelListList& subMap,
+                const bool subHasFlip,
+                const labelListList& constructMap,
+                const bool constructHasFlip,
+                List<T>&,
+                const CombineOp& cop,
+                const negateOp& negOp,
+                const T& nullValue,
+                const int tag = UPstream::msgType()
+            );
+
+            //- Distribute data using default commsType.
+            template<class T>
+            void distribute
+            (
+                List<T>& fld,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Distribute data using default commsType.
+            template<class T, class negateOp>
+            void distribute
+            (
+                List<T>& fld,
+                const negateOp& negOp,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Distribute data using default commsType.
+            template<class T>
+            void distribute
+            (
+                DynamicList<T>& fld,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Reverse distribute data using default commsType.
+            template<class T>
+            void reverseDistribute
+            (
+                const label constructSize,
+                List<T>&,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Reverse distribute data using default commsType.
+            //  Since constructSize might be larger than supplied size supply
+            //  a nullValue
+            template<class T>
+            void reverseDistribute
+            (
+                const label constructSize,
+                const T& nullValue,
+                List<T>& fld,
+                const int tag = UPstream::msgType()
+            ) const;
+
+            //- Do all sends using PstreamBuffers
+            template<class T>
+            void send(PstreamBuffers&, const List<T>&) const;
+            //- Do all receives using PstreamBuffers
+            template<class T>
+            void receive(PstreamBuffers&, List<T>&) const;
+
+            //- Debug: print layout. Can only be used on maps with sorted
+            //  storage (local data first, then non-local data)
+            void printLayout(Ostream& os) const;
+
+            //- Correct for topo change.
+            void updateMesh(const mapPolyMesh&)
+            {
+                NotImplemented;
+            }
+
+    // Member Operators
+
+        void operator=(const mapDistributeBase&);
+
+    // IOstream operators
+
+        //- Read dictionary from Istream
+        friend Istream& operator>>(Istream&, mapDistributeBase&);
+
+        //- Write dictionary to Ostream
+        friend Ostream& operator<<(Ostream&, const mapDistributeBase&);
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "mapDistributeBaseTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
new file mode 100644
index 0000000000..111424e589
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -0,0 +1,1368 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Pstream.H"
+#include "PstreamBuffers.H"
+#include "PstreamCombineReduceOps.H"
+#include "flipOp.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class T, class CombineOp, class negateOp>
+void Foam::mapDistributeBase::flipAndCombine
+(
+    const UList<label>& map,
+    const bool hasFlip,
+    const UList<T>& rhs,
+    const CombineOp& cop,
+    const negateOp& negOp,
+    List<T>& lhs
+)
+{
+    if (hasFlip)
+    {
+        forAll(map, i)
+        {
+            if (map[i] > 0)
+            {
+                label index = map[i]-1;
+                cop(lhs[index], rhs[i]);
+            }
+            else if (map[i] < 0)
+            {
+                label index = -map[i]-1;
+                cop(lhs[index], negOp(rhs[i]));
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "At index " << i << " out of " << map.size()
+                    << " have illegal index " << map[i]
+                    << " for field " << rhs.size() << " with flipMap"
+                    << exit(FatalError);
+            }
+        }
+    }
+    else
+    {
+        forAll(map, i)
+        {
+            cop(lhs[map[i]], rhs[i]);
+        }
+    }
+}
+
+
+template<class T, class negateOp>
+T Foam::mapDistributeBase::accessAndFlip
+(
+    const UList<T>& fld,
+    const label index,
+    const bool hasFlip,
+    const negateOp& negOp
+)
+{
+    T t;
+    if (hasFlip)
+    {
+        if (index > 0)
+        {
+            t = fld[index-1];
+        }
+        else if (index < 0)
+        {
+            t = negOp(fld[-index-1]);
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Illegal index " << index
+                << " into field of size " << fld.size()
+                << " with face-flipping"
+                << exit(FatalError);
+            t = fld[index];
+        }
+    }
+    else
+    {
+        t = fld[index];
+    }
+    return t;
+}
+
+
+// Distribute list.
+template<class T, class negateOp>
+void Foam::mapDistributeBase::distribute
+(
+    const Pstream::commsTypes commsType,
+    const List<labelPair>& schedule,
+    const label constructSize,
+    const labelListList& subMap,
+    const bool subHasFlip,
+    const labelListList& constructMap,
+    const bool constructHasFlip,
+    List<T>& field,
+    const negateOp& negOp,
+    const int tag
+)
+{
+    if (!Pstream::parRun())
+    {
+        // Do only me to me.
+
+        const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+        List<T> subField(mySubMap.size());
+        forAll(mySubMap, i)
+        {
+            subField[i] = accessAndFlip(field, mySubMap[i], subHasFlip, negOp);
+        }
+
+        // Receive sub field from myself (subField)
+        const labelList& map = constructMap[Pstream::myProcNo()];
+
+        field.setSize(constructSize);
+
+        flipAndCombine
+        (
+            map,
+            constructHasFlip,
+            subField,
+            eqOp<T>(),
+            negOp,
+            field
+        );
+
+        return;
+    }
+
+    if (commsType == Pstream::blocking)
+    {
+        // Since buffered sending can reuse the field to collect the
+        // received data.
+
+        // Send sub field to neighbour
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = subMap[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                OPstream toNbr(Pstream::blocking, domain, 0, tag);
+
+                List<T> subField(map.size());
+                forAll(subField, i)
+                {
+                    subField[i] = accessAndFlip
+                    (
+                        field,
+                        map[i],
+                        subHasFlip,
+                        negOp
+                    );
+                }
+                toNbr << subField;
+            }
+        }
+
+        // Subset myself
+        const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+        List<T> subField(mySubMap.size());
+        forAll(mySubMap, i)
+        {
+            subField[i] = accessAndFlip(field, mySubMap[i], subHasFlip, negOp);
+        }
+
+        // Receive sub field from myself (subField)
+        const labelList& map = constructMap[Pstream::myProcNo()];
+
+        field.setSize(constructSize);
+
+        flipAndCombine
+        (
+            map,
+            constructHasFlip,
+            subField,
+            eqOp<T>(),
+            negOp,
+            field
+        );
+
+        // Receive sub field from neighbour
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = constructMap[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                IPstream fromNbr(Pstream::blocking, domain, 0, tag);
+                List<T> subField(fromNbr);
+
+                checkReceivedSize(domain, map.size(), subField.size());
+
+                flipAndCombine
+                (
+                    map,
+                    constructHasFlip,
+                    subField,
+                    eqOp<T>(),
+                    negOp,
+                    field
+                );
+            }
+        }
+    }
+    else if (commsType == Pstream::scheduled)
+    {
+        // Need to make sure I don't overwrite field with received data
+        // since the data might need to be sent to another processor. So
+        // allocate a new field for the results.
+        List<T> newField(constructSize);
+
+        // Receive sub field from myself
+        {
+            const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+            List<T> subField(mySubMap.size());
+            forAll(subField, i)
+            {
+                subField[i] = accessAndFlip
+                (
+                    field,
+                    mySubMap[i],
+                    subHasFlip,
+                    negOp
+                );
+            }
+
+            // Receive sub field from myself (subField)
+            flipAndCombine
+            (
+                constructMap[Pstream::myProcNo()],
+                constructHasFlip,
+                subField,
+                eqOp<T>(),
+                negOp,
+                newField
+            );
+        }
+
+        // Schedule will already have pruned 0-sized comms
+        forAll(schedule, i)
+        {
+            const labelPair& twoProcs = schedule[i];
+            // twoProcs is a swap pair of processors. The first one is the
+            // one that needs to send first and then receive.
+
+            label sendProc = twoProcs[0];
+            label recvProc = twoProcs[1];
+
+            if (Pstream::myProcNo() == sendProc)
+            {
+                // I am send first, receive next
+                {
+                    OPstream toNbr(Pstream::scheduled, recvProc, 0, tag);
+
+                    const labelList& map = subMap[recvProc];
+                    List<T> subField(map.size());
+                    forAll(subField, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+                    toNbr << subField;
+                }
+                {
+                    IPstream fromNbr(Pstream::scheduled, recvProc, 0, tag);
+                    List<T> subField(fromNbr);
+
+                    const labelList& map = constructMap[recvProc];
+
+                    checkReceivedSize(recvProc, map.size(), subField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        subField,
+                        eqOp<T>(),
+                        negOp,
+                        newField
+                    );
+                }
+            }
+            else
+            {
+                // I am receive first, send next
+                {
+                    IPstream fromNbr(Pstream::scheduled, sendProc, 0, tag);
+                    List<T> subField(fromNbr);
+
+                    const labelList& map = constructMap[sendProc];
+
+                    checkReceivedSize(sendProc, map.size(), subField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        subField,
+                        eqOp<T>(),
+                        negOp,
+                        newField
+                    );
+                }
+                {
+                    OPstream toNbr(Pstream::scheduled, sendProc, 0, tag);
+
+                    const labelList& map = subMap[sendProc];
+                    List<T> subField(map.size());
+                    forAll(subField, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+                    toNbr << subField;
+                }
+            }
+        }
+        field.transfer(newField);
+    }
+    else if (commsType == Pstream::nonBlocking)
+    {
+        label nOutstanding = Pstream::nRequests();
+
+        if (!contiguous<T>())
+        {
+            PstreamBuffers pBufs(Pstream::nonBlocking, tag);
+
+            // Stream data into buffer
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    // Put data into send buffer
+                    UOPstream toDomain(domain, pBufs);
+
+                    List<T> subField(map.size());
+                    forAll(subField, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+                    toDomain << subField;
+                }
+            }
+
+            // Start receiving. Do not block.
+            pBufs.finishedSends(false);
+
+            {
+                // Set up 'send' to myself
+                const labelList& mySub = subMap[Pstream::myProcNo()];
+                List<T> mySubField(mySub.size());
+                forAll(mySub, i)
+                {
+                    mySubField[i] = accessAndFlip
+                    (
+                        field,
+                        mySub[i],
+                        subHasFlip,
+                        negOp
+                    );
+                }
+                // Combine bits. Note that can reuse field storage
+                field.setSize(constructSize);
+                // Receive sub field from myself
+                {
+                    const labelList& map = constructMap[Pstream::myProcNo()];
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        mySubField,
+                        eqOp<T>(),
+                        negOp,
+                        field
+                    );
+                }
+            }
+
+            // Block ourselves, waiting only for the current comms
+            Pstream::waitRequests(nOutstanding);
+
+            // Consume
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    UIPstream str(domain, pBufs);
+                    List<T> recvField(str);
+
+                    checkReceivedSize(domain, map.size(), recvField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        recvField,
+                        eqOp<T>(),
+                        negOp,
+                        field
+                    );
+                }
+            }
+        }
+        else
+        {
+            // Set up sends to neighbours
+
+            List<List<T > > sendFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    List<T>& subField = sendFields[domain];
+                    subField.setSize(map.size());
+                    forAll(map, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+
+                    OPstream::write
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<const char*>(subField.begin()),
+                        subField.byteSize(),
+                        tag
+                    );
+                }
+            }
+
+            // Set up receives from neighbours
+
+            List<List<T > > recvFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    recvFields[domain].setSize(map.size());
+                    IPstream::read
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<char*>(recvFields[domain].begin()),
+                        recvFields[domain].byteSize(),
+                        tag
+                    );
+                }
+            }
+
+
+            // Set up 'send' to myself
+
+            {
+                const labelList& map = subMap[Pstream::myProcNo()];
+
+                List<T>& subField = sendFields[Pstream::myProcNo()];
+                subField.setSize(map.size());
+                forAll(map, i)
+                {
+                    subField[i] = accessAndFlip
+                    (
+                        field,
+                        map[i],
+                        subHasFlip,
+                        negOp
+                    );
+                }
+            }
+
+
+            // Combine bits. Note that can reuse field storage
+
+            field.setSize(constructSize);
+
+
+            // Receive sub field from myself (sendFields[Pstream::myProcNo()])
+            {
+                const labelList& map = constructMap[Pstream::myProcNo()];
+                const List<T>& subField = sendFields[Pstream::myProcNo()];
+
+                flipAndCombine
+                (
+                    map,
+                    constructHasFlip,
+                    subField,
+                    eqOp<T>(),
+                    negOp,
+                    field
+                );
+            }
+
+
+            // Wait for all to finish
+
+            Pstream::waitRequests(nOutstanding);
+
+
+            // Collect neighbour fields
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    const List<T>& subField = recvFields[domain];
+
+                    checkReceivedSize(domain, map.size(), subField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        subField,
+                        eqOp<T>(),
+                        negOp,
+                        field
+                    );
+                }
+            }
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Unknown communication schedule " << commsType
+            << abort(FatalError);
+    }
+}
+
+
+// Distribute list.
+template<class T, class CombineOp, class negateOp>
+void Foam::mapDistributeBase::distribute
+(
+    const Pstream::commsTypes commsType,
+    const List<labelPair>& schedule,
+    const label constructSize,
+    const labelListList& subMap,
+    const bool subHasFlip,
+    const labelListList& constructMap,
+    const bool constructHasFlip,
+    List<T>& field,
+    const CombineOp& cop,
+    const negateOp& negOp,
+    const T& nullValue,
+    const int tag
+)
+{
+    if (!Pstream::parRun())
+    {
+        // Do only me to me.
+
+        const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+        List<T> subField(mySubMap.size());
+        forAll(mySubMap, i)
+        {
+            subField[i] = accessAndFlip(field, mySubMap[i], subHasFlip, negOp);
+        }
+
+        // Receive sub field from myself (subField)
+        const labelList& map = constructMap[Pstream::myProcNo()];
+
+        field.setSize(constructSize);
+        field = nullValue;
+
+        flipAndCombine(map, constructHasFlip, subField, cop, negOp, field);
+
+        return;
+    }
+
+    if (commsType == Pstream::blocking)
+    {
+        // Since buffered sending can reuse the field to collect the
+        // received data.
+
+        // Send sub field to neighbour
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = subMap[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                OPstream toNbr(Pstream::blocking, domain, 0, tag);
+                List<T> subField(map.size());
+                forAll(subField, i)
+                {
+                    subField[i] = accessAndFlip
+                    (
+                        field,
+                        map[i],
+                        subHasFlip,
+                        negOp
+                    );
+                }
+                toNbr << subField;
+            }
+        }
+
+        // Subset myself
+        const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+        List<T> subField(mySubMap.size());
+        forAll(mySubMap, i)
+        {
+            subField[i] = accessAndFlip(field, mySubMap[i], subHasFlip, negOp);
+        }
+
+        // Receive sub field from myself (subField)
+        const labelList& map = constructMap[Pstream::myProcNo()];
+
+        field.setSize(constructSize);
+        field = nullValue;
+
+        flipAndCombine(map, constructHasFlip, subField, cop, negOp, field);
+
+        // Receive sub field from neighbour
+        for (label domain = 0; domain < Pstream::nProcs(); domain++)
+        {
+            const labelList& map = constructMap[domain];
+
+            if (domain != Pstream::myProcNo() && map.size())
+            {
+                IPstream fromNbr(Pstream::blocking, domain, 0, tag);
+                List<T> subField(fromNbr);
+
+                checkReceivedSize(domain, map.size(), subField.size());
+
+                flipAndCombine
+                (
+                    map,
+                    constructHasFlip,
+                    subField,
+                    cop,
+                    negOp,
+                    field
+                );
+            }
+        }
+    }
+    else if (commsType == Pstream::scheduled)
+    {
+        // Need to make sure I don't overwrite field with received data
+        // since the data might need to be sent to another processor. So
+        // allocate a new field for the results.
+        List<T> newField(constructSize, nullValue);
+
+        {
+            const labelList& mySubMap = subMap[Pstream::myProcNo()];
+
+            // Subset myself
+            List<T> subField(mySubMap.size());
+            forAll(subField, i)
+            {
+                subField[i] = accessAndFlip
+                (
+                    field,
+                    mySubMap[i],
+                    subHasFlip,
+                    negOp
+                );
+            }
+
+            // Receive sub field from myself (subField)
+            const labelList& map = constructMap[Pstream::myProcNo()];
+
+            flipAndCombine
+            (
+                map,
+                constructHasFlip,
+                subField,
+                cop,
+                negOp,
+                newField
+            );
+        }
+
+
+        // Schedule will already have pruned 0-sized comms
+        forAll(schedule, i)
+        {
+            const labelPair& twoProcs = schedule[i];
+            // twoProcs is a swap pair of processors. The first one is the
+            // one that needs to send first and then receive.
+
+            label sendProc = twoProcs[0];
+            label recvProc = twoProcs[1];
+
+            if (Pstream::myProcNo() == sendProc)
+            {
+                // I am send first, receive next
+                {
+                    OPstream toNbr(Pstream::scheduled, recvProc, 0, tag);
+
+                    const labelList& map = subMap[recvProc];
+
+                    List<T> subField(map.size());
+                    forAll(subField, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+                    toNbr << subField;
+                }
+                {
+                    IPstream fromNbr(Pstream::scheduled, recvProc, 0, tag);
+                    List<T> subField(fromNbr);
+                    const labelList& map = constructMap[recvProc];
+
+                    checkReceivedSize(recvProc, map.size(), subField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        subField,
+                        cop,
+                        negOp,
+                        newField
+                    );
+                }
+            }
+            else
+            {
+                // I am receive first, send next
+                {
+                    IPstream fromNbr(Pstream::scheduled, sendProc, 0, tag);
+                    List<T> subField(fromNbr);
+                    const labelList& map = constructMap[sendProc];
+
+                    checkReceivedSize(sendProc, map.size(), subField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        subField,
+                        cop,
+                        negOp,
+                        newField
+                    );
+                }
+                {
+                    OPstream toNbr(Pstream::scheduled, sendProc, 0, tag);
+
+                    const labelList& map = subMap[sendProc];
+
+                    List<T> subField(map.size());
+                    forAll(subField, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+                    toNbr << subField;
+                }
+            }
+        }
+        field.transfer(newField);
+    }
+    else if (commsType == Pstream::nonBlocking)
+    {
+        label nOutstanding = Pstream::nRequests();
+
+        if (!contiguous<T>())
+        {
+            PstreamBuffers pBufs(Pstream::nonBlocking, tag);
+
+            // Stream data into buffer
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    // Put data into send buffer
+                    UOPstream toDomain(domain, pBufs);
+
+                    List<T> subField(map.size());
+                    forAll(subField, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+                    toDomain << subField;
+                }
+            }
+
+            // Start receiving. Do not block.
+            pBufs.finishedSends(false);
+
+            {
+                // Set up 'send' to myself
+                const labelList& myMap = subMap[Pstream::myProcNo()];
+
+                List<T> mySubField(myMap.size());
+                forAll(myMap, i)
+                {
+                    mySubField[i] = accessAndFlip
+                    (
+                        field,
+                        myMap[i],
+                        subHasFlip,
+                        negOp
+                    );
+                }
+
+                // Combine bits. Note that can reuse field storage
+                field.setSize(constructSize);
+                field = nullValue;
+                // Receive sub field from myself
+                {
+                    const labelList& map = constructMap[Pstream::myProcNo()];
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        mySubField,
+                        cop,
+                        negOp,
+                        field
+                    );
+                }
+            }
+
+            // Block ourselves, waiting only for the current comms
+            Pstream::waitRequests(nOutstanding);
+
+            // Consume
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    UIPstream str(domain, pBufs);
+                    List<T> recvField(str);
+
+                    checkReceivedSize(domain, map.size(), recvField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        recvField,
+                        cop,
+                        negOp,
+                        field
+                    );
+                }
+            }
+        }
+        else
+        {
+            // Set up sends to neighbours
+
+            List<List<T > > sendFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    List<T>& subField = sendFields[domain];
+                    subField.setSize(map.size());
+                    forAll(map, i)
+                    {
+                        subField[i] = accessAndFlip
+                        (
+                            field,
+                            map[i],
+                            subHasFlip,
+                            negOp
+                        );
+                    }
+
+                    OPstream::write
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<const char*>(subField.begin()),
+                        subField.size()*sizeof(T),
+                        tag
+                    );
+                }
+            }
+
+            // Set up receives from neighbours
+
+            List<List<T > > recvFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    recvFields[domain].setSize(map.size());
+                    UIPstream::read
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<char*>(recvFields[domain].begin()),
+                        recvFields[domain].size()*sizeof(T),
+                        tag
+                    );
+                }
+            }
+
+            // Set up 'send' to myself
+
+            {
+                const labelList& map = subMap[Pstream::myProcNo()];
+
+                List<T>& subField = sendFields[Pstream::myProcNo()];
+                subField.setSize(map.size());
+                forAll(map, i)
+                {
+                    subField[i] = accessAndFlip
+                    (
+                        field,
+                        map[i],
+                        subHasFlip,
+                        negOp
+                    );
+                }
+            }
+
+
+            // Combine bits. Note that can reuse field storage
+
+            field.setSize(constructSize);
+            field = nullValue;
+
+            // Receive sub field from myself (subField)
+            {
+                const labelList& map = constructMap[Pstream::myProcNo()];
+                const List<T>& subField = sendFields[Pstream::myProcNo()];
+
+                flipAndCombine
+                (
+                    map,
+                    constructHasFlip,
+                    subField,
+                    cop,
+                    negOp,
+                    field
+                );
+            }
+
+
+            // Wait for all to finish
+
+            Pstream::waitRequests(nOutstanding);
+
+
+            // Collect neighbour fields
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    const List<T>& subField = recvFields[domain];
+
+                    checkReceivedSize(domain, map.size(), subField.size());
+
+                    flipAndCombine
+                    (
+                        map,
+                        constructHasFlip,
+                        subField,
+                        cop,
+                        negOp,
+                        field
+                    );
+                }
+            }
+        }
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Unknown communication schedule " << commsType
+            << abort(FatalError);
+    }
+}
+
+
+template<class T>
+void Foam::mapDistributeBase::send(PstreamBuffers& pBufs, const List<T>& field)
+const
+{
+    // Stream data into buffer
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& map = subMap_[domain];
+
+        if (map.size())
+        {
+            // Put data into send buffer
+            UOPstream toDomain(domain, pBufs);
+
+            List<T> subField(map.size());
+            forAll(subField, i)
+            {
+                subField[i] = accessAndFlip
+                (
+                    field,
+                    map[i],
+                    subHasFlip_,
+                    flipOp()
+                );
+            }
+            toDomain << subField;
+        }
+    }
+
+    // Start sending and receiving but do not block.
+    pBufs.finishedSends(false);
+}
+
+
+template<class T>
+void Foam::mapDistributeBase::receive(PstreamBuffers& pBufs, List<T>& field)
+const
+{
+    // Consume
+    field.setSize(constructSize_);
+
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& map = constructMap_[domain];
+
+        if (map.size())
+        {
+            UIPstream str(domain, pBufs);
+            List<T> recvField(str);
+
+            if (recvField.size() != map.size())
+            {
+                FatalErrorInFunction
+                    << "Expected from processor " << domain
+                    << " " << map.size() << " but received "
+                    << recvField.size() << " elements."
+                    << abort(FatalError);
+            }
+
+            flipAndCombine
+            (
+                map,
+                constructHasFlip_,
+                recvField,
+                eqOp<T>(),
+                flipOp(),
+                field
+            );
+        }
+    }
+}
+
+
+//- Distribute data using default commsType.
+template<class T, class negateOp>
+void Foam::mapDistributeBase::distribute
+(
+    List<T>& fld,
+    const negateOp& negOp,
+    const int tag
+) const
+{
+    if (Pstream::defaultCommsType == Pstream::nonBlocking)
+    {
+        distribute
+        (
+            Pstream::nonBlocking,
+            List<labelPair>(),
+            constructSize_,
+            subMap_,
+            subHasFlip_,
+            constructMap_,
+            constructHasFlip_,
+            fld,
+            negOp,
+            tag
+        );
+    }
+    else if (Pstream::defaultCommsType == Pstream::scheduled)
+    {
+        distribute
+        (
+            Pstream::scheduled,
+            schedule(),
+            constructSize_,
+            subMap_,
+            subHasFlip_,
+            constructMap_,
+            constructHasFlip_,
+            fld,
+            negOp,
+            tag
+        );
+    }
+    else
+    {
+        distribute
+        (
+            Pstream::blocking,
+            List<labelPair>(),
+            constructSize_,
+            subMap_,
+            subHasFlip_,
+            constructMap_,
+            constructHasFlip_,
+            fld,
+            negOp,
+            tag
+        );
+    }
+}
+
+
+//- Distribute data using default commsType.
+template<class T>
+void Foam::mapDistributeBase::distribute
+(
+    List<T>& fld,
+    const int tag
+) const
+{
+    distribute(fld, flipOp(), tag);
+}
+
+
+//- Distribute data using default commsType.
+template<class T>
+void Foam::mapDistributeBase::distribute
+(
+    DynamicList<T>& fld,
+    const int tag
+) const
+{
+    fld.shrink();
+
+    List<T>& fldList = static_cast<List<T>& >(fld);
+
+    distribute(fldList, tag);
+
+    fld.setCapacity(fldList.size());
+}
+
+
+//- Reverse distribute data using default commsType.
+template<class T>
+void Foam::mapDistributeBase::reverseDistribute
+(
+    const label constructSize,
+    List<T>& fld,
+    const int tag
+) const
+{
+    if (Pstream::defaultCommsType == Pstream::nonBlocking)
+    {
+        distribute
+        (
+            Pstream::nonBlocking,
+            List<labelPair>(),
+            constructSize,
+            constructMap_,
+            constructHasFlip_,
+            subMap_,
+            subHasFlip_,
+            fld,
+            flipOp(),
+            tag
+        );
+    }
+    else if (Pstream::defaultCommsType == Pstream::scheduled)
+    {
+        distribute
+        (
+            Pstream::scheduled,
+            schedule(),
+            constructSize,
+            constructMap_,
+            constructHasFlip_,
+            subMap_,
+            subHasFlip_,
+            fld,
+            flipOp(),
+            tag
+        );
+    }
+    else
+    {
+        distribute
+        (
+            Pstream::blocking,
+            List<labelPair>(),
+            constructSize,
+            constructMap_,
+            constructHasFlip_,
+            subMap_,
+            subHasFlip_,
+            fld,
+            flipOp(),
+            tag
+        );
+    }
+}
+
+
+//- Reverse distribute data using default commsType.
+//  Since constructSize might be larger than supplied size supply
+//  a nullValue
+template<class T>
+void Foam::mapDistributeBase::reverseDistribute
+(
+    const label constructSize,
+    const T& nullValue,
+    List<T>& fld,
+    const int tag
+) const
+{
+    if (Pstream::defaultCommsType == Pstream::nonBlocking)
+    {
+        distribute
+        (
+            Pstream::nonBlocking,
+            List<labelPair>(),
+            constructSize,
+            constructMap_,
+            constructHasFlip_,
+            subMap_,
+            subHasFlip_,
+            fld,
+            eqOp<T>(),
+            flipOp(),
+            nullValue,
+            tag
+        );
+    }
+    else if (Pstream::defaultCommsType == Pstream::scheduled)
+    {
+        distribute
+        (
+            Pstream::scheduled,
+            schedule(),
+            constructSize,
+            constructMap_,
+            constructHasFlip_,
+            subMap_,
+            subHasFlip_,
+            fld,
+            eqOp<T>(),
+            flipOp(),
+            nullValue,
+            tag
+        );
+    }
+    else
+    {
+        distribute
+        (
+            Pstream::blocking,
+            List<labelPair>(),
+            constructSize,
+            constructMap_,
+            constructHasFlip_,
+            subMap_,
+            subHasFlip_,
+            fld,
+            eqOp<T>(),
+            flipOp(),
+            nullValue,
+            tag
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
index 23daa35db9..6bce7d6ccd 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
@@ -106,10 +106,7 @@ public:
             //- Correct for topo change.
             void updateMesh(const mapPolyMesh&)
             {
-                notImplemented
-                (
-                    "mapDistributeLagrangian::updateMesh(const mapPolyMesh&)"
-                );
+                NotImplemented;
             }
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
index 0dc63bdb57..48f2830b65 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,37 +26,53 @@ License
 #include "mapDistributePolyMesh.H"
 #include "polyMesh.H"
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::mapDistributePolyMesh::calcPatchSizes()
 {
     oldPatchSizes_.setSize(oldPatchStarts_.size());
 
-    // Calculate old patch sizes
-    for (label patchI = 0; patchI < oldPatchStarts_.size() - 1; patchI++)
+    if (oldPatchStarts_.size())
     {
-        oldPatchSizes_[patchI] =
-            oldPatchStarts_[patchI + 1] - oldPatchStarts_[patchI];
-    }
+        // Calculate old patch sizes
+        for (label patchI = 0; patchI < oldPatchStarts_.size() - 1; patchI++)
+        {
+            oldPatchSizes_[patchI] =
+                oldPatchStarts_[patchI + 1] - oldPatchStarts_[patchI];
+        }
 
-    // Set the last one by hand
-    const label lastPatchID = oldPatchStarts_.size() - 1;
+        // Set the last one by hand
+        const label lastPatchID = oldPatchStarts_.size() - 1;
 
-    oldPatchSizes_[lastPatchID] = nOldFaces_ - oldPatchStarts_[lastPatchID];
+        oldPatchSizes_[lastPatchID] = nOldFaces_ - oldPatchStarts_[lastPatchID];
 
-    if (min(oldPatchSizes_) < 0)
-    {
-        FatalErrorIn("mapDistributePolyMesh::calcPatchSizes()")
-            << "Calculated negative old patch size:" << oldPatchSizes_ << nl
-            << "Error in mapping data" << abort(FatalError);
+        if (min(oldPatchSizes_) < 0)
+        {
+            FatalErrorInFunction
+                << "Calculated negative old patch size:" << oldPatchSizes_ << nl
+                << "Error in mapping data" << abort(FatalError);
+        }
     }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct from components
+Foam::mapDistributePolyMesh::mapDistributePolyMesh()
+:
+    nOldPoints_(0),
+    nOldFaces_(0),
+    nOldCells_(0),
+    oldPatchSizes_(0),
+    oldPatchStarts_(0),
+    oldPatchNMeshPoints_(0),
+    pointMap_(),
+    faceMap_(),
+    cellMap_(),
+    patchMap_()
+{}
+
+
 Foam::mapDistributePolyMesh::mapDistributePolyMesh
 (
     const polyMesh& mesh,
@@ -78,10 +94,12 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     const Xfer<labelListList>& constructPointMap,
     const Xfer<labelListList>& constructFaceMap,
     const Xfer<labelListList>& constructCellMap,
-    const Xfer<labelListList>& constructPatchMap
+    const Xfer<labelListList>& constructPatchMap,
+
+    const bool subFaceHasFlip,
+    const bool constructFaceHasFlip
 )
 :
-    mesh_(mesh),
     nOldPoints_(nOldPoints),
     nOldFaces_(nOldFaces),
     nOldCells_(nOldCells),
@@ -89,7 +107,14 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     oldPatchStarts_(oldPatchStarts),
     oldPatchNMeshPoints_(oldPatchNMeshPoints),
     pointMap_(mesh.nPoints(), subPointMap, constructPointMap),
-    faceMap_(mesh.nFaces(), subFaceMap, constructFaceMap),
+    faceMap_
+    (
+        mesh.nFaces(),
+        subFaceMap,
+        constructFaceMap,
+        subFaceHasFlip,
+        constructFaceHasFlip
+    ),
     cellMap_(mesh.nCells(), subCellMap, constructCellMap),
     patchMap_(mesh.boundaryMesh().size(), subPatchMap, constructPatchMap)
 {
@@ -97,8 +122,84 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 }
 
 
+Foam::mapDistributePolyMesh::mapDistributePolyMesh
+(
+    // mesh before changes
+    const label nOldPoints,
+    const label nOldFaces,
+    const label nOldCells,
+    const Xfer<labelList>& oldPatchStarts,
+    const Xfer<labelList>& oldPatchNMeshPoints,
+
+    // how to transfer pieces of mesh
+    const Xfer<mapDistribute>& pointMap,
+    const Xfer<mapDistribute>& faceMap,
+    const Xfer<mapDistribute>& cellMap,
+    const Xfer<mapDistribute>& patchMap
+)
+:
+    nOldPoints_(nOldPoints),
+    nOldFaces_(nOldFaces),
+    nOldCells_(nOldCells),
+    oldPatchSizes_(oldPatchStarts().size()),
+    oldPatchStarts_(oldPatchStarts),
+    oldPatchNMeshPoints_(oldPatchNMeshPoints),
+    pointMap_(pointMap),
+    faceMap_(faceMap),
+    cellMap_(cellMap),
+    patchMap_(patchMap)
+{
+    calcPatchSizes();
+}
+
+
+Foam::mapDistributePolyMesh::mapDistributePolyMesh
+(
+    const Xfer<mapDistributePolyMesh>& map
+)
+:
+    nOldPoints_(map().nOldPoints_),
+    nOldFaces_(map().nOldFaces_),
+    nOldCells_(map().nOldCells_),
+    oldPatchSizes_(map().oldPatchSizes_.xfer()),
+    oldPatchStarts_(map().oldPatchStarts_.xfer()),
+    oldPatchNMeshPoints_(map().oldPatchNMeshPoints_.xfer()),
+    pointMap_(map().pointMap_.xfer()),
+    faceMap_(map().faceMap_.xfer()),
+    cellMap_(map().cellMap_.xfer()),
+    patchMap_(map().patchMap_.xfer())
+{}
+
+
+Foam::mapDistributePolyMesh::mapDistributePolyMesh(Istream& is)
+{
+    is  >> *this;
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::mapDistributePolyMesh::transfer(mapDistributePolyMesh& rhs)
+{
+    nOldPoints_ = rhs.nOldPoints_;
+    nOldFaces_ = rhs.nOldFaces_;
+    nOldCells_ = rhs.nOldCells_;
+    oldPatchSizes_.transfer(rhs.oldPatchSizes_);
+    oldPatchStarts_.transfer(rhs.oldPatchStarts_);
+    oldPatchNMeshPoints_.transfer(rhs.oldPatchNMeshPoints_);
+    pointMap_.transfer(rhs.pointMap_);
+    faceMap_.transfer(rhs.faceMap_);
+    cellMap_.transfer(rhs.cellMap_);
+    patchMap_.transfer(rhs.patchMap_);
+}
+
+
+Foam::Xfer<Foam::mapDistributePolyMesh> Foam::mapDistributePolyMesh::xfer()
+{
+    return xferMove(*this);
+}
+
+
 void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
@@ -187,10 +288,61 @@ void Foam::mapDistributePolyMesh::distributePatchIndices(labelList& lst) const
 }
 
 
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs)
+{
+    nOldPoints_ = rhs.nOldPoints_;
+    nOldFaces_ = rhs.nOldFaces_;
+    nOldCells_ = rhs.nOldCells_;
+    oldPatchSizes_ = rhs.oldPatchSizes_;
+    oldPatchStarts_ = rhs.oldPatchStarts_;
+    oldPatchNMeshPoints_ = rhs.oldPatchNMeshPoints_;
+    pointMap_ = rhs.pointMap_;
+    faceMap_ = rhs.faceMap_;
+    cellMap_ = rhs.cellMap_;
+    patchMap_ = rhs.patchMap_;
+}
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map)
+{
+    is.fatalCheck("operator>>(Istream&, mapDistributePolyMesh&)");
+
+    is  >> map.nOldPoints_
+        >> map.nOldFaces_
+        >> map.nOldCells_
+        >> map.oldPatchSizes_
+        >> map.oldPatchStarts_
+        >> map.oldPatchNMeshPoints_
+        >> map.pointMap_
+        >> map.faceMap_
+        >> map.cellMap_
+        >> map.patchMap_;
+
+    return is;
+}
+
+
+// * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistributePolyMesh& map)
+{
+    os  << map.nOldPoints_
+        << token::SPACE << map.nOldFaces_
+        << token::SPACE << map.nOldCells_ << token::NL
+        << map.oldPatchSizes_ << token::NL
+        << map.oldPatchStarts_ << token::NL
+        << map.oldPatchNMeshPoints_ << token::NL
+        << map.pointMap_ << token::NL
+        << map.faceMap_ << token::NL
+        << map.cellMap_ << token::NL
+        << map.patchMap_;
+
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
index 5429e75730..2f4f3f5a5c 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,46 +52,43 @@ class mapPolyMesh;
 class polyMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class mapDistributePolyMesh Declaration
+                     Class mapDistributePolyMesh Declaration
 \*---------------------------------------------------------------------------*/
 
 class mapDistributePolyMesh
 {
     // Private data
 
-        const polyMesh& mesh_;
-
         //- Number of old live points
-        const label nOldPoints_;
+        label nOldPoints_;
 
         //- Number of old live faces
-        const label nOldFaces_;
+        label nOldFaces_;
 
         //- Number of old live cells
-        const label nOldCells_;
+        label nOldCells_;
 
         //- List of the old patch sizes
         labelList oldPatchSizes_;
 
         //- List of the old patch start labels
-        const labelList oldPatchStarts_;
+        labelList oldPatchStarts_;
 
         //- List of numbers of mesh points per old patch
-        const labelList oldPatchNMeshPoints_;
+        labelList oldPatchNMeshPoints_;
 
 
         //- Point distribute map
-        const mapDistribute pointMap_;
+        mapDistribute pointMap_;
 
         //- Face distribute map
-        const mapDistribute faceMap_;
+        mapDistribute faceMap_;
 
         //- Cell distribute map
-        const mapDistribute cellMap_;
+        mapDistribute cellMap_;
 
         //- Patch distribute map
-        const mapDistribute patchMap_;
-
+        mapDistribute patchMap_;
 
 
     // Private Member Functions
@@ -101,14 +98,14 @@ class mapDistributePolyMesh
         //- Disallow default bitwise copy construct
         mapDistributePolyMesh(const mapDistributePolyMesh&);
 
-        //- Disallow default bitwise assignment
-        void operator=(const mapDistributePolyMesh&);
-
 
 public:
 
     // Constructors
 
+        //- Construct null
+        mapDistributePolyMesh();
+
         //- Construct from components. Note that mesh has to be changed already
         //  since uses mesh.nPoints etc as the new size.
         mapDistributePolyMesh
@@ -132,19 +129,40 @@ public:
             const Xfer<labelListList>& constructPointMap,
             const Xfer<labelListList>& constructFaceMap,
             const Xfer<labelListList>& constructCellMap,
-            const Xfer<labelListList>& constructPatchMap
+            const Xfer<labelListList>& constructPatchMap,
+
+            const bool subFaceHasFlip = false,
+            const bool constructFaceHasFlip = false
         );
 
+        //- Construct from components
+        mapDistributePolyMesh
+        (
+            // mesh before changes
+            const label nOldPoints,
+            const label nOldFaces,
+            const label nOldCells,
+            const Xfer<labelList>& oldPatchStarts,
+            const Xfer<labelList>& oldPatchNMeshPoints,
+
+            // how to subset pieces of mesh to send across
+            const Xfer<mapDistribute>& pointMap,
+            const Xfer<mapDistribute>& faceMap,
+            const Xfer<mapDistribute>& cellMap,
+            const Xfer<mapDistribute>& patchMap
+        );
+
+        //- Construct by transferring parameter content
+        mapDistributePolyMesh(const Xfer<mapDistributePolyMesh>&);
+
+        //- Construct from Istream
+        mapDistributePolyMesh(Istream&);
+
 
     // Member Functions
 
         // Access
 
-            const polyMesh& mesh() const
-            {
-                return mesh_;
-            }
-
             //- Number of points in mesh before distribution
             label nOldPoints() const
             {
@@ -206,7 +224,13 @@ public:
             }
 
 
-        // Edit
+        // Other
+
+            //- Transfer the contents of the argument and annul the argument.
+            void transfer(mapDistributePolyMesh&);
+
+            //- Transfer contents to the Xfer container
+            Xfer<mapDistributePolyMesh> xfer();
 
             //- Distribute list of point data
             template<class T>
@@ -249,11 +273,21 @@ public:
             //- Correct for topo change.
             void updateMesh(const mapPolyMesh&)
             {
-                notImplemented
-                (
-                    "mapDistributePolyMesh::updateMesh(const mapPolyMesh&)"
-                );
+                NotImplemented;
             }
+
+    // Member operators
+
+        void operator=(const mapDistributePolyMesh&);
+
+
+    // IOstream operators
+
+        //- Read dictionary from Istream
+        friend Istream& operator>>(Istream&, mapDistributePolyMesh&);
+
+        //- Write dictionary to Ostream
+        friend Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
 };
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 577af21ed1..911529730b 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,768 +28,10 @@ License
 #include "PstreamCombineReduceOps.H"
 #include "globalIndexAndTransform.H"
 #include "transformField.H"
+#include "flipOp.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Distribute list.
-template<class T>
-void Foam::mapDistribute::distribute
-(
-    const Pstream::commsTypes commsType,
-    const List<labelPair>& schedule,
-    const label constructSize,
-    const labelListList& subMap,
-    const labelListList& constructMap,
-    List<T>& field,
-    const int tag
-)
-{
-    if (!Pstream::parRun())
-    {
-        // Do only me to me.
-
-        const labelList& mySubMap = subMap[Pstream::myProcNo()];
-
-        List<T> subField(mySubMap.size());
-        forAll(mySubMap, i)
-        {
-            subField[i] = field[mySubMap[i]];
-        }
-
-        // Receive sub field from myself (subField)
-        const labelList& map = constructMap[Pstream::myProcNo()];
-
-        field.setSize(constructSize);
-
-        forAll(map, i)
-        {
-            field[map[i]] = subField[i];
-        }
-        return;
-    }
-
-    if (commsType == Pstream::blocking)
-    {
-        // Since buffered sending can reuse the field to collect the
-        // received data.
-
-        // Send sub field to neighbour
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = subMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                OPstream toNbr(Pstream::blocking, domain, 0, tag);
-                toNbr << UIndirectList<T>(field, map);
-            }
-        }
-
-        // Subset myself
-        const labelList& mySubMap = subMap[Pstream::myProcNo()];
-
-        List<T> subField(mySubMap.size());
-        forAll(mySubMap, i)
-        {
-            subField[i] = field[mySubMap[i]];
-        }
-
-        // Receive sub field from myself (subField)
-        const labelList& map = constructMap[Pstream::myProcNo()];
-
-        field.setSize(constructSize);
-
-        forAll(map, i)
-        {
-            field[map[i]] = subField[i];
-        }
-
-        // Receive sub field from neighbour
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                IPstream fromNbr(Pstream::blocking, domain, 0, tag);
-                List<T> subField(fromNbr);
-
-                checkReceivedSize(domain, map.size(), subField.size());
-
-                forAll(map, i)
-                {
-                    field[map[i]] = subField[i];
-                }
-            }
-        }
-    }
-    else if (commsType == Pstream::scheduled)
-    {
-        // Need to make sure I don't overwrite field with received data
-        // since the data might need to be sent to another processor. So
-        // allocate a new field for the results.
-        List<T> newField(constructSize);
-
-        // Subset myself
-        UIndirectList<T> subField(field, subMap[Pstream::myProcNo()]);
-
-        // Receive sub field from myself (subField)
-        const labelList& map = constructMap[Pstream::myProcNo()];
-
-        forAll(map, i)
-        {
-            newField[map[i]] = subField[i];
-        }
-
-        // Schedule will already have pruned 0-sized comms
-        forAll(schedule, i)
-        {
-            const labelPair& twoProcs = schedule[i];
-            // twoProcs is a swap pair of processors. The first one is the
-            // one that needs to send first and then receive.
-
-            label sendProc = twoProcs[0];
-            label recvProc = twoProcs[1];
-
-            if (Pstream::myProcNo() == sendProc)
-            {
-                // I am send first, receive next
-                {
-                    OPstream toNbr(Pstream::scheduled, recvProc, 0, tag);
-                    toNbr << UIndirectList<T>(field, subMap[recvProc]);
-                }
-                {
-                    IPstream fromNbr(Pstream::scheduled, recvProc, 0, tag);
-                    List<T> subField(fromNbr);
-
-                    const labelList& map = constructMap[recvProc];
-
-                    checkReceivedSize(recvProc, map.size(), subField.size());
-
-                    forAll(map, i)
-                    {
-                        newField[map[i]] = subField[i];
-                    }
-                }
-            }
-            else
-            {
-                // I am receive first, send next
-                {
-                    IPstream fromNbr(Pstream::scheduled, sendProc, 0, tag);
-                    List<T> subField(fromNbr);
-
-                    const labelList& map = constructMap[sendProc];
-
-                    checkReceivedSize(sendProc, map.size(), subField.size());
-
-                    forAll(map, i)
-                    {
-                        newField[map[i]] = subField[i];
-                    }
-                }
-                {
-                    OPstream toNbr(Pstream::scheduled, sendProc, 0, tag);
-                    toNbr << UIndirectList<T>(field, subMap[sendProc]);
-                }
-            }
-        }
-        field.transfer(newField);
-    }
-    else if (commsType == Pstream::nonBlocking)
-    {
-        label nOutstanding = Pstream::nRequests();
-
-        if (!contiguous<T>())
-        {
-            PstreamBuffers pBufs(Pstream::nonBlocking, tag);
-
-            // Stream data into buffer
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = subMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    // Put data into send buffer
-                    UOPstream toDomain(domain, pBufs);
-                    toDomain << UIndirectList<T>(field, map);
-                }
-            }
-
-            // Start receiving. Do not block.
-            pBufs.finishedSends(false);
-
-            {
-                // Set up 'send' to myself
-                const labelList& mySubMap = subMap[Pstream::myProcNo()];
-                List<T> mySubField(mySubMap.size());
-                forAll(mySubMap, i)
-                {
-                    mySubField[i] = field[mySubMap[i]];
-                }
-                // Combine bits. Note that can reuse field storage
-                field.setSize(constructSize);
-                // Receive sub field from myself
-                {
-                    const labelList& map = constructMap[Pstream::myProcNo()];
-
-                    forAll(map, i)
-                    {
-                        field[map[i]] = mySubField[i];
-                    }
-                }
-            }
-
-            // Block ourselves, waiting only for the current comms
-            Pstream::waitRequests(nOutstanding);
-
-            // Consume
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = constructMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    UIPstream str(domain, pBufs);
-                    List<T> recvField(str);
-
-                    checkReceivedSize(domain, map.size(), recvField.size());
-
-                    forAll(map, i)
-                    {
-                        field[map[i]] = recvField[i];
-                    }
-                }
-            }
-        }
-        else
-        {
-            // Set up sends to neighbours
-
-            List<List<T > > sendFields(Pstream::nProcs());
-
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = subMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    List<T>& subField = sendFields[domain];
-                    subField.setSize(map.size());
-                    forAll(map, i)
-                    {
-                        subField[i] = field[map[i]];
-                    }
-
-                    OPstream::write
-                    (
-                        Pstream::nonBlocking,
-                        domain,
-                        reinterpret_cast<const char*>(subField.begin()),
-                        subField.byteSize(),
-                        tag
-                    );
-                }
-            }
-
-            // Set up receives from neighbours
-
-            List<List<T > > recvFields(Pstream::nProcs());
-
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = constructMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    recvFields[domain].setSize(map.size());
-                    IPstream::read
-                    (
-                        Pstream::nonBlocking,
-                        domain,
-                        reinterpret_cast<char*>(recvFields[domain].begin()),
-                        recvFields[domain].byteSize(),
-                        tag
-                    );
-                }
-            }
-
-
-            // Set up 'send' to myself
-
-            {
-                const labelList& map = subMap[Pstream::myProcNo()];
-
-                List<T>& subField = sendFields[Pstream::myProcNo()];
-                subField.setSize(map.size());
-                forAll(map, i)
-                {
-                    subField[i] = field[map[i]];
-                }
-            }
-
-
-            // Combine bits. Note that can reuse field storage
-
-            field.setSize(constructSize);
-
-
-            // Receive sub field from myself (sendFields[Pstream::myProcNo()])
-            {
-                const labelList& map = constructMap[Pstream::myProcNo()];
-                const List<T>& subField = sendFields[Pstream::myProcNo()];
-
-                forAll(map, i)
-                {
-                    field[map[i]] = subField[i];
-                }
-            }
-
-
-            // Wait for all to finish
-
-            Pstream::waitRequests(nOutstanding);
-
-
-            // Collect neighbour fields
-
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = constructMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    const List<T>& subField = recvFields[domain];
-
-                    checkReceivedSize(domain, map.size(), subField.size());
-
-                    forAll(map, i)
-                    {
-                        field[map[i]] = subField[i];
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        FatalErrorIn("mapDistribute::distribute(..)")
-            << "Unknown communication schedule " << commsType
-            << abort(FatalError);
-    }
-}
-
-
-// Distribute list.
-template<class T, class CombineOp>
-void Foam::mapDistribute::distribute
-(
-    const Pstream::commsTypes commsType,
-    const List<labelPair>& schedule,
-    const label constructSize,
-    const labelListList& subMap,
-    const labelListList& constructMap,
-    List<T>& field,
-    const CombineOp& cop,
-    const T& nullValue,
-    const int tag
-)
-{
-    if (!Pstream::parRun())
-    {
-        // Do only me to me.
-
-        const labelList& mySubMap = subMap[Pstream::myProcNo()];
-
-        List<T> subField(mySubMap.size());
-        forAll(mySubMap, i)
-        {
-            subField[i] = field[mySubMap[i]];
-        }
-
-        // Receive sub field from myself (subField)
-        const labelList& map = constructMap[Pstream::myProcNo()];
-
-        field.setSize(constructSize);
-        field = nullValue;
-
-        forAll(map, i)
-        {
-            cop(field[map[i]], subField[i]);
-        }
-        return;
-    }
-
-    if (commsType == Pstream::blocking)
-    {
-        // Since buffered sending can reuse the field to collect the
-        // received data.
-
-        // Send sub field to neighbour
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = subMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                OPstream toNbr(Pstream::blocking, domain, 0, tag);
-                toNbr << UIndirectList<T>(field, map);
-            }
-        }
-
-        // Subset myself
-        const labelList& mySubMap = subMap[Pstream::myProcNo()];
-
-        List<T> subField(mySubMap.size());
-        forAll(mySubMap, i)
-        {
-            subField[i] = field[mySubMap[i]];
-        }
-
-        // Receive sub field from myself (subField)
-        const labelList& map = constructMap[Pstream::myProcNo()];
-
-        field.setSize(constructSize);
-        field = nullValue;
-
-        forAll(map, i)
-        {
-            cop(field[map[i]], subField[i]);
-        }
-
-        // Receive sub field from neighbour
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                IPstream fromNbr(Pstream::blocking, domain, 0, tag);
-                List<T> subField(fromNbr);
-
-                checkReceivedSize(domain, map.size(), subField.size());
-
-                forAll(map, i)
-                {
-                    cop(field[map[i]], subField[i]);
-                }
-            }
-        }
-    }
-    else if (commsType == Pstream::scheduled)
-    {
-        // Need to make sure I don't overwrite field with received data
-        // since the data might need to be sent to another processor. So
-        // allocate a new field for the results.
-        List<T> newField(constructSize, nullValue);
-
-        // Subset myself
-        UIndirectList<T> subField(field, subMap[Pstream::myProcNo()]);
-
-        // Receive sub field from myself (subField)
-        const labelList& map = constructMap[Pstream::myProcNo()];
-
-        forAll(map, i)
-        {
-            cop(newField[map[i]], subField[i]);
-        }
-
-        // Schedule will already have pruned 0-sized comms
-        forAll(schedule, i)
-        {
-            const labelPair& twoProcs = schedule[i];
-            // twoProcs is a swap pair of processors. The first one is the
-            // one that needs to send first and then receive.
-
-            label sendProc = twoProcs[0];
-            label recvProc = twoProcs[1];
-
-            if (Pstream::myProcNo() == sendProc)
-            {
-                // I am send first, receive next
-                {
-                    OPstream toNbr(Pstream::scheduled, recvProc, 0, tag);
-                    toNbr << UIndirectList<T>(field, subMap[recvProc]);
-                }
-                {
-                    IPstream fromNbr(Pstream::scheduled, recvProc, 0, tag);
-                    List<T> subField(fromNbr);
-                    const labelList& map = constructMap[recvProc];
-
-                    checkReceivedSize(recvProc, map.size(), subField.size());
-
-                    forAll(map, i)
-                    {
-                        cop(newField[map[i]], subField[i]);
-                    }
-                }
-            }
-            else
-            {
-                // I am receive first, send next
-                {
-                    IPstream fromNbr(Pstream::scheduled, sendProc, 0, tag);
-                    List<T> subField(fromNbr);
-                    const labelList& map = constructMap[sendProc];
-
-                    checkReceivedSize(sendProc, map.size(), subField.size());
-
-                    forAll(map, i)
-                    {
-                        cop(newField[map[i]], subField[i]);
-                    }
-                }
-                {
-                    OPstream toNbr(Pstream::scheduled, sendProc, 0, tag);
-                    toNbr << UIndirectList<T>(field, subMap[sendProc]);
-                }
-            }
-        }
-        field.transfer(newField);
-    }
-    else if (commsType == Pstream::nonBlocking)
-    {
-        label nOutstanding = Pstream::nRequests();
-
-        if (!contiguous<T>())
-        {
-            PstreamBuffers pBufs(Pstream::nonBlocking, tag);
-
-            // Stream data into buffer
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = subMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    // Put data into send buffer
-                    UOPstream toDomain(domain, pBufs);
-                    toDomain << UIndirectList<T>(field, map);
-                }
-            }
-
-            // Start receiving. Do not block.
-            pBufs.finishedSends(false);
-
-            {
-                // Set up 'send' to myself
-                List<T> mySubField(field, subMap[Pstream::myProcNo()]);
-                // Combine bits. Note that can reuse field storage
-                field.setSize(constructSize);
-                field = nullValue;
-                // Receive sub field from myself
-                {
-                    const labelList& map = constructMap[Pstream::myProcNo()];
-
-                    forAll(map, i)
-                    {
-                        cop(field[map[i]], mySubField[i]);
-                    }
-                }
-            }
-
-            // Block ourselves, waiting only for the current comms
-            Pstream::waitRequests(nOutstanding);
-
-            // Consume
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = constructMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    UIPstream str(domain, pBufs);
-                    List<T> recvField(str);
-
-                    checkReceivedSize(domain, map.size(), recvField.size());
-
-                    forAll(map, i)
-                    {
-                        cop(field[map[i]], recvField[i]);
-                    }
-                }
-            }
-        }
-        else
-        {
-            // Set up sends to neighbours
-
-            List<List<T > > sendFields(Pstream::nProcs());
-
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = subMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    List<T>& subField = sendFields[domain];
-                    subField.setSize(map.size());
-                    forAll(map, i)
-                    {
-                        subField[i] = field[map[i]];
-                    }
-
-                    OPstream::write
-                    (
-                        Pstream::nonBlocking,
-                        domain,
-                        reinterpret_cast<const char*>(subField.begin()),
-                        subField.size()*sizeof(T),
-                        tag
-                    );
-                }
-            }
-
-            // Set up receives from neighbours
-
-            List<List<T > > recvFields(Pstream::nProcs());
-
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = constructMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    recvFields[domain].setSize(map.size());
-                    UIPstream::read
-                    (
-                        Pstream::nonBlocking,
-                        domain,
-                        reinterpret_cast<char*>(recvFields[domain].begin()),
-                        recvFields[domain].size()*sizeof(T),
-                        tag
-                    );
-                }
-            }
-
-            // Set up 'send' to myself
-
-            {
-                const labelList& map = subMap[Pstream::myProcNo()];
-
-                List<T>& subField = sendFields[Pstream::myProcNo()];
-                subField.setSize(map.size());
-                forAll(map, i)
-                {
-                    subField[i] = field[map[i]];
-                }
-            }
-
-
-            // Combine bits. Note that can reuse field storage
-
-            field.setSize(constructSize);
-            field = nullValue;
-
-            // Receive sub field from myself (subField)
-            {
-                const labelList& map = constructMap[Pstream::myProcNo()];
-                const List<T>& subField = sendFields[Pstream::myProcNo()];
-
-                forAll(map, i)
-                {
-                    cop(field[map[i]], subField[i]);
-                }
-            }
-
-
-            // Wait for all to finish
-
-            Pstream::waitRequests(nOutstanding);
-
-
-            // Collect neighbour fields
-
-            for (label domain = 0; domain < Pstream::nProcs(); domain++)
-            {
-                const labelList& map = constructMap[domain];
-
-                if (domain != Pstream::myProcNo() && map.size())
-                {
-                    const List<T>& subField = recvFields[domain];
-
-                    checkReceivedSize(domain, map.size(), subField.size());
-
-                    forAll(map, i)
-                    {
-                        cop(field[map[i]], subField[i]);
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        FatalErrorIn("mapDistribute::distribute(..)")
-            << "Unknown communication schedule " << commsType
-            << abort(FatalError);
-    }
-}
-
-
-template<class T>
-void Foam::mapDistribute::send(PstreamBuffers& pBufs, const List<T>& field)
-const
-{
-    // Stream data into buffer
-    for (label domain = 0; domain < Pstream::nProcs(); domain++)
-    {
-        const labelList& map = subMap_[domain];
-
-        if (map.size())
-        {
-            // Put data into send buffer
-            UOPstream toDomain(domain, pBufs);
-            toDomain << UIndirectList<T>(field, map);
-        }
-    }
-
-    // Start sending and receiving but do not block.
-    pBufs.finishedSends(false);
-}
-
-
-template<class T>
-void Foam::mapDistribute::receive(PstreamBuffers& pBufs, List<T>& field) const
-{
-    // Consume
-    field.setSize(constructSize_);
-
-    for (label domain = 0; domain < Pstream::nProcs(); domain++)
-    {
-        const labelList& map = constructMap_[domain];
-
-        if (map.size())
-        {
-            UIPstream str(domain, pBufs);
-            List<T> recvField(str);
-
-            if (recvField.size() != map.size())
-            {
-                FatalErrorIn
-                (
-                    "template<class T>\n"
-                    "void mapDistribute::receive\n"
-                    "(\n"
-                    "    PstreamBuffers&,\n"
-                    "    List<T>&\n"
-                    ")\n"
-                )   << "Expected from processor " << domain
-                    << " " << map.size() << " but received "
-                    << recvField.size() << " elements."
-                    << abort(FatalError);
-            }
-
-            forAll(map, i)
-            {
-                field[map[i]] = recvField[i];
-            }
-        }
-    }
-}
-
-
 // In case of no transform: copy elements
 template<class T>
 void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
@@ -887,6 +129,39 @@ void Foam::mapDistribute::applyInverseTransforms
 }
 
 
+//- Distribute data using default commsType.
+template<class T, class negateOp>
+void Foam::mapDistribute::distribute
+(
+    List<T>& fld,
+    const negateOp& negOp,
+    const bool dummyTransform,
+    const int tag
+) const
+{
+    mapDistributeBase::distribute(fld, negOp, tag);
+
+    //- Fill in transformed slots with copies
+    if (dummyTransform)
+    {
+        applyDummyTransforms(fld);
+    }
+}
+
+
+//- Distribute data using default commsType.
+template<class T>
+void Foam::mapDistribute::distribute
+(
+    List<T>& fld,
+    const bool dummyTransform,
+    const int tag
+) const
+{
+    distribute(fld, flipOp(), dummyTransform, tag);
+}
+
+
 //- Distribute data using default commsType.
 template<class T>
 void Foam::mapDistribute::distribute
@@ -906,63 +181,6 @@ void Foam::mapDistribute::distribute
 }
 
 
-//- Distribute data using default commsType.
-template<class T>
-void Foam::mapDistribute::distribute
-(
-    List<T>& fld,
-    const bool dummyTransform,
-    const int tag
-) const
-{
-    if (Pstream::defaultCommsType == Pstream::nonBlocking)
-    {
-        distribute
-        (
-            Pstream::nonBlocking,
-            List<labelPair>(),
-            constructSize_,
-            subMap_,
-            constructMap_,
-            fld,
-            tag
-        );
-    }
-    else if (Pstream::defaultCommsType == Pstream::scheduled)
-    {
-        distribute
-        (
-            Pstream::scheduled,
-            schedule(),
-            constructSize_,
-            subMap_,
-            constructMap_,
-            fld,
-            tag
-        );
-    }
-    else
-    {
-        distribute
-        (
-            Pstream::blocking,
-            List<labelPair>(),
-            constructSize_,
-            subMap_,
-            constructMap_,
-            fld,
-            tag
-        );
-    }
-
-    //- Fill in transformed slots with copies
-    if (dummyTransform)
-    {
-        applyDummyTransforms(fld);
-    }
-}
-
-
 //- Reverse distribute data using default commsType.
 template<class T>
 void Foam::mapDistribute::reverseDistribute
@@ -978,45 +196,7 @@ void Foam::mapDistribute::reverseDistribute
         applyDummyInverseTransforms(fld);
     }
 
-    if (Pstream::defaultCommsType == Pstream::nonBlocking)
-    {
-        distribute
-        (
-            Pstream::nonBlocking,
-            List<labelPair>(),
-            constructSize,
-            constructMap_,
-            subMap_,
-            fld,
-            tag
-        );
-    }
-    else if (Pstream::defaultCommsType == Pstream::scheduled)
-    {
-        distribute
-        (
-            Pstream::scheduled,
-            schedule(),
-            constructSize,
-            constructMap_,
-            subMap_,
-            fld,
-            tag
-        );
-    }
-    else
-    {
-        distribute
-        (
-            Pstream::blocking,
-            List<labelPair>(),
-            constructSize,
-            constructMap_,
-            subMap_,
-            fld,
-            tag
-        );
-    }
+    mapDistributeBase::reverseDistribute(constructSize, fld, tag);
 }
 
 
@@ -1038,51 +218,7 @@ void Foam::mapDistribute::reverseDistribute
         applyDummyInverseTransforms(fld);
     }
 
-    if (Pstream::defaultCommsType == Pstream::nonBlocking)
-    {
-        distribute
-        (
-            Pstream::nonBlocking,
-            List<labelPair>(),
-            constructSize,
-            constructMap_,
-            subMap_,
-            fld,
-            eqOp<T>(),
-            nullValue,
-            tag
-        );
-    }
-    else if (Pstream::defaultCommsType == Pstream::scheduled)
-    {
-        distribute
-        (
-            Pstream::scheduled,
-            schedule(),
-            constructSize,
-            constructMap_,
-            subMap_,
-            fld,
-            eqOp<T>(),
-            nullValue,
-            tag
-        );
-    }
-    else
-    {
-        distribute
-        (
-            Pstream::blocking,
-            List<labelPair>(),
-            constructSize,
-            constructMap_,
-            subMap_,
-            fld,
-            eqOp<T>(),
-            nullValue,
-            tag
-        );
-    }
+    mapDistributeBase::reverseDistribute(constructSize, nullValue, fld, tag);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
index 85e69b02dc..ddf90970ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,8 +106,7 @@ Foam::mapPolyMesh::mapPolyMesh
     {
         if (min(oldPatchSizes_) < 0)
         {
-            FatalErrorIn("mapPolyMesh::mapPolyMesh(...)")
-                << "Calculated negative old patch size.  Error in mapping data"
+            FatalErrorInFunction
                 << abort(FatalError);
         }
     }
@@ -195,7 +194,7 @@ Foam::mapPolyMesh::mapPolyMesh
         {
             if (min(oldPatchSizes_) < 0)
             {
-                FatalErrorIn("mapPolyMesh::mapPolyMesh(...)")
+                FatalErrorInFunction
                     << "Calculated negative old patch size."
                     << "  Error in mapping data"
                     << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
index e21ff4c736..e81de98eb7 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapPolyMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -484,7 +484,7 @@ public:
                     }
                     else
                     {
-                        FatalErrorIn("mergedPoint(const label) const")
+                        FatalErrorInFunction
                             << "old point label " << oldPointI
                             << " has reverseMap " << i << endl
                             << "Only call mergedPoint for removed points."
@@ -515,7 +515,7 @@ public:
                     }
                     else
                     {
-                        FatalErrorIn("mergedFace(const label) const")
+                        FatalErrorInFunction
                             << "old face label " << oldFaceI
                             << " has reverseMap " << i << endl
                             << "Only call mergedFace for removed faces."
@@ -546,7 +546,7 @@ public:
                     }
                     else
                     {
-                        FatalErrorIn("mergedCell(const label) const")
+                        FatalErrorInFunction
                             << "old cell label " << oldCellI
                             << " has reverseMap " << i << endl
                             << "Only call mergedCell for removed cells."
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 1e104b4602..f3311f26e4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,14 +61,8 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
     {
         if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
         {
-            WarningIn
-            (
-                "polyBoundaryMesh::polyBoundaryMesh\n"
-                "(\n"
-                "    const IOobject&,\n"
-                "    const polyMesh&\n"
-                ")"
-            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            WarningInFunction
+                << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
                 << " does not support automatic rereading."
                 << endl;
         }
@@ -143,15 +137,8 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
 
         if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
         {
-            WarningIn
-            (
-                "polyBoundaryMesh::polyBoundaryMesh\n"
-                "(\n"
-                "    const IOobject&,\n"
-                "    const polyMesh&\n"
-                "    const polyPatchList&\n"
-                ")"
-            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            WarningInFunction
+                << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
                 << " does not support automatic rereading."
                 << endl;
         }
@@ -281,7 +268,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 {
     if (Pstream::parRun())
     {
-        WarningIn("polyBoundaryMesh::neighbourEdges() const")
+        WarningInFunction
             << "Neighbour edge addressing not correct across parallel"
             << " boundaries." << endl;
     }
@@ -371,7 +358,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
         if (pointsToEdge.size())
         {
-            FatalErrorIn("polyBoundaryMesh::neighbourEdges() const")
+            FatalErrorInFunction
                 << "Not all boundary edges of patches match up." << nl
                 << "Is the outside of your mesh multiply connected?"
                 << abort(FatalError);
@@ -392,7 +379,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
                     label edgeI = pp.nInternalEdges() + i;
                     const edge& e = pp.edges()[edgeI];
 
-                    FatalErrorIn("polyBoundaryMesh::neighbourEdges() const")
+                    FatalErrorInFunction
                         << "Not all boundary edges of patches match up." << nl
                         << "Edge " << edgeI << " on patch " << pp.name()
                         << " end points " << pp.localPoints()[e[0]] << ' '
@@ -458,7 +445,7 @@ Foam::polyBoundaryMesh::groupPatchIDs() const
 
                 if (findPatchID(name) != -1)
                 {
-                    WarningIn("polyBoundaryMesh::groupPatchIDs() const")
+                    WarningInFunction
                         << "Patch " << bm[patchI].name()
                         << " specifies a group " << name
                         << " which is also a patch name."
@@ -725,10 +712,8 @@ Foam::label Foam::polyBoundaryMesh::whichPatch(const label faceIndex) const
     }
     else if (faceIndex >= mesh().nFaces())
     {
-        FatalErrorIn
-        (
-            "polyBoundaryMesh::whichPatch(const label faceIndex) const"
-        )   << "given label " << faceIndex
+        FatalErrorInFunction
+            << "given label " << faceIndex
             << " greater than the number of geometric faces " << mesh().nFaces()
             << abort(FatalError);
     }
@@ -749,10 +734,8 @@ Foam::label Foam::polyBoundaryMesh::whichPatch(const label faceIndex) const
     }
 
     // If not in any of above, it is trouble!
-    FatalErrorIn
-    (
-        "label polyBoundaryMesh::whichPatch(const label faceIndex) const"
-    )   << "Cannot find face " << faceIndex << " in any of the patches "
+    FatalErrorInFunction
+        << "Cannot find face " << faceIndex << " in any of the patches "
         << names() << nl
         << "It seems your patches are not consistent with the mesh :"
         << " internalFaces:" << mesh().nInternalFaces()
@@ -808,22 +791,16 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
 
                 if (groupIDs.empty() && warnNotFound)
                 {
-                    WarningIn
-                    (
-                        "polyBoundaryMesh::patchSet"
-                        "(const wordReList&, const bool, const bool) const"
-                    )   << "Cannot find any patch or group names matching "
+                    WarningInFunction
+                        << "Cannot find any patch or group names matching "
                         << patchName
                         << endl;
                 }
             }
             else if (warnNotFound)
             {
-                WarningIn
-                (
-                    "polyBoundaryMesh::patchSet"
-                    "(const wordReList&, const bool, const bool) const"
-                )   << "Cannot find any patch names matching " << patchName
+                WarningInFunction
+                    << "Cannot find any patch names matching " << patchName
                     << endl;
             }
         }
@@ -1187,10 +1164,8 @@ const Foam::polyPatch& Foam::polyBoundaryMesh::operator[]
 
     if (patchI < 0)
     {
-        FatalErrorIn
-        (
-            "polyBoundaryMesh::operator[](const word&) const"
-        )   << "Patch named " << patchName << " not found." << nl
+        FatalErrorInFunction
+            << "Patch named " << patchName << " not found." << nl
             << "Available patch names: " << names() << endl
             << abort(FatalError);
     }
@@ -1208,10 +1183,8 @@ Foam::polyPatch& Foam::polyBoundaryMesh::operator[]
 
     if (patchI < 0)
     {
-        FatalErrorIn
-        (
-            "polyBoundaryMesh::operator[](const word&)"
-        )   << "Patch named " << patchName << " not found." << nl
+        FatalErrorInFunction
+            << "Patch named " << patchName << " not found." << nl
             << "Available patch names: " << names() << endl
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H
index 5e49319024..ecc4ad783c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshEntries.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ public:
 
         bool writeData(Ostream&) const
         {
-            notImplemented("writeData(Ostream&) const");
+            NotImplemented;
             return false;
         }
 };
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 4b8012b71d..3e54a37e62 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -304,12 +304,12 @@ Foam::polyMesh::polyMesh(const IOobject& io)
     // Warn if global empty mesh
     if (returnReduce(nPoints(), sumOp<label>()) == 0)
     {
-        WarningIn("polyMesh(const IOobject&)")
+        WarningInFunction
             << "no points in mesh" << endl;
     }
     if (returnReduce(nCells(), sumOp<label>()) == 0)
     {
-        WarningIn("polyMesh(const IOobject&)")
+        WarningInFunction
             << "no cells in mesh" << endl;
     }
 
@@ -458,16 +458,8 @@ Foam::polyMesh::polyMesh
 
         if (min(curFace) < 0 || max(curFace) > points_.size())
         {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh\n"
-                "(\n"
-                "    const IOobject& io,\n"
-                "    const pointField& points,\n"
-                "    const faceList& faces,\n"
-                "    const cellList& cells\n"
-                ")\n"
-            )   << "Face " << facei << "contains vertex labels out of range: "
+            FatalErrorInFunction
+                << "Face " << facei << "contains vertex labels out of range: "
                 << curFace << " Max point index = " << points_.size()
                 << abort(FatalError);
         }
@@ -617,16 +609,8 @@ Foam::polyMesh::polyMesh
 
         if (min(curFace) < 0 || max(curFace) > points_.size())
         {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh\n"
-                "(\n"
-                "    const IOobject&,\n"
-                "    const Xfer<pointField>&,\n"
-                "    const Xfer<faceList>&,\n"
-                "    const Xfer<cellList>&\n"
-                ")\n"
-            )   << "Face " << facei << "contains vertex labels out of range: "
+            FatalErrorInFunction
+                << "Face " << facei << "contains vertex labels out of range: "
                 << curFace << " Max point index = " << points_.size()
                 << abort(FatalError);
         }
@@ -642,16 +626,8 @@ Foam::polyMesh::polyMesh
 
         if (min(curCell) < 0 || max(curCell) > faces_.size())
         {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh\n"
-                "(\n"
-                "    const IOobject&,\n"
-                "    const Xfer<pointField>&,\n"
-                "    const Xfer<faceList>&,\n"
-                "    const Xfer<cellList>&\n"
-                ")\n"
-            )   << "Cell " << celli << "contains face labels out of range: "
+            FatalErrorInFunction
+                << "Cell " << celli << "contains face labels out of range: "
                 << curCell << " Max face index = " << faces_.size()
                 << abort(FatalError);
         }
@@ -724,19 +700,8 @@ void Foam::polyMesh::resetPrimitives
 
         if (min(curFace) < 0 || max(curFace) > points_.size())
         {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh::resetPrimitives\n"
-                "(\n"
-                "    const Xfer<pointField>&,\n"
-                "    const Xfer<faceList>&,\n"
-                "    const Xfer<labelList>& owner,\n"
-                "    const Xfer<labelList>& neighbour,\n"
-                "    const labelList& patchSizes,\n"
-                "    const labelList& patchStarts\n"
-                "    const bool validBoundary\n"
-                ")\n"
-            )   << "Face " << facei << " contains vertex labels out of range: "
+            FatalErrorInFunction
+                << "Face " << facei << " contains vertex labels out of range: "
                 << curFace << " Max point index = " << points_.size()
                 << abort(FatalError);
         }
@@ -767,19 +732,8 @@ void Foam::polyMesh::resetPrimitives
          || (returnReduce(nCells(), sumOp<label>()) == 0)
         )
         {
-            FatalErrorIn
-            (
-                "polyMesh::polyMesh::resetPrimitives\n"
-                "(\n"
-                "    const Xfer<pointField>&,\n"
-                "    const Xfer<faceList>&,\n"
-                "    const Xfer<labelList>& owner,\n"
-                "    const Xfer<labelList>& neighbour,\n"
-                "    const labelList& patchSizes,\n"
-                "    const labelList& patchStarts\n"
-                "    const bool validBoundary\n"
-                ")\n"
-            )   << "no points or no cells in mesh" << endl;
+            FatalErrorInFunction
+                << "no points or no cells in mesh" << endl;
         }
     }
 }
@@ -867,8 +821,7 @@ const Foam::labelList& Foam::polyMesh::tetBasePtIs() const
     {
         if (debug)
         {
-            WarningIn("const labelList& polyMesh::tetBasePtIs() const")
-                << "Tet base point indices not available.  "
+            WarningInFunction
                 << "Forcing storage of base points."
                 << endl;
         }
@@ -929,10 +882,8 @@ void Foam::polyMesh::addPatches
 {
     if (boundaryMesh().size())
     {
-        FatalErrorIn
-        (
-            "void polyMesh::addPatches(const List<polyPatch*>&, const bool)"
-        )   << "boundary already exists"
+        FatalErrorInFunction
+            << "boundary already exists"
             << abort(FatalError);
     }
 
@@ -976,15 +927,8 @@ void Foam::polyMesh::addZones
 {
     if (pointZones().size() || faceZones().size() || cellZones().size())
     {
-        FatalErrorIn
-        (
-            "void addZones\n"
-            "(\n"
-            "    const List<pointZone*>&,\n"
-            "    const List<faceZone*>&,\n"
-            "    const List<cellZone*>&\n"
-            ")"
-        )   << "point, face or cell zone already exists"
+        FatalErrorInFunction
+            << "point, face or cell zone already exists"
             << abort(FatalError);
     }
 
@@ -1036,7 +980,7 @@ const Foam::pointField& Foam::polyMesh::points() const
 {
     if (clearedPrimitives_)
     {
-        FatalErrorIn("const pointField& polyMesh::points() const")
+        FatalErrorInFunction
             << "points deallocated"
             << abort(FatalError);
     }
@@ -1053,7 +997,7 @@ bool Foam::polyMesh::upToDatePoints(const regIOobject& io) const
 
 void Foam::polyMesh::setUpToDatePoints(regIOobject& io) const
 {
-    io.eventNo() = points_.eventNo();
+    io.eventNo() = points_.eventNo()+1;
 }
 
 
@@ -1061,7 +1005,7 @@ const Foam::faceList& Foam::polyMesh::faces() const
 {
     if (clearedPrimitives_)
     {
-        FatalErrorIn("const faceList& polyMesh::faces() const")
+        FatalErrorInFunction
             << "faces deallocated"
             << abort(FatalError);
     }
@@ -1088,8 +1032,7 @@ const Foam::pointField& Foam::polyMesh::oldPoints() const
     {
         if (debug)
         {
-            WarningIn("const pointField& polyMesh::oldPoints() const")
-                << "Old points not available.  Forcing storage of old points"
+            WarningInFunction
                 << endl;
         }
 
@@ -1322,16 +1265,8 @@ void Foam::polyMesh::findCellFacePt
     }
     else
     {
-        FatalErrorIn
-        (
-            "void Foam::polyMesh::findCellFacePt"
-            "("
-                "const point& p, "
-                "label& celli, "
-                "label& tetFacei, "
-                "label& tetPti"
-            ") const"
-        )   << "Did not find nearest cell in search tree."
+        FatalErrorInFunction
+            << "Did not find nearest cell in search tree."
             << abort(FatalError);
     }
 }
@@ -1478,12 +1413,11 @@ Foam::label Foam::polyMesh::findCell
     const cellDecomposition decompMode
 ) const
 {
-    if (nCells() == 0)
-    {
-        return -1;
-    }
-
-    if (Pstream::parRun() && decompMode == FACE_DIAG_TRIS)
+    if
+    (
+        Pstream::parRun()
+     && (decompMode == FACE_DIAG_TRIS || decompMode == CELL_TETS)
+    )
     {
         // Force construction of face-diagonal decomposition before testing
         // for zero cells.
@@ -1494,6 +1428,11 @@ Foam::label Foam::polyMesh::findCell
         (void)tetBasePtIs();
     }
 
+    if (nCells() == 0)
+    {
+        return -1;
+    }
+
     if (decompMode == CELL_TETS)
     {
         // Advanced search method utilizing an octree
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index 576655b74a..14835981ab 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,11 +97,8 @@ bool Foam::polyMesh::checkFaceOrthogonality
                 if (detailedReport && errorNonOrth == 0)
                 {
                     // Non-orthogonality greater than 90 deg
-                    WarningIn
-                    (
-                        "polyMesh::checkFaceOrthogonality"
-                        "(const pointField&, const bool) const"
-                    )   << "Severe non-orthogonality for face "
+                    WarningInFunction
+                        << "Severe non-orthogonality for face "
                         << faceI
                         << " between cells " << own[faceI]
                         << " and " << nei[faceI]
@@ -227,22 +224,16 @@ bool Foam::polyMesh::checkFaceSkewness
                 // Non-orthogonality greater than 90 deg
                 if (isInternalFace(faceI))
                 {
-                    WarningIn
-                    (
-                        "polyMesh::checkFaceSkewnesss"
-                        "(const pointField&, const bool) const"
-                    )   << "Severe skewness " << skew[faceI]
+                    WarningInFunction
+                        << "Severe skewness " << skew[faceI]
                         << " for face " << faceI
                         << " between cells " << own[faceI]
                         << " and " << nei[faceI];
                 }
                 else
                 {
-                    WarningIn
-                    (
-                        "polyMesh::checkFaceSkewnesss"
-                        "(const pointField&, const bool) const"
-                    )   << "Severe skewness " << skew[faceI]
+                    WarningInFunction
+                        << "Severe skewness " << skew[faceI]
                         << " for boundary face " << faceI
                         << " on cell " << own[faceI];
                 }
@@ -312,11 +303,8 @@ bool Foam::polyMesh::checkEdgeAlignment
         }
         else if (directions[cmpt] != 0)
         {
-            FatalErrorIn
-            (
-                "polyMesh::checkEdgeAlignment"
-                "(const bool, const Vector<label>&, labelHashSet*)"
-            )   << "directions should contain 0 or 1 but is now " << directions
+            FatalErrorInFunction
+                << "directions should contain 0 or 1 but is now " << directions
                 << exit(FatalError);
         }
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 62c1877fc1..bd77828520 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -115,13 +115,8 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
 
         if (!found)
         {
-            FatalErrorIn
-            (
-                "polyMesh::facePatchFaceCells(const faceList& patchFaces,"
-                "const labelListList& pointCells,"
-                "const faceListList& cellsFaceShapes,"
-                "const label patchID)"
-            )   << "face " << fI << " in patch " << patchID
+            FatalErrorInFunction
+                << "face " << fI << " in patch " << patchID
                 << " does not have neighbour cell"
                 << " face: " << patchFaces[fI]
                 << abort(FatalError);
@@ -282,20 +277,8 @@ void Foam::polyMesh::setTopology
             }
             else
             {
-                FatalErrorIn
-                (
-                    "polyMesh::setTopology\n"
-                    "(\n"
-                    "    const cellShapeList& cellsAsShapes,\n"
-                    "    const faceListList& boundaryFaces,\n"
-                    "    const wordList& boundaryPatchNames,\n"
-                    "    labelList& patchSizes,\n"
-                    "    labelList& patchStarts,\n"
-                    "    label& defaultPatchStart,\n"
-                    "    label& nFaces,\n"
-                    "    cellList& cells\n"
-                    ")"
-                )   << "Error in internal face insertion"
+                FatalErrorInFunction
+                    << "Error in internal face insertion"
                     << abort(FatalError);
             }
         }
@@ -339,20 +322,8 @@ void Foam::polyMesh::setTopology
                 {
                     if (cells[cellInside][cellFaceI] >= 0)
                     {
-                        FatalErrorIn
-                        (
-                            "polyMesh::setTopology\n"
-                            "(\n"
-                            "    const cellShapeList& cellsAsShapes,\n"
-                            "    const faceListList& boundaryFaces,\n"
-                            "    const wordList& boundaryPatchNames,\n"
-                            "    labelList& patchSizes,\n"
-                            "    labelList& patchStarts,\n"
-                            "    label& defaultPatchStart,\n"
-                            "    label& nFaces,\n"
-                            "    cellList& cells\n"
-                            ")"
-                        )   << "Trying to specify a boundary face " << curFace
+                        FatalErrorInFunction
+                            << "Trying to specify a boundary face " << curFace
                             << " on the face on cell " << cellInside
                             << " which is either an internal face or already "
                             << "belongs to some other patch.  This is face "
@@ -375,7 +346,7 @@ void Foam::polyMesh::setTopology
 
             if (!found)
             {
-                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                FatalErrorInFunction
                     << "face " << faceI << " of patch " << patchI
                     << " does not seem to belong to cell " << cellInside
                     << " which, according to the addressing, "
@@ -622,7 +593,7 @@ Foam::polyMesh::polyMesh
 
     if (nDefaultFaces > 0)
     {
-        WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+        WarningInFunction
             << "Found " << nDefaultFaces
             << " undefined faces in mesh; adding to default patch." << endl;
 
@@ -634,13 +605,13 @@ Foam::polyMesh::polyMesh
         {
             if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
             {
-                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                FatalErrorInFunction
                     << "Default patch " << boundary_[patchI].name()
                     << " already has faces in it or is not"
                     << " last in list of patches." << exit(FatalError);
             }
 
-            WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+            WarningInFunction
                 << "Reusing existing patch " << patchI
                 << " for undefined faces." << endl;
 
@@ -898,7 +869,7 @@ Foam::polyMesh::polyMesh
 
     if (nDefaultFaces > 0)
     {
-        WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+        WarningInFunction
             << "Found " << nDefaultFaces
             << " undefined faces in mesh; adding to default patch." << endl;
 
@@ -910,13 +881,13 @@ Foam::polyMesh::polyMesh
         {
             if (patchI != boundaryFaces.size()-1 || boundary_[patchI].size())
             {
-                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
+                FatalErrorInFunction
                     << "Default patch " << boundary_[patchI].name()
                     << " already has faces in it or is not"
                     << " last in list of patches." << exit(FatalError);
             }
 
-            WarningIn("polyMesh::polyMesh(... construct from shapes...)")
+            WarningInFunction
                 << "Reusing existing patch " << patchI
                 << " for undefined faces." << endl;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 6015f1167d..7a39d6c25e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -204,8 +204,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         if (boundaryChanged)
         {
-            WarningIn("polyMesh::readUpdateState polyMesh::readUpdate()")
-                << "Number of patches has changed.  This may have "
+            WarningInFunction
                 << "unexpected consequences.  Proceed with care." << endl;
 
             boundary_.clear();
@@ -227,7 +226,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
                     newBoundary[patchI].start(),
                     patchI,
                     boundary_,
-                    newBoundary[patchI].type()
+                    newBoundary[patchI].physicalType(),
+                    newBoundary[patchI].inGroups()
                 );
             }
         }
@@ -432,7 +432,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         if (nOldPoints != 0 && nOldPoints != newPoints.size())
         {
-            FatalErrorIn("polyMesh::readUpdate()")
+            FatalErrorInFunction
                 << "Point motion detected but number of points "
                 << newPoints.size() << " in "
                 << newPoints.objectPath() << " does not correspond to "
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
index 33399d41d3..ef2c09e5b6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ void Foam::polyMesh::initMesh()
     {
         if (owner_[facei] < 0)
         {
-            FatalErrorIn("polyMesh::initMesh()")
+            FatalErrorInFunction
                 << "Illegal cell label " << owner_[facei]
                 << " in neighbour addressing for face " << facei
                 << exit(FatalError);
@@ -75,7 +75,7 @@ void Foam::polyMesh::initMesh()
     {
         if (neighbour_[facei] < 0)
         {
-            FatalErrorIn("polyMesh::initMesh()")
+            FatalErrorInFunction
                 << "Illegal cell label " << neighbour_[facei]
                 << " in neighbour addressing for face " << facei
                 << exit(FatalError);
@@ -129,7 +129,7 @@ void Foam::polyMesh::initMesh(cellList& c)
         {
             if (cellfaces[faceI] < 0)
             {
-                FatalErrorIn("polyMesh::initMesh(cellList&)")
+                FatalErrorInFunction
                     << "Illegal face label " << cellfaces[faceI]
                     << " in cell " << cellI
                     << exit(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
index 6c1d76d4ae..a38773d455 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -309,16 +309,8 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts
 
         if (bFTetBasePtI == -2)
         {
-            FatalErrorIn
-            (
-                "labelList"
-                "polyMeshTetDecomposition::findFaceBasePts"
-                "("
-                    "const polyMesh& mesh, "
-                    "scalar tol, "
-                    "bool report"
-                ")"
-            )   << "Coupled face base point exchange failure for face "
+            FatalErrorInFunction
+                << "Coupled face base point exchange failure for face "
                 << fI
                 << abort(FatalError);
         }
@@ -558,16 +550,8 @@ Foam::List<Foam::tetIndices> Foam::polyMeshTetDecomposition::faceTetIndices
     {
         if (nWarnings < maxWarnings)
         {
-            WarningIn
-            (
-                "List<tetIndices> "
-                "polyMeshTetDecomposition::faceTetIndices"
-                "("
-                    "const polyMesh&, "
-                    "label, "
-                    "label"
-                ")"
-            )   << "No base point for face " << fI << ", " << f
+            WarningInFunction
+                << "No base point for face " << fI << ", " << f
                 << ", produces a valid tet decomposition."
                 << endl;
             nWarnings++;
@@ -630,17 +614,8 @@ Foam::tetIndices Foam::polyMeshTetDecomposition::triangleTetIndices
     {
         if (nWarnings < maxWarnings)
         {
-            WarningIn
-            (
-                "tetIndices "
-                "polyMeshTetDecomposition::triangleTetIndices"
-                "("
-                    "const polyMesh&, "
-                    "label, "
-                    "label, "
-                    "label"
-                ")"
-            )   << "No base point for face " << fI << ", " << f
+            WarningInFunction
+                << "No base point for face " << fI << ", " << f
                 << ", produces a valid tet decomposition."
                 << endl;
             nWarnings++;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 4a8b5dd7d7..f26f77cad3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,15 +78,43 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
         newMotionPoints.setSize(points_.size());
 
         // Map the list
-        newMotionPoints.map(oldMotionPoints, mpm.pointMap());
-
-        // Any points created out-of-nothing get set to the current coordinate
-        // for lack of anything better.
-        forAll(mpm.pointMap(), newPointI)
+        if (mpm.hasMotionPoints())
         {
-            if (mpm.pointMap()[newPointI] == -1)
+            newMotionPoints.map(oldMotionPoints, mpm.pointMap());
+
+            // Any points created out-of-nothing get set to the current
+            // coordinate for lack of anything better.
+            forAll(mpm.pointMap(), newPointI)
             {
-                newMotionPoints[newPointI] = points_[newPointI];
+                if (mpm.pointMap()[newPointI] == -1)
+                {
+                    newMotionPoints[newPointI] = points_[newPointI];
+                }
+            }
+        }
+        else
+        {
+            const labelList& pointMap = mpm.pointMap();
+            const labelList& revPointMap = mpm.reversePointMap();
+
+            forAll(pointMap, newPointI)
+            {
+                label oldPointI = pointMap[newPointI];
+                if (oldPointI >= 0)
+                {
+                    if (revPointMap[oldPointI] == newPointI) // master point
+                    {
+                        newMotionPoints[newPointI] = oldMotionPoints[oldPointI];
+                    }
+                    else
+                    {
+                        newMotionPoints[newPointI] = points_[newPointI];
+                    }
+                }
+                else
+                {
+                    newMotionPoints[newPointI] = points_[newPointI];
+                }
             }
         }
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index 8a4f913ce3..8c4eea8f29 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -270,16 +270,8 @@ Foam::label Foam::coupledPolyPatch::getRotation
 
             if (distSqr == minDistSqr && fp != anchorFp)
             {
-                WarningIn
-                (
-                    "label coupledPolyPatch::getRotation\n"
-                    "(\n"
-                    "    const pointField&,\n"
-                    "    const face&,\n"
-                    "    const point&,\n"
-                    "    const scalar\n"
-                    ")"
-                )   << "Cannot determine unique anchor point on face "
+                WarningInFunction
+                    << "Cannot determine unique anchor point on face "
                     << UIndirectList<point>(points, f)
                     << endl
                     << "Both at index " << anchorFp << " and " << fp
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 05720e178f..4aa380399a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,11 +29,9 @@ License
 #include "polyMesh.H"
 #include "demandDrivenData.H"
 #include "OFstream.H"
-#include "patchZones.H"
 #include "matchPoints.H"
 #include "EdgeMap.H"
 #include "Time.H"
-#include "diagTensor.H"
 #include "transformField.H"
 #include "SubField.H"
 #include "unitConversion.H"
@@ -155,10 +153,8 @@ void Foam::cyclicPolyPatch::calcTransforms
 
     if (half0Ctrs.size() != half1Ctrs.size())
     {
-        FatalErrorIn
-        (
-            "cyclicPolyPatch::calcTransforms()"
-        )   << "For patch " << name()
+        FatalErrorInFunction
+            << "For patch " << name()
             << " there are " << half0Ctrs.size()
             << " face centres, for the neighbour patch " << neighbPatch().name()
             << " there are " << half1Ctrs.size()
@@ -167,10 +163,8 @@ void Foam::cyclicPolyPatch::calcTransforms
 
     if (transform() != neighbPatch().transform())
     {
-        FatalErrorIn
-        (
-            "cyclicPolyPatch::calcTransforms()"
-        )   << "Patch " << name()
+        FatalErrorInFunction
+            << "Patch " << name()
             << " has transform type " << transformTypeNames[transform()]
             << ", neighbour patch " << neighbPatchName()
             << " has transform type "
@@ -215,10 +209,8 @@ void Foam::cyclicPolyPatch::calcTransforms
 
                 if (areaDiff > matchTolerance())
                 {
-                    FatalErrorIn
-                    (
-                        "cyclicPolyPatch::calcTransforms()"
-                    )   << "face " << facei
+                    FatalErrorInFunction
+                        << "face " << facei
                         << " area does not match neighbour by "
                         << 100*areaDiff
                         << "% -- possible face ordering problem." << endl
@@ -347,10 +339,8 @@ void Foam::cyclicPolyPatch::calcTransforms
                   > avgTol
                 )
                 {
-                    WarningIn
-                    (
-                        "cyclicPolyPatch::calcTransforms()"
-                    )   << "Specified separation vector " << separationVector_
+                    WarningInFunction
+                        << "Specified separation vector " << separationVector_
                         << " differs by that of neighbouring patch "
                         << neighbPatch().separationVector_
                         << " by more than tolerance " << avgTol << endl
@@ -367,10 +357,8 @@ void Foam::cyclicPolyPatch::calcTransforms
                  || mag(separation()[0] - separationVector_) > avgTol
                 )
                 {
-                    WarningIn
-                    (
-                        "cyclicPolyPatch::calcTransforms()"
-                    )   << "Specified separationVector " << separationVector_
+                    WarningInFunction
+                        << "Specified separationVector " << separationVector_
                         << " differs from computed separation vector "
                         << separation() << endl
                         << "This probably means your geometry is not consistent"
@@ -677,15 +665,8 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
 {
     if (neighbPatchName_ == word::null && !coupleGroup_.valid())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicPolyPatch::cyclicPolyPatch\n"
-            "(\n"
-            "    const word& name,\n"
-            "    const dictionary& dict,\n"
-            "    const label index,\n"
-            "    const polyBoundaryMesh& bm\n"
-            ")",
             dict
         )   << "No \"neighbourPatch\" provided." << endl
             << "Is your mesh uptodate with split cyclics?" << endl
@@ -695,7 +676,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
 
     if (neighbPatchName_ == name)
     {
-        FatalIOErrorIn("cyclicPolyPatch::cyclicPolyPatch(..)", dict)
+        FatalIOErrorInFunction(dict)
             << "Neighbour patch name " << neighbPatchName_
             << " cannot be the same as this patch " << name
             << exit(FatalIOError);
@@ -711,7 +692,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
             scalar magRot = mag(rotationAxis_);
             if (magRot < SMALL)
             {
-                FatalIOErrorIn("cyclicPolyPatch::cyclicPolyPatch(..)", dict)
+                FatalIOErrorInFunction(dict)
                     << "Illegal rotationAxis " << rotationAxis_ << endl
                     << "Please supply a non-zero vector."
                     << exit(FatalIOError);
@@ -779,7 +760,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
 {
     if (neighbName == name())
     {
-        FatalErrorIn("cyclicPolyPatch::cyclicPolyPatch(..)")
+        FatalErrorInFunction
             << "Neighbour patch name " << neighbName
             << " cannot be the same as this patch " << name()
             << exit(FatalError);
@@ -843,7 +824,7 @@ Foam::label Foam::cyclicPolyPatch::neighbPatchID() const
 
         if (neighbPatchID_ == -1)
         {
-            FatalErrorIn("cyclicPolyPatch::neighbPatchID() const")
+            FatalErrorInFunction
                 << "Illegal neighbourPatch name " << neighbPatchName()
                 << endl << "Valid patch names are "
                 << this->boundaryMesh().names()
@@ -858,7 +839,7 @@ Foam::label Foam::cyclicPolyPatch::neighbPatchID() const
 
         if (nbrPatch.neighbPatchName() != name())
         {
-            WarningIn("cyclicPolyPatch::neighbPatchID() const")
+            WarningInFunction
                 << "Patch " << name()
                 << " specifies neighbour patch " << neighbPatchName()
                 << endl << " but that in return specifies "
@@ -1207,7 +1188,7 @@ const Foam::edgeList& Foam::cyclicPolyPatch::coupledEdges() const
 
             if (e[0] < 0 || e[1] < 0)
             {
-                FatalErrorIn("cyclicPolyPatch::coupledEdges() const")
+                FatalErrorInFunction
                     << "Problem : at position " << i
                     << " illegal couple:" << e
                     << abort(FatalError);
@@ -1395,11 +1376,8 @@ bool Foam::cyclicPolyPatch::order
 
         if (!matchedAll)
         {
-            SeriousErrorIn
-            (
-                "cyclicPolyPatch::order"
-                "(const primitivePatch&, labelList&, labelList&) const"
-            )   << "Patch:" << name() << " : "
+            SeriousErrorInFunction
+                << "Patch:" << name() << " : "
                 << "Cannot match vectors to faces on both sides of patch"
                 << endl
                 << "    Perhaps your faces do not match?"
@@ -1432,11 +1410,8 @@ bool Foam::cyclicPolyPatch::order
 
             if (rotation[newFaceI] == -1)
             {
-                SeriousErrorIn
-                (
-                    "cyclicPolyPatch::order(const primitivePatch&"
-                    ", labelList&, labelList&) const"
-                )   << "in patch " << name()
+                SeriousErrorInFunction
+                    << "in patch " << name()
                     << " : "
                     << "Cannot find point on face " << pp[oldFaceI]
                     << " with vertices "
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index 8835266826..5ef37b3022 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -362,10 +362,8 @@ public:
             }
             else
             {
-                FatalErrorIn
-                (
-                    "cyclicPolyPatch::transformGlobalFace(const label) const"
-                )   << "Face " << facei << " not in patch " << name()
+                FatalErrorInFunction
+                    << "Face " << facei << " not in patch " << name()
                     << exit(FatalError);
                 return -1;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
index 75431fdaa8..e04604c4ed 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class nonuniformTransformCyclicPolyPatch Declaration
+             Class nonuniformTransformCyclicPolyPatch Declaration
 \*---------------------------------------------------------------------------*/
 
 class nonuniformTransformCyclicPolyPatch
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index 2c8383c407..efc2c8adaf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -263,11 +263,8 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves
             }
         }
 
-        SeriousErrorIn
-        (
-            "oldCyclicPolyPatch::getGeometricHalves"
-            "(const primitivePatch&, labelList&, labelList&) const"
-        )   << "Patch " << name() << " gets decomposed in two zones of"
+        SeriousErrorInFunction
+            << "Patch " << name() << " gets decomposed in two zones of"
             << "inequal size: " << half0ToPatch.size()
             << " and " << half1ToPatch.size() << endl
             << "This means that the patch is either not two separate regions"
@@ -499,10 +496,8 @@ bool Foam::oldCyclicPolyPatch::matchAnchors
             if (report)
             {
                 const face& f = half1Faces[half1FaceI];
-                SeriousErrorIn
-                (
-                    "oldCyclicPolyPatch::matchAnchors(..)"
-                )   << "Patch:" << name() << " : "
+                SeriousErrorInFunction
+                    << "Patch:" << name() << " : "
                     << "Cannot find point on face " << f
                     << " with vertices:"
                     << UIndirectList<point>(pp.points(), f)()
@@ -602,15 +597,8 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
 {
     if (dict.found("neighbourPatch"))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "oldCyclicPolyPatch::oldCyclicPolyPatch\n"
-            "(\n"
-            "    const word& name,\n"
-            "    const dictionary& dict,\n"
-            "    const label index,\n"
-            "    const polyBoundaryMesh& bm\n"
-            ")",
             dict
         )   << "Found \"neighbourPatch\" entry when reading cyclic patch "
             << name << endl
@@ -771,7 +759,7 @@ bool Foam::oldCyclicPolyPatch::order
 
     if (pp.size()&1)
     {
-        FatalErrorIn("oldCyclicPolyPatch::order(..)")
+        FatalErrorInFunction
             << "Size of cyclic " << name() << " should be a multiple of 2"
             << ". It is " << pp.size() << abort(FatalError);
     }
@@ -1191,11 +1179,8 @@ bool Foam::oldCyclicPolyPatch::order
 
     if (!matchedAll)
     {
-        SeriousErrorIn
-        (
-            "oldCyclicPolyPatch::order"
-            "(const primitivePatch&, labelList&, labelList&) const"
-        )   << "Patch:" << name() << " : "
+        SeriousErrorInFunction
+            << "Patch:" << name() << " : "
             << "Cannot match vectors to faces on both sides of patch" << endl
             << "    Perhaps your faces do not match?"
             << " The obj files written contain the current match." << endl
@@ -1269,7 +1254,7 @@ void Foam::oldCyclicPolyPatch::write(Ostream& os) const
         }
     }
 
-    WarningIn("oldCyclicPolyPatch::write(Ostream& os) const")
+    WarningInFunction
         << "Please run foamUpgradeCyclics to convert these old-style"
         << " cyclics into two separate cyclics patches."
         << endl;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
index 0b8b0955e2..69130138fc 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
@@ -247,20 +247,20 @@ public:
             //- Does this side own the patch ?
             virtual bool owner() const
             {
-                notImplemented("oldCyclicPolyPatch::owner()");
+                NotImplemented;
                 return true;
             }
 
             //- Transform a patch-based position from other side to this side
             virtual void transformPosition(pointField& l) const
             {
-                notImplemented("transformPosition(pointField&)");
+                NotImplemented;
             }
 
             //- Transform a patch-based position from other side to this side
             virtual void transformPosition(point&, const label facei) const
             {
-                notImplemented("transformPosition(point&, const label)");
+                NotImplemented;
             }
 
         //- Calculate the patch geometry
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 5b2a4332fd..2531438516 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -237,10 +237,8 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
                     writeOBJ(ccStr, c0, c1, vertI);
                 }
 
-                FatalErrorIn
-                (
-                    "processorPolyPatch::calcGeometry()"
-                )   << "face " << facei << " area does not match neighbour by "
+                FatalErrorInFunction
+                    << "face " << facei << " area does not match neighbour by "
                     << 100*mag(magSf - nbrMagSf)/avSf
                     << "% -- possible face ordering problem." << endl
                     << "patch:" << name()
@@ -465,7 +463,7 @@ const Foam::labelList& Foam::processorPolyPatch::neighbPoints() const
 {
     if (!neighbPointsPtr_.valid())
     {
-        FatalErrorIn("processorPolyPatch::neighbPoints() const")
+        FatalErrorInFunction
             << "No extended addressing calculated for patch " << name()
             << abort(FatalError);
     }
@@ -477,7 +475,7 @@ const Foam::labelList& Foam::processorPolyPatch::neighbEdges() const
 {
     if (!neighbEdgesPtr_.valid())
     {
-        FatalErrorIn("processorPolyPatch::neighbEdges() const")
+        FatalErrorInFunction
             << "No extended addressing calculated for patch " << name()
             << abort(FatalError);
     }
@@ -838,7 +836,7 @@ bool Foam::processorPolyPatch::order
                         pts[pI] = localPts[localPtI];
                     }
 
-                    FatalErrorIn("Foam::processorPolyPatch::order(...) const")
+                    FatalErrorInFunction
                         << "No match for face " << localFace << nl << pts
                         << abort(FatalError);
                 }
@@ -885,11 +883,8 @@ bool Foam::processorPolyPatch::order
 
                 if (masterCtrs.size() != pp.size())
                 {
-                    FatalErrorIn
-                    (
-                        "processorPolyPatch::order(const primitivePatch&"
-                        ", labelList&, labelList&) const"
-                    )   << "in patch:" << name() << " : "
+                    FatalErrorInFunction
+                        << "in patch:" << name() << " : "
                         << "Local size of patch is " << pp.size() << " (faces)."
                         << endl
                         << "Received from neighbour " << masterCtrs.size()
@@ -913,7 +908,7 @@ bool Foam::processorPolyPatch::order
                 faceMap
             );
 
-            // Try using face point average for matching
+            // Fallback: try using face point average for matching
             if (!matchedAll)
             {
                 const pointField& ppPoints = pp.points();
@@ -933,16 +928,20 @@ bool Foam::processorPolyPatch::order
 
                 scalarField tols2
                 (
-                    calcFaceTol(pp, pp.points(), facePointAverages)
+                    matchTolerance()
+                   *calcFaceTol(pp, pp.points(), facePointAverages)
                 );
 
+                // Note that we do not use the faceNormals anymore for
+                // comparison. Since we're
+                // having problems with the face centres (e.g. due to extreme
+                // aspect ratios) we will probably also have problems with
+                // reliable normals calculation
                 labelList faceMap2(faceMap.size(), -1);
                 matchedAll = matchPoints
                 (
                     facePointAverages,
                     masterFacePointAverages,
-                    pp.faceNormals(),
-                    masterNormals,
                     tols2,
                     true,
                     faceMap2
@@ -1008,11 +1007,8 @@ bool Foam::processorPolyPatch::order
 
             if (!matchedAll)
             {
-                SeriousErrorIn
-                (
-                    "processorPolyPatch::order(const primitivePatch&"
-                    ", labelList&, labelList&) const"
-                )   << "in patch:" << name() << " : "
+                SeriousErrorInFunction
+                    << "in patch:" << name() << " : "
                     << "Cannot match vectors to faces on both sides of patch"
                     << endl
                     << "    masterCtrs[0]:" << masterCtrs[0] << endl
@@ -1047,11 +1043,8 @@ bool Foam::processorPolyPatch::order
 
                 if (rotation[newFaceI] == -1)
                 {
-                    SeriousErrorIn
-                    (
-                        "processorPolyPatch::order(const primitivePatch&"
-                        ", labelList&, labelList&) const"
-                    )   << "in patch " << name()
+                    SeriousErrorInFunction
+                        << "in patch " << name()
                         << " : "
                         << "Cannot find point on face " << pp[oldFaceI]
                         << " with vertices "
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index 63c2a7dd8a..c61ad0eb00 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,13 +62,13 @@ class processorPolyPatch
         int myProcNo_;
         int neighbProcNo_;
 
-        //- Processor-neighbbour patch face centres
+        //- Processor-neighbour patch face centres
         vectorField neighbFaceCentres_;
 
-        //- Processor-neighbbour patch face areas
+        //- Processor-neighbour patch face areas
         vectorField neighbFaceAreas_;
 
-        //- Processor-neighbbour patch neighbour cell centres
+        //- Processor-neighbour patch neighbour cell centres
         vectorField neighbFaceCellCentres_;
 
         //- Corresponding neighbouring local point label for every local point
@@ -102,7 +102,7 @@ protected:
             const pointField& nbrCc
         )
         {
-            notImplemented("processorPolyPatch::calcGeometry(..)");
+            NotImplemented;
         }
 
         //- Initialise the patches for moving points
@@ -270,19 +270,19 @@ public:
             return !owner();
         }
 
-        //- Return processor-neighbbour patch face centres
+        //- Return processor-neighbour patch face centres
         const vectorField& neighbFaceCentres() const
         {
             return neighbFaceCentres_;
         }
 
-        //- Return processor-neighbbour patch face areas
+        //- Return processor-neighbour patch face areas
         const vectorField& neighbFaceAreas() const
         {
             return neighbFaceAreas_;
         }
 
-        //- Return processor-neighbbour patch neighbour cell centres
+        //- Return processor-neighbour patch neighbour cell centres
         const vectorField& neighbFaceCellCentres() const
         {
             return neighbFaceCellCentres_;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index e2d86a4977..8bd031532a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -179,7 +179,7 @@ int Foam::processorCyclicPolyPatch::tag() const
 
         if (tag_ == Pstream::msgType() || tag_ == -1)
         {
-            FatalErrorIn("processorCyclicPolyPatch::tag() const")
+            FatalErrorInFunction
                 << "Tag calculated from cyclic patch name " << tag_
                 << " is the same as the current message type "
                 << Pstream::msgType() << " or -1" << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 3ede021901..1f98b30bca 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ protected:
             const pointField& nbrCc
         )
         {
-            notImplemented("processorCyclicPolyPatch::calcGeometry(..)");
+            NotImplemented;
         }
 
         //- Initialise the patches for moving points
@@ -277,10 +277,8 @@ public:
                 );
                 if (referPatchID_ == -1)
                 {
-                    FatalErrorIn
-                    (
-                        "processorCyclicPolyPatch::referPatchID() const"
-                    )   << "Illegal referPatch name " << referPatchName_
+                    FatalErrorInFunction
+                        << "Illegal referPatch name " << referPatchName_
                         << endl << "Valid patch names are "
                         << this->boundaryMesh().names()
                         << exit(FatalError);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C
index 63268e6832..4888ff2270 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ void Foam::symmetryPlanePolyPatch::calcGeometry(PstreamBuffers&)
             {
                 if (magSqr(n_ - nf[facei]) > SMALL)
                 {
-                    FatalErrorIn("symmetryPlanePolyPatch::n()")
+                    FatalErrorInFunction
                         << "Symmetry plane '" << name() << "' is not planar."
                         << endl
                         << "At local face at "
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index e12d22e5a5..e8fd99e786 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,10 +66,7 @@ void Foam::wedgePolyPatch::calcGeometry(PstreamBuffers&)
             {
                 // only issue warning instead of error so that the case can
                 // still be read for post-processing
-                WarningIn
-                (
-                    "wedgePolyPatch::calcGeometry(PstreamBuffers&)"
-                )
+                WarningInFunction
                     << "Wedge patch '" << name() << "' is not planar." << nl
                     << "At local face at "
                     << primitivePatch::faceCentres()[faceI]
@@ -97,7 +94,7 @@ void Foam::wedgePolyPatch::calcGeometry(PstreamBuffers&)
 
         if (mag(cnCmptSum) < (1 - SMALL))
         {
-            FatalErrorIn("wedgePolyPatch::calcGeometry(PstreamBuffers&)")
+            FatalErrorInFunction
                 << "wedge " << name()
                 << " centre plane does not align with a coordinate plane by "
                 << 1 - mag(cnCmptSum)
@@ -109,7 +106,7 @@ void Foam::wedgePolyPatch::calcGeometry(PstreamBuffers&)
 
         if (magAxis < SMALL)
         {
-            FatalErrorIn("wedgePolyPatch::calcGeometry(PstreamBuffers&)")
+            FatalErrorInFunction
                 << "wedge " << name()
                 << " plane aligns with a coordinate plane." << nl
                 << "    The wedge plane should make a small angle (~2.5deg)"
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index d7508c3d94..dd1583577f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,6 +107,30 @@ Foam::polyPatch::polyPatch
 }
 
 
+Foam::polyPatch::polyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& physicalType,
+    const wordList& inGroups
+)
+:
+    patchIdentifier(name, index, physicalType, inGroups),
+    primitivePatch
+    (
+        faceSubList(bm.mesh().faces(), size, start),
+        bm.mesh().points()
+    ),
+    start_(start),
+    boundaryMesh_(bm),
+    faceCellsPtr_(NULL),
+    mePtr_(NULL)
+{}
+
+
 Foam::polyPatch::polyPatch
 (
     const word& name,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index b13faf0968..2e12697a18 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -179,6 +179,18 @@ public:
             const word& patchType
         );
 
+        //- Construct from components
+        polyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& physicalType,
+            const wordList& inGroups
+        );
+
         //- Construct from dictionary
         polyPatch
         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
index 055fea4f7c..b161194fc3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,11 +51,8 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "polyPatch::New(const word&, const word&, const label, "
-            "const label, const label, const polyBoundaryMesh&) "
-        )   << "Unknown polyPatch type "
+        FatalErrorInFunction
+            << "Unknown polyPatch type "
             << patchType << " for patch " << name << nl << nl
             << "Valid polyPatch types are :" << endl
             << wordConstructorTablePtr_->sortedToc()
@@ -127,10 +124,8 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "polyPatch::New(const word&, const dictionary&, "
-                "const label, const polyBoundaryMesh&)",
                 dict
             )   << "Unknown polyPatch type "
                 << patchType << " for patch " << name << nl << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
index 4326d43f38..9855309451 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,11 +36,8 @@ void Foam::syncTools::swapBoundaryCellPositions
 {
     if (cellData.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "syncTools<class T>::swapBoundaryCellPositions"
-            "(const polyMesh&, const UList<T>&, List<T>&)"
-        )   << "Number of cell values " << cellData.size()
+        FatalErrorInFunction
+            << "Number of cell values " << cellData.size()
             << " is not equal to the number of cells in the mesh "
             << mesh.nCells() << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index cb1484b3b0..286bfb9a50 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -164,7 +164,8 @@ public:
                 const polyMesh&,
                 UList<T>&,
                 const CombineOp& cop,
-                const TransformOp& top
+                const TransformOp& top,
+                const bool parRun = Pstream::parRun()
             );
 
 
@@ -556,7 +557,8 @@ public:
             (
                 const polyMesh& mesh,
                 PackedList<nBits>& faceValues,
-                const CombineOp& cop
+                const CombineOp& cop,
+                const bool parRun = Pstream::parRun()
             );
 
             template<unsigned nBits>
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index f9b90ae0a1..ff10807dd8 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -773,12 +773,8 @@ void Foam::syncTools::syncEdgeMap
 //{
 //    if (pointValues.size() != mesh.nPoints())
 //    {
-//        FatalErrorIn
-//        (
-//            "syncTools<class T, class CombineOp>::syncPointList"
-//            "(const polyMesh&, List<T>&, const CombineOp&, const T&"
-//            ", const bool)"
-//        )   << "Number of values " << pointValues.size()
+//        FatalErrorInFunction
+//            << "Number of values " << pointValues.size()
 //            << " is not equal to the number of points in the mesh "
 //            << mesh.nPoints() << abort(FatalError);
 //    }
@@ -950,12 +946,8 @@ void Foam::syncTools::syncEdgeMap
 //{
 //    if (pointValues.size() != meshPoints.size())
 //    {
-//        FatalErrorIn
-//        (
-//            "syncTools<class T, class CombineOp>::syncPointList"
-//            "(const polyMesh&, const labelList&, List<T>&, const CombineOp&"
-//            ", const T&, const bool)"
-//        )   << "Number of values " << pointValues.size()
+//        FatalErrorInFunction
+//            << "Number of values " << pointValues.size()
 //            << " is not equal to the number of points "
 //            << meshPoints.size() << abort(FatalError);
 //    }
@@ -999,12 +991,8 @@ void Foam::syncTools::syncPointList
 {
     if (pointValues.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "syncTools<class T, class CombineOp>::syncPointList"
-            "(const polyMesh&, List<T>&, const CombineOp&, const T&"
-            ", const bool)"
-        )   << "Number of values " << pointValues.size()
+        FatalErrorInFunction
+            << "Number of values " << pointValues.size()
             << " is not equal to the number of points in the mesh "
             << mesh.nPoints() << abort(FatalError);
     }
@@ -1024,11 +1012,8 @@ void Foam::syncTools::syncPointList
 //{
 //    if (pointValues.size() != mesh.nPoints())
 //    {
-//        FatalErrorIn
-//        (
-//            "syncTools<class CombineOp>::syncPointPositions"
-//            "(const polyMesh&, List<point>&, const CombineOp&, const point&)"
-//        )   << "Number of values " << pointValues.size()
+//        FatalErrorInFunction
+//            << "Number of values " << pointValues.size()
 //            << " is not equal to the number of points in the mesh "
 //            << mesh.nPoints() << abort(FatalError);
 //    }
@@ -1050,11 +1035,8 @@ void Foam::syncTools::syncPointList
 {
     if (pointValues.size() != meshPoints.size())
     {
-        FatalErrorIn
-        (
-            "syncTools<class T, class CombineOp>::syncPointList"
-            "(const polyMesh&, List<T>&, const CombineOp&, const T&)"
-        )   << "Number of values " << pointValues.size()
+        FatalErrorInFunction
+            << "Number of values " << pointValues.size()
             << " is not equal to the number of meshPoints "
             << meshPoints.size() << abort(FatalError);
     }
@@ -1109,11 +1091,8 @@ void Foam::syncTools::syncPointList
 //{
 //    if (pointValues.size() != meshPoints.size())
 //    {
-//        FatalErrorIn
-//        (
-//            "syncTools<class CombineOp>::syncPointList"
-//            "(const polyMesh&, List<point>&, const CombineOp&, const point&)"
-//        )   << "Number of values " << pointValues.size()
+//        FatalErrorInFunction
+//            << "Number of values " << pointValues.size()
 //            << " is not equal to the number of meshPoints "
 //            << meshPoints.size() << abort(FatalError);
 //    }
@@ -1169,11 +1148,8 @@ void Foam::syncTools::syncEdgeList
 {
     if (edgeValues.size() != mesh.nEdges())
     {
-        FatalErrorIn
-        (
-            "syncTools<class T, class CombineOp>::syncEdgeList"
-            "(const polyMesh&, List<T>&, const CombineOp&, const T&)"
-        )   << "Number of values " << edgeValues.size()
+        FatalErrorInFunction
+            << "Number of values " << edgeValues.size()
             << " is not equal to the number of edges in the mesh "
             << mesh.nEdges() << abort(FatalError);
     }
@@ -1215,11 +1191,8 @@ void Foam::syncTools::syncEdgeList
 //{
 //    if (edgeValues.size() != mesh.nEdges())
 //    {
-//        FatalErrorIn
-//        (
-//            "syncTools<class CombineOp>::syncEdgePositions"
-//            "(const polyMesh&, List<point>&, const CombineOp&, const point&)"
-//        )   << "Number of values " << edgeValues.size()
+//        FatalErrorInFunction
+//            << "Number of values " << edgeValues.size()
 //            << " is not equal to the number of edges in the mesh "
 //            << mesh.nEdges() << abort(FatalError);
 //    }
@@ -1264,11 +1237,8 @@ void Foam::syncTools::syncEdgeList
 {
     if (edgeValues.size() != meshEdges.size())
     {
-        FatalErrorIn
-        (
-            "syncTools<class T, class CombineOp>::syncEdgeList"
-            "(const polyMesh&, List<T>&, const CombineOp&, const T&)"
-        )   << "Number of values " << edgeValues.size()
+        FatalErrorInFunction
+            << "Number of values " << edgeValues.size()
             << " is not equal to the number of meshEdges "
             << meshEdges.size() << abort(FatalError);
     }
@@ -1316,26 +1286,23 @@ void Foam::syncTools::syncBoundaryFaceList
     const polyMesh& mesh,
     UList<T>& faceValues,
     const CombineOp& cop,
-    const TransformOp& top
+    const TransformOp& top,
+    const bool parRun
 )
 {
     const label nBFaces = mesh.nFaces() - mesh.nInternalFaces();
 
     if (faceValues.size() != nBFaces)
     {
-        FatalErrorIn
-        (
-            "syncTools<class T, class CombineOp>::syncBoundaryFaceList"
-            "(const polyMesh&, UList<T>&, const CombineOp&"
-            ", const bool)"
-        )   << "Number of values " << faceValues.size()
+        FatalErrorInFunction
+            << "Number of values " << faceValues.size()
             << " is not equal to the number of boundary faces in the mesh "
             << nBFaces << abort(FatalError);
     }
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    if (Pstream::parRun())
+    if (parRun)
     {
         PstreamBuffers pBufs(Pstream::nonBlocking);
 
@@ -1441,23 +1408,21 @@ void Foam::syncTools::syncFaceList
 (
     const polyMesh& mesh,
     PackedList<nBits>& faceValues,
-    const CombineOp& cop
+    const CombineOp& cop,
+    const bool parRun
 )
 {
     if (faceValues.size() != mesh.nFaces())
     {
-        FatalErrorIn
-        (
-            "syncTools<unsigned nBits, class CombineOp>::syncFaceList"
-            "(const polyMesh&, PackedList<nBits>&, const CombineOp&)"
-        )   << "Number of values " << faceValues.size()
+        FatalErrorInFunction
+            << "Number of values " << faceValues.size()
             << " is not equal to the number of faces in the mesh "
             << mesh.nFaces() << abort(FatalError);
     }
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    if (Pstream::parRun())
+    if (parRun)
     {
         PstreamBuffers pBufs(Pstream::nonBlocking);
 
@@ -1563,11 +1528,8 @@ void Foam::syncTools::swapBoundaryCellList
 {
     if (cellData.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "syncTools<class T>::swapBoundaryCellList"
-            "(const polyMesh&, const UList<T>&, List<T>&)"
-        )   << "Number of cell values " << cellData.size()
+        FatalErrorInFunction
+            << "Number of cell values " << cellData.size()
             << " is not equal to the number of cells in the mesh "
             << mesh.nCells() << abort(FatalError);
     }
@@ -1614,12 +1576,8 @@ void Foam::syncTools::syncPointList
 {
     if (pointValues.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "syncTools<unsigned nBits, class CombineOp>::syncPointList"
-            "(const polyMesh&, PackedList<nBits>&, const CombineOp&"
-            ", const unsigned int)"
-        )   << "Number of values " << pointValues.size()
+        FatalErrorInFunction
+            << "Number of values " << pointValues.size()
             << " is not equal to the number of points in the mesh "
             << mesh.nPoints() << abort(FatalError);
     }
@@ -1661,12 +1619,8 @@ void Foam::syncTools::syncEdgeList
 {
     if (edgeValues.size() != mesh.nEdges())
     {
-        FatalErrorIn
-        (
-            "syncTools<unsigned nBits, class CombineOp>::syncEdgeList"
-            "(const polyMesh&, PackedList<nBits>&, const CombineOp&"
-            ", const unsigned int)"
-        )   << "Number of values " << edgeValues.size()
+        FatalErrorInFunction
+            << "Number of values " << edgeValues.size()
             << " is not equal to the number of edges in the mesh "
             << mesh.nEdges() << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 0c0525d9ee..5e44455f0c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ void Foam::ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
     // if the pointer is already set
     if (zoneMapPtr_)
     {
-        FatalErrorIn("void ZoneMesh<ZoneType>::calcZoneMap() const")
+        FatalErrorInFunction
             << "zone map already calculated"
             << abort(FatalError);
     }
@@ -82,14 +82,8 @@ bool Foam::ZoneMesh<ZoneType, MeshType>::read()
     {
         if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
         {
-            WarningIn
-            (
-                "ZoneMesh::ZoneMesh\n"
-                "(\n"
-                "    const IOobject&,\n"
-                "    const MeshType&\n"
-                ")"
-            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            WarningInFunction
+                << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
                 << " does not support automatic rereading."
                 << endl;
         }
@@ -548,10 +542,8 @@ const ZoneType& Foam::ZoneMesh<ZoneType, MeshType>::operator[]
 
     if (zoneI < 0)
     {
-        FatalErrorIn
-        (
-            "ZoneMesh<ZoneType>::operator[](const word&) const"
-        )   << "Zone named " << zoneName << " not found." << nl
+        FatalErrorInFunction
+            << "Zone named " << zoneName << " not found." << nl
             << "Available zone names: " << names() << endl
             << abort(FatalError);
     }
@@ -570,10 +562,8 @@ ZoneType& Foam::ZoneMesh<ZoneType, MeshType>::operator[]
 
     if (zoneI < 0)
     {
-        FatalErrorIn
-        (
-            "ZoneMesh<ZoneType>::operator[](const word&)"
-        )   << "Zone named " << zoneName << " not found." << nl
+        FatalErrorInFunction
+            << "Zone named " << zoneName << " not found." << nl
             << "Available zone names: " << names() << endl
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
index 869914608d..983ff5d8b8 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,8 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cellZone::New(const word&, const dictionary&, "
-            "const label, const cellZoneMesh&)",
             dict
         )   << "Unknown cellZone type "
             << zoneType << nl << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index fd1f72e875..60eb63af66 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,8 @@ void Foam::faceZone::calcFaceZonePatch() const
 
     if (patchPtr_)
     {
-        FatalErrorIn
-        (
-            "void faceZone::calcFaceZonePatch() const"
-        )   << "primitive face zone patch already calculated"
+        FatalErrorInFunction
+            << "primitive face zone patch already calculated"
             << abort(FatalError);
     }
 
@@ -111,7 +109,7 @@ void Foam::faceZone::calcCellLayers() const
     // if the pointer is already set
     if (masterCellsPtr_ || slaveCellsPtr_)
     {
-        FatalErrorIn("void faceZone::calcCellLayers() const")
+        FatalErrorInFunction
             << "cell layers already calculated"
             << abort(FatalError);
     }
@@ -165,8 +163,7 @@ void Foam::faceZone::checkAddressing() const
 {
     if (size() != flipMap_.size())
     {
-        FatalErrorIn("void Foam::faceZone::checkAddressing() const")
-            << "Different sizes of the addressing and flipMap arrays.  "
+        FatalErrorInFunction
             << "Size of addressing: " << size()
             << " size of flip map: " << flipMap_.size()
             << abort(FatalError);
@@ -182,7 +179,7 @@ void Foam::faceZone::checkAddressing() const
     {
         if (!hasWarned && (mf[i] < 0 || mf[i] >= nFaces))
         {
-            WarningIn("void Foam::faceZone::checkAddressing() const")
+            WarningInFunction
                 << "Illegal face index " << mf[i] << " outside range 0.."
                 << nFaces-1 << endl;
             hasWarned = true;
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
index e38849d983..8c75b01c08 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,8 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "faceZone::New(const word&, const dictionary&, "
-            "const label, const faceZoneMesh&)",
             dict
         )   << "Unknown faceZone type "
             << zoneType << nl << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
index 6b873943b6..f2ddb5480c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,8 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "pointZone::New(const word&, const dictionary&, "
-            "const label, const pointZoneMesh&)",
             dict
         )   << "Unknown pointZone type "
             << zoneType << nl << nl
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
index 23a7ab3d7f..8d31b8a3ad 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ void Foam::zone::calcLookupMap() const
 
     if (lookupMapPtr_)
     {
-        FatalErrorIn("void zone::calcLookupMap() const")
+        FatalErrorInFunction
             << "Lookup map already calculated" << nl
             << abort(FatalError);
     }
@@ -207,11 +207,8 @@ bool Foam::zone::checkDefinition(const label maxSize, const bool report) const
 
             if (report)
             {
-                SeriousErrorIn
-                (
-                    "bool zone::checkDefinition("
-                    "const label maxSize, const bool report) const"
-                )   << "Zone " << name_
+                SeriousErrorInFunction
+                    << "Zone " << name_
                     << " contains invalid index label " << addr[i] << nl
                     << "Valid index labels are 0.."
                     << maxSize-1 << endl;
@@ -226,11 +223,8 @@ bool Foam::zone::checkDefinition(const label maxSize, const bool report) const
         {
             if (report)
             {
-                WarningIn
-                (
-                    "bool zone::checkDefinition("
-                    "const label maxSize, const bool report) const"
-                )   << "Zone " << name_
+                WarningInFunction
+                    << "Zone " << name_
                     << " contains duplicate index label " << addr[i] << endl;
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
index 88cce88751..95f49cea12 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,10 +73,7 @@ Foam::PatchTools::edgeOwner
 
             if (edgeOwner[edgeI] == -1)
             {
-                FatalErrorIn
-                (
-                    "PatchTools::edgeOwner()"
-                )
+                FatalErrorInFunction
                     << "Edge " << edgeI << " vertices:" << edges[edgeI]
                     << " is used by faces " << nbrFaces
                     << " vertices:"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
index 8ecd790b1e..6533c3ca17 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSearch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,18 +89,7 @@ Foam::PatchTools::markZone
                         }
                         else if (faceZone[nbrFaceI] != currentZone)
                         {
-                            FatalErrorIn
-                            (
-                                "PatchTools::markZone"
-                                "("
-                                    "const PrimitivePatch<Face, FaceList, "
-                                        "PointField, PointType>& p,"
-                                    "const BoolListType& borderEdge,"
-                                    "const label faceI,"
-                                    "const label currentZone,"
-                                    "labelList&  faceZone"
-                                ")"
-                            )
+                            FatalErrorInFunction
                                 << "Zones " << faceZone[nbrFaceI]
                                 << " at face " << nbrFaceI
                                 << " connects to zone " << currentZone
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
index e6e507caaa..a1e93db9fc 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ Foam::PatchTools::sortedPointEdges
             nVisitedEdges++;
             if (nVisitedEdges > nPointEdges)
             {
-                WarningIn("Foam::PatchTools::sortedPointEdges()")
+                WarningInFunction
                     << "Unable to order pointEdges as the face connections "
                     << "are not circular" << nl
                     << "    Original pointEdges = " << pEdges << nl
@@ -130,7 +130,7 @@ Foam::PatchTools::sortedPointEdges
             {
                 if (findIndex(newEdgeList, pEdges[eI]) == -1)
                 {
-                    WarningIn("Foam::PatchTools::sortedPointEdges()")
+                    WarningInFunction
                         << "Cannot find all original edges in the new list"
                         << nl
                         << "    Original pointEdges = " << pEdges << nl
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index a2015069fe..0508eb3165 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,11 +62,8 @@ calcAddressing() const
     {
         // it is considered an error to attempt to recalculate
         // if already allocated
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcAddressing()"
-        )   << "addressing already calculated"
+        FatalErrorInFunction
+            << "addressing already calculated"
             << abort(FatalError);
     }
 
@@ -245,11 +242,8 @@ calcAddressing() const
             }
             else
             {
-                FatalErrorIn
-                (
-                    "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-                    "calcAddressing()"
-                )   << "Error in internal edge insertion"
+                FatalErrorInFunction
+                    << "Error in internal edge insertion"
                     << abort(FatalError);
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
index 1cc39fb96b..fe0a80ef28 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,11 +52,8 @@ calcBdryPoints() const
     {
         // it is considered an error to attempt to recalculate
         // if already allocated
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcBdryPoints()"
-        )   << "edge types already calculated"
+        FatalErrorInFunction
+            << "edge types already calculated"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
index a454823a56..68be5b7ab5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,6 @@ Description
 #include "Map.H"
 #include "ListOps.H"
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template
@@ -79,11 +78,8 @@ visitPointRegion
 
         if (nextEdgeI == -1)
         {
-            FatalErrorIn
-            (
-                "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-                "visitPointRegion"
-            )   << "Problem: cannot find edge out of " << fEdges
+            FatalErrorInFunction
+                << "Problem: cannot find edge out of " << fEdges
                 << "on face " << startFaceI << " that uses point " << pointI
                 << " and is not edge " << startEdgeI << abort(FatalError);
         }
@@ -192,7 +188,7 @@ checkTopology
 
     const labelListList& edgeFcs = edgeFaces();
 
-    surfaceTopo surfaceType = MANIFOLD;
+    bool illegalTopo = false;
 
     forAll(edgeFcs, edgeI)
     {
@@ -200,7 +196,7 @@ checkTopology
 
         if (nNbrs < 1 || nNbrs > 2)
         {
-            surfaceType = ILLEGAL;
+            illegalTopo = true;
 
             if (report)
             {
@@ -217,10 +213,6 @@ checkTopology
                 setPtr->insert(meshPoints()[e.end()]);
             }
         }
-        else if (nNbrs == 1)
-        {
-            surfaceType = OPEN;
-        }
     }
 
     if (debug)
@@ -231,7 +223,7 @@ checkTopology
             << endl;
     }
 
-    return surfaceType == ILLEGAL;
+    return illegalTopo;
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
index d0c2e3c1cb..3a7501083a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,11 +55,8 @@ calcEdgeLoops() const
     {
         // it is considered an error to attempt to recalculate
         // if already allocated
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcIntBdryEdges()"
-        )   << "edge loops already calculated"
+        FatalErrorInFunction
+            << "edge loops already calculated"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index 852262c32b..7284c313d9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,11 +58,8 @@ calcLocalPointOrder() const
     {
         // it is considered an error to attempt to recalculate
         // if already allocated
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcLocalPointOrder()"
-        )   << "local point order already calculated"
+        FatalErrorInFunction
+            << "local point order already calculated"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
index 8816a11785..10f758c648 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,11 +51,8 @@ calcMeshData() const
     // if they have already been calculated.
     if (meshPointsPtr_ || localFacesPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcMeshData()"
-        )   << "meshPointsPtr_ or localFacesPtr_already allocated"
+        FatalErrorInFunction
+            << "meshPointsPtr_ or localFacesPtr_already allocated"
             << abort(FatalError);
     }
 
@@ -164,11 +161,8 @@ calcMeshPointMap() const
     // if they have already been calculated.
     if (meshPointMapPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcMeshPointMap()"
-        )   << "meshPointMapPtr_ already allocated"
+        FatalErrorInFunction
+            << "meshPointMapPtr_ already allocated"
             << abort(FatalError);
     }
 
@@ -215,11 +209,8 @@ calcLocalPoints() const
     // if they have already been calculated.
     if (localPointsPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcLocalPoints()"
-        )   << "localPointsPtr_already allocated"
+        FatalErrorInFunction
+            << "localPointsPtr_already allocated"
             << abort(FatalError);
     }
 
@@ -267,11 +258,8 @@ calcPointNormals() const
     // if they have already been calculated.
     if (pointNormalsPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcPointNormals()"
-        )   << "pointNormalsPtr_already allocated"
+        FatalErrorInFunction
+            << "pointNormalsPtr_already allocated"
             << abort(FatalError);
     }
 
@@ -334,11 +322,8 @@ calcFaceCentres() const
     // if they have already been calculated.
     if (faceCentresPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcFaceCentres()"
-        )   << "faceCentresPtr_already allocated"
+        FatalErrorInFunction
+            << "faceCentresPtr_already allocated"
             << abort(FatalError);
     }
 
@@ -384,11 +369,8 @@ calcFaceNormals() const
     // if they have already been calculated.
     if (faceNormalsPtr_)
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcFaceNormals()"
-        )   << "faceNormalsPtr_already allocated"
+        FatalErrorInFunction
+            << "faceNormalsPtr_already allocated"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index 28863131b7..22374efe12 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,11 +55,8 @@ calcPointEdges() const
     {
         // it is considered an error to attempt to recalculate
         // if already allocated
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcPointEdges()"
-        )   << "pointEdges already calculated"
+        FatalErrorInFunction
+            << "pointEdges already calculated"
             << abort(FatalError);
     }
 
@@ -100,11 +97,8 @@ calcPointFaces() const
     {
         // it is considered an error to attempt to recalculate
         // if already allocated
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "calcPointFaces()"
-        )   << "pointFaces already calculated"
+        FatalErrorInFunction
+            << "pointFaces already calculated"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
index 61dc971e39..3fe3c7338a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,12 +56,8 @@ projectPoints
 
     if (projectionDirection.size() != nPoints())
     {
-        FatalErrorIn
-        (
-            "PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "projectPoints(const PrimitivePatch& "
-            ", const Field<PointType>&) const"
-        )   << "Projection direction field does not correspond to "
+        FatalErrorInFunction
+            << "Projection direction field does not correspond to "
             << "patch points." << endl
             << "Size: " << projectionDirection.size()
             << " Number of points: " << nPoints()
@@ -303,12 +299,8 @@ projectFaceCentres
 
     if (projectionDirection.size() != this->size())
     {
-        FatalErrorIn
-        (
-            "labelList PrimitivePatch<Face, FaceList, PointField, PointType>::"
-            "projectFaceCentres(const PrimitivePatch& "
-            ", const Field<PointType>&) const"
-        )   << "Projection direction field does not correspond to patch faces."
+        FatalErrorInFunction
+            << "Projection direction field does not correspond to patch faces."
             << endl << "Size: " << projectionDirection.size()
             << " Number of points: " << this->size()
             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index 595c286239..0e5beeeb03 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -310,11 +310,8 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMesh::movePoints
 {
     if (newPoints.size() <  nPoints() || oldPoints.size() < nPoints())
     {
-        FatalErrorIn
-        (
-            "primitiveMesh::movePoints(const pointField& newPoints, "
-            "const pointField& oldPoints)"
-        )   << "Cannot move points: size of given point list smaller "
+        FatalErrorInFunction
+            << "Cannot move points: size of given point list smaller "
             << "than the number of active points"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
index 1c35bde3ff..7144e41c23 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ void Foam::primitiveMesh::calcCellShapes() const
     // if the pointer is already set
     if (cellShapesPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcCellShapes() const")
+        FatalErrorInFunction
             << "cellShapes already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index 9f6ddf986e..8cb2c4360d 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ void Foam::primitiveMesh::calcCellCells() const
         {
             // For checking calls:abort so we can quickly hunt down
             // origin of call
-            FatalErrorIn("primitiveMesh::calcCellCells()")
+            FatalErrorInFunction
                 << abort(FatalError);
         }
     }
@@ -50,7 +50,7 @@ void Foam::primitiveMesh::calcCellCells() const
     // if the pointer is already set
     if (ccPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcCellCells() const")
+        FatalErrorInFunction
             << "cellCells already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 7f04d5877d..458336db20 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ void Foam::primitiveMesh::calcCellCentresAndVols() const
     // if the pointer is already set
     if (cellCentresPtr_ || cellVolumesPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcCellCentresAndVols() const")
+        FatalErrorInFunction
             << "Cell centres or cell volumes already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index 21e14118ff..a4e449af37 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ void Foam::primitiveMesh::calcCellEdges() const
         {
             // For checking calls:abort so we can quickly hunt down
             // origin of call
-            FatalErrorIn("primitiveMesh::calcCellEdges()")
+            FatalErrorInFunction
                 << abort(FatalError);
         }
     }
@@ -53,7 +53,7 @@ void Foam::primitiveMesh::calcCellEdges() const
     // if the pointer is already set
     if (cePtr_)
     {
-        FatalErrorIn("primitiveMesh::calcCellEdges() const")
+        FatalErrorInFunction
             << "cellEdges already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
index 8d520f2fa9..914b4755aa 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ const Foam::labelListList& Foam::primitiveMesh::cellPoints() const
             {
                 // For checking calls:abort so we can quickly hunt down
                 // origin of call
-                FatalErrorIn("primitiveMesh::cellPoints()")
+                FatalErrorInFunction
                     << abort(FatalError);
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index 5ba711be13..5f76854d8d 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ void Foam::primitiveMesh::calcCells() const
     // if the pointer is already set
     if (cfPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcCells() const")
+        FatalErrorInFunction
             << "cells already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index a0aacc8272..01daafe355 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -699,11 +699,8 @@ bool Foam::primitiveMesh::checkFaceAngles
 
     if (maxDeg < -SMALL || maxDeg > 180+SMALL)
     {
-        FatalErrorIn
-        (
-            "primitiveMesh::checkFaceAngles"
-            "(const bool, const scalar, labelHashSet*)"
-        )   << "maxDeg should be [0..180] but is now " << maxDeg
+        FatalErrorInFunction
+            << "maxDeg should be [0..180] but is now " << maxDeg
             << exit(FatalError);
     }
 
@@ -785,11 +782,8 @@ bool Foam::primitiveMesh::checkFaceFlatness
 
     if (warnFlatness < 0 || warnFlatness > 1)
     {
-        FatalErrorIn
-        (
-            "primitiveMesh::checkFaceFlatness"
-            "(const bool, const scalar, labelHashSet*)"
-        )   << "warnFlatness should be [0..1] but is now " << warnFlatness
+        FatalErrorInFunction
+            << "warnFlatness should be [0..1] but is now " << warnFlatness
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
index 22b5f9f162..9aeba752a3 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ const Foam::labelListList& Foam::primitiveMesh::edgeCells() const
             {
                 // For checking calls:abort so we can quickly hunt down
                 // origin of call
-                FatalErrorIn("primitiveMesh::edgeCells()")
+                FatalErrorInFunction
                     << abort(FatalError);
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
index 7b4c0e5fc8..7f028196ac 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ const Foam::labelListList& Foam::primitiveMesh::edgeFaces() const
             {
                 // For checking calls:abort so we can quickly hunt down
                 // origin of call
-                FatalErrorIn("primitiveMesh::edgeFaces()")
+                FatalErrorInFunction
                     << abort(FatalError);
             }
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index d39c6ad909..b79879f01f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
     // if the pointer is already set
     if ((edgesPtr_ || pePtr_) || (doFaceEdges && fePtr_))
     {
-        FatalErrorIn("primitiveMesh::calcEdges(const bool) const")
+        FatalErrorInFunction
             << "edges or pointEdges or faceEdges already calculated"
             << abort(FatalError);
     }
@@ -381,7 +381,7 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
                             else if (nbrPointI < nInternalPoints_)
                             {
                                 // Not possible!
-                                FatalErrorIn("primitiveMesh::calcEdges(..)")
+                                FatalErrorInFunction
                                     << abort(FatalError);
                             }
                             else
@@ -404,7 +404,7 @@ void Foam::primitiveMesh::calcEdges(const bool doFaceEdges) const
             {
                 const edge& e = es[edgeI];
 
-                FatalErrorIn("primitiveMesh::calcEdges(..)")
+                FatalErrorInFunction
                     << "Did not sort edge " << edgeI << " points:" << e
                     << " coords:" << points()[e[0]] << points()[e[1]]
                     << endl
@@ -483,11 +483,8 @@ Foam::label Foam::primitiveMesh::findFirstCommonElementFromSortedLists
     }
     if (result == -1)
     {
-        FatalErrorIn
-        (
-            "primitiveMesh::findFirstCommonElementFromSortedLists"
-            "(const labelList&, const labelList&)"
-        )   << "No common elements in lists " << list1 << " and " << list2
+        FatalErrorInFunction
+            << "No common elements in lists " << list1 << " and " << list2
             << abort(FatalError);
     }
     return result;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 589ff7a98b..236b1e30ee 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ void Foam::primitiveMesh::calcFaceCentresAndAreas() const
     // if the pointer is already set
     if (faceCentresPtr_ || faceAreasPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcFaceCentresAndAreas() const")
+        FatalErrorInFunction
             << "Face centres or face areas already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index fce127ee37..a30bf8858e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ void Foam::primitiveMesh::calcPointCells() const
         {
             // For checking calls:abort so we can quickly hunt down
             // origin of call
-            FatalErrorIn("primitiveMesh::calcPointCells()")
+            FatalErrorInFunction
                 << abort(FatalError);
         }
     }
@@ -51,7 +51,7 @@ void Foam::primitiveMesh::calcPointCells() const
     // if the pointer is already set
     if (pcPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcPointCells() const")
+        FatalErrorInFunction
             << "pointCells already calculated"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index a37ecef040..cb6fa58490 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ void Foam::primitiveMesh::calcPointPoints() const
         {
             // For checking calls:abort so we can quickly hunt down
             // origin of call
-            FatalErrorIn("primitiveMesh::calcPointPoints()")
+            FatalErrorInFunction
                 << abort(FatalError);
         }
     }
@@ -48,7 +48,7 @@ void Foam::primitiveMesh::calcPointPoints() const
     // if the pointer is already set
     if (ppPtr_)
     {
-        FatalErrorIn("primitiveMesh::calcPointPoints() const")
+        FatalErrorInFunction
             << "pointPoints already calculated"
             << abort(FatalError);
     }
@@ -76,7 +76,7 @@ void Foam::primitiveMesh::calcPointPoints() const
                 }
                 else
                 {
-                    FatalErrorIn("primitiveMesh::calcPointPoints() const")
+                    FatalErrorInFunction
                         << "something wrong with edges"
                         << abort(FatalError);
                 }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
index fe5a09b19f..fba0466599 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,10 +165,8 @@ Foam::patchZones::patchZones
 
     if (borderEdge.size() != pp_.nEdges())
     {
-        FatalErrorIn
-        (
-            "patchZones::patchZones(const primitivePatch&, const boolList&)"
-        )   << "borderEdge boolList not same size as number of edges" << endl
+        FatalErrorInFunction
+            << "borderEdge boolList not same size as number of edges" << endl
             << "borderEdge:" << borderEdge.size() << endl
             << "nEdges    :" << pp_.nEdges()
             << abort(FatalError);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
index 9e1455874b..5b721d7326 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ Foam::label Foam::walkPatch::getNeighbour
 
     if (nbrEdgeI == -1)
     {
-        FatalErrorIn("getNeighbour")
+        FatalErrorInFunction
             << "Did not find edge on face " << faceI << " that uses vertices"
             << v0 << " and " << v1 << abort(FatalError);
     }
@@ -114,7 +114,7 @@ Foam::label Foam::walkPatch::getNeighbour
     }
     else
     {
-        FatalErrorIn("getNeighbour")
+        FatalErrorInFunction
             << "Illegal surface on patch. Face " << faceI
             << " at vertices " << v0 << ',' << v1
             << " has fewer than 1 or more than 2 neighbours"
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
index 3e2e4dd698..e6196b9d37 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ public:
         {
             if (!hit_)
             {
-                FatalErrorIn("const Point& PointHit::hitPoint() const")
+                FatalErrorInFunction
                     << "requested a hit point for a miss"
                     << abort(FatalError);
             }
@@ -147,7 +147,7 @@ public:
         {
             if (hit_)
             {
-                FatalErrorIn("const Point& PointHit::missPoint() const")
+                FatalErrorInFunction
                     << "requested a miss point for a hit"
                     << abort(FatalError);
             }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
index 7e1103b276..fa15dbfd42 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
@@ -119,7 +119,7 @@ public:
         {
             if (!hit_)
             {
-                FatalErrorIn("PointIndexHit::hitPoint() const")
+                FatalErrorInFunction
                     << "requested a hit point for a miss"
                     << abort(FatalError);
             }
@@ -132,7 +132,7 @@ public:
         {
             if (hit_)
             {
-                FatalErrorIn("PointIndexHit::missPoint() const")
+                FatalErrorInFunction
                     << "requested a miss point for a hit"
                     << abort(FatalError);
             }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
index fe4f649f15..7f222fb8a8 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ void Foam::plane::calcPntAndVec(const scalarList& C)
             }
             else
             {
-                FatalErrorIn("void plane::calcPntAndVec(const scalarList&)")
+                FatalErrorInFunction
                     << "At least one plane coefficient must have a value"
                     << abort(FatalError);
             }
@@ -61,7 +61,7 @@ void Foam::plane::calcPntAndVec(const scalarList& C)
 
     if (magUnitVector < VSMALL)
     {
-        FatalErrorIn("void plane::calcPntAndVec(const scalarList&)")
+        FatalErrorInFunction
             << "Plane normal defined with zero length"
             << abort(FatalError);
     }
@@ -88,15 +88,8 @@ void Foam::plane::calcPntAndVec
      || mag(point3-point1) < VSMALL
     )
     {
-        FatalErrorIn
-        (
-            "void plane::calcPntAndVec\n"
-            "(\n"
-            "    const point&,\n"
-            "    const point&,\n"
-            "    const point&\n"
-            ")\n"
-        )   << "Bad points:" << point1 << ' ' << point2 << ' ' << point3
+        FatalErrorInFunction
+            << "Bad points:" << point1 << ' ' << point2 << ' ' << point3
             << abort(FatalError);
     }
 
@@ -105,15 +98,8 @@ void Foam::plane::calcPntAndVec
 
     if (magUnitVector < VSMALL)
     {
-        FatalErrorIn
-        (
-            "void plane::calcPntAndVec\n"
-            "(\n"
-            "    const point&,\n"
-            "    const point&,\n"
-            "    const point&\n"
-            ")\n"
-        )   << "Plane normal defined with zero length" << nl
+        FatalErrorInFunction
+            << "Plane normal defined with zero length" << nl
             << "Bad points:" << point1 << ' ' << point2 << ' ' << point3
             << abort(FatalError);
     }
@@ -138,7 +124,7 @@ Foam::plane::plane(const vector& normalVector)
     }
     else
     {
-        FatalErrorIn("plane::plane(const vector&)")
+        FatalErrorInFunction
             << "plane normal has zero length. basePoint:" << basePoint_
             << abort(FatalError);
     }
@@ -159,7 +145,7 @@ Foam::plane::plane(const point& basePoint, const vector& normalVector)
     }
     else
     {
-        FatalErrorIn("plane::plane(const point&, const vector&)")
+        FatalErrorInFunction
             << "plane normal has zero length. basePoint:" << basePoint_
             << abort(FatalError);
     }
@@ -226,7 +212,7 @@ Foam::plane::plane(const dictionary& dict)
     }
     else
     {
-        FatalIOErrorIn("plane::plane(const dictionary&)", dict)
+        FatalIOErrorInFunction(dict)
             << "Invalid plane type: " << planeType << nl
             << "Valid options include: planeEquation, embeddedPoints and "
             << "pointAndNormal"
@@ -249,7 +235,7 @@ Foam::plane::plane(Istream& is)
     }
     else
     {
-        FatalErrorIn("plane::plane(Istream& is)")
+        FatalErrorInFunction
             << "plane normal has zero length. basePoint:" << basePoint_
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H b/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H
new file mode 100644
index 0000000000..abd7f4ada0
--- /dev/null
+++ b/src/OpenFOAM/meshes/primitiveShapes/point/pointList.H
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::pointList
+
+Description
+    A List of points
+
+Typedef
+    Foam::pointListList
+
+Description
+    A List of labelList
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pointList_H
+#define pointList_H
+
+#include "point.H"
+#include "List.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Note: frequently used UList version is located in container itself
+
+    typedef List<point> pointList;
+    typedef List<pointList> pointListList;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index e941956d60..a5e6864c7c 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ inline Foam::triPointRef Foam::tetrahedron<Point, PointRef>::tri
     }
     else
     {
-        FatalErrorIn("tetrahedron::tri(const label faceI) const")
+        FatalErrorInFunction
             << "index out of range 0 -> 3. faceI = " << faceI
             << abort(FatalError);
         return triPointRef(b_, c_, d_);
@@ -907,7 +907,7 @@ tetSliceWithPlane
         }
         else
         {
-            FatalErrorIn("tetSliceWithPlane(..)")
+            FatalErrorInFunction
                 << "Missed edge:" << posEdge
                 << abort(FatalError);
         }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
index 85c8f8de56..6051b36c42 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,10 +93,7 @@ public:
         {
             if (t < -VSMALL)
             {
-                FatalErrorIn
-                (
-                    "scalar intersection::setPlanarTol(const scalar t)"
-                )   << "Negative planar tolerance.  This is not allowed."
+                FatalErrorInFunction
                     << abort(FatalError);
             }
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triPoints.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triPoints.H
new file mode 100644
index 0000000000..e152599dc6
--- /dev/null
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triPoints.H
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::triPoints
+
+Description
+    Triangle storage. Null constructable (unfortunately triangle<point, point>
+    is not)
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef triPoints_H
+#define triPoints_H
+
+#include "FixedList.H"
+#include "treeBoundBox.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class triPoints Declaration
+\*---------------------------------------------------------------------------*/
+
+class triPoints
+:
+    public FixedList<point, 3>
+{
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline triPoints()
+        {}
+
+        //- Construct from points
+        inline triPoints
+        (
+            const point& a,
+            const point& b,
+            const point& c
+        )
+        {
+            operator[](0) = a;
+            operator[](1) = b;
+            operator[](2) = c;
+        }
+
+
+    // Member Functions
+
+        //- Calculate the bounding box
+        inline treeBoundBox bounds() const
+        {
+            treeBoundBox bb(operator[](0), operator[](0));
+            for (label i = 1; i < size(); i++)
+            {
+                bb.min() = min(bb.min(), operator[](i));
+                bb.max() = max(bb.max(), operator[](i));
+            }
+            return bb;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.C b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.C
new file mode 100644
index 0000000000..8085ccd8f0
--- /dev/null
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.C
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "triangle.H"
+#include "triPoints.H"
+#include "plane.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Point, class PointRef>
+template<class AboveOp, class BelowOp>
+inline void Foam::triangle<Point, PointRef>::triSliceWithPlane
+(
+    const plane& pl,
+    const triPoints& tri,
+    AboveOp& aboveOp,
+    BelowOp& belowOp
+)
+{
+    // distance to cutting plane
+    FixedList<scalar, 3> d;
+
+    // determine how many of the points are above the cutting plane
+    label nPos = 0;
+    label posI = -1;
+    label negI = -1;
+    forAll(tri, i)
+    {
+        d[i] = ((tri[i] - pl.refPoint()) & pl.normal());
+
+        if (d[i] > 0)
+        {
+            nPos++;
+            posI = i;
+        }
+        else
+        {
+            negI = i;
+        }
+    }
+
+    if (nPos == 3)
+    {
+        aboveOp(tri);
+    }
+    else if (nPos == 2)
+    {
+        // point under the plane
+        label i0 = negI;
+
+        // indices of remaining points
+        label i1 = d.fcIndex(i0);
+        label i2 = d.fcIndex(i1);
+
+        // determine the two intersection points
+        point p01 = planeIntersection(d, tri, i0, i1);
+        point p02 = planeIntersection(d, tri, i0, i2);
+
+        aboveOp(triPoints(tri[i1], tri[i2], p02));
+        aboveOp(triPoints(tri[i1], p02, p01));
+        belowOp(triPoints(tri[i0], p01, p02));
+    }
+    else if (nPos == 1)
+    {
+        // point above the plane
+        label i0 = posI;
+
+        // indices of remaining points
+        label i1 = d.fcIndex(i0);
+        label i2 = d.fcIndex(i1);
+
+        // determine the two intersection points
+        point p01 = planeIntersection(d, tri, i0, i1);
+        point p02 = planeIntersection(d, tri, i0, i2);
+
+        belowOp(triPoints(tri[i1], tri[i2], p02));
+        belowOp(triPoints(tri[i1], p02, p01));
+        aboveOp(triPoints(tri[i0], p01, p02));
+    }
+    else
+    {
+        // All below
+        belowOp(tri);
+    }
+}
+
+
+template<class Point, class PointRef>
+template<class AboveOp, class BelowOp>
+inline void Foam::triangle<Point, PointRef>::sliceWithPlane
+(
+    const plane& pl,
+    AboveOp& aboveOp,
+    BelowOp& belowOp
+) const
+{
+    triSliceWithPlane(pl, triPoints(a_, b_, c_), aboveOp, belowOp);
+}
+
+
+template<class Point, class PointRef>
+template<class InsideOp, class OutsideOp>
+inline void Foam::triangle<Point, PointRef>::triangleOverlap
+(
+    const vector& n,
+    const triangle<Point, PointRef>& tgt,
+    InsideOp& insideOp,
+    OutsideOp& outsideOp
+) const
+{
+    // There are two possibilities with this algorithm - we either cut
+    // the outside triangles with all the edges or not (and keep them
+    // as disconnected triangles). In the first case
+    // we cannot do any evaluation short cut so we've chosen not to re-cut
+    // the outside triangles.
+
+
+    triIntersectionList insideTrisA;
+    label nInsideA = 0;
+    storeOp insideOpA(insideTrisA, nInsideA);
+
+    triIntersectionList outsideTrisA;
+    label nOutsideA = 0;
+    storeOp outsideOpA(outsideTrisA, nOutsideA);
+
+
+    const triPoints thisTri(a_, b_, c_);
+
+
+    // Cut original triangle with tgt edge 0.
+    // From *this to insideTrisA, outsideTrisA.
+    {
+        scalar s = Foam::mag(tgt.b() - tgt.a());
+        const plane pl0(tgt.a(), tgt.b(), tgt.b() + s*n);
+        triSliceWithPlane(pl0, thisTri, insideOpA, outsideOpA);
+    }
+
+    // Shortcut if nothing cut
+
+    if (insideOpA.nTris_ == 0)
+    {
+        outsideOp(thisTri);
+        return;
+    }
+
+    if (outsideOpA.nTris_ == 0)
+    {
+        insideOp(thisTri);
+        return;
+    }
+
+
+    // Cut all triangles with edge 1.
+    // From insideTrisA to insideTrisB, outsideTrisA
+
+    triIntersectionList insideTrisB;
+    label nInsideB = 0;
+    storeOp insideOpB(insideTrisB, nInsideB);
+
+    //triIntersectionList outsideTrisB;
+    //label nOutsideB = 0;
+    //storeOp outsideOpB(outsideTrisB, nOutsideB);
+
+    {
+        scalar s = Foam::mag(tgt.c() - tgt.b());
+        const plane pl0(tgt.b(), tgt.c(), tgt.c() + s*n);
+
+        for (label i = 0; i < insideOpA.nTris_; i++)
+        {
+            const triPoints& tri = insideOpA.tris_[i];
+            triSliceWithPlane(pl0, tri, insideOpB, outsideOpA);
+        }
+
+        //// Recut outside triangles (not necessary if only interested in
+        //// intersection properties)
+        //for (label i = 0; i < outsideOpA.nTris_; i++)
+        //{
+        //    const triPoints& tri = outsideOpA.tris_[i];
+        //    triSliceWithPlane(pl0, tri, outsideOpB, outsideOpB);
+        //}
+    }
+
+
+    // Cut all triangles with edge 2.
+    // From insideTrisB to insideTrisA, outsideTrisA
+    {
+        scalar s = Foam::mag(tgt.a() - tgt.c());
+        const plane pl0(tgt.c(), tgt.a(), tgt.a() + s*n);
+
+        insideOpA.nTris_ = 0;
+        //outsideOpA.nTris_ = 0;
+        for (label i = 0; i < insideOpB.nTris_; i++)
+        {
+            const triPoints& tri = insideOpB.tris_[i];
+            triSliceWithPlane(pl0, tri, insideOpA, outsideOpA);
+        }
+
+        //// Recut outside triangles (not necessary if only interested in
+        //// intersection properties)
+        //for (label i = 0; i < outsideOpB.nTris_; i++)
+        //{
+        //    const triPoints& tri = outsideOpB.tris_[i];
+        //    triSliceWithPlane(pl0, tri, outsideOpA, outsideOpA);
+        //}
+    }
+
+    // Transfer from A to argument
+    for (label i = 0; i < insideOpA.nTris_; i++)
+    {
+        insideOp(insideOpA.tris_[i]);
+    }
+
+    for (label i = 0; i < outsideOpA.nTris_; i++)
+    {
+        outsideOp(outsideOpA.tris_[i]);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
index 6e8030c797..de477d20e0 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,6 +52,8 @@ namespace Foam
 
 class Istream;
 class Ostream;
+class triPoints;
+class plane;
 
 // Forward declaration of friend functions and operators
 
@@ -71,6 +73,8 @@ inline Ostream& operator<<
     const triangle<Point, PointRef>&
 );
 
+typedef triangle<point, const point&> triPointRef;
+
 
 /*---------------------------------------------------------------------------*\
                           Class triangle Declaration
@@ -79,27 +83,98 @@ inline Ostream& operator<<
 template<class Point, class PointRef>
 class triangle
 {
+public:
+
+    // Public typedefs
+
+        //- Storage type for triangles originating from intersecting triangle
+        //  with another triangle
+        typedef FixedList<triPoints, 27> triIntersectionList;
+
+        //- Return types for classify
+        enum proxType
+        {
+            NONE,
+            POINT,  // Close to point
+            EDGE    // Close to edge
+        };
+
+
+    // Public classes
+
+        // Classes for use in sliceWithPlane. What to do with decomposition
+        // of triangle.
+
+            //- Dummy
+            class dummyOp
+            {
+            public:
+                inline void operator()(const triPoints&);
+            };
+
+            //- Sum resulting areas
+            class sumAreaOp
+            {
+            public:
+                scalar area_;
+
+                inline sumAreaOp();
+
+                inline void operator()(const triPoints&);
+            };
+
+            //- Store resulting tris
+            class storeOp
+            {
+            public:
+                triIntersectionList& tris_;
+                label& nTris_;
+
+                inline storeOp(triIntersectionList&, label&);
+
+                inline void operator()(const triPoints&);
+            };
+
+
+private:
+
     // Private data
 
         PointRef a_, b_, c_;
 
 
+   // Private Member Functions
+
+        //- Helper: calculate intersection point
+        inline static point planeIntersection
+        (
+            const FixedList<scalar, 3>& d,
+            const triPoints& t,
+            const label negI,
+            const label posI
+        );
+
+        //- Helper: slice triangle with plane
+        template<class AboveOp, class BelowOp>
+        inline static void triSliceWithPlane
+        (
+            const plane& pl,
+            const triPoints& tri,
+            AboveOp& aboveOp,
+            BelowOp& belowOp
+        );
+
+
 public:
 
-    //- Return types for classify
-    enum proxType
-    {
-        NONE,
-        POINT,  // Close to point
-        EDGE    // Close to edge
-    };
-
-
     // Constructors
 
         //- Construct from three points
         inline triangle(const Point& a, const Point& b, const Point& c);
 
+        //- Construct from three points
+        inline triangle(const FixedList<Point, 3>&);
+
         //- Construct from three points in the list of points
         //  The indices could be from triFace etc.
         inline triangle
@@ -237,6 +312,27 @@ public:
                 pointHit& edgePoint
             ) const;
 
+            //- Decompose triangle into triangles above and below plane
+            template<class AboveOp, class BelowOp>
+            inline void sliceWithPlane
+            (
+                const plane& pl,
+                AboveOp& aboveOp,
+                BelowOp& belowOp
+            ) const;
+
+            //- Decompose triangle into triangles inside and outside
+            //  (with respect to user provided normal) other
+            //  triangle.
+            template<class InsideOp, class OutsideOp>
+            inline void triangleOverlap
+            (
+                const vector& n,
+                const triangle<Point, PointRef>& tri,
+                InsideOp& insideOp,
+                OutsideOp& outsideOp
+            ) const;
+
 
     // IOstream operators
 
@@ -264,6 +360,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "triangle.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index fbc5a14286..e3f8993e2e 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "IOstreams.H"
 #include "pointHit.H"
+#include "triPoints.H"
 #include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -43,6 +44,18 @@ inline Foam::triangle<Point, PointRef>::triangle
 {}
 
 
+template<class Point, class PointRef>
+inline Foam::triangle<Point, PointRef>::triangle
+(
+    const FixedList<Point, 3>& tri
+)
+:
+    a_(tri[0]),
+    b_(tri[1]),
+    c_(tri[2])
+{}
+
+
 template<class Point, class PointRef>
 inline Foam::triangle<Point, PointRef>::triangle
 (
@@ -804,6 +817,66 @@ inline Foam::pointHit Foam::triangle<Point, PointRef>::nearestPoint
 }
 
 
+template<class Point, class PointRef>
+inline void Foam::triangle<Point, PointRef>::dummyOp::operator()
+(
+    const triPoints&
+)
+{}
+
+
+template<class Point, class PointRef>
+inline Foam::triangle<Point, PointRef>::sumAreaOp::sumAreaOp()
+:
+    area_(0.0)
+{}
+
+
+template<class Point, class PointRef>
+inline void Foam::triangle<Point, PointRef>::sumAreaOp::operator()
+(
+    const triPoints& tri
+)
+{
+    area_ += triangle<Point, const Point&>(tri).mag();
+}
+
+
+template<class Point, class PointRef>
+inline Foam::triangle<Point, PointRef>::storeOp::storeOp
+(
+    triIntersectionList& tris,
+    label& nTris
+)
+:
+    tris_(tris),
+    nTris_(nTris)
+{}
+
+
+template<class Point, class PointRef>
+inline void Foam::triangle<Point, PointRef>::storeOp::operator()
+(
+    const triPoints& tri
+)
+{
+    tris_[nTris_++] = tri;
+}
+
+
+template<class Point, class PointRef>
+inline Foam::point Foam::triangle<Point, PointRef>::planeIntersection
+(
+    const FixedList<scalar, 3>& d,
+    const triPoints& t,
+    const label negI,
+    const label posI
+)
+{
+    return (d[posI]*t[negI] - d[negI]*t[posI])/(-d[negI] + d[posI]);
+}
+
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 template<class Point, class PointRef>
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
index 1cec955dbd..9dfb3e9094 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,10 +130,8 @@ Foam::treeBoundBox::treeBoundBox(const UList<point>& points)
 {
     if (points.empty())
     {
-        WarningIn
-        (
-            "treeBoundBox::treeBoundBox(const UList<point>&)"
-        )   << "cannot find bounding box for zero-sized pointField, "
+        WarningInFunction
+            << "cannot find bounding box for zero-sized pointField, "
             << "returning zero" << endl;
 
         return;
@@ -151,11 +149,8 @@ Foam::treeBoundBox::treeBoundBox
 {
     if (points.empty() || indices.empty())
     {
-        WarningIn
-        (
-            "treeBoundBox::treeBoundBox"
-            "(const UList<point>&, const labelUList&)"
-        )   << "cannot find bounding box for zero-sized pointField, "
+        WarningInFunction
+            << "cannot find bounding box for zero-sized pointField, "
             << "returning zero" << endl;
 
         return;
@@ -195,10 +190,8 @@ Foam::treeBoundBox Foam::treeBoundBox::subBbox
 {
     if (octant > 7)
     {
-        FatalErrorIn
-        (
-            "treeBoundBox::subBbox(const point&, const direction)"
-        )   << "octant should be [0..7]"
+        FatalErrorInFunction
+            << "octant should be [0..7]"
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C
index 3e7fd2d1aa..a06469fbfd 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,11 +42,8 @@ Foam::treeBoundBox::treeBoundBox
     // points may be empty, but a FixedList is never empty
     if (points.empty())
     {
-        WarningIn
-        (
-            "treeBoundBox::treeBoundBox"
-            "(const UList<point>&, const FixedList<label, Size>&)"
-        )   << "cannot find bounding box for zero-sized pointField, "
+        WarningInFunction
+            << "cannot find bounding box for zero-sized pointField, "
             << "returning zero" << endl;
 
         return;
diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H
index 6715bffd7e..ef30fb547f 100644
--- a/src/OpenFOAM/primitives/Pair/Pair.H
+++ b/src/OpenFOAM/primitives/Pair/Pair.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
         {
             if (first() == second())
             {
-                FatalErrorIn("Pair<Type>::other(const Type&) const")
+                FatalErrorInFunction
                     << "Call to other only valid for Pair with differing"
                     << " elements:" << *this << abort(FatalError);
             }
@@ -125,7 +125,7 @@ public:
             {
                 if (second() != a)
                 {
-                    FatalErrorIn("Pair<Type>::other(const Type&) const")
+                    FatalErrorInFunction
                         << "Pair " << *this
                         << " does not contain " << a << abort(FatalError);
                 }
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index de2eb11e71..05db9a2d80 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ const Scalar pTraits<Scalar>::max = ScalarVGREAT;
 const Scalar pTraits<Scalar>::rootMin = -ScalarROOTVGREAT;
 const Scalar pTraits<Scalar>::rootMax = ScalarROOTVGREAT;
 
-const char* pTraits<Scalar>::componentNames[] = { "x" };
+const char* pTraits<Scalar>::componentNames[] = { "" };
 
 pTraits<Scalar>::pTraits(const Scalar& p)
 :
@@ -90,7 +90,7 @@ Istream& operator>>(Istream& is, Scalar& s)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, Scalar&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected Scalar, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index f0c38d6d6a..c25a92b209 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -50,6 +50,9 @@ public:
     //- Component type
     typedef Scalar cmptType;
 
+    //- Equivalent type of labels used for valid component indexing
+    typedef label labelType;
+
     // Member constants
 
         enum
diff --git a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
index fa20ef6bf6..fd636a2529 100644
--- a/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,7 +165,7 @@ Foam::vector Foam::eigenValues(const tensor& t)
         // based on the above logic, PPP must be less than QQ
         else
         {
-            WarningIn("eigenValues(const tensor&)")
+            WarningInFunction
                 << "complex eigenvalues detected for tensor: " << t
                 << endl;
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
index 3d86f738f0..4ac7a9dcb5 100644
--- a/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
+++ b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ vector2D eigenValues(const tensor2D& t)
             }
             else
             {
-                FatalErrorIn("eigenValues(const tensor2D&)")
+                FatalErrorInFunction
                     << "zero and complex eigenvalues in tensor2D: " << t
                     << abort(FatalError);
             }
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index eb313e51ec..4752ea43f5 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -79,10 +79,8 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 #   ifdef FULLDEBUG
     if (d >= nCmpt)
     {
-        FatalErrorIn
-        (
-            "VectorSpace<Form, Cmpt, nCmpt>::component(direction) const"
-        )   << "index out of range"
+        FatalErrorInFunction
+            << "index out of range"
             << abort(FatalError);
     }
 #   endif
@@ -100,7 +98,7 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::component
 #   ifdef FULLDEBUG
     if (d >= nCmpt)
     {
-        FatalErrorIn("VectorSpace<Form, Cmpt, nCmpt>::component(direction)")
+        FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
@@ -120,10 +118,8 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::component
 #   ifdef FULLDEBUG
     if (d >= nCmpt)
     {
-        FatalErrorIn
-        (
-            "VectorSpace<Form, Cmpt, nCmpt>::component(Cmpt&, direction) const"
-        )   << "index out of range"
+        FatalErrorInFunction
+            << "index out of range"
             << abort(FatalError);
     }
 #   endif
@@ -142,11 +138,8 @@ inline void VectorSpace<Form, Cmpt, nCmpt>::replace
 #   ifdef FULLDEBUG
     if (d >= nCmpt)
     {
-        FatalErrorIn
-        (
-            "VectorSpace<Form, Cmpt, nCmpt>::"
-            "replace(direction, const Cmpt&) const"
-        )   << "index out of range"
+        FatalErrorInFunction
+            << "index out of range"
             << abort(FatalError);
     }
 #   endif
@@ -166,10 +159,8 @@ inline const Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 #   ifdef FULLDEBUG
     if (d >= nCmpt)
     {
-        FatalErrorIn
-        (
-            "VectorSpace<Form, Cmpt, nCmpt>::operator[](direction d) const"
-        )   << "index out of range"
+        FatalErrorInFunction
+            << "index out of range"
             << abort(FatalError);
     }
 #   endif
@@ -187,7 +178,7 @@ inline Cmpt& VectorSpace<Form, Cmpt, nCmpt>::operator[]
 #   ifdef FULLDEBUG
     if (d >= nCmpt)
     {
-        FatalErrorIn("VectorSpace<Form, Cmpt, nCmpt>::operator[](direction d)")
+        FatalErrorInFunction
             << "index out of range"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C
index e2a2a0d855..1ff04b5316 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ Foam::Switch::switchType Foam::Switch::asEnum
 
     if (!allowInvalid)
     {
-        FatalErrorIn("Switch::asEnum(const std::string&, const bool)")
+        FatalErrorInFunction
             << "unknown switch word " << str << nl
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
index 2719328524..e716820d5f 100644
--- a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
+++ b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
         else
         {
             is.setBad();
-            FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
+            FatalIOErrorInFunction(is)
                 << "expected 'true/false', 'on/off' ... found " << t.wordToken()
                 << exit(FatalIOError);
 
@@ -72,7 +72,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected bool, found " << t
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.C b/src/OpenFOAM/primitives/bools/bool/bool.C
index 5a26a155c4..5969cadcea 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.C
+++ b/src/OpenFOAM/primitives/bools/bool/bool.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ const char* const Foam::pTraits<bool>::typeName = "bool";
 const bool Foam::pTraits<bool>::zero = false;
 const bool Foam::pTraits<bool>::one = true;
 
-const char* Foam::pTraits<bool>::componentNames[] = { "x" };
+const char* Foam::pTraits<bool>::componentNames[] = { "" };
 
 Foam::pTraits<bool>::pTraits(const bool& p)
 :
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
index 28b0924db9..4f3d1b12d3 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
@@ -36,7 +36,7 @@ namespace Foam
     {
         if (componentColumns_[0] >= splitted.size())
         {
-            FatalErrorIn("CSV<label>::readValue(const List<string>&)")
+            FatalErrorInFunction
                 << "No column " << componentColumns_[0] << " in "
                 << splitted << endl
                 << exit(FatalError);
@@ -50,7 +50,7 @@ namespace Foam
     {
         if (componentColumns_[0] >= splitted.size())
         {
-            FatalErrorIn("CSV<scalar>::readValue(const List<string>&)")
+            FatalErrorInFunction
                 << "No column " << componentColumns_[0] << " in "
                 << splitted << endl
                 << exit(FatalError);
@@ -69,7 +69,7 @@ namespace Foam
         {
             if (componentColumns_[i] >= splitted.size())
             {
-                FatalErrorIn("CSV<Type>::readValue(const List<string>&)")
+                FatalErrorInFunction
                     << "No column " << componentColumns_[i] << " in "
                     << splitted << endl
                     << exit(FatalError);
@@ -92,7 +92,7 @@ void Foam::CSV<Type>::read()
 
     if (!is.good())
     {
-        FatalIOErrorIn("CSV<Type>::read()", is)
+        FatalIOErrorInFunction(is)
             << "Cannot open CSV file for reading."
             << exit(FatalIOError);
     }
@@ -214,7 +214,7 @@ Foam::CSV<Type>::CSV
 {
     if (componentColumns_.size() != pTraits<Type>::nComponents)
     {
-        FatalErrorIn("Foam::CSV<Type>::CSV(const word&, Istream&)")
+        FatalErrorInFunction
             << componentColumns_ << " does not have the expected length of "
             << pTraits<Type>::nComponents << endl
             << exit(FatalError);
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
index e4f60195a8..e07a0d182a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,6 +55,20 @@ Foam::Constant<Type>::Constant(const word& entryName, const dictionary& dict)
 }
 
 
+template<class Type>
+Foam::Constant<Type>::Constant
+(
+    const word& entryName,
+    const Type& value,
+    const dimensionSet& dimensions
+)
+:
+    DataEntry<Type>(entryName),
+    value_(value),
+    dimensions_(dimensions)
+{}
+
+
 template<class Type>
 Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
 :
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index 0c251fec03..842f84770d 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -86,7 +86,15 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and Istream
+        //- Construct from components
+        Constant
+        (
+            const word& entryName,
+            const Type& value,
+            const dimensionSet& dimensions = dimless
+        );
+
+        //- Construct from entry name and dictionary
         Constant(const word& entryName, const dictionary& dict);
 
         //- Copy constructor
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
index 2674a04c34..51cea62185 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
@@ -70,7 +70,7 @@ void Foam::DataEntry<Type>::convertTimeBase(const Time&)
 template<class Type>
 Type Foam::DataEntry<Type>::value(const scalar x) const
 {
-    notImplemented("Type Foam::DataEntry<Type>::value(const scalar) const");
+    NotImplemented;
 
     return pTraits<Type>::zero;
 }
@@ -79,14 +79,7 @@ Type Foam::DataEntry<Type>::value(const scalar x) const
 template<class Type>
 Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
 {
-    notImplemented
-    (
-        "Type Foam::DataEntry<Type>::integrate"
-        "("
-            "const scalar, "
-            "const scalar"
-        ") const"
-    );
+    NotImplemented;
 
     return pTraits<Type>::zero;
 }
@@ -131,11 +124,7 @@ Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::integrate
 template<class Type>
 Foam::dimensioned<Type> Foam::DataEntry<Type>::dimValue(const scalar x) const
 {
-    notImplemented
-    (
-        "dimensioned<Type> Foam::DataEntry<dimensioned<Type> >::dimValue"
-        "(const scalar) const"
-    );
+    NotImplemented;
 
     return dimensioned<Type>("zero", dimless, pTraits<Type>::zero);
 }
@@ -148,14 +137,7 @@ Foam::dimensioned<Type> Foam::DataEntry<Type>::dimIntegrate
     const scalar x2
 ) const
 {
-    notImplemented
-    (
-        "dimensioned<Type> Foam::DataEntry<Type>::dimIntegrate"
-        "("
-            "const scalar, "
-            "const scalar"
-        ") const"
-    );
+    NotImplemented;
 
     return dimensioned<Type>("zero", dimless, pTraits<Type>::zero);
 }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index ef023e4c3c..e2edd026fd 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("DataEntry<Type>::New(const word&, const dictionary&)")
+        FatalErrorInFunction
             << "Unknown DataEntry type "
             << DataEntryType << " for DataEntry "
             << entryName << nl << nl
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
index e5cc7d1da0..7479702cdf 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/PolynomialEntry/PolynomialEntry.C
@@ -53,11 +53,8 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
 
     if (!coeffs_.size())
     {
-        FatalErrorIn
-        (
-            "PolynomialEntry<Type>::"
-            "PolynomialEntry(const word&, const dictionary&)"
-        )   << "PolynomialEntry coefficients for entry " << this->name_
+        FatalErrorInFunction
+            << "PolynomialEntry coefficients for entry " << this->name_
             << " are invalid (empty)" << nl << exit(FatalError);
     }
 
@@ -74,11 +71,8 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
     {
         if (!canIntegrate_)
         {
-            WarningIn
-            (
-                "PolynomialEntry<Type>::PolynomialEntry"
-                "(const word&, const dictionary&)"
-            )   << "PolynomialEntry " << this->name_ << " cannot be integrated"
+            WarningInFunction
+                << "PolynomialEntry " << this->name_ << " cannot be integrated"
                 << endl;
         }
     }
@@ -99,11 +93,8 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
 {
     if (!coeffs_.size())
     {
-        FatalErrorIn
-        (
-            "Foam::PolynomialEntry<Type>::PolynomialEntry"
-            "(const word&, const List<Tuple2<Type, Type> >&)"
-        )   << "PolynomialEntry coefficients for entry " << this->name_
+        FatalErrorInFunction
+            << "PolynomialEntry coefficients for entry " << this->name_
             << " are invalid (empty)" << nl << exit(FatalError);
     }
 
@@ -120,11 +111,8 @@ Foam::PolynomialEntry<Type>::PolynomialEntry
     {
         if (!canIntegrate_)
         {
-            WarningIn
-            (
-                "Foam::PolynomialEntry<Type>::PolynomialEntry"
-                "(const word&, const List<Tuple2<Type, Type> >&)"
-            )   << "PolynomialEntry " << this->name_ << " cannot be integrated"
+            WarningInFunction
+                << "PolynomialEntry " << this->name_ << " cannot be integrated"
                 << endl;
         }
     }
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index 2dedd9ffe3..8d781f541f 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -159,7 +159,7 @@ Foam::TableBase<Type>::wordToBoundsHandling
     }
     else
     {
-        WarningIn("Foam::TableBase<Type>::wordToBoundsHandling(const word&)")
+        WarningInFunction
             << "bad outOfBounds specifier " << bound << " using 'warn'"
             << endl;
 
@@ -187,7 +187,7 @@ void Foam::TableBase<Type>::check() const
 {
     if (!table_.size())
     {
-        FatalErrorIn("Foam::TableBase<Type>::check() const")
+        FatalErrorInFunction
             << "Table for entry " << this->name_ << " is invalid (empty)"
             << nl << exit(FatalError);
     }
@@ -202,7 +202,7 @@ void Foam::TableBase<Type>::check() const
         // avoid duplicate values (divide-by-zero error)
         if (currValue <= prevValue)
         {
-            FatalErrorIn("Foam::TableBase<Type>::check() const")
+            FatalErrorInFunction
                 << "out-of-order value: " << currValue << " at index " << i
                 << exit(FatalError);
         }
@@ -224,27 +224,15 @@ bool Foam::TableBase<Type>::checkMinBounds
         {
             case ERROR:
             {
-                FatalErrorIn
-                (
-                    "bool Foam::TableBase<Type>::checkMinBounds"
-                    "("
-                        "const scalar, "
-                        "scalar&"
-                    ") const"
-                )   << "value (" << x << ") underflow"
+                FatalErrorInFunction
+                    << "value (" << x << ") underflow"
                     << exit(FatalError);
                 break;
             }
             case WARN:
             {
-                WarningIn
-                (
-                    "bool Foam::TableBase<Type>::checkMinBounds"
-                    "("
-                        "const scalar, "
-                        "scalar&"
-                    ") const"
-                )   << "value (" << x << ") underflow" << nl
+                WarningInFunction
+                    << "value (" << x << ") underflow" << nl
                     << endl;
 
                 // fall-through to 'CLAMP'
@@ -286,27 +274,15 @@ bool Foam::TableBase<Type>::checkMaxBounds
         {
             case ERROR:
             {
-                FatalErrorIn
-                (
-                    "bool Foam::TableBase<Type>::checkMaxBounds"
-                    "("
-                        "const scalar, "
-                        "scalar&"
-                    ") const"
-                )   << "value (" << x << ") overflow"
+                FatalErrorInFunction
+                    << "value (" << x << ") overflow"
                     << exit(FatalError);
                 break;
             }
             case WARN:
             {
-                WarningIn
-                (
-                    "bool Foam::TableBase<Type>::checkMaxBounds"
-                    "("
-                        "const scalar, "
-                        "scalar&"
-                    ") const"
-                )   << "value (" << x << ") overflow" << nl
+                WarningInFunction
+                    << "value (" << x << ") overflow" << nl
                     << endl;
 
                 // fall-through to 'CLAMP'
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
index 20f8a4b1d0..25ed90dc68 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
@@ -46,9 +46,8 @@ Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
 
     if (!is.good())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "TableFile<Type>::TableFile(const word&, const dictionary&)",
             is
         )   << "Cannot open file." << exit(FatalIOError);
     }
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index 5a545f150c..4d99d698bf 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,10 +76,8 @@ Foam::Polynomial<PolySize>::Polynomial(const UList<scalar>& coeffs)
 {
     if (coeffs.size() != PolySize)
     {
-        FatalErrorIn
-        (
-            "Polynomial<PolySize>::Polynomial(const UList<scalar>&)"
-        )   << "Size mismatch: Needed " << PolySize
+        FatalErrorInFunction
+            << "Size mismatch: Needed " << PolySize
             << " but given " << coeffs.size()
             << nl << exit(FatalError);
     }
@@ -111,10 +109,8 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 
     if (isName != name)
     {
-        FatalErrorIn
-        (
-            "Polynomial<PolySize>::Polynomial(const word&, Istream&)"
-        )   << "Expected polynomial name " << name << " but read " << isName
+        FatalErrorInFunction
+            << "Expected polynomial name " << name << " but read " << isName
             << nl << exit(FatalError);
     }
 
@@ -123,10 +119,8 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 
     if (this->size() == 0)
     {
-        FatalErrorIn
-        (
-            "Polynomial<PolySize>::Polynomial(const word&, Istream&)"
-        )   << "Polynomial coefficients for entry " << isName
+        FatalErrorInFunction
+            << "Polynomial coefficients for entry " << isName
             << " are invalid (empty)" << nl << exit(FatalError);
     }
 }
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C b/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C
index fa9ccea830..e10d5a7c97 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,10 +89,8 @@ Foam::polynomialFunction::polynomialFunction(const label order)
 {
     if (this->empty())
     {
-        FatalErrorIn
-        (
-            "polynomialFunction::polynomialFunction(const label order)"
-        )   << "polynomialFunction coefficients are invalid (empty)"
+        FatalErrorInFunction
+            << "polynomialFunction coefficients are invalid (empty)"
             << nl << exit(FatalError);
     }
 }
@@ -114,10 +112,8 @@ Foam::polynomialFunction::polynomialFunction(const UList<scalar>& coeffs)
 {
     if (this->empty())
     {
-        FatalErrorIn
-        (
-            "polynomialFunction::polynomialFunction(const UList<scalar>&)"
-        )   << "polynomialFunction coefficients are invalid (empty)"
+        FatalErrorInFunction
+            << "polynomialFunction coefficients are invalid (empty)"
             << nl << exit(FatalError);
     }
 }
@@ -131,10 +127,8 @@ Foam::polynomialFunction::polynomialFunction(Istream& is)
 {
     if (this->empty())
     {
-        FatalErrorIn
-        (
-            "polynomialFunction::polynomialFunction(Istream&)"
-        )   << "polynomialFunction coefficients are invalid (empty)"
+        FatalErrorInFunction
+            << "polynomialFunction coefficients are invalid (empty)"
             << nl << exit(FatalError);
     }
 }
@@ -192,14 +186,8 @@ Foam::scalar Foam::polynomialFunction::integrate
 
     if (logActive_)
     {
-        FatalErrorIn
-        (
-            "scalar polynomialFunction::integrate"
-            "("
-                "const scalar, "
-                "const scalar"
-            ") const"
-        )   << "Cannot integrate polynomial with logarithmic coefficients"
+        FatalErrorInFunction
+            << "Cannot integrate polynomial with logarithmic coefficients"
             << nl << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
index ec1e8efdda..178898eb07 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,11 +180,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
                         {
                             if (nextTrans == 6)
                             {
-                                FatalErrorIn
-                                (
-                                     "void Foam::globalIndexAndTransform::"
-                                     "determineTransforms()"
-                                )   << "More than six unsigned transforms"
+                                FatalErrorInFunction
+                                    << "More than six unsigned transforms"
                                     << " detected:" << nl << transforms_
                                     << exit(FatalError);
                             }
@@ -220,11 +217,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
                         {
                             if (nextTrans == 6)
                             {
-                                FatalErrorIn
-                                (
-                                    "void Foam::globalIndexAndTransform::"
-                                    "determineTransforms()"
-                                )   << "More than six unsigned transforms"
+                                FatalErrorInFunction
+                                    << "More than six unsigned transforms"
                                     << " detected:" << nl << transforms_
                                     << exit(FatalError);
                             }
@@ -283,11 +277,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
                     if (nextTrans > 3)
                     {
-                        FatalErrorIn
-                        (
-                            "void Foam::globalIndexAndTransform::"
-                            "determineTransforms()"
-                        )
+                        FatalErrorInFunction
                             << "More than three independent basic "
                             << "transforms detected:" << nl
                             << allTransforms
@@ -305,10 +295,8 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
     if (transforms_.size() > 3)
     {
-        WarningIn
-        (
-            "void globalIndexAndTransform::determineTransforms()"
-        )   << "More than three independent basic "
+        WarningInFunction
+            << "More than three independent basic "
             << "transforms detected:" << nl
             << transforms_ << nl
             << "This is not a space filling tiling and will probably"
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
index 9227e6a990..5ce965ea48 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,13 +77,7 @@ Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
 {
     if (permutationIndices.size() != transforms_.size())
     {
-        FatalErrorIn
-        (
-            "Foam::label encodeTransformIndex"
-            "("
-                "const List<label>& permutationIndices,"
-            ") const"
-        )
+        FatalErrorInFunction
             << "permutationIndices " << permutationIndices
             << "are of a different size to the number of independent transforms"
             << abort(FatalError);
@@ -97,13 +91,7 @@ Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
     {
         if (mag(permutationIndices[b]) > 1)
         {
-            FatalErrorIn
-            (
-                "Foam::label encodeTransformIndex"
-                "("
-                "const List<label>& permutationIndices,"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "permutationIndices " << permutationIndices
                 << "are illegal, they must all be only -1, 0 or +1"
                 << abort(FatalError);
@@ -173,10 +161,8 @@ Foam::globalIndexAndTransform::decodeTransformIndex
     t /= 3;
     if (t != 0)
     {
-        FatalErrorIn
-        (
-            "globalIndexAndTransform::decodeTransformIndex(const label)"
-        )   << "transformIndex : " << transformIndex
+        FatalErrorInFunction
+            << "transformIndex : " << transformIndex
             << " has more than 3 fields."
             << abort(FatalError);
     }
@@ -221,7 +207,7 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
             if (sign == 0)
             {
                 // sent from patch without a transformation. Do nothing.
-                FatalErrorIn("globalIndexAndTransform::addToTransformIndex(..)")
+                FatalErrorInFunction
                     << "patch:" << mesh_.boundaryMesh()[patchI].name()
                     << " transform:" << matchTransI << " sign:" << sign
                     << "  current transforms:" << permutation
@@ -256,16 +242,8 @@ Foam::label Foam::globalIndexAndTransform::addToTransformIndex
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "Foam::label "
-                        "Foam::globalIndexAndTransform::addToTransformIndex\n"
-                        "(\n"
-                            "const label,\n"
-                            "const label,\n"
-                            "const bool\n"
-                        ") const\n"
-                    )   << "More than one patch accessing the same transform "
+                    FatalErrorInFunction
+                        << "More than one patch accessing the same transform "
                         << "but not of the same sign." << endl
                         << "patch:" << mesh_.boundaryMesh()[patchI].name()
                         << " transform:" << matchTransI << " sign:" << sign
@@ -377,15 +355,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
 {
     if (transformIndex < 0 || transformIndex >= base_)
     {
-        FatalErrorIn
-        (
-            "Foam::labelPair Foam::globalIndexAndTransform::encode"
-            "("
-                "const label procI, "
-                "const label index, "
-                "const label transformIndex"
-            ")"
-        )
+        FatalErrorInFunction
             << "TransformIndex " << transformIndex
             << " is outside allowed range of 0 to "
             << base_ - 1
@@ -394,15 +364,7 @@ Foam::labelPair Foam::globalIndexAndTransform::encode
 
     if (procI > labelMax/base_)
     {
-        FatalErrorIn
-        (
-            "Foam::labelPair Foam::globalIndexAndTransform::encode"
-            "("
-                "const label procI, "
-                "const label index, "
-                "const label transformIndex"
-            ")"
-        )
+        FatalErrorInFunction
             << "Overflow : encoding processor " << procI << " in base " << base_
             << " exceeds capability of label (" << labelMax
             << "). Please recompile with larger datatype for label."
@@ -521,14 +483,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
                 // transform.
                 if (permutation[matchTransI] != sign)
                 {
-                    FatalErrorIn
-                    (
-                        "const Foam::List<Foam::vectorTensorTransform>& "
-                        "Foam::globalIndexAndTransform::transformsForPatches"
-                        "("
-                            "const labelList& patchIs"
-                        ") const"
-                    )
+                    FatalErrorInFunction
                         << "More than one patch accessing the same transform "
                         << "but not of the same sign."
                         << exit(FatalError);
@@ -658,14 +613,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
         }
         default:
         {
-            FatalErrorIn
-            (
-                "const Foam::List<Foam::vectorTensorTransform>& "
-                "Foam::globalIndexAndTransform::transformsForPatches"
-                "("
-                    "const labelList& patchIs"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "Only 1-3 transforms are possible."
                 << exit(FatalError);
         }
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C
index 834223fccd..478681b204 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1Digest.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ unsigned char Foam::SHA1Digest::readHexDigit(Istream& is)
 
     if (!isxdigit(c))
     {
-        FatalIOErrorIn("SHA1Digest::readHexDigit(Istream&)", is)
+        FatalIOErrorInFunction(is)
             << "Illegal hex digit: '" << c << "'"
             << exit(FatalIOError);
     }
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.C b/src/OpenFOAM/primitives/ints/int32/int32.C
index c3674a58f7..4883be46d5 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32.C
+++ b/src/OpenFOAM/primitives/ints/int32/int32.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const int32_t Foam::pTraits<int32_t>::max = INT32_MAX;
 const int32_t Foam::pTraits<int32_t>::rootMin = pTraits<int32_t>::min;
 const int32_t Foam::pTraits<int32_t>::rootMax = pTraits<int32_t>::max;
 
-const char* Foam::pTraits<int32_t>::componentNames[] = { "x" };
+const char* Foam::pTraits<int32_t>::componentNames[] = { "" };
 
 Foam::pTraits<int32_t>::pTraits(const int32_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/int32/int32IO.C b/src/OpenFOAM/primitives/ints/int32/int32IO.C
index ae4a2a1d64..33dd078e35 100644
--- a/src/OpenFOAM/primitives/ints/int32/int32IO.C
+++ b/src/OpenFOAM/primitives/ints/int32/int32IO.C
@@ -61,7 +61,7 @@ Foam::Istream& Foam::operator>>(Istream& is, int32_t& i)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, int32_t&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected int32_t, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.C b/src/OpenFOAM/primitives/ints/int64/int64.C
index 351eff9de2..5b58fad539 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64.C
+++ b/src/OpenFOAM/primitives/ints/int64/int64.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const int64_t Foam::pTraits<int64_t>::max = INT64_MAX;
 const int64_t Foam::pTraits<int64_t>::rootMin = pTraits<int64_t>::min;
 const int64_t Foam::pTraits<int64_t>::rootMax = pTraits<int64_t>::max;
 
-const char* Foam::pTraits<int64_t>::componentNames[] = { "x" };
+const char* Foam::pTraits<int64_t>::componentNames[] = { "" };
 
 Foam::pTraits<int64_t>::pTraits(const int64_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/int64/int64IO.C b/src/OpenFOAM/primitives/ints/int64/int64IO.C
index 1cba3d0b53..bb897d0d17 100644
--- a/src/OpenFOAM/primitives/ints/int64/int64IO.C
+++ b/src/OpenFOAM/primitives/ints/int64/int64IO.C
@@ -61,7 +61,7 @@ Foam::Istream& Foam::operator>>(Istream& is, int64_t& i)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, int64_t&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected int64_t, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/ints/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
index 22b2014bfd..10a621f462 100644
--- a/src/OpenFOAM/primitives/ints/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@@ -50,7 +50,7 @@ Foam::label Foam::pow(label a, label b)
     #ifdef FULLDEBUG
     if (b < 0)
     {
-        FatalErrorIn("pow(label a, label b)")
+        FatalErrorInFunction
             << "negative value for b is not supported"
             << abort(FatalError);
     }
@@ -71,7 +71,7 @@ Foam::label Foam::factorial(label n)
     #ifdef FULLDEBUG
     if (n > 12 && n < 0)
     {
-        FatalErrorIn("factorial(label n)")
+        FatalErrorInFunction
             << "n value out of range"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
index 9c8411093d..f4aea858dd 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
@@ -50,7 +50,7 @@ Foam::uLabel Foam::pow(uLabel a, uLabel b)
     #ifdef FULLDEBUG
     if (b < 0)
     {
-        FatalErrorIn("pow(uLabel a, uLabel b)")
+        FatalErrorInFunction
             << "negative value for b is not supported"
             << abort(FatalError);
     }
@@ -71,7 +71,7 @@ Foam::uLabel Foam::factorial(uLabel n)
     #ifdef FULLDEBUG
     if (n > 12 && n < 0)
     {
-        FatalErrorIn("factorial(uLabel n)")
+        FatalErrorInFunction
             << "n value out of range"
             << abort(FatalError);
     }
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.C b/src/OpenFOAM/primitives/ints/uint32/uint32.C
index cdafc33441..2ffe5445dc 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32.C
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const uint32_t Foam::pTraits<uint32_t>::max = INT32_MAX;
 const uint32_t Foam::pTraits<uint32_t>::rootMin = pTraits<uint32_t>::min;
 const uint32_t Foam::pTraits<uint32_t>::rootMax = pTraits<uint32_t>::max;
 
-const char* Foam::pTraits<uint32_t>::componentNames[] = { "x" };
+const char* Foam::pTraits<uint32_t>::componentNames[] = { "" };
 
 Foam::pTraits<uint32_t>::pTraits(const uint32_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32IO.C b/src/OpenFOAM/primitives/ints/uint32/uint32IO.C
index 688834e737..a57bcfbd4c 100644
--- a/src/OpenFOAM/primitives/ints/uint32/uint32IO.C
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32IO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::Istream& Foam::operator>>(Istream& is, uint32_t& i)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, uint32_t&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected uint32_t, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.C b/src/OpenFOAM/primitives/ints/uint64/uint64.C
index bbe35d20bb..63fd8b3194 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64.C
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ const uint64_t Foam::pTraits<uint64_t>::max = INT64_MAX;
 const uint64_t Foam::pTraits<uint64_t>::rootMin = pTraits<uint64_t>::min;
 const uint64_t Foam::pTraits<uint64_t>::rootMax = pTraits<uint64_t>::max;
 
-const char* Foam::pTraits<uint64_t>::componentNames[] = { "x" };
+const char* Foam::pTraits<uint64_t>::componentNames[] = { "" };
 
 Foam::pTraits<uint64_t>::pTraits(const uint64_t& p)
 :
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64IO.C b/src/OpenFOAM/primitives/ints/uint64/uint64IO.C
index 39737bc934..d814a99664 100644
--- a/src/OpenFOAM/primitives/ints/uint64/uint64IO.C
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64IO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::Istream& Foam::operator>>(Istream& is, uint64_t& i)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, uint64_t&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected uint64_t, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/ops/flipOp.C b/src/OpenFOAM/primitives/ops/flipOp.C
new file mode 100644
index 0000000000..5555f686b3
--- /dev/null
+++ b/src/OpenFOAM/primitives/ops/flipOp.C
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "flipOp.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<>
+Foam::scalar Foam::flipOp::operator()(const scalar& v) const
+{
+    return -v;
+}
+
+
+template<> Foam::vector Foam::flipOp::operator()(const vector& v) const
+{
+    return -v;
+}
+
+
+template<>Foam::sphericalTensor Foam::flipOp::operator()
+(
+    const sphericalTensor& v
+) const
+{
+    return -v;
+}
+
+
+template<> Foam::symmTensor Foam::flipOp::operator()
+(
+    const symmTensor& v
+) const
+{
+    return -v;
+}
+
+
+template<> Foam::tensor Foam::flipOp::operator()(const tensor& v) const
+{
+    return -v;
+}
+
+
+template<> Foam::triad Foam::flipOp::operator()
+(
+    const triad& v
+) const
+{
+    return -v;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ops/flipOp.H b/src/OpenFOAM/primitives/ops/flipOp.H
new file mode 100644
index 0000000000..58d671ab38
--- /dev/null
+++ b/src/OpenFOAM/primitives/ops/flipOp.H
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::flipOp
+
+Description
+    Class containing functor to negate primitives. Dummy for all other types.
+
+    Used in mesh transformations where face can flip.
+
+SourceFiles
+    flipOp.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef flipOp_H
+#define flipOp_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class flipOp Declaration
+\*---------------------------------------------------------------------------*/
+
+class flipOp
+{
+public:
+
+    template<class Type>
+    Type operator()(const Type& val) const
+    {
+        return val;
+    }
+};
+
+
+class noOp
+{
+public:
+
+    template<class Type>
+    Type operator()(const Type& val) const
+    {
+        return val;
+    }
+};
+
+
+class flipLabelOp
+{
+public:
+
+    label operator()(const label& val) const
+    {
+        return -val;
+    }
+};
+
+
+// Template specialisation for primitives that support negation
+template<> scalar flipOp::operator()(const scalar&) const;
+template<> vector flipOp::operator()(const vector&) const;
+template<> sphericalTensor flipOp::operator()(const sphericalTensor&) const;
+template<> symmTensor flipOp::operator()(const symmTensor&) const;
+template<> tensor flipOp::operator()(const tensor&) const;
+template<> triad flipOp::operator()(const triad&) const;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
index c7e65ac558..afba64df74 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
+++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
@@ -97,10 +97,8 @@ Foam::cachedRandom::cachedRandom(const cachedRandom& cr, const bool reset)
     }
     if (sampleI_ == -1)
     {
-        WarningIn
-        (
-            "Foam::cachedRandom::cachedRandom(const cachedRandom& cr)"
-        )   << "Copy constructor called, but samples not being cached. "
+        WarningInFunction
+            << "Copy constructor called, but samples not being cached. "
             << "This may lead to non-repeatable behaviour" << endl;
 
         osRandomSeed(seed_);
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C b/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C
index 3a45b884f6..b87431ca5c 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileNameIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ Foam::Istream& Foam::operator>>(Istream& is, fileName& fn)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, fileName&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected string, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.C b/src/OpenFOAM/primitives/strings/keyType/keyType.C
index fd2925fe71..3df927921e 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyType.C
+++ b/src/OpenFOAM/primitives/strings/keyType/keyType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ Foam::Istream& Foam::operator>>(Istream& is, keyType& kw)
         if (kw.empty())
         {
             is.setBad();
-            FatalIOErrorIn("operator>>(Istream&, keyType&)", is)
+            FatalIOErrorInFunction(is)
                 << "empty word/expression "
                 << exit(FatalIOError);
             return is;
@@ -102,7 +102,7 @@ Foam::Istream& Foam::operator>>(Istream& is, keyType& kw)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, keyType&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected word or string, found "
             << t.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/primitives/strings/string/stringIO.C b/src/OpenFOAM/primitives/strings/string/stringIO.C
index ab76e7135d..954290fff7 100644
--- a/src/OpenFOAM/primitives/strings/string/stringIO.C
+++ b/src/OpenFOAM/primitives/strings/string/stringIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ Foam::Istream& Foam::operator>>(Istream& is, string& s)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, string&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected string, found " << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index cd117cd7e8..52387922b1 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -286,15 +286,8 @@ Foam::string Foam::stringOps::getVariable
 
         if (value.empty())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "stringOps::getVariable\n"
-                "(\n"
-                "    const word&,\n"
-                "    const dictionary&,\n"
-                "    const bool,\n"
-                "    const bool\n"
-                ")\n",
                 dict
             )   << "Cannot find dictionary or environment variable "
                 << name << exit(FatalIOError);
@@ -302,15 +295,8 @@ Foam::string Foam::stringOps::getVariable
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "stringOps::getVariable\n"
-            "(\n"
-            "    const word&,\n"
-            "    const dictionary&,\n"
-            "    const bool,\n"
-            "    const bool\n"
-            ")\n",
             dict
         )   << "Cannot find dictionary variable "
             << name << exit(FatalIOError);
@@ -792,10 +778,8 @@ Foam::string& Foam::stringOps::inplaceExpand
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "stringOps::inplaceExpand(string&, const bool)"
-                    )   << "Unknown variable name '" << varName << "'"
+                    FatalErrorInFunction
+                        << "Unknown variable name '" << varName << "'"
                         << exit(FatalError);
                 }
             }
diff --git a/src/OpenFOAM/primitives/strings/word/wordIO.C b/src/OpenFOAM/primitives/strings/word/wordIO.C
index eca5d3a27e..19221fa2b7 100644
--- a/src/OpenFOAM/primitives/strings/word/wordIO.C
+++ b/src/OpenFOAM/primitives/strings/word/wordIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w)
         if (w.empty() || w.size() != t.stringToken().size())
         {
             is.setBad();
-            FatalIOErrorIn("operator>>(Istream&, word&)", is)
+            FatalIOErrorInFunction(is)
                 << "wrong token type - expected word, found "
                 "non-word characters "
                 << t.info()
@@ -71,7 +71,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, word&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected word, found "
             << t.info()
             << exit(FatalIOError);
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.C b/src/OpenFOAM/primitives/strings/wordRe/wordRe.C
index aff4e226c8..95fd22dc8a 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.C
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Foam::Istream& Foam::operator>>(Istream& is, wordRe& w)
         if (w.empty())
         {
             is.setBad();
-            FatalIOErrorIn("operator>>(Istream&, wordRe&)", is)
+            FatalIOErrorInFunction(is)
                 << "empty word/expression "
                 << exit(FatalIOError);
             return is;
@@ -77,7 +77,7 @@ Foam::Istream& Foam::operator>>(Istream& is, wordRe& w)
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, wordRe&)", is)
+        FatalIOErrorInFunction(is)
             << "wrong token type - expected word or string, found "
             << t.info()
             << exit(FatalIOError);
diff --git a/src/Pstream/dummy/UIPread.C b/src/Pstream/dummy/UIPread.C
index 7d4a2f8ca5..d91a017b4f 100644
--- a/src/Pstream/dummy/UIPread.C
+++ b/src/Pstream/dummy/UIPread.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,21 +53,7 @@ Foam::UIPstream::UIPstream
     clearAtEnd_(clearAtEnd),
     messageSize_(0)
 {
-    notImplemented
-    (
-        "UIPstream::UIPstream\n"
-        "(\n"
-            "const commsTypes,\n"
-            "const int,\n"
-            "DynamicList<char>&,\n"
-            "label&,\n"
-            "const int,\n"
-            "const label,\n"
-            "const bool,\n"
-            "streamFormat,\n"
-            "versionNumber\n"
-        ")"
-    );
+    NotImplemented;
 }
 
 
@@ -83,14 +69,7 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
     clearAtEnd_(true),
     messageSize_(0)
 {
-    notImplemented
-    (
-        "UIPstream::UIPstream\n"
-        "(\n"
-            "const int,\n"
-            "PstreamBuffers&\n"
-        ")"
-    );
+    NotImplemented;
 }
 
 
@@ -106,18 +85,7 @@ Foam::label Foam::UIPstream::read
     const label communicator
 )
 {
-    notImplemented
-    (
-        "UIPstream::read"
-        "("
-            "const commsTypes,"
-            "const int fromProcNo,"
-            "char* buf,"
-            "const label bufSize,"
-            "const int tag,"
-            "const label communicator"
-        ")"
-     );
+    NotImplemented;
 
      return 0;
 }
diff --git a/src/Pstream/dummy/UOPwrite.C b/src/Pstream/dummy/UOPwrite.C
index 67d3e84205..07459ab8fd 100644
--- a/src/Pstream/dummy/UOPwrite.C
+++ b/src/Pstream/dummy/UOPwrite.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,18 +40,7 @@ bool Foam::UOPstream::write
     const label communicator
 )
 {
-    notImplemented
-    (
-        "UOPstream::write"
-        "("
-            "const commsTypes commsType,"
-            "const int fromProcNo,"
-            "char* buf,"
-            "const label bufSize,"
-            "const int tag,"
-            "const label communicator"
-        ")"
-    );
+    NotImplemented;
 
     return false;
 }
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index c8eadfb92b..cd3bc60f39 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ void Foam::UPstream::addValidParOptions(HashTable<string>& validParOptions)
 
 bool Foam::UPstream::init(int& argc, char**& argv)
 {
-    FatalErrorIn("UPstream::init(int& argc, char**& argv)")
+    FatalErrorInFunction
         << "Trying to use the dummy Pstream library." << nl
         << "This dummy library cannot be used in parallel mode"
         << Foam::exit(FatalError);
@@ -45,13 +45,13 @@ bool Foam::UPstream::init(int& argc, char**& argv)
 
 void Foam::UPstream::exit(int errnum)
 {
-    notImplemented("UPstream::exit(int errnum)");
+    NotImplemented;
 }
 
 
 void Foam::UPstream::abort()
 {
-    notImplemented("UPstream::abort()");
+    NotImplemented;
 }
 
 
@@ -113,7 +113,7 @@ void Foam::UPstream::waitRequest(const label i)
 
 bool Foam::UPstream::finishedRequest(const label i)
 {
-    notImplemented("UPstream::finishedRequest()");
+    NotImplemented;
     return false;
 }
 
diff --git a/src/Pstream/mpi/PstreamGlobals.C b/src/Pstream/mpi/PstreamGlobals.C
index cdafa043d7..1acbe583f3 100644
--- a/src/Pstream/mpi/PstreamGlobals.C
+++ b/src/Pstream/mpi/PstreamGlobals.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,10 +76,8 @@ void PstreamGlobals::checkCommunicator
      || comm >= PstreamGlobals::MPICommunicators_.size()
     )
     {
-        FatalErrorIn
-        (
-            "PstreamGlobals::checkCommunicator(const label, const label)"
-        )   << "otherProcNo:" << otherProcNo << " : illegal communicator "
+        FatalErrorInFunction
+            << "otherProcNo:" << otherProcNo << " : illegal communicator "
             << comm << endl
             << "Communicator should be within range 0.."
             << PstreamGlobals::MPICommunicators_.size()-1 << abort(FatalError);
diff --git a/src/Pstream/mpi/UIPread.C b/src/Pstream/mpi/UIPread.C
index 4570c6d6de..524f09dcea 100644
--- a/src/Pstream/mpi/UIPread.C
+++ b/src/Pstream/mpi/UIPread.C
@@ -137,7 +137,7 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
 {
     if (commsType() != UPstream::scheduled && !buffers.finishedSendsCalled_)
     {
-        FatalErrorIn("UIPstream::UIPstream(const int, PstreamBuffers&)")
+        FatalErrorInFunction
             << "PstreamBuffers::finishedSends() never called." << endl
             << "Please call PstreamBuffers::finishedSends() after doing"
             << " all your sends (using UOPstream) and before doing any"
@@ -269,11 +269,8 @@ Foam::label Foam::UIPstream::read
             )
         )
         {
-            FatalErrorIn
-            (
-                "UIPstream::read"
-                "(const int fromProcNo, char* buf, std::streamsize bufSize)"
-            )   << "MPI_Recv cannot receive incomming message"
+            FatalErrorInFunction
+                << "MPI_Recv cannot receive incomming message"
                 << Foam::abort(FatalError);
 
             return 0;
@@ -295,11 +292,8 @@ Foam::label Foam::UIPstream::read
 
         if (messageSize > bufSize)
         {
-            FatalErrorIn
-            (
-                "UIPstream::read"
-                "(const int fromProcNo, char* buf, std::streamsize bufSize)"
-            )   << "buffer (" << label(bufSize)
+            FatalErrorInFunction
+                << "buffer (" << label(bufSize)
                 << ") not large enough for incomming message ("
                 << messageSize << ')'
                 << Foam::abort(FatalError);
@@ -325,11 +319,8 @@ Foam::label Foam::UIPstream::read
             )
         )
         {
-            FatalErrorIn
-            (
-                "UIPstream::read"
-                "(const int fromProcNo, char* buf, std::streamsize bufSize)"
-            )   << "MPI_Recv cannot start non-blocking receive"
+            FatalErrorInFunction
+                << "MPI_Recv cannot start non-blocking receive"
                 << Foam::abort(FatalError);
 
             return 0;
@@ -351,11 +342,8 @@ Foam::label Foam::UIPstream::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "UIPstream::read"
-            "(const int fromProcNo, char* buf, std::streamsize bufSize)"
-        )   << "Unsupported communications type "
+        FatalErrorInFunction
+            << "Unsupported communications type "
             << commsType
             << Foam::abort(FatalError);
 
diff --git a/src/Pstream/mpi/UOPwrite.C b/src/Pstream/mpi/UOPwrite.C
index 7d84d3f837..b3188f0009 100644
--- a/src/Pstream/mpi/UOPwrite.C
+++ b/src/Pstream/mpi/UOPwrite.C
@@ -136,12 +136,8 @@ bool Foam::UOPstream::write
     }
     else
     {
-        FatalErrorIn
-        (
-            "UOPstream::write"
-            "(const int fromProcNo, char* buf, std::streamsize bufSize"
-            ", const int)"
-        )   << "Unsupported communications type "
+        FatalErrorInFunction
+            << "Unsupported communications type "
             << UPstream::commsTypeNames[commsType]
             << Foam::abort(FatalError);
     }
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 74edc518b2..f035c989c3 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -76,7 +76,7 @@ bool Foam::UPstream::init(int& argc, char**& argv)
 
     if (numprocs <= 1)
     {
-        FatalErrorIn("UPstream::init(int& argc, char**& argv)")
+        FatalErrorInFunction
             << "bool IPstream::init(int& argc, char**& argv) : "
                "attempt to run parallel on 1 processor"
             << Foam::abort(FatalError);
@@ -100,7 +100,7 @@ bool Foam::UPstream::init(int& argc, char**& argv)
     }
     else
     {
-        FatalErrorIn("UPstream::init(int& argc, char**& argv)")
+        FatalErrorInFunction
             << "UPstream::init(int& argc, char**& argv) : "
             << "environment variable MPI_BUFFER_SIZE not defined"
             << Foam::abort(FatalError);
@@ -137,7 +137,7 @@ void Foam::UPstream::exit(int errnum)
         label n = PstreamGlobals::outstandingRequests_.size();
         PstreamGlobals::outstandingRequests_.clear();
 
-        WarningIn("UPstream::exit(int)")
+        WarningInFunction
             << "There are still " << n << " outstanding MPI_Requests." << endl
             << "This means that your code exited before doing a"
             << " UPstream::waitRequests()." << endl
@@ -311,14 +311,8 @@ void Foam::UPstream::allocatePstreamCommunicator
     }
     else if (index > PstreamGlobals::MPIGroups_.size())
     {
-        FatalErrorIn
-        (
-            "UPstream::allocatePstreamCommunicator\n"
-            "(\n"
-            "    const label parentIndex,\n"
-            "    const labelList& subRanks\n"
-            ")\n"
-        )   << "PstreamGlobals out of sync with UPstream data. Problem."
+        FatalErrorInFunction
+            << "PstreamGlobals out of sync with UPstream data. Problem."
             << Foam::exit(FatalError);
     }
 
@@ -329,14 +323,8 @@ void Foam::UPstream::allocatePstreamCommunicator
 
         if (index != UPstream::worldComm)
         {
-            FatalErrorIn
-            (
-                "UPstream::allocateCommunicator\n"
-                "(\n"
-                "    const label parentIndex,\n"
-                "    const labelList& subRanks\n"
-                ")\n"
-            )   << "world communicator should always be index "
+            FatalErrorInFunction
+                << "world communicator should always be index "
                 << UPstream::worldComm << Foam::exit(FatalError);
         }
 
@@ -393,14 +381,8 @@ void Foam::UPstream::allocatePstreamCommunicator
                 )
             )
             {
-                FatalErrorIn
-                (
-                    "UPstream::allocatePstreamCommunicator\n"
-                    "(\n"
-                    "    const label,\n"
-                    "    const labelList&\n"
-                    ")\n"
-                )   << "Problem :"
+                FatalErrorInFunction
+                    << "Problem :"
                     << " when allocating communicator at " << index
                     << " from ranks " << procIDs_[index]
                     << " of parent " << parentIndex
@@ -473,10 +455,8 @@ void Foam::UPstream::waitRequests(const label start)
             )
         )
         {
-            FatalErrorIn
-            (
-                "UPstream::waitRequests()"
-            )   << "MPI_Waitall returned with error" << Foam::endl;
+            FatalErrorInFunction
+                << "MPI_Waitall returned with error" << Foam::endl;
         }
 
         resetRequests(start);
@@ -499,10 +479,8 @@ void Foam::UPstream::waitRequest(const label i)
 
     if (i >= PstreamGlobals::outstandingRequests_.size())
     {
-        FatalErrorIn
-        (
-            "UPstream::waitRequest(const label)"
-        )   << "There are " << PstreamGlobals::outstandingRequests_.size()
+        FatalErrorInFunction
+            << "There are " << PstreamGlobals::outstandingRequests_.size()
             << " outstanding send requests and you are asking for i=" << i
             << nl
             << "Maybe you are mixing blocking/non-blocking comms?"
@@ -518,10 +496,8 @@ void Foam::UPstream::waitRequest(const label i)
         )
     )
     {
-        FatalErrorIn
-        (
-            "UPstream::waitRequest()"
-        )   << "MPI_Wait returned with error" << Foam::endl;
+        FatalErrorInFunction
+            << "MPI_Wait returned with error" << Foam::endl;
     }
 
     if (debug)
@@ -542,10 +518,8 @@ bool Foam::UPstream::finishedRequest(const label i)
 
     if (i >= PstreamGlobals::outstandingRequests_.size())
     {
-        FatalErrorIn
-        (
-            "UPstream::finishedRequest(const label)"
-        )   << "There are " << PstreamGlobals::outstandingRequests_.size()
+        FatalErrorInFunction
+            << "There are " << PstreamGlobals::outstandingRequests_.size()
             << " outstanding send requests and you are asking for i=" << i
             << nl
             << "Maybe you are mixing blocking/non-blocking comms?"
diff --git a/src/Pstream/mpi/allReduceTemplates.C b/src/Pstream/mpi/allReduceTemplates.C
index 7a07698a77..ec735f7814 100644
--- a/src/Pstream/mpi/allReduceTemplates.C
+++ b/src/Pstream/mpi/allReduceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,18 +71,8 @@ void Foam::allReduce
                     )
                 )
                 {
-                    FatalErrorIn
-                    (
-                        "void Foam::allReduce\n"
-                        "(\n"
-                        "    Type&,\n"
-                        "    int,\n"
-                        "    MPI_Datatype,\n"
-                        "    MPI_Op,\n"
-                        "    const BinaryOp&,\n"
-                        "    const int\n"
-                        ")\n"
-                    )   << "MPI_Recv failed"
+                    FatalErrorInFunction
+                        << "MPI_Recv failed"
                         << Foam::abort(FatalError);
                 }
 
@@ -104,18 +94,8 @@ void Foam::allReduce
                 )
             )
             {
-                FatalErrorIn
-                (
-                    "void Foam::allReduce\n"
-                    "(\n"
-                    "    Type&,\n"
-                    "    int,\n"
-                    "    MPI_Datatype,\n"
-                    "    MPI_Op,\n"
-                    "    const BinaryOp&,\n"
-                    "    const int\n"
-                    ")\n"
-                )   << "MPI_Send failed"
+                FatalErrorInFunction
+                    << "MPI_Send failed"
                     << Foam::abort(FatalError);
             }
         }
@@ -143,18 +123,8 @@ void Foam::allReduce
                     )
                 )
                 {
-                    FatalErrorIn
-                    (
-                        "void Foam::allReduce\n"
-                        "(\n"
-                        "    Type&,\n"
-                        "    int,\n"
-                        "    MPI_Datatype,\n"
-                        "    MPI_Op,\n"
-                        "    const BinaryOp&,\n"
-                        "    const int\n"
-                        ")\n"
-                    )   << "MPI_Send failed"
+                    FatalErrorInFunction
+                        << "MPI_Send failed"
                         << Foam::abort(FatalError);
                 }
             }
@@ -175,18 +145,8 @@ void Foam::allReduce
                 )
             )
             {
-                FatalErrorIn
-                (
-                    "void Foam::allReduce\n"
-                    "(\n"
-                    "    Type&,\n"
-                    "    int,\n"
-                    "    MPI_Datatype,\n"
-                    "    MPI_Op,\n"
-                    "    const BinaryOp&,\n"
-                    "    const int\n"
-                    ")\n"
-                )   << "MPI_Recv failed"
+                FatalErrorInFunction
+                    << "MPI_Recv failed"
                     << Foam::abort(FatalError);
             }
         }
diff --git a/src/TurbulenceModels/Allwmake b/src/TurbulenceModels/Allwmake
index fb0c219f58..d76497d667 100755
--- a/src/TurbulenceModels/Allwmake
+++ b/src/TurbulenceModels/Allwmake
@@ -9,6 +9,7 @@ set -x
 wmake $targetType turbulenceModels
 wmake $targetType incompressible
 wmake $targetType compressible
+wmake $targetType schemes
 wmakeLnInclude phaseIncompressible
 wmakeLnInclude phaseCompressible
 
diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
index 0a9cdfe58b..363bd7540e 100644
--- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
@@ -78,7 +78,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const transportModel& trasport,
+            const transportModel& transport,
             const word& propertiesName
         );
 
@@ -91,7 +91,7 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            const transportModel& trasportModel,
+            const transportModel& transport,
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index 82ba1221d9..3b4f935a85 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -87,7 +87,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const transportModel& trasport,
+            const transportModel& transport,
             const word& propertiesName
         );
 
diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files
index c4aab94251..2c2366c37d 100644
--- a/src/TurbulenceModels/compressible/Make/files
+++ b/src/TurbulenceModels/compressible/Make/files
@@ -10,7 +10,6 @@ $(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchSca
 $(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
 $(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
 $(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
-$(BCs)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
 $(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
 
 turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options
index fa99ca3a58..4a6578d628 100644
--- a/src/TurbulenceModels/compressible/Make/options
+++ b/src/TurbulenceModels/compressible/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
 
 LIB_LIBS = \
     -lcompressibleTransportModels \
diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C
index 2f7bdb1617..b78dddf279 100644
--- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C
+++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C
@@ -74,7 +74,6 @@ buoyantKEpsilon<BasicTurbulenceModel>::buoyantKEpsilon
 {
     if (type == typeName)
     {
-        kEpsilon<BasicTurbulenceModel>::correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 4a85a59d07..487582a8d5 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -63,6 +63,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
     const alphaField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
     const transportModel& transport,
     const word& propertiesName
@@ -76,6 +77,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
             alpha,
             rho,
             U,
+            alphaRhoPhi,
             phi,
             transport,
             propertiesName
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index 2066e44a1d..0ee9da0d0b 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -69,7 +69,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const transportModel& trasport,
+            const transportModel& transport,
             const word& propertiesName
         );
 
@@ -82,8 +82,9 @@ public:
             const alphaField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const transportModel& trasportModel,
+            const transportModel& transportModel,
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
@@ -94,7 +95,7 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            const transportModel& trasportModel,
+            const transportModel& transportModel,
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
diff --git a/src/TurbulenceModels/compressible/turbulenceModelDoc.H b/src/TurbulenceModels/compressible/turbulenceModelDoc.H
index 5722cee54e..941e205368 100644
--- a/src/TurbulenceModels/compressible/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/compressible/turbulenceModelDoc.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
 
 \defgroup grpCmpTurbulence Compressible turbulence
 @{
+    \ingroup grpTurbulence
     This group contains compressible turbulence models.
 @}
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index b4346d59c2..fff73ccb41 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -136,23 +136,27 @@ externalWallHeatFluxTemperatureFvPatchScalarField
         h_ = scalarField("h", dict, p.size());
         Ta_ = scalarField("Ta", dict, p.size());
         if (dict.found("thicknessLayers"))
+
+        if (dict.readIfPresent("thicknessLayers", thicknessLayers_))
         {
-            dict.lookup("thicknessLayers") >> thicknessLayers_;
             dict.lookup("kappaLayers") >> kappaLayers_;
+
+            if (thicknessLayers_.size() != kappaLayers_.size())
+            {
+                FatalIOErrorInFunction(dict)
+                    << "\n number of layers for thicknessLayers and "
+                    << "kappaLayers must be the same"
+                    << "\n for patch " << p.name()
+                    << " of field " << dimensionedInternalField().name()
+                    << " in file " << dimensionedInternalField().objectPath()
+                    << exit(FatalIOError);
+            }
         }
     }
     else
     {
-        FatalErrorIn
-        (
-            "externalWallHeatFluxTemperatureFvPatchScalarField::"
-            "externalWallHeatFluxTemperatureFvPatchScalarField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<scalar, volMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "\n patch type '" << p.type()
+        FatalErrorInFunction
+            << "\n patch type '" << p.type()
             << "' either q or h and Ta were not found '"
             << "\n for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
@@ -311,11 +315,8 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         }
         default:
         {
-            FatalErrorIn
-            (
-                "externalWallHeatFluxTemperatureFvPatchScalarField"
-                "::updateCoeffs()"
-            )   << "Illegal heat flux mode " << operationModeNames[mode_]
+            FatalErrorInFunction
+                << "Illegal heat flux mode " << operationModeNames[mode_]
                 << exit(FatalError);
         }
     }
@@ -330,7 +331,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
             << patch().name() << ':'
             << this->dimensionedInternalField().name() << " :"
             << " heat transfer rate:" << Q
-            << " walltemperature "
+            << " wall temperature "
             << " min:" << gMin(*this)
             << " max:" << gMax(*this)
             << " avg:" << gAverage(*this)
@@ -370,13 +371,8 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
         }
         default:
         {
-            FatalErrorIn
-            (
-                "void externalWallHeatFluxTemperatureFvPatchScalarField::write"
-                "("
-                    "Ostream& os"
-                ") const"
-            )   << "Illegal heat flux mode " << operationModeNames[mode_]
+            FatalErrorInFunction
+                << "Illegal heat flux mode " << operationModeNames[mode_]
                 << abort(FatalError);
         }
     }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 52aabee0b3..9ed2dd3648 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -132,10 +132,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
             }
             else
             {
-                FatalErrorIn
-                (
-                    "temperatureCoupledBase::kappa(const scalarField&) const"
-                )
+                FatalErrorInFunction
                     << "Kappa defined to employ " << KMethodTypeNames_[method_]
                     << " method, but thermo package not available"
                     << exit(FatalError);
@@ -196,10 +193,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
             }
             else
             {
-                FatalErrorIn
-                (
-                    "temperatureCoupledBase::kappa(const scalarField&) const"
-                )
+                FatalErrorInFunction
                     << "Did not find field " << kappaName_
                     << " on mesh " << mesh.name() << " patch " << patch_.name()
                     << nl
@@ -215,10 +209,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
 
         default:
         {
-            FatalErrorIn
-            (
-                "temperatureCoupledBase::kappa(const scalarField&) const"
-            )
+            FatalErrorInFunction
                 << "Unimplemented method " << KMethodTypeNames_[method_] << nl
                 << "Please set 'kappa' to one of " << KMethodTypeNames_.toc()
                 << " and 'kappaName' to the name of the volScalar"
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 186ed39eec..d64cdef42b 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -25,17 +25,41 @@ Class
     Foam::temperatureCoupledBase
 
 Description
-    Common functions for use in temperature coupled boundaries. For now only
+    Common functions for use in temperature coupled boundaries.
 
-    kappa() : heat conduction at patch. Gets supplied how to lookup/calculate
-        kappa:
+    For now only provides the following methods:
 
-    - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
-    - 'fluidThermo' : use fluidThermo and default compressible::turbulenceModel
-       to calculate kappa
-    - 'solidThermo' : use solidThermo kappa()
-    - 'directionalSolidThermo': uses look up for volSymmTensorField for
-       transformed kappa vector. Named 'Anialpha' in solid solver
+    - kappa() : heat conduction at patch. Gets supplied how to lookup/calculate
+      'kappa':
+        - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
+           defined in 'kappaName'
+        - 'fluidThermo' : use fluidThermo and default
+          compressible::turbulenceModel to calculate kappa
+        - 'solidThermo' : use solidThermo kappa()
+        - 'directionalSolidThermo': uses look up for volSymmTensorField for
+          transformed kappa vector. Field name definable in 'alphaAniName',
+          named 'Anialpha' in solid solver by default
+
+    \heading Keywords provided by this class
+
+    \table
+        Property     | Description             | Required    | Default value
+        kappa        | heat conduction type at patch, as listed above | yes |
+        kappaName    | Name of thermal conductivity field | yes |
+        alphaAniName | name of the non-isotropic alpha | no | 'Anialpha'
+    \endtable
+
+    Usage examples:
+    \verbatim
+    nonIsotropicWall
+    {
+        ...
+        kappa           directionalSolidThermo;
+        kappaName       none;
+        alphaAniName    Anialpha;
+        ...
+    }
+    \endverbatim
 
 SourceFiles
     temperatureCoupledBase.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index fe8fb58808..7612f746e7 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -231,11 +231,8 @@ baffleThickness() const
     {
         if (thickness_.size() != patch().size())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                " template<class solidType>"
-                " tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>"
-                " baffleThickness() const",
                 solidDict_
             )<< " Field thickness has not been specified "
             << " for patch " << this->patch().name()
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index fa137f34b5..786ceae3e9 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -219,10 +219,8 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         }
         default:
         {
-            FatalErrorIn
-            (
-                "turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()"
-            )   << "Unknown heat source type. Valid types are: "
+            FatalErrorInFunction
+                << "Unknown heat source type. Valid types are: "
                 << heatSourceTypeNames_ << nl << exit(FatalError);
         }
     }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
index 94f75fead8..b288e821d9 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -29,18 +29,37 @@ Description
     heat source either specified in terms of an absolute power [W], or as a
     flux [W/m^2].
 
+    \heading Patch usage
+
+    \table
+        Property     | Description             | Required    | Default value
+        heatSource   | 'power' [W] or 'flux' [W/m^2] | yes |
+        q            | heat power or flux field      | yes |
+        kappa        | inherited from temperatureCoupledBase | yes |
+        kappaName    | inherited from temperatureCoupledBase | yes |
+        Qr           | name of the radiative flux field | yes |
+        value        | initial temperature value | no | calculated
+        gradient     | initial gradient value | no | 0.0
+    \endtable
+
+    Note: If needed, both 'value' and 'gradient' must be defined to be used.
+
     Example usage:
+    \verbatim
+    hotWall
+    {
+        type            compressible::turbulentHeatFluxTemperature;
+        heatSource      flux;
+        q               uniform 10;
+        kappa           fluidThermo;
+        kappaName       none;
+        Qr              none;
+    }
+    \endverbatim
 
-        hotWall
-        {
-            type            compressible::turbulentHeatFluxTemperature;
-            heatSource      flux;        // power [W]; flux [W/m^2]
-            q               uniform 10;  // heat power or flux
-            kappa           fluidThermo; // calculate kappa=alphaEff*thermo.Cp
-            Qr              none;        // name of the radiative flux
-            value           uniform 300; // initial temperature value
-        }
 
+SeeAlso
+    Foam::temperatureCoupledBase
 
 SourceFiles
     turbulentHeatFluxTemperatureFvPatchScalarField.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index d304e598ee..903c50b164 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -93,16 +93,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
-        FatalErrorIn
-        (
-            "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::"
-            "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<scalar, volMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not type '" << mappedPatchBase::typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index e610afc80e..8d563bac65 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -99,16 +99,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
-        FatalErrorIn
-        (
-            "turbulentTemperatureRadCoupledMixedFvPatchScalarField::"
-            "turbulentTemperatureRadCoupledMixedFvPatchScalarField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<scalar, volMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not type '" << mappedPatchBase::typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 7a9983fc20..4b337af073 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -49,10 +49,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn
-        (
-            "alphatJayatillekeWallFunctionFvPatchScalarField::checkType()"
-        )
+        FatalErrorInFunction
             << "Patch type for patch " << patch().name() << " must be wall\n"
             << "Current patch type is " << patch().type() << nl
             << exit(FatalError);
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
index 0eb70aabbc..27646f6dbb 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -39,7 +39,6 @@ namespace compressible
 
 defineTypeNameAndDebug(alphatPhaseChangeWallFunctionFvPatchScalarField,0);
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 alphatPhaseChangeWallFunctionFvPatchScalarField::
@@ -50,7 +49,8 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    dmdt_(p.size(), 0.0)
+    dmdt_(p.size(), 0.0),
+    mDotL_(p.size(), 0.0)
 {}
 
 
@@ -63,12 +63,18 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    dmdt_(p.size(), 0.0)
+    dmdt_(p.size(), 0.0),
+    mDotL_(p.size(), 0.0)
 {
     if (dict.found("dmdt"))
     {
         dmdt_ = scalarField("dmdt", dict, p.size());
     }
+
+    if (dict.found("mDotL"))
+    {
+        dmdt_ = scalarField("mDotL", dict, p.size());
+    }
 }
 
 
@@ -82,7 +88,8 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    dmdt_(ptf.dmdt_, mapper)
+    dmdt_(ptf.dmdt_, mapper),
+    mDotL_(ptf.mDotL_, mapper)
 {}
 
 
@@ -93,7 +100,8 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(awfpsf),
-    dmdt_(awfpsf.dmdt_)
+    dmdt_(awfpsf.dmdt_),
+    mDotL_(awfpsf.mDotL_)
 {}
 
 
@@ -105,7 +113,8 @@ alphatPhaseChangeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(awfpsf, iF),
-    dmdt_(awfpsf.dmdt_)
+    dmdt_(awfpsf.dmdt_),
+    mDotL_(awfpsf.mDotL_)
 {}
 
 
@@ -115,6 +124,7 @@ void alphatPhaseChangeWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     dmdt_.writeEntry("dmdt", os);
+    mDotL_.writeEntry("mDotL", os);
     writeEntry("value", os);
 }
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
index 4d1dd4f15b..08d71a52ba 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
@@ -31,7 +31,8 @@ Description
     Abstract base-class for all alphatWallFunctions supporting phase-change.
 
 SeeAlso
-    Foam::alphatWallFunction
+    Foam::fixedValueFvPatchScalarField
+    Foam::alphatWallFunctionFvPatchScalarField
 
 SourceFiles
     alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -51,7 +52,7 @@ namespace compressible
 {
 
 /*---------------------------------------------------------------------------*\
-            Class alphatPhaseChangeWallFunctionFvPatchScalarField Declaration
+       Class alphatPhaseChangeWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class alphatPhaseChangeWallFunctionFvPatchScalarField
@@ -65,6 +66,9 @@ protected:
         //- Rate of phase-change
         scalarField dmdt_;
 
+        //- Latent heat of the phase-change
+        scalarField mDotL_;
+
 
 public:
 
@@ -122,6 +126,12 @@ public:
             return dmdt_;
         }
 
+        //- Return the enthelpy source due to phase-change
+        const scalarField& mDotL() const
+        {
+            return mDotL_;
+        }
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index 2bf0664c16..d4c21d4b96 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "EddyDiffusivity.H"
+
 #define makeBaseTurbulenceModel(                                               \
     Alpha, Rho, baseModel, BaseModel, TDModel, Transport)                      \
                                                                                \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C
new file mode 100644
index 0000000000..0e7a8eb146
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentFluidThermoModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace compressible
+    {
+        template<class BasicCompressibleTurbulenceModel>
+        autoPtr<BasicCompressibleTurbulenceModel> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const typename BasicCompressibleTurbulenceModel::transportModel&
+                transport,
+            const word& propertiesName
+        )
+        {
+            return BasicCompressibleTurbulenceModel::New
+            (
+                geometricOneField(),
+                rho,
+                U,
+                phi,
+                phi,
+                transport,
+                propertiesName
+            );
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index da111a9907..9420f89864 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -35,6 +35,7 @@ Description
     based on the standard laminar transport package.
 
 SourceFiles
+    turbulentFluidThermoModel.C
     turbulentFluidThermoModels.C
 
 \*---------------------------------------------------------------------------*/
@@ -42,7 +43,7 @@ SourceFiles
 #ifndef turbulentFluidThermoModel_H
 #define turbulentFluidThermoModel_H
 
-#include "SpecificCompressibleTurbulenceModel.H"
+#include "CompressibleTurbulenceModel.H"
 #include "ThermalDiffusivity.H"
 #include "EddyDiffusivity.H"
 #include "RASModel.H"
@@ -58,19 +59,29 @@ namespace Foam
         typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo> >
             turbulenceModel;
 
-        typedef SpecificCompressibleTurbulenceModel
-        <
-            RASModel<EddyDiffusivity<turbulenceModel> >
-        > RASModel;
+        typedef RASModel<EddyDiffusivity<turbulenceModel> > RASModel;
+        typedef LESModel<EddyDiffusivity<turbulenceModel> > LESModel;
 
-        typedef SpecificCompressibleTurbulenceModel
-        <
-            LESModel<EddyDiffusivity<turbulenceModel> >
-        > LESModel;
+        template<class BasicCompressibleTurbulenceModel>
+        autoPtr<BasicCompressibleTurbulenceModel> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const typename BasicCompressibleTurbulenceModel::transportModel&
+                transport,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
     }
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "turbulentFluidThermoModel.C"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index db2d414070..2f15cab115 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -129,5 +129,14 @@ makeLESModel(SpalartAllmarasIDDES);
 #include "DeardorffDiffStress.H"
 makeLESModel(DeardorffDiffStress);
 
+#include "kOmegaSSTDES.H"
+makeLESModel(kOmegaSSTDES);
+
+#include "kOmegaSSTDDES.H"
+makeLESModel(kOmegaSSTDDES);
+
+#include "kOmegaSSTIDDES.H"
+makeLESModel(kOmegaSSTIDDES);
+
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
index 447af12fff..2da3007b12 100644
--- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
@@ -121,11 +121,7 @@ Foam::tmp<Foam::volSymmTensorField>
 Foam::IncompressibleTurbulenceModel<TransportModel>::
 devRhoReff() const
 {
-    notImplemented
-    (
-        "IncompressibleTurbulenceModel<TransportModel>::"
-        "devRhoReff()"
-    );
+    NotImplemented;
 
     return devReff();
 }
@@ -139,11 +135,7 @@ divDevRhoReff
     volVectorField& U
 ) const
 {
-    notImplemented
-    (
-        "IncompressibleTurbulenceModel<TransportModel>::"
-        "divDevRhoReff(volVectorField& U)"
-    );
+    NotImplemented;
 
     return divDevReff(U);
 }
@@ -158,11 +150,7 @@ divDevRhoReff
     volVectorField& U
 ) const
 {
-    notImplemented
-    (
-        "IncompressibleTurbulenceModel<TransportModel>::"
-        "divDevRhoReff(const volScalarField& rho, volVectorField& U)"
-    );
+    NotImplemented;
 
     return divDevReff(U);
 }
diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
index eb9d8bfb06..dd6899d3b0 100644
--- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
@@ -91,7 +91,7 @@ public:
         (
             const volVectorField& U,
             const surfaceScalarField& phi,
-            const TransportModel& trasportModel,
+            const TransportModel& transportModel,
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options
index 8eceaf533f..c44e9ae61c 100644
--- a/src/TurbulenceModels/incompressible/Make/options
+++ b/src/TurbulenceModels/incompressible/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
     -I../turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
 
 LIB_LIBS = \
     -lincompressibleTransportModels \
diff --git a/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C
deleted file mode 100644
index f6ba580c0f..0000000000
--- a/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C
+++ /dev/null
@@ -1,98 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "SpecificIncompressibleTurbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class BasicIncompressibleTurbulenceModel>
-Foam::SpecificIncompressibleTurbulenceModel
-<
-    BasicIncompressibleTurbulenceModel
->::SpecificIncompressibleTurbulenceModel
-(
-    const word& type,
-    const geometricOneField& alpha,
-    const geometricOneField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& alphaRhoPhi,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& propertiesName
-)
-:
-    BasicIncompressibleTurbulenceModel
-    (
-        type,
-        alpha,
-        rho,
-        U,
-        alphaRhoPhi,
-        phi,
-        transport,
-        propertiesName
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-template<class BasicIncompressibleTurbulenceModel>
-Foam::autoPtr
-<
-    Foam::SpecificIncompressibleTurbulenceModel
-    <
-        BasicIncompressibleTurbulenceModel
-    >
->
-Foam::SpecificIncompressibleTurbulenceModel
-<
-    BasicIncompressibleTurbulenceModel
->::New
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& propertiesName
-)
-{
-    return autoPtr<SpecificIncompressibleTurbulenceModel>
-    (
-        static_cast<SpecificIncompressibleTurbulenceModel*>(
-        BasicIncompressibleTurbulenceModel::New
-        (
-            geometricOneField(),
-            geometricOneField(),
-            U,
-            phi,
-            phi,
-            transport,
-            propertiesName
-        ).ptr())
-    );
-}
-
-
-// ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/turbulenceModelDoc.H b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
index 2e5547351f..a0357f18d1 100644
--- a/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
 
 \defgroup grpIcoTurbulence Incompressible turbulence
 @{
+    \ingroup grpTurbulence
     This group contains incompressible turbulence models.
 @}
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
index 1364f2cea2..245a0ff55c 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -180,7 +180,6 @@ LamBremhorstKE::LamBremhorstKE
 
     if (type == typeName)
     {
-        correctNut();
         printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
index 603b5295f1..e0d1fda37b 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -131,7 +131,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for k
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
index 4183371298..cc58aabc78 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
@@ -330,7 +330,6 @@ LienCubicKE::LienCubicKE
 
     if (type == typeName)
     {
-        correctNut();
         printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
index 8580991b9b..f38e40a4c7 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
@@ -156,7 +156,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for k
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
index 40f5029312..0b1ec73202 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
@@ -224,7 +224,6 @@ LienLeschziner::LienLeschziner
 
     if (type == typeName)
     {
-        correctNut();
         printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H
index d861281f0f..e74a64f443 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H
@@ -144,7 +144,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for k
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
index 7c764f4747..c2d22054c2 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
@@ -222,7 +222,6 @@ ShihQuadraticKE::ShihQuadraticKE
 
     if (type == typeName)
     {
-        correctNut();
         printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
index d81435cf09..5a61675371 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
@@ -131,7 +131,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for k
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
index 24a3d6ec41..58a84fc148 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
@@ -213,7 +213,7 @@ void kkLOmega::correctNut()
 {
     // Currently this function is not implemented due to the complexity of
     // evaluating nut.  Better calculate nut at the end of correct()
-    notImplemented("kkLOmega::correctNut()");
+    NotImplemented;
 }
 
 
@@ -593,6 +593,10 @@ bool kkLOmega::read()
 }
 
 
+void kkLOmega::validate()
+{}
+
+
 void kkLOmega::correct()
 {
     eddyViscosity<incompressible::RASModel>::correct();
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
index 68ba379380..4080ecbcdc 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
@@ -237,7 +237,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for k
@@ -301,6 +301,10 @@ public:
             return epsilon_;
         }
 
+        //- Validate the turbulence fields after construction
+        //  Update turbulence viscosity and other derived fields as requires
+        virtual void validate();
+
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 };
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
index a12b61f1a6..44a5c33121 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
@@ -207,7 +207,6 @@ qZeta::qZeta
 
     if (type == typeName)
     {
-        correctNut();
         printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
index 600845160b..7be89ff9c9 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
@@ -138,7 +138,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the lower allowable limit for q (default: SMALL)
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 46a3eb55a7..02ff42ecc3 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -48,10 +48,8 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn
-        (
-            "alphatJayatillekeWallFunctionFvPatchScalarField::checkType()"
-        )   << "Invalid wall function specification" << nl
+        FatalErrorInFunction
+            << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
             << "    Current patch type is " << patch().type() << nl << endl
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C
new file mode 100644
index 0000000000..aa3bfa784a
--- /dev/null
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentTransportModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace incompressible
+    {
+        template<class BasicCompressibleTurbulenceModel>
+        autoPtr<BasicCompressibleTurbulenceModel> New
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const typename BasicCompressibleTurbulenceModel::transportModel&
+                transport,
+            const word& propertiesName
+        )
+        {
+            return BasicCompressibleTurbulenceModel::New
+            (
+                geometricOneField(),
+                geometricOneField(),
+                U,
+                phi,
+                phi,
+                transport,
+                propertiesName
+            );
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
index 72818e7f3c..99f70435bd 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
@@ -35,6 +35,7 @@ Description
     based on the standard laminar transport package.
 
 SourceFiles
+    turbulentTransportModel.C
     turbulentTransportModels.C
 
 \*---------------------------------------------------------------------------*/
@@ -42,7 +43,7 @@ SourceFiles
 #ifndef turbulentTransportModel_H
 #define turbulentTransportModel_H
 
-#include "SpecificIncompressibleTurbulenceModel.H"
+#include "IncompressibleTurbulenceModel.H"
 #include "RASModel.H"
 #include "LESModel.H"
 #include "incompressible/transportModel/transportModel.H"
@@ -55,19 +56,28 @@ namespace Foam
     {
         typedef IncompressibleTurbulenceModel<transportModel> turbulenceModel;
 
-        typedef SpecificIncompressibleTurbulenceModel
-        <
-            RASModel<turbulenceModel>
-        > RASModel;
+        typedef RASModel<turbulenceModel> RASModel;
+        typedef LESModel<turbulenceModel> LESModel;
 
-        typedef SpecificIncompressibleTurbulenceModel
-        <
-            LESModel<turbulenceModel>
-        > LESModel;
+        template<class BasicCompressibleTurbulenceModel>
+        autoPtr<BasicCompressibleTurbulenceModel> New
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const typename BasicCompressibleTurbulenceModel::transportModel&
+                transport,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
     }
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "turbulentTransportModel.C"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
index 1a3dc38620..db4f1ab398 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C
@@ -121,5 +121,14 @@ makeLESModel(SpalartAllmarasIDDES);
 #include "DeardorffDiffStress.H"
 makeLESModel(DeardorffDiffStress);
 
+#include "kOmegaSSTDES.H"
+makeLESModel(kOmegaSSTDES);
+
+#include "kOmegaSSTDDES.H"
+makeLESModel(kOmegaSSTDDES);
+
+#include "kOmegaSSTIDDES.H"
+makeLESModel(kOmegaSSTIDDES);
+
 
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
index 2d3ee8421b..44eb97019b 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
@@ -96,9 +96,6 @@ NicenoKEqn<BasicTurbulenceModel>::NicenoKEqn
 {
     if (type == typeName)
     {
-        // Cannot correct nut yet: construction of the phases is not complete
-        // correctNut();
-
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
index 4eb3187d95..f7bfe4fbf6 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
@@ -73,9 +73,6 @@ SmagorinskyZhang<BasicTurbulenceModel>::SmagorinskyZhang
 {
     if (type == typeName)
     {
-        // Cannot correct nut yet: construction of the phases is not complete
-        // correctNut();
-
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
index 6bfec32e68..00e23e7c32 100644
--- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
+++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
@@ -75,7 +75,6 @@ continuousGasKEqn<BasicTurbulenceModel>::continuousGasKEqn
 {
     if (type == typeName)
     {
-        kEqn<BasicTurbulenceModel>::correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
index 7ebabf3072..d3d19edc4d 100644
--- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
@@ -78,7 +78,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const transportModel& trasport,
+            const transportModel& transport,
             const word& propertiesName
         );
 
@@ -93,7 +93,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const transportModel& trasportModel,
+            const transportModel& transportModel,
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
index f523fce5a0..843ecc015d 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
@@ -106,9 +106,6 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
 {
     if (type == typeName)
     {
-        // Cannot correct nut yet: construction of the phases is not complete
-        // correctNut();
-
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
index 4fe327c91d..86d6a7f334 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
@@ -89,7 +89,6 @@ continuousGasKEpsilon<BasicTurbulenceModel>::continuousGasKEpsilon
 {
     if (type == typeName)
     {
-        kEpsilon<BasicTurbulenceModel>::correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
index 7e5114d828..76d7e4d0be 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
@@ -76,8 +76,6 @@ kOmegaSSTSato<BasicTurbulenceModel>::kOmegaSSTSato
 {
     if (type == typeName)
     {
-        // Cannot correct nut yet: construction of the phases is not complete
-        // correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
index 25539ac161..f563357970 100644
--- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
@@ -169,11 +169,7 @@ Foam::tmp<Foam::volSymmTensorField>
 Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::
 devRhoReff() const
 {
-    notImplemented
-    (
-        "PhaseIncompressibleTurbulenceModel<TransportModel>::"
-        "devRhoReff()"
-    );
+    NotImplemented;
 
     return devReff();
 }
@@ -187,11 +183,7 @@ divDevRhoReff
     volVectorField& U
 ) const
 {
-    notImplemented
-    (
-        "PhaseIncompressibleTurbulenceModel<TransportModel>::"
-        "divDevRhoReff(volVectorField& U)"
-    );
+    NotImplemented;
 
     return divDevReff(U);
 }
diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
index fb4ee56c32..17b6f0a01e 100644
--- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
@@ -78,7 +78,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const TransportModel& trasportModel,
+            const TransportModel& transportModel,
             const word& propertiesName
         );
 
@@ -92,7 +92,7 @@ public:
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
-            const TransportModel& trasportModel,
+            const TransportModel& transportModel,
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.C b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.C
new file mode 100644
index 0000000000..d18c0f007b
--- /dev/null
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.C
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvMesh.H"
+#include "DEShybrid.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeSurfaceInterpolationScheme(DEShybrid);
+}
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
new file mode 100644
index 0000000000..df2642e27e
--- /dev/null
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
@@ -0,0 +1,407 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::DEShybrid
+
+Description
+    Hybrid convection scheme of Travin et al. for hybrid RAS/LES calculations.
+    The scheme blends between a low-dissipative convection scheme within the
+    LES region (e.g. linear) and a numerically more robust convection scheme in
+    the RAS region (e.g. upwind-biased schemes).
+
+    The routine calculates the blending factor denoted as "sigma" in the
+    literature reference, where 0 <= sigma <= sigmaMax, which is then employed
+    to set the weights:
+    \f[
+        weight = (1-sigma) w_1 + sigma w_2
+    \f]
+
+    where
+    \vartable
+        sigma | blending factor
+        w_1   | scheme 1 weights
+        w_2   | scheme 2 weights
+    \endvartable
+
+    Reference:
+    \verbatim
+        A. Travin, M. Shur, M. Strelets, P. Spalart (2000).
+        Physical and numerical upgrades in the detached-eddy simulation of
+        complex turbulent flows.
+        In Proceedings of the 412th Euromech Colloquium on LES and Complex
+        Transition and Turbulent Flows, Munich, Germany
+    \endverbatim
+
+    Example of the DEShybrid scheme specification using linear within the LES
+    region and linearUpwind within the RAS region:
+    \verbatim
+    divSchemes
+    {
+        .
+        .
+        div(phi,U)      Gauss DEShybrid
+            linear                        // scheme 1
+            linearUpwind grad(U)          // scheme 2
+            0.65                          // DES coefficient, typically = 0.65
+            10                            // Reference time scale (Uref/Lref)
+            1;                            // Maximum sigma limit (0-1)
+        .
+        .
+    }
+    \endverbatim
+
+Notes
+    - Scheme 1 should be linear (or other low-dissipative schemes) which will
+      be used in the detached/vortex shedding regions.
+    - Scheme 2 should be an upwind/deferred correction/TVD scheme which will
+      be used in the free-stream/Euler/boundary layer regions.
+
+SourceFiles
+    DEShybrid.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DEShybrid_H
+#define DEShybrid_H
+
+#include "surfaceInterpolationScheme.H"
+#include "surfaceInterpolate.H"
+#include "fvcGrad.H"
+#include "blendedSchemeBase.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          class DEShybrid Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class DEShybrid
+:
+    public surfaceInterpolationScheme<Type>,
+    public blendedSchemeBase<Type>
+{
+    // Private Data
+
+        //- Scheme 1
+        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+
+        //- Scheme 2
+        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+
+        //- DES Coefficient
+        scalar CDES_;
+
+        //- Time scale coefficient [1/s]
+        dimensionedScalar invTau_;
+
+        //- Maximum bound for sigma (limited to 1)
+        scalar sigmaMax_;
+
+        //- Lower limit for `B' coefficient
+        dimensionedScalar B0_;
+
+        //- Small length scale to avoid division by zero
+        dimensionedScalar d0_;
+
+        //- Disallow default bitwise copy construct
+        DEShybrid(const DEShybrid&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const DEShybrid&);
+
+
+    // Private Member Functions
+
+        //- Calculate the blending factor
+        tmp<surfaceScalarField> calcBlendingFactor
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf,
+            const volScalarField& nuEff,
+            const volVectorField& U,
+            const volScalarField& delta
+        ) const
+        {
+            tmp<volTensorField> gradU(fvc::grad(U));
+            const volScalarField S(sqrt(2.0)*mag(symm(gradU())));
+            const volScalarField Omega(sqrt(2.0)*mag(skew(gradU())));
+            const volScalarField magSqrGradU(magSqr(gradU));
+
+            const volScalarField B
+            (
+                0.5*Omega*max(S, Omega)
+               /max(0.5*magSqrGradU, B0_)
+            );
+            const volScalarField K
+            (
+                max(Foam::sqrt(0.5*magSqrGradU), 0.1*invTau_)
+            );
+            const volScalarField lTurb(Foam::sqrt(nuEff/(pow(0.09, 1.5)*K)));
+            const volScalarField g(tanh(pow4(B)));
+            const volScalarField A
+            (
+                 max(scalar(0), CDES_*delta/max(lTurb*g, d0_) - 0.5)
+            );
+            const surfaceScalarField Af(fvc::interpolate(A));
+
+            return tmp<surfaceScalarField>
+            (
+                new surfaceScalarField
+                (
+                    vf.name() + "BlendingFactor",
+                    max(sigmaMax_*tanh(pow3(Af)), scalar(0))
+                )
+            );
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName("DEShybrid");
+
+
+    // Constructors
+
+        //- Construct from mesh and Istream.
+        //  The name of the flux field is read from the Istream and looked-up
+        //  from the mesh objectRegistry
+        DEShybrid(const fvMesh& mesh, Istream& is)
+        :
+            surfaceInterpolationScheme<Type>(mesh),
+            tScheme1_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, is)
+            ),
+            tScheme2_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, is)
+            ),
+            CDES_(readScalar(is)),
+            invTau_("invTau", dimless/dimTime, readScalar(is)),
+            sigmaMax_(readScalar(is)),
+            B0_("B0", dimless/sqr(dimTime), 1e-20),
+            d0_("d0", dimLength, SMALL)
+        {
+            if (invTau_.value() <= 0)
+            {
+                FatalErrorInFunction
+                    << "invTau coefficient must be greater than 0. "
+                    << "Current value: " << invTau_ << exit(FatalError);
+            }
+            if (sigmaMax_ > 1)
+            {
+                FatalErrorInFunction
+                    << "sigmaMax coefficient must be less than or equal to 1. "
+                    << "Current value: " << sigmaMax_ << exit(FatalError);
+            }
+        }
+
+        //- Construct from mesh, faceFlux and Istream
+        DEShybrid
+        (
+            const fvMesh& mesh,
+            const surfaceScalarField& faceFlux,
+            Istream& is
+        )
+        :
+            surfaceInterpolationScheme<Type>(mesh),
+            tScheme1_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, faceFlux, is)
+            ),
+            tScheme2_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, faceFlux, is)
+            ),
+            CDES_(readScalar(is)),
+            invTau_("invTau", dimless/dimTime, readScalar(is)),
+            sigmaMax_(readScalar(is)),
+            B0_("B0", dimless/sqr(dimTime), 1e-20),
+            d0_("d0", dimLength, SMALL)
+        {
+            if (invTau_.value() <= 0)
+            {
+                FatalErrorInFunction
+                    << "invTau coefficient must be greater than 0. "
+                    << "Current value: " << invTau_ << exit(FatalError);
+            }
+            if (sigmaMax_ > 1)
+            {
+                FatalErrorInFunction
+                    << "sigmaMax coefficient must be less than or equal to 1. "
+                    << "Current value: " << sigmaMax_ << exit(FatalError);
+            }
+        }
+
+
+    // Member Functions
+
+        //- Return the face-based blending factor
+        virtual tmp<surfaceScalarField> blendingFactor
+        (
+             const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
+        {
+            const fvMesh& mesh = this->mesh();
+
+            typedef compressible::turbulenceModel cmpModel;
+            typedef incompressible::turbulenceModel icoModel;
+
+            // Assuming that LES delta field is called "delta"
+            const volScalarField& delta = this->mesh().template
+                 lookupObject<const volScalarField>("delta");
+
+            // Could avoid the compressible/incompressible case by looking
+            // up all fields from the database - but retrieving from model
+            // ensures consistent fields are being employed e.g. for multiphase
+            // where group name is used
+
+            if (mesh.foundObject<icoModel>(icoModel::propertiesName))
+            {
+                const icoModel& model =
+                    mesh.lookupObject<icoModel>(icoModel::propertiesName);
+
+                return calcBlendingFactor(vf, model.nuEff(), model.U(), delta);
+            }
+            else if (mesh.foundObject<cmpModel>(cmpModel::propertiesName))
+            {
+                const cmpModel& model =
+                    mesh.lookupObject<cmpModel>(cmpModel::propertiesName);
+
+                return calcBlendingFactor
+                (
+                    vf, model.muEff()/model.rho(), model.U(), delta
+                );
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Scheme requires a turbulence model to be present. "
+                    << "Unable to retrieve turbulence model from the mesh "
+                    << "database" << exit(FatalError);
+
+                return tmp<surfaceScalarField>(NULL);
+            }
+        }
+
+
+        //- Return the interpolation weighting factors
+        tmp<surfaceScalarField> weights
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
+        {
+            surfaceScalarField bf(blendingFactor(vf));
+
+            return
+                (scalar(1) - bf)*tScheme1_().weights(vf)
+              + bf*tScheme2_().weights(vf);
+        }
+
+
+        //- Return the face-interpolate of the given cell field
+        //  with explicit correction
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        interpolate
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
+        {
+            surfaceScalarField bf(blendingFactor(vf));
+
+            return
+                (scalar(1) - bf)*tScheme1_().interpolate(vf)
+              + bf*tScheme2_().interpolate(vf);
+        }
+
+
+        //- Return true if this scheme uses an explicit correction
+        virtual bool corrected() const
+        {
+            return tScheme1_().corrected() || tScheme2_().corrected();
+        }
+
+
+        //- Return the explicit correction to the face-interpolate
+        //  for the given field
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        correction
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
+        {
+            surfaceScalarField bf(blendingFactor(vf));
+
+            if (tScheme1_().corrected())
+            {
+                if (tScheme2_().corrected())
+                {
+                    return
+                    (
+                        (scalar(1) - bf)
+                      * tScheme1_().correction(vf)
+                      + bf
+                      * tScheme2_().correction(vf)
+                    );
+                }
+                else
+                {
+                    return
+                    (
+                        (scalar(1) - bf)
+                      * tScheme1_().correction(vf)
+                    );
+                }
+            }
+            else if (tScheme2_().corrected())
+            {
+                return (bf*tScheme2_().correction(vf));
+            }
+            else
+            {
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                (
+                    NULL
+                );
+            }
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/schemes/Make/files b/src/TurbulenceModels/schemes/Make/files
new file mode 100644
index 0000000000..49f0357b64
--- /dev/null
+++ b/src/TurbulenceModels/schemes/Make/files
@@ -0,0 +1,3 @@
+DEShybrid/DEShybrid.C
+
+LIB = $(FOAM_LIBBIN)/libturbulenceModelSchemes
\ No newline at end of file
diff --git a/src/TurbulenceModels/schemes/Make/options b/src/TurbulenceModels/schemes/Make/options
new file mode 100644
index 0000000000..29eef672df
--- /dev/null
+++ b/src/TurbulenceModels/schemes/Make/options
@@ -0,0 +1,17 @@
+EXE_INC = \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+    -lcompressibleTransportModels \
+    -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
+    -lincompressibleTransportModels \
+    -lcompressibleTurbulenceModels \
+    -lfluidThermophysicalModels \
+    -lfiniteVolume
diff --git a/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.C
similarity index 54%
rename from src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C
rename to src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.C
index b7430341b2..cd57c02597 100644
--- a/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,19 +23,23 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "SpecificCompressibleTurbulenceModel.H"
+#include "DESModel.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class BasicCompressibleTurbulenceModel>
-Foam::SpecificCompressibleTurbulenceModel
-<
-    BasicCompressibleTurbulenceModel
->::SpecificCompressibleTurbulenceModel
+namespace Foam
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+DESModel<BasicTurbulenceModel>::DESModel
 (
     const word& type,
-    const geometricOneField& alpha,
-    const volScalarField& rho,
+    const alphaField& alpha,
+    const rhoField& rho,
     const volVectorField& U,
     const surfaceScalarField& alphaRhoPhi,
     const surfaceScalarField& phi,
@@ -43,7 +47,7 @@ Foam::SpecificCompressibleTurbulenceModel
     const word& propertiesName
 )
 :
-    BasicCompressibleTurbulenceModel
+    LESeddyViscosity<BasicTurbulenceModel>
     (
         type,
         alpha,
@@ -57,43 +61,16 @@ Foam::SpecificCompressibleTurbulenceModel
 {}
 
 
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class BasicCompressibleTurbulenceModel>
-Foam::autoPtr
-<
-    Foam::SpecificCompressibleTurbulenceModel
-    <
-        BasicCompressibleTurbulenceModel
-    >
->
-Foam::SpecificCompressibleTurbulenceModel
-<
-    BasicCompressibleTurbulenceModel
->::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& propertiesName
-)
-{
-    return autoPtr<SpecificCompressibleTurbulenceModel>
-    (
-        static_cast<SpecificCompressibleTurbulenceModel*>(
-        BasicCompressibleTurbulenceModel::New
-        (
-            geometricOneField(),
-            rho,
-            U,
-            phi,
-            phi,
-            transport,
-            propertiesName
-        ).ptr())
-    );
-}
+template<class BasicTurbulenceModel>
+DESModel<BasicTurbulenceModel>::~DESModel()
+{}
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H
similarity index 63%
rename from src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H
rename to src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H
index e7cc38118b..1e27387650 100644
--- a/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,84 +22,92 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::SpecificIncompressibleTurbulenceModel
+    Foam::DESModel
 
 Description
-    Templated abstract base class for specific (RAS/LES) incompressible
-    turbulence models
+    Templated abstract base class for DES models
 
 SourceFiles
-    SpecificIncompressibleTurbulenceModel.C
+    DESModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SpecificIncompressibleTurbulenceModel_H
-#define SpecificIncompressibleTurbulenceModel_H
+#ifndef DESModel_H
+#define DESModel_H
 
-#include "IncompressibleTurbulenceModel.H"
+#include "DESModelBase.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace LESModels
+{
 
 /*---------------------------------------------------------------------------*\
-           Class SpecificIncompressibleTurbulenceModel Declaration
+                          Class DESModel Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class BasicIncompressibleTurbulenceModel>
-class SpecificIncompressibleTurbulenceModel
+template<class BasicTurbulenceModel>
+class DESModel
 :
-    public BasicIncompressibleTurbulenceModel
+    public DESModelBase,
+    public LESeddyViscosity<BasicTurbulenceModel>
 {
 
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        DESModel(const DESModel&);
+
+        //- Disallow default bitwise assignment
+        DESModel& operator=(const DESModel&);
+
+
 public:
 
-    typedef typename BasicIncompressibleTurbulenceModel::transportModel
-        transportModel;
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
 
     // Constructors
 
         //- Construct from components
-        SpecificIncompressibleTurbulenceModel
+        DESModel
         (
             const word& type,
-            const geometricOneField& alpha,
-            const geometricOneField& rho,
+            const alphaField& alpha,
+            const rhoField& rho,
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
             const surfaceScalarField& phi,
             const transportModel& transport,
-            const word& propertiesName
+            const word& propertiesName = turbulenceModel::propertiesName
         );
 
 
     //- Destructor
-    virtual ~SpecificIncompressibleTurbulenceModel()
-    {}
+    virtual ~DESModel();
 
 
-    // Selectors
+    // Public Member Functions
 
-        //- Return a reference to the selected RAS model
-        static autoPtr<SpecificIncompressibleTurbulenceModel> New
-        (
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& propertiesName = turbulenceModel::propertiesName
-        );
+        //- Return the LES field indicator
+        virtual tmp<volScalarField> LESRegion() const = 0;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace LESModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "SpecificIncompressibleTurbulenceModel.C"
+    #include "DESModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelBase.C b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelBase.C
new file mode 100644
index 0000000000..401c74a868
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelBase.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::DESModelBase
+
+Description
+    Base class for DES models providing an interfaces to the LESRegion
+    function.
+
+SourceFiles
+    DESModelBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#include "DESModelBase.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(DESModelBase, 0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelBase.H b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelBase.H
new file mode 100644
index 0000000000..7378eab306
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelBase.H
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::DESModelBase
+
+Description
+    Base class for DES models providing an interfaces to the LESRegion
+    function.
+
+SourceFiles
+    DESModelBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DESModelBase_H
+#define DESModelBase_H
+
+#include "className.H"
+#include "tmp.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        class DESModelBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class DESModelBase
+{
+public:
+
+    //- Constructor
+    DESModelBase()
+    {}
+
+    //- Destructor
+    virtual ~DESModelBase()
+    {}
+
+    ClassName("DESModelBase");
+
+
+    // Public Member Functions
+
+        //- Return the LES field indicator
+        virtual tmp<volScalarField> LESRegion() const = 0;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H
new file mode 100644
index 0000000000..df3671a24a
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+\defgroup grpDESTurbulence DES
+@{
+    \ingroup grpTurbulence
+    This group contains DES turbulence models.
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
similarity index 78%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
index 186970ca61..3339dd4ce5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +68,7 @@ tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::fd
     const volScalarField& magGradU
 ) const
 {
-    return 1 - tanh(pow3(8*rd(magGradU)));
+    return 1 - tanh(pow(fdFactor_*rd(magGradU), fdExponent_));
 }
 
 
@@ -88,7 +88,7 @@ tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::dTilda
       - fd(mag(gradU))
        *max
         (
-            this->y_ - this->CDES_*this->delta(),
+            this->y_ - this->psi(chi, fv1)*this->CDES_*this->delta(),
             dimensionedScalar("zero", dimLength, 0)
         ),
         dimensionedScalar("small", dimLength, SMALL)
@@ -120,10 +120,46 @@ SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
         phi,
         transport,
         propertiesName
+    ),
+    fdFactor_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "fdFactor",
+            this->coeffDict_,
+            8
+        )
+    ),
+    fdExponent_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "fdExponent",
+            this->coeffDict_,
+            3
+        )
     )
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool SpalartAllmarasDDES<BasicTurbulenceModel>::read()
+{
+    if (SpalartAllmarasDES<BasicTurbulenceModel>::read())
+    {
+        fdFactor_.readIfPresent(this->coeffDict());
+        fdExponent_.readIfPresent(this->coeffDict());
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
similarity index 94%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index addcb635a4..80fb8c3cef 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -79,6 +79,15 @@ class SpalartAllmarasDDES
 
 protected:
 
+    // Protected data
+
+        //- fd function pre-factor
+        dimensionedScalar fdFactor_;
+
+        //- fd function exponent
+        dimensionedScalar fdExponent_;
+
+
     // Protected Member Functions
 
         //- Length scale
@@ -120,6 +129,12 @@ public:
     //- Destructor
     virtual ~SpalartAllmarasDDES()
     {}
+
+
+    // Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
similarity index 80%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
index 53e22dd384..a803522f8c 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,6 +63,16 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::fv2
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::ft2
+(
+    const volScalarField& chi
+) const
+{
+    return Ct3_*exp(-Ct4_*sqr(chi));
+}
+
+
 template<class BasicTurbulenceModel>
 tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::S
 (
@@ -148,6 +158,53 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::fw
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::psi
+(
+    const volScalarField& chi,
+    const volScalarField& fv1
+) const
+{
+    tmp<volScalarField> tpsi
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                type() + ":psi",
+                this->time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            this->mesh(),
+            dimensionedScalar("one", dimless, 1)
+        )
+    );
+
+    if (lowReCorrection_)
+    {
+        volScalarField& psi = tpsi();
+
+        const volScalarField fv2(this->fv2(chi, fv1));
+        const volScalarField ft2(this->ft2(chi));
+
+        psi =
+            sqrt
+            (
+                min
+                (
+                    scalar(100),
+                    (1 - Cb1_/(Cw1_*sqr(kappa_)*fwStar_)*(ft2 + (1 - ft2)*fv2))
+                   /max(SMALL, (fv1*max(1e-10, 1 - ft2)))
+                )
+            );
+    }
+
+    return tpsi;
+}
+
+
 template<class BasicTurbulenceModel>
 tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::dTilda
 (
@@ -156,7 +213,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::dTilda
     const volTensorField& gradU
 ) const
 {
-    tmp<volScalarField> tdTilda(CDES_*this->delta());
+    tmp<volScalarField> tdTilda(psi(chi, fv1)*CDES_*this->delta());
     min(tdTilda().dimensionedInternalField(), tdTilda(), y_);
     return tdTilda;
 }
@@ -197,7 +254,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
     const word& type
 )
 :
-    LESeddyViscosity<BasicTurbulenceModel>
+    DESModel<BasicTurbulenceModel>
     (
         type,
         alpha,
@@ -300,6 +357,42 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
             0.07
         )
     ),
+    lowReCorrection_
+    (
+        Switch::lookupOrAddToDict
+        (
+            "lowReCorrection",
+            this->coeffDict_,
+            true
+        )
+    ),
+    Ct3_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Ct3",
+            this->coeffDict_,
+            1.2
+        )
+    ),
+    Ct4_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Ct4",
+            this->coeffDict_,
+            0.5
+        )
+    ),
+    fwStar_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "fwStar",
+            this->coeffDict_,
+            0.424
+        )
+    ),
 
     nuTilda_
     (
@@ -318,7 +411,6 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
 {
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
@@ -329,7 +421,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
 template<class BasicTurbulenceModel>
 bool SpalartAllmarasDES<BasicTurbulenceModel>::read()
 {
-    if (LESeddyViscosity<BasicTurbulenceModel>::read())
+    if (DESModel<BasicTurbulenceModel>::read())
     {
         sigmaNut_.readIfPresent(this->coeffDict());
         kappa_.readIfPresent(*this);
@@ -345,6 +437,11 @@ bool SpalartAllmarasDES<BasicTurbulenceModel>::read()
         CDES_.readIfPresent(this->coeffDict());
         ck_.readIfPresent(this->coeffDict());
 
+        lowReCorrection_.readIfPresent("lowReCorrection", this->coeffDict());
+        Ct3_.readIfPresent(this->coeffDict());
+        Ct4_.readIfPresent(this->coeffDict());
+        fwStar_.readIfPresent(this->coeffDict());
+
         return true;
     }
     else
@@ -414,10 +511,11 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
 
-    LESeddyViscosity<BasicTurbulenceModel>::correct();
+    DESModel<BasicTurbulenceModel>::correct();
 
     const volScalarField chi(this->chi());
     const volScalarField fv1(this->fv1(chi));
+    const volScalarField ft2(this->ft2(chi));
 
     tmp<volTensorField> tgradU = fvc::grad(U);
     const volScalarField Omega(this->Omega(tgradU()));
@@ -431,10 +529,11 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
       - fvm::laplacian(alpha*rho*DnuTildaEff(), nuTilda_)
       - Cb2_/sigmaNut_*alpha*rho*magSqr(fvc::grad(nuTilda_))
      ==
-        Cb1_*alpha*rho*Stilda*nuTilda_
+        Cb1_*alpha*rho*Stilda*nuTilda_*(scalar(1) - ft2)
       - fvm::Sp
         (
-            Cw1_*alpha*rho*fw(Stilda, dTilda)*nuTilda_/sqr(dTilda),
+            (Cw1_*fw(Stilda, dTilda) - Cb1_/sqr(kappa_)*ft2)
+           *alpha*rho*nuTilda_/sqr(dTilda),
             nuTilda_
         )
     );
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
similarity index 86%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
index 4c512487a3..2ffbbbd714 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,15 @@ Description
         Advances in DNS/LES, 1, 4-8.
     \endverbatim
 
+    Including the low Reynolds number correction documented in
+    \verbatim
+        Spalart, P. R., Deck, S., Shur, M.L., Squires, K.D., Strelets, M.Kh,
+        Travin, A. (2006).
+        A new version of detached-eddy simulation, resistant to ambiguous grid
+        densities.
+        Theor. Comput. Fluid Dyn., 20, 181-195.
+    \endverbatim
+
 SourceFiles
     SpalartAllmarasDES.C
 
@@ -47,7 +56,7 @@ SourceFiles
 #ifndef SpalartAllmarasDES_H
 #define SpalartAllmarasDES_H
 
-#include "LESeddyViscosity.H"
+#include "DESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,7 +72,7 @@ namespace LESModels
 template<class BasicTurbulenceModel>
 class SpalartAllmarasDES
 :
-    public LESeddyViscosity<BasicTurbulenceModel>
+    public DESModel<BasicTurbulenceModel>
 {
     // Private Member Functions
 
@@ -91,6 +100,15 @@ protected:
             dimensionedScalar CDES_;
             dimensionedScalar ck_;
 
+
+            // Low Reynolds number correction
+
+                Switch lowReCorrection_;
+                dimensionedScalar Ct3_;
+                dimensionedScalar Ct4_;
+                dimensionedScalar fwStar_;
+
+
         // Fields
 
             volScalarField nuTilda_;
@@ -113,6 +131,8 @@ protected:
             const volScalarField& fv1
         ) const;
 
+        tmp<volScalarField> ft2(const volScalarField& chi) const;
+
         tmp<volScalarField> S(const volTensorField& gradU) const;
 
         tmp<volScalarField> Omega(const volTensorField& gradU) const;
@@ -138,6 +158,12 @@ protected:
             const volScalarField& dTilda
         ) const;
 
+        tmp<volScalarField> psi
+        (
+            const volScalarField& chi,
+            const volScalarField& fv1
+        ) const;
+
         //- Length scale
         virtual tmp<volScalarField> dTilda
         (
@@ -184,7 +210,7 @@ public:
 
     // Member Functions
 
-        //- Read LESProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for nuTilda
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
similarity index 85%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index f96cdc6a16..40ea5c9e6a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,7 @@ namespace LESModels
 template<class BasicTurbulenceModel>
 tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::alpha() const
 {
+    // Equation 9 (plus limits)
     return max
     (
         0.25 - this->y_/static_cast<const volScalarField&>(IDDESDelta_.hmax()),
@@ -51,6 +52,7 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::ft
     const volScalarField& magGradU
 ) const
 {
+    // Equation 13
     return tanh(pow3(sqr(ct_)*rd(this->nut_, magGradU)));
 }
 
@@ -61,6 +63,7 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fl
     const volScalarField& magGradU
 ) const
 {
+    // Equation 13
     return tanh(pow(sqr(cl_)*rd(this->nu(), magGradU), 10));
 }
 
@@ -90,11 +93,12 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::rd
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fd
+tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::fdt
 (
     const volScalarField& magGradU
 ) const
 {
+    // Related to equation 16
     return 1 - tanh(pow3(8*rd(this->nuEff(), magGradU)));
 }
 
@@ -111,36 +115,28 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::dTilda
     const volScalarField expTerm(exp(sqr(alpha)));
     const volScalarField magGradU(mag(gradU));
 
-    tmp<volScalarField> fHill =
+    // Equation 9
+    tmp<volScalarField> fB = min(2*pow(expTerm, -9.0), scalar(1));
+
+    // Equation 11
+    tmp<volScalarField> fe1 =
         2*(pos(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.0));
 
-    tmp<volScalarField> fStep = min(2*pow(expTerm, -9.0), scalar(1));
-    const volScalarField fHyb(max(1 - fd(magGradU), fStep));
-    tmp<volScalarField> fAmp = 1 - max(ft(magGradU), fl(magGradU));
-    tmp<volScalarField> fRestore = max(fHill - 1, scalar(0))*fAmp;
+    // Equation 12
+    tmp<volScalarField> fe2 = 1 - max(ft(magGradU), fl(magGradU));
 
-    // IGNORING ft2 terms
-    const volScalarField Psi
-    (
-        sqrt
-        (
-            min
-            (
-                scalar(100),
-                (
-                    1
-                  - this->Cb1_*this->fv2(chi, fv1)
-                   /(this->Cw1_*sqr(this->kappa_)*fwStar_)
-                 )/max(SMALL, fv1)
-            )
-        )
-    );
+    // Equation 10
+    const volScalarField psi(this->psi(chi, fv1));
+    tmp<volScalarField> fe = max(fe1 - 1, scalar(0))*psi*fe2;
 
+    // Equation 16
+    const volScalarField fdTilda(max(1 - fdt(magGradU), fB));
+
+    // Equation 17 (plus limits)
     return max
     (
-        dimensionedScalar("SMALL", dimLength, SMALL),
-        fHyb*(1 + fRestore*Psi)*this->y_
-      + (1 - fHyb)*this->CDES_*Psi*this->delta()
+        fdTilda*(1 + fe)*this->y_ + (1 - fdTilda)*psi*this->CDES_*this->delta(),
+        dimensionedScalar("SMALL", dimLength, SMALL)
     );
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
similarity index 97%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index 2bfaf6089a..f146bf1dbf 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -92,7 +92,7 @@ class SpalartAllmarasIDDES
         ) const;
 
         //- Delay function
-        tmp<volScalarField> fd(const volScalarField& magGradU) const;
+        tmp<volScalarField> fdt(const volScalarField& magGradU) const;
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmarasIDDES(const SpalartAllmarasIDDES&);
@@ -146,7 +146,7 @@ public:
 
     // Member Functions
 
-        //- Read LESProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 };
 
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C
new file mode 100644
index 0000000000..9256590ddb
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "kOmegaSSTDDES.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTDDES<BasicTurbulenceModel>::rd
+(
+    const volScalarField& nur,
+    const volScalarField& magGradU
+) const
+{
+    tmp<volScalarField> tr
+    (
+        min
+        (
+            nur
+           /(
+                max
+                (
+                    magGradU,
+                    dimensionedScalar("SMALL", magGradU.dimensions(), SMALL)
+                )
+                *sqr(this->kappa_*this->y_)
+            ),
+            scalar(10)
+        )
+    );
+    tr().boundaryField() == 0.0;
+
+    return tr;
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTDDES<BasicTurbulenceModel>::fd
+(
+    const volScalarField& magGradU
+) const
+{
+    return 1 - tanh(pow(cd1_*rd(this->nuEff(), magGradU), cd2_));
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTDDES<BasicTurbulenceModel>::dTilda
+(
+    const volScalarField& magGradU,
+    const volScalarField& CDES
+) const
+{
+    const volScalarField& k = this->k_;
+    const volScalarField& omega = this->omega_;
+
+    const volScalarField lRAS(sqrt(k)/(this->betaStar_*omega));
+    const volScalarField lLES(CDES*this->delta());
+    const dimensionedScalar d0("SMALL", dimLength, SMALL);
+
+    return max(lRAS - fd(magGradU)*max(lRAS - lLES, d0), d0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+kOmegaSSTDDES<BasicTurbulenceModel>::kOmegaSSTDDES
+(
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName,
+    const word& type
+)
+:
+    kOmegaSSTDES<BasicTurbulenceModel>
+    (
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName,
+        type
+    ),
+
+    cd1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "cd1",
+            this->coeffDict_,
+            20
+        )
+    ),
+    cd2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "cd2",
+            this->coeffDict_,
+            3
+        )
+    )
+{
+    if (type == typeName)
+    {
+        this->printCoeffs(type);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool kOmegaSSTDDES<BasicTurbulenceModel>::read()
+{
+    if (kOmegaSSTDES<BasicTurbulenceModel>::read())
+    {
+        cd1_.readIfPresent(this->coeffDict());
+        cd2_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H
new file mode 100644
index 0000000000..ebc3e3ab12
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::LESModels::kOmegaSSTDDES
+
+Group
+    grpDESTurbulence
+
+Description
+    k-omega-SST DDES turbulence model for incompressible and compressible flows
+
+    Reference:
+    \verbatim
+        Gritskevich, M.S., Garbaruk, A.V., Schuetze, J., Menter, F.R. (2011)
+        Development of DDES and IDDES Formulations for the k-omega
+        Shear Stress Transport Model, Flow, Turbulence and Combustion,
+        pp. 1-19
+    \endverbatim
+
+SourceFiles
+    kOmegaSSTDDES.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kOmegaSSTDDES_H
+#define kOmegaSSTDDES_H
+
+#include "kOmegaSSTDES.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class kOmegaSSTDDES Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicTurbulenceModel>
+class kOmegaSSTDDES
+:
+    public kOmegaSSTDES<BasicTurbulenceModel>
+{
+    // Private Member Functions
+
+        tmp<volScalarField> rd
+        (
+            const volScalarField& nur,
+            const volScalarField& magGradU
+        ) const;
+
+        tmp<volScalarField> fd(const volScalarField& magGradU) const;
+
+        // Disallow default bitwise copy construct and assignment
+        kOmegaSSTDDES(const kOmegaSSTDDES&);
+        kOmegaSSTDDES& operator=(const kOmegaSSTDDES&);
+
+
+protected:
+
+    // Protected data
+
+        // Model coefficients
+
+            dimensionedScalar cd1_;
+            dimensionedScalar cd2_;
+
+
+    // Protected Member Functions
+
+        //- Length scale
+        virtual tmp<volScalarField> dTilda
+        (
+            const volScalarField& magGradU,
+            const volScalarField& CDES
+        ) const;
+
+
+public:
+
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
+    //- Runtime type information
+    TypeName("kOmegaSSTDDES");
+
+
+    // Constructors
+
+        //- Construct from components
+        kOmegaSSTDDES
+        (
+            const alphaField& alpha,
+            const rhoField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
+            const surfaceScalarField& phi,
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
+        );
+
+
+    //- Destructor
+    virtual ~kOmegaSSTDDES()
+    {}
+
+
+    // Member Functions
+
+        //- Re-read model coefficients if they have changed
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#ifdef NoRepository
+#   include "kOmegaSSTDDES.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C
new file mode 100644
index 0000000000..449eb03e15
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C
@@ -0,0 +1,290 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "kOmegaSSTDES.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+void kOmegaSSTDES<BasicTurbulenceModel>::correctNut(const volScalarField& S2)
+{
+    // Correct the turbulence viscosity
+    kOmegaSSTBase<DESModel<BasicTurbulenceModel> >::correctNut(S2);
+
+    // Correct the turbulence thermal diffusivity
+    BasicTurbulenceModel::correctNut();
+}
+
+
+template<class BasicTurbulenceModel>
+void kOmegaSSTDES<BasicTurbulenceModel>::correctNut()
+{
+    correctNut(2*magSqr(symm(fvc::grad(this->U_))));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTDES<BasicTurbulenceModel>::dTilda
+(
+    const volScalarField& magGradU,
+    const volScalarField& CDES
+) const
+{
+    const volScalarField& k = this->k_;
+    const volScalarField& omega = this->omega_;
+
+    return min(CDES*this->delta(), sqrt(k)/(this->betaStar_*omega));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
+(
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName,
+    const word& type
+)
+:
+    kOmegaSSTBase<DESModel<BasicTurbulenceModel> >
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            this->coeffDict_,
+            0.41
+        )
+    ),
+    CDESkom_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "CDESkom",
+            this->coeffDict_,
+            0.78
+        )
+    ),
+    CDESkeps_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "CDESkeps",
+            this->coeffDict_,
+            0.61
+        )
+    )
+{
+    correctNut();
+
+    if (type == typeName)
+    {
+        this->printCoeffs(type);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool kOmegaSSTDES<BasicTurbulenceModel>::read()
+{
+    if (kOmegaSSTBase<DESModel<BasicTurbulenceModel> >::read())
+    {
+        kappa_.readIfPresent(this->coeffDict());
+        CDESkom_.readIfPresent(this->coeffDict());
+        CDESkeps_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class BasicTurbulenceModel>
+void kOmegaSSTDES<BasicTurbulenceModel>::correct()
+{
+    if (!this->turbulence_)
+    {
+        return;
+    }
+
+    // Local references
+    const alphaField& alpha = this->alpha_;
+    const rhoField& rho = this->rho_;
+    const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+    const volVectorField& U = this->U_;
+    volScalarField& k = this->k_;
+    volScalarField& omega = this->omega_;
+    volScalarField& nut = this->nut_;
+
+    DESModel<BasicTurbulenceModel>::correct();
+
+    volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
+
+    tmp<volTensorField> tgradU = fvc::grad(U);
+    volScalarField magGradU(mag(tgradU()));
+    volScalarField S2(2*magSqr(symm(tgradU())));
+    volScalarField GbyNu((tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G(this->GName(), nut*GbyNu);
+    tgradU.clear();
+
+    // Update omega and G at the wall
+    omega.boundaryField().updateCoeffs();
+
+    volScalarField CDkOmega
+    (
+        (2*this->alphaOmega2_)*(fvc::grad(k) & fvc::grad(omega))/omega
+    );
+
+    volScalarField F1(this->F1(CDkOmega));
+
+    {
+        volScalarField gamma(this->gamma(F1));
+        volScalarField beta(this->beta(F1));
+
+        // Turbulent frequency equation
+        tmp<fvScalarMatrix> omegaEqn
+        (
+            fvm::ddt(alpha, rho, omega)
+          + fvm::div(alphaRhoPhi, omega)
+          - fvm::laplacian(alpha*rho*this->DomegaEff(F1), omega)
+         ==
+            alpha*rho*gamma*GbyNu // Using unlimited GybNu
+          - fvm::SuSp((2.0/3.0)*alpha*rho*gamma*divU, omega)
+          - fvm::Sp(alpha*rho*beta*omega, omega)
+          - fvm::SuSp(alpha*rho*(F1 - scalar(1))*CDkOmega/omega, omega)
+          + this->omegaSource()
+        );
+
+        omegaEqn().relax();
+
+        omegaEqn().boundaryManipulate(omega.boundaryField());
+
+        solve(omegaEqn);
+        bound(omega, this->omegaMin_);
+    }
+
+    {
+        volScalarField CDES(this->CDES(F1));
+        volScalarField dTilda(this->dTilda(magGradU, CDES));
+
+        // Turbulent kinetic energy equation
+        tmp<fvScalarMatrix> kEqn
+        (
+            fvm::ddt(alpha, rho, k)
+          + fvm::div(alphaRhoPhi, k)
+          - fvm::laplacian(alpha*rho*this->DkEff(F1), k)
+         ==
+            min(alpha*rho*G, (this->c1_*this->betaStar_)*alpha*rho*k*omega)
+          - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k)
+          - fvm::Sp(alpha*rho*sqrt(k)/dTilda, k)  // modified for DES
+          + this->kSource()
+        );
+
+        kEqn().relax();
+        solve(kEqn);
+        bound(k, this->kMin_);
+    }
+
+    this->correctNut(S2);
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTDES<BasicTurbulenceModel>::LESRegion() const
+{
+    const volScalarField& k = this->k_;
+    const volScalarField& omega = this->omega_;
+    const volVectorField& U = this->U_;
+
+    const volScalarField CDkOmega
+    (
+        (2*this->alphaOmega2_)*(fvc::grad(k) & fvc::grad(omega))/omega
+    );
+
+    const volScalarField F1(this->F1(CDkOmega));
+
+    tmp<volScalarField> tLESRegion
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "DES::LESRegion",
+                this->mesh_.time().timeName(),
+                this->mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            neg
+            (
+                dTilda
+                (
+                    mag(fvc::grad(U)),
+                    F1*CDESkom_ + (1 - F1)*CDESkeps_
+                )
+              - sqrt(k)/(this->betaStar_*omega)
+            )
+        )
+    );
+
+    return tLESRegion;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
new file mode 100644
index 0000000000..219c041c04
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::LESModels::kOmegaSSTDES
+
+Group
+    grpDESTurbulence
+
+Description
+    k-omega-SST DES turbulence model for incompressible and compressible flows
+
+    Reference:
+    \verbatim
+        Strelets, M. (2001)
+        Detached Eddy Simulation of Massively Separated Flows,
+        39th AIAA Aerospace Sciences Meeting and Exhibit, Reno, NV
+    \endverbatim
+
+SourceFiles
+    kOmegaSSTDES.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kOmegaSSTDES_H
+#define kOmegaSSTDES_H
+
+#include "DESModel.H"
+#include "kOmegaSSTBase.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                        class kOmegaSSTDES Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicTurbulenceModel>
+class kOmegaSSTDES
+:
+    public kOmegaSSTBase<DESModel<BasicTurbulenceModel> >
+{
+    // Private Member Functions
+
+        // Disallow default bitwise copy construct and assignment
+        kOmegaSSTDES(const kOmegaSSTDES&);
+        kOmegaSSTDES& operator=(const kOmegaSSTDES&);
+
+
+protected:
+
+    // Protected data
+
+        // Model coefficients
+
+            dimensionedScalar kappa_;
+            dimensionedScalar CDESkom_;
+            dimensionedScalar CDESkeps_;
+
+
+    // Protected Member Functions
+
+        //- Blending for CDES parameter
+        virtual tmp<volScalarField> CDES(const volScalarField& F1) const
+        {
+            return this->blend(F1, CDESkom_, CDESkeps_);
+        }
+
+        virtual void correctNut(const volScalarField& S2);
+        virtual void correctNut();
+
+        //- Length scale
+        virtual tmp<volScalarField> dTilda
+        (
+            const volScalarField& magGradU,
+            const volScalarField& CDES
+        ) const;
+
+
+public:
+
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
+    //- Runtime type information
+    TypeName("kOmegaSSTDES");
+
+
+    // Constructors
+
+        //- Construct from components
+        kOmegaSSTDES
+        (
+            const alphaField& alpha,
+            const rhoField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
+            const surfaceScalarField& phi,
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
+        );
+
+
+    //- Destructor
+    virtual ~kOmegaSSTDES()
+    {}
+
+
+    // Member Functions
+
+        //- Re-read model coefficients if they have changed
+        virtual bool read();
+
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct();
+
+        //- Return the LES field indicator
+        virtual tmp<volScalarField> LESRegion() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#ifdef NoRepository
+#   include "kOmegaSSTDES.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
new file mode 100644
index 0000000000..797f42407b
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
@@ -0,0 +1,247 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "kOmegaSSTIDDES.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+const IDDESDelta& kOmegaSSTIDDES<BasicTurbulenceModel>::setDelta() const
+{
+    if (!isA<IDDESDelta>(this->delta_()))
+    {
+        FatalErrorInFunction
+            << "The delta function must be set to a " << IDDESDelta::typeName
+            << " -based model" << exit(FatalError);
+    }
+
+    return refCast<const IDDESDelta>(this->delta_());
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::alpha() const
+{
+    return max(0.25 - this->y_/IDDESDelta_.hmax(), scalar(-5));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::ft
+(
+    const volScalarField& magGradU
+) const
+{
+    return tanh(pow3(sqr(ct_)*rd(this->nut_, magGradU)));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::fl
+(
+    const volScalarField& magGradU
+) const
+{
+    return tanh(pow(sqr(cl_)*rd(this->nu(), magGradU), 10));
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::rd
+(
+    const volScalarField& nur,
+    const volScalarField& magGradU
+) const
+{
+    tmp<volScalarField> tr
+    (
+        min
+        (
+            nur
+           /(
+                max
+                (
+                    magGradU,
+                    dimensionedScalar("SMALL", magGradU.dimensions(), SMALL)
+                )
+                *sqr(this->kappa_*this->y_)
+            ),
+            scalar(10)
+        )
+    );
+    tr().boundaryField() == 0.0;
+
+    return tr;
+}
+
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::fd
+(
+    const volScalarField& magGradU
+) const
+{
+    return 1 - tanh(pow(cdt1_*rd(this->nuEff(), magGradU), cdt2_));
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::dTilda
+(
+    const volScalarField& magGradU,
+    const volScalarField& CDES
+) const
+{
+    const volScalarField& k = this->k_;
+    const volScalarField& omega = this->omega_;
+
+    const volScalarField lRAS(sqrt(k)/(this->betaStar_*omega));
+    const volScalarField lLES(CDES*this->delta());
+    const dimensionedScalar d0("SMALL", dimLength, SMALL);
+
+    const volScalarField alpha(this->alpha());
+    const volScalarField expTerm(exp(sqr(alpha)));
+
+    tmp<volScalarField> fStep = min(2*pow(expTerm, -9.0), scalar(1));
+    const volScalarField fHyb(max(1 - fd(magGradU), fStep));
+    // Simplified version where fRestore = 0
+    // return max(d0, fHyb*lRAS + (1 - fHyb)*lLES);
+
+    // Original form
+    tmp<volScalarField> fHill =
+        2*(pos(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.0));
+    tmp<volScalarField> fAmp = 1 - max(ft(magGradU), fl(magGradU));
+    tmp<volScalarField> fRestore = max(fHill - 1, scalar(0))*fAmp;
+    return max(d0, fHyb*(1 + fRestore)*lRAS + (1 - fHyb)*lLES);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+kOmegaSSTIDDES<BasicTurbulenceModel>::kOmegaSSTIDDES
+(
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName,
+    const word& type
+)
+:
+    kOmegaSSTDES<BasicTurbulenceModel>
+    (
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName,
+        type
+    ),
+    cdt1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "cdt1",
+            this->coeffDict_,
+            20
+        )
+    ),
+    cdt2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "cdt2",
+            this->coeffDict_,
+            3
+        )
+    ),
+    cl_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "cl",
+            this->coeffDict_,
+            5
+        )
+    ),
+    ct_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "ct",
+            this->coeffDict_,
+            1.87
+        )
+    ),
+    IDDESDelta_(setDelta())
+{
+    if (type == typeName)
+    {
+        this->printCoeffs(type);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool kOmegaSSTIDDES<BasicTurbulenceModel>::read()
+{
+    if (kOmegaSSTDES<BasicTurbulenceModel>::read())
+    {
+        cdt1_.readIfPresent(this->coeffDict());
+        cdt2_.readIfPresent(this->coeffDict());
+        cl_.readIfPresent(this->coeffDict());
+        ct_.readIfPresent(this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H
new file mode 100644
index 0000000000..fe5e50a304
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::LESModels::kOmegaSSTIDDES
+
+Group
+    grpDESTurbulence
+
+Description
+    k-omega-SST IDDES turbulence model for incompressible and compressible
+    flows
+
+    Reference:
+    \verbatim
+        Gritskevich, M.S., Garbaruk, A.V., Schuetze, J., Menter, F.R. (2011)
+        Development of DDES and IDDES Formulations for the k-omega
+        Shear Stress Transport Model, Flow, Turbulence and Combustion,
+        pp. 1-19
+    \endverbatim
+
+SourceFiles
+    kOmegaSSTIDDES.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kOmegaSSTIDDES_H
+#define kOmegaSSTIDDES_H
+
+#include "kOmegaSSTDES.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                       class kOmegaSSTIDDES Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicTurbulenceModel>
+class kOmegaSSTIDDES
+:
+    public kOmegaSSTDES<BasicTurbulenceModel>
+{
+    // Private Member Functions
+
+        //- Check that the supplied delta is an IDDESDelta
+        const IDDESDelta& setDelta() const;
+
+        tmp<volScalarField> alpha() const;
+        tmp<volScalarField> ft(const volScalarField& magGradU) const;
+        tmp<volScalarField> fl(const volScalarField& magGradU) const;
+
+        tmp<volScalarField> rd
+        (
+            const volScalarField& nur,
+            const volScalarField& magGradU
+        ) const;
+
+        //- Delay function
+        tmp<volScalarField> fd(const volScalarField& maggradU) const;
+
+        // Disallow default bitwise copy construct and assignment
+        kOmegaSSTIDDES(const kOmegaSSTIDDES&);
+        kOmegaSSTIDDES& operator=(const kOmegaSSTIDDES&);
+
+
+protected:
+
+    // Protected data
+
+        // Model coefficients
+
+            dimensionedScalar cdt1_;
+            dimensionedScalar cdt2_;
+            dimensionedScalar cl_;
+            dimensionedScalar ct_;
+
+        // Fields
+
+            const IDDESDelta& IDDESDelta_;
+
+
+        //- Length scale
+        virtual tmp<volScalarField> dTilda
+        (
+            const volScalarField& magGradU,
+            const volScalarField& CDES
+        ) const;
+
+
+public:
+
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
+    typedef typename BasicTurbulenceModel::rhoField rhoField;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
+
+
+    //- Runtime type information
+    TypeName("kOmegaSSTIDDES");
+
+
+    // Constructors
+
+        //- Construct from components
+        kOmegaSSTIDDES
+        (
+            const alphaField& alpha,
+            const rhoField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
+            const surfaceScalarField& phi,
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName,
+            const word& type = typeName
+        );
+
+
+    //- Destructor
+    virtual ~kOmegaSSTIDDES()
+    {}
+
+
+    // Member Functions
+
+        //- Re-read model coefficients if they have changed
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#ifdef NoRepository
+#   include "kOmegaSSTIDDES.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 31526fbf0c..e958e93324 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -110,9 +110,8 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
 {
     if (type == typeName)
     {
-        this->boundNormalStress(this->R_);
-        correctNut();
         this->printCoeffs(type);
+        this->boundNormalStress(this->R_);
     }
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 9955478f41..ea11e334a3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -80,6 +80,17 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
         )
     ),
 
+    omegaMin_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "omegaMin",
+            LESDict_,
+            dimless/dimTime,
+            SMALL
+        )
+    ),
+
     delta_
     (
         LESdelta::New
@@ -136,17 +147,8 @@ Foam::LESModel<BasicTurbulenceModel>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "LESModel::New"
-            "("
-                "const volScalarField&, "
-                "const volVectorField&, "
-                "const surfaceScalarField&, "
-                "transportModel&, "
-                "const word&"
-            ")"
-        )   << "Unknown LESModel type "
+        FatalErrorInFunction
+            << "Unknown LESModel type "
             << modelType << nl << nl
             << "Valid LESModel types:" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
index cefb8dd70e..5ecfeecee3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,6 +78,9 @@ protected:
         //- Lower limit of k
         dimensionedScalar kMin_;
 
+        //- Lower limit of omega
+        dimensionedScalar omegaMin_;
+
         //- Run-time selectable delta model
         autoPtr<Foam::LESdelta> delta_;
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
index 301638dd5f..38517e5bc5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C
@@ -103,13 +103,13 @@ void Foam::LESModels::IDDESDelta::calcDelta()
 
     if (nD == 2)
     {
-        WarningIn("IDDESDelta::calcDelta()")
+        WarningInFunction
             << "Case is 2D, LES is not strictly applicable" << nl
             << endl;
     }
     else if (nD != 3)
     {
-        FatalErrorIn("IDDESDelta::calcDelta()")
+        FatalErrorInFunction
             << "Case must be either 2D or 3D" << exit(FatalError);
     }
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index a685bd5e53..b799237a36 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -78,10 +78,8 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "LESdelta::New(const word& name, const turbulenceModel& turbulence)"
-        )   << "Unknown LESdelta type "
+        FatalErrorInFunction
+            << "Unknown LESdelta type "
             << deltaType << nl << nl
             << "Valid LESdelta types are :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
@@ -119,12 +117,8 @@ Foam::autoPtr<Foam::LESdelta> Foam::LESdelta::New
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
-            FatalErrorIn
-            (
-                "LESdelta::New(const word& name, "
-                "const turbulenceModel& turbulence, "
-                "const dictionaryConstructorTable&)"
-            )   << "Unknown LESdelta type "
+            FatalErrorInFunction
+                << "Unknown LESdelta type "
                 << deltaType << nl << nl
                 << "Valid LESdelta types are :" << endl
                 << additionalConstructors.sortedToc()
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
index 4767c400ce..9829fed3c5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
@@ -52,7 +52,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta()
     }
     else if (nD == 2)
     {
-        WarningIn("cubeRootVolDelta::calcDelta()")
+        WarningInFunction
             << "Case is 2D, LES is not strictly applicable\n"
             << endl;
 
@@ -72,7 +72,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta()
     }
     else
     {
-        FatalErrorIn("cubeRootVolDelta::calcDelta()")
+        FatalErrorInFunction
             << "Case is not 3D or 2D, LES is not applicable"
             << exit(FatalError);
     }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
index 6c277bf7eb..701bab6da3 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C
@@ -90,7 +90,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
     }
     else if (nD == 2)
     {
-        WarningIn("maxDeltaxyz::calcDelta()")
+        WarningInFunction
             << "Case is 2D, LES is not strictly applicable\n"
             << endl;
 
@@ -98,7 +98,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta()
     }
     else
     {
-        FatalErrorIn("maxDeltaxyz::calcDelta()")
+        FatalErrorInFunction
             << "Case is not 3D or 2D, LES is not applicable"
             << exit(FatalError);
     }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
index 1a71e556bf..a8d82752f5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
@@ -49,7 +49,7 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LESeddyViscosity Declaration
+                      Class LESeddyViscosity Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class BasicTurbulenceModel>
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
index 0dc3e9b493..6f614f0d91 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
@@ -51,10 +51,8 @@ Foam::autoPtr<Foam::LESfilter> Foam::LESfilter::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "LESfilter::New(const fvMesh&, const dictionary&)"
-        )   << "Unknown LESfilter type "
+        FatalErrorInFunction
+            << "Unknown LESfilter type "
             << filterType << nl << nl
             << "Valid LESfilter types are :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
index c3549fdd88..9827f76063 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
@@ -113,7 +113,6 @@ Smagorinsky<BasicTurbulenceModel>::Smagorinsky
 {
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
index 674c889b1c..49a353ba1d 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
@@ -143,7 +143,6 @@ WALE<BasicTurbulenceModel>::WALE
 {
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
index 9f98bea024..ac076991e8 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
@@ -185,7 +185,6 @@ dynamicKEqn<BasicTurbulenceModel>::dynamicKEqn
 
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
index 15908a4ffe..6a6fb02b93 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
@@ -122,7 +122,6 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
 {
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
index eda73f6929..ef2b2b8535 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
@@ -113,7 +113,6 @@ kEqn<BasicTurbulenceModel>::kEqn
 
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/Make/files b/src/TurbulenceModels/turbulenceModels/Make/files
index 028ed811b4..a22069a952 100644
--- a/src/TurbulenceModels/turbulenceModels/Make/files
+++ b/src/TurbulenceModels/turbulenceModels/Make/files
@@ -20,6 +20,10 @@ $(LESfilters)/laplaceFilter/laplaceFilter.C
 $(LESfilters)/anisotropicFilter/anisotropicFilter.C
 
 
+/* Base class for DES models */
+DES/DESModel/DESModelBase.C
+
+
 /* Turbulence BCs */
 derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
 derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
index 7dfa45a031..2b8be52762 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
@@ -200,11 +200,11 @@ LRR<BasicTurbulenceModel>::LRR
 {
     if (type == typeName)
     {
+        this->printCoeffs(type);
+
         this->boundNormalStress(this->R_);
         bound(epsilon_, this->epsilonMin_);
         k_ = 0.5*tr(this->R_);
-        correctNut();
-        this->printCoeffs(type);
     }
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index ef6809fcfc..d3fca3307b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -204,7 +204,6 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
 
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index 240c0870df..e55e79f4d4 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -148,17 +148,8 @@ Foam::RASModel<BasicTurbulenceModel>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "RASModel::New"
-            "("
-                "const volScalarField&, "
-                "const volVectorField&, "
-                "const surfaceScalarField&, "
-                "transportModel&, "
-                "const word&"
-            ")"
-        )   << "Unknown RASModel type "
+        FatalErrorInFunction
+            << "Unknown RASModel type "
             << modelType << nl << nl
             << "Valid RASModel types:" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
index 5406367db6..1eec3da8a9 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -205,7 +205,6 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
 
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
index 4d61b3db65..9f9cc53464 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
@@ -209,11 +209,11 @@ SSG<BasicTurbulenceModel>::SSG
 {
     if (type == typeName)
     {
+        this->printCoeffs(type);
+
         this->boundNormalStress(this->R_);
         bound(epsilon_, this->epsilonMin_);
         k_ = 0.5*tr(this->R_);
-        correctNut();
-        this->printCoeffs(type);
     }
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
index 520accaed5..a029db7ad3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -255,7 +255,6 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
 {
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
@@ -321,7 +320,7 @@ tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::k() const
 template<class BasicTurbulenceModel>
 tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::epsilon() const
 {
-    WarningIn("tmp<volScalarField> SpalartAllmaras::epsilon() const")
+    WarningInFunction
         << "Turbulence kinetic energy dissipation rate not defined for "
         << "Spalart-Allmaras model. Returning zero field"
         << endl;
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
index 51d303361c..c84373b9e2 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -183,7 +183,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for nuTilda
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index 5cd044eb34..2679132d78 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -60,10 +60,8 @@ atmBoundaryLayer::atmBoundaryLayer(const vectorField& p, const dictionary& dict)
 {
     if (mag(flowDir_) < SMALL || mag(zDir_) < SMALL)
     {
-        FatalErrorIn
-        (
-            "atmBoundaryLayer(const dictionary&)"
-        )   << "magnitude of n or z must be greater than zero"
+        FatalErrorInFunction
+            << "magnitude of n or z must be greater than zero"
             << abort(FatalError);
     }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
index f551ecc7e4..f3353c0ab3 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ Description
         \f]
 
         \f[
-            k = \frac{(U^*)^2}{\sqrt{C_mu}}
+            k = \frac{(U^*)^2}{\sqrt{C_{\mu}}}
         \f]
 
         \f[
@@ -50,7 +50,7 @@ Description
     \vartable
         U^*     | Friction velocity
         \kappa  | von Karman's constant
-        C_mu    | Turbulence viscosity coefficient
+        C_{\mu} | Turbulence viscosity coefficient
         z       | Vertical coordinate
         z_0     | Surface roughness height [m]
         z_g     | Minimum z-coordinate [m]
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
index e4a45b01fb..6a9266e8b0 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kEpsilon.H"
+#include "fvOptions.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,6 +42,9 @@ void kEpsilon<BasicTurbulenceModel>::correctNut()
     this->nut_ = Cmu_*sqr(k_)/epsilon_;
     this->nut_.correctBoundaryConditions();
 
+    fv::options& fvOptions(fv::options::New(this->mesh_));
+    fvOptions.correct(this->nut_);
+
     BasicTurbulenceModel::correctNut();
 }
 
@@ -188,7 +192,6 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
     if (type == typeName)
     {
         this->printCoeffs(type);
-        correctNut();
     }
 }
 
@@ -230,6 +233,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
     volScalarField& nut = this->nut_;
+    fv::options& fvOptions(fv::options::New(this->mesh_));
 
     eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
 
@@ -253,11 +257,14 @@ void kEpsilon<BasicTurbulenceModel>::correct()
       - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*alpha*rho*divU, epsilon_)
       - fvm::Sp(C2_*alpha*rho*epsilon_/k_, epsilon_)
       + epsilonSource()
+      + fvOptions(alpha, rho, epsilon_)
     );
 
     epsEqn().relax();
+    fvOptions.constrain(epsEqn());
     epsEqn().boundaryManipulate(epsilon_.boundaryField());
     solve(epsEqn);
+    fvOptions.correct(epsilon_);
     bound(epsilon_, this->epsilonMin_);
 
     // Turbulent kinetic energy equation
@@ -271,10 +278,13 @@ void kEpsilon<BasicTurbulenceModel>::correct()
       - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
       - fvm::Sp(alpha*rho*epsilon_/k_, k_)
       + kSource()
+      + fvOptions(alpha, rho, k_)
     );
 
     kEqn().relax();
+    fvOptions.constrain(kEqn());
     solve(kEqn);
+    fvOptions.correct(k_);
     bound(k_, this->kMin_);
 
     correctNut();
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
index 412a6b3e6b..5f5e76c03f 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
@@ -147,7 +147,6 @@ kOmega<BasicTurbulenceModel>::kOmega
 
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
index 76fd9cf0c3..878e0f55a7 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
@@ -24,8 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "kOmegaSST.H"
-#include "bound.H"
-#include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -34,91 +32,22 @@ namespace Foam
 namespace RASModels
 {
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-template<class BasicTurbulenceModel>
-tmp<volScalarField> kOmegaSST<BasicTurbulenceModel>::kOmegaSST::F1
-(
-    const volScalarField& CDkOmega
-) const
-{
-    tmp<volScalarField> CDkOmegaPlus = max
-    (
-        CDkOmega,
-        dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10)
-    );
-
-    tmp<volScalarField> arg1 = min
-    (
-        min
-        (
-            max
-            (
-                (scalar(1)/betaStar_)*sqrt(k_)/(omega_*y_),
-                scalar(500)*(this->mu()/this->rho_)/(sqr(y_)*omega_)
-            ),
-            (4*alphaOmega2_)*k_/(CDkOmegaPlus*sqr(y_))
-        ),
-        scalar(10)
-    );
-
-    return tanh(pow4(arg1));
-}
-
-template<class BasicTurbulenceModel>
-tmp<volScalarField> kOmegaSST<BasicTurbulenceModel>::kOmegaSST::F2() const
-{
-    tmp<volScalarField> arg2 = min
-    (
-        max
-        (
-            (scalar(2)/betaStar_)*sqrt(k_)/(omega_*y_),
-            scalar(500)*(this->mu()/this->rho_)/(sqr(y_)*omega_)
-        ),
-        scalar(100)
-    );
-
-    return tanh(sqr(arg2));
-}
-
-template<class BasicTurbulenceModel>
-tmp<volScalarField> kOmegaSST<BasicTurbulenceModel>::kOmegaSST::F3() const
-{
-    tmp<volScalarField> arg3 = min
-    (
-        150*(this->mu()/this->rho_)/(omega_*sqr(y_)),
-        scalar(10)
-    );
-
-    return 1 - tanh(pow4(arg3));
-}
-
-template<class BasicTurbulenceModel>
-tmp<volScalarField> kOmegaSST<BasicTurbulenceModel>::kOmegaSST::F23() const
-{
-    tmp<volScalarField> f23(F2());
-
-    if (F3_)
-    {
-        f23() *= F3();
-    }
-
-    return f23;
-}
-
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
 void kOmegaSST<BasicTurbulenceModel>::correctNut(const volScalarField& S2)
 {
-    this->nut_ = a1_*k_/max(a1_*omega_, b1_*F23()*sqrt(S2));
-    this->nut_.correctBoundaryConditions();
+    // Correct the turbulence viscosity
+    kOmegaSSTBase<eddyViscosity<RASModel<BasicTurbulenceModel> > >::correctNut
+    (
+        S2
+    );
 
+    // Correct the turbulence thermal diffusivity
     BasicTurbulenceModel::correctNut();
 }
 
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
 template<class BasicTurbulenceModel>
 void kOmegaSST<BasicTurbulenceModel>::correctNut()
 {
@@ -126,53 +55,6 @@ void kOmegaSST<BasicTurbulenceModel>::correctNut()
 }
 
 
-template<class BasicTurbulenceModel>
-tmp<fvScalarMatrix> kOmegaSST<BasicTurbulenceModel>::kSource() const
-{
-    return tmp<fvScalarMatrix>
-    (
-        new fvScalarMatrix
-        (
-            k_,
-            dimVolume*this->rho_.dimensions()*k_.dimensions()/dimTime
-        )
-    );
-}
-
-
-template<class BasicTurbulenceModel>
-tmp<fvScalarMatrix> kOmegaSST<BasicTurbulenceModel>::omegaSource() const
-{
-    return tmp<fvScalarMatrix>
-    (
-        new fvScalarMatrix
-        (
-            omega_,
-            dimVolume*this->rho_.dimensions()*omega_.dimensions()/dimTime
-        )
-    );
-}
-
-
-template<class BasicTurbulenceModel>
-tmp<fvScalarMatrix> kOmegaSST<BasicTurbulenceModel>::Qsas
-(
-    const volScalarField& S2,
-    const volScalarField& gamma,
-    const volScalarField& beta
-) const
-{
-    return tmp<fvScalarMatrix>
-    (
-        new fvScalarMatrix
-        (
-            omega_,
-            dimVolume*this->rho_.dimensions()*omega_.dimensions()/dimTime
-        )
-    );
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
@@ -188,7 +70,7 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
     const word& type
 )
 :
-    eddyViscosity<RASModel<BasicTurbulenceModel> >
+    kOmegaSSTBase<eddyViscosity<RASModel<BasicTurbulenceModel> > >
     (
         type,
         alpha,
@@ -198,286 +80,15 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
         phi,
         transport,
         propertiesName
-    ),
-
-    alphaK1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK1",
-            this->coeffDict_,
-            0.85
-        )
-    ),
-    alphaK2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaK2",
-            this->coeffDict_,
-            1.0
-        )
-    ),
-    alphaOmega1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega1",
-            this->coeffDict_,
-            0.5
-        )
-    ),
-    alphaOmega2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "alphaOmega2",
-            this->coeffDict_,
-            0.856
-        )
-    ),
-    gamma1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma1",
-            this->coeffDict_,
-            5.0/9.0
-        )
-    ),
-    gamma2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "gamma2",
-            this->coeffDict_,
-            0.44
-        )
-    ),
-    beta1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta1",
-            this->coeffDict_,
-            0.075
-        )
-    ),
-    beta2_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "beta2",
-            this->coeffDict_,
-            0.0828
-        )
-    ),
-    betaStar_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "betaStar",
-            this->coeffDict_,
-            0.09
-        )
-    ),
-    a1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "a1",
-            this->coeffDict_,
-            0.31
-        )
-    ),
-    b1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "b1",
-            this->coeffDict_,
-            1.0
-        )
-    ),
-    c1_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "c1",
-            this->coeffDict_,
-            10.0
-        )
-    ),
-    F3_
-    (
-        Switch::lookupOrAddToDict
-        (
-            "F3",
-            this->coeffDict_,
-            false
-        )
-    ),
-
-    y_(wallDist::New(this->mesh_).y()),
-
-    k_
-    (
-        IOobject
-        (
-            IOobject::groupName("k", U.group()),
-            this->runTime_.timeName(),
-            this->mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        this->mesh_
-    ),
-    omega_
-    (
-        IOobject
-        (
-            IOobject::groupName("omega", U.group()),
-            this->runTime_.timeName(),
-            this->mesh_,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        this->mesh_
     )
 {
-    bound(k_, this->kMin_);
-    bound(omega_, this->omegaMin_);
-
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class BasicTurbulenceModel>
-bool kOmegaSST<BasicTurbulenceModel>::read()
-{
-    if (eddyViscosity<RASModel<BasicTurbulenceModel> >::read())
-    {
-        alphaK1_.readIfPresent(this->coeffDict());
-        alphaK2_.readIfPresent(this->coeffDict());
-        alphaOmega1_.readIfPresent(this->coeffDict());
-        alphaOmega2_.readIfPresent(this->coeffDict());
-        gamma1_.readIfPresent(this->coeffDict());
-        gamma2_.readIfPresent(this->coeffDict());
-        beta1_.readIfPresent(this->coeffDict());
-        beta2_.readIfPresent(this->coeffDict());
-        betaStar_.readIfPresent(this->coeffDict());
-        a1_.readIfPresent(this->coeffDict());
-        b1_.readIfPresent(this->coeffDict());
-        c1_.readIfPresent(this->coeffDict());
-        F3_.readIfPresent("F3", this->coeffDict());
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-template<class BasicTurbulenceModel>
-void kOmegaSST<BasicTurbulenceModel>::correct()
-{
-    if (!this->turbulence_)
-    {
-        return;
-    }
-
-    // Local references
-    const alphaField& alpha = this->alpha_;
-    const rhoField& rho = this->rho_;
-    const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
-    const volVectorField& U = this->U_;
-    volScalarField& nut = this->nut_;
-
-    eddyViscosity<RASModel<BasicTurbulenceModel> >::correct();
-
-    volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
-
-    tmp<volTensorField> tgradU = fvc::grad(U);
-    volScalarField S2(2*magSqr(symm(tgradU())));
-    volScalarField GbyNu((tgradU() && dev(twoSymm(tgradU()))));
-    volScalarField G(this->GName(), nut*GbyNu);
-    tgradU.clear();
-
-    // Update omega and G at the wall
-    omega_.boundaryField().updateCoeffs();
-
-    volScalarField CDkOmega
-    (
-        (2*alphaOmega2_)*(fvc::grad(k_) & fvc::grad(omega_))/omega_
-    );
-
-    volScalarField F1(this->F1(CDkOmega));
-
-    {
-        volScalarField gamma(this->gamma(F1));
-        volScalarField beta(this->beta(F1));
-
-        // Turbulent frequency equation
-        tmp<fvScalarMatrix> omegaEqn
-        (
-            fvm::ddt(alpha, rho, omega_)
-          + fvm::div(alphaRhoPhi, omega_)
-          - fvm::laplacian(alpha*rho*DomegaEff(F1), omega_)
-         ==
-            alpha*rho*gamma
-           *min
-            (
-                GbyNu,
-                (c1_/a1_)*betaStar_*omega_*max(a1_*omega_, b1_*F23()*sqrt(S2))
-            )
-          - fvm::SuSp((2.0/3.0)*alpha*rho*gamma*divU, omega_)
-          - fvm::Sp(alpha*rho*beta*omega_, omega_)
-          - fvm::SuSp
-            (
-                alpha*rho*(F1 - scalar(1))*CDkOmega/omega_,
-                omega_
-            )
-          + Qsas(S2, gamma, beta)
-          + omegaSource()
-        );
-
-        omegaEqn().relax();
-
-        omegaEqn().boundaryManipulate(omega_.boundaryField());
-
-        solve(omegaEqn);
-        bound(omega_, this->omegaMin_);
-    }
-
-    // Turbulent kinetic energy equation
-    tmp<fvScalarMatrix> kEqn
-    (
-        fvm::ddt(alpha, rho, k_)
-      + fvm::div(alphaRhoPhi, k_)
-      - fvm::laplacian(alpha*rho*DkEff(F1), k_)
-     ==
-        min(alpha*rho*G, (c1_*betaStar_)*alpha*rho*k_*omega_)
-      - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
-      - fvm::Sp(alpha*rho*betaStar_*omega_, k_)
-      + kSource()
-    );
-
-    kEqn().relax();
-    solve(kEqn);
-    bound(k_, this->kMin_);
-
-    correctNut(S2);
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace RASModels
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index 1bbbedc91d..17327ad9dd 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -31,6 +31,8 @@ Description
     Implementation of the k-omega-SST turbulence model for
     incompressible and compressible flows.
 
+    Light wrapper around base class.
+
     Turbulence model described in:
     \verbatim
         Menter, F. R. & Esch, T. (2001).
@@ -98,11 +100,15 @@ Description
 SourceFiles
     kOmegaSST.C
 
+SeeAlso
+    kOmegaSSTBase.H
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef kOmegaSST_H
 #define kOmegaSST_H
 
+#include "kOmegaSSTBase.H"
 #include "RASModel.H"
 #include "eddyViscosity.H"
 
@@ -114,110 +120,21 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class kOmegaSST Declaration
+                          Class kOmegaSST Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class BasicTurbulenceModel>
 class kOmegaSST
 :
-    public eddyViscosity<RASModel<BasicTurbulenceModel> >
+    public kOmegaSSTBase<eddyViscosity<RASModel<BasicTurbulenceModel> > >
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSST(const kOmegaSST&);
-        kOmegaSST& operator=(const kOmegaSST&);
-
 
 protected:
 
-    // Protected data
-
-        // Model coefficients
-
-            dimensionedScalar alphaK1_;
-            dimensionedScalar alphaK2_;
-
-            dimensionedScalar alphaOmega1_;
-            dimensionedScalar alphaOmega2_;
-
-            dimensionedScalar gamma1_;
-            dimensionedScalar gamma2_;
-
-            dimensionedScalar beta1_;
-            dimensionedScalar beta2_;
-
-            dimensionedScalar betaStar_;
-
-            dimensionedScalar a1_;
-            dimensionedScalar b1_;
-            dimensionedScalar c1_;
-
-            Switch F3_;
-
-
-        // Fields
-
-            //- Wall distance
-            //  Note: different to wall distance in parent RASModel
-            //  which is for near-wall cells only
-            const volScalarField& y_;
-
-            volScalarField k_;
-            volScalarField omega_;
-
-
-    // Private Member Functions
-
-        tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
-        tmp<volScalarField> F2() const;
-        tmp<volScalarField> F3() const;
-        tmp<volScalarField> F23() const;
-
-        tmp<volScalarField> blend
-        (
-            const volScalarField& F1,
-            const dimensionedScalar& psi1,
-            const dimensionedScalar& psi2
-        ) const
-        {
-            return F1*(psi1 - psi2) + psi2;
-        }
-
-        tmp<volScalarField> alphaK(const volScalarField& F1) const
-        {
-            return blend(F1, alphaK1_, alphaK2_);
-        }
-
-        tmp<volScalarField> alphaOmega(const volScalarField& F1) const
-        {
-            return blend(F1, alphaOmega1_, alphaOmega2_);
-        }
-
-        tmp<volScalarField> beta(const volScalarField& F1) const
-        {
-            return blend(F1, beta1_, beta2_);
-        }
-
-        tmp<volScalarField> gamma(const volScalarField& F1) const
-        {
-            return blend(F1, gamma1_, gamma2_);
-        }
-
-        void correctNut(const volScalarField& S2);
-
-
-    // Protected Member Functions
+    // Protecetd Member Functions
 
+        virtual void correctNut(const volScalarField& S2);
         virtual void correctNut();
-        virtual tmp<fvScalarMatrix> kSource() const;
-        virtual tmp<fvScalarMatrix> omegaSource() const;
-        virtual tmp<fvScalarMatrix> Qsas
-        (
-            const volScalarField& S2,
-            const volScalarField& gamma,
-            const volScalarField& beta
-        ) const;
 
 
 public:
@@ -250,68 +167,6 @@ public:
     //- Destructor
     virtual ~kOmegaSST()
     {}
-
-
-    // Member Functions
-
-        //- Re-read model coefficients if they have changed
-        virtual bool read();
-
-        //- Return the effective diffusivity for k
-        tmp<volScalarField> DkEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField("DkEff", alphaK(F1)*this->nut_ + this->nu())
-            );
-        }
-
-        //- Return the effective diffusivity for omega
-        tmp<volScalarField> DomegaEff(const volScalarField& F1) const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    "DomegaEff",
-                    alphaOmega(F1)*this->nut_ + this->nu()
-                )
-            );
-        }
-
-        //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return k_;
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-              return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (
-                        "epsilon",
-                        this->mesh_.time().timeName(),
-                        this->mesh_
-                    ),
-                    betaStar_*k_*omega_,
-                    omega_.boundaryField().types()
-                )
-            );
-        }
-
-        //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> omega() const
-        {
-            return omega_;
-        }
-
-        //- Solve the turbulence equations and correct the turbulence viscosity
-        virtual void correct();
 };
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.C
new file mode 100644
index 0000000000..19943c0c1b
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.C
@@ -0,0 +1,480 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "kOmegaSSTBase.H"
+#include "bound.H"
+#include "wallDist.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class BasicEddyViscosityModel>
+tmp<volScalarField> kOmegaSSTBase<BasicEddyViscosityModel>::F1
+(
+    const volScalarField& CDkOmega
+) const
+{
+    tmp<volScalarField> CDkOmegaPlus = max
+    (
+        CDkOmega,
+        dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10)
+    );
+
+    tmp<volScalarField> arg1 = min
+    (
+        min
+        (
+            max
+            (
+                (scalar(1)/betaStar_)*sqrt(k_)/(omega_*y_),
+                scalar(500)*(this->mu()/this->rho_)/(sqr(y_)*omega_)
+            ),
+            (4*alphaOmega2_)*k_/(CDkOmegaPlus*sqr(y_))
+        ),
+        scalar(10)
+    );
+
+    return tanh(pow4(arg1));
+}
+
+
+template<class BasicEddyViscosityModel>
+tmp<volScalarField> kOmegaSSTBase<BasicEddyViscosityModel>::F2() const
+{
+    tmp<volScalarField> arg2 = min
+    (
+        max
+        (
+            (scalar(2)/betaStar_)*sqrt(k_)/(omega_*y_),
+            scalar(500)*(this->mu()/this->rho_)/(sqr(y_)*omega_)
+        ),
+        scalar(100)
+    );
+
+    return tanh(sqr(arg2));
+}
+
+
+template<class BasicEddyViscosityModel>
+tmp<volScalarField> kOmegaSSTBase<BasicEddyViscosityModel>::F3() const
+{
+    tmp<volScalarField> arg3 = min
+    (
+        150*(this->mu()/this->rho_)/(omega_*sqr(y_)),
+        scalar(10)
+    );
+
+    return 1 - tanh(pow4(arg3));
+}
+
+
+template<class BasicEddyViscosityModel>
+tmp<volScalarField> kOmegaSSTBase<BasicEddyViscosityModel>::F23() const
+{
+    tmp<volScalarField> f23(F2());
+
+    if (F3_)
+    {
+        f23() *= F3();
+    }
+
+    return f23;
+}
+
+
+template<class BasicEddyViscosityModel>
+void kOmegaSSTBase<BasicEddyViscosityModel>::correctNut
+(
+    const volScalarField& S2
+)
+{
+    // Correct the turbulence viscosity
+    this->nut_ = a1_*k_/max(a1_*omega_, b1_*F23()*sqrt(S2));
+    this->nut_.correctBoundaryConditions();
+}
+
+
+template<class BasicEddyViscosityModel>
+void kOmegaSSTBase<BasicEddyViscosityModel>::correctNut()
+{
+    correctNut(2*magSqr(symm(fvc::grad(this->U_))));
+}
+
+
+template<class BasicEddyViscosityModel>
+tmp<fvScalarMatrix> kOmegaSSTBase<BasicEddyViscosityModel>::kSource() const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            k_,
+            dimVolume*this->rho_.dimensions()*k_.dimensions()/dimTime
+        )
+    );
+}
+
+
+template<class BasicEddyViscosityModel>
+tmp<fvScalarMatrix> kOmegaSSTBase<BasicEddyViscosityModel>::omegaSource() const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            omega_,
+            dimVolume*this->rho_.dimensions()*omega_.dimensions()/dimTime
+        )
+    );
+}
+
+
+template<class BasicEddyViscosityModel>
+tmp<fvScalarMatrix> kOmegaSSTBase<BasicEddyViscosityModel>::Qsas
+(
+    const volScalarField& S2,
+    const volScalarField& gamma,
+    const volScalarField& beta
+) const
+{
+    return tmp<fvScalarMatrix>
+    (
+        new fvScalarMatrix
+        (
+            omega_,
+            dimVolume*this->rho_.dimensions()*omega_.dimensions()/dimTime
+        )
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class BasicEddyViscosityModel>
+kOmegaSSTBase<BasicEddyViscosityModel>::kOmegaSSTBase
+(
+    const word& type,
+    const alphaField& alpha,
+    const rhoField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& alphaRhoPhi,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+:
+    BasicEddyViscosityModel
+    (
+        type,
+        alpha,
+        rho,
+        U,
+        alphaRhoPhi,
+        phi,
+        transport,
+        propertiesName
+    ),
+
+    alphaK1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaK1",
+            this->coeffDict_,
+            0.85
+        )
+    ),
+    alphaK2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaK2",
+            this->coeffDict_,
+            1.0
+        )
+    ),
+    alphaOmega1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaOmega1",
+            this->coeffDict_,
+            0.5
+        )
+    ),
+    alphaOmega2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaOmega2",
+            this->coeffDict_,
+            0.856
+        )
+    ),
+    gamma1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "gamma1",
+            this->coeffDict_,
+            5.0/9.0
+        )
+    ),
+    gamma2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "gamma2",
+            this->coeffDict_,
+            0.44
+        )
+    ),
+    beta1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "beta1",
+            this->coeffDict_,
+            0.075
+        )
+    ),
+    beta2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "beta2",
+            this->coeffDict_,
+            0.0828
+        )
+    ),
+    betaStar_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "betaStar",
+            this->coeffDict_,
+            0.09
+        )
+    ),
+    a1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "a1",
+            this->coeffDict_,
+            0.31
+        )
+    ),
+    b1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "b1",
+            this->coeffDict_,
+            1.0
+        )
+    ),
+    c1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "c1",
+            this->coeffDict_,
+            10.0
+        )
+    ),
+    F3_
+    (
+        Switch::lookupOrAddToDict
+        (
+            "F3",
+            this->coeffDict_,
+            false
+        )
+    ),
+
+    y_(wallDist::New(this->mesh_).y()),
+
+    k_
+    (
+        IOobject
+        (
+            IOobject::groupName("k", U.group()),
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    ),
+    omega_
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", U.group()),
+            this->runTime_.timeName(),
+            this->mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        this->mesh_
+    )
+{
+    bound(k_, this->kMin_);
+    bound(omega_, this->omegaMin_);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicEddyViscosityModel>
+bool kOmegaSSTBase<BasicEddyViscosityModel>::read()
+{
+    if (BasicEddyViscosityModel::read())
+    {
+        alphaK1_.readIfPresent(this->coeffDict());
+        alphaK2_.readIfPresent(this->coeffDict());
+        alphaOmega1_.readIfPresent(this->coeffDict());
+        alphaOmega2_.readIfPresent(this->coeffDict());
+        gamma1_.readIfPresent(this->coeffDict());
+        gamma2_.readIfPresent(this->coeffDict());
+        beta1_.readIfPresent(this->coeffDict());
+        beta2_.readIfPresent(this->coeffDict());
+        betaStar_.readIfPresent(this->coeffDict());
+        a1_.readIfPresent(this->coeffDict());
+        b1_.readIfPresent(this->coeffDict());
+        c1_.readIfPresent(this->coeffDict());
+        F3_.readIfPresent("F3", this->coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class BasicEddyViscosityModel>
+void kOmegaSSTBase<BasicEddyViscosityModel>::correct()
+{
+    if (!this->turbulence_)
+    {
+        return;
+    }
+
+    // Local references
+    const alphaField& alpha = this->alpha_;
+    const rhoField& rho = this->rho_;
+    const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
+    const volVectorField& U = this->U_;
+    volScalarField& nut = this->nut_;
+
+    BasicEddyViscosityModel::correct();
+
+    volScalarField divU(fvc::div(fvc::absolute(this->phi(), U)));
+
+    tmp<volTensorField> tgradU = fvc::grad(U);
+    volScalarField S2(2*magSqr(symm(tgradU())));
+    volScalarField GbyNu((tgradU() && dev(twoSymm(tgradU()))));
+    volScalarField G(this->GName(), nut*GbyNu);
+    tgradU.clear();
+
+    // Update omega and G at the wall
+    omega_.boundaryField().updateCoeffs();
+
+    volScalarField CDkOmega
+    (
+        (2*alphaOmega2_)*(fvc::grad(k_) & fvc::grad(omega_))/omega_
+    );
+
+    volScalarField F1(this->F1(CDkOmega));
+
+    {
+        volScalarField gamma(this->gamma(F1));
+        volScalarField beta(this->beta(F1));
+
+        // Turbulent frequency equation
+        tmp<fvScalarMatrix> omegaEqn
+        (
+            fvm::ddt(alpha, rho, omega_)
+          + fvm::div(alphaRhoPhi, omega_)
+          - fvm::laplacian(alpha*rho*DomegaEff(F1), omega_)
+         ==
+            alpha*rho*gamma
+           *min
+            (
+                GbyNu,
+                (c1_/a1_)*betaStar_*omega_*max(a1_*omega_, b1_*F23()*sqrt(S2))
+            )
+          - fvm::SuSp((2.0/3.0)*alpha*rho*gamma*divU, omega_)
+          - fvm::Sp(alpha*rho*beta*omega_, omega_)
+          - fvm::SuSp
+            (
+                alpha*rho*(F1 - scalar(1))*CDkOmega/omega_,
+                omega_
+            )
+          + Qsas(S2, gamma, beta)
+          + omegaSource()
+        );
+
+        omegaEqn().relax();
+
+        omegaEqn().boundaryManipulate(omega_.boundaryField());
+
+        solve(omegaEqn);
+        bound(omega_, this->omegaMin_);
+    }
+
+    // Turbulent kinetic energy equation
+    tmp<fvScalarMatrix> kEqn
+    (
+        fvm::ddt(alpha, rho, k_)
+      + fvm::div(alphaRhoPhi, k_)
+      - fvm::laplacian(alpha*rho*DkEff(F1), k_)
+     ==
+        min(alpha*rho*G, (c1_*betaStar_)*alpha*rho*k_*omega_)
+      - fvm::SuSp((2.0/3.0)*alpha*rho*divU, k_)
+      - fvm::Sp(alpha*rho*betaStar_*omega_, k_)
+      + kSource()
+    );
+
+    kEqn().relax();
+    solve(kEqn);
+    bound(k_, this->kMin_);
+
+    correctNut(S2);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H
new file mode 100644
index 0000000000..9684892ea9
--- /dev/null
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H
@@ -0,0 +1,320 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::kOmegaSSTBase
+
+Description
+    Base class implementation of the k-omega-SST turbulence model for
+    incompressible and compressible flows.
+
+    Turbulence model described in:
+    \verbatim
+        Menter, F. R. & Esch, T. (2001).
+        Elements of Industrial Heat Transfer Prediction.
+        16th Brazilian Congress of Mechanical Engineering (COBEM).
+    \endverbatim
+
+    with updated coefficients from
+    \verbatim
+        Menter, F. R., Kuntz, M., and Langtry, R. (2003).
+        Ten Years of Industrial Experience with the SST Turbulence Model.
+        Turbulence, Heat and Mass Transfer 4, ed: K. Hanjalic, Y. Nagano,
+        & M. Tummers, Begell House, Inc., 625 - 632.
+    \endverbatim
+
+    but with the consistent production terms from the 2001 paper as form in the
+    2003 paper is a typo, see
+    \verbatim
+        http://turbmodels.larc.nasa.gov/sst.html
+    \endverbatim
+
+    and the addition of the optional F3 term for rough walls from
+    \verbatim
+        Hellsten, A. (1998).
+        "Some Improvements in Menter’s k-omega-SST turbulence model"
+        29th AIAA Fluid Dynamics Conference, AIAA-98-2554.
+    \endverbatim
+
+    Note that this implementation is written in terms of alpha diffusion
+    coefficients rather than the more traditional sigma (alpha = 1/sigma) so
+    that the blending can be applied to all coefficuients in a consistent
+    manner.  The paper suggests that sigma is blended but this would not be
+    consistent with the blending of the k-epsilon and k-omega models.
+
+    Also note that the error in the last term of equation (2) relating to
+    sigma has been corrected.
+
+    Wall-functions are applied in this implementation by using equations (14)
+    to specify the near-wall omega as appropriate.
+
+    The blending functions (15) and (16) are not currently used because of the
+    uncertainty in their origin, range of applicability and that if y+ becomes
+    sufficiently small blending u_tau in this manner clearly becomes nonsense.
+
+    The default model coefficients are
+    \verbatim
+        kOmegaSSTBaseCoeffs
+        {
+            alphaK1     0.85;
+            alphaK2     1.0;
+            alphaOmega1 0.5;
+            alphaOmega2 0.856;
+            beta1       0.075;
+            beta2       0.0828;
+            betaStar    0.09;
+            gamma1      5/9;
+            gamma2      0.44;
+            a1          0.31;
+            b1          1.0;
+            c1          10.0;
+            F3          no;
+        }
+    \endverbatim
+
+SourceFiles
+    kOmegaSSTBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kOmegaSSTBase_H
+#define kOmegaSSTBase_H
+
+#include "RASModel.H"
+#include "eddyViscosity.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class kOmegaSSTBase Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class BasicEddyViscosityModel>
+class kOmegaSSTBase
+:
+    public BasicEddyViscosityModel
+{
+    // Private Member Functions
+
+        // Disallow default bitwise copy construct and assignment
+        kOmegaSSTBase(const kOmegaSSTBase&);
+        kOmegaSSTBase& operator=(const kOmegaSSTBase&);
+
+
+protected:
+
+    // Protected data
+
+        // Model coefficients
+
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
+
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
+
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
+
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
+
+            dimensionedScalar betaStar_;
+
+            dimensionedScalar a1_;
+            dimensionedScalar b1_;
+            dimensionedScalar c1_;
+
+            Switch F3_;
+
+
+        // Fields
+
+            //- Wall distance
+            //  Note: different to wall distance in parent RASModel
+            //  which is for near-wall cells only
+            const volScalarField& y_;
+
+            volScalarField k_;
+            volScalarField omega_;
+
+
+    // Protected Member Functions
+
+        tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
+        tmp<volScalarField> F2() const;
+        tmp<volScalarField> F3() const;
+        tmp<volScalarField> F23() const;
+
+        tmp<volScalarField> blend
+        (
+            const volScalarField& F1,
+            const dimensionedScalar& psi1,
+            const dimensionedScalar& psi2
+        ) const
+        {
+            return F1*(psi1 - psi2) + psi2;
+        }
+
+        tmp<volScalarField> alphaK(const volScalarField& F1) const
+        {
+            return blend(F1, alphaK1_, alphaK2_);
+        }
+
+        tmp<volScalarField> alphaOmega(const volScalarField& F1) const
+        {
+            return blend(F1, alphaOmega1_, alphaOmega2_);
+        }
+
+        tmp<volScalarField> beta(const volScalarField& F1) const
+        {
+            return blend(F1, beta1_, beta2_);
+        }
+
+        tmp<volScalarField> gamma(const volScalarField& F1) const
+        {
+            return blend(F1, gamma1_, gamma2_);
+        }
+
+        virtual void correctNut(const volScalarField& S2);
+
+        virtual void correctNut();
+        virtual tmp<fvScalarMatrix> kSource() const;
+        virtual tmp<fvScalarMatrix> omegaSource() const;
+        virtual tmp<fvScalarMatrix> Qsas
+        (
+            const volScalarField& S2,
+            const volScalarField& gamma,
+            const volScalarField& beta
+        ) const;
+
+
+public:
+
+    typedef typename BasicEddyViscosityModel::alphaField alphaField;
+    typedef typename BasicEddyViscosityModel::rhoField rhoField;
+    typedef typename BasicEddyViscosityModel::transportModel transportModel;
+
+
+    // Constructors
+
+        //- Construct from components
+        kOmegaSSTBase
+        (
+            const word& type,
+            const alphaField& alpha,
+            const rhoField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& alphaRhoPhi,
+            const surfaceScalarField& phi,
+            const transportModel& transport,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
+
+
+    //- Destructor
+    virtual ~kOmegaSSTBase()
+    {}
+
+
+    // Member Functions
+
+        //- Re-read model coefficients if they have changed
+        virtual bool read();
+
+        //- Return the effective diffusivity for k
+        tmp<volScalarField> DkEff(const volScalarField& F1) const
+        {
+            return tmp<volScalarField>
+            (
+                new volScalarField("DkEff", alphaK(F1)*this->nut_ + this->nu())
+            );
+        }
+
+        //- Return the effective diffusivity for omega
+        tmp<volScalarField> DomegaEff(const volScalarField& F1) const
+        {
+            return tmp<volScalarField>
+            (
+                new volScalarField
+                (
+                    "DomegaEff",
+                    alphaOmega(F1)*this->nut_ + this->nu()
+                )
+            );
+        }
+
+        //- Return the turbulence kinetic energy
+        virtual tmp<volScalarField> k() const
+        {
+            return k_;
+        }
+
+        //- Return the turbulence kinetic energy dissipation rate
+        virtual tmp<volScalarField> epsilon() const
+        {
+              return tmp<volScalarField>
+            (
+                new volScalarField
+                (
+                    IOobject
+                    (
+                        "epsilon",
+                        this->mesh_.time().timeName(),
+                        this->mesh_
+                    ),
+                    betaStar_*k_*omega_,
+                    omega_.boundaryField().types()
+                )
+            );
+        }
+
+        //- Return the turbulence kinetic energy dissipation rate
+        virtual tmp<volScalarField> omega() const
+        {
+            return omega_;
+        }
+
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "kOmegaSSTBase.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C
index 08b3b5af43..f2b9951ba6 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -113,7 +113,8 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
         alphaRhoPhi,
         phi,
         transport,
-        propertiesName
+        propertiesName,
+        type
     ),
 
     Cs_
@@ -171,7 +172,13 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
             this->coeffDict_
         )
     )
-{}
+{
+    if (type == typeName)
+    {
+        this->correctNut();
+        this->printCoeffs(type);
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
index 597d21f1eb..81212cb410 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C
@@ -226,7 +226,6 @@ realizableKE<BasicTurbulenceModel>::realizableKE
 
     if (type == typeName)
     {
-        correctNut();
         this->printCoeffs(type);
     }
 }
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index 1ccad74485..4a76ee1870 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
@@ -239,7 +239,6 @@ v2f<BasicTurbulenceModel>::v2f
     if (type == typeName)
     {
         this->printCoeffs(type);
-        correctNut();
     }
 }
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
index 099e0cb079..a76c4ee689 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H
@@ -208,7 +208,7 @@ public:
 
     // Member Functions
 
-        //- Read RASProperties dictionary
+        //- Re-read model coefficients if they have changed
         virtual bool read();
 
         //- Return the effective diffusivity for k
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
index 3d148f063d..55001003da 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
@@ -168,10 +168,8 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::ReynoldsStress
 {
     if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
     {
-        FatalErrorIn
-        (
-            "ReynoldsStress::ReynoldsStress"
-        )   << "couplingFactor = " << couplingFactor_
+        FatalErrorInFunction
+            << "couplingFactor = " << couplingFactor_
             << " is not in range 0 - 1" << nl
             << exit(FatalError);
     }
@@ -297,6 +295,13 @@ Foam::ReynoldsStress<BasicTurbulenceModel>::divDevRhoReff
 }
 
 
+template<class BasicTurbulenceModel>
+void Foam::ReynoldsStress<BasicTurbulenceModel>::validate()
+{
+    correctNut();
+}
+
+
 template<class BasicTurbulenceModel>
 void Foam::ReynoldsStress<BasicTurbulenceModel>::correct()
 {
diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
index b27468b5a3..0beb0f5885 100644
--- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
+++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H
@@ -140,6 +140,10 @@ public:
             volVectorField& U
         ) const;
 
+        //- Validate the turbulence fields after construction
+        //  Update turbulence viscosity and other derived fields as requires
+        virtual void validate();
+
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 };
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
index ec5bf4a31d..30d4d31921 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,13 +110,8 @@ Foam::TurbulenceModel<Alpha, Rho, BasicTurbulenceModel, TransportModel>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "TurbulenceModel::New"
-            "(const alphaField&, const rhoField&, "
-            "const volVectorField&, const surfaceScalarField&, "
-            "transportModel&, const word&)"
-        )   << "Unknown TurbulenceModel type "
+        FatalErrorInFunction
+            << "Unknown TurbulenceModel type "
             << modelType << nl << nl
             << "Valid TurbulenceModel types:" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index 5abd82f3eb..4940cacefb 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -39,9 +39,10 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(p, iF),
     phiName_("phi"),
     rhoName_("rho"),
-    D_(0),
-    I_(0),
-    length_(0)
+    D_(),
+    I_(),
+    length_(0),
+    uniformJump_(false)
 {}
 
 
@@ -55,9 +56,10 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    D_(readScalar(dict.lookup("D"))),
-    I_(readScalar(dict.lookup("I"))),
-    length_(readScalar(dict.lookup("length")))
+    D_(DataEntry<scalar>::New("D", dict)),
+    I_(DataEntry<scalar>::New("I", dict)),
+    length_(readScalar(dict.lookup("length"))),
+    uniformJump_(dict.lookupOrDefault<bool>("uniformJump", false))
 {
     fvPatchField<scalar>::operator=
     (
@@ -77,9 +79,10 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(ptf, p, iF, mapper),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    D_(ptf.D_),
-    I_(ptf.I_),
-    length_(ptf.length_)
+    D_(ptf.D_, false),
+    I_(ptf.I_, false),
+    length_(ptf.length_),
+    uniformJump_(ptf.uniformJump_)
 {}
 
 
@@ -92,9 +95,10 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(ptf),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    D_(ptf.D_),
-    I_(ptf.I_),
-    length_(ptf.length_)
+    D_(ptf.D_, false),
+    I_(ptf.I_, false),
+    length_(ptf.length_),
+    uniformJump_(ptf.uniformJump_)
 {}
 
 
@@ -107,9 +111,10 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(ptf, iF),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    D_(ptf.D_),
-    I_(ptf.I_),
-    length_(ptf.length_)
+    D_(ptf.D_, false),
+    I_(ptf.I_, false),
+    length_(ptf.length_),
+    uniformJump_(ptf.uniformJump_)
 {}
 
 
@@ -130,11 +135,15 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
 
     scalarField Un(phip/patch().magSf());
 
-    if (phi.dimensions() == dimensionSet(0, 3, -1, 0, 0))
+    if (phi.dimensions() == dimMass/dimTime)
     {
         Un /= patch().lookupPatchField<volScalarField, scalar>(rhoName_);
     }
 
+    if (uniformJump_)
+    {
+        Un = gAverage(Un);
+    }
     scalarField magUn(mag(Un));
 
     const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
@@ -146,11 +155,15 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
         )
     );
 
+    const scalar t = db().time().timeOutputValue();
+    const scalar D = D_->value(t);
+    const scalar I = I_->value(t);
+
     jump_ =
         -sign(Un)
         *(
-            D_*turbModel.nu(patch().index())
-          + I_*0.5*magUn
+            D*turbModel.nu(patch().index())
+          + I*0.5*magUn
          )*magUn*length_;
 
     if (dimensionedInternalField().dimensions() == dimPressure)
@@ -161,7 +174,7 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs()
     if (debug)
     {
         scalar avePressureJump = gAverage(jump_);
-        scalar aveVelocity = gAverage(mag(Un));
+        scalar aveVelocity = gAverage(Un);
 
         Info<< patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
@@ -179,9 +192,11 @@ void Foam::porousBafflePressureFvPatchField::write(Ostream& os) const
     fixedJumpFvPatchField<scalar>::write(os);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    os.writeKeyword("D") << D_ << token::END_STATEMENT << nl;
-    os.writeKeyword("I") << I_ << token::END_STATEMENT << nl;
+    D_->writeData(os);
+    I_->writeData(os);
     os.writeKeyword("length") << length_ << token::END_STATEMENT << nl;
+    os.writeKeyword("uniformJump") << uniformJump_
+        << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
index 496ba81548..b88a768936 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
@@ -43,8 +43,8 @@ Description
         p      | pressure [Pa]
         \rho   | density [kg/m3]
         \mu    | laminar viscosity [Pa s]
-        I      | inertial coefficient
         D      | Darcy coefficient
+        I      | inertial coefficient
         L      | porous media length in the flow direction
     \endvartable
 
@@ -58,7 +58,8 @@ Description
         rho          | density field name      | no          | rho
         D            | Darcy coefficient       | yes         |
         I            | inertial coefficient    | yes         |
-        L            | porous media length in the flow direction | yes |
+        length       | porous media length in the flow direction | yes |
+        uniformJump  | applies a uniform pressure drop on the patch based on the
     \endtable
 
     Example of the boundary condition specification:
@@ -70,7 +71,8 @@ Description
         jump            uniform 0;
         D               0.001;
         I               1000000;
-        L               0.1;
+        length          0.1;
+        uniformJump     false;
         value           uniform 0;
     }
     \endverbatim
@@ -87,6 +89,7 @@ SourceFiles
 #define porousBafflePressureFvPatchField_H
 
 #include "fixedJumpFvPatchField.H"
+#include "DataEntry.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,14 +113,17 @@ class porousBafflePressureFvPatchField
         const word rhoName_;
 
         //- Darcy pressure loss coefficient
-        scalar D_;
+        autoPtr<DataEntry<scalar> > D_;
 
         //- Inertia pressure lost coefficient
-        scalar I_;
+        autoPtr<DataEntry<scalar> > I_;
 
         //- Porous media length
         scalar length_;
 
+        //- Aplies uniform pressure drop
+        bool uniformJump_;
+
 
 public:
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 9361279373..048b3437e4 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -41,7 +41,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
index 9b1aff3b6a..0b61bfa3f5 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C
@@ -43,7 +43,7 @@ void fWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("fWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
index 29a6f0e2b4..30308b2926 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C
@@ -41,7 +41,7 @@ void kLowReWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("kLowReWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 1bcc7cd834..6afabdcc6c 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -40,7 +40,7 @@ void kqRWallFunctionFvPatchField<Type>::checkType()
 {
     if (!isA<wallFvPatch>(this->patch()))
     {
-        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << this->patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index 54e31372fc..86cb3b473c 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -45,7 +45,7 @@ void nutWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index 43a552dc52..0d54c60ecb 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -34,14 +34,29 @@ Description
 
     \heading Patch usage
 
-    Example of the boundary condition specification:
+    \table
+        Property  | Description         | Required   | Default value
+        Cmu       | Cmu coefficient     | no         | 0.09
+        kappa     | Von Karman constant | no         | 0.41
+        E         | E coefficient       | no         | 9.8
+    \endtable
+
+    Examples of the boundary condition specification:
     \verbatim
     myPatch
     {
         type            nutWallFunction;
+        value           uniform 0.0;
     }
     \endverbatim
 
+    Reference for the default model coefficients:
+    \verbatim
+        H. Versteeg, W. Malalasekera
+        An Introduction to Computational Fluid Dynamics: The Finite Volume
+        Method, subsection "3.5.2 k-epsilon model"
+    \endverbatim
+
 SeeAlso
     Foam::fixedValueFvPatchField
 
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index da6130662a..105822e97a 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -47,7 +47,7 @@ void omegaWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
index 5351ea669a..2c24a2688e 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C
@@ -43,7 +43,7 @@ void v2WallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("v2WallFunctionFvPatchScalarField::checkType()")
+        FatalErrorInFunction
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModelDoc.H b/src/TurbulenceModels/turbulenceModels/doc/turbulenceModelDoc.H
similarity index 100%
rename from src/TurbulenceModels/turbulenceModels/turbulenceModelDoc.H
rename to src/TurbulenceModels/turbulenceModels/doc/turbulenceModelDoc.H
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
index 70307f6456..82a0da7719 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@@ -84,6 +84,23 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
 {
     tmp<volScalarField> tk(k());
 
+    // Get list of patchField type names from k
+    wordList patchFieldTypes(tk().boundaryField().types());
+
+    // For k patchField types which do not have an equivalent for symmTensor
+    // set to calculated
+    forAll(patchFieldTypes, i)
+    {
+        if
+        (
+           !fvPatchField<symmTensor>::patchConstructorTablePtr_
+                ->found(patchFieldTypes[i])
+        )
+        {
+            patchFieldTypes[i] = calculatedFvPatchField<symmTensor>::typeName;
+        }
+    }
+
     return tmp<volSymmTensorField>
     (
         new volSymmTensorField
@@ -98,12 +115,19 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
                 false
             ),
             ((2.0/3.0)*I)*tk() - (nut_)*dev(twoSymm(fvc::grad(this->U_))),
-            tk().boundaryField().types()
+            patchFieldTypes
         )
     );
 }
 
 
+template<class BasicTurbulenceModel>
+void Foam::eddyViscosity<BasicTurbulenceModel>::validate()
+{
+    correctNut();
+}
+
+
 template<class BasicTurbulenceModel>
 void Foam::eddyViscosity<BasicTurbulenceModel>::correct()
 {
diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
index e46543864b..3a26fac199 100644
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H
@@ -127,6 +127,10 @@ public:
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 
+        //- Validate the turbulence fields after construction
+        //  Update turbulence viscosity and other derived fields as requires
+        virtual void validate();
+
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 };
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C
index 0cee043768..58a1c34ebd 100644
--- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,6 +84,10 @@ bool Foam::turbulenceModel::read()
 }
 
 
+void Foam::turbulenceModel::validate()
+{}
+
+
 void Foam::turbulenceModel::correct()
 {
     if (mesh_.changing())
diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
index a634cedcbe..43b848b23f 100644
--- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H
@@ -205,6 +205,10 @@ public:
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const = 0;
 
+        //- Validate the turbulence fields after construction
+        //  Update derived fields as required
+        virtual void validate();
+
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 };
diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C
index 9d79904cd4..ed3cdb602c 100644
--- a/src/combustionModels/FSD/FSD.C
+++ b/src/combustionModels/FSD/FSD.C
@@ -56,7 +56,7 @@ FSD<CombThermoType, ThermoType>::FSD
         (
             this->coeffs(),
             this->mesh(),
-            *this
+           *this
         )
     ),
     ft_
@@ -188,18 +188,17 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
     volScalarField& omegaFuelBar = tomegaFuel();
 
     // Calculation of the mixture fraction variance (ftVar)
-    const compressible::LESModel& lesModel =
-        YO2.db().lookupObject<compressible::LESModel>("LESProperties");
+    // TODO: generalize delta for RAS and LES.
+    const volScalarField& delta =
+        refCast<const compressible::LESModel>(this->turbulence()).delta();
 
-    const volScalarField& delta = lesModel.delta();
     const volScalarField ftVar(Cv_*sqr(delta)*sqr(mgft));
 
     // Thickened flame (average flame thickness for counterflow configuration
     // is 1.5 mm)
-
     volScalarField  deltaF
     (
-        lesModel.delta()/dimensionedScalar("flame", dimLength, 1.5e-3)
+        delta/dimensionedScalar("flame", dimLength, 1.5e-3)
     );
 
     // Linear correlation between delta and flame thickness
diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H
index 6e3609abdb..10be2acdfa 100644
--- a/src/combustionModels/FSD/FSD.H
+++ b/src/combustionModels/FSD/FSD.H
@@ -52,7 +52,7 @@ Description
     is large (>1e-04) then a beta pdf is used for filtering.
 
     At the moment the flame area combustion model is only fit to work in a LES
-    frame work. In RAS the subgrid fluctiuation has to be solved by an extra
+    frame work. In RAS the subgrid fluctuation has to be solved by an extra
     transport equation.
 
 SourceFiles
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
index 0d18abb27f..8b5905ca4a 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,9 +47,8 @@ Foam::autoPtr<Foam::reactionRateFlameArea> Foam::reactionRateFlameArea::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "reactionRateFlameArea::New(const psiReactionThermo&)",
             dict
         )   << "Unknown reactionRateFlameArea type "
             << reactionRateFlameAreaType << endl << endl
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
index 9352dd8396..2da8036f44 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,6 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct
     const volScalarField& sigma
 )
 {
-
     dimensionedScalar omega0
     (
         "omega0",
@@ -97,13 +96,19 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct
         1e-4
     );
 
-    const compressible::LESModel& lesModel =
-        omega_.db().lookupObject<compressible::LESModel>("LESProperties");
+    dimensionedScalar kMin
+    (
+        "kMin",
+        sqr(dimVelocity),
+        SMALL
+    );
 
-    // Total strain : resolved and sub-grid (just LES for now)
+    const compressibleTurbulenceModel& turbulence = combModel_.turbulence();
+
+    // Total strain
     const volScalarField sigmaTotal
     (
-        sigma + alpha_*lesModel.epsilon()/(lesModel.k() + lesModel.kMin())
+        sigma + alpha_*turbulence.epsilon()/(turbulence.k() + kMin)
     );
 
     const volScalarField omegaInf(correlation_.omega0Sigma(sigmaTotal));
@@ -118,20 +123,20 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct
        /(sqr(omega0 - omegaInf) + sqr(omegaMin))
     );
 
-    const volScalarField rho(combModel_.rho());
-    const surfaceScalarField phi(combModel_.phi());
+    tmp<surfaceScalarField> phi(combModel_.phi());
 
     solve
     (
-         fvm::ddt(rho, omega_)
+         fvm::ddt(omega_)
        + fvm::div(phi, omega_, "div(phi,omega)")
       ==
-         rho*Rc*omega0
-       - fvm::SuSp(rho*(tau + Rc), omega_)
+         Rc*omega0
+       - fvm::SuSp((tau + Rc), omega_)
     );
 
     omega_.min(omega0);
     omega_.max(0.0);
+
 }
 
 
diff --git a/src/combustionModels/Make/files b/src/combustionModels/Make/files
index b68fbb742f..f1f87e9cfb 100644
--- a/src/combustionModels/Make/files
+++ b/src/combustionModels/Make/files
@@ -17,12 +17,15 @@ PaSR/PaSRs.C
 
 laminar/laminars.C
 
+/*
 FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
 FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.C
 FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C
 FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
-
 FSD/FSDs.C
+*/
+
+diffusionMulticomponent/diffusionMulticomponents.C
 
 noCombustion/noCombustions.C
 
diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
index 5368d1af80..badd484829 100644
--- a/src/combustionModels/combustionModel/combustionModel.H
+++ b/src/combustionModels/combustionModel/combustionModel.H
@@ -112,9 +112,9 @@ public:
             inline const fvMesh& mesh() const;
 
             //- Return const access to phi
-            inline const surfaceScalarField& phi() const;
+            inline tmp<surfaceScalarField> phi() const;
 
-            //- Return const access to rho
+            //- Returns rho
             virtual tmp<volScalarField> rho() const = 0;
 
             //- Return access to turbulence
diff --git a/src/combustionModels/combustionModel/combustionModelI.H b/src/combustionModels/combustionModel/combustionModelI.H
index 6553155682..140f8c9bb5 100644
--- a/src/combustionModels/combustionModel/combustionModelI.H
+++ b/src/combustionModels/combustionModel/combustionModelI.H
@@ -31,7 +31,7 @@ inline const Foam::fvMesh& Foam::combustionModel::mesh() const
 }
 
 
-inline const Foam::surfaceScalarField& Foam::combustionModel::phi() const
+inline Foam::tmp<Foam::surfaceScalarField> Foam::combustionModel::phi() const
 {
     if (turbulencePtr_)
     {
@@ -39,13 +39,10 @@ inline const Foam::surfaceScalarField& Foam::combustionModel::phi() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "const Foam::compressibleTurbulenceModel& "
-            "Foam::combustionModel::turbulence() const "
-        )   << "turbulencePtr_ is empty. Please use "
+        FatalErrorInFunction
+            << "turbulencePtr_ is empty. Please use "
             << "combustionModel::setTurbulence "
-            << "(compressibleTurbulenceModel& )"
+            << "(compressibleTurbulenceModel&)"
             << abort(FatalError);
 
         return turbulencePtr_->phi();
@@ -62,11 +59,8 @@ Foam::combustionModel::turbulence() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "const Foam::compressibleTurbulenceModel& "
-            "Foam::combustionModel::turbulence() const "
-        )   << "turbulencePtr_ is empty. Please use "
+        FatalErrorInFunction
+            << "turbulencePtr_ is empty. Please use "
             << "combustionModel::setTurbulence "
             << "(compressibleTurbulenceModel& )"
             << abort(FatalError);
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
new file mode 100644
index 0000000000..bc60afe054
--- /dev/null
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
@@ -0,0 +1,515 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "diffusionMulticomponent.H"
+#include "fvcGrad.H"
+#include "reactingMixture.H"
+#include "fvCFD.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * //
+
+template<class CombThermoType, class ThermoType>
+void Foam::combustionModels::
+diffusionMulticomponent<CombThermoType, ThermoType>::init()
+{
+    // Load default values
+    if (this->coeffs().found("Ci"))
+    {
+        this->coeffs().lookup("Ci") >> Ci_;
+    }
+
+    if (this->coeffs().found("YoxStream"))
+    {
+        this->coeffs().lookup("YoxStream") >> YoxStream_;
+    }
+
+    if (this->coeffs().found("YfStream"))
+    {
+        this->coeffs().lookup("YfStream") >> YfStream_;
+    }
+
+    if (this->coeffs().found("sigma"))
+    {
+        this->coeffs().lookup("sigma") >> sigma_;
+    }
+
+    if (this->coeffs().found("ftCorr"))
+    {
+        this->coeffs().lookup("ftCorr") >> ftCorr_;
+    }
+
+    if (this->coeffs().found("alpha"))
+    {
+        alpha_ = readScalar(this->coeffs().lookup("alpha"));
+    }
+
+    if (this->coeffs().found("laminarIgn"))
+    {
+        this->coeffs().lookup("laminarIgn") >> laminarIgn_;
+    }
+
+    typedef typename Reaction<ThermoType>::specieCoeffs specieCoeffs;
+
+    const speciesTable& species = this->thermo().composition().species();
+
+    scalarList specieStoichCoeffs(species.size());
+    const label nReactions = reactions_.size();
+
+    for (label k=0; k < nReactions; k++)
+    {
+        RijPtr_.set
+        (
+            k,
+            new volScalarField
+            (
+                IOobject
+                (
+                    "Rijk" + name(k),
+                    this->mesh_.time().timeName(),
+                    this->mesh_,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                this->mesh_,
+                dimensionedScalar("Rij", dimMass/dimTime/dimVolume, 0.0),
+                zeroGradientFvPatchScalarField::typeName
+            )
+        );
+
+        RijPtr_[k].storePrevIter();
+
+        const List<specieCoeffs>& lhs = reactions_[k].lhs();
+        const List<specieCoeffs>& rhs = reactions_[k].rhs();
+
+        const label fuelIndex = species[fuelNames_[k]];
+        const label oxydantIndex = species[oxydantNames_[k]];
+
+        const scalar Wu = specieThermo_[fuelIndex].W();
+        const scalar Wox = specieThermo_[oxydantIndex].W();
+
+        forAll(lhs, i)
+        {
+            const label specieI = lhs[i].index;
+            specieStoichCoeffs[specieI] = -lhs[i].stoichCoeff;
+            qFuel_[k] +=
+                specieThermo_[specieI].hc()*lhs[i].stoichCoeff/Wu;
+        }
+
+        forAll(rhs, i)
+        {
+            const label specieI = rhs[i].index;
+            specieStoichCoeffs[specieI] = rhs[i].stoichCoeff;
+            qFuel_[k] -=
+                specieThermo_[specieI].hc()*rhs[i].stoichCoeff/Wu;
+        }
+
+        Info << "Fuel heat of combustion : " << qFuel_[k] << endl;
+
+        s_[k] =
+            (Wox*mag(specieStoichCoeffs[oxydantIndex]))
+          / (Wu*mag(specieStoichCoeffs[fuelIndex]));
+
+        Info << "stoichiometric oxygen-fuel ratio : " << s_[k] << endl;
+
+        stoicRatio_[k] = s_[k]*YfStream_[k]/YoxStream_[k];
+
+        Info << "stoichiometric air-fuel ratio : " << stoicRatio_[k] << endl;
+
+        const scalar fStoich = 1.0/(1.0 + stoicRatio_[k]);
+
+        Info << "stoichiometric mixture fraction : " << fStoich << endl;
+
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CombThermoType, class ThermoType>
+Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
+diffusionMulticomponent
+(
+    const word& modelType, const fvMesh& mesh, const word& phaseName
+)
+:
+    CombThermoType(modelType, mesh, phaseName),
+    reactions_
+    (
+        dynamic_cast<const reactingMixture<ThermoType>&>(this->thermo())
+    ),
+    specieThermo_
+    (
+        dynamic_cast<const reactingMixture<ThermoType>&>
+            (this->thermo()).speciesData()
+    ),
+    RijPtr_(reactions_.size()),
+    Ci_(reactions_.size(), 1.0),
+    fuelNames_(this->coeffs().lookup("fuels")),
+    oxydantNames_(this->coeffs().lookup("oxydants")),
+    qFuel_(reactions_.size()),
+    stoicRatio_(reactions_.size()),
+    s_(reactions_.size()),
+    YoxStream_(reactions_.size(), 0.23),
+    YfStream_(reactions_.size(), 1.0),
+    sigma_(reactions_.size(), 0.02),
+    oxydantRes_(this->coeffs().lookup("oxydantRes")),
+    ftCorr_(reactions_.size(), 0.0),
+    alpha_(1),
+    laminarIgn_(false)
+{
+    init();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CombThermoType, class ThermoType>
+Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
+~diffusionMulticomponent()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class CombThermoType, class ThermoType>
+Foam::tmp<Foam::volScalarField> Foam::combustionModels::
+diffusionMulticomponent<CombThermoType, ThermoType>::tc() const
+{
+    return this->chemistryPtr_->tc();
+}
+
+
+template<class CombThermoType, class ThermoType>
+void Foam::combustionModels::
+diffusionMulticomponent<CombThermoType, ThermoType>::correct()
+{
+    if (this->active())
+    {
+        typedef typename Reaction<ThermoType>::specieCoeffs specieCoeffs;
+        const speciesTable& species = this->thermo().composition().species();
+
+        const label nReactions = reactions_.size();
+
+        PtrList<volScalarField> RijlPtr(nReactions);
+
+        for (label k=0; k < nReactions; k++)
+        {
+
+            RijlPtr.set
+            (
+                k,
+                new volScalarField
+                (
+                    IOobject
+                    (
+                        "Rijl" + word(k),
+                        this->mesh_.time().timeName(),
+                        this->mesh_,
+                        IOobject::NO_READ,
+                        IOobject::NO_WRITE,
+                        false
+                    ),
+                    this->mesh_,
+                    dimensionedScalar("Rijl", dimMass/dimTime/dimVolume, 0.0),
+                    zeroGradientFvPatchScalarField::typeName
+                )
+            );
+
+            volScalarField& Rijl = RijlPtr[k];
+
+            // Obtain individual reaction rates for each reaction
+            const label fuelIndex = species[fuelNames_[k]];
+
+            if (laminarIgn_)
+            {
+                Rijl.dimensionedInternalField() =
+                    -this->chemistryPtr_->calculateRR(k, fuelIndex);
+            }
+
+
+             // Look for the fuelStoic
+            const List<specieCoeffs>& rhs = reactions_[k].rhs();
+            const List<specieCoeffs>& lhs = reactions_[k].lhs();
+
+            // Set to zero RR's
+            forAll (lhs, l)
+            {
+                const label lIndex = lhs[l].index;
+                this->chemistryPtr_->RR(lIndex) =
+                    dimensionedScalar("zero", dimMass/dimTime/dimVolume, 0.0);
+            }
+
+            forAll (rhs, l)
+            {
+                const label rIndex = rhs[l].index;
+                this->chemistryPtr_->RR(rIndex) =
+                    dimensionedScalar("zero", dimMass/dimTime/dimVolume, 0.0);
+            }
+        }
+
+
+        for (label k=0; k < nReactions; k++)
+        {
+            const label fuelIndex = species[fuelNames_[k]];
+            const label oxydantIndex = species[oxydantNames_[k]];
+
+            const volScalarField& Yfuel =
+                this->thermo().composition().Y(fuelIndex);
+
+            const volScalarField& Yox =
+                this->thermo().composition().Y(oxydantIndex);
+
+            const volScalarField ft
+            (
+                "ft" + name(k),
+                (
+                    s_[k]*Yfuel
+                  - (Yox - YoxStream_[k])
+                )
+                /
+                (
+                    s_[k]*YfStream_[k] + YoxStream_[k]
+                )
+            );
+
+            const scalar sigma = sigma_[k];
+
+            const scalar fStoich = 1.0/(1.0 + stoicRatio_[k]) + ftCorr_[k];
+
+            const volScalarField OAvailScaled
+            (
+                "OAvailScaled",
+                Yox/max(oxydantRes_[k], 1e-3)
+            );
+
+            const volScalarField preExp
+            (
+                "preExp" + name(k),
+                 1.0  + sqr(OAvailScaled)
+            );
+
+            const volScalarField filter
+            (
+                (1.0/(sigma*sqrt(2.0*constant::mathematical::pi)))
+              * exp(-sqr(ft - fStoich)/(2*sqr(sigma)))
+            );
+
+            const volScalarField topHatFilter
+            (
+                pos(filter - 1e-3)
+            );
+
+            const volScalarField prob
+            (
+                "prob" + name(k), preExp*filter
+            );
+
+            const volScalarField RijkDiff
+            (
+               "RijkDiff",
+                Ci_[k]*this->turbulence().muEff()*prob*
+                (
+                    mag(fvc::grad(Yfuel) & fvc::grad(Yox))
+                )
+               *pos(Yox)*pos(Yfuel)
+            );
+
+            volScalarField& Rijk = RijPtr_[k];
+
+            if (laminarIgn_)
+            {
+                Rijk =
+                    min(RijkDiff, topHatFilter*RijlPtr[k]*pos(Yox)*pos(Yfuel));
+            }
+            else
+            {
+                Rijk = RijkDiff;
+            }
+
+            Rijk.relax(alpha_);
+
+            if (this->mesh_.time().outputTime() && debug)
+            {
+                Rijk.write();
+                ft.write();
+            }
+
+            // Look for the fuelStoic
+            const List<specieCoeffs>& rhs = reactions_[k].rhs();
+            const List<specieCoeffs>& lhs = reactions_[k].lhs();
+
+            scalar fuelStoic = 1.0;
+            forAll (lhs, l)
+            {
+                const label lIndex = lhs[l].index;
+                if (lIndex == fuelIndex)
+                {
+                    fuelStoic = lhs[l].stoichCoeff;
+                    break;
+                }
+            }
+
+            const scalar MwFuel = specieThermo_[fuelIndex].W();
+
+            // Update left hand side species
+            forAll (lhs, l)
+            {
+                const label lIndex = lhs[l].index;
+
+                const scalar stoichCoeff = lhs[l].stoichCoeff;
+
+                this->chemistryPtr_->RR(lIndex) +=
+                    -Rijk*stoichCoeff*specieThermo_[lIndex].W()
+                   /fuelStoic/MwFuel;
+
+            }
+
+            // Update right hand side species
+            forAll (rhs, r)
+            {
+                const label rIndex = rhs[r].index;
+
+                const scalar stoichCoeff = rhs[r].stoichCoeff;
+
+                this->chemistryPtr_->RR(rIndex) +=
+                    Rijk*stoichCoeff*specieThermo_[rIndex].W()
+                   /fuelStoic/MwFuel;
+            }
+        }
+    }
+}
+
+
+template<class CombThermoType, class ThermoType>
+Foam::tmp<Foam::fvScalarMatrix>
+Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
+R(volScalarField& Y) const
+{
+    tmp<fvScalarMatrix> tSu(new fvScalarMatrix(Y, dimMass/dimTime));
+
+    fvScalarMatrix& Su = tSu();
+
+    if (this->active())
+    {
+        const label specieI = this->thermo().composition().species()[Y.name()];
+        Su += this->chemistryPtr_->RR(specieI);
+    }
+
+    return tSu;
+}
+
+
+template<class CombThermoType, class ThermoType>
+Foam::tmp<Foam::volScalarField>
+Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
+dQ() const
+{
+    tmp<volScalarField> tdQ
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "dQ",
+                this->mesh().time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            this->mesh(),
+            dimensionedScalar("dQ", dimEnergy/dimTime, 0.0),
+            zeroGradientFvPatchScalarField::typeName
+        )
+    );
+
+    if (this->active())
+    {
+        volScalarField& dQ = tdQ();
+        dQ = this->chemistryPtr_->dQ();
+    }
+
+    return tdQ;
+}
+
+
+template<class CombThermoType, class ThermoType>
+Foam::tmp<Foam::volScalarField>
+Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::
+Sh() const
+{
+    tmp<volScalarField> tSh
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Sh",
+                this->mesh().time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            this->mesh(),
+            dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0),
+            zeroGradientFvPatchScalarField::typeName
+        )
+    );
+
+    if (this->active())
+    {
+        scalarField& Sh = tSh();
+        Sh = this->chemistryPtr_->Sh();
+    }
+
+    return tSh;
+}
+
+
+template<class CombThermoType, class ThermoType>
+bool Foam::combustionModels::
+diffusionMulticomponent<CombThermoType, ThermoType>::read()
+{
+    if (CombThermoType::read())
+    {
+        this->coeffs().readIfPresent("Ci", Ci_);
+        this->coeffs().readIfPresent("sigma", sigma_);
+        this->coeffs().readIfPresent("oxydantRes", oxydantRes_);
+        this->coeffs().readIfPresent("ftCorr", ftCorr_);
+        this->coeffs().readIfPresent("alpha", alpha_);
+        this->coeffs().readIfPresent("laminarIgn", laminarIgn_);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
new file mode 100644
index 0000000000..2d6b9531f7
--- /dev/null
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::combustionModels::diffusionMulticomponent
+
+Description
+
+    Diffusion based turbulent combustion model for multicomponent species.
+
+    The model calculates the laminar finite rate source terms based on
+    the kinetic for each reaction in order to begin the combustion and
+    evaluates the minimum between this and the cross diffusion rate term
+    defined as D*prob*muEff*mag(grad(Yi)*grad(Yj)) if laminarIgn is true.
+
+    where:
+
+    D :     is a model constant.
+    muEff : is the effective turbulent diffusivity
+    prob :  is a Gaussian shaped distribution around the stoichiometric value
+            of each reaction. The distribtion has the input parameter 'sigma'
+            for standard deviation.
+
+    The variable prob is multiplied by the factor: 1  + pow2(O2/oxydantRes),
+    where oxydantRes is the residual oxydant specified for each reaction.
+
+    In the combustion properties dictionary:
+
+    diffusionMulticomponentCoeffs
+    {
+        Ci          (1.0 1.0);      // Default to 1
+        fuels       (CH4 CO);
+        oxydants    (O2 O2);
+        YoxStream   (0.23 0.23);    // Default to 0.23
+        YfStream    (1.0 1.0);      // Default to 1.0
+        sigma       (0.02 0.02);    // Default to 0.02
+        oxydantRes  (0.025 0.005);
+        ftCorr      (0.0 0.0);      // Default to 0.0
+        laminarIgn  false;          // Default false
+    }
+
+    ftCorr is used to shift the location of the flame and corrects the
+    stochimetric mixture value when the mesh resolution is not enough
+    to resolve the combustion zone.
+
+    NOTE: Optionally the switch 'laminarIgn' can be used to ignite the mixture
+    using laminar combustion.
+
+
+SourceFiles
+    diffusionMulticomponent.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef diffusionMulticomponent_H
+#define diffusionMulticomponent_H
+
+#include "scalarList.H"
+#include "tmp.H"
+#include "Reaction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace combustionModels
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class diffusionMulticomponent Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CombThermoType, class ThermoType>
+class diffusionMulticomponent
+:
+    public CombThermoType
+{
+    // Private data
+
+        //- Reactions
+        const PtrList<Reaction<ThermoType> >& reactions_;
+
+        //- Thermodynamic data of the species
+        const PtrList<ThermoType>& specieThermo_;
+
+        //- Pointer list of source terms
+        PtrList<volScalarField> RijPtr_;
+
+        //- Model constants
+        scalarList Ci_;
+
+        //- List of fuels for each reaction
+        wordList fuelNames_;
+
+        //- List of oxydants for each reaction
+        wordList oxydantNames_;
+
+        //- Heat of combustion [J/Kg]
+        scalarList qFuel_;
+
+        //- Stoichiometric air-fuel mass ratio
+        scalarList stoicRatio_;
+
+        //- Stoichiometric oxygen-fuel mass ratio
+        scalarList s_;
+
+        //- Oxydaser sream mass concentrations
+        scalarList YoxStream_;
+
+        //- Fuel stream mass concentrations
+        scalarList YfStream_;
+
+        //- Mean distribution for gaussian probabililty
+        scalarList sigma_;
+
+        //- Residual oxydaser
+        scalarList oxydantRes_;
+
+        //- ft stochiometric correction
+        scalarList ftCorr_;
+
+        //- Relaxatnio factor on total source
+        scalar alpha_;
+
+        //- Switch on to laminar combustion for ignition
+        bool laminarIgn_;
+
+
+    // Private Member Functions
+
+        //- Return the chemical time scale
+        tmp<volScalarField> tc() const;
+
+        //- Initialize
+        void init();
+
+        //- Disallow copy construct
+        diffusionMulticomponent(const diffusionMulticomponent&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const diffusionMulticomponent&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("diffusionMulticomponent");
+
+
+    // Constructors
+
+        //- Construct from components
+        diffusionMulticomponent
+        (
+            const word& modelType,
+            const fvMesh& mesh,
+            const word& phaseName
+        );
+
+
+    //- Destructor
+    virtual ~diffusionMulticomponent();
+
+
+    // Member Functions
+
+        // Evolution
+
+            //- Correct combustion rate
+            virtual void correct();
+
+            //- Fuel consumption rate matrix.
+            virtual tmp<fvScalarMatrix> R(volScalarField& Y) const;
+
+            //- Heat release rate calculated from fuel consumption rate matrix
+            virtual tmp<volScalarField> dQ() const;
+
+            //-  Return source for enthalpy equation [kg/m/s3]
+            virtual tmp<volScalarField> Sh() const;
+
+
+    // IO
+
+            //- Update properties from given dictionary
+            virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace combustionModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "diffusionMulticomponent.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponents.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponents.C
new file mode 100644
index 0000000000..3aa6b79401
--- /dev/null
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponents.C
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeCombustionTypes.H"
+
+#include "thermoPhysicsTypes.H"
+#include "psiChemistryCombustion.H"
+#include "rhoChemistryCombustion.H"
+#include "diffusionMulticomponent.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Combustion models based on sensibleEnthalpy
+
+makeCombustionTypesThermo
+(
+    diffusionMulticomponent,
+    psiChemistryCombustion,
+    gasHThermoPhysics,
+    psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+    diffusionMulticomponent,
+    rhoChemistryCombustion,
+    gasHThermoPhysics,
+    rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+    diffusionMulticomponent,
+    rhoChemistryCombustion,
+    incompressibleGasHThermoPhysics,
+    rhoCombustionModel
+);
+
+// ************************************************************************* //
diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C
index 42a000e187..59789b4841 100644
--- a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C
+++ b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C
@@ -57,10 +57,8 @@ Foam::combustionModels::psiCombustionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "psiCombustionModel::New"
-        )   << "Unknown psiCombustionModel type "
+        FatalErrorInFunction
+            << "Unknown psiCombustionModel type "
             << combModelName << endl << endl
             << "Valid  combustionModels are : " << endl
             << dictionaryConstructorTablePtr_->toc()
diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C
index 2c94b39931..4a23b500d5 100644
--- a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C
+++ b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C
@@ -57,10 +57,8 @@ Foam::combustionModels::rhoCombustionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "rhoCombustionModel::New"
-        )   << "Unknown rhoCombustionModel type "
+        FatalErrorInFunction
+            << "Unknown rhoCombustionModel type "
             << combTypeName << endl << endl
             << "Valid  combustionModels are : " << endl
             << dictionaryConstructorTablePtr_->toc()
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index 65a41fcada..0f6dd8adc5 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -68,16 +68,7 @@ singleStepCombustion<CombThermoType, ThermoType>::singleStepCombustion
     }
     else
     {
-        FatalErrorIn
-        (
-            "singleStepCombustion<CombThermoType, ThermoType>::"
-            "singleStepCombustion"
-            "("
-                "const word&, "
-                "const fvMesh& "
-                "const word&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Inconsistent thermo package for " << this->type() << " model:\n"
             << "    " << this->thermo().type() << nl << nl
             << "Please select a thermo package based on "
diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C
index fa89a8cafe..a8a02535d0 100644
--- a/src/conversion/ensight/part/ensightPart.C
+++ b/src/conversion/ensight/part/ensightPart.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,9 +136,8 @@ Foam::autoPtr<Foam::ensightPart> Foam::ensightPart::New(Istream& is)
 
     if (cstrIter == istreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "ensightPart::New(Istream&)",
             is
         )   << "unknown ensightPart type "
             << partType << nl << nl
diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H
index 8166f953dc..ff1cdcf1f8 100644
--- a/src/conversion/ensight/part/ensightPart.H
+++ b/src/conversion/ensight/part/ensightPart.H
@@ -340,7 +340,7 @@ public:
         //- Disallow default bitwise assignment
         void operator=(const ensightPart&)
         {
-            notImplemented("ensightPart::operator=(const ensightPart&)");
+            NotImplemented;
         }
 
 
diff --git a/src/conversion/meshReader/calcPointCells.C b/src/conversion/meshReader/calcPointCells.C
index 4da904faa7..fab62003b6 100644
--- a/src/conversion/meshReader/calcPointCells.C
+++ b/src/conversion/meshReader/calcPointCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ void Foam::meshReader::calcPointCells() const
 
     if (pointCellsPtr_)
     {
-        FatalErrorIn("meshReader::calcPointCells() const")
+        FatalErrorInFunction
             << "pointCells already calculated"
             << abort(FatalError);
     }
diff --git a/src/conversion/meshReader/createPolyCells.C b/src/conversion/meshReader/createPolyCells.C
index 028313ce9e..deebfc12aa 100644
--- a/src/conversion/meshReader/createPolyCells.C
+++ b/src/conversion/meshReader/createPolyCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -310,7 +310,7 @@ void Foam::meshReader::createPolyCells()
             }
             else
             {
-              FatalErrorIn("meshReader::createPolyCells()")
+              FatalErrorInFunction
                   << "Error in internal face insertion"
                   << abort(FatalError);
             }
diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C
index 3e3e94383b..5ba8c7abc9 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.C
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C
@@ -69,8 +69,7 @@ bool Foam::meshReaders::STARCD::readHeader(IFstream& is, word fileSignature)
 {
     if (!is.good())
     {
-        FatalErrorIn("meshReaders::STARCD::readHeader()")
-            << "cannot read " << fileSignature  << "  " << is.name()
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
@@ -194,7 +193,7 @@ void Foam::meshReaders::STARCD::readPoints
     }
     else
     {
-        FatalErrorIn("meshReaders::STARCD::readPoints()")
+        FatalErrorInFunction
             << "no points in file " << inputName
             << abort(FatalError);
     }
@@ -366,7 +365,7 @@ void Foam::meshReaders::STARCD::readCells(const fileName& inputName)
     // construct cellFaces_ and possibly cellShapes_
     if (nCells <= 0)
     {
-        FatalErrorIn("meshReaders::STARCD::readCells()")
+        FatalErrorInFunction
             << "no cells in file " << inputName
             << abort(FatalError);
     }
@@ -533,7 +532,7 @@ void Foam::meshReaders::STARCD::readCells(const fileName& inputName)
 
                 if (nFaces < 4)
                 {
-                    FatalErrorIn("meshReaders::STARCD::readCells()")
+                    FatalErrorInFunction
                         << "star cell " << starCellId << " has " << nFaces
                         << abort(FatalError);
                 }
@@ -597,7 +596,7 @@ void Foam::meshReaders::STARCD::readCells(const fileName& inputName)
 
     if (unknownVertices)
     {
-        FatalErrorIn("meshReaders::STARCD::readCells()")
+        FatalErrorInFunction
             << "cells with unknown vertices"
             << abort(FatalError);
     }
diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/meshTables/remappingDict
index bed396b1a7..7e90303ab2 100644
--- a/src/conversion/meshTables/remappingDict
+++ b/src/conversion/meshTables/remappingDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 08383060e1..a308dfbc54 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ void Foam::meshWriters::STARCD::getCellTable()
         }
         else
         {
-            WarningIn("STARCD::getCellTable()")
+            WarningInFunction
                 << ioList.objectPath() << " has incorrect number of cells "
                 << " - use cellZone information"
                 << endl;
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 9ed6be4c8f..ed76d92d72 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,11 +125,8 @@ Foam::labelList Foam::polyDualMesh::getFaceOrder
     {
         if (oldToNew[faceI] == -1)
         {
-            FatalErrorIn
-            (
-                "polyDualMesh::getFaceOrder"
-                "(const labelList&, const labelList&, const label) const"
-            )   << "Did not determine new position"
+            FatalErrorInFunction
+                << "Did not determine new position"
                 << " for face " << faceI
                 << abort(FatalError);
         }
@@ -205,7 +202,7 @@ void Foam::polyDualMesh::getPointEdges
         }
     }
 
-    FatalErrorIn("getPointEdges") << "Cannot find two edges on face:" << faceI
+    FatalErrorInFunction
         << " vertices:" << patch.localFaces()[faceI]
         << " that uses point:" << pointI
         << abort(FatalError);
@@ -247,7 +244,7 @@ Foam::labelList Foam::polyDualMesh::collectPatchSideFace
     // Store dual vertex for starting edge.
     if (edgeToDualPoint[patch.meshEdges()[edgeI]] < 0)
     {
-        FatalErrorIn("polyDualMesh::collectPatchSideFace") << edgeI
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
@@ -761,11 +758,8 @@ void Foam::polyDualMesh::calcDual
         {
             nonManifoldPoints.write();
 
-            FatalErrorIn
-            (
-                "polyDualMesh::calcDual(const polyMesh&, const labelList&"
-                ", const labelList&)"
-            )   << "There are " << nonManifoldPoints.size() << " points where"
+            FatalErrorInFunction
+                << "There are " << nonManifoldPoints.size() << " points where"
                 << " the outside of the mesh is non-manifold." << nl
                 << "Such a mesh cannot be converted to a dual." << nl
                 << "Writing points at non-manifold sites to pointSet "
@@ -918,7 +912,7 @@ void Foam::polyDualMesh::calcDual
 
         if (patchFaces.size() != 2)
         {
-            FatalErrorIn("polyDualMesh::calcDual")
+            FatalErrorInFunction
                 << "Cannot handle edges with " << patchFaces.size()
                 << " connected boundary faces."
                 << abort(FatalError);
@@ -1018,7 +1012,7 @@ void Foam::polyDualMesh::calcDual
             vector n = f.normal(dualPoints);
             if (((mesh.points()[owner] - dualPoints[f[0]]) & n) > 0)
             {
-                WarningIn("calcDual") << "Incorrect orientation"
+                WarningInFunction
                     << " on boundary edge:" << edgeI
                     << mesh.points()[mesh.edges()[edgeI][0]]
                     << mesh.points()[mesh.edges()[edgeI][1]]
@@ -1133,7 +1127,7 @@ void Foam::polyDualMesh::calcDual
                 vector n = f.normal(dualPoints);
                 if (((mesh.points()[owner] - dualPoints[f[0]]) & n) > 0)
                 {
-                    WarningIn("calcDual") << "Incorrect orientation"
+                    WarningInFunction
                         << " on internal edge:" << edgeI
                         << mesh.points()[mesh.edges()[edgeI][0]]
                         << mesh.points()[mesh.edges()[edgeI][1]]
@@ -1537,7 +1531,7 @@ void Foam::polyDualMesh::calcFeatures
             // Non-manifold. Problem?
             const edge& e = allBoundary.edges()[edgeI];
 
-            WarningIn("polyDualMesh::calcFeatures") << "Edge "
+            WarningInFunction
                 << meshPoints[e[0]] << ' ' << meshPoints[e[1]]
                 << "  coords:" << mesh.points()[meshPoints[e[0]]]
                 << mesh.points()[meshPoints[e[1]]]
diff --git a/src/dummyThirdParty/MGridGen/dummyMGridGen.C b/src/dummyThirdParty/MGridGen/dummyMGridGen.C
index 566c64d997..fe1cca6828 100644
--- a/src/dummyThirdParty/MGridGen/dummyMGridGen.C
+++ b/src/dummyThirdParty/MGridGen/dummyMGridGen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ extern "C"
 void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *,
               int, int, int *, int *, int *, idxtype *)
 {
-    FatalErrorIn("MGridGen(..)")
+    FatalErrorInFunction
         << notImplementedMessage
         << Foam::exit(Foam::FatalError);
 }
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index 438e158df9..ffe80489d7 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,16 +63,8 @@ Foam::label Foam::metisDecomp::decompose
     List<label>& finalDecomp
 )
 {
-    FatalErrorIn
-    (
-        "labelList metisDecomp::decompose"
-        "("
-            "const List<label>&, "
-            "const List<label>&, "
-            "const scalarField&, "
-            "List<label>&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return -1;
 }
@@ -98,14 +90,8 @@ Foam::labelList Foam::metisDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList metisDecomp::decompose"
-        "("
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList();
 }
@@ -119,15 +105,8 @@ Foam::labelList Foam::metisDecomp::decompose
     const scalarField& agglomWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList metisDecomp::decompose"
-        "("
-            "const labelList&, "
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList();
 }
@@ -140,15 +119,8 @@ Foam::labelList Foam::metisDecomp::decompose
     const scalarField& cellWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList metisDecomp::decompose"
-        "("
-            "const labelListList&, "
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList();
 }
diff --git a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
index e9b05babb7..719e6b6d11 100644
--- a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
+++ b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,17 +68,8 @@ Foam::label Foam::ptscotchDecomp::decompose
     List<label>& finalDecomp
 ) const
 {
-    FatalErrorIn
-    (
-        "label ptscotchDecomp::decompose"
-        "("
-            "onst fileName&,"
-            "const List<label>&, "
-            "const List<label>&, "
-            "const scalarField&, "
-            "List<label>&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return -1;
 }
@@ -95,19 +86,8 @@ Foam::label Foam::ptscotchDecomp::decompose
     List<label>& finalDecomp
 ) const
 {
-    FatalErrorIn
-    (
-        "label ptscotchDecomp::decompose"
-        "("
-            "const fileName&,"
-            "const int,"
-            "const int,"
-            "const int,"
-            "const int,"
-            "const scalarField&,"
-            "List<label>&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return -1;
 }
@@ -133,14 +113,8 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList ptscotchDecomp::decompose"
-        "("
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList::null();
 }
@@ -154,15 +128,8 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList ptscotchDecomp::decompose"
-        "("
-            "const labelList&, "
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList::null();
 }
@@ -175,15 +142,8 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     const scalarField& cWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList ptscotchDecomp::decompose"
-        "("
-            "const labelListList&, "
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList::null();
 }
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index 3929b7a0c1..737196be16 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,17 +67,8 @@ Foam::label Foam::scotchDecomp::decompose
     List<label>& finalDecomp
 )
 {
-    FatalErrorIn
-    (
-        "label scotchDecomp::decompose\n"
-        "(\n"
-            "const fileName& meshPath,\n"
-            "const List<label>&,\n"
-            "const List<label>&,\n"
-            "const scalarField&,\n"
-            "List<label>&\n"
-        ")\n"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return -1;
 }
@@ -103,14 +94,8 @@ Foam::labelList Foam::scotchDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList scotchDecomp::decompose"
-        "("
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList::null();
 }
@@ -124,15 +109,8 @@ Foam::labelList Foam::scotchDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList scotchDecomp::decompose"
-        "("
-            "const labelList&, "
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList::null();
 }
@@ -145,15 +123,8 @@ Foam::labelList Foam::scotchDecomp::decompose
     const scalarField& cWeights
 )
 {
-    FatalErrorIn
-    (
-        "labelList scotchDecomp::decompose"
-        "("
-            "const labelListList&, "
-            "const pointField&, "
-            "const scalarField&"
-        ")"
-    )   << notImplementedMessage << exit(FatalError);
+    FatalErrorInFunction
+        << notImplementedMessage << exit(FatalError);
 
     return labelList::null();
 }
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
index f1a70cb97b..fa05cc2a59 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,10 +63,8 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
 
     if (!IOobjectConstructorTablePtr_)
     {
-        FatalErrorIn
-        (
-            "dynamicFvMesh::New(const IOobject&)"
-        )   << "dynamicFvMesh table is empty"
+        FatalErrorInFunction
+            << "dynamicFvMesh table is empty"
             << exit(FatalError);
     }
 
@@ -75,10 +73,8 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
 
     if (cstrIter == IOobjectConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "dynamicFvMesh::New(const IOobject&)"
-        )   << "Unknown dynamicFvMesh type "
+        FatalErrorInFunction
+            << "Unknown dynamicFvMesh type "
             << dynamicFvMeshTypeName << nl << nl
             << "Valid dynamicFvMesh types are :" << endl
             << IOobjectConstructorTablePtr_->sortedToc()
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
index 0fd2b0073a..3c9397314e 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index ad64e1ca40..a3f38112c8 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -241,7 +241,7 @@ Foam::dynamicRefineFvMesh::refine
 
             if (oldFaceI >= nInternalFaces())
             {
-                FatalErrorIn("dynamicRefineFvMesh::refine(const labelList&)")
+                FatalErrorInFunction
                     << "New internal face:" << faceI
                     << " fc:" << faceCentres()[faceI]
                     << " originates from boundary oldFace:" << oldFaceI
@@ -294,10 +294,8 @@ Foam::dynamicRefineFvMesh::refine
 
                 if (masterFaceI < 0)
                 {
-                    FatalErrorIn
-                    (
-                        "dynamicRefineFvMesh::refine(const labelList&)"
-                    )   << "Problem: should not have removed faces"
+                    FatalErrorInFunction
+                        << "Problem: should not have removed faces"
                         << " when refining."
                         << nl << "face:" << faceI << abort(FatalError);
                 }
@@ -320,7 +318,7 @@ Foam::dynamicRefineFvMesh::refine
         {
             if (!correctFluxes_.found(iter.key()))
             {
-                WarningIn("dynamicRefineFvMesh::refine(const labelList&)")
+                WarningInFunction
                     << "Cannot find surfaceScalarField " << iter.key()
                     << " in user-provided flux mapping table "
                     << correctFluxes_ << endl
@@ -549,7 +547,7 @@ Foam::dynamicRefineFvMesh::unrefine
         {
             if (!correctFluxes_.found(iter.key()))
             {
-                WarningIn("dynamicRefineFvMesh::refine(const labelList&)")
+                WarningInFunction
                     << "Cannot find surfaceScalarField " << iter.key()
                     << " in user-provided flux mapping table "
                     << correctFluxes_ << endl
@@ -862,16 +860,62 @@ Foam::labelList Foam::dynamicRefineFvMesh::selectUnrefinePoints
     // All points that can be unrefined
     const labelList splitPoints(meshCutter_.getSplitPoints());
 
+
+    const labelListList& pointCells = this->pointCells();
+
+    // If we have any protected cells make sure they also are not being
+    // unrefined
+
+    PackedBoolList protectedPoint(nPoints());
+
+    if (protectedCell_.size())
+    {
+        // Get all points on a protected cell
+        forAll(pointCells, pointI)
+        {
+            const labelList& pCells = pointCells[pointI];
+
+            forAll(pCells, pCellI)
+            {
+                label cellI = pCells[pCellI];
+
+                if (protectedCell_[cellI])
+                {
+                    protectedPoint[pointI] = true;
+                    break;
+                }
+            }
+        }
+
+        syncTools::syncPointList
+        (
+            *this,
+            protectedPoint,
+            orEqOp<unsigned int>(),
+            0U
+        );
+
+        if (debug)
+        {
+            Info<< "From "
+                << returnReduce(protectedCell_.count(), sumOp<label>())
+                << " protected cells found "
+                << returnReduce(protectedPoint.count(), sumOp<label>())
+                << " protected points." << endl;
+        }
+    }
+
+
     DynamicList<label> newSplitPoints(splitPoints.size());
 
     forAll(splitPoints, i)
     {
         label pointI = splitPoints[i];
 
-        if (pFld[pointI] < unrefineLevel)
+        if (!protectedPoint[pointI] && pFld[pointI] < unrefineLevel)
         {
             // Check that all cells are not marked
-            const labelList& pCells = pointCells()[pointI];
+            const labelList& pCells = pointCells[pointI];
 
             bool hasMarked = false;
 
@@ -1227,7 +1271,7 @@ bool Foam::dynamicRefineFvMesh::update()
     }
     else if (refineInterval < 0)
     {
-        FatalErrorIn("dynamicRefineFvMesh::update()")
+        FatalErrorInFunction
             << "Illegal refineInterval " << refineInterval << nl
             << "The refineInterval setting in the dynamicMeshDict should"
             << " be >= 1." << nl
@@ -1246,7 +1290,7 @@ bool Foam::dynamicRefineFvMesh::update()
 
         if (maxCells <= 0)
         {
-            FatalErrorIn("dynamicRefineFvMesh::update()")
+            FatalErrorInFunction
                 << "Illegal maximum number of cells " << maxCells << nl
                 << "The maxCells setting in the dynamicMeshDict should"
                 << " be > 0." << nl
@@ -1257,7 +1301,7 @@ bool Foam::dynamicRefineFvMesh::update()
 
         if (maxRefinement <= 0)
         {
-            FatalErrorIn("dynamicRefineFvMesh::update()")
+            FatalErrorInFunction
                 << "Illegal maximum refinement level " << maxRefinement << nl
                 << "The maxCells setting in the dynamicMeshDict should"
                 << " be > 0." << nl
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
index d5d37fc4bc..4051f7a7ea 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/multiSolidBodyMotionFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,10 +81,8 @@ Foam::multiSolidBodyMotionFvMesh::multiSolidBodyMotionFvMesh(const IOobject& io)
 {
     if (undisplacedPoints_.size() != nPoints())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "multiSolidBodyMotionFvMesh::multiSolidBodyMotionFvMesh"
-            "(const IOobject&)",
             dynamicMeshCoeffs_
         )   << "Read " << undisplacedPoints_.size()
             << " undisplaced points from " << undisplacedPoints_.objectPath()
@@ -106,10 +104,8 @@ Foam::multiSolidBodyMotionFvMesh::multiSolidBodyMotionFvMesh(const IOobject& io)
 
             if (zoneIDs_[zoneI] == -1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "multiSolidBodyMotionFvMesh::"
-                    "multiSolidBodyMotionFvMesh(const IOobject&)",
                     dynamicMeshCoeffs_
                 )   << "Cannot find cellZone named " << iter().keyword()
                     << ". Valid zones are " << cellZones().names()
@@ -207,7 +203,7 @@ bool Foam::multiSolidBodyMotionFvMesh::update()
     {
         hasWarned = true;
 
-        WarningIn("multiSolidBodyMotionFvMesh::update()")
+        WarningInFunction
             << "Did not find volVectorField U."
             << " Not updating U boundary conditions." << endl;
     }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
index 283657c5f2..b0f0921750 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,14 +42,8 @@ Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "solidBodyMotionFunction::New"
-            "("
-            "    const dictionary& SBMFCoeffs,"
-            "    const Time& runTime"
-            ")"
-        )   << "Unknown solidBodyMotionFunction type "
+        FatalErrorInFunction
+            << "Unknown solidBodyMotionFunction type "
             << motionType << nl << nl
             << "Valid solidBodyMotionFunctions are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index c763c9917a..2410e72f04 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -78,10 +78,8 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
 
     if (t < times_[0])
     {
-        FatalErrorIn
-        (
-            "solidBodyMotionFunctions::tabulated6DoFMotion::transformation()"
-        )   << "current time (" << t
+        FatalErrorInFunction
+            << "current time (" << t
             << ") is less than the minimum in the data table ("
             << times_[0] << ')'
             << exit(FatalError);
@@ -89,10 +87,8 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::transformation() const
 
     if (t > times_.last())
     {
-        FatalErrorIn
-        (
-            "solidBodyMotionFunctions::tabulated6DoFMotion::transformation()"
-        )   << "current time (" << t
+        FatalErrorInFunction
+            << "current time (" << t
             << ") is greater than the maximum in the data table ("
             << times_.last() << ')'
             << exit(FatalError);
@@ -156,11 +152,8 @@ bool Foam::solidBodyMotionFunctions::tabulated6DoFMotion::read
         }
         else
         {
-            FatalErrorIn
-            (
-                "solidBodyMotionFunctions::tabulated6DoFMotion::read"
-                "(const dictionary&)"
-            )   << "Cannot open time data file " << timeDataFileName_
+            FatalErrorInFunction
+                << "Cannot open time data file " << timeDataFileName_
                 << exit(FatalError);
         }
     }
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
index d7118782a5..b12b241429 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
@@ -81,11 +81,8 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
 {
     if (undisplacedPoints_.size() != nPoints())
     {
-        FatalIOErrorIn
-        (
-            "solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject&)",
-            dynamicMeshCoeffs_
-        )   << "Read " << undisplacedPoints_.size()
+        FatalIOErrorInFunction(dynamicMeshCoeffs_)
+            << "Read " << undisplacedPoints_.size()
             << " undisplaced points from " << undisplacedPoints_.objectPath()
             << " but the current mesh has " << nPoints()
             << exit(FatalIOError);
@@ -99,11 +96,7 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
 
     if ((cellZoneName != "none") && (cellSetName != "none"))
     {
-        FatalIOErrorIn
-        (
-            "solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject&)",
-            dynamicMeshCoeffs_
-        )
+        FatalIOErrorInFunction(dynamicMeshCoeffs_)
             << "Either cellZone OR cellSet can be supplied, but not both. "
             << "If neither is supplied, all cells will be included"
             << exit(FatalIOError);
@@ -120,10 +113,8 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
 
         if (zoneID == -1)
         {
-            FatalErrorIn
-            (
-                "solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject&)"
-            )   << "Unable to find cellZone " << cellZoneName
+            FatalErrorInFunction
+                << "Unable to find cellZone " << cellZoneName
                 << ".  Valid cellZones are:"
                 << cellZones().names()
                 << exit(FatalError);
@@ -234,7 +225,7 @@ bool Foam::solidBodyMotionFvMesh::update()
     {
         hasWarned = true;
 
-        WarningIn("solidBodyMotionFvMesh::update()")
+        WarningInFunction
             << "Did not find volVectorField " << UName_
             << " Not updating " << UName_ << "boundary conditions."
             << endl;
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index c9c748ec4a..ec2ec3418e 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -28,17 +28,22 @@ polyTopoChange/polyTopoChange/addPatchCellLayer.C
 polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapse.C
 polyTopoChange/polyTopoChange/edgeCollapser.C
 polyTopoChange/polyTopoChange/faceCollapser.C
-polyTopoChange/polyTopoChange/hexRef8.C
 polyTopoChange/polyTopoChange/removeCells.C
 polyTopoChange/polyTopoChange/removeFaces.C
 polyTopoChange/polyTopoChange/refinementData.C
 polyTopoChange/polyTopoChange/refinementDistanceData.C
-polyTopoChange/polyTopoChange/refinementHistory.C
 polyTopoChange/polyTopoChange/removePoints.C
 polyTopoChange/polyTopoChange/combineFaces.C
 polyTopoChange/polyTopoChange/duplicatePoints.C
 polyTopoChange/polyTopoChange/tetDecomposer.C
 
+
+hexRef8 = polyTopoChange/polyTopoChange/hexRef8
+
+$(hexRef8)/hexRef8.C
+$(hexRef8)/hexRef8Data.C
+$(hexRef8)/refinementHistory.C
+
 slidingInterface/slidingInterface.C
 slidingInterface/slidingInterfaceProjectPoints.C
 slidingInterface/coupleSlidingInterface.C
@@ -78,11 +83,14 @@ polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
 
 fvMeshAdder/fvMeshAdder.C
 fvMeshDistribute/fvMeshDistribute.C
+fvMeshDistribute/IOmapDistributePolyMesh.C
 polyMeshAdder/faceCoupleInfo.C
 polyMeshAdder/polyMeshAdder.C
 
 fvMeshTools/fvMeshTools.C
 
+fvMeshSubset/fvMeshSubset.C
+
 motionSmoother/motionSmoother.C
 motionSmoother/motionSmootherAlgo.C
 motionSmoother/motionSmootherAlgoCheck.C
@@ -95,6 +103,7 @@ motionSolver/motionSolver/motionSolver.C
 motionSolver/displacement/displacementMotionSolver.C
 motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
 motionSolver/velocity/velocityMotionSolver.C
+motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C
 motionSolver/componentVelocity/componentVelocityMotionSolver.C
 
 createShellMesh/createShellMesh.C
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 6c71ded4e5..4627bf6d70 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,10 +61,8 @@ void Foam::attachDetach::checkDefinition()
      || !slavePatchID_.active()
     )
     {
-        FatalErrorIn
-        (
-            "void Foam::attachDetach::checkDefinition()"
-        )   << "Not all zones and patches needed in the definition "
+        FatalErrorInFunction
+            << "Not all zones and patches needed in the definition "
             << "have been found.  Please check your mesh definition."
             << abort(FatalError);
     }
@@ -97,10 +95,7 @@ void Foam::attachDetach::checkDefinition()
         // Check if there are faces in the master zone
         if (mesh.faceZones()[faceZoneID_.index()].empty())
         {
-            FatalErrorIn
-            (
-                "void Foam::attachDetach::checkDefinition()"
-            )   << "Attach/detach zone contains no faces.  Please check your "
+            FatalErrorInFunction
                 << "mesh definition."
                 << abort(FatalError);
         }
@@ -122,10 +117,8 @@ void Foam::attachDetach::checkDefinition()
 
             if (bouFacesInZone.size())
             {
-                FatalErrorIn
-                (
-                    "void Foam::attachDetach::checkDefinition()"
-                )   << "Found boundary faces in the zone defining "
+                FatalErrorInFunction
+                    << "Found boundary faces in the zone defining "
                     << "attach/detach boundary "
                     << " for object " << name()
                     << " : .  This is not allowed." << nl
@@ -158,10 +151,8 @@ void Foam::attachDetach::checkDefinition()
             )
         )
         {
-            FatalErrorIn
-            (
-                "void Foam::attachDetach::checkDefinition()"
-            )   << "Problem with sizes in mesh modifier. The face zone,"
+            FatalErrorInFunction
+                << "Problem with sizes in mesh modifier. The face zone,"
                 << " master and slave patch should have the same size"
                 << " for object " << name() << ". " << nl
                 << "Zone size: "
@@ -197,10 +188,8 @@ void Foam::attachDetach::checkDefinition()
 
             if (zoneProblemFaces.size())
             {
-                FatalErrorIn
-                (
-                    "void Foam::attachDetach::checkDefinition()"
-                )   << "Found faces in the zone defining "
+                FatalErrorInFunction
+                    << "Found faces in the zone defining "
                     << "attach/detach boundary which do not belong to "
                     << "either master or slave patch.  "
                     << "This is not allowed." << nl
@@ -224,10 +213,8 @@ void Foam::attachDetach::checkDefinition()
      || (triggerTimes_.empty() && !manualTrigger())
     )
     {
-        FatalErrorIn
-        (
-            "void Foam::attachDetach::checkDefinition()"
-        )   << "Problem with definition of trigger times: "
+        FatalErrorInFunction
+            << "Problem with definition of trigger times: "
             << triggerTimes_
             << abort(FatalError);
     }
@@ -439,10 +426,8 @@ void Foam::attachDetach::setRefinement(polyTopoChange& ref) const
         }
         else
         {
-            FatalErrorIn
-            (
-                "void attachDetach::setRefinement(polyTopoChange&) const"
-            )   << "Requested attach/detach event and currect state "
+            FatalErrorInFunction
+                << "Requested attach/detach event and currect state "
                 << "is not known."
                 << abort(FatalError);
         }
diff --git a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
index 4a22c0d858..cb1eadf6a6 100644
--- a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
+++ b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,10 +54,8 @@ void Foam::attachDetach::calcPointMatchMap() const
 
     if (pointMatchMapPtr_)
     {
-        FatalErrorIn
-        (
-            "void attachDetach::calcPointMatchMap() const"
-        )   << "Point match map already calculated for object " << name()
+        FatalErrorInFunction
+            << "Point match map already calculated for object " << name()
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/attachDetach/detachInterface.C b/src/dynamicMesh/attachDetach/detachInterface.C
index 63ae360d51..e457967b07 100644
--- a/src/dynamicMesh/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/attachDetach/detachInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,11 +84,8 @@ void Foam::attachDetach::detachInterface
             {
                 if (faceLabels[i] <= faceLabels[i-1])
                 {
-                    FatalErrorIn
-                    (
-                        "attachDetach::detachInterface"
-                        "(polyTopoChange&) const"
-                    )   << "faceZone " << zoneMesh[faceZoneID_.index()].name()
+                    FatalErrorInFunction
+                        << "faceZone " << zoneMesh[faceZoneID_.index()].name()
                         << " does not have mesh face labels in"
                         << " increasing order." << endl
                         << "Face label " << faceLabels[i]
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index ad204d7c15..1276900588 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,7 +157,7 @@ Foam::labelList Foam::boundaryMesh::collectSegment
 
         if (featI == -1)
         {
-            FatalErrorIn("boundaryMesh::collectSegment")
+            FatalErrorInFunction
                 << "Problem" << abort(FatalError);
         }
         featLabels[featLabelI++] = featI;
@@ -1544,7 +1544,7 @@ Foam::label Foam::boundaryMesh::whichPatch(const label faceI) const
         }
     }
 
-    FatalErrorIn("boundaryMesh::whichPatch(const label)")
+    FatalErrorInFunction
         << "Cannot find face " << faceI << " in list of boundaryPatches "
         << patches_
         << abort(FatalError);
@@ -1610,14 +1610,14 @@ void Foam::boundaryMesh::deletePatch(const word& patchName)
 
     if (delPatchI == -1)
     {
-        FatalErrorIn("boundaryMesh::deletePatch(const word&")
+        FatalErrorInFunction
             << "Can't find patch named " << patchName
             << abort(FatalError);
     }
 
     if (patches_[delPatchI].size())
     {
-        FatalErrorIn("boundaryMesh::deletePatch(const word&")
+        FatalErrorInFunction
             << "Trying to delete non-empty patch " << patchName
             << endl << "Current size:" << patches_[delPatchI].size()
             << abort(FatalError);
@@ -1669,7 +1669,7 @@ void Foam::boundaryMesh::changePatchType
 
     if (changeI == -1)
     {
-        FatalErrorIn("boundaryMesh::changePatchType(const word&, const word&)")
+        FatalErrorInFunction
             << "Can't find patch named " << patchName
             << abort(FatalError);
     }
@@ -1718,7 +1718,7 @@ void Foam::boundaryMesh::changeFaces
 {
     if (patchIDs.size() != mesh().size())
     {
-        FatalErrorIn("boundaryMesh::changeFaces(const labelList& patchIDs)")
+        FatalErrorInFunction
             << "List of patchIDs not equal to number of faces." << endl
             << "PatchIDs size:" << patchIDs.size()
             << " nFaces::" << mesh().size()
@@ -1735,7 +1735,7 @@ void Foam::boundaryMesh::changeFaces
 
         if (patchID < 0 || patchID >= patches_.size())
         {
-            FatalErrorIn("boundaryMesh::changeFaces(const labelList&)")
+            FatalErrorInFunction
                 << "PatchID " << patchID << " out of range"
                 << abort(FatalError);
         }
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index d6eca3f770..37fd4c64d4 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -204,7 +204,7 @@ public:
             {
                 if (!meshPtr_)
                 {
-                    FatalErrorIn("boundaryMesh::mesh()")
+                    FatalErrorInFunction
                         << "No mesh available. Probably mesh not yet"
                         << " read." << abort(FatalError);
                 }
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
index e6356ff66f..7d2d36d1dc 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.C
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -432,7 +432,7 @@ Foam::createShellMesh::createShellMesh
 {
     if (pointRegions_.size() != patch_.size())
     {
-        FatalErrorIn("createShellMesh::createShellMesh(..)")
+        FatalErrorInFunction
             << "nFaces:" << patch_.size()
             << " pointRegions:" << pointRegions.size()
             << exit(FatalError);
@@ -455,7 +455,7 @@ void Foam::createShellMesh::setRefinement
 {
     if (firstLayerDisp.size() != regionPoints_.size())
     {
-        FatalErrorIn("createShellMesh::setRefinement(..)")
+        FatalErrorInFunction
             << "nRegions:" << regionPoints_.size()
             << " firstLayerDisp:" << firstLayerDisp.size()
             << exit(FatalError);
@@ -467,7 +467,7 @@ void Foam::createShellMesh::setRefinement
      && bottomPatchID.size() != patch_.size()
     )
     {
-        FatalErrorIn("createShellMesh::setRefinement(..)")
+        FatalErrorInFunction
             << "nFaces:" << patch_.size()
             << " topPatchID:" << topPatchID.size()
             << " bottomPatchID:" << bottomPatchID.size()
@@ -476,7 +476,7 @@ void Foam::createShellMesh::setRefinement
 
     if (extrudeEdgePatches.size() != patch_.nEdges())
     {
-        FatalErrorIn("createShellMesh::setRefinement(..)")
+        FatalErrorInFunction
             << "nEdges:" << patch_.nEdges()
             << " extrudeEdgePatches:" << extrudeEdgePatches.size()
             << exit(FatalError);
@@ -672,7 +672,7 @@ void Foam::createShellMesh::setRefinement
             // Internal face
             if (eFaces.size() != 2)
             {
-                FatalErrorIn("createShellMesh::setRefinement(..)")
+                FatalErrorInFunction
                     << "edge:" << edgeI
                     << " not internal but does not have side-patches defined."
                     << exit(FatalError);
@@ -682,7 +682,7 @@ void Foam::createShellMesh::setRefinement
         {
             if (eFaces.size() != ePatches.size())
             {
-                FatalErrorIn("createShellMesh::setRefinement(..)")
+                FatalErrorInFunction
                     << "external/feature edge:" << edgeI
                     << " has " << eFaces.size() << " connected extruded faces "
                     << " but only " << ePatches.size()
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
index 915173a142..6e1febbcd9 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,14 @@ License
 #include "faceCoupleInfo.H"
 #include "fvMesh.H"
 
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+defineTypeNameAndDebug(fvMeshAdder, 0);
+}
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 //- Calculate map from new patch faces to old patch faces. -1 where
@@ -108,6 +116,12 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::fvMeshAdder::add
     fvMeshAdder::MapSurfaceFields<symmTensor>(mapPtr, mesh0, mesh1);
     fvMeshAdder::MapSurfaceFields<tensor>(mapPtr, mesh0, mesh1);
 
+    fvMeshAdder::MapDimFields<scalar>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<vector>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<sphericalTensor>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<symmTensor>(mapPtr, mesh0, mesh1);
+    fvMeshAdder::MapDimFields<tensor>(mapPtr, mesh0, mesh1);
+
     return mapPtr;
 }
 
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index cc4240c77e..ccd869296c 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,7 +26,7 @@ Class
 
 Description
     Adds two fvMeshes without using any polyMesh morphing.
-    Uses fvMeshAdder.
+    Uses polyMeshAdder.
 
 SourceFiles
     fvMeshAdder.C
@@ -42,6 +42,7 @@ SourceFiles
 #include "fvPatchFieldsFwd.H"
 #include "fvsPatchFieldsFwd.H"
 #include "fvPatchFieldMapper.H"
+#include "DimensionedField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -101,8 +102,22 @@ private:
             const GeometricField<Type, fvsPatchField, surfaceMesh>& fldToAdd
         );
 
+        //- Update single dimensionedField.
+        template<class Type>
+        static void MapDimField
+        (
+            const mapAddedPolyMesh& meshMap,
+
+            DimensionedField<Type, volMesh>& fld,
+            const DimensionedField<Type, volMesh>& fldToAdd
+        );
+
 public:
 
+    // Declare name of the class and its debug switch
+    ClassName("fvMeshAdder");
+
+
     // Member Functions
 
         //- Inplace add mesh to fvMesh. Maps all stored fields. Returns map.
@@ -131,6 +146,15 @@ public:
             const fvMesh& mesh,
             const fvMesh& meshToAdd
         );
+
+        //- Map all DimensionedFields of Type
+        template<class Type>
+        static void MapDimFields
+        (
+            const mapAddedPolyMesh&,
+            const fvMesh& mesh,
+            const fvMesh& meshToAdd
+        );
 };
 
 
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
index 296bb3c513..ca4f59cdbd 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -280,6 +280,12 @@ void Foam::fvMeshAdder::MapVolFields
         ++fieldIter
     )
     {
+        if (debug)
+        {
+            Pout<< "MapVolFields : Storing old time for " << fieldIter()->name()
+                << endl;
+        }
+
         const_cast<GeometricField<Type, fvPatchField, volMesh>*>(fieldIter())
             ->storeOldTimes();
     }
@@ -304,11 +310,17 @@ void Foam::fvMeshAdder::MapVolFields
             const GeometricField<Type, fvPatchField, volMesh>& fldToAdd =
                 *fieldsToAdd[fld.name()];
 
+            if (debug)
+            {
+                Pout<< "MapVolFields : mapping " << fld.name()
+                    << " and " << fldToAdd.name() << endl;
+            }
+
             MapVolField<Type>(meshMap, fld, fldToAdd);
         }
         else
         {
-            WarningIn("fvMeshAdder::MapVolFields(..)")
+            WarningInFunction
                 << "Not mapping field " << fld.name()
                 << " since not present on mesh to add"
                 << endl;
@@ -585,8 +597,13 @@ void Foam::fvMeshAdder::MapSurfaceFields
         ++fieldIter
     )
     {
-        const_cast<fldType*>(fieldIter())
-            ->storeOldTimes();
+        if (debug)
+        {
+            Pout<< "MapSurfaceFields : Storing old time for "
+                << fieldIter()->name() << endl;
+        }
+
+        const_cast<fldType*>(fieldIter())->storeOldTimes();
     }
 
 
@@ -604,11 +621,93 @@ void Foam::fvMeshAdder::MapSurfaceFields
         {
             const fldType& fldToAdd = *fieldsToAdd[fld.name()];
 
+            if (debug)
+            {
+                Pout<< "MapSurfaceFields : mapping " << fld.name()
+                    << " and " << fldToAdd.name() << endl;
+            }
+
             MapSurfaceField<Type>(meshMap, fld, fldToAdd);
         }
         else
         {
-            WarningIn("fvMeshAdder::MapSurfaceFields(..)")
+            WarningInFunction
+                << "Not mapping field " << fld.name()
+                << " since not present on mesh to add"
+                << endl;
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::fvMeshAdder::MapDimField
+(
+    const mapAddedPolyMesh& meshMap,
+
+    DimensionedField<Type, volMesh>& fld,
+    const DimensionedField<Type, volMesh>& fldToAdd
+)
+{
+    const fvMesh& mesh = fld.mesh();
+
+    // Store old field
+    Field<Type> oldField(fld);
+
+    fld.setSize(mesh.nCells());
+
+    fld.rmap(oldField, meshMap.oldCellMap());
+    fld.rmap(fldToAdd, meshMap.addedCellMap());
+}
+
+
+template<class Type>
+void Foam::fvMeshAdder::MapDimFields
+(
+    const mapAddedPolyMesh& meshMap,
+    const fvMesh& mesh,
+    const fvMesh& meshToAdd
+)
+{
+    typedef DimensionedField<Type, volMesh> fldType;
+
+    // Note: use strict flag on lookupClass to avoid picking up
+    //       volFields
+    HashTable<const fldType*> fields
+    (
+        mesh.objectRegistry::lookupClass<fldType>(true)
+    );
+
+    HashTable<const fldType*> fieldsToAdd
+    (
+        meshToAdd.objectRegistry::lookupClass<fldType>(true)
+    );
+
+    for
+    (
+        typename HashTable<const fldType*>::
+            iterator fieldIter = fields.begin();
+        fieldIter != fields.end();
+        ++fieldIter
+    )
+    {
+        fldType& fld = const_cast<fldType&>(*fieldIter());
+
+        if (fieldsToAdd.found(fld.name()))
+        {
+            const fldType& fldToAdd = *fieldsToAdd[fld.name()];
+
+            if (debug)
+            {
+                Pout<< "MapDimFields : mapping " << fld.name()
+                    << " and " << fldToAdd.name() << endl;
+            }
+
+            MapDimField<Type>(meshMap, fld, fldToAdd);
+        }
+        else
+        {
+            WarningInFunction
                 << "Not mapping field " << fld.name()
                 << " since not present on mesh to add"
                 << endl;
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
new file mode 100644
index 0000000000..bf0dcd03fc
--- /dev/null
+++ b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOmapDistributePolyMesh.H"
+
+/* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
+
+namespace Foam
+{
+defineTypeNameAndDebug(IOmapDistributePolyMesh, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::IOmapDistributePolyMesh::IOmapDistributePolyMesh(const IOobject& io)
+:
+    regIOobject(io)
+{
+    // Temporary warning
+    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            << " does not support automatic rereading."
+            << endl;
+    }
+
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+}
+
+
+Foam::IOmapDistributePolyMesh::IOmapDistributePolyMesh
+(
+    const IOobject& io,
+    const mapDistributePolyMesh& map
+)
+:
+    regIOobject(io)
+{
+    // Temporary warning
+    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            << " does not support automatic rereading."
+            << endl;
+    }
+
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+    else
+    {
+        mapDistributePolyMesh::operator=(map);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+Foam::IOmapDistributePolyMesh::~IOmapDistributePolyMesh()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::IOmapDistributePolyMesh::readData(Istream& is)
+{
+    return (is >> *this).good();
+}
+
+
+bool Foam::IOmapDistributePolyMesh::writeData(Ostream& os) const
+{
+    return (os << *this).good();
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
new file mode 100644
index 0000000000..4aede4a7ec
--- /dev/null
+++ b/src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::IOmapDistributePolyMesh
+
+Description
+    IOmapDistributePolyMesh is derived from mapDistributePolyMesh and
+    IOobject to give the mapDistributePolyMesh
+    automatic IO functionality via the objectRegistry.
+
+SourceFiles
+    IOmapDistributePolyMesh.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOmapDistributePolyMesh_H
+#define IOmapDistributePolyMesh_H
+
+#include "mapDistributePolyMesh.H"
+#include "regIOobject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class IOmapDistributePolyMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class IOmapDistributePolyMesh
+:
+    public regIOobject,
+    public mapDistributePolyMesh
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("mapDistributePolyMesh");
+
+    // Constructors
+
+        //- Construct given an IOobject
+        IOmapDistributePolyMesh(const IOobject&);
+
+        //- Construct given an IOobject and mapDistributePolyMesh
+        IOmapDistributePolyMesh(const IOobject&, const mapDistributePolyMesh&);
+
+
+    //- Destructor
+    virtual ~IOmapDistributePolyMesh();
+
+
+    // Member functions
+
+        //- ReadData function required for regIOobject read operation
+        virtual bool readData(Istream&);
+
+        //- WriteData function required for regIOobject write operation
+        virtual bool writeData(Ostream&) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 31619469d1..902e4d85bf 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,17 +40,125 @@ License
 #include "syncTools.H"
 #include "CompactListList.H"
 #include "fvMeshTools.H"
+#include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 defineTypeNameAndDebug(fvMeshDistribute, 0);
+
+//- Less function class that can be used for sorting processor patches
+class lessProcPatches
+{
+    const labelList& nbrProc_;
+    const labelList& referPatchID_;
+
+public:
+
+    lessProcPatches( const labelList& nbrProc, const labelList& referPatchID)
+    :
+        nbrProc_(nbrProc),
+        referPatchID_(referPatchID)
+    {}
+
+    bool operator()(const label a, const label b)
+    {
+        if (nbrProc_[a] < nbrProc_[b])
+        {
+            return true;
+        }
+        else if (nbrProc_[a] > nbrProc_[b])
+        {
+            return false;
+        }
+        else
+        {
+            // Equal neighbour processor
+            return referPatchID_[a] < referPatchID_[b];
+        }
+    }
+};
+
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void Foam::fvMeshDistribute::inplaceRenumberWithFlip
+(
+    const labelUList& oldToNew,
+    const bool oldToNewHasFlip,
+    const bool lstHasFlip,
+    labelUList& lst
+)
+{
+    if (!lstHasFlip && !oldToNewHasFlip)
+    {
+        Foam::inplaceRenumber(oldToNew, lst);
+    }
+    else
+    {
+        // Either input data or map encodes sign so result encodes sign
+
+        forAll(lst, elemI)
+        {
+            // Extract old value and sign
+            label val = lst[elemI];
+            label sign = 1;
+            if (lstHasFlip)
+            {
+                if (val > 0)
+                {
+                    val = val-1;
+                }
+                else if (val < 0)
+                {
+                    val = -val-1;
+                    sign = -1;
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Problem : zero value " << val
+                        << " at index " << elemI << " out of " << lst.size()
+                        << " list with flip bit" << exit(FatalError);
+                }
+            }
+
+
+            // Lookup new value and possibly change sign
+            label newVal = oldToNew[val];
+
+            if (oldToNewHasFlip)
+            {
+                if (newVal > 0)
+                {
+                    newVal = newVal-1;
+                }
+                else if (newVal < 0)
+                {
+                    newVal = -newVal-1;
+                    sign = -sign;
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Problem : zero value " << newVal
+                        << " at index " << elemI << " out of "
+                        << oldToNew.size()
+                        << " list with flip bit" << exit(FatalError);
+                }
+            }
+
+
+            // Encode new value and sign
+            lst[elemI] = sign*(newVal+1);
+        }
+    }
+}
+
+
 Foam::labelList Foam::fvMeshDistribute::select
 (
     const bool selectEqual,
@@ -98,7 +206,7 @@ void Foam::fvMeshDistribute::checkEqualWordList
     {
         if (allNames[procI] != allNames[0])
         {
-            FatalErrorIn("fvMeshDistribute::checkEqualWordList(..)")
+            FatalErrorInFunction
                 << "When checking for equal " << msg.c_str() << " :" << endl
                 << "processor0 has:" << allNames[0] << endl
                 << "processor" << procI << " has:" << allNames[procI] << endl
@@ -235,7 +343,7 @@ Foam::label Foam::fvMeshDistribute::findNonEmptyPatch() const
 
     if (nonEmptyPatchI == -1)
     {
-        FatalErrorIn("fvMeshDistribute::findNonEmptyPatch() const")
+        FatalErrorInFunction
             << "Cannot find a patch which is neither of type empty nor"
             << " coupled in patches " << patches.names() << endl
             << "There has to be at least one such patch for"
@@ -263,7 +371,7 @@ Foam::label Foam::fvMeshDistribute::findNonEmptyPatch() const
         }
         else if (procPatchI != -1)
         {
-            FatalErrorIn("fvMeshDistribute::findNonEmptyPatch() const")
+            FatalErrorInFunction
                 << "Processor patches should be at end of patch list."
                 << endl
                 << "Have processor patch " << procPatchI
@@ -277,6 +385,110 @@ Foam::label Foam::fvMeshDistribute::findNonEmptyPatch() const
 }
 
 
+Foam::tmp<Foam::surfaceScalarField> Foam::fvMeshDistribute::generateTestField
+(
+    const fvMesh& mesh
+)
+{
+    vector testNormal(1, 1, 1);
+    testNormal /= mag(testNormal);
+
+    tmp<surfaceScalarField> tfld
+    (
+        new surfaceScalarField
+        (
+            IOobject
+            (
+                "myFlux",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionedScalar("zero", dimless, 0.0)
+        )
+    );
+    surfaceScalarField& fld = tfld();
+
+    const surfaceVectorField n(mesh.Sf()/mesh.magSf());
+
+    forAll(fld, faceI)
+    {
+        fld[faceI] = (n[faceI] & testNormal);
+    }
+    forAll(fld.boundaryField(), patchI)
+    {
+        fvsPatchScalarField& fvp = fld.boundaryField()[patchI];
+
+        scalarField newPfld(fvp.size());
+        forAll(newPfld, i)
+        {
+            newPfld[i] = (n.boundaryField()[patchI][i] & testNormal);
+        }
+        fvp == newPfld;
+    }
+
+    return tfld;
+}
+
+
+void Foam::fvMeshDistribute::testField(const surfaceScalarField& fld)
+{
+    const fvMesh& mesh = fld.mesh();
+
+    vector testNormal(1, 1, 1);
+    testNormal /= mag(testNormal);
+
+    const surfaceVectorField n(mesh.Sf()/mesh.magSf());
+
+    forAll(fld, faceI)
+    {
+        scalar cos = (n[faceI] & testNormal);
+
+        if (mag(cos-fld[faceI]) > 1e-6)
+        {
+            //FatalErrorInFunction
+            WarningInFunction
+                << "On internal face " << faceI << " at "
+                << mesh.faceCentres()[faceI]
+                << " the field value is " << fld[faceI]
+                << " whereas cos angle of " << testNormal
+                << " with mesh normal " << n[faceI]
+                << " is " << cos
+                //<< exit(FatalError);
+                << endl;
+        }
+    }
+    forAll(fld.boundaryField(), patchI)
+    {
+        const fvsPatchScalarField& fvp = fld.boundaryField()[patchI];
+        const fvsPatchVectorField& np = n.boundaryField()[patchI];
+
+        forAll(fvp, i)
+        {
+            scalar cos = (np[i] & testNormal);
+
+            if (mag(cos-fvp[i]) > 1e-6)
+            {
+                label faceI = fvp.patch().start()+i;
+                //FatalErrorInFunction
+                WarningInFunction
+                    << "On face " << faceI
+                    << " on patch " << fvp.patch().name()
+                    << " at " << mesh.faceCentres()[faceI]
+                    << " the field value is " << fvp[i]
+                    << " whereas cos angle of " << testNormal
+                    << " with mesh normal " << np[i]
+                    << " is " << cos
+                    //<< exit(FatalError);
+                    << endl;
+            }
+        }
+    }
+}
+
+
 // Delete all processor patches. Move any processor faces into the last
 // non-processor patch.
 Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::deleteProcPatches
@@ -443,10 +655,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
 
         if (index != -1)
         {
-            FatalErrorIn
-            (
-                "fvMeshDistribute::repatch(const labelList&, labelListList&)"
-            )   << "reverseFaceMap contains -1 at index:"
+            FatalErrorInFunction
+                << "reverseFaceMap contains -1 at index:"
                 << index << endl
                 << "This means that the repatch operation was not just"
                 << " a shuffle?" << abort(FatalError);
@@ -455,10 +665,15 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
 
     forAll(constructFaceMap, procI)
     {
-        inplaceRenumber(map().reverseFaceMap(), constructFaceMap[procI]);
+        inplaceRenumberWithFlip
+        (
+            map().reverseFaceMap(),
+            false,
+            true,
+            constructFaceMap[procI]
+        );
     }
 
-
     return map;
 }
 
@@ -520,7 +735,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::mergeSharedPoints
             }
             else
             {
-                FatalErrorIn("fvMeshDistribute::mergeSharedPoints()")
+                FatalErrorInFunction
                     << "Problem. oldPointI:" << oldPointI
                     << " newPointI:" << newPointI << abort(FatalError);
             }
@@ -886,18 +1101,52 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::doRemoveCells
         meshMod
     );
 
+
+    //// Generate test field
+    //tmp<surfaceScalarField> sfld(generateTestField(mesh_));
+
+    // Save internal fields (note: not as DimensionedFields since would
+    // get mapped)
+    PtrList<Field<scalar> > sFlds;
+    saveInternalFields(sFlds);
+    PtrList<Field<vector> > vFlds;
+    saveInternalFields(vFlds);
+    PtrList<Field<sphericalTensor> > sptFlds;
+    saveInternalFields(sptFlds);
+    PtrList<Field<symmTensor> > sytFlds;
+    saveInternalFields(sytFlds);
+    PtrList<Field<tensor> > tFlds;
+    saveInternalFields(tFlds);
+
     // Change the mesh. No inflation. Note: no parallel comms allowed.
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, false);
 
     // Update fields
     mesh_.updateMesh(map);
 
+
+    // Any exposed faces in a surfaceField will not be mapped. Map the value
+    // of these separately (until there is support in all PatchFields for
+    // mapping from internal faces ...)
+
+    mapExposedFaces(map(), sFlds);
+    mapExposedFaces(map(), vFlds);
+    mapExposedFaces(map(), sptFlds);
+    mapExposedFaces(map(), sytFlds);
+    mapExposedFaces(map(), tFlds);
+
+
+    //// Test test field
+    //testField(sfld);
+
+
     // Move mesh (since morphing does not do this)
     if (map().hasMotionPoints())
     {
         mesh_.movePoints(map().preMotionPoints());
     }
 
+
     return map;
 }
 
@@ -915,10 +1164,18 @@ void Foam::fvMeshDistribute::addProcPatches
     // contain for all current boundary faces the global patchID (for non-proc
     // patch) or the processor.
 
+    // Determine a visit order such that the processor patches get added
+    // in order of increasing neighbour processor (and for same neighbour
+    // processor (in case of processor cyclics) in order of increasing
+    // 'refer' patch)
+    labelList indices;
+    sortedOrder(nbrProc, indices, lessProcPatches(nbrProc, referPatchID));
+
     procPatchID.setSize(Pstream::nProcs());
 
-    forAll(nbrProc, bFaceI)
+    forAll(indices, i)
     {
+        label bFaceI = indices[i];
         label procI = nbrProc[bFaceI];
 
         if (procI != -1 && procI != Pstream::myProcNo())
@@ -946,7 +1203,7 @@ void Foam::fvMeshDistribute::addProcPatches
                         mesh_.boundaryMesh().size(),
                         mesh_.boundaryMesh(),
                         Pstream::myProcNo(),
-                        nbrProc[bFaceI]
+                        procI
                     );
 
                     procPatchID[procI].insert
@@ -989,7 +1246,7 @@ void Foam::fvMeshDistribute::addProcPatches
                         mesh_.boundaryMesh().size(),
                         mesh_.boundaryMesh(),
                         Pstream::myProcNo(),
-                        nbrProc[bFaceI],
+                        procI,
                         cycName,
                         pcPatch.transform()
                     );
@@ -1340,7 +1597,7 @@ Foam::labelList Foam::fvMeshDistribute::countCells
 
         if (newProc < 0 || newProc >= Pstream::nProcs())
         {
-            FatalErrorIn("fvMeshDistribute::distribute(const labelList&)")
+            FatalErrorInFunction
                 << "Distribution should be in range 0.." << Pstream::nProcs()-1
                 << endl
                 << "At index " << cellI << " distribution:" << newProc
@@ -1360,7 +1617,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     // Some checks on distribution
     if (distribution.size() != mesh_.nCells())
     {
-        FatalErrorIn("fvMeshDistribute::distribute(const labelList&)")
+        FatalErrorInFunction
             << "Size of distribution:"
             << distribution.size() << " mesh nCells:" << mesh_.nCells()
             << abort(FatalError);
@@ -1372,7 +1629,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     // Check all processors have same non-proc patches in same order.
     if (patches.checkParallelSync(true))
     {
-        FatalErrorIn("fvMeshDistribute::distribute(const labelList&)")
+        FatalErrorInFunction
             << "This application requires all non-processor patches"
             << " to be present in the same order on all patches" << nl
             << "followed by the processor patches (which of course are unique)."
@@ -1524,7 +1781,33 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     const wordList surfTensors(mesh_.names(surfaceTensorField::typeName));
     checkEqualWordList("surfaceTensorFields", surfTensors);
 
+    typedef volScalarField::DimensionedInternalField dimScalType;
+    const wordList dimScalars(mesh_.names(dimScalType::typeName));
+    checkEqualWordList("volScalarField::DimensionedInternalField", dimScalars);
 
+    typedef volVectorField::DimensionedInternalField dimVecType;
+    const wordList dimVectors(mesh_.names(dimVecType::typeName));
+    checkEqualWordList("volVectorField::DimensionedInternalField", dimVectors);
+
+    typedef volSphericalTensorField::DimensionedInternalField dimSphereType;
+    const wordList dimSphereTensors(mesh_.names(dimSphereType::typeName));
+    checkEqualWordList
+    (
+        "volSphericalTensorField::DimensionedInternalField",
+        dimSphereTensors
+    );
+
+    typedef volSymmTensorField::DimensionedInternalField dimSymmTensorType;
+    const wordList dimSymmTensors(mesh_.names(dimSymmTensorType::typeName));
+    checkEqualWordList
+    (
+        "volSymmTensorField::DimensionedInternalField",
+        dimSymmTensors
+    );
+
+    typedef volTensorField::DimensionedInternalField dimTensorType;
+    const wordList dimTensors(mesh_.names(dimTensorType::typeName));
+    checkEqualWordList("volTensorField::DimensionedInternalField", dimTensors);
 
 
     // Find patch to temporarily put exposed and processor faces into.
@@ -1650,10 +1933,13 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
             );
 
             subCellMap[recvProc] = subsetter.cellMap();
-            subFaceMap[recvProc] = renumber
+            subFaceMap[recvProc] = subsetter.faceFlipMap();
+            inplaceRenumberWithFlip
             (
                 repatchFaceMap,
-                subsetter.faceMap()
+                false,      // oldToNew has flip
+                true,       // subFaceMap has flip
+                subFaceMap[recvProc]
             );
             subPointMap[recvProc] = subsetter.pointMap();
             subPatchMap[recvProc] = subsetter.patchMap();
@@ -1705,6 +1991,8 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                 procSourceNewNbrProc,
                 str
             );
+
+            // volFields
             sendFields<volScalarField>(recvProc, volScalars, subsetter, str);
             sendFields<volVectorField>(recvProc, volVectors, subsetter, str);
             sendFields<volSphericalTensorField>
@@ -1723,6 +2011,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
             );
             sendFields<volTensorField>(recvProc, volTensors, subsetter, str);
 
+            // surfaceFields
             sendFields<surfaceScalarField>
             (
                 recvProc,
@@ -1758,6 +2047,43 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                 subsetter,
                 str
             );
+
+            // dimensionedFields
+            sendFields<volScalarField::DimensionedInternalField>
+            (
+                recvProc,
+                dimScalars,
+                subsetter,
+                str
+            );
+            sendFields<volVectorField::DimensionedInternalField>
+            (
+                recvProc,
+                dimVectors,
+                subsetter,
+                str
+            );
+            sendFields<volSphericalTensorField::DimensionedInternalField>
+            (
+                recvProc,
+                dimSphereTensors,
+                subsetter,
+                str
+            );
+            sendFields<volSymmTensorField::DimensionedInternalField>
+            (
+                recvProc,
+                dimSymmTensors,
+                subsetter,
+                str
+            );
+            sendFields<volTensorField::DimensionedInternalField>
+            (
+                recvProc,
+                dimTensors,
+                subsetter,
+                str
+            );
         }
     }
 
@@ -1795,12 +2121,24 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
             repatchFaceMap,
             subMap().faceMap()
         );
+        // Insert the sign bit from face flipping
+        labelList& faceMap = subFaceMap[Pstream::myProcNo()];
+        forAll(faceMap, faceI)
+        {
+            faceMap[faceI] += 1;
+        }
+        const labelHashSet& flip = subMap().flipFaceFlux();
+        forAllConstIter(labelHashSet, flip, iter)
+        {
+            label faceI = iter.key();
+            faceMap[faceI] = -faceMap[faceI];
+        }
         subPointMap[Pstream::myProcNo()] = subMap().pointMap();
         subPatchMap[Pstream::myProcNo()] = identity(patches.size());
 
         // Initialize all addressing into current mesh
         constructCellMap[Pstream::myProcNo()] = identity(mesh_.nCells());
-        constructFaceMap[Pstream::myProcNo()] = identity(mesh_.nFaces());
+        constructFaceMap[Pstream::myProcNo()] = identity(mesh_.nFaces()) + 1;
         constructPointMap[Pstream::myProcNo()] = identity(mesh_.nPoints());
         constructPatchMap[Pstream::myProcNo()] = identity(patches.size());
 
@@ -1896,17 +2234,26 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
             labelList domainSourceNewNbrProc;
 
             autoPtr<fvMesh> domainMeshPtr;
+
             PtrList<volScalarField> vsf;
             PtrList<volVectorField> vvf;
             PtrList<volSphericalTensorField> vsptf;
             PtrList<volSymmTensorField> vsytf;
             PtrList<volTensorField> vtf;
+
             PtrList<surfaceScalarField> ssf;
             PtrList<surfaceVectorField> svf;
             PtrList<surfaceSphericalTensorField> ssptf;
             PtrList<surfaceSymmTensorField> ssytf;
             PtrList<surfaceTensorField> stf;
 
+            PtrList<volScalarField::DimensionedInternalField> dsf;
+            PtrList<volVectorField::DimensionedInternalField> dvf;
+            PtrList<volSphericalTensorField::DimensionedInternalField> dstf;
+            PtrList<volSymmTensorField::DimensionedInternalField> dsytf;
+            PtrList<volTensorField::DimensionedInternalField> dtf;
+
+
             // Opposite of sendMesh
             {
                 domainMeshPtr = receiveMesh
@@ -1932,6 +2279,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                 // of problems reading consecutive fields from single stream.
                 dictionary fieldDicts(str);
 
+                // Vol fields
                 receiveFields<volScalarField>
                 (
                     sendProc,
@@ -1973,6 +2321,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                     fieldDicts.subDict(volTensorField::typeName)
                 );
 
+                // Surface fields
                 receiveFields<surfaceScalarField>
                 (
                     sendProc,
@@ -2013,12 +2362,70 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                     stf,
                     fieldDicts.subDict(surfaceTensorField::typeName)
                 );
+
+                // Dimensioned fields
+                receiveFields<volScalarField::DimensionedInternalField>
+                (
+                    sendProc,
+                    dimScalars,
+                    domainMesh,
+                    dsf,
+                    fieldDicts.subDict
+                    (
+                        volScalarField::DimensionedInternalField::typeName
+                    )
+                );
+                receiveFields<volVectorField::DimensionedInternalField>
+                (
+                    sendProc,
+                    dimVectors,
+                    domainMesh,
+                    dvf,
+                    fieldDicts.subDict
+                    (
+                        volVectorField::DimensionedInternalField::typeName
+                    )
+                );
+                receiveFields<volSphericalTensorField::DimensionedInternalField>
+                (
+                    sendProc,
+                    dimSphereTensors,
+                    domainMesh,
+                    dstf,
+                    fieldDicts.subDict
+                    (
+                        volSphericalTensorField::DimensionedInternalField::
+                        typeName
+                    )
+                );
+                receiveFields<volSymmTensorField::DimensionedInternalField>
+                (
+                    sendProc,
+                    dimSymmTensors,
+                    domainMesh,
+                    dsytf,
+                    fieldDicts.subDict
+                    (
+                        volSymmTensorField::DimensionedInternalField::typeName
+                    )
+                );
+                receiveFields<volTensorField::DimensionedInternalField>
+                (
+                    sendProc,
+                    dimTensors,
+                    domainMesh,
+                    dtf,
+                    fieldDicts.subDict
+                    (
+                        volTensorField::DimensionedInternalField::typeName
+                    )
+                );
             }
             const fvMesh& domainMesh = domainMeshPtr();
 
 
             constructCellMap[sendProc] = identity(domainMesh.nCells());
-            constructFaceMap[sendProc] = identity(domainMesh.nFaces());
+            constructFaceMap[sendProc] = identity(domainMesh.nFaces()) + 1;
             constructPointMap[sendProc] = identity(domainMesh.nPoints());
             constructPatchMap[sendProc] =
                 identity(domainMesh.boundaryMesh().size());
@@ -2129,28 +2536,76 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                 domainSourceNewNbrProc
             );
 
-            // Update all addressing so xxProcAddressing points to correct item
-            // in masterMesh.
+            // Update all addressing so xxProcAddressing points to correct
+            // item in masterMesh.
             const labelList& oldCellMap = map().oldCellMap();
             const labelList& oldFaceMap = map().oldFaceMap();
             const labelList& oldPointMap = map().oldPointMap();
             const labelList& oldPatchMap = map().oldPatchMap();
 
+            //Note: old mesh faces never flipped!
             forAll(constructPatchMap, procI)
             {
                 if (procI != sendProc && constructPatchMap[procI].size())
                 {
                     // Processor already in mesh (either myProcNo or received)
                     inplaceRenumber(oldCellMap, constructCellMap[procI]);
-                    inplaceRenumber(oldFaceMap, constructFaceMap[procI]);
+                    inplaceRenumberWithFlip
+                    (
+                        oldFaceMap,
+                        false,
+                        true,
+                        constructFaceMap[procI]
+                    );
                     inplaceRenumber(oldPointMap, constructPointMap[procI]);
                     inplaceRenumber(oldPatchMap, constructPatchMap[procI]);
                 }
             }
 
+
+            labelHashSet flippedAddedFaces;
+            {
+                // Find out if any faces of domain mesh were flipped (boundary
+                // faces becoming internal)
+                label nBnd = domainMesh.nFaces()-domainMesh.nInternalFaces();
+                flippedAddedFaces.resize(nBnd/4);
+
+                for
+                (
+                    label domainFaceI = domainMesh.nInternalFaces();
+                    domainFaceI < domainMesh.nFaces();
+                    domainFaceI++
+                )
+                {
+                    label newFaceI = map().addedFaceMap()[domainFaceI];
+                    label newCellI = mesh_.faceOwner()[newFaceI];
+
+                    label domainCellI = domainMesh.faceOwner()[domainFaceI];
+
+                    if (newCellI != map().addedCellMap()[domainCellI])
+                    {
+                        flippedAddedFaces.insert(domainFaceI);
+                    }
+                }
+            }
+
+
             // Added processor
             inplaceRenumber(map().addedCellMap(), constructCellMap[sendProc]);
-            inplaceRenumber(map().addedFaceMap(), constructFaceMap[sendProc]);
+            // Add flip
+            forAllConstIter(labelHashSet, flippedAddedFaces, iter)
+            {
+                label domainFaceI = iter.key();
+                label& val = constructFaceMap[sendProc][domainFaceI];
+                val = -val;
+            }
+            inplaceRenumberWithFlip
+            (
+                map().addedFaceMap(),
+                false,
+                true,           // constructFaceMap has flip sign
+                constructFaceMap[sendProc]
+            );
             inplaceRenumber(map().addedPointMap(), constructPointMap[sendProc]);
             inplaceRenumber(map().addedPatchMap(), constructPatchMap[sendProc]);
 
@@ -2260,35 +2715,6 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
         pTraits<tensor>::zero
     );
 
-    initPatchFields<surfaceScalarField, processorFvsPatchField<scalar> >
-    (
-        pTraits<scalar>::zero
-    );
-    initPatchFields<surfaceVectorField, processorFvsPatchField<vector> >
-    (
-        pTraits<vector>::zero
-    );
-    initPatchFields
-    <
-        surfaceSphericalTensorField,
-        processorFvsPatchField<sphericalTensor>
-    >
-    (
-        pTraits<sphericalTensor>::zero
-    );
-    initPatchFields
-    <
-        surfaceSymmTensorField,
-        processorFvsPatchField<symmTensor>
-    >
-    (
-        pTraits<symmTensor>::zero
-    );
-    initPatchFields<surfaceTensorField, processorFvsPatchField<tensor> >
-    (
-        pTraits<tensor>::zero
-    );
-
 
     mesh_.setInstance(mesh_.time().timeName());
 
@@ -2332,7 +2758,10 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
             constructPointMap.xfer(),
             constructFaceMap.xfer(),
             constructCellMap.xfer(),
-            constructPatchMap.xfer()
+            constructPatchMap.xfer(),
+
+            true,           // subFaceMap has flip
+            true            // constructFaceMap has flip
         )
     );
 }
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index a469d99d13..b3d3a47656 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,6 +82,14 @@ class fvMeshDistribute
 
     // Private Member Functions
 
+        static void inplaceRenumberWithFlip
+        (
+            const labelUList& oldToNew,
+            const bool oldToNewHasFlip,
+            const bool lstHasFlip,
+            labelUList& lst
+        );
+
         //- Find indices with value
         static labelList select
         (
@@ -117,6 +125,21 @@ class fvMeshDistribute
                 const PtrList<FieldField<fvsPatchField, T> >& oldBflds
             );
 
+            //- Save internal fields of surfaceFields
+            template<class T>
+            void saveInternalFields
+            (
+                PtrList<Field<T> >& iflds
+            ) const;
+
+            //- Set value of patch faces resulting from internal faces
+            template<class T>
+            void mapExposedFaces
+            (
+                const mapPolyMesh& map,
+                const PtrList<Field<T> >& oldFlds
+            );
+
             //- Init patch fields of certain type
             template<class GeoField, class PatchFieldType>
             void initPatchFields
@@ -337,6 +360,12 @@ public:
 
             //- Print some info on mesh.
             static void printMeshInfo(const fvMesh&);
+
+            //- Generate a test field on faces
+            static tmp<surfaceScalarField> generateTestField(const fvMesh&);
+
+            //- Check whether field consistent with face orientation
+            static void testField(const surfaceScalarField&);
 };
 
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index c97df63b4a..6d4f6d64f1 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -104,7 +104,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
 
     if (flds.size() != oldBflds.size())
     {
-        FatalErrorIn("fvMeshDistribute::mapBoundaryFields(..)") << "problem"
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
@@ -113,8 +113,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
     forAllIter(typename HashTable<fldType*>, flds, iter)
     {
         fldType& fld = *iter();
-        typename fldType::GeometricBoundaryField& bfld =
-            fld.boundaryField();
+        typename fldType::GeometricBoundaryField& bfld = fld.boundaryField();
 
         const FieldField<fvsPatchField, T>& oldBfld = oldBflds[fieldI++];
 
@@ -145,6 +144,95 @@ void Foam::fvMeshDistribute::mapBoundaryFields
 }
 
 
+template<class T>
+void Foam::fvMeshDistribute::saveInternalFields
+(
+    PtrList<Field<T> >& iflds
+) const
+{
+    typedef GeometricField<T, fvsPatchField, surfaceMesh> fldType;
+
+    HashTable<const fldType*> flds
+    (
+        static_cast<const fvMesh&>(mesh_).objectRegistry::lookupClass<fldType>()
+    );
+
+    iflds.setSize(flds.size());
+
+    label i = 0;
+
+    forAllConstIter(typename HashTable<const fldType*>, flds, iter)
+    {
+        const fldType& fld = *iter();
+
+        iflds.set(i, fld.internalField().clone());
+
+        i++;
+    }
+}
+
+
+// Set boundary values of exposed internal faces
+template<class T>
+void Foam::fvMeshDistribute::mapExposedFaces
+(
+    const mapPolyMesh& map,
+    const PtrList<Field<T> >& oldFlds
+)
+{
+    const labelList& faceMap = map.faceMap();
+
+    typedef GeometricField<T, fvsPatchField, surfaceMesh> fldType;
+
+    HashTable<fldType*> flds
+    (
+        mesh_.objectRegistry::lookupClass<fldType>()
+    );
+
+    if (flds.size() != oldFlds.size())
+    {
+        FatalErrorInFunction
+            << "problem"
+            << abort(FatalError);
+    }
+
+
+    label fieldI = 0;
+
+    forAllIter(typename HashTable<fldType*>, flds, iter)
+    {
+        fldType& fld = *iter();
+        typename fldType::GeometricBoundaryField& bfld = fld.boundaryField();
+
+        const Field<T>& oldInternal = oldFlds[fieldI++];
+
+        // Pull from old internal field into bfld.
+
+        forAll(bfld, patchI)
+        {
+            fvsPatchField<T>& patchFld = bfld[patchI];
+
+            forAll(patchFld, i)
+            {
+                const label faceI = patchFld.patch().start()+i;
+
+                label oldFaceI = faceMap[faceI];
+
+                if (oldFaceI < oldInternal.size())
+                {
+                    patchFld[i] = oldInternal[oldFaceI];
+
+                    if (map.flipFaceFlux().found(faceI))
+                    {
+                        patchFld[i] = flipOp()(patchFld[i]);
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 // Init patch fields of certain type
 template<class GeoField, class PatchFieldType>
 void Foam::fvMeshDistribute::initPatchFields
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
similarity index 90%
rename from src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
rename to src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 3a377e2ffa..af93d97f20 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,9 @@ Description
 #include "emptyPolyPatch.H"
 #include "demandDrivenData.H"
 #include "cyclicPolyPatch.H"
+#include "removeCells.H"
+#include "polyTopoChange.H"
+#include "mapPolyMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,8 +49,7 @@ bool Foam::fvMeshSubset::checkCellSubset() const
 {
     if (fvMeshSubsetPtr_.empty())
     {
-        FatalErrorIn("bool fvMeshSubset::checkCellSubset() const")
-            << "Mesh subset not set.  Please set the cell map using "
+        FatalErrorInFunction
             << "void setCellSubset(const labelHashSet& cellsToSubset)" << endl
             << "before attempting to access subset data"
             << abort(FatalError);
@@ -354,6 +356,39 @@ void Foam::fvMeshSubset::subsetZones()
 }
 
 
+Foam::labelList Foam::fvMeshSubset::getCellsToRemove
+(
+    const labelList& region,
+    const label currentRegion
+) const
+{
+    // Count
+    label nKeep = 0;
+    forAll(region, cellI)
+    {
+        if (region[cellI] == currentRegion)
+        {
+            nKeep++;
+        }
+    }
+
+    // Collect cells to remove
+    label nRemove = baseMesh().nCells() - nKeep;
+    labelList cellsToRemove(nRemove);
+
+    nRemove = 0;
+    forAll(region, cellI)
+    {
+        if (region[cellI] != currentRegion)
+        {
+            cellsToRemove[nRemove++] = cellI;
+        }
+    }
+
+    return cellsToRemove;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from components
@@ -364,7 +399,8 @@ Foam::fvMeshSubset::fvMeshSubset(const fvMesh& baseMesh)
     pointMap_(0),
     faceMap_(0),
     cellMap_(0),
-    patchMap_(0)
+    patchMap_(0),
+    faceFlipMapPtr_()
 {}
 
 
@@ -394,16 +430,17 @@ void Foam::fvMeshSubset::setCellSubset
     }
     else if (wantedPatchID < 0 || wantedPatchID >= oldPatches.size())
     {
-        FatalErrorIn
-        (
-            "fvMeshSubset::setCellSubset(const labelHashSet&"
-            ", const label patchID)"
-        )   << "Non-existing patch index " << wantedPatchID << endl
+        FatalErrorInFunction
+            << "Non-existing patch index " << wantedPatchID << endl
             << "Should be between 0 and " << oldPatches.size()-1
             << abort(FatalError);
     }
 
 
+    // Clear demand driven data
+    faceFlipMapPtr_.clear();
+
+
     cellMap_ = globalCellMap.toc();
 
     // Sort the cell map in the ascending order
@@ -774,11 +811,8 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     if (region.size() != oldCells.size())
     {
-        FatalErrorIn
-        (
-            "fvMeshSubset::setCellSubset(const labelList&"
-            ", const label, const label, const bool)"
-        )   << "Size of region " << region.size()
+        FatalErrorInFunction
+            << "Size of region " << region.size()
             << " is not equal to number of cells in mesh " << oldCells.size()
             << abort(FatalError);
     }
@@ -794,15 +828,14 @@ void Foam::fvMeshSubset::setLargeCellSubset
     }
     else if (wantedPatchID < 0 || wantedPatchID >= oldPatches.size())
     {
-        FatalErrorIn
-        (
-            "fvMeshSubset::setCellSubset(const labelList&"
-            ", const label, const label, const bool)"
-        )   << "Non-existing patch index " << wantedPatchID << endl
+        FatalErrorInFunction
+            << "Non-existing patch index " << wantedPatchID << endl
             << "Should be between 0 and " << oldPatches.size()-1
             << abort(FatalError);
     }
 
+    // Clear demand driven data
+    faceFlipMapPtr_.clear();
 
     // Get the cells for the current region.
     cellMap_.setSize(oldCells.size());
@@ -1045,11 +1078,8 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     if (faceI != nFacesInSet)
     {
-        FatalErrorIn
-        (
-            "fvMeshSubset::setCellSubset(const labelList&"
-            ", const label, const label, const bool)"
-        )   << "Problem" << abort(FatalError);
+        FatalErrorInFunction
+            << "Problem" << abort(FatalError);
     }
 
 
@@ -1371,6 +1401,68 @@ void Foam::fvMeshSubset::setLargeCellSubset
 }
 
 
+Foam::labelList Foam::fvMeshSubset::getExposedFaces
+(
+    const labelList& region,
+    const label currentRegion,
+    const bool syncCouples
+) const
+{
+    // Collect cells to remove
+    labelList cellsToRemove(getCellsToRemove(region, currentRegion));
+
+    return removeCells(baseMesh(), syncCouples).getExposedFaces(cellsToRemove);
+}
+
+
+void Foam::fvMeshSubset::setLargeCellSubset
+(
+    const labelList& region,
+    const label currentRegion,
+    const labelList& exposedFaces,
+    const labelList& patchIDs,
+    const bool syncCouples
+)
+{
+    // Collect cells to remove
+    labelList cellsToRemove(getCellsToRemove(region, currentRegion));
+
+    // Mesh changing engine.
+    polyTopoChange meshMod(baseMesh());
+
+    removeCells cellRemover(baseMesh(), syncCouples);
+
+    cellRemover.setRefinement
+    (
+        cellsToRemove,
+        exposedFaces,
+        patchIDs,
+        meshMod
+    );
+
+    // Create mesh, return map from old to new mesh.
+    autoPtr<mapPolyMesh> map = meshMod.makeMesh
+    (
+        fvMeshSubsetPtr_,
+        IOobject
+        (
+            baseMesh().name(),
+            baseMesh().time().timeName(),
+            baseMesh().time(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        baseMesh(),
+        syncCouples
+    );
+
+    pointMap_ = map().pointMap();
+    faceMap_ = map().faceMap();
+    cellMap_ = map().cellMap();
+    patchMap_ = identity(baseMesh().boundaryMesh().size());
+}
+
+
 bool Foam::fvMeshSubset::hasSubMesh() const
 {
     return fvMeshSubsetPtr_.valid();
@@ -1409,6 +1501,44 @@ const labelList& Foam::fvMeshSubset::faceMap() const
 }
 
 
+const labelList& Foam::fvMeshSubset::faceFlipMap() const
+{
+    if (!faceFlipMapPtr_.valid())
+    {
+        const labelList& subToBaseFace = faceMap();
+        const labelList& subToBaseCell = cellMap();
+
+        faceFlipMapPtr_.reset(new labelList(subToBaseFace.size()));
+        labelList& faceFlipMap = faceFlipMapPtr_();
+
+        // Only exposed internal faces might be flipped (since we don't do
+        // any cell renumbering, just compacting)
+        label subInt = subMesh().nInternalFaces();
+        const labelList& subOwn = subMesh().faceOwner();
+        const labelList& own = baseMesh_.faceOwner();
+
+        for (label subFaceI = 0; subFaceI < subInt; subFaceI++)
+        {
+            faceFlipMap[subFaceI] = subToBaseFace[subFaceI]+1;
+        }
+        for (label subFaceI = subInt; subFaceI < subOwn.size(); subFaceI++)
+        {
+            label faceI = subToBaseFace[subFaceI];
+            if (subToBaseCell[subOwn[subFaceI]] == own[faceI])
+            {
+                faceFlipMap[subFaceI] = faceI+1;
+            }
+            else
+            {
+                faceFlipMap[subFaceI] = -faceI-1;
+            }
+        }
+    }
+
+    return faceFlipMapPtr_();
+}
+
+
 const labelList& Foam::fvMeshSubset::cellMap() const
 {
     checkCellSubset();
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
similarity index 74%
rename from src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
rename to src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
index 5f2a281d06..792825ce6c 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,10 +41,12 @@ Description
       a face on a coupled patch 'losing' its neighbour it will move the
       face into the oldInternalFaces patch.
 
-    - if a user supplied patch is used the mapping becomes a problem.
-    Do the new faces get the value of the internal face they came from?
-    What if e.g. the user supplied patch is a fixedValue 0? So for now
-    they get the face of existing patch face 0.
+    - if a user supplied patch is used it is up to the destination
+      patchField to handle exposed internal faces (mapping from face -1).
+      If not provided the default is to assign the internalField. All the
+      basic patch field types (e.g. fixedValue) will give a warning and
+      preferably derived patch field types should be used that know how to
+      handle exposed faces (e.g. use uniformFixedValue instead of fixedValue)
 
 SourceFiles
     fvMeshSubset.C
@@ -94,6 +96,8 @@ private:
         //- Patch mapping array
         labelList patchMap_;
 
+        mutable autoPtr<labelList> faceFlipMapPtr_;
+
 
     // Private Member Functions
 
@@ -124,6 +128,13 @@ private:
         //- Create zones for submesh
         void subsetZones();
 
+        //- Helper: extract cells-to-remove from cells-to-keep
+        labelList getCellsToRemove
+        (
+            const labelList& region,
+            const label currentRegion
+        ) const;
+
         //- Disallow default bitwise copy construct
         fvMeshSubset(const fvMeshSubset&);
 
@@ -174,6 +185,32 @@ public:
             );
 
 
+            //- Two step subsetting
+
+                //- Get labels of exposed faces.
+                //  These are
+                //  - internal faces that become boundary faces
+                //  - coupled faces that become uncoupled (since one of the
+                //    sides gets deleted)
+                labelList getExposedFaces
+                (
+                    const labelList& region,
+                    const label currentRegion,
+                    const bool syncCouples = true
+                ) const;
+
+                //- For every exposed face (from above getExposedFaces)
+                //  used supplied (existing!) patch
+                void setLargeCellSubset
+                (
+                    const labelList& region,
+                    const label currentRegion,
+                    const labelList& exposedFaces,
+                    const labelList& patchIDs,
+                    const bool syncCouples = true
+                );
+
+
         // Access
 
             //- Original mesh
@@ -196,6 +233,9 @@ public:
             //- Return face map
             const labelList& faceMap() const;
 
+            //- Return face map with sign to encode flipped faces
+            const labelList& faceFlipMap() const;
+
             //- Return cell map
             const labelList& cellMap() const;
 
@@ -224,7 +264,8 @@ public:
                 const GeometricField<Type, fvPatchField, volMesh>&
             ) const;
 
-            //- Map surface field
+            //- Map surface field. Optionally negates value if flipping
+            //  a face (from exposing an internal face)
             template<class Type>
             static tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
             interpolate
@@ -232,14 +273,17 @@ public:
                 const GeometricField<Type, fvsPatchField, surfaceMesh>&,
                 const fvMesh& sMesh,
                 const labelList& patchMap,
-                const labelList& faceMap
+                const labelList& cellMap,
+                const labelList& faceMap,
+                const bool negateIfFlipped = true
             );
 
             template<class Type>
             tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
             interpolate
             (
-                const GeometricField<Type, fvsPatchField, surfaceMesh>&
+                const GeometricField<Type, fvsPatchField, surfaceMesh>&,
+                const bool negateIfFlipped = true
             ) const;
 
             //- Map point field
@@ -259,6 +303,24 @@ public:
             (
                 const GeometricField<Type, pointPatchField, pointMesh>&
             ) const;
+
+            //- Map dimensioned fields
+            template<class Type>
+            static tmp<DimensionedField<Type, volMesh> >
+            interpolate
+            (
+                const DimensionedField<Type, volMesh>&,
+                const fvMesh& sMesh,
+                const labelList& cellMap
+            );
+
+            template<class Type>
+            tmp<DimensionedField<Type, volMesh> >
+            interpolate
+            (
+                const DimensionedField<Type, volMesh>&
+            ) const;
+
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
similarity index 89%
rename from src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
rename to src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index 7881194818..e987136f36 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ License
 #include "emptyFvPatchFields.H"
 #include "directFvPatchFieldMapper.H"
 #include "directPointPatchFieldMapper.H"
+#include "flipOp.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -178,7 +179,9 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
     const GeometricField<Type, fvsPatchField, surfaceMesh>& vf,
     const fvMesh& sMesh,
     const labelList& patchMap,
-    const labelList& faceMap
+    const labelList& cellMap,
+    const labelList& faceMap,
+    const bool negateIfFlipped
 )
 {
     // 1. Create the complete field with dummy patch fields
@@ -297,14 +300,24 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
             // Postprocess patch field for exposed faces
 
             fvsPatchField<Type>& pfld = bf[patchI];
+            const labelUList& fc = bf[patchI].patch().faceCells();
+            const labelList& own = vf.mesh().faceOwner();
 
             forAll(pfld, i)
             {
                 label baseFaceI = faceMap[subPatch.start()+i];
                 if (baseFaceI < vf.internalField().size())
                 {
-                    // Exposed internal face
-                    pfld[i] = vf.internalField()[baseFaceI];
+                    Type val = vf.internalField()[baseFaceI];
+
+                    if (cellMap[fc[i]] == own[baseFaceI] || !negateIfFlipped)
+                    {
+                        pfld[i] = val;
+                    }
+                    else
+                    {
+                        pfld[i] = flipOp()(val);
+                    }
                 }
                 else
                 {
@@ -329,7 +342,8 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
 template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
+    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf,
+    const bool negateIfFlipped
 ) const
 {
     return interpolate
@@ -337,7 +351,9 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
         sf,
         subMesh(),
         patchMap(),
-        faceMap()
+        cellMap(),
+        faceMap(),
+        negateIfFlipped
     );
 }
 
@@ -489,6 +505,47 @@ tmp<GeometricField<Type, pointPatchField, pointMesh> > fvMeshSubset::interpolate
 }
 
 
+template<class Type>
+tmp<DimensionedField<Type, volMesh> > fvMeshSubset::interpolate
+(
+    const DimensionedField<Type, volMesh>& df,
+    const fvMesh& sMesh,
+    const labelList& cellMap
+)
+{
+    // Create the complete field from the pieces
+    tmp<DimensionedField<Type, volMesh> > tresF
+    (
+        new DimensionedField<Type, volMesh>
+        (
+            IOobject
+            (
+                "subset"+df.name(),
+                sMesh.time().timeName(),
+                sMesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            sMesh,
+            df.dimensions(),
+            Field<Type>(df, cellMap)
+        )
+    );
+
+    return tresF;
+}
+
+
+template<class Type>
+tmp<DimensionedField<Type, volMesh> > fvMeshSubset::interpolate
+(
+    const DimensionedField<Type, volMesh>& df
+) const
+{
+    return interpolate(df, subMesh(), cellMap());
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.C b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
index 682a96422e..ecbe00325d 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.C
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,6 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvMeshTools.H"
+#include "processorCyclicPolyPatch.H"
+#include "polyBoundaryMeshEntries.H"
 #include "fvMeshTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -282,7 +285,7 @@ void Foam::fvMeshTools::trimPatches(fvMesh& mesh, const label nPatches)
 
     if (polyPatches.empty())
     {
-        FatalErrorIn("fvMeshTools::trimPatches(fvMesh&, const label)")
+        FatalErrorInFunction
             << "No patches in mesh"
             << abort(FatalError);
     }
@@ -296,7 +299,7 @@ void Foam::fvMeshTools::trimPatches(fvMesh& mesh, const label nPatches)
 
     if (nFaces)
     {
-        FatalErrorIn("fvMeshTools::trimPatches(fvMesh&, const label)")
+        FatalErrorInFunction
             << "There are still " << nFaces
             << " faces in " << polyPatches.size()-nPatches
             << " patches to be deleted" << abort(FatalError);
@@ -352,4 +355,264 @@ void Foam::fvMeshTools::reorderPatches
 }
 
 
+Foam::autoPtr<Foam::fvMesh> Foam::fvMeshTools::newMesh
+(
+    const IOobject& io,
+    const bool masterOnlyReading
+)
+{
+    // Region name
+    // ~~~~~~~~~~~
+
+    fileName meshSubDir;
+
+    if (io.name() == polyMesh::defaultRegion)
+    {
+        meshSubDir = polyMesh::meshSubDir;
+    }
+    else
+    {
+        meshSubDir = io.name()/polyMesh::meshSubDir;
+    }
+
+
+    fileName facesInstance;
+
+    // Patch types
+    // ~~~~~~~~~~~
+    // Read and scatter master patches (without reading master mesh!)
+
+    PtrList<entry> patchEntries;
+    if (Pstream::master())
+    {
+        facesInstance = io.time().findInstance
+        (
+            meshSubDir,
+            "faces",
+            IOobject::MUST_READ
+        );
+
+        patchEntries = polyBoundaryMeshEntries
+        (
+            IOobject
+            (
+                "boundary",
+                facesInstance,
+                meshSubDir,
+                io.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        );
+
+        // Send patches
+        for
+        (
+            int slave=Pstream::firstSlave();
+            slave<=Pstream::lastSlave();
+            slave++
+        )
+        {
+            OPstream toSlave(Pstream::scheduled, slave);
+            toSlave << patchEntries;
+        }
+    }
+    else
+    {
+        // Receive patches
+        IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
+        fromMaster >> patchEntries;
+    }
+
+
+    Pstream::scatter(facesInstance);
+
+    // Dummy meshes
+    // ~~~~~~~~~~~~
+
+    // Check who has a mesh
+    const fileName meshDir = io.time().path()/facesInstance/meshSubDir;
+    bool haveMesh = isDir(meshDir);
+    if (masterOnlyReading && !Pstream::master())
+    {
+        haveMesh = false;
+    }
+
+
+    // Set up to read-if-present. Note: does not search for mesh so set
+    // instance explicitly
+    IOobject meshIO(io);
+    meshIO.instance() = facesInstance;
+    if (masterOnlyReading && !Pstream::master())
+    {
+        meshIO.readOpt() = IOobject::NO_READ;
+    }
+    else
+    {
+        meshIO.readOpt() = IOobject::READ_IF_PRESENT;
+    }
+
+
+    // Read mesh
+    // ~~~~~~~~~
+    // Now all processors read a mesh and use supplied points,faces etc
+    // if there is none.
+    // Note: fvSolution, fvSchemes are also using the supplied Ioobject so
+    //       on slave will be NO_READ, on master READ_IF_PRESENT. This will
+    //       conflict with e.g. timeStampMaster reading so switch off.
+
+    const regIOobject::fileCheckTypes oldCheckType =
+        regIOobject::fileModificationChecking;
+    regIOobject::fileModificationChecking = regIOobject::timeStamp;
+
+    autoPtr<fvMesh> meshPtr
+    (
+        new fvMesh
+        (
+            meshIO,
+            xferCopy(pointField()),
+            xferCopy(faceList()),
+            xferCopy(labelList()),
+            xferCopy(labelList())
+        )
+    );
+    fvMesh& mesh = meshPtr();
+
+    regIOobject::fileModificationChecking = oldCheckType;
+
+
+
+    // Add patches
+    // ~~~~~~~~~~~
+
+
+    bool havePatches = mesh.boundary().size();
+    reduce(havePatches, andOp<bool>());
+
+    if (!havePatches)
+    {
+        // There are one or more processors without full complement of
+        // patches
+
+        DynamicList<polyPatch*> newPatches;
+
+        if (haveMesh)   //Pstream::master())
+        {
+            forAll(mesh.boundary(), patchI)
+            {
+                newPatches.append
+                (
+                    mesh.boundaryMesh()[patchI].clone(mesh.boundaryMesh()).ptr()
+                );
+            }
+        }
+        else
+        {
+            forAll(patchEntries, patchI)
+            {
+                const entry& e = patchEntries[patchI];
+                const word type(e.dict().lookup("type"));
+
+                if
+                (
+                    type == processorPolyPatch::typeName
+                 || type == processorCyclicPolyPatch::typeName
+                )
+                {}
+                else
+                {
+                    dictionary patchDict(e.dict());
+                    patchDict.set("nFaces", 0);
+                    patchDict.set("startFace", 0);
+
+                    newPatches.append
+                    (
+                        polyPatch::New
+                        (
+                            patchEntries[patchI].keyword(),
+                            patchDict,
+                            newPatches.size(),
+                            mesh.boundaryMesh()
+                        ).ptr()
+                    );
+                }
+            }
+        }
+        mesh.removeFvBoundary();
+        mesh.addFvPatches(newPatches);
+    }
+
+    //Pout<< "patches:" << endl;
+    //forAll(mesh.boundary(), patchI)
+    //{
+    //    Pout<< "    type" << mesh.boundary()[patchI].type()
+    //        << " size:" << mesh.boundary()[patchI].size()
+    //        << " start:" << mesh.boundary()[patchI].start() << endl;
+    //}
+    //Pout<< endl;
+
+
+    // Determine zones
+    // ~~~~~~~~~~~~~~~
+
+    wordList pointZoneNames(mesh.pointZones().names());
+    Pstream::scatter(pointZoneNames);
+    wordList faceZoneNames(mesh.faceZones().names());
+    Pstream::scatter(faceZoneNames);
+    wordList cellZoneNames(mesh.cellZones().names());
+    Pstream::scatter(cellZoneNames);
+
+    if (!haveMesh)
+    {
+        // Add the zones. Make sure to remove the old dummy ones first
+        mesh.pointZones().clear();
+        mesh.faceZones().clear();
+        mesh.cellZones().clear();
+
+        List<pointZone*> pz(pointZoneNames.size());
+        forAll(pointZoneNames, i)
+        {
+            pz[i] = new pointZone
+            (
+                pointZoneNames[i],
+                labelList(0),
+                i,
+                mesh.pointZones()
+            );
+        }
+        List<faceZone*> fz(faceZoneNames.size());
+        forAll(faceZoneNames, i)
+        {
+            fz[i] = new faceZone
+            (
+                faceZoneNames[i],
+                labelList(0),
+                boolList(0),
+                i,
+                mesh.faceZones()
+            );
+        }
+        List<cellZone*> cz(cellZoneNames.size());
+        forAll(cellZoneNames, i)
+        {
+            cz[i] = new cellZone
+            (
+                cellZoneNames[i],
+                labelList(0),
+                i,
+                mesh.cellZones()
+            );
+        }
+
+        if (pz.size() && fz.size() && cz.size())
+        {
+            mesh.addZones(pz, fz, cz);
+        }
+    }
+
+    return meshPtr;
+}
+
+
 // ************************************************************************* //
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.H b/src/dynamicMesh/fvMeshTools/fvMeshTools.H
index 0e7e132d9c..e458425d0b 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.H
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -112,7 +112,7 @@ public:
     //- Change patchField to zero on registered fields
     static void zeroPatchFields(fvMesh& mesh, const label patchI);
 
-    // -Reorder and remove trailing patches. If validBoundary call is parallel
+    //- Reorder and remove trailing patches. If validBoundary call is parallel
     //  synced and all add the same patch with same settings
     static void reorderPatches
     (
@@ -122,6 +122,18 @@ public:
         const bool validBoundary
     );
 
+
+    //- Read mesh or create dummy mesh (0 cells, >0 patches). Works in two
+    //  modes according to masterOnlyReading:
+    //  true : all slaves create dummy mesh
+    //  false: checks locally for mesh directories and only creates dummy mesh
+    //         if not present
+    static autoPtr<fvMesh> newMesh
+    (
+        const IOobject& io,
+        const bool masterOnlyReading
+    );
+
 };
 
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
index 0fffb4aa35..572b8b7d79 100644
--- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -442,11 +442,8 @@ void Foam::layerAdditionRemoval::addCellLayer
 
         if (patchID < 0)
         {
-            FatalErrorIn
-            (
-                "void Foam::layerAdditionRemoval::setRefinement("
-                "polyTopoChange& ref)"
-            )   << "Cannot find patch for edge " << meshEdges[curEdgeID]
+            FatalErrorInFunction
+                << "Cannot find patch for edge " << meshEdges[curEdgeID]
                 << ". Edge: " << mesh.edges()[meshEdges[curEdgeID]]
                 << abort(FatalError);
         }
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index a1a8d22846..0ea18976a2 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ void Foam::layerAdditionRemoval::checkDefinition()
 {
     if (!faceZoneID_.active())
     {
-        FatalErrorIn("void Foam::layerAdditionRemoval::checkDefinition()")
+        FatalErrorInFunction
             << "Master face zone named " << faceZoneID_.name()
             << " cannot be found."
             << abort(FatalError);
@@ -70,10 +70,8 @@ void Foam::layerAdditionRemoval::checkDefinition()
      || maxLayerThickness_ < minLayerThickness_
     )
     {
-        FatalErrorIn
-        (
-            "void Foam::layerAdditionRemoval::checkDefinition()"
-        )   << "Incorrect layer thickness definition."
+        FatalErrorInFunction
+            << "Incorrect layer thickness definition."
             << abort(FatalError);
     }
 
@@ -83,7 +81,7 @@ void Foam::layerAdditionRemoval::checkDefinition()
 
     if (nFaces == 0)
     {
-        FatalErrorIn("void Foam::layerAdditionRemoval::checkDefinition()")
+        FatalErrorInFunction
             << "Face extrusion zone contains no faces. "
             << "Please check your mesh definition."
             << abort(FatalError);
@@ -222,7 +220,7 @@ bool Foam::layerAdditionRemoval::changeTopology() const
 
     if (min(V) < -VSMALL)
     {
-        FatalErrorIn("bool layerAdditionRemoval::changeTopology() const")
+        FatalErrorInFunction
             << "negative cell volume. Error in mesh motion before "
             << "topological change.\n V: " << V
             << abort(FatalError);
@@ -462,13 +460,8 @@ void Foam::layerAdditionRemoval::setMinLayerThickness(const scalar t) const
 {
     if (t < VSMALL || maxLayerThickness_ < t)
     {
-        FatalErrorIn
-        (
-            "void layerAdditionRemoval::setMinLayerThickness"
-            "("
-                "const scalar"
-            ") const"
-        )   << "Incorrect layer thickness definition."
+        FatalErrorInFunction
+            << "Incorrect layer thickness definition."
             << abort(FatalError);
     }
 
@@ -480,13 +473,8 @@ void Foam::layerAdditionRemoval::setMaxLayerThickness(const scalar t) const
 {
     if (t < minLayerThickness_)
     {
-        FatalErrorIn
-        (
-            "void layerAdditionRemoval::setMaxLayerThickness"
-            "("
-                "const scalar"
-            ") const"
-        )   << "Incorrect layer thickness definition."
+        FatalErrorInFunction
+            << "Incorrect layer thickness definition."
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index 0e2996e45e..c4975633f8 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,10 +76,8 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
     // the master patch
     if (pointsPairingPtr_ || facesPairingPtr_)
     {
-        FatalErrorIn
-        (
-            "void Foam::layerAdditionRemoval::setLayerPairing() const"
-        )   << "Problem with layer pairing data"
+        FatalErrorInFunction
+            << "Problem with layer pairing data"
             << abort(FatalError);
     }
 
@@ -189,10 +187,8 @@ const Foam::labelList& Foam::layerAdditionRemoval::pointsPairing() const
 {
     if (!pointsPairingPtr_)
     {
-        FatalErrorIn
-        (
-            "const labelList& layerAdditionRemoval::pointsPairing() const"
-        )   << "Problem with layer pairing data for object " << name()
+        FatalErrorInFunction
+            << "Problem with layer pairing data for object " << name()
             << abort(FatalError);
     }
 
@@ -203,10 +199,8 @@ const Foam::labelList& Foam::layerAdditionRemoval::facesPairing() const
 {
     if (!facesPairingPtr_)
     {
-        FatalErrorIn
-        (
-            "const labelList& layerAdditionRemoval::facesPairing() const"
-        )   << "Problem with layer pairing data for object " << name()
+        FatalErrorInFunction
+            << "Problem with layer pairing data for object " << name()
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 6861186e39..864faad5fd 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -252,12 +252,8 @@ Foam::label Foam::cellCuts::edgeEdgeToFace
     // Coming here means the loop is illegal since the two edges
     // are not shared by a face. We just mark loop as invalid and continue.
 
-    WarningIn
-    (
-        "Foam::cellCuts::edgeEdgeToFace"
-        "(const label cellI, const label edgeA,"
-        "const label edgeB) const"
-    )   << "cellCuts : Cannot find face on cell "
+    WarningInFunction
+        << "cellCuts : Cannot find face on cell "
         << cellI << " that has both edges " << edgeA << ' ' << edgeB << endl
         << "faces : " << cFaces << endl
         << "edgeA : " << mesh().edges()[edgeA] << endl
@@ -296,12 +292,8 @@ Foam::label Foam::cellCuts::edgeVertexToFace
         }
     }
 
-    WarningIn
-    (
-        "Foam::cellCuts::edgeVertexToFace"
-        "(const label cellI, const label edgeI, "
-        "const label vertI) const"
-    )   << "cellCuts : Cannot find face on cell "
+    WarningInFunction
+        << "cellCuts : Cannot find face on cell "
         << cellI << " that has both edge " << edgeI << " and vertex "
         << vertI << endl
         << "faces : " << cFaces << endl
@@ -338,7 +330,7 @@ Foam::label Foam::cellCuts::vertexVertexToFace
         }
     }
 
-    WarningIn("Foam::cellCuts::vertexVertexToFace")
+    WarningInFunction
         << "cellCuts : Cannot find face on cell "
         << cellI << " that has vertex " << vertA << " and vertex "
         << vertB << endl
@@ -353,7 +345,7 @@ void Foam::cellCuts::calcFaceCuts() const
 {
     if (faceCutsPtr_)
     {
-        FatalErrorIn("cellCuts::calcFaceCuts()")
+        FatalErrorInFunction
             << "faceCuts already calculated" << abort(FatalError);
     }
 
@@ -468,7 +460,7 @@ void Foam::cellCuts::calcFaceCuts() const
 
         if (allVerticesCut)
         {
-            WarningIn("Foam::cellCuts::calcFaceCuts() const")
+            WarningInFunction
                 << "Face " << faceI << " vertices " << f
                 << " has all its vertices cut. Not cutting face." << endl;
 
@@ -783,7 +775,7 @@ bool Foam::cellCuts::walkFace
     }
     else
     {
-        WarningIn("Foam::cellCuts::walkFace")
+        WarningInFunction
             << "In middle of cut. cell:" << cellI << " face:" << faceI
             << " cuts:" << fCuts << " current cut:" << cut << endl;
 
@@ -1314,7 +1306,7 @@ bool Foam::cellCuts::calcAnchors
 
     if (uncutIndex == -1)
     {
-        WarningIn("Foam::cellCuts::calcAnchors")
+        WarningInFunction
             << "Invalid loop " << loop << " for cell " << cellI << endl
             << "Can not find point on cell which is not cut by loop."
             << endl;
@@ -1334,7 +1326,7 @@ bool Foam::cellCuts::calcAnchors
     {
         // All vertices either in loop or in anchor. So split is along single
         // face.
-        WarningIn("Foam::cellCuts::calcAnchors")
+        WarningInFunction
             << "Invalid loop " << loop << " for cell " << cellI << endl
             << "All vertices of cell are either in loop or in anchor set"
             << endl;
@@ -1371,7 +1363,7 @@ bool Foam::cellCuts::calcAnchors
 
     if (uncutIndex != -1)
     {
-        WarningIn("Foam::cellCuts::calcAnchors")
+        WarningInFunction
             << "Invalid loop " << loop << " for cell " << cellI
             << " since it splits the cell into more than two cells" << endl;
 
@@ -1415,7 +1407,7 @@ bool Foam::cellCuts::calcAnchors
 
     if (connectedFaces.size() < 3)
     {
-        WarningIn("Foam::cellCuts::calcAnchors")
+        WarningInFunction
             << "Invalid loop " << loop << " for cell " << cellI
             << " since would have too few faces on one side." << nl
             << "All faces:" << cFaces << endl;
@@ -1427,7 +1419,7 @@ bool Foam::cellCuts::calcAnchors
 
     if (otherFaces.size() < 3)
     {
-        WarningIn("Foam::cellCuts::calcAnchors")
+        WarningInFunction
             << "Invalid loop " << loop << " for cell " << cellI
             << " since would have too few faces on one side." << nl
             << "All faces:" << cFaces << endl;
@@ -1471,7 +1463,7 @@ bool Foam::cellCuts::calcAnchors
                     if (hasSet1)
                     {
                         // Second occurence of set1.
-                        WarningIn("Foam::cellCuts::calcAnchors")
+                        WarningInFunction
                             << "Invalid loop " << loop << " for cell " << cellI
                             << " since face " << f << " would be split into"
                             << " more than two faces" << endl;
@@ -1488,7 +1480,7 @@ bool Foam::cellCuts::calcAnchors
                     if (hasSet2)
                     {
                         // Second occurence of set1.
-                        WarningIn("Foam::cellCuts::calcAnchors")
+                        WarningInFunction
                             << "Invalid loop " << loop << " for cell " << cellI
                             << " since face " << f << " would be split into"
                             << " more than two faces" << endl;
@@ -1502,7 +1494,7 @@ bool Foam::cellCuts::calcAnchors
                 }
                 else
                 {
-                    FatalErrorIn("Foam::cellCuts::calcAnchors")
+                    FatalErrorInFunction
                         << abort(FatalError);
                 }
 
@@ -1526,7 +1518,7 @@ bool Foam::cellCuts::calcAnchors
                     if (hasSet1)
                     {
                         // Second occurence of set1.
-                        WarningIn("Foam::cellCuts::calcAnchors")
+                        WarningInFunction
                             << "Invalid loop " << loop << " for cell " << cellI
                             << " since face " << f << " would be split into"
                             << " more than two faces" << endl;
@@ -1543,7 +1535,7 @@ bool Foam::cellCuts::calcAnchors
                     if (hasSet2)
                     {
                         // Second occurence of set1.
-                        WarningIn("Foam::cellCuts::calcAnchors")
+                        WarningInFunction
                             << "Invalid loop " << loop << " for cell " << cellI
                             << " since face " << f << " would be split into"
                             << " more than two faces" << endl;
@@ -1576,7 +1568,7 @@ bool Foam::cellCuts::calcAnchors
             // Both sets of points are supposedly on the same side as the
             // loop normal. Oops.
 
-            WarningIn("Foam::cellCuts::calcAnchors")
+            WarningInFunction
                 << " For cell:" << cellI
                 << " achorpoints and nonanchorpoints are geometrically"
                 << " on same side!" << endl
@@ -1971,7 +1963,7 @@ bool Foam::cellCuts::validLoop
 
     if (faceContainingLoop != -1)
     {
-        WarningIn("Foam::cellCuts::validLoop")
+        WarningInFunction
             << "Found loop on cell " << cellI << " with all points"
             << " on face " << faceContainingLoop << endl;
 
@@ -2029,13 +2021,11 @@ void Foam::cellCuts::setFromCellLoops()
             {
                 //writeOBJ(".", cellI, loopPoints(cellI), anchorPoints);
 
-                //FatalErrorIn("cellCuts::setFromCellLoops()")
-                WarningIn("cellCuts::setFromCellLoops")
+                WarningInFunction
                     << "Illegal loop " << loop
                     << " when recreating cut-addressing"
                     << " from existing cellLoops for cell " << cellI
                     << endl;
-                    //<< abort(FatalError);
 
                 cellLoops_[cellI].setSize(0);
                 cellAnchorPoints_[cellI].setSize(0);
@@ -2477,7 +2467,7 @@ void Foam::cellCuts::orientPlanesAndLoops()
         {
             if (cellAnchorPoints_[cellI].empty())
             {
-                FatalErrorIn("orientPlanesAndLoops()")
+                FatalErrorInFunction
                     << "No anchor points for cut cell " << cellI << endl
                     << "cellLoop:" << cellLoops_[cellI] << abort(FatalError);
             }
@@ -2515,10 +2505,8 @@ void Foam::cellCuts::calcLoopsAndAddressing(const labelList& cutCells)
 
             if (weight < 0 || weight > 1)
             {
-                FatalErrorIn
-                (
-                    "cellCuts::calcLoopsAndAddressing(const labelList&)"
-                )   << "Weight out of range [0,1]. Edge " << edgeI
+                FatalErrorInFunction
+                    << "Weight out of range [0,1]. Edge " << edgeI
                     << " verts:" << mesh().edges()[edgeI]
                     << " weight:" << weight << abort(FatalError);
             }
@@ -2570,13 +2558,11 @@ void Foam::cellCuts::check() const
             )
             {
                 // Should have been snapped.
-                //FatalErrorIn("cellCuts::check()")
-                WarningIn("cellCuts::check()")
+                WarningInFunction
                     << "edge:" << edgeI << " vertices:"
                     << mesh().edges()[edgeI]
                     << " weight:" << edgeWeight_[edgeI] << " should have been"
                     << " snapped to one of its endpoints"
-                    //<< abort(FatalError);
                     << endl;
             }
         }
@@ -2584,7 +2570,7 @@ void Foam::cellCuts::check() const
         {
             if (edgeWeight_[edgeI] > - 1)
             {
-                FatalErrorIn("cellCuts::check()")
+                FatalErrorInFunction
                     << "edge:" << edgeI << " vertices:"
                     << mesh().edges()[edgeI]
                     << " weight:" << edgeWeight_[edgeI] << " is not cut but"
@@ -2612,7 +2598,7 @@ void Foam::cellCuts::check() const
                 labelList cuts(1, cut);
                 writeCuts(Pout, cuts, loopWeights(cuts));
 
-                FatalErrorIn("cellCuts::check()")
+                FatalErrorInFunction
                     << "cell:" << cellI << " loop:"
                     << loop
                     << " cut:" << cut << " is not marked as cut"
@@ -2630,7 +2616,7 @@ void Foam::cellCuts::check() const
 
         if (loop.size() && anchors.empty())
         {
-            FatalErrorIn("cellCuts::check()")
+            FatalErrorInFunction
                 << "cell:" << cellI << " loop:" << loop
                 << " has no anchor points"
                 << abort(FatalError);
@@ -2647,7 +2633,7 @@ void Foam::cellCuts::check() const
              && findIndex(anchors, getVertex(cut)) != -1
             )
             {
-                FatalErrorIn("cellCuts::check()")
+                FatalErrorInFunction
                     << "cell:" << cellI << " loop:" << loop
                     << " anchor points:" << anchors
                     << " anchor:" << getVertex(cut) << " is part of loop"
@@ -2669,7 +2655,7 @@ void Foam::cellCuts::check() const
 
             if (cellLoops_[own].empty() && cellLoops_[nei].empty())
             {
-                FatalErrorIn("cellCuts::check()")
+                FatalErrorInFunction
                     << "Internal face:" << faceI << " cut by " << iter()
                     << " has owner:" << own
                     << " and neighbour:" << nei
@@ -2683,7 +2669,7 @@ void Foam::cellCuts::check() const
 
             if (cellLoops_[own].empty())
             {
-                FatalErrorIn("cellCuts::check()")
+                FatalErrorInFunction
                     << "Boundary face:" << faceI << " cut by " << iter()
                     << " has owner:" << own
                     << " that is uncut"
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
index 69e526fe2b..12dac20c0c 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,8 @@ Foam::autoPtr<Foam::cellLooper> Foam::cellLooper::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "cellLooper::New(const word&, const polyMesh&)"
-        )   << "Unknown set type "
+        FatalErrorInFunction
+            << "Unknown set type "
             << type << nl << nl
             << "Valid cellLooper types : " << endl
             << wordConstructorTablePtr_->sortedToc()
@@ -124,10 +122,8 @@ Foam::label Foam::cellLooper::getFirstVertEdge
         }
     }
 
-    FatalErrorIn
-    (
-        "getFirstVertEdge(const label, const label)"
-    )   << "Can not find edge on face " << faceI
+    FatalErrorInFunction
+        << "Can not find edge on face " << faceI
         << " using vertex " << vertI
         << abort(FatalError);
 
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
index b39a074103..9feae62ca8 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -145,7 +145,7 @@ public:
         //- Clone
         autoPtr<cellLooper> clone() const
         {
-            notImplemented("autoPtr<tcellLooper> clone() const");
+            NotImplemented;
             return autoPtr<cellLooper>(NULL);
         }
 
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
index bf5b7f1d65..5a2d42e4a0 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ Description
     cell centre and normal in direction of provided direction. Snaps cuts
     close to edge endpoints (close = snapTol * minEdgeLen) to vertices.
 
-    Currently determines cuts through edges (and edgeendpoints close to plane)
+    Currently determines cuts through edges (and edge endpoints close to plane)
     in random order and then sorts them acc. to angle. Could be converted to
     use walk but problem is that face can be cut multiple times (since does
     not need to be convex). Another problem is that edges parallel to plane
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
index c01c916aa3..e228515e7e 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -215,7 +215,7 @@ bool Foam::hexCellLooper::cut
     {
         if (loop.empty())
         {
-            WarningIn("hexCellLooper")
+            WarningInFunction
                 << "could not cut cell " << cellI << endl;
 
             fileName cutsFile("hexCellLooper_" + name(cellI) + ".obj");
@@ -245,7 +245,7 @@ bool Foam::hexCellLooper::cut
 
             if (loopSet.found(elem))
             {
-                FatalErrorIn("hexCellLooper::walkHex") << " duplicate cut"
+                FatalErrorInFunction
                     << abort(FatalError);
             }
             loopSet.insert(elem);
@@ -259,7 +259,7 @@ bool Foam::hexCellLooper::cut
 
         if ((faceVerts.mag(facePoints) < SMALL) || (loop.size() < 3))
         {
-            FatalErrorIn("hexCellLooper::walkHex") << "Face:" << faceVerts
+            FatalErrorInFunction
                 << " on points:" << facePoints << endl
                 << UIndirectList<point>(facePoints, faceVerts)()
                 << abort(FatalError);
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index ce04d65990..d93c5a2a1f 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,8 +63,7 @@ void Foam::topoCellLooper::subsetList
         // changed)
         if (freeI < 0)
         {
-            FatalErrorIn("topoCellLooper::subsetList")
-                << "startI:" << startI << "  freeI:" << freeI
+            FatalErrorInFunction
                 << "  lst:" << lst << abort(FatalError);
         }
         lst.setCapacity(freeI);
@@ -80,8 +79,7 @@ void Foam::topoCellLooper::subsetList
 
         if ((freeI - startI) < 0)
         {
-            FatalErrorIn("topoCellLooper::subsetList")
-                << "startI:" << startI << "  freeI:" << freeI
+            FatalErrorInFunction
                 << "  lst:" << lst << abort(FatalError);
         }
 
@@ -460,7 +458,7 @@ void Foam::topoCellLooper::walkSplitHex
             // On edge
             if (edgeI == -1)
             {
-                FatalErrorIn("walkSplitHex") << "Illegal edge and vert"
+                FatalErrorInFunction
                     << abort(FatalError);
             }
 
@@ -651,7 +649,7 @@ void Foam::topoCellLooper::walkSplitHex
                 }
                 else
                 {
-                    FatalErrorIn("walkFromVert") << "Not yet implemented"
+                    FatalErrorInFunction
                         << "Choosing from more than "
                         << "two candidates:" << nextFaces
                         << " when coming from vertex " << vertI << " on cell "
diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C
index 2e19bb7e32..c1028dbfe5 100644
--- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C
+++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Foam::label Foam::directionInfo::findEdge
         }
     }
 
-    FatalErrorIn("directionInfo::findEdge")
+    FatalErrorInFunction
         << "Cannot find an edge among " << edgeLabels << endl
         << "that uses vertices " << v0
         << " and " << v1
@@ -77,7 +77,7 @@ Foam::label Foam::directionInfo::lowest
 
         if (b1 != a)
         {
-            FatalErrorIn("directionInfo::lowest")
+            FatalErrorInFunction
                 << "Problem : a:" << a << " b:" << b << " size:" << size
                 << abort(FatalError);
         }
@@ -99,7 +99,7 @@ Foam::label Foam::directionInfo::edgeToFaceIndex
 {
     if ((edgeI < 0) || (edgeI >= mesh.nEdges()))
     {
-        FatalErrorIn("directionInfo::edgeToFaceIndex")
+        FatalErrorInFunction
             << "Illegal edge label:" << edgeI
             << " when projecting cut edge from cell " << cellI
             << " to face " << faceI
@@ -184,7 +184,7 @@ Foam::label Foam::directionInfo::edgeToFaceIndex
                 return lowest(f.size(), fpA, fpB);
             }
 
-            FatalErrorIn("directionInfo::edgeToFaceIndex")
+            FatalErrorInFunction
                 << "Found connected faces " << mesh.faces()[f0I] << " and "
                 << mesh.faces()[f1I] << " sharing edge " << edgeI << endl
                 << "But none seems to be connected to face " << faceI
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index 35170e9007..d2b6aa683e 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ void Foam::directions::check2D
     {
         if (mag(correct2DPtr->planeNormal() & vec) > 1e-6)
         {
-            FatalErrorIn("check2D") << "Specified vector " << vec
+            FatalErrorInFunction
                 << "is not normal to plane defined in dynamicMeshDict."
                 << endl
                 << "Either make case 3D or adjust vector."
@@ -161,7 +161,7 @@ Foam::vectorField Foam::directions::propagateDirection
 
             if (!hexMatcher().isA(mesh, cellI))
             {
-                FatalErrorIn("propagateDirection")
+                FatalErrorInFunction
                     << "useHexTopology specified but cell " << cellI
                     << " on face " << patchFaceI << " of patch " << pp.name()
                     << " is not a hex" << exit(FatalError);
@@ -229,7 +229,7 @@ Foam::vectorField Foam::directions::propagateDirection
         if (index == -3)
         {
             // Never visited
-            WarningIn("propagateDirection")
+            WarningInFunction
                 << "Cell " << cellI << " never visited to determine "
                 << "local coordinate system" << endl
                 << "Using direction " << defaultDir << " instead" << endl;
@@ -247,7 +247,7 @@ Foam::vectorField Foam::directions::propagateDirection
         }
         else if (index == -1)
         {
-            FatalErrorIn("propagateDirection")
+            FatalErrorInFunction
                 << "Illegal index " << index << endl
                 << "Value is only allowed on faces" << abort(FatalError);
         }
@@ -353,11 +353,8 @@ Foam::directions::directions
 
         if (patchI == -1)
         {
-            FatalErrorIn
-            (
-                "directions::directions(const polyMesh&, const dictionary&,"
-                "const twoDPointCorrector*)"
-            )   << "Cannot find patch "
+            FatalErrorInFunction
+                << "Cannot find patch "
                 << patchName
                 << exit(FatalError);
         }
@@ -373,11 +370,8 @@ Foam::directions::directions
         {
             tan1 = correct2DPtr->planeNormal() ^ n0;
 
-            WarningIn
-            (
-                "directions::directions(const polyMesh&, const dictionary&,"
-                "const twoDPointCorrector*)"
-            )   << "Discarding user specified tan1 since 2D case." << endl
+            WarningInFunction
+                << "Discarding user specified tan1 since 2D case." << endl
                 << "Recalculated tan1 from face normal and planeNormal as "
                 << tan1 << endl << endl;
         }
@@ -432,11 +426,8 @@ Foam::directions::directions
     }
     else
     {
-        FatalErrorIn
-        (
-            "directions::directions(const polyMesh&, const dictionary&,"
-            "const twoDPointCorrector*)"
-        )   << "Unknown coordinate system "
+        FatalErrorInFunction
+            << "Unknown coordinate system "
             << coordSystem << endl
             << "Known types are global and patchLocal"
             << exit(FatalError);
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
index 6e22baf236..f6df6d13c1 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,11 +105,8 @@ void Foam::edgeVertex::updateLabels
 
             if (newMaster == -1)
             {
-                WarningIn
-                (
-                    "edgeVertex::updateLabels(const labelList&, "
-                    "Map<label>&)"
-                )   << "master cell:" << iter.key()
+                WarningInFunction
+                    << "master cell:" << iter.key()
                     << " has disappeared" << endl;
             }
             else
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
index b8d9e05483..a7a7b4313d 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
@@ -109,10 +109,8 @@ public:
         {
             if (eVert < 0 || eVert >= (mesh.nPoints() + mesh.nEdges()))
             {
-                FatalErrorIn
-                (
-                    "edgeVertex::isEdge(const primitiveMesh&, const label)"
-                )   << "EdgeVertex " << eVert << " out of range "
+                FatalErrorInFunction
+                    << "EdgeVertex " << eVert << " out of range "
                     << mesh.nPoints() << " to "
                     << (mesh.nPoints() + mesh.nEdges() - 1)
                     << abort(FatalError);
@@ -130,10 +128,8 @@ public:
         {
             if (!isEdge(mesh, eVert))
             {
-                FatalErrorIn
-                (
-                    "edgeVertex::getEdge(const primitiveMesh&, const label)"
-                )   << "EdgeVertex " << eVert << " not an edge"
+                FatalErrorInFunction
+                    << "EdgeVertex " << eVert << " not an edge"
                     << abort(FatalError);
             }
             return eVert - mesh.nPoints();
@@ -148,10 +144,8 @@ public:
         {
             if (isEdge(mesh, eVert) || (eVert < 0))
             {
-                FatalErrorIn
-                (
-                    "edgeVertex::getVertex(const primitiveMesh&, const label)"
-                )   << "EdgeVertex " << eVert << " not a vertex"
+                FatalErrorInFunction
+                    << "EdgeVertex " << eVert << " not a vertex"
                     << abort(FatalError);
             }
             return eVert;
@@ -166,10 +160,8 @@ public:
         {
             if ((vertI < 0) || (vertI >= mesh.nPoints()))
             {
-                FatalErrorIn
-                (
-                    "edgeVertex::vertToEVert(const primitiveMesh&, const label)"
-                )   << "Illegal vertex number " << vertI
+                FatalErrorInFunction
+                    << "Illegal vertex number " << vertI
                     << abort(FatalError);
             }
             return vertI;
@@ -184,10 +176,8 @@ public:
         {
             if ((edgeI < 0) || (edgeI >= mesh.nEdges()))
             {
-                FatalErrorIn
-                (
-                    "edgeVertex::edgeToEVert(const primitiveMesh&const label)"
-                )   << "Illegal edge number " << edgeI
+                FatalErrorInFunction
+                    << "Illegal edge number " << edgeI
                     << abort(FatalError);
             }
             return mesh.nPoints() + edgeI;
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 654b47a254..1e81226a4b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -248,7 +248,7 @@ bool Foam::boundaryCutter::splitFace
 
     if (nSplitEdges == 0 && nModPoints == 0)
     {
-        FatalErrorIn("boundaryCutter::splitFace") << "Problem : face:" << faceI
+        FatalErrorInFunction
             << " nSplitEdges:" << nSplitEdges
             << " nTotalSplits:" << nTotalSplits
             << abort(FatalError);
@@ -302,7 +302,7 @@ bool Foam::boundaryCutter::splitFace
 
         if (startFp == -1)
         {
-            FatalErrorIn("boundaryCutter::splitFace")
+            FatalErrorInFunction
                 << "Problem" << abort(FatalError);
         }
 
@@ -508,7 +508,7 @@ void Foam::boundaryCutter::setRefinement
 
         if (faceToSplit.found(faceI))
         {
-            FatalErrorIn("boundaryCutter::setRefinement")
+            FatalErrorInFunction
                 << "Face " << faceI << " vertices " << f
                 << " is both marked for face-centre decomposition and"
                 << " diagonal splitting."
@@ -517,7 +517,7 @@ void Foam::boundaryCutter::setRefinement
 
         if (mesh_.isInternalFace(faceI))
         {
-            FatalErrorIn("boundaryCutter::setRefinement")
+            FatalErrorInFunction
                 << "Face " << faceI << " vertices " << f
                 << " is not an external face. Cannot split it"
                 << abort(FatalError);
@@ -637,7 +637,7 @@ void Foam::boundaryCutter::setRefinement
 
         if (faceAddedPoint_.found(faceI))
         {
-            FatalErrorIn("boundaryCutter::setRefinement")
+            FatalErrorInFunction
                 << "Face " << faceI << " vertices " << f
                 << " is both marked for face-centre decomposition and"
                 << " diagonal splitting."
@@ -662,7 +662,7 @@ void Foam::boundaryCutter::setRefinement
 
         if (fp0 == -1 || fp1 == -1 || fp0 == fp1)
         {
-            FatalErrorIn("boundaryCutter::setRefinement")
+            FatalErrorInFunction
                 << "Problem : Face " << faceI << " vertices " << f
                 << " newFace:" << newFace << " diagonal:" << f[diag[0]]
                 << ' ' << f[diag[1]]
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index 4999757132..a3b768e9cd 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,10 +137,7 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint
 
     if (pointLabels.empty())
     {
-        FatalErrorIn
-        (
-            "meshCutAndRemove::findInternalFacePoint(const labelList&)"
-        )
+        FatalErrorInFunction
             << "Empty pointLabels" << abort(FatalError);
     }
 
@@ -452,11 +449,8 @@ void Foam::meshCutAndRemove::splitFace
 
     if (startFp == -1)
     {
-        FatalErrorIn
-        (
-            "meshCutAndRemove::splitFace"
-            ", const face&, const label, const label, face&, face&)"
-        )   << "Cannot find vertex (new numbering) " << v0
+        FatalErrorInFunction
+            << "Cannot find vertex (new numbering) " << v0
             << " on face " << f
             << abort(FatalError);
     }
@@ -465,11 +459,8 @@ void Foam::meshCutAndRemove::splitFace
 
     if (endFp == -1)
     {
-        FatalErrorIn
-        (
-            "meshCutAndRemove::splitFace("
-            ", const face&, const label, const label, face&, face&)"
-        )   << "Cannot find vertex (new numbering) " << v1
+        FatalErrorInFunction
+            << "Cannot find vertex (new numbering) " << v1
             << " on face " << f
             << abort(FatalError);
     }
@@ -619,12 +610,8 @@ void Foam::meshCutAndRemove::setRefinement
 
     if (exposedPatchI < 0 || exposedPatchI >= patches.size())
     {
-        FatalErrorIn
-        (
-            "meshCutAndRemove::setRefinement("
-            ", const label, const cellCuts&, const labelList&"
-            ", polyTopoChange&)"
-        )   << "Illegal exposed patch " << exposedPatchI
+        FatalErrorInFunction
+            << "Illegal exposed patch " << exposedPatchI
             << abort(FatalError);
     }
 
@@ -642,12 +629,8 @@ void Foam::meshCutAndRemove::setRefinement
             // Check if there is any cell using this edge.
             if (debug && findCutCell(cuts, mesh().edgeCells()[edgeI]) == -1)
             {
-                FatalErrorIn
-                (
-                    "meshCutAndRemove::setRefinement("
-                    ", const label, const cellCuts&, const labelList&"
-                    ", polyTopoChange&)"
-                )   << "Problem: cut edge but none of the cells using it is\n"
+                FatalErrorInFunction
+                    << "Problem: cut edge but none of the cells using it is\n"
                     << "edge:" << edgeI << " verts:" << e
                     << abort(FatalError);
             }
@@ -748,12 +731,8 @@ void Foam::meshCutAndRemove::setRefinement
 
                     if (!usedPoint[pointI])
                     {
-                        FatalErrorIn
-                        (
-                            "meshCutAndRemove::setRefinement("
-                            ", const label, const cellCuts&, const labelList&"
-                            ", polyTopoChange&)"
-                        )   << "Problem: faceSplitCut not used by any loop"
+                        FatalErrorInFunction
+                            << "Problem: faceSplitCut not used by any loop"
                             << " or cell anchor point"
                             << "face:" << iter.key() << " point:" << pointI
                             << " coord:" << mesh().points()[pointI]
@@ -769,12 +748,8 @@ void Foam::meshCutAndRemove::setRefinement
             {
                 if (!usedPoint[pointI])
                 {
-                    FatalErrorIn
-                    (
-                        "meshCutAndRemove::setRefinement("
-                        ", const label, const cellCuts&, const labelList&"
-                        ", polyTopoChange&)"
-                    )   << "Problem: point is marked as cut but"
+                    FatalErrorInFunction
+                        << "Problem: point is marked as cut but"
                         << " not used by any loop"
                         << " or cell anchor point"
                         << "point:" << pointI
@@ -813,12 +788,8 @@ void Foam::meshCutAndRemove::setRefinement
         {
             if (cutPatch[cellI] < 0 || cutPatch[cellI] >= patches.size())
             {
-                FatalErrorIn
-                (
-                    "meshCutAndRemove::setRefinement("
-                    ", const label, const cellCuts&, const labelList&"
-                    ", polyTopoChange&)"
-                )   << "Illegal patch " << cutPatch[cellI]
+                FatalErrorInFunction
+                    << "Illegal patch " << cutPatch[cellI]
                     << " provided for cut cell " << cellI
                     << abort(FatalError);
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index 80acd2bc17..5c3f0e61a6 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -123,7 +123,7 @@ Foam::label Foam::meshCutter::findInternalFacePoint
 
     if (pointLabels.empty())
     {
-        FatalErrorIn("meshCutter::findInternalFacePoint(const labelList&)")
+        FatalErrorInFunction
             << "Empty pointLabels" << abort(FatalError);
     }
 
@@ -383,11 +383,8 @@ void Foam::meshCutter::splitFace
 
     if (startFp == -1)
     {
-        FatalErrorIn
-        (
-            "meshCutter::splitFace"
-            ", const face&, const label, const label, face&, face&)"
-        )   << "Cannot find vertex (new numbering) " << v0
+        FatalErrorInFunction
+            << "Cannot find vertex (new numbering) " << v0
             << " on face " << f
             << abort(FatalError);
     }
@@ -396,11 +393,8 @@ void Foam::meshCutter::splitFace
 
     if (endFp == -1)
     {
-        FatalErrorIn
-        (
-            "meshCutter::splitFace("
-            ", const face&, const label, const label, face&, face&)"
-        )   << "Cannot find vertex (new numbering) " << v1
+        FatalErrorInFunction
+            << "Cannot find vertex (new numbering) " << v1
             << " on face " << f
             << abort(FatalError);
     }
@@ -563,11 +557,8 @@ void Foam::meshCutter::setRefinement
             // Check if there is any cell using this edge.
             if (debug && findCutCell(cuts, mesh().edgeCells()[edgeI]) == -1)
             {
-                FatalErrorIn
-                (
-                    "meshCutter::setRefinement(const cellCuts&"
-                    ", polyTopoChange&)"
-                )   << "Problem: cut edge but none of the cells using it is\n"
+                FatalErrorInFunction
+                    << "Problem: cut edge but none of the cells using it is\n"
                     << "edge:" << edgeI << " verts:" << e
                     << abort(FatalError);
             }
@@ -939,11 +930,8 @@ void Foam::meshCutter::setRefinement
 
                     if (debug && (f != addEdgeCutsToFace(faceI)))
                     {
-                        FatalErrorIn
-                        (
-                            "meshCutter::setRefinement(const cellCuts&"
-                            ", polyTopoChange&)"
-                        )   << "Problem: edges added to face which does "
+                        FatalErrorInFunction
+                            << "Problem: edges added to face which does "
                             << " not use a marked cut" << endl
                             << "faceI:" << faceI << endl
                             << "face:" << f << endl
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index 3668134cc4..2ed62a7e7b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,17 +25,14 @@ License
 
 #include "multiDirRefinement.H"
 #include "polyMesh.H"
-#include "polyTopoChanger.H"
 #include "Time.H"
 #include "undoableMeshCutter.H"
 #include "hexCellLooper.H"
 #include "geomCellLooper.H"
-#include "topoSet.H"
 #include "directions.H"
 #include "hexRef8.H"
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
-#include "ListOps.H"
 #include "cellModeller.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -70,11 +67,8 @@ void Foam::multiDirRefinement::addCells
 
         if (iter == splitMap.end())
         {
-            FatalErrorIn
-            (
-                "multiDirRefinement::addCells(const Map<label>&"
-                ", List<refineCell>&)"
-            )   << "Problem : cannot find added cell for cell "
+            FatalErrorInFunction
+                << "Problem : cannot find added cell for cell "
                 << refCell.cellNo() << abort(FatalError);
         }
 
@@ -143,11 +137,8 @@ void Foam::multiDirRefinement::addCells
             }
             else if (origCell[slave] != cellI)
             {
-                FatalErrorIn
-                (
-                    "multiDirRefinement::addCells(const primitiveMesh&"
-                    ", const Map<label>&"
-                )   << "Added cell " << slave << " has two different masters:"
+                FatalErrorInFunction
+                    << "Added cell " << slave << " has two different masters:"
                     << origCell[slave] << " , " << cellI
                     << abort(FatalError);
             }
@@ -167,11 +158,8 @@ void Foam::multiDirRefinement::addCells
 
         if (masterI >= addedCells_.size())
         {
-            FatalErrorIn
-            (
-                "multiDirRefinement::addCells(const primitiveMesh&"
-                ", const Map<label>&"
-            )   << "Map of added cells contains master cell " << masterI
+            FatalErrorInFunction
+                << "Map of added cells contains master cell " << masterI
                 << " which is not a valid cell number" << endl
                 << "This means that the mesh is not consistent with the"
                 << " done refinement" << endl
@@ -265,7 +253,8 @@ void Foam::multiDirRefinement::refineHex8
                 false
             ),
             List<refinementHistory::splitCell8>(0),
-            labelList(0)
+            labelList(0),
+            false
         )                                   // refinement history
     );
 
@@ -298,11 +287,8 @@ void Foam::multiDirRefinement::refineHex8
 
             if (iter == hexCellSet.end())
             {
-                FatalErrorIn
-                (
-                    "multiDirRefinement::refineHex8"
-                    "(polyMesh&, const labelList&, const bool)"
-                )   << "Resulting mesh would not satisfy 2:1 ratio"
+                FatalErrorInFunction
+                    << "Resulting mesh would not satisfy 2:1 ratio"
                     << " when refining cell " << cellI << abort(FatalError);
             }
             else
@@ -317,11 +303,8 @@ void Foam::multiDirRefinement::refineHex8
         {
             if (iter() != 2)
             {
-                FatalErrorIn
-                (
-                    "multiDirRefinement::refineHex8"
-                    "(polyMesh&, const labelList&, const bool)"
-                )   << "Resulting mesh would not satisfy 2:1 ratio"
+                FatalErrorInFunction
+                    << "Resulting mesh would not satisfy 2:1 ratio"
                     << " when refining cell " << iter.key()
                     << abort(FatalError);
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index 30e32a44af..feec8ba08c 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -214,7 +214,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
         {
             if (!addedCells.insert(iter.key(), iter()))
             {
-                FatalErrorIn("refinementIterator")
+                FatalErrorInFunction
                     << "Master cell " << iter.key()
                     << " already has been refined" << endl
                     << "Added cell:" << iter() << abort(FatalError);
@@ -272,7 +272,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
 
     if (nRefCells == oldRefCells)
     {
-        WarningIn("refinementIterator")
+        WarningInFunction
             << "stopped refining."
             << "Did not manage to refine a single cell" << endl
             << "Wanted :" << oldRefCells << endl;
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 7782b9bb3a..1bc371a44f 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,11 +115,8 @@ void Foam::undoableMeshCutter::updateLabels
 
         if (!splitPtr)
         {
-            FatalErrorIn
-            (
-                "undoableMeshCutter::updateLabels"
-                "(const labelList&, Map<splitCell*>&)"
-            )   << "Problem: null pointer on liveSplitCells list"
+            FatalErrorInFunction
+                << "Problem: null pointer on liveSplitCells list"
                 << abort(FatalError);
         }
 
@@ -275,7 +272,7 @@ void Foam::undoableMeshCutter::setRefinement
 
                 if (liveSplitCells_.found(addedCellI))
                 {
-                    FatalErrorIn("undoableMeshCutter::setRefinement")
+                    FatalErrorInFunction
                         << "problem addedCell:" << addedCellI
                         << abort(FatalError);
                 }
@@ -304,7 +301,7 @@ void Foam::undoableMeshCutter::setRefinement
 
                 if (liveSplitCells_.found(addedCellI))
                 {
-                    FatalErrorIn("undoableMeshCutter::setRefinement")
+                    FatalErrorInFunction
                         << "problem addedCell:" << addedCellI
                         << abort(FatalError);
                 }
@@ -346,7 +343,7 @@ Foam::labelList Foam::undoableMeshCutter::getSplitFaces() const
 {
     if (!undoable_)
     {
-        FatalErrorIn("undoableMeshCutter::getSplitFaces()")
+        FatalErrorInFunction
             << "Only call if constructed with unrefinement capability"
             << abort(FatalError);
     }
@@ -359,7 +356,7 @@ Foam::labelList Foam::undoableMeshCutter::getSplitFaces() const
 
         if (!splitPtr->parent())
         {
-            FatalErrorIn("undoableMeshCutter::getSplitFaces()")
+            FatalErrorInFunction
                 << "Live split cell without parent" << endl
                 << "splitCell:" << splitPtr->cellLabel()
                 << abort(FatalError);
@@ -407,7 +404,7 @@ Foam::Map<Foam::label> Foam::undoableMeshCutter::getAddedCells() const
 
     if (!undoable_)
     {
-        FatalErrorIn("undoableMeshCutter::getAddedCells()")
+        FatalErrorInFunction
             << "Only call if constructed with unrefinement capability"
             << abort(FatalError);
     }
@@ -420,7 +417,7 @@ Foam::Map<Foam::label> Foam::undoableMeshCutter::getAddedCells() const
 
         if (!splitPtr->parent())
         {
-            FatalErrorIn("undoableMeshCutter::getAddedCells()")
+            FatalErrorInFunction
                 << "Live split cell without parent" << endl
                 << "splitCell:" << splitPtr->cellLabel()
                 << abort(FatalError);
@@ -455,7 +452,7 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
 {
     if (!undoable_)
     {
-        FatalErrorIn("undoableMeshCutter::removeSplitFaces(const labelList&)")
+        FatalErrorInFunction
             << "Only call if constructed with unrefinement capability"
             << abort(FatalError);
     }
@@ -479,10 +476,8 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
         Pout<< "cellRegion:" << cellRegion << endl;
         Pout<< "cellRegionMaster:" << cellRegionMaster << endl;
 
-        FatalErrorIn
-        (
-            "undoableMeshCutter::removeSplitFaces(const labelList&)"
-        )   << "Faces to remove:" << splitFaces << endl
+        FatalErrorInFunction
+            << "Faces to remove:" << splitFaces << endl
             << "to be removed:" << facesToRemove
             << abort(FatalError);
     }
@@ -496,10 +491,8 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
 
         if (!mesh().isInternalFace(faceI))
         {
-            FatalErrorIn
-            (
-                "undoableMeshCutter::removeSplitFaces(const labelList&)"
-            )   << "Trying to remove face that is not internal"
+            FatalErrorInFunction
+                << "Trying to remove face that is not internal"
                 << abort(FatalError);
         }
 
@@ -542,28 +535,22 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
             }
             if (!parentPtr)
             {
-                FatalErrorIn
-                (
-                    "undoableMeshCutter::removeSplitFaces(const labelList&)"
-                )   << "No parent for owner " << ownPtr->cellLabel()
+                FatalErrorInFunction
+                    << "No parent for owner " << ownPtr->cellLabel()
                     << abort(FatalError);
             }
 
             if (!nbrPtr->parent())
             {
-                FatalErrorIn
-                (
-                    "undoableMeshCutter::removeSplitFaces(const labelList&)"
-                )   << "No parent for neighbour " << nbrPtr->cellLabel()
+                FatalErrorInFunction
+                    << "No parent for neighbour " << nbrPtr->cellLabel()
                     << abort(FatalError);
             }
 
             if (parentPtr != nbrPtr->parent())
             {
-                FatalErrorIn
-                (
-                    "undoableMeshCutter::removeSplitFaces(const labelList&)"
-                )   << "Owner and neighbour liveSplitCell entries do not have"
+                FatalErrorInFunction
+                    << "Owner and neighbour liveSplitCell entries do not have"
                     << " same parent. faceI:" << faceI << "  owner:" << own
                     << "  ownparent:" << parentPtr->cellLabel()
                     << " neighbour:" << nbr
@@ -579,10 +566,8 @@ Foam::labelList Foam::undoableMeshCutter::removeSplitFaces
             )
             {
                 // Live owner and neighbour are refined themselves.
-                FatalErrorIn
-                (
-                    "undoableMeshCutter::removeSplitFaces(const labelList&)"
-                )   << "Owner and neighbour liveSplitCell entries are"
+                FatalErrorInFunction
+                    << "Owner and neighbour liveSplitCell entries are"
                     << " refined themselves or the parent is not refined"
                     << endl
                     << "owner unrefined:" << ownPtr->isUnrefined()
diff --git a/src/dynamicMesh/meshCut/refineCell/refineCell.C b/src/dynamicMesh/meshCut/refineCell/refineCell.C
index 9e100234d7..5517d34a66 100644
--- a/src/dynamicMesh/meshCut/refineCell/refineCell.C
+++ b/src/dynamicMesh/meshCut/refineCell/refineCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::refineCell::refineCell(const label cellI, const vector& direction)
 
     if (magDir < SMALL)
     {
-        FatalErrorIn("refineCell(const label, const vector&)")
+        FatalErrorInFunction
             << "(almost)zero vector as direction for cell " << cellNo_
             << abort(FatalError);
     }
@@ -65,7 +65,7 @@ Foam::refineCell::refineCell(Istream& is)
 
     if (magDir < SMALL)
     {
-        FatalErrorIn("refineCell(Istream&)")
+        FatalErrorInFunction
             << "(almost)zero vector as direction for cell " << cellNo_
             << abort(FatalError);
     }
diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.C b/src/dynamicMesh/meshCut/splitCell/splitCell.C
index ef675814b9..c4e7970062 100644
--- a/src/dynamicMesh/meshCut/splitCell/splitCell.C
+++ b/src/dynamicMesh/meshCut/splitCell/splitCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Foam::splitCell::~splitCell()
         }
         else
         {
-            FatalErrorIn("splitCell::~splitCell()") << "this not equal to"
+            FatalErrorInFunction
                 << " parent's master or slave pointer" << endl
                 << "Cell:" << cellLabel() << abort(FatalError);
         }
@@ -73,7 +73,7 @@ bool Foam::splitCell::isMaster() const
 
     if (!myParent)
     {
-        FatalErrorIn("splitCell::isMaster()") << "parent not set"
+        FatalErrorInFunction
             << "Cell:" << cellLabel() << abort(FatalError);
 
         return false;
@@ -88,7 +88,7 @@ bool Foam::splitCell::isMaster() const
     }
     else
     {
-        FatalErrorIn("splitCell::isMaster()") << "this not equal to"
+        FatalErrorInFunction
             << " parent's master or slave pointer" << endl
             << "Cell:" << cellLabel() << abort(FatalError);
 
@@ -109,7 +109,7 @@ Foam::splitCell* Foam::splitCell::getOther() const
 
     if (!myParent)
     {
-        FatalErrorIn("splitCell::getOther()") << "parent not set"
+        FatalErrorInFunction
             << "Cell:" << cellLabel() << abort(FatalError);
 
         return NULL;
@@ -124,7 +124,7 @@ Foam::splitCell* Foam::splitCell::getOther() const
     }
     else
     {
-        FatalErrorIn("splitCell::getOther()") << "this not equal to"
+        FatalErrorInFunction
             << " parent's master or slave pointer" << endl
             << "Cell:" << cellLabel() << abort(FatalError);
 
diff --git a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
index e24734607b..bbea7eee83 100644
--- a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
+++ b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,10 +37,8 @@ inline bool Foam::wallNormalInfo::update
 {
     if (!w2.valid(td))
     {
-        FatalErrorIn
-        (
-            "wallNormalInfo::update(const wallNormalInfo&)"
-        ) << "Problem: w2 is not valid" << abort(FatalError);
+        FatalErrorInFunction
+          << "Problem: w2 is not valid" << abort(FatalError);
 
         return false;
     }
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index d546ff86bb..9c19ee6102 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,14 +63,8 @@ void Foam::motionSmootherAlgo::testSyncPositions
     {
         if (mag(syncedFld[i] - fld[i]) > maxMag)
         {
-            FatalErrorIn
-            (
-                "motionSmootherAlgo::testSyncPositions"
-                "("
-                    "const pointField&, "
-                    "const scalar"
-                ")"
-            )   << "On point " << i << " point:" << fld[i]
+            FatalErrorInFunction
+                << "On point " << i << " point:" << fld[i]
                 << " synchronised point:" << syncedFld[i]
                 << abort(FatalError);
         }
@@ -88,11 +82,8 @@ void Foam::motionSmootherAlgo::checkFld(const pointScalarField& fld)
         {}
         else
         {
-            FatalErrorIn
-            (
-                "motionSmootherAlgo::checkFld"
-                "(const pointScalarField&)"
-            )   << "Problem : point:" << pointI << " value:" << val
+            FatalErrorInFunction
+                << "Problem : point:" << pointI << " value:" << val
                 << abort(FatalError);
         }
     }
@@ -514,12 +505,31 @@ void Foam::motionSmootherAlgo::setDisplacement
     const labelList& cppMeshPoints =
         mesh.globalData().coupledPatch().meshPoints();
 
-    forAll(cppMeshPoints, i)
+    const labelList& ppMeshPoints = pp.meshPoints();
+
+    // Knock out displacement on points which are not on pp but are coupled
+    // to them since we want 'proper' values from displacement to take
+    // precedence.
     {
-        displacement[cppMeshPoints[i]] = vector::zero;
+        PackedBoolList isPatchPoint(mesh.nPoints());
+        isPatchPoint.set(ppMeshPoints);
+        syncTools::syncPointList
+        (
+            mesh,
+            isPatchPoint,
+            maxEqOp<unsigned int>(),
+            0
+        );
+        forAll(cppMeshPoints, i)
+        {
+            label pointI = cppMeshPoints[i];
+            if (isPatchPoint[pointI])
+            {
+                displacement[pointI] = vector::zero;
+            }
+        }
     }
 
-    const labelList& ppMeshPoints = pp.meshPoints();
 
     // Set internal point data from displacement on combined patch points.
     forAll(ppMeshPoints, patchPointI)
@@ -657,7 +667,7 @@ void Foam::motionSmootherAlgo::modifyMotionPoints(pointField& newPoints) const
 
         if (mesh_.globalData().parallel())
         {
-            WarningIn("motionSmootherAlgo::modifyMotionPoints(pointField&)")
+            WarningInFunction
                 << "2D mesh-motion probably not correct in parallel" << endl;
         }
 
@@ -842,18 +852,7 @@ bool Foam::motionSmootherAlgo::scaleMesh
 {
     if (!smoothMesh && adaptPatchIDs_.empty())
     {
-        FatalErrorIn
-        (
-            "motionSmootherAlgo::scaleMesh"
-            "("
-                "labelList&, "
-                "const List<labelPair>&, "
-                "const dictionary&, "
-                "const dictionary&, "
-                "const bool, "
-                "const label"
-            ")"
-        )
+        FatalErrorInFunction
             << "You specified both no movement on the internal mesh points"
             << " (smoothMesh = false)" << nl
             << "and no movement on the patch (adaptPatchIDs is empty)" << nl
@@ -1064,10 +1063,8 @@ void Foam::motionSmootherAlgo::updateMesh()
             )
         )
         {
-            FatalErrorIn
-            (
-                "motionSmootherAlgo::updateMesh"
-            )   << "Patch " << patches[patchI].name()
+            FatalErrorInFunction
+                << "Patch " << patches[patchI].name()
                 << " has wrong boundary condition "
                 << displacement_.boundaryField()[patchI].type()
                 << " on field " << displacement_.name() << nl
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index d4c1054860..4cc17efdcd 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,8 @@ Note
     and/or edges but no faces of pp). Hence we have to be careful when e.g.
     synchronising displacements that the value from the processor which has
     faces of pp get priority. This is currently handled in setDisplacement
-    by resetting the internal displacement to zero before doing anything
+    by resetting the internal displacement to zero on coupled points
+    that are coupled to patch points before doing anything
     else. The combine operator used will give preference to non-zero
     values.
 
@@ -332,6 +333,17 @@ public:
 
             const dictionary& paramDict() const;
 
+            //- Return reference to the point motion displacement field
+            pointVectorField& pointDisplacement()
+            {
+                return displacement_;
+            }
+
+            //- Return const reference to the point motion displacement field
+            const pointVectorField& pointDisplacement() const
+            {
+                return displacement_;
+            }
 
 
         // Edit
@@ -339,7 +351,6 @@ public:
             //- Take over existing mesh position.
             void correct();
 
-
             //- Set patch fields on patchIDs to be consistent with
             //  all other boundary conditions
             static void setDisplacementPatchFields
@@ -471,6 +482,7 @@ public:
                 const bool report,
                 const dictionary& dict,
                 const polyMeshGeometry&,
+                const pointField&,
                 const labelList& checkFaces,
                 labelHashSet& wrongFaces
             );
@@ -483,6 +495,7 @@ public:
                 const bool report,
                 const dictionary& dict,
                 const polyMeshGeometry&,
+                const pointField&,
                 const labelList& checkFaces,
                 const List<labelPair>& baffles,
                 labelHashSet& wrongFaces
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
index 07859539a5..8928dc29bb 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -434,6 +434,7 @@ bool Foam::motionSmootherAlgo::checkMesh
     const bool report,
     const dictionary& dict,
     const polyMeshGeometry& meshGeom,
+    const pointField& points,
     const labelList& checkFaces,
     labelHashSet& wrongFaces
 )
@@ -445,6 +446,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         report,
         dict,
         meshGeom,
+        points,
         checkFaces,
         emptyBaffles,
         wrongFaces
@@ -457,6 +459,7 @@ bool Foam::motionSmootherAlgo::checkMesh
     const bool report,
     const dictionary& dict,
     const polyMeshGeometry& meshGeom,
+    const pointField& points,
     const labelList& checkFaces,
     const List<labelPair>& baffles,
     labelHashSet& wrongFaces
@@ -482,14 +485,14 @@ bool Foam::motionSmootherAlgo::checkMesh
     (
         readScalar(dict.lookup("minArea", true))
     );
-    //const scalar maxIntSkew
-    //(
-    //    readScalar(dict.lookup("maxInternalSkewness", true))
-    //);
-    //const scalar maxBounSkew
-    //(
-    //    readScalar(dict.lookup("maxBoundarySkewness", true))
-    //);
+    const scalar maxIntSkew
+    (
+        readScalar(dict.lookup("maxInternalSkewness", true))
+    );
+    const scalar maxBounSkew
+    (
+        readScalar(dict.lookup("maxBoundarySkewness", true))
+    );
     const scalar minWeight
     (
         readScalar(dict.lookup("minFaceWeight", true))
@@ -512,7 +515,6 @@ bool Foam::motionSmootherAlgo::checkMesh
     (
         readScalar(dict.lookup("minDeterminant", true))
     );
-
     label nWrongFaces = 0;
 
     Info<< "Checking faces in error :" << endl;
@@ -544,8 +546,8 @@ bool Foam::motionSmootherAlgo::checkMesh
         meshGeom.checkFacePyramids
         (
             report,
-            minVol,
-            meshGeom.mesh().points(),
+            minTetQuality,
+            points,
             checkFaces,
             baffles,
             &wrongFaces
@@ -566,7 +568,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         (
             report,
             minTetQuality,
-            meshGeom.mesh().points(),
+            points,
             checkFaces,
             baffles,
             &wrongFaces
@@ -575,7 +577,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         label nNewWrongFaces = returnReduce(wrongFaces.size(), sumOp<label>());
 
         Info<< "    faces with face-decomposition tet quality < "
-            << setw(5) << minTetQuality << "                : "
+            << setw(5) << minTetQuality << "      : "
             << nNewWrongFaces-nWrongFaces << endl;
 
         nWrongFaces = nNewWrongFaces;
@@ -587,7 +589,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         (
             report,
             maxConcave,
-            meshGeom.mesh().points(),
+            points,
             checkFaces,
             &wrongFaces
         );
@@ -604,7 +606,13 @@ bool Foam::motionSmootherAlgo::checkMesh
 
     if (minArea > -SMALL)
     {
-        meshGeom.checkFaceArea(report, minArea, checkFaces, &wrongFaces);
+        meshGeom.checkFaceArea
+        (
+            report,
+            minArea,
+            checkFaces,
+            &wrongFaces
+        );
 
         label nNewWrongFaces = returnReduce(wrongFaces.size(), sumOp<label>());
 
@@ -616,30 +624,32 @@ bool Foam::motionSmootherAlgo::checkMesh
         nWrongFaces = nNewWrongFaces;
     }
 
+    if (maxIntSkew > 0 || maxBounSkew > 0)
+    {
+        polyMeshGeometry::checkFaceSkewness
+        (
+            report,
+            maxIntSkew,
+            maxBounSkew,
+            meshGeom.mesh(),
+            points,
+            meshGeom.cellCentres(),
+            meshGeom.faceCentres(),
+            meshGeom.faceAreas(),
+            checkFaces,
+            baffles,
+            &wrongFaces
+        );
 
-    //- Note: cannot check the skewness without the points and don't want
-    //  to store them on polyMeshGeometry.
-    //if (maxIntSkew > 0 || maxBounSkew > 0)
-    //{
-    //    meshGeom.checkFaceSkewness
-    //    (
-    //        report,
-    //        maxIntSkew,
-    //        maxBounSkew,
-    //        checkFaces,
-    //        baffles,
-    //        &wrongFaces
-    //    );
-    //
-    //    label nNewWrongFaces = returnReduce(wrongFaces.size(),sumOp<label>());
-    //
-    //    Info<< "    faces with skewness > "
-    //        << setw(3) << maxIntSkew
-    //        << " (internal) or " << setw(3) << maxBounSkew
-    //        << " (boundary) : " << nNewWrongFaces-nWrongFaces << endl;
-    //
-    //    nWrongFaces = nNewWrongFaces;
-    //}
+        label nNewWrongFaces = returnReduce(wrongFaces.size(), sumOp<label>());
+
+        Info<< "    faces with skewness > "
+            << setw(3) << maxIntSkew
+            << " (internal) or " << setw(3) << maxBounSkew
+            << " (boundary) : " << nNewWrongFaces-nWrongFaces << endl;
+
+        nWrongFaces = nNewWrongFaces;
+    }
 
     if (minWeight >= 0 && minWeight < 1)
     {
@@ -691,7 +701,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         (
             report,
             minTwist,
-            meshGeom.mesh().points(),
+            points,
             checkFaces,
             &wrongFaces
         );
@@ -714,7 +724,7 @@ bool Foam::motionSmootherAlgo::checkMesh
         (
             report,
             minTriangleTwist,
-            meshGeom.mesh().points(),
+            points,
             checkFaces,
             &wrongFaces
         );
@@ -729,13 +739,13 @@ bool Foam::motionSmootherAlgo::checkMesh
         nWrongFaces = nNewWrongFaces;
     }
 
-    if (minFaceFlatness > -1)
+    if (minFaceFlatness > -SMALL)
     {
         meshGeom.checkFaceFlatness
         (
             report,
             minFaceFlatness,
-            meshGeom.mesh().points(),
+            points,
             checkFaces,
             &wrongFaces
         );
@@ -757,7 +767,7 @@ bool Foam::motionSmootherAlgo::checkMesh
             report,
             minDet,
             checkFaces,
-            meshGeom.affectedCells(meshGeom.mesh(), checkFaces),
+            polyMeshGeometry::affectedCells(meshGeom.mesh(), checkFaces),
             &wrongFaces
         );
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
index 17730d131e..abd1d1f04b 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,11 +118,8 @@ void Foam::motionSmootherAlgo::checkConstraints
 
                 if (savedVal != pf[ppp])
                 {
-                    FatalErrorIn
-                    (
-                        "motionSmootherAlgo::checkConstraints"
-                        "(GeometricField<Type, pointPatchField, pointMesh>&)"
-                    )   << "Patch fields are not consistent on mesh point "
+                    FatalErrorInFunction
+                        << "Patch fields are not consistent on mesh point "
                         << ppp << " coordinate " << mesh.points()[ppp]
                         << " at patch " << bm[patchi].name() << '.'
                         << endl
@@ -290,12 +287,8 @@ void Foam::motionSmootherAlgo::testSyncField
     {
         if (mag(syncedFld[i] - fld[i]) > maxMag)
         {
-            FatalErrorIn
-            (
-                "motionSmootherAlgo::testSyncField"
-                "(const Field<Type>&, const CombineOp&"
-                ", const Type&, const bool)"
-            )   << "On element " << i << " value:" << fld[i]
+            FatalErrorInFunction
+                << "On element " << i << " value:" << fld[i]
                 << " synchronised value:" << syncedFld[i]
                 << abort(FatalError);
         }
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index 57725dc57c..b583589ecf 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,13 +31,11 @@ License
 #include "unitConversion.H"
 #include "primitiveMeshTools.H"
 
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(polyMeshGeometry, 0);
-
+namespace Foam
+{
+    defineTypeNameAndDebug(polyMeshGeometry, 0);
 }
 
 
@@ -105,86 +103,82 @@ void Foam::polyMeshGeometry::updateCellCentresAndVols
     const labelList& changedFaces
 )
 {
+    const labelList& own = mesh().faceOwner();
+    const cellList& cells = mesh().cells();
+
     // Clear the fields for accumulation
     UIndirectList<vector>(cellCentres_, changedCells) = vector::zero;
     UIndirectList<scalar>(cellVolumes_, changedCells) = 0.0;
 
-    const labelList& own = mesh_.faceOwner();
-    const labelList& nei = mesh_.faceNeighbour();
 
-    // first estimate the approximate cell centre as the average of face centres
-
-    vectorField cEst(mesh_.nCells());
-    UIndirectList<vector>(cEst, changedCells) = vector::zero;
-    scalarField nCellFaces(mesh_.nCells());
-    UIndirectList<scalar>(nCellFaces, changedCells) = 0.0;
-
-    forAll(changedFaces, i)
+    // Re-calculate the changed cell centres and volumes
+    forAll(changedCells, changedCellI)
     {
-        label faceI = changedFaces[i];
-        cEst[own[faceI]] += faceCentres_[faceI];
-        nCellFaces[own[faceI]] += 1;
+        const label cellI(changedCells[changedCellI]);
 
-        if (mesh_.isInternalFace(faceI))
+        const labelList& cFaces(cells[cellI]);
+
+
+        // Estimate the cell centre and bounding box using the face centres
+        vector cEst = vector::zero;
+        boundBox bb(boundBox::invertedBox);
+
+        forAll(cFaces, cFaceI)
         {
-            cEst[nei[faceI]] += faceCentres_[faceI];
-            nCellFaces[nei[faceI]] += 1;
+            const point& fc = faceCentres_[cFaces[cFaceI]];
+            cEst += fc;
+            bb.max() = max(bb.max(), fc);
+            bb.min() = min(bb.min(), fc);
         }
-    }
+        cEst /= cFaces.size();
 
-    forAll(changedCells, i)
-    {
-        label cellI = changedCells[i];
-        cEst[cellI] /= nCellFaces[cellI];
-    }
 
-    forAll(changedFaces, i)
-    {
-        label faceI = changedFaces[i];
-
-        // Calculate 3*face-pyramid volume
-        scalar pyr3Vol = max
-        (
-            faceAreas_[faceI] & (faceCentres_[faceI] - cEst[own[faceI]]),
-            VSMALL
-        );
-
-        // Calculate face-pyramid centre
-        vector pc = (3.0/4.0)*faceCentres_[faceI] + (1.0/4.0)*cEst[own[faceI]];
-
-        // Accumulate volume-weighted face-pyramid centre
-        cellCentres_[own[faceI]] += pyr3Vol*pc;
-
-        // Accumulate face-pyramid volume
-        cellVolumes_[own[faceI]] += pyr3Vol;
-
-        if (mesh_.isInternalFace(faceI))
+        // Sum up the face-pyramid contributions
+        forAll(cFaces, cFaceI)
         {
-            // Calculate 3*face-pyramid volume
-            scalar pyr3Vol = max
-            (
-                faceAreas_[faceI] & (cEst[nei[faceI]] - faceCentres_[faceI]),
-                VSMALL
-            );
+            const label faceI(cFaces[cFaceI]);
 
-            // Calculate face-pyramid centre
-            vector pc =
-                (3.0/4.0)*faceCentres_[faceI]
-              + (1.0/4.0)*cEst[nei[faceI]];
+            // Calculate 3* the face-pyramid volume
+            scalar pyr3Vol = faceAreas_[faceI] & (faceCentres_[faceI] - cEst);
 
-            // Accumulate volume-weighted face-pyramid centre
-            cellCentres_[nei[faceI]] += pyr3Vol*pc;
+            if (own[faceI] != cellI)
+            {
+                pyr3Vol = -pyr3Vol;
+            }
 
             // Accumulate face-pyramid volume
-            cellVolumes_[nei[faceI]] += pyr3Vol;
+            cellVolumes_[cellI] += pyr3Vol;
+
+            // Calculate the face-pyramid centre
+            const vector pCtr = (3.0/4.0)*faceCentres_[faceI] + (1.0/4.0)*cEst;
+
+            // Accumulate volume-weighted face-pyramid centre
+            cellCentres_[cellI] += pyr3Vol*pCtr;
         }
-    }
 
-    forAll(changedCells, i)
-    {
-        label cellI = changedCells[i];
+        // Average the accumulated quantities
+
+        if (mag(cellVolumes_[cellI]) > VSMALL)
+        {
+            point cc = cellCentres_[cellI] / cellVolumes_[cellI];
+
+            // Do additional check for collapsed cells since some volumes
+            // (e.g. 1e-33) do not trigger above but do return completely
+            // wrong cell centre
+            if (bb.contains(cc))
+            {
+                cellCentres_[cellI] = cc;
+            }
+            else
+            {
+                cellCentres_[cellI] = cEst;
+            }
+        }
+        else
+        {
+            cellCentres_[cellI] = cEst;
+        }
 
-        cellCentres_[cellI] /= cellVolumes_[cellI] + VSMALL;
         cellVolumes_[cellI] *= (1.0/3.0);
     }
 }
@@ -261,12 +255,8 @@ Foam::scalar Foam::polyMeshGeometry::checkNonOrtho
             // Non-orthogonality greater than 90 deg
             if (report)
             {
-                WarningIn
-                (
-                    "polyMeshGeometry::checkFaceDotProduct"
-                    "(const bool, const scalar, const labelList&"
-                    ", labelHashSet*)"
-                )   << "Severe non-orthogonality detected for face "
+                WarningInFunction
+                    << "Severe non-orthogonality detected for face "
                     << faceI
                     << " between cells " << mesh.faceOwner()[faceI]
                     << " and " << nei
@@ -541,11 +531,8 @@ bool Foam::polyMeshGeometry::checkFaceDotProduct
     {
         if (report)
         {
-            SeriousErrorIn
-            (
-                "polyMeshGeometry::checkFaceDotProduct"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Error in non-orthogonality detected" << endl;
+            SeriousErrorInFunction
+                << "Error in non-orthogonality detected" << endl;
         }
 
         return true;
@@ -724,12 +711,8 @@ bool Foam::polyMeshGeometry::checkFacePyramids
     {
         if (report)
         {
-            SeriousErrorIn
-            (
-                "polyMeshGeometry::checkFacePyramids("
-                "const bool, const scalar, const pointField&"
-                ", const labelList&, labelHashSet*)"
-            )   << "Error in face pyramids: faces pointing the wrong way."
+            SeriousErrorInFunction
+                << "Error in face pyramids: faces pointing the wrong way."
                 << endl;
         }
 
@@ -957,12 +940,8 @@ bool Foam::polyMeshGeometry::checkFaceTets
     {
         if (report)
         {
-            SeriousErrorIn
-            (
-                "polyMeshGeometry::checkFaceTets("
-                "const bool, const scalar, const pointField&, const pointField&"
-                ", const labelList&, labelHashSet*)"
-            )   << "Error in face decomposition: negative tets."
+            SeriousErrorInFunction
+                << "Error in face decomposition: negative tets."
                 << endl;
         }
 
@@ -1171,11 +1150,7 @@ bool Foam::polyMeshGeometry::checkFaceSkewness
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkFaceSkewness"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Large face skewness detected.  Max skewness = "
+            WarningInFunction
                 << 100*maxSkew
                 << " percent.\nThis may impair the quality of the result." << nl
                 << nWarnSkew << " highly skew faces detected."
@@ -1331,11 +1306,7 @@ bool Foam::polyMeshGeometry::checkFaceWeights
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkFaceWeights"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Small interpolation weight detected.  Min weight = "
+            WarningInFunction
                 << minWeight << '.' << nl
                 << nWarnWeight << " faces with small weights detected."
                 << endl;
@@ -1473,11 +1444,7 @@ bool Foam::polyMeshGeometry::checkVolRatio
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkVolRatio"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Small volume ratio detected.  Min ratio = "
+            WarningInFunction
                 << minRatio << '.' << nl
                 << nWarnRatio << " faces with small ratios detected."
                 << endl;
@@ -1515,12 +1482,8 @@ bool Foam::polyMeshGeometry::checkFaceAngles
 {
     if (maxDeg < -SMALL || maxDeg > 180+SMALL)
     {
-        FatalErrorIn
-        (
-            "polyMeshGeometry::checkFaceAngles"
-            "(const bool, const scalar, const pointField&, const labelList&"
-            ", labelHashSet*)"
-        )   << "maxDeg should be [0..180] but is now " << maxDeg
+        FatalErrorInFunction
+            << "maxDeg should be [0..180] but is now " << maxDeg
             << abort(FatalError);
     }
 
@@ -1622,12 +1585,8 @@ bool Foam::polyMeshGeometry::checkFaceAngles
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkFaceAngles"
-                "(const bool, const scalar,  const pointField&"
-                ", const labelList&, labelHashSet*)"
-            )   << nConcave  << " face points with severe concave angle (> "
+            WarningInFunction
+                << nConcave  << " face points with severe concave angle (> "
                 << maxDeg << " deg) found.\n"
                 << endl;
         }
@@ -1658,13 +1617,8 @@ bool Foam::polyMeshGeometry::checkFaceTwist
 {
     if (minTwist < -1-SMALL || minTwist > 1+SMALL)
     {
-        FatalErrorIn
-        (
-            "polyMeshGeometry::checkFaceTwist"
-            "(const bool, const scalar, const polyMesh&, const pointField&"
-            ", const pointField&, const pointField&, const pointField&"
-            ", const labelList&, labelHashSet*)"
-        )   << "minTwist should be [-1..1] but is now " << minTwist
+        FatalErrorInFunction
+            << "minTwist should be [-1..1] but is now " << minTwist
             << abort(FatalError);
     }
 
@@ -1816,13 +1770,8 @@ bool Foam::polyMeshGeometry::checkFaceTwist
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkFaceTwist"
-                "(const bool, const scalar, const polyMesh&, const pointField&"
-                ", const pointField&, const pointField&, const pointField&"
-                ", const labelList&, labelHashSet*)"
-            )   << nWarped  << " faces with severe warpage "
+            WarningInFunction
+                << nWarped  << " faces with severe warpage "
                 << "(cosine of the angle between triangle normal and "
                 << "face normal < " << minTwist << ") found.\n"
                 << endl;
@@ -1852,12 +1801,8 @@ bool Foam::polyMeshGeometry::checkTriangleTwist
 {
     if (minTwist < -1-SMALL || minTwist > 1+SMALL)
     {
-        FatalErrorIn
-        (
-            "polyMeshGeometry::checkTriangleTwist"
-            "(const bool, const scalar, const polyMesh&, const pointField&"
-            ", const labelList&, labelHashSet*)"
-        )   << "minTwist should be [-1..1] but is now " << minTwist
+        FatalErrorInFunction
+            << "minTwist should be [-1..1] but is now " << minTwist
             << abort(FatalError);
     }
 
@@ -1976,12 +1921,8 @@ bool Foam::polyMeshGeometry::checkTriangleTwist
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkTriangleTwist"
-                "(const bool, const scalar, const polyMesh&"
-                ", const pointField&, const labelList&, labelHashSet*)"
-            )   << nWarped  << " faces with severe warpage "
+            WarningInFunction
+                << nWarped  << " faces with severe warpage "
                 << "(cosine of the angle between consecutive triangle normals"
                 << " < " << minTwist << ") found.\n"
                 << endl;
@@ -2010,12 +1951,8 @@ bool Foam::polyMeshGeometry::checkFaceFlatness
 {
     if (minFlatness < -SMALL || minFlatness > 1+SMALL)
     {
-        FatalErrorIn
-        (
-            "polyMeshGeometry::checkFaceFlatness"
-            "(const bool, const scalar, const polyMesh&, const pointField&"
-            ", const pointField&, const labelList&, labelHashSet*)"
-        )   << "minFlatness should be [0..1] but is now " << minFlatness
+        FatalErrorInFunction
+            << "minFlatness should be [0..1] but is now " << minFlatness
             << abort(FatalError);
     }
 
@@ -2081,13 +2018,8 @@ bool Foam::polyMeshGeometry::checkFaceFlatness
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkFaceFlatness"
-                "(const bool, const scalar, const polyMesh&"
-                ", const pointField&, const pointField&, const labelList&"
-                ", labelHashSet*)"
-            )   << nWarped  << " non-flat faces "
+            WarningInFunction
+                << nWarped  << " non-flat faces "
                 << "(area of invidual triangles"
                 << " compared to overall area"
                 << " < " << minFlatness << ") found.\n"
@@ -2149,12 +2081,8 @@ bool Foam::polyMeshGeometry::checkFaceArea
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkFaceArea"
-                "(const bool, const scalar, const polyMesh&"
-                ", const pointField&, const labelList&, labelHashSet*)"
-            )   << nZeroArea  << " faces with area < " << minArea
+            WarningInFunction
+                << nZeroArea  << " faces with area < " << minArea
                 << " found.\n"
                 << endl;
         }
@@ -2254,13 +2182,8 @@ bool Foam::polyMeshGeometry::checkCellDeterminant
     {
         if (report)
         {
-            WarningIn
-            (
-                "polyMeshGeometry::checkCellDeterminant"
-                "(const bool, const scalar, const polyMesh&"
-                ", const pointField&, const labelList&, const labelList&"
-                ", labelHashSet*)"
-            )   << nWarnDet << " cells with determinant < " << warnDet
+            WarningInFunction
+                << nWarnDet << " cells with determinant < " << warnDet
                 << " found.\n"
                 << endl;
         }
diff --git a/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C b/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
index fe902f95a0..19742e25b9 100644
--- a/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,12 +55,8 @@ Foam::direction Foam::componentDisplacementMotionSolver::cmpt
     }
     else
     {
-        FatalErrorIn
-        (
-            "componentDisplacementMotionSolver::"
-            "componentDisplacementMotionSolver"
-            "(const polyMesh& mesh, const IOdictionary&)"
-        )   << "Given component name " << cmptName << " should be x, y or z"
+        FatalErrorInFunction
+            << "Given component name " << cmptName << " should be x, y or z"
             << exit(FatalError);
 
         return 0;
@@ -111,15 +107,8 @@ Foam::componentDisplacementMotionSolver::componentDisplacementMotionSolver
 {
     if (points0_.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "componentDisplacementMotionSolver::"
-            "componentDisplacementMotionSolver\n"
-            "(\n"
-            "    const polyMesh&,\n"
-            "    const IOdictionary&\n"
-            ")"
-        )   << "Number of points in mesh " << mesh.nPoints()
+        FatalErrorInFunction
+            << "Number of points in mesh " << mesh.nPoints()
             << " differs from number of points " << points0_.size()
             << " read from file "
             <<
@@ -199,11 +188,8 @@ void Foam::componentDisplacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
         }
         else
         {
-            FatalErrorIn
-            (
-                "displacementLaplacianFvMotionSolver::updateMesh"
-                "(const mapPolyMesh& mpm)"
-            )   << "Cannot work out coordinates of introduced vertices."
+            FatalErrorInFunction
+                << "Cannot work out coordinates of introduced vertices."
                 << " New vertex " << pointI << " at coordinate "
                 << points[pointI] << exit(FatalError);
         }
diff --git a/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.C b/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.C
index 57781e3bb1..7d38bcfa54 100644
--- a/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.C
+++ b/src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,12 +55,8 @@ Foam::direction Foam::componentVelocityMotionSolver::cmpt
     }
     else
     {
-        FatalErrorIn
-        (
-            "componentVelocityMotionSolver::"
-            "componentVelocityMotionSolver"
-            "(const polyMesh& mesh, const IOdictionary&)"
-        )   << "Given component name " << cmptName << " should be x, y or z"
+        FatalErrorInFunction
+            << "Given component name " << cmptName << " should be x, y or z"
             << exit(FatalError);
 
         return 0;
diff --git a/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C b/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C
index 6d759d9647..71e9538f77 100644
--- a/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,25 +31,23 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(displacementMotionSolver, 0);
+    defineRunTimeSelectionTable(displacementMotionSolver, displacement);
 }
 
 
-// * * * * * * * * * * * * * Protected Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::IOobject Foam::displacementMotionSolver::points0IO
-(
-    const polyMesh& mesh
-) const
+Foam::IOobject Foam::displacementMotionSolver::points0IO(const polyMesh& mesh)
 {
     const word instance =
-        time().findInstance
+        mesh.time().findInstance
         (
             mesh.meshDir(),
             "points0",
             IOobject::READ_IF_PRESENT
         );
 
-    if (instance != time().constant())
+    if (instance != mesh.time().constant())
     {
         // points0 written to a time folder
 
@@ -58,7 +56,7 @@ Foam::IOobject Foam::displacementMotionSolver::points0IO
             (
                 "points0",
                 instance,
-                polyMesh::meshSubDir,
+                mesh.meshDir(),
                 mesh,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
@@ -73,7 +71,7 @@ Foam::IOobject Foam::displacementMotionSolver::points0IO
         (
             "points0",
             instance,
-            polyMesh::meshSubDir,
+            mesh.meshDir(),
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
@@ -93,7 +91,7 @@ Foam::IOobject Foam::displacementMotionSolver::points0IO
                 (
                     "points",
                     instance,
-                    polyMesh::meshSubDir,
+                    mesh.meshDir(),
                     mesh,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
@@ -130,24 +128,15 @@ Foam::displacementMotionSolver::displacementMotionSolver
 {
     if (points0_.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "displacementMotionSolver::"
-            "displacementMotionSolver\n"
-            "(\n"
-            "    const polyMesh&,\n"
-            "    const IOdictionary&,\n"
-            "    const word&\n"
-            ")"
-        )   << "Number of points in mesh " << mesh.nPoints()
+        FatalErrorInFunction
+            << "Number of points in mesh " << mesh.nPoints()
             << " differs from number of points " << points0_.size()
             << " read from file "
-            <<
-                IOobject
+            << IOobject
                 (
                     "points",
                     time().constant(),
-                    polyMesh::meshSubDir,
+                    mesh.meshDir(),
                     mesh,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
@@ -158,6 +147,90 @@ Foam::displacementMotionSolver::displacementMotionSolver
 }
 
 
+Foam::displacementMotionSolver::displacementMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict,
+    const pointVectorField& pointDisplacement,
+    const pointIOField& points0,
+    const word& type
+)
+:
+    motionSolver(mesh, dict, type),
+    pointDisplacement_
+    (
+        IOobject(pointDisplacement, "pointDisplacement"),
+        pointDisplacement
+    ),
+    points0_(points0)
+{
+    if (points0_.size() != mesh.nPoints())
+    {
+        FatalErrorInFunction
+            << "Number of points in mesh " << mesh.nPoints()
+            << " differs from number of points " << points0_.size()
+            << " read from file " << points0.filePath()
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::displacementMotionSolver>
+Foam::displacementMotionSolver::New
+(
+    const word& solverTypeName,
+    const polyMesh& mesh,
+    const IOdictionary& solverDict,
+    const pointVectorField& pointDisplacement,
+    const pointIOField& points0
+)
+{
+    //const word solverTypeName(solverDict.lookup("solver"));
+
+    Info<< "Selecting motion solver: " << solverTypeName << endl;
+
+    const_cast<Time&>(mesh.time()).libs().open
+    (
+        solverDict,
+        "motionSolverLibs",
+        displacementConstructorTablePtr_
+    );
+
+    if (!displacementConstructorTablePtr_)
+    {
+        FatalErrorInFunction
+            << "solver table is empty"
+            << exit(FatalError);
+    }
+
+    displacementConstructorTable::iterator cstrIter =
+        displacementConstructorTablePtr_->find(solverTypeName);
+
+    if (cstrIter == displacementConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown solver type "
+            << solverTypeName << nl << nl
+            << "Valid solver types are:" << endl
+            << displacementConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<displacementMotionSolver>
+    (
+        cstrIter()
+        (
+            mesh,
+            solverDict,
+            pointDisplacement,
+            points0
+        )
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::displacementMotionSolver::~displacementMotionSolver()
@@ -222,11 +295,8 @@ void Foam::displacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
         }
         else
         {
-            FatalErrorIn
-            (
-                "displacementMotionSolver::updateMesh"
-                "(const mapPolyMesh&)"
-            )   << "Cannot determine co-ordinates of introduced vertices."
+            FatalErrorInFunction
+                << "Cannot determine co-ordinates of introduced vertices."
                 << " New vertex " << pointI << " at co-ordinate "
                 << points[pointI] << exit(FatalError);
         }
diff --git a/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.H b/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.H
index 810aae068c..dc4bac3b46 100644
--- a/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.H
+++ b/src/dynamicMesh/motionSolver/displacement/displacementMotionSolver.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,14 +68,8 @@ protected:
         pointIOField points0_;
 
 
-    // Protected Member Functions
-
-        //- Return IO object for points0
-        IOobject points0IO(const polyMesh& mesh) const;
-
 private:
 
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -84,12 +78,49 @@ private:
         //- Disallow default bitwise assignment
         void operator=(const displacementMotionSolver&);
 
+
 public:
 
     //- Runtime type information
     TypeName("displacementMotionSolver");
 
 
+    // Declare run-time constructor selection tables
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            displacementMotionSolver,
+            displacement,
+            (
+                const polyMesh& mesh,
+                const IOdictionary& dict,
+                const pointVectorField& pointDisplacement,
+                const pointIOField& points0
+            ),
+            (mesh, dict, pointDisplacement, points0)
+        );
+
+    // Static Member Functions
+
+        //- Return IO object for points0
+        static IOobject points0IO(const polyMesh& mesh);
+
+
+    // Selectors
+
+        //- Select constructed from polyMesh, dictionary and components.
+        //  If dictionary was registered this will 'steal' that registration.
+        static autoPtr<displacementMotionSolver> New
+        (
+            const word& solverTypeName,
+            const polyMesh&,
+            const IOdictionary&,
+            const pointVectorField& pointDisplacement,
+            const pointIOField& points0
+        );
+
+
     // Constructors
 
         //- Construct from mesh and dictionary
@@ -100,6 +131,16 @@ public:
             const word& type
         );
 
+        //- Construct from mesh and dictionary
+        displacementMotionSolver
+        (
+            const polyMesh&,
+            const IOdictionary&,
+            const pointVectorField& pointDisplacement,
+            const pointIOField& points0,
+            const word& type
+        );
+
 
     //- Destructor
     virtual ~displacementMotionSolver();
diff --git a/src/dynamicMesh/motionSolver/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver/motionSolver.C
index 5613ac6b41..efcaab60e1 100644
--- a/src/dynamicMesh/motionSolver/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolver/motionSolver/motionSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,10 +110,8 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
 
     if (!dictionaryConstructorTablePtr_)
     {
-        FatalErrorIn
-        (
-            "motionSolver::New(const polyMesh& mesh)"
-        )   << "solver table is empty"
+        FatalErrorInFunction
+            << "solver table is empty"
             << exit(FatalError);
     }
 
@@ -122,10 +120,8 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "motionSolver::New(const polyMesh&)"
-        )   << "Unknown solver type "
+        FatalErrorInFunction
+            << "Unknown solver type "
             << solverTypeName << nl << nl
             << "Valid solver types are:" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/dynamicMesh/motionSolver/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolver/motionSolver/motionSolver.H
index 651c0d9d18..32b0e945e1 100644
--- a/src/dynamicMesh/motionSolver/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolver/motionSolver/motionSolver.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,7 +67,9 @@ private:
         dictionary coeffDict_;
 
 
-    // Private Member Functions
+protected:
+
+    // Protected Member Functions
 
         //- De-register object if registered and assign to current
         static IOobject stealRegistration(const IOdictionary& dict);
diff --git a/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C b/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C
new file mode 100644
index 0000000000..150e712c10
--- /dev/null
+++ b/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "velocityDisplacementMotionSolver.H"
+#include "displacementMotionSolver.H"
+#include "fixedValuePointPatchField.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(velocityDisplacementMotionSolver, 0);
+
+    addToRunTimeSelectionTable
+    (
+        motionSolver,
+        velocityDisplacementMotionSolver,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::wordList
+Foam::velocityDisplacementMotionSolver::pointDisplacementBoundaryTypes() const
+{
+    const pointVectorField::GeometricBoundaryField& pmUbf
+    (
+        pointMotionU().boundaryField()
+    );
+
+    wordList cmUbf = pmUbf.types();
+
+    forAll(pmUbf, patchI)
+    {
+        if (isA<fixedValuePointPatchField<vector> >(pmUbf[patchI]))
+        {
+            cmUbf[patchI] = fixedValuePointPatchField<vector>::typeName;
+        }
+    }
+
+    return cmUbf;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::velocityDisplacementMotionSolver::velocityDisplacementMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict
+)
+:
+    velocityMotionSolver(mesh, dict, typeName),
+    displacementMotionSolverPtr_()
+{
+    pointIOField points0(displacementMotionSolver::points0IO(mesh));
+
+    pointVectorField pointDisplacement
+    (
+        IOobject
+        (
+            "pointVelocityDisplacement",
+            mesh.time().timeName(),
+            mesh
+        ),
+        pointMotionU().mesh(),
+        dimLength,
+        pointDisplacementBoundaryTypes()
+    );
+
+    pointDisplacement.internalField() = mesh.points() - points0;
+
+    displacementMotionSolverPtr_.set
+    (
+        dynamic_cast<displacementMotionSolver*>
+        (
+            displacementMotionSolver::New
+            (
+                coeffDict().lookup("solver"),
+                mesh,
+                IOdictionary
+                (
+                    IOobject
+                    (
+                        dict.name() + "Coeffs",
+                        mesh.time().constant(),
+                        mesh
+                    ),
+                    coeffDict()
+                ),
+                pointDisplacement,
+                points0
+            ).ptr()
+        )
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::velocityDisplacementMotionSolver::~velocityDisplacementMotionSolver()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::pointField>
+Foam::velocityDisplacementMotionSolver::curPoints() const
+{
+    return displacementMotionSolverPtr_->curPoints();
+}
+
+
+void Foam::velocityDisplacementMotionSolver::solve()
+{
+    movePoints(mesh().points());
+
+    const scalar deltaT(mesh().time().deltaTValue());
+
+    // Current and old point displacements
+    pointVectorField& displacement
+    (
+        displacementMotionSolverPtr_->pointDisplacement()
+    );
+    const vectorField displacementOld
+    (
+        mesh().points() - displacementMotionSolverPtr_->points0()
+    );
+
+    // Update the velocity boundary conditions
+    pointMotionU().correctBoundaryConditions();
+
+    // Update the displacement boundary conditions
+    forAll(pointMotionU().boundaryField(), patchI)
+    {
+        const pointPatchVectorField& patchField
+        (
+            pointMotionU().boundaryField()[patchI]
+        );
+
+        displacement.boundaryField()[patchI] ==
+            patchField.patchInternalField()*deltaT
+          + patchField.patchInternalField(displacementOld);
+    }
+
+    // Run the sub-solver
+    displacementMotionSolverPtr_->solve();
+
+    // Update the velocity
+    pointMotionU().internalField() =
+        (displacement.internalField() - displacementOld)/deltaT;
+}
+
+
+void Foam::velocityDisplacementMotionSolver::movePoints(const pointField& p)
+{
+    velocityMotionSolver::movePoints(p);
+
+    displacementMotionSolverPtr_->movePoints(p);
+}
+
+
+void Foam::velocityDisplacementMotionSolver::updateMesh
+(
+    const mapPolyMesh& mpm
+)
+{
+    velocityMotionSolver::updateMesh(mpm);
+
+    displacementMotionSolverPtr_->updateMesh(mpm);
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.H b/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.H
new file mode 100644
index 0000000000..735a3f5c09
--- /dev/null
+++ b/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::velocityDisplacementMotionSolver
+
+Description
+    Mesh motion solver for a polyMesh. Wraps a displacement motion solver in a
+    velocity motion solver.
+
+SourceFiles
+    velocityDisplacementMotionSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef velocityDisplacementMotionSolver_H
+#define velocityDisplacementMotionSolver_H
+
+#include "velocityMotionSolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward class declarations
+class displacementMotionSolver;
+
+/*---------------------------------------------------------------------------*\
+              Class velocityDisplacementMotionSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class velocityDisplacementMotionSolver
+:
+    public velocityMotionSolver
+{
+    // Private data
+
+        //- Displacement motion solver
+        autoPtr<displacementMotionSolver> displacementMotionSolverPtr_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        velocityDisplacementMotionSolver
+        (
+            const velocityDisplacementMotionSolver&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const velocityDisplacementMotionSolver&);
+
+        //- Get the boundary condition types for the point displacement
+        wordList pointDisplacementBoundaryTypes() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("velocityDisplacement");
+
+
+    // Constructors
+
+        //- Construct from polyMesh and IOdictionary
+        velocityDisplacementMotionSolver
+        (
+            const polyMesh&,
+            const IOdictionary&
+        );
+
+
+    //- Destructor
+    ~velocityDisplacementMotionSolver();
+
+
+    // Member Functions
+
+        //- Return point location obtained from the current motion field
+        virtual tmp<pointField> curPoints() const;
+
+        //- Solve for motion
+        virtual void solve();
+
+        //- Update geometry
+        virtual void movePoints(const pointField&);
+
+        //- Update topology
+        virtual void updateMesh(const mapPolyMesh&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 56fc14cdc7..3cc0179b33 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -214,10 +214,8 @@ void Foam::perfectInterface::setRefinement
 
         if (!matchOk)
         {
-            FatalErrorIn
-            (
-                "perfectInterface::setRefinement(polyTopoChange& ref) const"
-            )   << "Points on patch sides do not match to within tolerance "
+            FatalErrorInFunction
+                << "Points on patch sides do not match to within tolerance "
                 << typDim << exit(FatalError);
         }
 
@@ -244,10 +242,8 @@ void Foam::perfectInterface::setRefinement
 
     if (!matchOk)
     {
-        FatalErrorIn
-        (
-            "perfectInterface::setRefinement(polyTopoChange& ref) const"
-        )   << "Face centres of patch sides do not match to within tolerance "
+        FatalErrorInFunction
+            << "Face centres of patch sides do not match to within tolerance "
             << typDim << exit(FatalError);
     }
 
@@ -288,10 +284,8 @@ void Foam::perfectInterface::setRefinement
 
         if (affectedFaces.erase(faceI))
         {
-            WarningIn
-            (
-                "perfectInterface::setRefinement(polyTopoChange&) const"
-            )   << "Found face " << faceI << " vertices "
+            WarningInFunction
+                << "Found face " << faceI << " vertices "
                 << mesh.faces()[faceI] << " whose points are"
                 << " used both by master patch and slave patch" << endl;
         }
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 27bea7ae47..02efdeabf0 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -183,7 +183,7 @@ void Foam::faceCoupleInfo::writePointsFaces() const
             }
             else
             {
-                WarningIn("writePointsFaces()")
+                WarningInFunction
                     << "No master face for cut face " << cutFaceI
                     << " at position " << c[cutFaceI].centre(c.points())
                     << endl;
@@ -453,7 +453,7 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
 
             if (magEVec < VSMALL)
             {
-                WarningIn("faceCoupleInfo::mostAlignedEdge")
+                WarningInFunction
                     << "Crossing zero sized edge " << edgeI
                     << " coords:" << localPoints[otherPointI]
                     << localPoints[pointI]
@@ -532,11 +532,8 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
 
         if (stringedEdges.empty())
         {
-            FatalErrorIn
-            (
-                "faceCoupleInfo::setCutEdgeToPoints"
-                "(const labelList&)"
-            )   << "Did not match all of master edges to cutFace edges"
+            FatalErrorInFunction
+                << "Did not match all of master edges to cutFace edges"
                 << nl
                 << "First unmatched edge:" << masterEdgeI << " endPoints:"
                 << masterPatch().localPoints()[masterE[0]]
@@ -611,11 +608,8 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
                 // Check
                 if (oldStart == startVertI)
                 {
-                    FatalErrorIn
-                    (
-                        "faceCoupleInfo::setCutEdgeToPoints"
-                        "(const labelList&)"
-                    )   << " unsplitEdge:" << unsplitEdge
+                    FatalErrorInFunction
+                        << " unsplitEdge:" << unsplitEdge
                         << " does not correspond to split edges "
                         << UIndirectList<edge>(cutEdges, stringedEdges)()
                         << abort(FatalError);
@@ -652,12 +646,8 @@ Foam::label Foam::faceCoupleInfo::matchFaces
 {
     if (f0.size() != f1.size())
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::matchFaces"
-            "(const scalar, const face&, const pointField&"
-            ", const face&, const pointField&)"
-        )   << "Different sizes for supposedly matching faces." << nl
+        FatalErrorInFunction
+            << "Different sizes for supposedly matching faces." << nl
             << "f0:" << f0 << " coords:" << UIndirectList<point>(points0, f0)()
             << nl
             << "f1:" << f1 << " coords:" << UIndirectList<point>(points1, f1)()
@@ -708,12 +698,8 @@ Foam::label Foam::faceCoupleInfo::matchFaces
 
     if (matchFp == -1)
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::matchFaces"
-            "(const scalar, const face&, const pointField&"
-            ", const face&, const pointField&)"
-        )   << "No unique match between two faces" << nl
+        FatalErrorInFunction
+            << "No unique match between two faces" << nl
             << "Face " << f0 << " coords "
             << UIndirectList<point>(points0, f0)() << nl
             << "Face " << f1 << " coords "
@@ -783,7 +769,7 @@ bool Foam::faceCoupleInfo::matchPointsThroughFaces
             //const point& patchPt = patchPoints[patchPointI];
             //if (mag(cutPt - patchPt) > SMALL)
             //{
-            //    FatalErrorIn("matchPointsThroughFaces")
+            //    FatalErrorInFunction
             //    << "cutP:" << cutPt
             //    << " patchP:" << patchPt
             //    << abort(FatalError);
@@ -1159,11 +1145,8 @@ Foam::label Foam::faceCoupleInfo::growCutFaces
 
                                 const face& nbrF = masterPatch()[masterFaceI];
 
-                                FatalErrorIn
-                                (
-                                    "faceCoupleInfo::growCutFaces"
-                                    "(const labelList&, Map<labelList>&)"
-                                )   << "Cut face "
+                                FatalErrorInFunction
+                                    << "Cut face "
                                     << cutFaces()[faceI].points(cutPoints)
                                     << " has master "
                                     << myMaster
@@ -1240,10 +1223,7 @@ void Foam::faceCoupleInfo::checkMatch(const labelList& cutToMasterEdges) const
 
                         const face& nbrF = masterLocalFaces[masterFaceI];
 
-                        FatalErrorIn
-                        (
-                            "faceCoupleInfo::checkMatch(const labelList&) const"
-                        )
+                        FatalErrorInFunction
                             << "Internal CutEdge " << e
                             << " coord:"
                             << cutLocalPoints[e[0]]
@@ -1535,11 +1515,8 @@ void Foam::faceCoupleInfo::perfectPointMatch
 
     if (!matchedAllFaces)
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::perfectPointMatch"
-            "(const scalar, const bool)"
-        )   << "Did not match all of the master faces to the slave faces"
+        FatalErrorInFunction
+            << "Did not match all of the master faces to the slave faces"
             << endl
             << "This usually means that the slave patch and master patch"
             << " do not align to within " << absTol << " metre."
@@ -1685,11 +1662,8 @@ void Foam::faceCoupleInfo::subDivisionMatch
 
     if (!matchedAllPoints)
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::subDivisionMatch"
-            "(const polyMesh&, const bool, const scalar)"
-        )   << "Did not match all of the master points to the slave points"
+        FatalErrorInFunction
+            << "Did not match all of the master points to the slave points"
             << endl
             << "This usually means that the slave patch is not a"
             << " subdivision of the master patch"
@@ -1775,11 +1749,8 @@ void Foam::faceCoupleInfo::subDivisionMatch
                     false
                 );
 
-                FatalErrorIn
-                (
-                    "faceCoupleInfo::subDivisionMatch"
-                    "(const polyMesh&, const bool, const scalar)"
-                )   << "Problem in finding cut edges corresponding to"
+                FatalErrorInFunction
+                    << "Problem in finding cut edges corresponding to"
                     << " master edge " << masterEdge
                     << " points:" << masterPoints[masterEdge[0]]
                     << ' ' << masterPoints[masterEdge[1]]
@@ -1884,11 +1855,8 @@ void Foam::faceCoupleInfo::subDivisionMatch
         {
             const face& cutF = cutFaces()[cutFaceI];
 
-            FatalErrorIn
-            (
-                "faceCoupleInfo::subDivisionMatch"
-                "(const polyMesh&, const bool, const scalar)"
-            )   << "Did not match all of cutFaces to a master face" << nl
+            FatalErrorInFunction
+                << "Did not match all of cutFaces to a master face" << nl
                 << "First unmatched cut face:" << cutFaceI << " with points:"
                 << UIndirectList<point>(cutFaces().points(), cutF)()
                 << nl
@@ -2042,11 +2010,8 @@ Foam::faceCoupleInfo::faceCoupleInfo
 {
     if (perfectMatch && (masterAddressing.size() != slaveAddressing.size()))
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::faceCoupleInfo(const primitiveMesh&"
-            ", const primitiveMesh&, const scalar, const bool"
-        )   << "Perfect match specified but number of master and slave faces"
+        FatalErrorInFunction
+            << "Perfect match specified but number of master and slave faces"
             << " differ." << endl
             << "master:" << masterAddressing.size()
             << "  slave:" << slaveAddressing.size()
@@ -2059,11 +2024,8 @@ Foam::faceCoupleInfo::faceCoupleInfo
      && min(masterAddressing) < masterMesh.nInternalFaces()
     )
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::faceCoupleInfo(const primitiveMesh&"
-            ", const primitiveMesh&, const scalar, const bool"
-        )   << "Supplied internal face on master mesh to couple." << nl
+        FatalErrorInFunction
+            << "Supplied internal face on master mesh to couple." << nl
             << "Faces to be coupled have to be boundary faces."
             << abort(FatalError);
     }
@@ -2073,11 +2035,8 @@ Foam::faceCoupleInfo::faceCoupleInfo
      && min(slaveAddressing) < slaveMesh.nInternalFaces()
     )
     {
-        FatalErrorIn
-        (
-            "faceCoupleInfo::faceCoupleInfo(const primitiveMesh&"
-            ", const primitiveMesh&, const scalar, const bool"
-        )   << "Supplied internal face on slave mesh to couple." << nl
+        FatalErrorInFunction
+            << "Supplied internal face on slave mesh to couple." << nl
             << "Faces to be coupled have to be boundary faces."
             << abort(FatalError);
     }
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index c5d24780d3..d018a3baa5 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -381,12 +381,8 @@ Foam::labelList Foam::polyMeshAdder::getFaceOrder
     {
         if (oldToNew[faceI] == -1)
         {
-            FatalErrorIn
-            (
-                "polyMeshAdder::getFaceOrder"
-                "(const cellList&, const label, const labelList&"
-                ", const labelList&) const"
-            )   << "Did not determine new position"
+            FatalErrorInFunction
+                << "Did not determine new position"
                 << " for face " << faceI
                 << abort(FatalError);
         }
@@ -2041,7 +2037,7 @@ Foam::Map<Foam::label> Foam::polyMeshAdder::findSharedPoints
             // Check just to make sure.
             if (findIndex(connectedPointLabels, pointI) != -1)
             {
-                FatalErrorIn("polyMeshAdder::findSharedPoints(..)")
+                FatalErrorInFunction
                     << "Duplicate point in sharedPoint addressing." << endl
                     << "When trying to add point " << pointI << " on shared "
                     << sharedI  << " with connected points "
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
index 6583dc408d..23f90fefca 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,10 +51,8 @@ Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "polyMeshModifier::New(const word&, const dictionary&, "
-            "const label, const polyMesh&)",
             dict
         )   << "Unknown polyMeshModifier type "
             << modifierType << nl << nl
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddFace.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddFace.H
index 5bbf6698cf..a6f3bc2e89 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddFace.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,22 +140,7 @@ public:
         {
             if (face_.size() < 3)
             {
-                FatalErrorIn
-                (
-                    "polyAddFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label owner,"
-                    "    const label neighbour,\n"
-                    "    const label masterPointID,\n"
-                    "    const label masterEdgeID,\n"
-                    "    const label masterFaceID,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Invalid face: less than 3 points.  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "Face: " << face_
                     << " masterPointID:" << masterPointID_
@@ -169,22 +154,7 @@ public:
 
             if (min(face_) < 0)
             {
-                FatalErrorIn
-                (
-                    "polyAddFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label owner,"
-                    "    const label neighbour,\n"
-                    "    const label masterPointID,\n"
-                    "    const label masterEdgeID,\n"
-                    "    const label masterFaceID,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Face contains invalid vertex ID: " << face_ << ".  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "Face: " << face_
                     << " masterPointID:" << masterPointID_
@@ -198,22 +168,7 @@ public:
 
             if (min(owner_, neighbour_) >= 0 && owner_ == neighbour_)
             {
-                FatalErrorIn
-                (
-                    "polyAddFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label owner,"
-                    "    const label neighbour,\n"
-                    "    const label masterPointID,\n"
-                    "    const label masterEdgeID,\n"
-                    "    const label masterFaceID,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Face owner and neighbour are identical.  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "Face: " << face_
                     << " masterPointID:" << masterPointID_
@@ -227,22 +182,7 @@ public:
 
             if (neighbour_ >= 0 && patchID >= 0)
             {
-                FatalErrorIn
-                (
-                    "polyAddFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label owner,"
-                    "    const label neighbour,\n"
-                    "    const label masterPointID,\n"
-                    "    const label masterEdgeID,\n"
-                    "    const label masterFaceID,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Patch face has got a neighbour.  Patch ID: " << patchID
+                FatalErrorInFunction
                     << ".  This is not allowed.\n"
                     << "Face: " << face_
                     << " masterPointID:" << masterPointID_
@@ -256,21 +196,7 @@ public:
 
             if (owner_ < 0 && zoneID < 0)
             {
-                FatalErrorIn
-                (
-                    "polyAddFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label owner,"
-                    "    const label neighbour,\n"
-                    "    const label masterPointID,\n"
-                    "    const label masterEdgeID,\n"
-                    "    const label masterFaceID,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const label zoneID"
-                    ")"
-                )   << "Face has no owner and is not in a zone.  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "Face: " << face_
                     << "Face: " << face_
@@ -285,22 +211,7 @@ public:
 
             if (zoneID_ == -1 && zoneFlip)
             {
-                FatalErrorIn
-                (
-                    "polyAddFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label owner,"
-                    "    const label neighbour,\n"
-                    "    const label masterPointID,\n"
-                    "    const label masterEdgeID,\n"
-                    "    const label masterFaceID,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Specified zone flip for a face that does not  "
+                FatalErrorInFunction
                     << "belong to zone.  This is not allowed.\n"
                     << "Face: " << face_
                     << " masterPointID:" << masterPointID_
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
index 82d23185b3..3ec0ed0e7a 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,16 +99,7 @@ public:
         {
             if (zoneID_ < 0 && !inCell)
             {
-                FatalErrorIn
-                (
-                    "polyAddPoint\n"
-                    "(\n"
-                    "    const point& p,\n"
-                    "    const label masterPointID,\n"
-                    "    const label zoneID,\n"
-                    "    const bool inCell\n"
-                    ")"
-                )   << "Point is not in a cell and not in a zone.  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "point: " << p
                     << " master: " << masterPointID_
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 58d39bc3cf..93489a1644 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,12 +34,14 @@ License
 #include "polyModifyFace.H"
 #include "polyAddCell.H"
 #include "globalIndex.H"
+#include "PatchTools.H"
+#include "dummyTransform.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-defineTypeNameAndDebug(addPatchCellLayer, 0);
+    defineTypeNameAndDebug(addPatchCellLayer, 0);
 }
 
 
@@ -221,13 +223,15 @@ Foam::labelPair Foam::addPatchCellLayer::getEdgeString
 }
 
 
-// Adds a side face i.e. extrudes a patch edge.
 Foam::label Foam::addPatchCellLayer::addSideFace
 (
     const indirectPrimitivePatch& pp,
     const labelListList& addedCells,    // per pp face the new extruded cell
     const face& newFace,
     const label newPatchID,
+    const label zoneI,
+    const bool edgeFlip,
+    const label inflateFaceI,
 
     const label ownFaceI,               // pp face that provides owner
     const label nbrFaceI,
@@ -238,68 +242,14 @@ Foam::label Foam::addPatchCellLayer::addSideFace
     polyTopoChange& meshMod
 ) const
 {
-    // Face or edge to 'inflate' from
-    label inflateEdgeI = -1;
-    label inflateFaceI = -1;
-
-    // Check mesh faces using edge
-    if (addToMesh_)
-    {
-        forAll(meshFaces, i)
-        {
-            if (mesh_.isInternalFace(meshFaces[i]))
-            {
-                // meshEdge uses internal faces so ok to inflate from it
-                inflateEdgeI = meshEdgeI;
-                break;
-            }
-        }
-    }
-
-    // Zone info comes from any side patch face. Otherwise -1 since we
-    // don't know what to put it in - inherit from the extruded faces?
-    label zoneI = -1;   //mesh_.faceZones().whichZone(meshFaceI);
-    bool flip = false;
-
     label addedFaceI = -1;
 
+
     // Is patch edge external edge of indirectPrimitivePatch?
     if (nbrFaceI == -1)
     {
         // External edge so external face.
 
-        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-        // Loop over all faces connected to edge to inflate and
-        // see if we can find a face that is otherPatchID
-
-        // Get my mesh face and its zone.
-        label meshFaceI = pp.addressing()[ownFaceI];
-
-        forAll(meshFaces, k)
-        {
-            label faceI = meshFaces[k];
-
-            if
-            (
-                (faceI != meshFaceI)
-             && (patches.whichPatch(faceI) == newPatchID)
-            )
-            {
-                // Found the patch face. Use it to inflate from
-                inflateEdgeI = -1;
-                inflateFaceI = faceI;
-
-                zoneI = mesh_.faceZones().whichZone(faceI);
-                if (zoneI != -1)
-                {
-                    label index = mesh_.faceZones()[zoneI].whichFace(faceI);
-                    flip = mesh_.faceZones()[zoneI].flipMap()[index];
-                }
-                break;
-            }
-        }
-
         // Determine if different number of layer on owner and neighbour side
         // (relevant only for coupled faces). See section for internal edge
         // below.
@@ -333,16 +283,16 @@ Foam::label Foam::addPatchCellLayer::addSideFace
         (
             polyAddFace
             (
-                newFace,                    // face
-                addedCells[ownFaceI][layerOwn],   // owner
-                -1,                         // neighbour
-                -1,                         // master point
-                inflateEdgeI,               // master edge
-                inflateFaceI,               // master face
-                false,                      // flux flip
-                newPatchID,                 // patch for face
-                zoneI,                      // zone for face
-                flip                        // face zone flip
+                newFace,                        // face
+                addedCells[ownFaceI][layerOwn], // owner
+                -1,                             // neighbour
+                -1,                             // master point
+                -1,                             // master edge
+                inflateFaceI,                   // master face
+                false,                          // flux flip
+                newPatchID,                     // patch for face
+                zoneI,                          // zone for face
+                edgeFlip                        // face zone flip
             )
         );
     }
@@ -395,20 +345,37 @@ Foam::label Foam::addPatchCellLayer::addSideFace
             layerOwn = layerI;
         }
 
+
+        // Check mesh internal faces using edge to initialise
+        label inflateEdgeI = -1;
+        if (addToMesh_)
+        {
+            forAll(meshFaces, i)
+            {
+                if (mesh_.isInternalFace(meshFaces[i]))
+                {
+                    // meshEdge uses internal faces so ok to inflate from it
+                    inflateEdgeI = meshEdgeI;
+                    break;
+                }
+            }
+        }
+
+
         addedFaceI = meshMod.setAction
         (
             polyAddFace
             (
-                newFace,                    // face
-                addedCells[ownFaceI][layerOwn],   // owner
-                addedCells[nbrFaceI][layerNbr],   // neighbour
-                -1,                         // master point
-                inflateEdgeI,               // master edge
-                -1,                         // master face
-                false,                      // flux flip
-                -1,                         // patch for face
-                zoneI,                      // zone for face
-                flip                        // face zone flip
+                newFace,                        // face
+                addedCells[ownFaceI][layerOwn], // owner
+                addedCells[nbrFaceI][layerNbr], // neighbour
+                -1,                             // master point
+                inflateEdgeI,                   // master edge
+                -1,                             // master face
+                false,                          // flux flip
+                -1,                             // patch for face
+                zoneI,                          // zone for face
+                edgeFlip                        // face zone flip
             )
         );
 
@@ -467,6 +434,134 @@ void Foam::addPatchCellLayer::setFaceProps
 }
 
 
+void Foam::addPatchCellLayer::setFaceProps
+(
+    const polyMesh& mesh,
+    const indirectPrimitivePatch& pp,
+    const label ppEdgeI,
+    const label faceI,
+
+    label& patchI,
+    label& zoneI,
+    bool& zoneFlip,
+    label& inflateFaceI
+)
+{
+    setFaceProps
+    (
+        mesh,
+        faceI,
+
+        patchI,
+        zoneI,
+        zoneFlip
+    );
+
+    if (patchI != -1 || zoneI != -1)
+    {
+        inflateFaceI = faceI;
+    }
+
+    if (zoneI != -1)
+    {
+        // Correct flip for patch edge ordering
+        const edge& ppEdge = pp.edges()[ppEdgeI];
+        const edge patchEdge
+        (
+            pp.meshPoints()[ppEdge[0]],
+            pp.meshPoints()[ppEdge[1]]
+        );
+
+        const face& f = mesh.faces()[faceI];
+        bool found = false;
+        forAll(f, fp)
+        {
+            const edge e(f[fp], f.nextLabel(fp));
+            int stat = edge::compare(e, patchEdge);
+            if (stat == 1)
+            {
+                found = true;
+                break;
+            }
+            else if (stat == -1)
+            {
+                found = true;
+                zoneFlip = !zoneFlip;
+                break;
+            }
+        }
+
+        if (!found)
+        {
+            FatalErrorInFunction
+                << "Problem: cannot find patch edge " << ppEdgeI
+                << " with mesh vertices " << patchEdge
+                << " at " << patchEdge.line(mesh.points())
+                << " is not in face " << faceI << " with mesh vertices "
+                << f
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::addPatchCellLayer::findZoneFace
+(
+    const bool useInternalFaces,
+    const bool useBoundaryFaces,
+
+    const polyMesh& mesh,
+    const indirectPrimitivePatch& pp,
+    const label ppEdgeI,
+    const UIndirectList<label>& excludeFaces,
+    const labelList& meshFaces,
+
+    label& inflateFaceI,
+    label& patchI,
+    label& zoneI,
+    bool& zoneFlip
+)
+{
+    inflateFaceI = -1;
+    patchI = -1;
+    zoneI = -1;
+    zoneFlip = false;
+
+    forAll(meshFaces, k)
+    {
+        label faceI = meshFaces[k];
+
+        if
+        (
+            (findIndex(excludeFaces, faceI) == -1)
+         && (
+                (mesh.isInternalFace(faceI) && useInternalFaces)
+             || (!mesh.isInternalFace(faceI) && useBoundaryFaces)
+            )
+        )
+        {
+            setFaceProps
+            (
+                mesh,
+                pp,
+                ppEdgeI,
+                faceI,
+
+                patchI,
+                zoneI,
+                zoneFlip,
+                inflateFaceI
+            );
+
+            if (zoneI != -1 || patchI != -1)
+            {
+                break;
+            }
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from mesh
@@ -564,38 +659,61 @@ Foam::labelListList Foam::addPatchCellLayer::globalEdgeFaces
 }
 
 
-void Foam::addPatchCellLayer::calcSidePatch
+void Foam::addPatchCellLayer::calcExtrudeInfo
 (
+    const bool zoneFromAnyFace,
+
     const polyMesh& mesh,
     const globalIndex& globalFaces,
     const labelListList& globalEdgeFaces,
     const indirectPrimitivePatch& pp,
 
-    labelList& sidePatchID,
+    labelList& edgePatchID,
     label& nPatches,
     Map<label>& nbrProcToPatch,
-    Map<label>& patchToNbrProc
+    Map<label>& patchToNbrProc,
+    labelList& edgeZoneID,
+    boolList& edgeFlip,
+    labelList& inflateFaceID
 )
 {
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
+    const globalMeshData& gd = mesh.globalData();
 
     // Precalculate mesh edges for pp.edges.
     const labelList meshEdges(pp.meshEdges(mesh.edges(), mesh.pointEdges()));
 
-    sidePatchID.setSize(pp.nEdges());
-    sidePatchID = -1;
+    edgePatchID.setSize(pp.nEdges());
+    edgePatchID = -1;
+    edgeZoneID.setSize(pp.nEdges());
+    edgeZoneID = -1;
+    edgeFlip.setSize(pp.nEdges());
+    edgeFlip = false;
+
+
+    // Determine properties for faces extruded from edges
+    // - edge inbetween two different processors:
+    //      - extrude as patch face on correct processor
+    // - edge at end of patch (so edgeFaces.size() == 1):
+    //      - use mesh face that is a boundary face
+    // - edge internal to patch (so edgeFaces.size() == 2):
+
+
 
     // These also get determined but not (yet) exported:
     // - whether face is created from other face or edge
-    // - what zone&orientation face should have
 
-    labelList inflateEdgeI(pp.nEdges(), -1);
-    labelList inflateFaceI(pp.nEdges(), -1);
-    labelList sideZoneID(pp.nEdges(), -1);
-    boolList sideFlip(pp.nEdges(), false);
+    inflateFaceID.setSize(pp.nEdges(), -1);
 
     nPatches = patches.size();
 
+
+
+    // Pass1:
+    // For all edges inbetween two processors: see if matches to existing
+    // processor patch or create interprocessor-patch if necessary.
+    // Sets edgePatchID[edgeI] but none of the other quantities
+
     forAll(globalEdgeFaces, edgeI)
     {
         const labelList& eGlobalFaces = globalEdgeFaces[edgeI];
@@ -606,8 +724,7 @@ void Foam::addPatchCellLayer::calcSidePatch
         )
         {
             // Locally but not globally a boundary edge. Hence a coupled
-            // edge. Find the patch to use if on different
-            // processors.
+            // edge. Find the patch to use if on different processors.
 
             label f0 = eGlobalFaces[0];
             label f1 = eGlobalFaces[1];
@@ -625,18 +742,25 @@ void Foam::addPatchCellLayer::calcSidePatch
 
             if (otherProcI != -1)
             {
-                sidePatchID[edgeI] = findProcPatch(mesh, otherProcI);
-                if (sidePatchID[edgeI] == -1)
+                if (findIndex(gd[Pstream::myProcNo()], otherProcI) != -1)
+                {
+                    // There is already a processorPolyPatch to otherProcI.
+                    // Use it. Note that we can only index procPatchMap
+                    // if the processor actually is a neighbour processor
+                    // so that is why we first check.
+                    edgePatchID[edgeI] = gd.procPatchMap()[otherProcI];
+                }
+                else
                 {
                     // Cannot find a patch to processor. See if already
                     // marked for addition
                     if (nbrProcToPatch.found(otherProcI))
                     {
-                        sidePatchID[edgeI] = nbrProcToPatch[otherProcI];
+                        edgePatchID[edgeI] = nbrProcToPatch[otherProcI];
                     }
                     else
                     {
-                        sidePatchID[edgeI] = nPatches;
+                        edgePatchID[edgeI] = nPatches;
                         nbrProcToPatch.insert(otherProcI, nPatches);
                         patchToNbrProc.insert(nPatches, otherProcI);
                         nPatches++;
@@ -647,9 +771,8 @@ void Foam::addPatchCellLayer::calcSidePatch
     }
 
 
-
-    // Determine face properties for all other boundary edges
-    // ------------------------------------------------------
+    // Pass2: determine face properties for all other edges
+    // ----------------------------------------------------
 
     const labelListList& edgeFaces = pp.edgeFaces();
 
@@ -657,13 +780,10 @@ void Foam::addPatchCellLayer::calcSidePatch
 
     forAll(edgeFaces, edgeI)
     {
-        if (edgeFaces[edgeI].size() == 1 && sidePatchID[edgeI] == -1)
+        if (edgePatchID[edgeI] == -1)
         {
-            // Proper, uncoupled patch edge.
+            UIndirectList<label> ppFaces(pp.addressing(), edgeFaces[edgeI]);
 
-            label myFaceI = pp.addressing()[edgeFaces[edgeI][0]];
-
-            // Pick up any boundary face on this edge and use its properties
             label meshEdgeI = meshEdges[edgeI];
             const labelList& meshFaces = mesh.edgeFaces
             (
@@ -671,46 +791,72 @@ void Foam::addPatchCellLayer::calcSidePatch
                 dynMeshEdgeFaces
             );
 
-            forAll(meshFaces, k)
+            if (edgeFaces[edgeI].size() == 2)
             {
-                label faceI = meshFaces[k];
+                // Internal edge. Look at any face (internal or boundary) to
+                // determine extrusion properties. First one that has zone
+                // info wins
 
-                if (faceI != myFaceI && !mesh.isInternalFace(faceI))
-                {
-                    setFaceProps
-                    (
-                        mesh,
-                        faceI,
+                label dummyPatchI = -1;
+                findZoneFace
+                (
+                    true,               // useInternalFaces,
+                    zoneFromAnyFace,    // useBoundaryFaces,
 
-                        sidePatchID[edgeI],
-                        sideZoneID[edgeI],
-                        sideFlip[edgeI]
-                    );
-                    inflateFaceI[edgeI] = faceI;
-                    inflateEdgeI[edgeI] = -1;
+                    mesh,
+                    pp,
+                    edgeI,
 
-                    break;
-                }
+
+                    ppFaces,            // excludeFaces,
+                    meshFaces,          // meshFaces,
+
+                    inflateFaceID[edgeI],
+                    dummyPatchI,        // do not use patch info
+                    edgeZoneID[edgeI],
+                    edgeFlip[edgeI]
+                );
+            }
+            else
+            {
+                // Proper, uncoupled patch edge
+
+                findZoneFace
+                (
+                    false,      // useInternalFaces,
+                    true,       // useBoundaryFaces,
+
+                    mesh,
+                    pp,
+                    edgeI,
+
+
+                    ppFaces,    // excludeFaces,
+                    meshFaces,  // meshFaces,
+
+                    inflateFaceID[edgeI],
+                    edgePatchID[edgeI],
+                    edgeZoneID[edgeI],
+                    edgeFlip[edgeI]
+                );
             }
         }
     }
 
 
 
-    // Now hopefully every boundary edge has a side patch. Check
+    // Now hopefully every boundary edge has a edge patch. Check
     if (debug)
     {
         forAll(edgeFaces, edgeI)
         {
-            if (edgeFaces[edgeI].size() == 1 && sidePatchID[edgeI] == -1)
+            if (edgeFaces[edgeI].size() == 1 && edgePatchID[edgeI] == -1)
             {
                 const edge& e = pp.edges()[edgeI];
-                //FatalErrorIn("addPatchCellLayer::calcSidePatch(..)")
-                WarningIn("addPatchCellLayer::calcSidePatch(..)")
+                WarningInFunction
                     << "Have no sidePatchID for edge " << edgeI << " points "
                     << pp.points()[pp.meshPoints()[e[0]]]
                     << pp.points()[pp.meshPoints()[e[1]]]
-                    //<< abort(FatalError);
                     << endl;
             }
         }
@@ -718,15 +864,15 @@ void Foam::addPatchCellLayer::calcSidePatch
 
 
 
-    // Now we have sidepatch see if we have patchface or edge to inflate
-    // from.
+    // Pass3: for any faces set in pass1 see if we can find a processor face
+    //        to inherit from (we only have a patch, not a patch face)
     forAll(edgeFaces, edgeI)
     {
         if
         (
             edgeFaces[edgeI].size() == 1
-         && sidePatchID[edgeI] != -1
-         && inflateFaceI[edgeI] == -1
+         && edgePatchID[edgeI] != -1
+         && inflateFaceID[edgeI] == -1
         )
         {
             // 1. Do we have a boundary face to inflate from
@@ -745,35 +891,116 @@ void Foam::addPatchCellLayer::calcSidePatch
             {
                 label faceI = meshFaces[k];
 
-                if (faceI != myFaceI)
+                if (faceI != myFaceI && !mesh.isInternalFace(faceI))
                 {
-                    if (mesh.isInternalFace(faceI))
+                    if (patches.whichPatch(faceI) == edgePatchID[edgeI])
                     {
-                        inflateEdgeI[edgeI] = meshEdgeI;
-                    }
-                    else
-                    {
-                        if (patches.whichPatch(faceI) == sidePatchID[edgeI])
-                        {
-                            setFaceProps
-                            (
-                                mesh,
-                                faceI,
+                        setFaceProps
+                        (
+                            mesh,
+                            pp,
+                            edgeI,
+                            faceI,
 
-                                sidePatchID[edgeI],
-                                sideZoneID[edgeI],
-                                sideFlip[edgeI]
-                            );
-                            inflateFaceI[edgeI] = faceI;
-                            inflateEdgeI[edgeI] = -1;
-
-                            break;
-                        }
+                            edgePatchID[edgeI],
+                            edgeZoneID[edgeI],
+                            edgeFlip[edgeI],
+                            inflateFaceID[edgeI]
+                        );
+                        break;
                     }
                 }
             }
         }
     }
+
+
+
+    // Sync all data:
+    // - edgePatchID : might be local in case of processor patch. Do not
+    //   sync for now
+    // - inflateFaceID: local. Do not sync
+    // - edgeZoneID : global. sync.
+    // - edgeFlip : global. sync.
+
+    if (Pstream::parRun())
+    {
+        const globalMeshData& gd = mesh.globalData();
+        const indirectPrimitivePatch& cpp = gd.coupledPatch();
+
+        labelList patchEdges;
+        labelList coupledEdges;
+        PackedBoolList sameEdgeOrientation;
+        PatchTools::matchEdges
+        (
+            pp,
+            cpp,
+            patchEdges,
+            coupledEdges,
+            sameEdgeOrientation
+        );
+
+        // Convert data on pp edges to data on coupled patch
+        labelList cppEdgeZoneID(cpp.nEdges(), -1);
+        boolList cppEdgeFlip(cpp.nEdges(), false);
+        forAll(coupledEdges, i)
+        {
+            label cppEdgeI = coupledEdges[i];
+            label ppEdgeI = patchEdges[i];
+
+            cppEdgeZoneID[cppEdgeI] = edgeZoneID[ppEdgeI];
+            if (sameEdgeOrientation[i])
+            {
+                cppEdgeFlip[cppEdgeI] = edgeFlip[ppEdgeI];
+            }
+            else
+            {
+                cppEdgeFlip[cppEdgeI] = !edgeFlip[ppEdgeI];
+            }
+        }
+
+        // Sync
+        const globalIndexAndTransform& git = gd.globalTransforms();
+        const mapDistribute& edgeMap = gd.globalEdgeSlavesMap();
+
+        globalMeshData::syncData
+        (
+            cppEdgeZoneID,
+            gd.globalEdgeSlaves(),
+            gd.globalEdgeTransformedSlaves(),
+            edgeMap,
+            git,
+            maxEqOp<label>(),
+            dummyTransform()
+        );
+        globalMeshData::syncData
+        (
+            cppEdgeFlip,
+            gd.globalEdgeSlaves(),
+            gd.globalEdgeTransformedSlaves(),
+            edgeMap,
+            git,
+            andEqOp<bool>(),
+            dummyTransform()
+        );
+
+        // Convert data on coupled edges to pp edges
+        forAll(coupledEdges, i)
+        {
+            label cppEdgeI = coupledEdges[i];
+            label ppEdgeI = patchEdges[i];
+
+            edgeZoneID[ppEdgeI] = cppEdgeZoneID[cppEdgeI];
+            if (sameEdgeOrientation[i])
+            {
+                edgeFlip[ppEdgeI] = cppEdgeFlip[cppEdgeI];
+            }
+            else
+            {
+                edgeFlip[ppEdgeI] = !cppEdgeFlip[cppEdgeI];
+            }
+        }
+    }
 }
 
 
@@ -783,7 +1010,12 @@ void Foam::addPatchCellLayer::setRefinement
     const labelListList& globalEdgeFaces,
     const scalarField& expansionRatio,
     const indirectPrimitivePatch& pp,
-    const labelList& sidePatchID,
+
+    const labelList& edgePatchID,
+    const labelList& edgeZoneID,
+    const boolList& edgeFlip,
+    const labelList& inflateFaceID,
+
     const labelList& exposedPatchID,
     const labelList& nFaceLayers,
     const labelList& nPointLayers,
@@ -806,12 +1038,8 @@ void Foam::addPatchCellLayer::setRefinement
      || pp.size() != nFaceLayers.size()
     )
     {
-        FatalErrorIn
-        (
-            "addPatchCellLayer::setRefinement"
-            "(const scalar, const indirectPrimitivePatch&"
-            ", const labelList&, const vectorField&, polyTopoChange&)"
-        )   << "Size of new points is not same as number of points used by"
+        FatalErrorInFunction
+            << "Size of new points is not same as number of points used by"
             << " the face subset" << endl
             << "  patch.nPoints:" << pp.nPoints()
             << "  displacement:" << firstLayerDisp.size()
@@ -825,12 +1053,8 @@ void Foam::addPatchCellLayer::setRefinement
     {
         if (nPointLayers[i] < 0)
         {
-            FatalErrorIn
-            (
-                "addPatchCellLayer::setRefinement"
-                "(const scalar, const indirectPrimitivePatch&"
-                ", const labelList&, const vectorField&, polyTopoChange&)"
-            )   << "Illegal number of layers " << nPointLayers[i]
+            FatalErrorInFunction
+                << "Illegal number of layers " << nPointLayers[i]
                 << " at patch point " << i << abort(FatalError);
         }
     }
@@ -838,12 +1062,8 @@ void Foam::addPatchCellLayer::setRefinement
     {
         if (nFaceLayers[i] < 0)
         {
-            FatalErrorIn
-            (
-                "addPatchCellLayer::setRefinement"
-                "(const scalar, const indirectPrimitivePatch&"
-                ", const labelList&, const vectorField&, polyTopoChange&)"
-            )   << "Illegal number of layers " << nFaceLayers[i]
+            FatalErrorInFunction
+                << "Illegal number of layers " << nFaceLayers[i]
                 << " at patch face " << i << abort(FatalError);
         }
     }
@@ -856,16 +1076,15 @@ void Foam::addPatchCellLayer::setRefinement
 
             if (nPointLayers[e[0]] > 0 || nPointLayers[e[1]] > 0)
             {
-                FatalErrorIn
-                (
-                    "addPatchCellLayer::setRefinement"
-                    "(const scalar, const indirectPrimitivePatch&"
-                    ", const labelList&, const vectorField&, polyTopoChange&)"
-                )   << "Trying to extrude edge "
+                FatalErrorInFunction
+                    << "Trying to extrude edge "
                     << e.line(pp.localPoints())
                     << " which is non-manifold (has "
                     << globalEdgeFaces[edgeI].size()
-                    << " faces using it)"
+                    << " local or coupled faces using it)"
+                    << " of which "
+                    << pp.edgeFaces()[edgeI].size()
+                    << " local"
                     << abort(FatalError);
             }
         }
@@ -897,13 +1116,8 @@ void Foam::addPatchCellLayer::setRefinement
 
                 if (n[meshPointI] != nPointLayers[i])
                 {
-                    FatalErrorIn
-                    (
-                        "addPatchCellLayer::setRefinement"
-                        "(const scalar, const indirectPrimitivePatch&"
-                        ", const labelList&, const vectorField&"
-                        ", polyTopoChange&)"
-                    )   << "At mesh point:" << meshPointI
+                    FatalErrorInFunction
+                        << "At mesh point:" << meshPointI
                         << " coordinate:" << mesh_.points()[meshPointI]
                         << " specified nLayers:" << nPointLayers[i] << endl
                         << "On coupled point a different nLayers:"
@@ -945,13 +1159,8 @@ void Foam::addPatchCellLayer::setRefinement
                  && nPointLayers[i] != nFromFace[meshPointI]
                 )
                 {
-                    FatalErrorIn
-                    (
-                        "addPatchCellLayer::setRefinement"
-                        "(const scalar, const indirectPrimitivePatch&"
-                        ", const labelList&, const vectorField&"
-                        ", polyTopoChange&)"
-                    )   << "At mesh point:" << meshPointI
+                    FatalErrorInFunction
+                        << "At mesh point:" << meshPointI
                         << " coordinate:" << mesh_.points()[meshPointI]
                         << " specified nLayers:" << nPointLayers[i] << endl
                         << "but the max nLayers of surrounding faces is:"
@@ -978,13 +1187,8 @@ void Foam::addPatchCellLayer::setRefinement
 
                 if (mag(d[meshPointI] - firstLayerDisp[i]) > SMALL)
                 {
-                    FatalErrorIn
-                    (
-                        "addPatchCellLayer::setRefinement"
-                        "(const scalar, const indirectPrimitivePatch&"
-                        ", const labelList&, const vectorField&"
-                        ", polyTopoChange&)"
-                    )   << "At mesh point:" << meshPointI
+                    FatalErrorInFunction
+                        << "At mesh point:" << meshPointI
                         << " coordinate:" << mesh_.points()[meshPointI]
                         << " specified displacement:" << firstLayerDisp[i]
                         << endl
@@ -1014,13 +1218,8 @@ void Foam::addPatchCellLayer::setRefinement
                 // First check: pp should be single connected.
                 if (eFaces.size() != 1)
                 {
-                    FatalErrorIn
-                    (
-                        "addPatchCellLayer::setRefinement"
-                        "(const scalar, const indirectPrimitivePatch&"
-                        ", const labelList&, const vectorField&"
-                        ", polyTopoChange&)"
-                    )   << "boundary-edge-to-be-extruded:"
+                    FatalErrorInFunction
+                        << "boundary-edge-to-be-extruded:"
                         << pp.points()[meshPoints[e[0]]]
                         << pp.points()[meshPoints[e[1]]]
                         << " has more than two faces using it:" << eFaces
@@ -1053,14 +1252,8 @@ void Foam::addPatchCellLayer::setRefinement
                             }
                             else
                             {
-                                FatalErrorIn
-                                (
-                                    "addPatchCellLayer::setRefinement"
-                                    "(const scalar"
-                                    ", const indirectPrimitivePatch&"
-                                    ", const labelList&, const vectorField&"
-                                    ", polyTopoChange&)"
-                                )   << "boundary-edge-to-be-extruded:"
+                                FatalErrorInFunction
+                                    << "boundary-edge-to-be-extruded:"
                                     << pp.points()[meshPoints[e[0]]]
                                     << pp.points()[meshPoints[e[1]]]
                                     << " has more than two boundary faces"
@@ -1690,10 +1883,8 @@ void Foam::addPatchCellLayer::setRefinement
                             {
                                 if (!verts.insert(newFace[fp]))
                                 {
-                                    FatalErrorIn
-                                    (
-                                        "addPatchCellLayer::setRefinement(..)"
-                                    )   << "Duplicate vertex in face"
+                                    FatalErrorInFunction
+                                        << "Duplicate vertex in face"
                                         << " to be added." << nl
                                         << "newFace:" << newFace << nl
                                         << "points:"
@@ -1741,13 +1932,25 @@ void Foam::addPatchCellLayer::setRefinement
                             ef
                         );
 
+                        // Because we walk in order of patch face and in order
+                        // of face edges so face orientation will be opposite
+                        // that of the patch edge
+                        bool zoneFlip = false;
+                        if (edgeZoneID[startEdgeI] != -1)
+                        {
+                            zoneFlip = !edgeFlip[startEdgeI];
+                        }
+
                         addSideFace
                         (
                             pp,
                             addedCells,
 
                             newFace,                // vertices of new face
-                            sidePatchID[startEdgeI],// -1 or patch for face
+                            edgePatchID[startEdgeI],// -1 or patch for face
+                            edgeZoneID[startEdgeI],
+                            zoneFlip,
+                            inflateFaceID[startEdgeI],
 
                             patchFaceI,
                             nbrFaceI,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 158af5e1d8..5413ea77fd 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -220,6 +220,9 @@ class addPatchCellLayer
 
             const face& newFace,
             const label newPatchID,
+            const label newZoneI,
+            const bool newFlip,
+            const label inflateFaceI,
 
             const label ownFaceI,
             const label nbrFaceI,
@@ -243,6 +246,39 @@ class addPatchCellLayer
             bool&
         );
 
+        //- Extract properties from mesh face in pp edge ordering
+        static void setFaceProps
+        (
+            const polyMesh& mesh,
+            const indirectPrimitivePatch& pp,
+            const label ppEdgeI,
+            const label faceI,
+
+            label& patchI,
+            label& zoneI,
+            bool& zoneFlip,
+            label& inflateFaceI
+        );
+
+        //- Find internal or boundary face to get extrude properties
+        //  from. zoneFlip consistent with ppEdge ordering
+        static void findZoneFace
+        (
+            const bool useInternalFaces,
+            const bool useBoundaryFaces,
+
+            const polyMesh& mesh,
+            const indirectPrimitivePatch& pp,
+            const label ppEdgeI,
+            const UIndirectList<label>& excludeFaces,
+            const labelList& meshFaces,
+
+            label& inflateFaceI,
+            label& patchI,
+            label& zoneI,
+            bool& zoneFlip
+        );
+
         //- Disallow default bitwise copy construct
         addPatchCellLayer(const addPatchCellLayer&);
 
@@ -303,22 +339,37 @@ public:
                 const indirectPrimitivePatch& pp
             );
 
-            //- Boundary edges get extruded into boundary faces. Determine patch
-            //  for these faces. This might be a to-be-created processor patch
-            //  (patchI >= mesh.boundaryMesh().size()) in which case the
-            //  nbrProcToPatch, patchToNbrProc give the correspondence. nPatches
-            //  is the new number of patches.
-            static void calcSidePatch
+            //- Determine extrude information per patch edge:
+            //  - zoneID, zoneFlip :
+            //      picks one of the faces that connects to
+            //      the edge. For boundary edge only looks
+            //      at boundary faces. For internal edge it looks at internal
+            //      faces only (zoneFromAnyFace = false) or at any face
+            //      (zoneFromAnyFace = true). zoneFlip is consistent with
+            //      ordering of pp edge.
+            //      Face selected gets stored in inflateFaceID
+            //  - patchID :
+            //      get patch from any boundary face connected to the
+            //      edge. The patch might be a to-be-created processor patch
+            //      (patchI >= mesh.boundaryMesh().size()) in which case the
+            //      nbrProcToPatch, patchToNbrProc give the correspondence.
+            //      nPatches is the new number of patches.
+            static void calcExtrudeInfo
             (
+                const bool zoneFromAnyFace,
+
                 const polyMesh&,
                 const globalIndex& globalFaces,
                 const labelListList& globalEdgeFaces,
                 const indirectPrimitivePatch& pp,
 
-                labelList& sidePatchID,
+                labelList& edgePatchID,     // if extruding a patch edge
                 label& nPatches,
                 Map<label>& nbrProcToPatch,
-                Map<label>& patchToNbrProc
+                Map<label>& patchToNbrProc,
+                labelList& edgeZoneID,
+                boolList& edgeFlip,
+                labelList& inflateFaceID
             );
 
             //- Play commands into polyTopoChange to create layers on top
@@ -347,7 +398,12 @@ public:
                 const labelListList& globalEdgeFaces,
                 const scalarField& expansionRatio,
                 const indirectPrimitivePatch& pp,
+
                 const labelList& sidePatchID,
+                const labelList& sideZoneID,
+                const boolList& sideFlip,
+                const labelList& inflateFaceID,
+
                 const labelList& exposedPatchID,
                 const labelList& nFaceLayers,
                 const labelList& nPointLayers,
@@ -374,7 +430,12 @@ public:
                     globalEdgeFaces,
                     scalarField(pp.nPoints(), 1.0),     // expansion ration
                     pp,
+
                     sidePatchID,
+                    labelList(pp.nEdges(), -1),         // zoneID
+                    boolList(pp.nEdges(), false),       // zoneFlip
+                    labelList(pp.nEdges(), -1),         // inflateFaceID
+
                     labelList(0),
                     labelList(pp.size(), nLayers),      // nFaceLayers
                     labelList(pp.nPoints(), nLayers),   // nPointLayers
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index e74e8783c4..da9251c9d9 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -417,10 +417,8 @@ Foam::face Foam::combineFaces::getOutsideFace
 {
     if (fp.edgeLoops().size() != 1)
     {
-        FatalErrorIn
-        (
-            "combineFaces::getOutsideFace(const indirectPrimitivePatch&)"
-        )   << "Multiple outside loops:" << fp.edgeLoops()
+        FatalErrorInFunction
+            << "Multiple outside loops:" << fp.edgeLoops()
             << abort(FatalError);
     }
 
@@ -434,10 +432,8 @@ Foam::face Foam::combineFaces::getOutsideFace
 
     if (eFaces.size() != 1)
     {
-        FatalErrorIn
-        (
-            "combineFaces::getOutsideFace(const indirectPrimitivePatch&)"
-        )   << "boundary edge:" << bEdgeI
+        FatalErrorInFunction
+            << "boundary edge:" << bEdgeI
             << " points:" << fp.meshPoints()[e[0]]
             << ' ' << fp.meshPoints()[e[1]]
             << " on indirectPrimitivePatch has " << eFaces.size()
@@ -462,11 +458,8 @@ Foam::face Foam::combineFaces::getOutsideFace
 
         if (index0 == -1 || index1 == -1)
         {
-            FatalErrorIn
-            (
-                "combineFaces::getOutsideFace"
-                "(const indirectPrimitivePatch&)"
-            )   << "Cannot find boundary edge:" << e
+            FatalErrorInFunction
+                << "Cannot find boundary edge:" << e
                 << " points:" << fp.meshPoints()[e[0]]
                 << ' ' << fp.meshPoints()[e[1]]
                 << " in edgeLoop:" << outsideLoop << abort(FatalError);
@@ -481,11 +474,8 @@ Foam::face Foam::combineFaces::getOutsideFace
         }
         else
         {
-            FatalErrorIn
-            (
-                "combineFaces::getOutsideFace"
-                "(const indirectPrimitivePatch&)"
-            )   << "Cannot find boundary edge:" << e
+            FatalErrorInFunction
+                << "Cannot find boundary edge:" << e
                 << " points:" << fp.meshPoints()[e[0]]
                 << ' ' << fp.meshPoints()[e[1]]
                 << " on consecutive points in edgeLoop:"
@@ -510,11 +500,8 @@ Foam::face Foam::combineFaces::getOutsideFace
 
         if (index == -1)
         {
-            FatalErrorIn
-            (
-                "combineFaces::getOutsideFace"
-                "(const indirectPrimitivePatch&)"
-            )   << "Cannot find boundary edge:" << e
+            FatalErrorInFunction
+                << "Cannot find boundary edge:" << e
                 << " points:" << fp.meshPoints()[e[0]]
                 << ' ' << fp.meshPoints()[e[1]]
                 << " in face:" << eFaces[0]
@@ -531,11 +518,8 @@ Foam::face Foam::combineFaces::getOutsideFace
         }
         else
         {
-            FatalErrorIn
-            (
-                "combineFaces::getOutsideFace"
-                "(const indirectPrimitivePatch&)"
-            )   << "Cannot find boundary edge:" << e
+            FatalErrorInFunction
+                << "Cannot find boundary edge:" << e
                 << " points:" << fp.meshPoints()[e[0]]
                 << ' ' << fp.meshPoints()[e[1]]
                 << " in face:" << eFaces[0] << " verts:" << localF
@@ -602,12 +586,8 @@ void Foam::combineFaces::setRefinement
 
                 if (patchI == -1 || patches[patchI].coupled())
                 {
-                    FatalErrorIn
-                    (
-                        "combineFaces::setRefinement"
-                        "(const bool, const labelListList&"
-                        ", polyTopoChange&)"
-                    )   << "Can only merge non-coupled boundary faces"
+                    FatalErrorInFunction
+                        << "Can only merge non-coupled boundary faces"
                         << " but found internal or coupled face:"
                         << setFaces[i] << " in set " << setI
                         << abort(FatalError);
@@ -631,11 +611,8 @@ void Foam::combineFaces::setRefinement
 
         if (edgeLoops.size() != 1)
         {
-            FatalErrorIn
-            (
-                "combineFaces::setRefinement"
-                "(const bool, const labelListList&, polyTopoChange&)"
-            )   << "Faces to-be-merged " << setFaces
+            FatalErrorInFunction
+                << "Faces to-be-merged " << setFaces
                 << " do not form a single big face." << nl
                 << abort(FatalError);
         }
@@ -815,11 +792,8 @@ void Foam::combineFaces::updateMesh(const mapPolyMesh& map)
 
                         if (f[fp] < 0)
                         {
-                            FatalErrorIn
-                            (
-                                "combineFaces::updateMesh"
-                                "(const mapPolyMesh&)"
-                            )   << "In set " << setI << " at position " << i
+                            FatalErrorInFunction
+                                << "In set " << setI << " at position " << i
                                 << " with master face "
                                 << masterFace_[setI] << nl
                                 << "the points of the slave face " << faces[i]
@@ -849,12 +823,8 @@ void Foam::combineFaces::setUnrefinement
 {
     if (!undoable_)
     {
-        FatalErrorIn
-        (
-            "combineFaces::setUnrefinement"
-            "(const labelList&, polyTopoChange&"
-            ", Map<label>&, Map<label>&, Map<label>&)"
-        )   << "Can only call setUnrefinement if constructed with"
+        FatalErrorInFunction
+            << "Can only call setUnrefinement if constructed with"
             << " unrefinement capability." << exit(FatalError);
     }
 
@@ -881,12 +851,8 @@ void Foam::combineFaces::setUnrefinement
 
         if (iter == masterToSet.end())
         {
-            FatalErrorIn
-            (
-                "combineFaces::setUnrefinement"
-                "(const labelList&, polyTopoChange&"
-                ", Map<label>&, Map<label>&, Map<label>&)"
-            )   << "Master face " << masterFaceI
+            FatalErrorInFunction
+                << "Master face " << masterFaceI
                 << " is not the master of one of the merge sets"
                 << " or has already been merged"
                 << abort(FatalError);
@@ -902,12 +868,8 @@ void Foam::combineFaces::setUnrefinement
 
         if (faces.empty())
         {
-            FatalErrorIn
-            (
-                "combineFaces::setUnrefinement"
-                "(const labelList&, polyTopoChange&"
-                ", Map<label>&, Map<label>&, Map<label>&)"
-            )   << "Set " << setI << " with master face " << masterFaceI
+            FatalErrorInFunction
+                << "Set " << setI << " with master face " << masterFaceI
                 << " has already been merged." << abort(FatalError);
         }
 
@@ -964,12 +926,8 @@ void Foam::combineFaces::setUnrefinement
 
         if (mesh_.boundaryMesh()[patchI].coupled())
         {
-            FatalErrorIn
-            (
-                "combineFaces::setUnrefinement"
-                "(const labelList&, polyTopoChange&"
-                ", Map<label>&, Map<label>&, Map<label>&)"
-            )   << "Master face " << masterFaceI << " is on coupled patch "
+            FatalErrorInFunction
+                << "Master face " << masterFaceI << " is on coupled patch "
                 << mesh_.boundaryMesh()[patchI].name()
                 << abort(FatalError);
         }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
index 928f792f2e..64e9ac34bf 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,7 +85,7 @@ void Foam::duplicatePoints::setRefinement
         {
             duplicates_[localI][i] = meshMod.addPoint
             (
-                mesh_.points()[pointI],  // point
+                mesh_.points()[pointI], // point
                 pointI,                 // master point
                 -1,                     // zone for point
                 true                    // supports a cell
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index ef29a307db..2bb25c9049 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -635,7 +635,7 @@ Foam::edgeCollapser::collapseType Foam::edgeCollapser::collapseFace
 
     if (middle == -1)
     {
-//        SeriousErrorIn("collapseFace")
+//        SeriousErrorInFunction
 //            << "middle == -1, " << f << " " << d
 //            << endl;//abort(FatalError);
 
@@ -662,10 +662,7 @@ Foam::edgeCollapser::collapseType Foam::edgeCollapser::collapseFace
 
     if (dNeg.size() == 0 || dPos.size() == 0)
     {
-        WarningIn
-        (
-            "Foam::conformalVoronoiMesh::collapseFace"
-        )
+        WarningInFunction
             << "All points on one side of face centre, not collapsing."
             << endl;
     }
@@ -1066,18 +1063,8 @@ Foam::label Foam::edgeCollapser::syncCollapse
 
                 if (!collapsePointToLocation.found(otherVertex))
                 {
-                    FatalErrorIn
-                    (
-                        "syncCollapse\n"
-                        "(\n"
-                        "   const polyMesh&,\n"
-                        "   const globalIndex&,\n"
-                        "   const labelList&,\n"
-                        "   const PackedBoolList&,\n"
-                        "   Map<point>&,\n"
-                        "   List<pointEdgeCollapse>&\n"
-                        ")\n"
-                    )   << masterPointI << " on edge " << edgeI << " " << e
+                    FatalErrorInFunction
+                        << masterPointI << " on edge " << edgeI << " " << e
                         << " is not marked for collapse."
                         << abort(FatalError);
                 }
@@ -1160,11 +1147,8 @@ void Foam::edgeCollapser::filterFace
         }
         else if (collapseIndex == -1)
         {
-            WarningIn
-            (
-                "filterFace"
-                "(const label, const Map<DynamicList<label> >&, face&)"
-            )   << "Point " << pointI << " was not visited by PointEdgeWave"
+            WarningInFunction
+                << "Point " << pointI << " was not visited by PointEdgeWave"
                 << endl;
         }
         else
@@ -1196,32 +1180,23 @@ void Foam::edgeCollapser::filterFace
 
         if (index == fp1)
         {
-            WarningIn
-            (
-                "Foam::edgeCollapser::filterFace(const label faceI, "
-                "face& f) const"
-            )   << "Removing consecutive duplicate vertex in face "
+            WarningInFunction
+                << "Removing consecutive duplicate vertex in face "
                 << f << endl;
             // Don't store current pointI
         }
         else if (index == fp2)
         {
-            WarningIn
-            (
-                "Foam::edgeCollapser::filterFace(const label faceI, "
-                "face& f) const"
-            )   << "Removing non-consecutive duplicate vertex in face "
+            WarningInFunction
+                << "Removing non-consecutive duplicate vertex in face "
                 << f << endl;
             // Don't store current pointI and remove previous
             newFp--;
         }
         else if (index != -1)
         {
-            WarningIn
-            (
-                "Foam::edgeCollapser::filterFace(const label faceI, "
-                "face& f) const"
-            )   << "Pinched face " << f << endl;
+            WarningInFunction
+                << "Pinched face " << f << endl;
             f[newFp++] = pointI;
         }
         else
@@ -1812,15 +1787,8 @@ void Foam::edgeCollapser::consistentCollapse
 
                 if (nFaces < 4)
                 {
-                    FatalErrorIn
-                    (
-                        "consistentCollapse\n"
-                        "(\n"
-                        "   labelList&,\n"
-                        "   Map<point>&,\n"
-                        "   bool&,\n"
-                        ")"
-                    )   << "Cell " << cellI << " " << cFaces << nl
+                    FatalErrorInFunction
+                        << "Cell " << cellI << " " << cFaces << nl
                         << "is " << nFaces << ", "
                         << "but cell collapse has been disabled."
                         << abort(FatalError);
@@ -2045,7 +2013,7 @@ Foam::labelPair Foam::edgeCollapser::markSmallSliverFaces
         }
         else
         {
-            FatalErrorIn("collapseFaces(const polyMesh&, List<labelPair>&)")
+            FatalErrorInFunction
                 << "Face is marked to be collapsed to " << flagCollapseFace
                 << ". Currently can only collapse to point/edge."
                 << abort(FatalError);
@@ -2112,7 +2080,7 @@ Foam::labelPair Foam::edgeCollapser::markFaceZoneEdges
         }
         else
         {
-            FatalErrorIn("collapseFaces(const polyMesh&, List<labelPair>&)")
+            FatalErrorInFunction
                 << "Face is marked to be collapsed to " << flagCollapseFace
                 << ". Currently can only collapse to point/edge."
                 << abort(FatalError);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 8f579fc4f7..0f61fbb5d1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ Foam::label Foam::faceCollapser::findEdge
         }
     }
 
-    FatalErrorIn("findEdge") << "Cannot find edge between vertices " << v0
+    FatalErrorInFunction
         << " and " << v1 << " in edge labels " << edgeLabels
         << abort(FatalError);
 
@@ -374,7 +374,7 @@ void Foam::faceCollapser::setRefinement
             OFstream str("conflictingFace.obj");
             meshTools::writeOBJ(str, faceList(1, f), points);
 
-            FatalErrorIn("faceCollapser::setRefinement")
+            FatalErrorInFunction
                 << "Trying to collapse face:" << faceI << " vertices:" << f
                 << " to edges between vertices " << f[fpA] << " and "
                 << f[fpB] << " but " << f[fpB] << " does not seem to be the"
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
similarity index 95%
rename from src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 263afe869f..b52312c0b2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,7 +81,7 @@ void Foam::hexRef8::reorder
 
         if (newI >= len)
         {
-            FatalErrorIn("hexRef8::reorder(..)") << abort(FatalError);
+            FatalErrorInFunction << abort(FatalError);
         }
 
         if (newI >= 0)
@@ -352,10 +352,8 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
 {
     if (cellLevel_.size() != mesh_.nCells())
     {
-        FatalErrorIn
-        (
-            "hexRef8::getLevel0EdgeLength() const"
-        )   << "Number of cells in mesh:" << mesh_.nCells()
+        FatalErrorInFunction
+            << "Number of cells in mesh:" << mesh_.nCells()
             << " does not equal size of cellLevel:" << cellLevel_.size()
             << endl
             << "This might be because of a restart with inconsistent cellLevel."
@@ -524,7 +522,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
 
     if (level0Size == -1)
     {
-        FatalErrorIn("hexRef8::getLevel0EdgeLength()")
+        FatalErrorInFunction
             << "Problem : typEdgeLenSqr:" << typEdgeLenSqr << abort(FatalError);
     }
 
@@ -573,7 +571,7 @@ Foam::label Foam::hexRef8::getAnchorCell
         Perr<< "cell:" << cellI << " anchorPoints:" << cellAnchorPoints[cellI]
             << endl;
 
-        FatalErrorIn("hexRef8::getAnchorCell(..)")
+        FatalErrorInFunction
             << "Could not find point " << pointI
             << " in the anchorPoints for cell " << cellI << endl
             << "Does your original mesh obey the 2:1 constraint and"
@@ -755,7 +753,7 @@ Foam::label Foam::hexRef8::findLevel
                 dumpCell(mesh_.faceNeighbour()[faceI]);
             }
 
-            FatalErrorIn("hexRef8::findLevel(..)")
+            FatalErrorInFunction
                 << "face:" << f
                 << " level:" << UIndirectList<label>(pointLevel_, f)()
                 << " startFp:" << startFp
@@ -783,7 +781,7 @@ Foam::label Foam::hexRef8::findLevel
         dumpCell(mesh_.faceNeighbour()[faceI]);
     }
 
-    FatalErrorIn("hexRef8::findLevel(..)")
+    FatalErrorInFunction
         << "face:" << f
         << " level:" << UIndirectList<label>(pointLevel_, f)()
         << " startFp:" << startFp
@@ -795,7 +793,7 @@ Foam::label Foam::hexRef8::findLevel
 
 
 // Gets cell level such that the face has four points <= level.
-Foam::label Foam::hexRef8::getAnchorLevel(const label faceI) const
+Foam::label Foam::hexRef8::faceLevel(const label faceI) const
 {
     const face& f = mesh_.faces()[faceI];
 
@@ -842,7 +840,7 @@ void Foam::hexRef8::checkInternalOrientation
 
     if ((dir & n) < 0)
     {
-        FatalErrorIn("checkInternalOrientation(..)")
+        FatalErrorInFunction
             << "cell:" << cellI << " old face:" << faceI
             << " newFace:" << newFace << endl
             << " coords:" << compactPoints
@@ -857,7 +855,7 @@ void Foam::hexRef8::checkInternalOrientation
 
     if (s < 0.1 || s > 0.9)
     {
-        FatalErrorIn("checkInternalOrientation(..)")
+        FatalErrorInFunction
             << "cell:" << cellI << " old face:" << faceI
             << " newFace:" << newFace << endl
             << " coords:" << compactPoints
@@ -888,7 +886,7 @@ void Foam::hexRef8::checkBoundaryOrientation
 
     if ((dir & n) < 0)
     {
-        FatalErrorIn("checkBoundaryOrientation(..)")
+        FatalErrorInFunction
             << "cell:" << cellI << " old face:" << faceI
             << " newFace:" << newFace
             << " coords:" << compactPoints
@@ -903,7 +901,7 @@ void Foam::hexRef8::checkBoundaryOrientation
 
     if (s < 0.7 || s > 1.3)
     {
-        WarningIn("checkBoundaryOrientation(..)")
+        WarningInFunction
             << "cell:" << cellI << " old face:" << faceI
             << " newFace:" << newFace
             << " coords:" << compactPoints
@@ -1273,7 +1271,7 @@ void Foam::hexRef8::createInternalFaces
                 dumpCell(mesh_.faceNeighbour()[faceI]);
             }
 
-            FatalErrorIn("createInternalFaces(..)")
+            FatalErrorInFunction
                 << "nAnchors:" << nAnchors
                 << " faceI:" << faceI
                 << abort(FatalError);
@@ -1315,7 +1313,7 @@ void Foam::hexRef8::createInternalFaces
 
                         const labelList& cPoints = mesh_.cellPoints(cellI);
 
-                        FatalErrorIn("createInternalFaces(..)")
+                        FatalErrorInFunction
                             << "cell:" << cellI << " cLevel:" << cLevel
                             << " cell points:" << cPoints
                             << " pointLevel:"
@@ -1388,7 +1386,7 @@ void Foam::hexRef8::createInternalFaces
 
                         const labelList& cPoints = mesh_.cellPoints(cellI);
 
-                        FatalErrorIn("createInternalFaces(..)")
+                        FatalErrorInFunction
                             << "cell:" << cellI << " cLevel:" << cLevel
                             << " cell points:" << cPoints
                             << " pointLevel:"
@@ -1672,10 +1670,8 @@ void Foam::hexRef8::checkWantedRefinementLevels
         {
             dumpCell(own);
             dumpCell(nei);
-            FatalErrorIn
-            (
-                "hexRef8::checkWantedRefinementLevels(const labelList&)"
-            )   << "cell:" << own
+            FatalErrorInFunction
+                << "cell:" << own
                 << " current level:" << cellLevel_[own]
                 << " level after refinement:" << ownLevel
                 << nl
@@ -1715,10 +1711,8 @@ void Foam::hexRef8::checkWantedRefinementLevels
             label patchI = mesh_.boundaryMesh().whichPatch(faceI);
 
             dumpCell(own);
-            FatalErrorIn
-            (
-                "hexRef8::checkWantedRefinementLevels(const labelList&)"
-            )   << "Celllevel does not satisfy 2:1 constraint."
+            FatalErrorInFunction
+                << "Celllevel does not satisfy 2:1 constraint."
                 << " On coupled face "
                 << faceI
                 << " on patch " << patchI << " "
@@ -2008,10 +2002,8 @@ Foam::hexRef8::hexRef8(const polyMesh& mesh, const bool readHistory)
 
     if (history_.active() && history_.visibleCells().size() != mesh_.nCells())
     {
-        FatalErrorIn
-        (
-            "hexRef8::hexRef8(const polyMesh&)"
-        )   << "History enabled but number of visible cells "
+        FatalErrorInFunction
+            << "History enabled but number of visible cells "
             << history_.visibleCells().size() << " in "
             << history_.objectPath()
             << " is not equal to the number of cells in the mesh "
@@ -2025,10 +2017,8 @@ Foam::hexRef8::hexRef8(const polyMesh& mesh, const bool readHistory)
      || pointLevel_.size() != mesh_.nPoints()
     )
     {
-        FatalErrorIn
-        (
-            "hexRef8::hexRef8(const polyMesh&)"
-        )   << "Restarted from inconsistent cellLevel or pointLevel files."
+        FatalErrorInFunction
+            << "Restarted from inconsistent cellLevel or pointLevel files."
             << endl
             << "cellLevel file " << cellLevel_.objectPath() << endl
             << "pointLevel file " << pointLevel_.objectPath() << endl
@@ -2127,11 +2117,8 @@ Foam::hexRef8::hexRef8
 {
     if (history_.active() && history_.visibleCells().size() != mesh_.nCells())
     {
-        FatalErrorIn
-        (
-            "hexRef8::hexRef8(const polyMesh&, const labelList&"
-            ", const labelList&, const refinementHistory&)"
-        )   << "History enabled but number of visible cells in it "
+        FatalErrorInFunction
+            << "History enabled but number of visible cells in it "
             << history_.visibleCells().size()
             << " is not equal to the number of cells in the mesh "
             << mesh_.nCells() << abort(FatalError);
@@ -2143,11 +2130,8 @@ Foam::hexRef8::hexRef8
      || pointLevel_.size() != mesh_.nPoints()
     )
     {
-        FatalErrorIn
-        (
-            "hexRef8::hexRef8(const polyMesh&, const labelList&"
-            ", const labelList&, const refinementHistory&)"
-        )   << "Incorrect cellLevel or pointLevel size." << endl
+        FatalErrorInFunction
+            << "Incorrect cellLevel or pointLevel size." << endl
             << "Number of cells in mesh:" << mesh_.nCells()
             << " does not equal size of cellLevel:" << cellLevel_.size() << endl
             << "Number of points in mesh:" << mesh_.nPoints()
@@ -2234,7 +2218,8 @@ Foam::hexRef8::hexRef8
             IOobject::AUTO_WRITE
         ),
         List<refinementHistory::splitCell8>(0),
-        labelList(0)
+        labelList(0),
+        false
     ),
     faceRemover_(mesh_, GREAT),     // merge boundary faces wherever possible
     savedPointLevel_(0),
@@ -2246,11 +2231,8 @@ Foam::hexRef8::hexRef8
      || pointLevel_.size() != mesh_.nPoints()
     )
     {
-        FatalErrorIn
-        (
-            "hexRef8::hexRef8(const polyMesh&, const labelList&"
-            ", const labelList&)"
-        )   << "Incorrect cellLevel or pointLevel size." << endl
+        FatalErrorInFunction
+            << "Incorrect cellLevel or pointLevel size." << endl
             << "Number of cells in mesh:" << mesh_.nCells()
             << " does not equal size of cellLevel:" << cellLevel_.size() << endl
             << "Number of points in mesh:" << mesh_.nPoints()
@@ -2362,12 +2344,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
 
     if (maxFaceDiff <= 0)
     {
-        FatalErrorIn
-        (
-            "hexRef8::consistentSlowRefinement"
-            "(const label, const labelList&, const labelList&"
-            ", const label, const labelList&)"
-        )   << "Illegal maxFaceDiff " << maxFaceDiff << nl
+        FatalErrorInFunction
+            << "Illegal maxFaceDiff " << maxFaceDiff << nl
             << "Value should be >= 1" << exit(FatalError);
     }
 
@@ -2425,12 +2403,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
         if (allFaceInfo[faceI].valid(dummyTrackData))
         {
             // Can only occur if face has already gone through loop below.
-            FatalErrorIn
-            (
-                "hexRef8::consistentSlowRefinement"
-                "(const label, const labelList&, const labelList&"
-                ", const label, const labelList&)"
-            )   << "Argument facesToCheck seems to have duplicate entries!"
+            FatalErrorInFunction
+                << "Argument facesToCheck seems to have duplicate entries!"
                 << endl
                 << "face:" << faceI << " occurs at positions "
                 << findIndices(facesToCheck, faceI)
@@ -2723,12 +2697,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
             {
                 dumpCell(own);
                 dumpCell(nei);
-                FatalErrorIn
-                (
-                    "hexRef8::consistentSlowRefinement"
-                    "(const label, const labelList&, const labelList&"
-                    ", const label, const labelList&)"
-                )   << "cell:" << own
+                FatalErrorInFunction
+                    << "cell:" << own
                     << " current level:" << cellLevel_[own]
                     << " current refData:" << allCellInfo[own]
                     << " level after refinement:" << ownLevel
@@ -2784,12 +2754,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement
                 dumpCell(own);
                 label patchI = mesh_.boundaryMesh().whichPatch(faceI);
 
-                FatalErrorIn
-                (
-                    "hexRef8::consistentSlowRefinement"
-                    "(const label, const labelList&, const labelList&"
-                    ", const label, const labelList&)"
-                )   << "Celllevel does not satisfy 2:1 constraint."
+                FatalErrorInFunction
+                    << "Celllevel does not satisfy 2:1 constraint."
                     << " On coupled face "
                     << faceI
                     << " refData:" << allFaceInfo[faceI]
@@ -2859,11 +2825,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
 
     if (maxFaceDiff <= 0)
     {
-        FatalErrorIn
-        (
-            "hexRef8::consistentSlowRefinement2"
-            "(const label, const labelList&, const labelList&)"
-        )   << "Illegal maxFaceDiff " << maxFaceDiff << nl
+        FatalErrorInFunction
+            << "Illegal maxFaceDiff " << maxFaceDiff << nl
             << "Value should be >= 1" << exit(FatalError);
     }
 
@@ -2926,11 +2889,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
         if (allFaceInfo[faceI].valid(dummyTrackData))
         {
             // Can only occur if face has already gone through loop below.
-            FatalErrorIn
-            (
-                "hexRef8::consistentSlowRefinement2"
-                "(const label, const labelList&, const labelList&)"
-            )   << "Argument facesToCheck seems to have duplicate entries!"
+            FatalErrorInFunction
+                << "Argument facesToCheck seems to have duplicate entries!"
                 << endl
                 << "face:" << faceI << " occurs at positions "
                 << findIndices(facesToCheck, faceI)
@@ -3262,11 +3222,8 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
                 if (refineCell.get(cellI) && !savedRefineCell.get(cellI))
                 {
                     dumpCell(cellI);
-                    FatalErrorIn
-                    (
-                        "hexRef8::consistentSlowRefinement2"
-                        "(const label, const labelList&, const labelList&)"
-                    )   << "Cell:" << cellI << " cc:"
+                    FatalErrorInFunction
+                        << "Cell:" << cellI << " cc:"
                         << mesh_.cellCentres()[cellI]
                         << " was not marked for refinement but does not obey"
                         << " 2:1 constraints."
@@ -3519,7 +3476,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
 
     for (label faceI = 0; faceI < mesh_.nFaces(); faceI++)
     {
-        faceAnchorLevel[faceI] = getAnchorLevel(faceI);
+        faceAnchorLevel[faceI] = faceLevel(faceI);
     }
 
     // -1  : no need to split face
@@ -3741,11 +3698,8 @@ Foam::labelListList Foam::hexRef8::setRefinement
                     if (nAnchorPoints[cellI] == 8)
                     {
                         dumpCell(cellI);
-                        FatalErrorIn
-                        (
-                            "hexRef8::setRefinement(const labelList&"
-                            ", polyTopoChange&)"
-                        )   << "cell " << cellI
+                        FatalErrorInFunction
+                            << "cell " << cellI
                             << " of level " << cellLevel_[cellI]
                             << " uses more than 8 points of equal or"
                             << " lower level" << nl
@@ -3768,11 +3722,8 @@ Foam::labelListList Foam::hexRef8::setRefinement
 
                     const labelList& cPoints = mesh_.cellPoints(cellI);
 
-                    FatalErrorIn
-                    (
-                        "hexRef8::setRefinement(const labelList&"
-                        ", polyTopoChange&)"
-                    )   << "cell " << cellI
+                    FatalErrorInFunction
+                        << "cell " << cellI
                         << " of level " << cellLevel_[cellI]
                         << " does not seem to have 8 points of equal or"
                         << " lower level" << endl
@@ -4247,7 +4198,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
 
         if (minPointI != labelMax && minPointI != mesh_.nPoints())
         {
-            FatalErrorIn("hexRef8::setRefinement(..)")
+            FatalErrorInFunction
                 << "Added point labels not consecutive to existing mesh points."
                 << nl
                 << "mesh_.nPoints():" << mesh_.nPoints()
@@ -4420,7 +4371,7 @@ void Foam::hexRef8::updateMesh
 
             if (fnd == savedCellLevel_.end())
             {
-                FatalErrorIn("hexRef8::updateMesh(const mapPolyMesh&)")
+                FatalErrorInFunction
                     << "Problem : trying to restore old value for new cell "
                     << newCellI << " but cannot find old cell " << storedCellI
                     << " in map of stored values " << savedCellLevel_
@@ -4431,7 +4382,7 @@ void Foam::hexRef8::updateMesh
 
         //if (findIndex(cellLevel_, -1) != -1)
         //{
-        //    WarningIn("hexRef8::updateMesh(const mapPolyMesh&)")
+        //    WarningInFunction
         //        << "Problem : "
         //        << "cellLevel_ contains illegal value -1 after mapping
         //        << " at cell " << findIndex(cellLevel_, -1) << endl
@@ -4465,7 +4416,7 @@ void Foam::hexRef8::updateMesh
 
                 if (oldPointI == -1)
                 {
-                    //FatalErrorIn("hexRef8::updateMesh(const mapPolyMesh&)")
+                    //FatalErrorInFunction
                     //    << "Problem : point " << newPointI
                     //    << " at " << mesh_.points()[newPointI]
                     //    << " does not originate from another point"
@@ -4493,7 +4444,7 @@ void Foam::hexRef8::updateMesh
 
             if (fnd == savedPointLevel_.end())
             {
-                FatalErrorIn("hexRef8::updateMesh(const mapPolyMesh&)")
+                FatalErrorInFunction
                     << "Problem : trying to restore old value for new point "
                     << newPointI << " but cannot find old point "
                     << storedPointI
@@ -4505,7 +4456,7 @@ void Foam::hexRef8::updateMesh
 
         //if (findIndex(pointLevel_, -1) != -1)
         //{
-        //    WarningIn("hexRef8::updateMesh(const mapPolyMesh&)")
+        //    WarningInFunction
         //        << "Problem : "
         //        << "pointLevel_ contains illegal value -1 after mapping"
         //        << " at point" << findIndex(pointLevel_, -1) << endl
@@ -4551,11 +4502,8 @@ void Foam::hexRef8::subset
 
     if (history_.active())
     {
-        WarningIn
-        (
-            "hexRef8::subset(const labelList&, const labelList&"
-            ", const labelList&)"
-        )   << "Subsetting will not work in combination with unrefinement."
+        WarningInFunction
+            << "Subsetting will not work in combination with unrefinement."
             << nl
             << "Proceed at your own risk." << endl;
     }
@@ -4574,7 +4522,7 @@ void Foam::hexRef8::subset
 
         if (findIndex(cellLevel_, -1) != -1)
         {
-            FatalErrorIn("hexRef8::subset(..)")
+            FatalErrorInFunction
                 << "Problem : "
                 << "cellLevel_ contains illegal value -1 after mapping:"
                 << cellLevel_
@@ -4595,7 +4543,7 @@ void Foam::hexRef8::subset
 
         if (findIndex(pointLevel_, -1) != -1)
         {
-            FatalErrorIn("hexRef8::subset(..)")
+            FatalErrorInFunction
                 << "Problem : "
                 << "pointLevel_ contains illegal value -1 after mapping:"
                 << pointLevel_
@@ -4698,7 +4646,7 @@ void Foam::hexRef8::checkMesh() const
                     if (!cellToFace.insert(labelPair(own, nei[bFaceI]), faceI))
                     {
                         dumpCell(own);
-                        FatalErrorIn("hexRef8::checkMesh()")
+                        FatalErrorInFunction
                             << "Faces do not seem to be correct across coupled"
                             << " boundaries" << endl
                             << "Coupled face " << faceI
@@ -4743,7 +4691,7 @@ void Foam::hexRef8::checkMesh() const
 
                 dumpCell(mesh_.faceOwner()[faceI]);
 
-                FatalErrorIn("hexRef8::checkMesh()")
+                FatalErrorInFunction
                     << "Faces do not seem to be correct across coupled"
                     << " boundaries" << endl
                     << "Coupled face " << faceI
@@ -4785,7 +4733,7 @@ void Foam::hexRef8::checkMesh() const
 
                 label patchI = mesh_.boundaryMesh().whichPatch(faceI);
 
-                FatalErrorIn("hexRef8::checkMesh()")
+                FatalErrorInFunction
                     << "Faces do not seem to be correct across coupled"
                     << " boundaries" << endl
                     << "Coupled face " << faceI
@@ -4835,7 +4783,7 @@ void Foam::hexRef8::checkMesh() const
 
                 label patchI = mesh_.boundaryMesh().whichPatch(faceI);
 
-                FatalErrorIn("hexRef8::checkMesh()")
+                FatalErrorInFunction
                     << "Faces do not seem to be correct across coupled"
                     << " boundaries" << endl
                     << "Coupled face " << faceI
@@ -4876,7 +4824,7 @@ void Foam::hexRef8::checkRefinementLevels
      || pointLevel_.size() != mesh_.nPoints()
     )
     {
-        FatalErrorIn("hexRef8::checkRefinementLevels(const label)")
+        FatalErrorInFunction
             << "cellLevel size should be number of cells"
             << " and pointLevel size should be number of points."<< nl
             << "cellLevel:" << cellLevel_.size()
@@ -4902,10 +4850,8 @@ void Foam::hexRef8::checkRefinementLevels
                 dumpCell(own);
                 dumpCell(nei);
 
-                FatalErrorIn
-                (
-                    "hexRef8::checkRefinementLevels(const label)"
-                )   << "Celllevel does not satisfy 2:1 constraint." << nl
+                FatalErrorInFunction
+                    << "Celllevel does not satisfy 2:1 constraint." << nl
                     << "On face " << faceI << " owner cell " << own
                     << " has refinement " << cellLevel_[own]
                     << " neighbour cell " << nei << " has refinement "
@@ -4939,10 +4885,8 @@ void Foam::hexRef8::checkRefinementLevels
 
                 label patchI = mesh_.boundaryMesh().whichPatch(faceI);
 
-                FatalErrorIn
-                (
-                    "hexRef8::checkRefinementLevels(const label)"
-                )   << "Celllevel does not satisfy 2:1 constraint."
+                FatalErrorInFunction
+                    << "Celllevel does not satisfy 2:1 constraint."
                     << " On coupled face " << faceI
                     << " on patch " << patchI << " "
                     << mesh_.boundaryMesh()[patchI].name()
@@ -4975,10 +4919,8 @@ void Foam::hexRef8::checkRefinementLevels
         {
             if (pointLevel_[pointI] != syncPointLevel[pointI])
             {
-                FatalErrorIn
-                (
-                    "hexRef8::checkRefinementLevels(const label)"
-                )   << "PointLevel is not consistent across coupled patches."
+                FatalErrorInFunction
+                    << "PointLevel is not consistent across coupled patches."
                     << endl
                     << "point:" << pointI << " coord:" << mesh_.points()[pointI]
                     << " has level " << pointLevel_[pointI]
@@ -5036,10 +4978,8 @@ void Foam::hexRef8::checkRefinementLevels
                 {
                     dumpCell(cellI);
 
-                    FatalErrorIn
-                    (
-                        "hexRef8::checkRefinementLevels(const label)"
-                    )   << "Too big a difference between"
+                    FatalErrorInFunction
+                        << "Too big a difference between"
                         << " point-connected cells." << nl
                         << "cell:" << cellI
                         << " cellLevel:" << cellLevel_[cellI]
@@ -5110,10 +5050,8 @@ void Foam::hexRef8::checkRefinementLevels
     //
     //    if (returnReduce(nHanging, sumOp<label>()) > 0)
     //    {
-    //        FatalErrorIn
-    //        (
-    //            "hexRef8::checkRefinementLevels(const label)"
-    //        )   << "Detected a point used by two edges only (hanging point)"
+    //        FatalErrorInFunction
+    //            << "Detected a point used by two edges only (hanging point)"
     //            << nl << "This is not allowed"
     //            << abort(FatalError);
     //    }
@@ -5204,7 +5142,7 @@ Foam::labelList Foam::hexRef8::getSplitPoints() const
 
     if (!history_.active())
     {
-        FatalErrorIn("hexRef8::getSplitPoints()")
+        FatalErrorInFunction
             << "Only call if constructed with history capability"
             << abort(FatalError);
     }
@@ -5405,10 +5343,8 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
 
     if (maxSet)
     {
-        FatalErrorIn
-        (
-            "hexRef8::consistentUnrefinement(const labelList&, const bool"
-        )   << "maxSet not implemented yet."
+        FatalErrorInFunction
+            << "maxSet not implemented yet."
             << abort(FatalError);
     }
 
@@ -5478,13 +5414,13 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
                     // could also combine with unset:
                     // if (!unrefineCell.unset(own))
                     // {
-                    //     FatalErrorIn("hexRef8::consistentUnrefinement(..)")
+                    //     FatalErrorInFunction
                     //         << "problem cell already unset"
                     //         << abort(FatalError);
                     // }
                     if (unrefineCell.get(own) == 0)
                     {
-                        FatalErrorIn("hexRef8::consistentUnrefinement(..)")
+                        FatalErrorInFunction
                             << "problem" << abort(FatalError);
                     }
 
@@ -5502,7 +5438,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
                 {
                     if (unrefineCell.get(nei) == 0)
                     {
-                        FatalErrorIn("hexRef8::consistentUnrefinement(..)")
+                        FatalErrorInFunction
                             << "problem" << abort(FatalError);
                     }
 
@@ -5538,7 +5474,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
                 {
                     if (unrefineCell.get(own) == 0)
                     {
-                        FatalErrorIn("hexRef8::consistentUnrefinement(..)")
+                        FatalErrorInFunction
                             << "problem" << abort(FatalError);
                     }
 
@@ -5552,7 +5488,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
                 {
                     if (unrefineCell.get(own) == 1)
                     {
-                        FatalErrorIn("hexRef8::consistentUnrefinement(..)")
+                        FatalErrorInFunction
                             << "problem" << abort(FatalError);
                     }
 
@@ -5635,10 +5571,8 @@ void Foam::hexRef8::setUnrefinement
 {
     if (!history_.active())
     {
-        FatalErrorIn
-        (
-            "hexRef8::setUnrefinement(const labelList&, polyTopoChange&)"
-        )   << "Only call if constructed with history capability"
+        FatalErrorInFunction
+            << "Only call if constructed with history capability"
             << abort(FatalError);
     }
 
@@ -5653,14 +5587,8 @@ void Foam::hexRef8::setUnrefinement
         {
             if (cellLevel_[cellI] < 0)
             {
-                FatalErrorIn
-                (
-                    "hexRef8::setUnrefinement"
-                    "("
-                        "const labelList&, "
-                        "polyTopoChange&"
-                    ")"
-                )   << "Illegal cell level " << cellLevel_[cellI]
+                FatalErrorInFunction
+                    << "Illegal cell level " << cellLevel_[cellI]
                     << " for cell " << cellI
                     << abort(FatalError);
             }
@@ -5722,10 +5650,8 @@ void Foam::hexRef8::setUnrefinement
 
         if (facesToRemove.size() != splitFaces.size())
         {
-            FatalErrorIn
-            (
-                "hexRef8::setUnrefinement(const labelList&, polyTopoChange&)"
-            )   << "Ininitial set of split points to unrefine does not"
+            FatalErrorInFunction
+                << "Ininitial set of split points to unrefine does not"
                 << " seem to be consistent or not mid points of refined cells"
                 << abort(FatalError);
         }
@@ -5746,10 +5672,8 @@ void Foam::hexRef8::setUnrefinement
         // Check
         if (pCells.size() != 8)
         {
-            FatalErrorIn
-            (
-                "hexRef8::setUnrefinement(const labelList&, polyTopoChange&)"
-            )   << "splitPoint " << pointI
+            FatalErrorInFunction
+                << "splitPoint " << pointI
                 << " should have 8 cells using it. It has " << pCells
                 << abort(FatalError);
         }
@@ -5769,7 +5693,7 @@ void Foam::hexRef8::setUnrefinement
 
                 if (region == -1)
                 {
-                    FatalErrorIn("hexRef8::setUnrefinement(..)")
+                    FatalErrorInFunction
                         << "Ininitial set of split points to unrefine does not"
                         << " seem to be consistent or not mid points"
                         << " of refined cells" << nl
@@ -5780,7 +5704,7 @@ void Foam::hexRef8::setUnrefinement
 
                 if (masterCellI != cellRegionMaster[region])
                 {
-                    FatalErrorIn("hexRef8::setUnrefinement(..)")
+                    FatalErrorInFunction
                         << "cell:" << cellI << " on splitPoint:" << pointI
                         << " in region " << region
                         << " has master:" << cellRegionMaster[region]
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
similarity index 99%
rename from src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 58dfc8559b..883681c789 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -411,7 +411,7 @@ public:
         // Refinement
 
             //- Gets level such that the face has four points <= level.
-            label getAnchorLevel(const label faceI) const;
+            label faceLevel(const label faceI) const;
 
             //- Given valid mesh and current cell level and proposed
             //  cells to refine calculate any clashes (due to 2:1) and return
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
new file mode 100644
index 0000000000..08fc68edf0
--- /dev/null
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOobject.H"
+#include "UList.H"
+
+#include "hexRef8Data.H"
+#include "mapPolyMesh.H"
+#include "mapDistributePolyMesh.H"
+#include "polyMesh.H"
+#include "syncTools.H"
+#include "refinementHistory.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::hexRef8Data::hexRef8Data(const IOobject& io)
+{
+    {
+        IOobject rio(io);
+        rio.rename("cellLevel");
+        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        if (haveFile)
+        {
+            Info<< "Reading hexRef8 data : " << rio.name() << endl;
+            cellLevelPtr_.reset(new labelIOList(rio));
+        }
+    }
+    {
+        IOobject rio(io);
+        rio.rename("pointLevel");
+        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        if (haveFile)
+        {
+            Info<< "Reading hexRef8 data : " << rio.name() << endl;
+            pointLevelPtr_.reset(new labelIOList(rio));
+        }
+    }
+    {
+        IOobject rio(io);
+        rio.rename("level0Edge");
+
+        // MEJ: temporarily (until global reading of UniformedFields)
+        //      do not read level0Edge on processors that do not have it.
+        bool haveFile = rio.headerOk();
+        if (rio.readOpt() != IOobject::READ_IF_PRESENT)
+        {
+            reduce(haveFile, orOp<bool>());
+        }
+
+        if (haveFile)
+        {
+            Info<< "Reading hexRef8 data : " << rio.name() << endl;
+            level0EdgePtr_.reset(new uniformDimensionedScalarField(rio));
+        }
+    }
+    {
+        IOobject rio(io);
+        rio.rename("refinementHistory");
+        bool haveFile = returnReduce(rio.headerOk(), orOp<bool>());
+        if (haveFile)
+        {
+            Info<< "Reading hexRef8 data : " << rio.name() << endl;
+            refHistoryPtr_.reset(new refinementHistory(rio));
+        }
+    }
+}
+
+
+Foam::hexRef8Data::hexRef8Data
+(
+    const IOobject& io,
+    const hexRef8Data& data,
+    const labelList& cellMap,
+    const labelList& pointMap
+)
+{
+    if (data.cellLevelPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(data.cellLevelPtr_().name());
+
+        cellLevelPtr_.reset
+        (
+            new labelIOList
+            (
+                rio,
+                UIndirectList<label>(data.cellLevelPtr_(), cellMap)()
+            )
+        );
+    }
+    if (data.pointLevelPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(data.pointLevelPtr_().name());
+
+        pointLevelPtr_.reset
+        (
+            new labelIOList
+            (
+                rio,
+                UIndirectList<label>(data.pointLevelPtr_(), pointMap)()
+            )
+        );
+    }
+    if (data.level0EdgePtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(data.level0EdgePtr_().name());
+
+        level0EdgePtr_.reset
+        (
+            new uniformDimensionedScalarField(rio, data.level0EdgePtr_())
+        );
+    }
+    if (data.refHistoryPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(data.refHistoryPtr_().name());
+
+        refHistoryPtr_ = data.refHistoryPtr_().clone(rio, cellMap);
+    }
+}
+
+
+Foam::hexRef8Data::hexRef8Data
+(
+    const IOobject& io,
+    const UPtrList<const labelList>& cellMaps,
+    const UPtrList<const labelList>& pointMaps,
+    const UPtrList<const hexRef8Data>& procDatas
+)
+{
+    const polyMesh& mesh = dynamic_cast<const polyMesh&>(io.db());
+
+    // cellLevel
+
+    if (procDatas[0].cellLevelPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(procDatas[0].cellLevelPtr_().name());
+
+        cellLevelPtr_.reset(new labelIOList(rio, mesh.nCells()));
+        labelList& cellLevel = cellLevelPtr_();
+
+        forAll(procDatas, procI)
+        {
+            const labelList& procCellLevel = procDatas[procI].cellLevelPtr_();
+            UIndirectList<label>(cellLevel, cellMaps[procI]) = procCellLevel;
+        }
+    }
+
+
+    // pointLevel
+
+    if (procDatas[0].pointLevelPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(procDatas[0].pointLevelPtr_().name());
+
+        pointLevelPtr_.reset(new labelIOList(rio, mesh.nPoints()));
+        labelList& pointLevel = pointLevelPtr_();
+
+        forAll(procDatas, procI)
+        {
+            const labelList& procPointLevel = procDatas[procI].pointLevelPtr_();
+            UIndirectList<label>(pointLevel, pointMaps[procI]) = procPointLevel;
+        }
+    }
+
+
+    // level0Edge
+
+    if (procDatas[0].level0EdgePtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(procDatas[0].level0EdgePtr_().name());
+
+        level0EdgePtr_.reset
+        (
+            new uniformDimensionedScalarField
+            (
+                rio,
+                procDatas[0].level0EdgePtr_()
+            )
+        );
+    }
+
+
+    // refinementHistory
+
+    if (procDatas[0].refHistoryPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename(procDatas[0].refHistoryPtr_().name());
+
+        UPtrList<const refinementHistory> procRefs(procDatas.size());
+        forAll(procDatas, i)
+        {
+            procRefs.set(i, &procDatas[i].refHistoryPtr_());
+        }
+
+        refHistoryPtr_.reset
+        (
+            new refinementHistory
+            (
+                rio,
+                cellMaps,
+                procRefs
+            )
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::hexRef8Data::~hexRef8Data()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::hexRef8Data::sync(const IOobject& io)
+{
+    const polyMesh& mesh = dynamic_cast<const polyMesh&>(io.db());
+
+    bool hasCellLevel = returnReduce(cellLevelPtr_.valid(), orOp<bool>());
+    if (hasCellLevel && !cellLevelPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename("cellLevel");
+        rio.readOpt() = IOobject::NO_READ;
+        cellLevelPtr_.reset(new labelIOList(rio, labelList(mesh.nCells(), 0)));
+    }
+
+    bool hasPointLevel = returnReduce(pointLevelPtr_.valid(), orOp<bool>());
+    if (hasPointLevel && !pointLevelPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename("pointLevel");
+        rio.readOpt() = IOobject::NO_READ;
+        pointLevelPtr_.reset
+        (
+            new labelIOList(rio, labelList(mesh.nPoints(), 0))
+        );
+    }
+
+    bool hasLevel0Edge = returnReduce(level0EdgePtr_.valid(), orOp<bool>());
+    if (hasLevel0Edge)
+    {
+        // Get master length
+        scalar masterLen = (Pstream::master() ? level0EdgePtr_().value() : 0);
+        Pstream::scatter(masterLen);
+        if (!level0EdgePtr_.valid())
+        {
+            IOobject rio(io);
+            rio.rename("level0Edge");
+            rio.readOpt() = IOobject::NO_READ;
+            level0EdgePtr_.reset
+            (
+                new uniformDimensionedScalarField
+                (
+                    rio,
+                    dimensionedScalar("zero", dimLength, masterLen)
+                )
+            );
+        }
+    }
+
+    bool hasHistory = returnReduce(refHistoryPtr_.valid(), orOp<bool>());
+    if (hasHistory && !refHistoryPtr_.valid())
+    {
+        IOobject rio(io);
+        rio.rename("refinementHistory");
+        rio.readOpt() = IOobject::NO_READ;
+        refHistoryPtr_.reset(new refinementHistory(rio, mesh.nCells(), true));
+    }
+}
+
+
+void Foam::hexRef8Data::distribute(const mapDistributePolyMesh& map)
+{
+    if (cellLevelPtr_.valid())
+    {
+        map.cellMap().distribute(cellLevelPtr_());
+    }
+    if (pointLevelPtr_.valid())
+    {
+        map.pointMap().distribute(pointLevelPtr_());
+    }
+
+    // No need to distribute the level0Edge
+
+    if (refHistoryPtr_.valid() && refHistoryPtr_().active())
+    {
+        refHistoryPtr_().distribute(map);
+    }
+}
+
+
+bool Foam::hexRef8Data::write() const
+{
+    bool ok = true;
+    if (cellLevelPtr_.valid())
+    {
+        ok = ok && cellLevelPtr_().write();
+    }
+    if (pointLevelPtr_.valid())
+    {
+        ok = ok && pointLevelPtr_().write();
+    }
+    if (level0EdgePtr_.valid())
+    {
+        ok = ok && level0EdgePtr_().write();
+    }
+    if (refHistoryPtr_.valid())
+    {
+        ok = ok && refHistoryPtr_().write();
+    }
+    return ok;
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
new file mode 100644
index 0000000000..3e7fc3cec0
--- /dev/null
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::hexRef8Data
+
+Description
+    Various for reading/decomposing/reconstructing/distributing refinement
+    data.
+
+SourceFiles
+    hexRef8Data.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hexRef8Data_H
+#define hexRef8Data_H
+
+#include "labelIOList.H"
+#include "uniformDimensionedFields.H"
+#include "UPtrList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class mapPolyMesh;
+class mapDistributePolyMesh;
+class refinementHistory;
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class hexRef8Data Declaration
+\*---------------------------------------------------------------------------*/
+
+class hexRef8Data
+{
+
+private:
+
+    // Private data
+
+        autoPtr<labelIOList> cellLevelPtr_;
+
+        autoPtr<labelIOList> pointLevelPtr_;
+
+        autoPtr<uniformDimensionedScalarField> level0EdgePtr_;
+
+        autoPtr<refinementHistory> refHistoryPtr_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        hexRef8Data(const hexRef8Data&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const hexRef8Data&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct read. Has special provision for only some processors
+        //  having the files so can be used in redistribution.
+        hexRef8Data(const IOobject& io);
+
+        //- Construct as subset
+        hexRef8Data
+        (
+            const IOobject& io,
+            const hexRef8Data&,
+            const labelList& cellMap,
+            const labelList& pointMap
+        );
+
+        //- Construct from multiple hexRef8Data
+        hexRef8Data
+        (
+            const IOobject& io,
+            const UPtrList<const labelList>& cellMaps,
+            const UPtrList<const labelList>& pointMaps,
+            const UPtrList<const hexRef8Data>&
+        );
+
+
+    //- Destructor
+    ~hexRef8Data();
+
+
+    // Member Functions
+
+        //- Parallel synchronise. This enforces valid objects on all processors
+        //  (even if they don't have a mesh). Used by redistributePar.
+        void sync(const IOobject& io);
+
+        //- In-place distribute
+        void distribute(const mapDistributePolyMesh&);
+
+        //- Write
+        bool write() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
similarity index 64%
rename from src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index 8e9e844cb5..bdf93b42ea 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,20 +23,150 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DynamicList.H"
 #include "refinementHistory.H"
-#include "ListOps.H"
 #include "mapPolyMesh.H"
 #include "mapDistributePolyMesh.H"
 #include "polyMesh.H"
+#include "syncTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(refinementHistory, 0);
+}
 
-defineTypeNameAndDebug(refinementHistory, 0);
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+//- Construct null
+Foam::refinementHistory::splitCell8::splitCell8()
+:
+    parent_(-1),
+    addedCellsPtr_(NULL)
+{}
+
+
+//- Construct as child element of parent
+Foam::refinementHistory::splitCell8::splitCell8(const label parent)
+:
+    parent_(parent),
+    addedCellsPtr_(NULL)
+{}
+
+
+//- Construct from Istream
+Foam::refinementHistory::splitCell8::splitCell8(Istream& is)
+{
+    is >> *this;
+}
+
+
+//- Construct as (deep) copy.
+Foam::refinementHistory::splitCell8::splitCell8(const splitCell8& sc)
+:
+    parent_(sc.parent_),
+    addedCellsPtr_
+    (
+        sc.addedCellsPtr_.valid()
+      ? new FixedList<label, 8>(sc.addedCellsPtr_())
+      : NULL
+    )
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+//- Copy operator since autoPtr otherwise 'steals' storage.
+void Foam::refinementHistory::splitCell8::operator=(const splitCell8& s)
+{
+    // Check for assignment to self
+    if (this == &s)
+    {
+        FatalErrorInFunction
+            << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    parent_ = s.parent_;
+
+    addedCellsPtr_.reset
+    (
+        s.addedCellsPtr_.valid()
+      ? new FixedList<label, 8>(s.addedCellsPtr_())
+      : NULL
+    );
+}
+
+
+bool Foam::refinementHistory::splitCell8::operator==(const splitCell8& s) const
+{
+    if (addedCellsPtr_.valid() != s.addedCellsPtr_.valid())
+    {
+        return false;
+    }
+    else if (parent_ != s.parent_)
+    {
+        return false;
+    }
+    else if (addedCellsPtr_.valid())
+    {
+        return addedCellsPtr_() == s.addedCellsPtr_();
+    }
+    else
+    {
+        return true;
+    }
+}
+
+
+bool Foam::refinementHistory::splitCell8::operator!=(const splitCell8& s) const
+{
+    return !operator==(s);
+}
+
+
+// * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, refinementHistory::splitCell8& sc)
+{
+    labelList addedCells;
+
+    is >> sc.parent_ >> addedCells;
+
+    if (addedCells.size())
+    {
+        sc.addedCellsPtr_.reset(new FixedList<label, 8>(addedCells));
+    }
+    else
+    {
+        sc.addedCellsPtr_.reset(NULL);
+    }
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const refinementHistory::splitCell8& sc
+)
+{
+    // Output as labelList so we can have 0 sized lists. Alternative is to
+    // output as fixedlist with e.g. -1 elements and check for this upon
+    // reading. However would cause much more data to be transferred.
+
+    if (sc.addedCellsPtr_.valid())
+    {
+        return os
+            << sc.parent_
+            << token::SPACE
+            << labelList(sc.addedCellsPtr_());
+    }
+    else
+    {
+        return os << sc.parent_ << token::SPACE << labelList(0);
+    }
 }
 
 
@@ -106,89 +236,6 @@ void Foam::refinementHistory::writeDebug
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-//- Construct null
-Foam::refinementHistory::splitCell8::splitCell8()
-:
-    parent_(-1),
-    addedCellsPtr_(NULL)
-{}
-
-
-//- Construct as child element of parent
-Foam::refinementHistory::splitCell8::splitCell8(const label parent)
-:
-    parent_(parent),
-    addedCellsPtr_(NULL)
-{}
-
-
-//- Construct from Istream
-Foam::refinementHistory::splitCell8::splitCell8(Istream& is)
-{
-    is >> *this;
-}
-
-
-//- Construct as (deep) copy.
-Foam::refinementHistory::splitCell8::splitCell8(const splitCell8& sc)
-:
-    parent_(sc.parent_),
-    addedCellsPtr_
-    (
-        sc.addedCellsPtr_.valid()
-      ? new FixedList<label, 8>(sc.addedCellsPtr_())
-      : NULL
-    )
-{}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-Foam::Istream& Foam::operator>>(Istream& is, refinementHistory::splitCell8& sc)
-{
-    labelList addedCells;
-
-    is >> sc.parent_ >> addedCells;
-
-    if (addedCells.size())
-    {
-        sc.addedCellsPtr_.reset(new FixedList<label, 8>(addedCells));
-    }
-    else
-    {
-        sc.addedCellsPtr_.reset(NULL);
-    }
-
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const refinementHistory::splitCell8& sc
-)
-{
-    // Output as labelList so we can have 0 sized lists. Alternative is to
-    // output as fixedlist with e.g. -1 elements and check for this upon
-    // reading. However would cause much more data to be transferred.
-
-    if (sc.addedCellsPtr_.valid())
-    {
-        return os
-            << sc.parent_
-            << token::SPACE
-            << labelList(sc.addedCellsPtr_());
-    }
-    else
-    {
-        return os << sc.parent_ << token::SPACE << labelList(0);
-    }
-}
-
-
 void Foam::refinementHistory::checkIndices() const
 {
     // Check indices.
@@ -196,7 +243,7 @@ void Foam::refinementHistory::checkIndices() const
     {
         if (visibleCells_[i] < 0 && visibleCells_[i] >= splitCells_.size())
         {
-            FatalErrorIn("refinementHistory::checkIndices() const")
+            FatalErrorInFunction
                 << "Illegal entry " << visibleCells_[i]
                 << " in visibleCells at location" << i << nl
                 << "It points outside the range of splitCells : 0.."
@@ -269,7 +316,7 @@ void Foam::refinementHistory::freeSplitCell(const label index)
 
             if (myPos == -1)
             {
-                FatalErrorIn("refinementHistory::freeSplitCell")
+                FatalErrorInFunction
                     << "Problem: cannot find myself in"
                     << " parents' children" << abort(FatalError);
             }
@@ -325,19 +372,199 @@ void Foam::refinementHistory::markSplit
 }
 
 
+// Mark index and all its descendants
+void Foam::refinementHistory::mark
+(
+    const label val,
+    const label index,
+    labelList& splitToVal
+) const
+{
+    splitToVal[index] = val;
+
+    const splitCell8& split = splitCells_[index];
+
+    if (split.addedCellsPtr_.valid())
+    {
+        const FixedList<label, 8>& splits = split.addedCellsPtr_();
+
+        forAll(splits, i)
+        {
+            if (splits[i] >= 0)
+            {
+                mark(val, splits[i], splitToVal);
+            }
+        }
+    }
+}
+
+
+Foam::label Foam::refinementHistory::markCommonCells
+(
+    labelList& cellToCluster
+) const
+{
+    label clusterI = 0;
+
+    labelList splitToCluster(splitCells_.size(), -1);
+
+    // Pass1: find top of all clusters
+    forAll(visibleCells_, cellI)
+    {
+        label index = visibleCells_[cellI];
+
+        if (index >= 0)
+        {
+            // Find highest ancestor
+            while (splitCells_[index].parent_ != -1)
+            {
+                index = splitCells_[index].parent_;
+            }
+
+            // Mark tree with clusterI
+            if (splitToCluster[index] == -1)
+            {
+                mark(clusterI, index, splitToCluster);
+                clusterI++;
+            }
+        }
+    }
+
+    // Pass2: mark all cells with cluster
+    cellToCluster.setSize(visibleCells_.size(), -1);
+
+    forAll(visibleCells_, cellI)
+    {
+        label index = visibleCells_[cellI];
+
+        if (index >= 0)
+        {
+            cellToCluster[cellI] = splitToCluster[index];
+        }
+    }
+
+    return clusterI;
+}
+
+
+void Foam::refinementHistory::add
+(
+    boolList& blockedFace,
+    PtrList<labelList>& specifiedProcessorFaces,
+    labelList& specifiedProcessor,
+    List<labelPair>& explicitConnections
+) const
+{
+    const polyMesh& mesh = dynamic_cast<const polyMesh&>(db());
+
+    blockedFace.setSize(mesh.nFaces(), true);
+
+    // Find common parent for all cells
+    labelList cellToCluster;
+    markCommonCells(cellToCluster);
+
+
+    // Unblock all faces inbetween same cluster
+
+    label nUnblocked = 0;
+
+    forAll(mesh.faceNeighbour(), faceI)
+    {
+        label ownCluster = cellToCluster[mesh.faceOwner()[faceI]];
+        label neiCluster = cellToCluster[mesh.faceNeighbour()[faceI]];
+
+        if (ownCluster != -1 && ownCluster == neiCluster)
+        {
+            if (blockedFace[faceI])
+            {
+                blockedFace[faceI] = false;
+                nUnblocked++;
+            }
+        }
+    }
+
+    if (refinementHistory::debug)
+    {
+        reduce(nUnblocked, sumOp<label>());
+        Info<< type() << " : unblocked " << nUnblocked << " faces" << endl;
+    }
+
+    syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
+}
+
+
+void Foam::refinementHistory::apply
+(
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+) const
+{
+    const polyMesh& mesh = dynamic_cast<const polyMesh&>(db());
+
+    // Find common parent for all cells
+    labelList cellToCluster;
+    label nClusters = markCommonCells(cellToCluster);
+
+    // Unblock all faces inbetween same cluster
+
+
+    labelList clusterToProc(nClusters, -1);
+
+    label nChanged = 0;
+
+    forAll(mesh.faceNeighbour(), faceI)
+    {
+        label own = mesh.faceOwner()[faceI];
+        label nei = mesh.faceNeighbour()[faceI];
+
+        label ownCluster = cellToCluster[own];
+        label neiCluster = cellToCluster[nei];
+
+        if (ownCluster != -1 && ownCluster == neiCluster)
+        {
+            if (clusterToProc[ownCluster] == -1)
+            {
+                clusterToProc[ownCluster] = decomposition[own];
+            }
+
+            if (decomposition[own] != clusterToProc[ownCluster])
+            {
+                decomposition[own] = clusterToProc[ownCluster];
+                nChanged++;
+            }
+            if (decomposition[nei] != clusterToProc[ownCluster])
+            {
+                decomposition[nei] = clusterToProc[ownCluster];
+                nChanged++;
+            }
+        }
+    }
+
+    if (refinementHistory::debug)
+    {
+        reduce(nChanged, sumOp<label>());
+        Info<< type() << " : changed decomposition on " << nChanged
+            << " cells" << endl;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::refinementHistory::refinementHistory(const IOobject& io)
 :
-    regIOobject(io)
+    regIOobject(io),
+    refCount(),
+    active_(false)
 {
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn
-        (
-            "refinementHistory::refinementHistory(const IOobject&)"
-        )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
             << " does not support automatic rereading."
             << endl;
     }
@@ -353,6 +580,11 @@ Foam::refinementHistory::refinementHistory(const IOobject& io)
         close();
     }
 
+    // When running in redistributPar + READ_IF_PRESENT it can happen
+    // that some processors do have refinementHistory and some don't so
+    // test for active has to be outside of above condition.
+    active_ = (returnReduce(visibleCells_.size(), sumOp<label>()) > 0);
+
     if (debug)
     {
         Pout<< "refinementHistory::refinementHistory :"
@@ -369,10 +601,13 @@ Foam::refinementHistory::refinementHistory
 (
     const IOobject& io,
     const List<splitCell8>& splitCells,
-    const labelList& visibleCells
+    const labelList& visibleCells,
+    const bool active
 )
 :
     regIOobject(io),
+    refCount(),
+    active_(active),
     splitCells_(splitCells),
     freeSplitCells_(0),
     visibleCells_(visibleCells)
@@ -380,11 +615,8 @@ Foam::refinementHistory::refinementHistory
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn
-        (
-            "refinementHistory::refinementHistory"
-            "(const IOobject&, const List<splitCell8>&, const labelList&)"
-        )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
             << " does not support automatic rereading."
             << endl;
     }
@@ -422,16 +654,76 @@ Foam::refinementHistory::refinementHistory
 )
 :
     regIOobject(io),
+    refCount(),
+    active_(false),
     freeSplitCells_(0)
 {
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn
-        (
-            "refinementHistory::refinementHistory"
-            "(const IOobject&, const label)"
-        )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            << " does not support automatic rereading."
+            << endl;
+    }
+
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+    else
+    {
+        visibleCells_.setSize(nCells);
+        splitCells_.setCapacity(nCells);
+
+        for (label cellI = 0; cellI < nCells; cellI++)
+        {
+            visibleCells_[cellI] = cellI;
+            splitCells_.append(splitCell8());
+        }
+    }
+
+    active_ = (returnReduce(visibleCells_.size(), sumOp<label>()) > 0);
+
+
+    // Check indices.
+    checkIndices();
+
+    if (debug)
+    {
+        Pout<< "refinementHistory::refinementHistory :"
+            << " constructed history from IOobject or initial size :"
+            << " splitCells:" << splitCells_.size()
+            << " visibleCells:" << visibleCells_.size()
+            << endl;
+    }
+}
+
+
+// Construct from initial number of cells (all visible)
+Foam::refinementHistory::refinementHistory
+(
+    const IOobject& io,
+    const label nCells,
+    const bool active
+)
+:
+    regIOobject(io),
+    refCount(),
+    active_(active),
+    freeSplitCells_(0)
+{
+    // Temporary warning
+    if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+    {
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
             << " does not support automatic rereading."
             << endl;
     }
@@ -480,6 +772,8 @@ Foam::refinementHistory::refinementHistory
 )
 :
     regIOobject(io),
+    refCount(),
+    active_(rh.active_),
     splitCells_(rh.splitCells()),
     freeSplitCells_(rh.freeSplitCells()),
     visibleCells_(rh.visibleCells())
@@ -492,14 +786,135 @@ Foam::refinementHistory::refinementHistory
 }
 
 
+// Construct from multiple
+Foam::refinementHistory::refinementHistory
+(
+    const IOobject& io,
+    const UPtrList<const labelList>& cellMaps,
+    const UPtrList<const refinementHistory>& refs
+)
+:
+    regIOobject(io),
+    refCount(),
+    active_(false)
+{
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        WarningInFunction
+            << "read option IOobject::MUST_READ, READ_IF_PRESENT or "
+            << "MUST_READ_IF_MODIFIED"
+            << " suggests that a read constructor would be more appropriate."
+            << endl;
+    }
+
+    const polyMesh& mesh = dynamic_cast<const polyMesh&>(db());
+
+
+    // Determine offsets into splitCells
+    labelList offsets(refs.size()+1);
+    offsets[0] = 0;
+    forAll(refs, refI)
+    {
+        const DynamicList<splitCell8>& subSplits = refs[refI].splitCells();
+        offsets[refI+1] = offsets[refI]+subSplits.size();
+    }
+
+    // Construct merged splitCells
+    splitCells_.setSize(offsets.last());
+    forAll(refs, refI)
+    {
+        const DynamicList<splitCell8>& subSplits = refs[refI].splitCells();
+        forAll(subSplits, i)
+        {
+            splitCell8& newSplit = splitCells_[offsets[refI]+i];
+
+            // Copy
+            newSplit = subSplits[i];
+
+            // Offset indices
+            if (newSplit.parent_ >= 0)
+            {
+                newSplit.parent_ += offsets[refI];
+            }
+
+            if (newSplit.addedCellsPtr_.valid())
+            {
+                FixedList<label, 8>& splits = newSplit.addedCellsPtr_();
+
+                forAll(splits, i)
+                {
+                    if (splits[i] >= 0)
+                    {
+                        splits[i] += offsets[refI];
+                    }
+                }
+            }
+        }
+    }
+
+
+    // Construct merged visibleCells
+    visibleCells_.setSize(mesh.nCells(), -1);
+    forAll(refs, refI)
+    {
+        const labelList& cellMap = cellMaps[refI];
+        const labelList& subVis = refs[refI].visibleCells();
+
+        forAll(subVis, i)
+        {
+            label& newVis = visibleCells_[cellMap[i]];
+
+            newVis = subVis[i];
+            if (newVis >= 0)
+            {
+                newVis += offsets[refI];
+            }
+        }
+    }
+
+
+    // Is active if any of the refinementHistories is active (assumes active
+    // flag parallel synchronised)
+    active_ = false;
+    forAll(refs, refI)
+    {
+        if (refs[refI].active())
+        {
+            active_ = true;
+            break;
+        }
+    }
+
+    // Check indices.
+    checkIndices();
+
+    if (debug)
+    {
+        Pout<< "refinementHistory::refinementHistory :"
+            << " constructed history from multiple refinementHistories :"
+            << " splitCells:" << splitCells_.size()
+            << " visibleCells:" << visibleCells_.size()
+            << endl;
+    }
+}
+
+
 // Construct from Istream
 Foam::refinementHistory::refinementHistory(const IOobject& io, Istream& is)
 :
     regIOobject(io),
+    refCount(),
     splitCells_(is),
     freeSplitCells_(0),
     visibleCells_(is)
 {
+    active_ = (returnReduce(visibleCells_.size(), sumOp<label>()) > 0);
+
     // Check indices.
     checkIndices();
 
@@ -516,6 +931,192 @@ Foam::refinementHistory::refinementHistory(const IOobject& io, Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+Foam::autoPtr<Foam::refinementHistory> Foam::refinementHistory::clone
+(
+    const IOobject& io,
+    // Per visible cell the processor it is going to
+    const labelList& decomposition,
+    // Per splitCell entry the processor it moves to
+    const labelList& splitCellProc,
+    // Per splitCell entry the number of live cells that move to that processor
+    const labelList& splitCellNum,
+
+    const label procI,
+
+    // From old to new splitCells
+    labelList& oldToNewSplit
+) const
+{
+    oldToNewSplit.setSize(splitCells_.size());
+    oldToNewSplit = -1;
+
+    // Compacted splitCells
+    DynamicList<splitCell8> newSplitCells(splitCells_.size());
+
+    // Loop over all entries. Note: could recurse like countProc so only
+    // visit used entries but is probably not worth it.
+
+    forAll(splitCells_, index)
+    {
+        if (splitCellProc[index] == procI && splitCellNum[index] == 8)
+        {
+            // Entry moves in its whole to procI
+            oldToNewSplit[index] = newSplitCells.size();
+            newSplitCells.append(splitCells_[index]);
+        }
+    }
+
+    // Add live cells that are subsetted.
+    forAll(visibleCells_, cellI)
+    {
+        label index = visibleCells_[cellI];
+
+        if (index >= 0 && decomposition[cellI] == procI)
+        {
+            label parent = splitCells_[index].parent_;
+
+            // Create new splitCell with parent
+            oldToNewSplit[index] = newSplitCells.size();
+            newSplitCells.append(splitCell8(parent));
+        }
+    }
+
+    //forAll(oldToNewSplit, index)
+    //{
+    //    Pout<< "old:" << index << " new:" << oldToNewSplit[index]
+    //        << endl;
+    //}
+
+    newSplitCells.shrink();
+
+    // Renumber contents of newSplitCells
+    forAll(newSplitCells, index)
+    {
+        splitCell8& split = newSplitCells[index];
+
+        if (split.parent_ >= 0)
+        {
+            split.parent_ = oldToNewSplit[split.parent_];
+        }
+        if (split.addedCellsPtr_.valid())
+        {
+            FixedList<label, 8>& splits = split.addedCellsPtr_();
+
+            forAll(splits, i)
+            {
+                if (splits[i] >= 0)
+                {
+                    splits[i] = oldToNewSplit[splits[i]];
+                }
+            }
+        }
+    }
+
+
+    // Count number of cells
+    label nSub = 0;
+    forAll(decomposition, cellI)
+    {
+        if (decomposition[cellI] == procI)
+        {
+            nSub++;
+        }
+    }
+
+    labelList newVisibleCells(nSub);
+    nSub = 0;
+
+    forAll(visibleCells_, cellI)
+    {
+        if (decomposition[cellI] == procI)
+        {
+            label index = visibleCells_[cellI];
+            if (index >= 0)
+            {
+                index = oldToNewSplit[index];
+            }
+            newVisibleCells[nSub++] = index;
+        }
+    }
+
+    return autoPtr<refinementHistory>
+    (
+        new refinementHistory
+        (
+            io,
+            newSplitCells,
+            newVisibleCells,
+            active_
+        )
+    );
+}
+
+
+Foam::autoPtr<Foam::refinementHistory> Foam::refinementHistory::clone
+(
+    const IOobject& io,
+    const labelList& cellMap
+) const
+{
+    if (active_)
+    {
+        // Mark selected cells with '1'
+        labelList decomposition(visibleCells_.size(), 0);
+        forAll(cellMap, i)
+        {
+            decomposition[cellMap[i]] = 1;
+        }
+
+
+        // Per splitCell entry the processor it moves to
+        labelList splitCellProc(splitCells_.size(), -1);
+        // Per splitCell entry the number of live cells that move to that
+        // processor
+        labelList splitCellNum(splitCells_.size(), 0);
+
+        forAll(visibleCells_, cellI)
+        {
+            label index = visibleCells_[cellI];
+
+            if (index >= 0)
+            {
+                countProc
+                (
+                    splitCells_[index].parent_,
+                    decomposition[cellI],
+                    splitCellProc,
+                    splitCellNum
+                );
+            }
+        }
+
+        labelList oldToNewSplit;
+        return clone
+        (
+            io,
+            decomposition,
+            splitCellProc,
+            splitCellNum,
+            1,      //procI,
+            oldToNewSplit
+        );
+    }
+    else
+    {
+        return autoPtr<refinementHistory>
+        (
+            new refinementHistory
+            (
+                io,
+                DynamicList<splitCell8>(0),
+                labelList(0),
+                false
+            )
+        );
+    }
+}
+
+
 void Foam::refinementHistory::resize(const label size)
 {
     label oldSize = visibleCells_.size();
@@ -555,10 +1156,8 @@ void Foam::refinementHistory::updateMesh(const mapPolyMesh& map)
                 // Check not already set
                 if (splitCells_[index].addedCellsPtr_.valid())
                 {
-                    FatalErrorIn
-                    (
-                        "refinementHistory::updateMesh(const mapPolyMesh&)"
-                    )   << "Problem" << abort(FatalError);
+                    FatalErrorInFunction
+                        << "Problem" << abort(FatalError);
                 }
 
                 label newCellI = reverseCellMap[cellI];
@@ -604,11 +1203,8 @@ void Foam::refinementHistory::subset
             // Check that cell is live (so its parent has no refinement)
             if (index >= 0 && splitCells_[index].addedCellsPtr_.valid())
             {
-                FatalErrorIn
-                (
-                    "refinementHistory::subset"
-                    "(const labelList&, const labelList&, const labelList&)"
-                )   << "Problem" << abort(FatalError);
+                FatalErrorInFunction
+                    << "Problem" << abort(FatalError);
             }
 
             newVisibleCells[cellI] = index;
@@ -673,10 +1269,8 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
 {
     if (!active())
     {
-        FatalErrorIn
-        (
-            "refinementHistory::distribute(const mapDistributePolyMesh&)"
-        )   << "Calling distribute on inactive history" << abort(FatalError);
+        FatalErrorInFunction
+            << "Calling distribute on inactive history" << abort(FatalError);
     }
 
 
@@ -720,9 +1314,6 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
         }
     }
 
-//Pout<< "refinementHistory::distribute :"
-//    << " destination:" << destination << endl;
-
     // Per splitCell entry the processor it moves to
     labelList splitCellProc(splitCells_.size(), -1);
     // Per splitCell entry the number of live cells that move to that processor
@@ -768,21 +1359,11 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
 
         forAll(splitCells_, index)
         {
-//            Pout<< "oldCell:" << index
-//                << " proc:" << splitCellProc[index]
-//                << " nCells:" << splitCellNum[index]
-//                << endl;
-
             if (splitCellProc[index] == procI && splitCellNum[index] == 8)
             {
                 // Entry moves in its whole to procI
                 oldToNew[index] = newSplitCells.size();
                 newSplitCells.append(splitCells_[index]);
-
-                //Pout<< "Added oldCell " << index
-                //    << " info " << newSplitCells.last()
-                //    << " at position " << newSplitCells.size()-1
-                //    << endl;
             }
         }
 
@@ -795,10 +1376,6 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
             {
                 label parent = splitCells_[index].parent_;
 
-                //Pout<< "Adding refined cell " << cellI
-                //    << " since moves to "
-                //    << procI << " old parent:" << parent << endl;
-
                 // Create new splitCell with parent
                 oldToNew[index] = newSplitCells.size();
                 newSplitCells.append(splitCell8(parent));
@@ -871,7 +1448,9 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
     // Remove all entries. Leave storage intact.
     splitCells_.clear();
 
-    visibleCells_.setSize(map.mesh().nCells());
+    const polyMesh& mesh = dynamic_cast<const polyMesh&>(db());
+
+    visibleCells_.setSize(mesh.nCells());
     visibleCells_ = -1;
 
     for (label procI = 0; procI < Pstream::nProcs(); procI++)
@@ -953,7 +1532,7 @@ void Foam::refinementHistory::compact()
 
             if (splitCells_[index].parent_ != -2)
             {
-                FatalErrorIn("refinementHistory::compact()")
+                FatalErrorInFunction
                     << "Problem index:" << index
                     << abort(FatalError);
             }
@@ -968,7 +1547,7 @@ void Foam::refinementHistory::compact()
              && splitCells_[visibleCells_[cellI]].parent_ == -2
             )
             {
-                FatalErrorIn("refinementHistory::compact()")
+                FatalErrorInFunction
                     << "Problem : visible cell:" << cellI
                     << " is marked as being free." << abort(FatalError);
             }
@@ -1160,6 +1739,17 @@ void Foam::refinementHistory::combineCells
 }
 
 
+bool Foam::refinementHistory::read()
+{
+    bool ok = readData(readStream(typeName));
+    close();
+
+    active_ = (returnReduce(visibleCells_.size(), sumOp<label>()) > 0);
+
+    return ok;
+}
+
+
 bool Foam::refinementHistory::readData(Istream& is)
 {
     is >> *this;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
similarity index 70%
rename from src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
rename to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
index 4d5d854b45..c7145be6fb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ Description
     All refinement history. Used in unrefinement.
 
     - visibleCells: valid for the current mesh and contains per cell -1
-    (cell unrefined) or an index into splitCells_.
+      (cell unrefined) or an index into splitCells_.
     - splitCells: for every split contains the parent (also index into
       splitCells) and optionally a subsplit as 8 indices into splitCells.
       Note that the numbers in splitCells are not cell labels, they are purely
@@ -71,12 +71,14 @@ SourceFiles
 #ifndef refinementHistory_H
 #define refinementHistory_H
 
+#include "UPtrList.H"
 #include "DynamicList.H"
 #include "labelList.H"
 #include "FixedList.H"
-#include "SLList.H"
 #include "autoPtr.H"
 #include "regIOobject.H"
+#include "boolList.H"
+#include "labelPair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,7 +95,8 @@ class mapDistributePolyMesh;
 
 class refinementHistory
 :
-    public regIOobject
+    public regIOobject,
+    public refCount
 {
 public:
 
@@ -122,50 +125,11 @@ public:
         splitCell8(const splitCell8&);
 
         //- Copy operator since autoPtr otherwise 'steals' storage.
-        void operator=(const splitCell8& s)
-        {
-            // Check for assignment to self
-            if (this == &s)
-            {
-                FatalErrorIn("splitCell8::operator=(const Foam::splitCell8&)")
-                    << "Attempted assignment to self"
-                    << abort(FatalError);
-            }
+        void operator=(const splitCell8& s);
 
-            parent_ = s.parent_;
+        bool operator==(const splitCell8& s) const;
 
-            addedCellsPtr_.reset
-            (
-                s.addedCellsPtr_.valid()
-              ? new FixedList<label, 8>(s.addedCellsPtr_())
-              : NULL
-            );
-        }
-
-        bool operator==(const splitCell8& s) const
-        {
-            if (addedCellsPtr_.valid() != s.addedCellsPtr_.valid())
-            {
-                return false;
-            }
-            else if (parent_ != s.parent_)
-            {
-                return false;
-            }
-            else if (addedCellsPtr_.valid())
-            {
-                return addedCellsPtr_() == s.addedCellsPtr_();
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        bool operator!=(const splitCell8& s) const
-        {
-            return !operator==(s);
-        }
+        bool operator!=(const splitCell8& s) const;
 
         friend Istream& operator>>(Istream&, splitCell8&);
         friend Ostream& operator<<(Ostream&, const splitCell8&);
@@ -176,6 +140,9 @@ private:
 
     // Private data
 
+        //- Is active?
+        bool active_;
+
         //- Storage for splitCells
         DynamicList<splitCell8> splitCells_;
 
@@ -226,6 +193,15 @@ private:
             labelList& splitCellNum
         ) const;
 
+        // For distribution:
+
+            //- Mark index and all its descendants
+            void mark(const label, const label, labelList&) const;
+
+            //- Mark cells according to top parent. Return number of clusters
+            //  (set of cells originating from same parent)
+            label markCommonCells(labelList& cellToCluster) const;
+
 public:
 
     // Declare name of the class and its debug switch
@@ -234,25 +210,47 @@ public:
 
     // Constructors
 
-        //- Construct (read) given an IOobject
+        //- Construct (read) given an IOobject. If global number of visible
+        //  cells > 0 becomes active
         refinementHistory(const IOobject&);
 
-        //- Construct (read) or construct null
+        //- Construct (read) or construct from components
         refinementHistory
         (
             const IOobject&,
             const List<splitCell8>& splitCells,
-            const labelList& visibleCells
+            const labelList& visibleCells,
+            const bool active
         );
 
         //- Construct (read) or construct from initial number of cells
-        //  (all visible)
+        //  (all visible). If global number of visible
+        //  cells > 0 becomes active
         refinementHistory(const IOobject&, const label nCells);
 
+        //- Construct (read) or construct from initial number of cells
+        //  (all visible) and active flag
+        refinementHistory
+        (
+            const IOobject&,
+            const label nCells,
+            const bool active
+        );
+
         //- Construct as copy
         refinementHistory(const IOobject&, const refinementHistory&);
 
-        //- Construct from Istream
+        //- Construct from multiple refinement histories. If global number of
+        //  visible cells > 0 becomes active
+        refinementHistory
+        (
+            const IOobject&,
+            const UPtrList<const labelList>& cellMaps,
+            const UPtrList<const refinementHistory>&
+        );
+
+        //- Construct from Istream. If global number of
+        //  visible cells > 0 becomes active
         refinementHistory(const IOobject&, Istream&);
 
 
@@ -278,12 +276,16 @@ public:
             return freeSplitCells_;
         }
 
-        //- Is there unrefinement history. Note that this will fall over if
-        //  there are 0 cells in the mesh. But this gives problems with
-        //  lots of other programs anyway.
+        //- Is there unrefinement history?
         bool active() const
         {
-            return visibleCells_.size() > 0;
+            return active_;
+        }
+
+        //- Is there unrefinement history?
+        bool& active()
+        {
+            return active_;
         }
 
         //- Get parent of cell
@@ -293,7 +295,7 @@ public:
 
             if (index < 0)
             {
-                FatalErrorIn("refinementHistory::parentIndex(const label)")
+                FatalErrorInFunction
                     << "Cell " << cellI << " is not visible"
                     << abort(FatalError);
             }
@@ -314,6 +316,23 @@ public:
             const labelList& combinedCells
         );
 
+        //- Low level clone
+        autoPtr<refinementHistory> clone
+        (
+            const IOobject& io,
+            const labelList& decomposition,
+            const labelList& splitCellProc,
+            const labelList& splitCellNum,
+            const label procI,
+            labelList& oldToNewSplit
+        ) const;
+
+        //- Create clone from subset
+        autoPtr<refinementHistory> clone
+        (
+            const IOobject& io,
+            const labelList& cellMap
+        ) const;
 
         //- Update numbering for mesh changes
         void updateMesh(const mapPolyMesh&);
@@ -331,7 +350,6 @@ public:
         //  handle parts recombined in multiple passes.
         void distribute(const mapDistributePolyMesh&);
 
-
         //- Compact splitCells_. Removes all freeSplitCells_ elements.
         void compact();
 
@@ -343,20 +361,44 @@ public:
         void writeDebug() const;
 
 
-        //- ReadData function required for regIOobject read operation
+        //- Read object. If global number of visible cells > 0 becomes active
+        virtual bool read();
+
+        //- ReadData function required for regIOobject read operation. Note:
+        //  does not do a reduction - does not set active_ flag
         virtual bool readData(Istream&);
 
         //- WriteData function required for regIOobject write operation
         virtual bool writeData(Ostream&) const;
 
+        // Helpers for decompositionConstraint
 
-    // Friend Functions
+            //- Add my decomposition constraints
+            void add
+            (
+                boolList& blockedFace,
+                PtrList<labelList>& specifiedProcessorFaces,
+                labelList& specifiedProcessor,
+                List<labelPair>& explicitConnections
+            ) const;
+
+            //- Apply any additional post-decomposition constraints
+            void apply
+            (
+                const boolList& blockedFace,
+                const PtrList<labelList>& specifiedProcessorFaces,
+                const labelList& specifiedProcessor,
+                const List<labelPair>& explicitConnections,
+                labelList& decomposition
+            ) const;
 
-    // Friend Operators
 
     // IOstream Operators
 
+        //- Istream operator. Note: does not do a reduction - does not set
+        //  active_ flag
         friend Istream& operator>>(Istream&, refinementHistory&);
+
         friend Ostream& operator<<(Ostream&, const refinementHistory&);
 };
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyFace.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyFace.H
index a4c6f284ab..14f155a5c8 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyFace.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,21 +130,8 @@ public:
         {
             if (face_.size() < 3)
             {
-                FatalErrorIn
-                (
-                    "polyModifyFace::polyModifyFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label faceID,\n"
-                    "    const label owner,\n"
-                    "    const label neighbour,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const bool removeFromZone,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Invalid face: less than 3 points. This is not allowed\n"
+                FatalErrorInFunction
+                    << "Invalid face: less than 3 points. This is not allowed\n"
                     << "Face: " << face_
                     << " faceID:" << faceID_
                     << " owner:" << owner_
@@ -154,21 +141,7 @@ public:
 
             if (min(face_) < 0)
             {
-                FatalErrorIn
-                (
-                    "polyModifyFace::polyModifyFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label faceID,\n"
-                    "    const label owner,\n"
-                    "    const label neighbour,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const bool removeFromZone,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Face contains invalid vertex ID: " << face_ << ".  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << " faceID:" << faceID_
                     << " owner:" << owner_
@@ -178,21 +151,7 @@ public:
 
             if (min(owner_, neighbour_) >= 0 && owner_ == neighbour_)
             {
-                FatalErrorIn
-                (
-                    "polyModifyFace::polyModifyFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label faceID,\n"
-                    "    const label owner,\n"
-                    "    const label neighbour,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const bool removeFromZone,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Face owner and neighbour are identical.  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "Face: " << face_
                     << " faceID:" << faceID_
@@ -203,21 +162,7 @@ public:
 
             if (neighbour_ >= 0 && patchID_ >= 0)
             {
-                FatalErrorIn
-                (
-                    "polyModifyFace::polyModifyFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label faceID,\n"
-                    "    const label owner,\n"
-                    "    const label neighbour,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const bool removeFromZone,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Patch face has got a neighbour  "
+                FatalErrorInFunction
                     << "This is not allowed.\n"
                     << "Face: " << face_
                     << " faceID:" << faceID_
@@ -229,21 +174,7 @@ public:
 
             if (zoneID_ < 0 && zoneFlip )
             {
-                FatalErrorIn
-                (
-                    "polyModifyFace::polyModifyFace\n"
-                    "(\n"
-                    "    const face& f,\n"
-                    "    const label faceID,\n"
-                    "    const label owner,\n"
-                    "    const label neighbour,\n"
-                    "    const bool flipFaceFlux,\n"
-                    "    const label patchID,\n"
-                    "    const bool removeFromZone,\n"
-                    "    const label zoneID,\n"
-                    "    const bool zoneFlip\n"
-                    ")"
-                )   << "Specified zone flip for a face that does not  "
+                FatalErrorInFunction
                     << "belong to zone.  This is not allowed.\n"
                     << "Face: " << face_
                     << " faceID:" << faceID_
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
index 84a11d1cbe..f97b9bcdbc 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ inline bool Foam::pointEdgeCollapse::update
 {
     if (!w2.valid(td))
     {
-        FatalErrorIn("pointEdgeCollapse::update(..)")
+        FatalErrorInFunction
             << "problem." << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 97a4ddc11f..5416fb5ddb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -157,7 +157,7 @@ void Foam::polyTopoChange::countMap
         }
         else
         {
-            FatalErrorIn("countMap") << "old:" << oldCellI
+            FatalErrorInFunction
                 << " new:" << newCellI << abort(FatalError);
         }
     }
@@ -323,7 +323,7 @@ Foam::pointField Foam::polyTopoChange::facePoints(const face& f) const
     {
         if (f[fp] < 0 && f[fp] >= points_.size())
         {
-            FatalErrorIn("polyTopoChange::facePoints(const face&) const")
+            FatalErrorInFunction
                 << "Problem." << abort(FatalError);
         }
         points[fp] = points_[f[fp]];
@@ -350,11 +350,8 @@ void Foam::polyTopoChange::checkFace
         }
         else if (patchI == -1 || patchI >= nPatches_)
         {
-            FatalErrorIn
-            (
-                "polyTopoChange::checkFace(const face&, const label"
-                ", const label, const label, const label)"
-            )   << "Face has no neighbour (so external) but does not have"
+            FatalErrorInFunction
+                << "Face has no neighbour (so external) but does not have"
                 << " a valid patch" << nl
                 << "f:" << f
                 << " faceI(-1 if added face):" << faceI
@@ -373,11 +370,8 @@ void Foam::polyTopoChange::checkFace
     {
         if (patchI != -1)
         {
-            FatalErrorIn
-            (
-                "polyTopoChange::checkFace(const face&, const label"
-                ", const label, const label, const label)"
-            )   << "Cannot both have valid patchI and neighbour" << nl
+            FatalErrorInFunction
+                << "Cannot both have valid patchI and neighbour" << nl
                 << "f:" << f
                 << " faceI(-1 if added face):" << faceI
                 << " own:" << own << " nei:" << nei
@@ -393,11 +387,8 @@ void Foam::polyTopoChange::checkFace
 
         if (nei <= own)
         {
-            FatalErrorIn
-            (
-                "polyTopoChange::checkFace(const face&, const label"
-                ", const label, const label, const label)"
-            )   << "Owner cell label should be less than neighbour cell label"
+            FatalErrorInFunction
+                << "Owner cell label should be less than neighbour cell label"
                 << nl
                 << "f:" << f
                 << " faceI(-1 if added face):" << faceI
@@ -415,11 +406,8 @@ void Foam::polyTopoChange::checkFace
 
     if (f.size() < 3 || findIndex(f, -1) != -1)
     {
-        FatalErrorIn
-        (
-            "polyTopoChange::checkFace(const face&, const label"
-            ", const label, const label, const label)"
-        )   << "Illegal vertices in face"
+        FatalErrorInFunction
+            << "Illegal vertices in face"
             << nl
             << "f:" << f
             << " faceI(-1 if added face):" << faceI
@@ -435,11 +423,8 @@ void Foam::polyTopoChange::checkFace
     }
     if (faceI >= 0 && faceI < faces_.size() && faceRemoved(faceI))
     {
-        FatalErrorIn
-        (
-            "polyTopoChange::checkFace(const face&, const label"
-            ", const label, const label, const label)"
-        )   << "Face already marked for removal"
+        FatalErrorInFunction
+            << "Face already marked for removal"
             << nl
             << "f:" << f
             << " faceI(-1 if added face):" << faceI
@@ -457,11 +442,8 @@ void Foam::polyTopoChange::checkFace
     {
         if (f[fp] < points_.size() && pointRemoved(f[fp]))
         {
-            FatalErrorIn
-            (
-                "polyTopoChange::checkFace(const face&, const label"
-                ", const label, const label, const label)"
-            )   << "Face uses removed vertices"
+            FatalErrorInFunction
+                << "Face uses removed vertices"
                 << nl
                 << "f:" << f
                 << " faceI(-1 if added face):" << faceI
@@ -498,15 +480,23 @@ void Foam::polyTopoChange::makeCells
     {
         if (faceOwner_[faceI] < 0)
         {
-            FatalErrorIn
-            (
-                "polyTopoChange::makeCells\n"
-                "(\n"
-                "    const label,\n"
-                "    labelList&,\n"
-                "    labelList&\n"
-                ") const\n"
-            )   << "Face " << faceI << " is active but its owner has"
+            pointField newPoints;
+            if (faceI < faces_.size())
+            {
+                const face& f = faces_[faceI];
+                newPoints.setSize(f.size(), vector::max);
+                forAll(f, fp)
+                {
+                    if (f[fp] < points_.size())
+                    {
+                        newPoints[fp] = points_[f[fp]];
+                    }
+                }
+            }
+
+
+            FatalErrorInFunction
+                << "Face " << faceI << " is active but its owner has"
                 << " been deleted. This is usually due to deleting cells"
                 << " without modifying exposed faces to be boundary faces."
                 << exit(FatalError);
@@ -866,12 +856,8 @@ void Foam::polyTopoChange::getFaceOrder
     {
         if (oldToNew[faceI] == -1)
         {
-            FatalErrorIn
-            (
-                "polyTopoChange::getFaceOrder"
-                "(const label, const labelList&, const labelList&)"
-                " const"
-            )   << "Did not determine new position"
+            FatalErrorInFunction
+                << "Did not determine new position"
                 << " for face " << faceI
                 << " owner " << faceOwner_[faceI]
                 << " neighbour " << faceNeighbour_[faceI]
@@ -1010,7 +996,7 @@ void Foam::polyTopoChange::compact
                              || retiredPoints_.found(pointI)
                             )
                             {
-                                FatalErrorIn("polyTopoChange::compact(..)")
+                                FatalErrorInFunction
                                     << "Removed or retired point " << pointI
                                     << " in face " << f
                                     << " at position " << faceI << endl
@@ -1062,7 +1048,7 @@ void Foam::polyTopoChange::compact
                              || retiredPoints_.found(pointI)
                             )
                             {
-                                FatalErrorIn("polyTopoChange::compact(..)")
+                                FatalErrorInFunction
                                     << "Removed or retired point " << pointI
                                     << " in face " << f
                                     << " at position " << faceI << endl
@@ -1077,7 +1063,7 @@ void Foam::polyTopoChange::compact
 
             if (newPointI != nInternalPoints)
             {
-                FatalErrorIn("polyTopoChange::compact(..)")
+                FatalErrorInFunction
                     << "Problem." << abort(FatalError);
             }
             newPointI = nActivePoints;
@@ -1116,7 +1102,7 @@ void Foam::polyTopoChange::compact
 
             if (!faceRemoved(faceI) && f.size() < 3)
             {
-                FatalErrorIn("polyTopoChange::compact(..)")
+                FatalErrorInFunction
                     << "Created illegal face " << f
                     //<< " from face " << oldF
                     << " at position:" << faceI
@@ -1620,11 +1606,8 @@ void Foam::polyTopoChange::resetZones
 
             if (zoneI < 0 || zoneI >= pointZones.size())
             {
-                FatalErrorIn
-                (
-                    "resetZones(const polyMesh&, polyMesh&, labelListList&"
-                    "labelListList&, labelListList&)"
-                )   << "Illegal zoneID " << zoneI << " for point "
+                FatalErrorInFunction
+                    << "Illegal zoneID " << zoneI << " for point "
                     << iter.key() << " coord " << mesh.points()[iter.key()]
                     << abort(FatalError);
             }
@@ -1707,11 +1690,8 @@ void Foam::polyTopoChange::resetZones
 
             if (zoneI < 0 || zoneI >= faceZones.size())
             {
-                FatalErrorIn
-                (
-                    "resetZones(const polyMesh&, polyMesh&, labelListList&"
-                    "labelListList&, labelListList&)"
-                )   << "Illegal zoneID " << zoneI << " for face "
+                FatalErrorInFunction
+                    << "Illegal zoneID " << zoneI << " for face "
                     << iter.key()
                     << abort(FatalError);
             }
@@ -1823,11 +1803,8 @@ void Foam::polyTopoChange::resetZones
 
             if (zoneI >= cellZones.size())
             {
-                FatalErrorIn
-                (
-                    "resetZones(const polyMesh&, polyMesh&, labelListList&"
-                    "labelListList&, labelListList&)"
-                )   << "Illegal zoneID " << zoneI << " for cell "
+                FatalErrorInFunction
+                    << "Illegal zoneID " << zoneI << " for cell "
                     << cellI << abort(FatalError);
             }
 
@@ -2097,7 +2074,7 @@ void Foam::polyTopoChange::compactAndReorder
 {
     if (mesh.boundaryMesh().size() != nPatches_)
     {
-        FatalErrorIn("polyTopoChange::compactAndReorder(..)")
+        FatalErrorInFunction
             << "polyTopoChange was constructed with a mesh with "
             << nPatches_ << " patches." << endl
             << "The mesh now provided has a different number of patches "
@@ -2395,13 +2372,8 @@ void Foam::polyTopoChange::addMesh
 
                 if (newZoneID[cellI] != -1)
                 {
-                    WarningIn
-                    (
-                        "polyTopoChange::addMesh"
-                        "(const polyMesh&, const labelList&,"
-                        "const labelList&, const labelList&,"
-                        "const labelList&)"
-                    )   << "Cell:" << cellI
+                    WarningInFunction
+                        << "Cell:" << cellI
                         << " centre:" << mesh.cellCentres()[cellI]
                         << " is in two zones:"
                         << cellZones[newZoneID[cellI]].name()
@@ -2491,11 +2463,8 @@ void Foam::polyTopoChange::addMesh
 
             if (pp.start() != faces_.size())
             {
-                FatalErrorIn
-                (
-                    "polyTopoChange::polyTopoChange"
-                    "(const polyMesh& mesh, const bool strict)"
-                )   << "Problem : "
+                FatalErrorInFunction
+                    << "Problem : "
                     << "Patch " << pp.name() << " starts at " << pp.start()
                     << endl
                     << "Current face counter at " << faces_.size() << endl
@@ -2676,10 +2645,8 @@ Foam::label Foam::polyTopoChange::setAction(const topoAction& action)
     }
     else
     {
-        FatalErrorIn
-        (
-            "label polyTopoChange::setAction(const topoAction& action)"
-        )   << "Unknown type of topoChange: " << action.type()
+        FatalErrorInFunction
+            << "Unknown type of topoChange: " << action.type()
             << abort(FatalError);
 
         // Dummy return to keep compiler happy
@@ -2726,19 +2693,15 @@ void Foam::polyTopoChange::modifyPoint
 {
     if (pointI < 0 || pointI >= points_.size())
     {
-        FatalErrorIn
-        (
-            "polyTopoChange::modifyPoint(const label, const point&)"
-        )   << "illegal point label " << pointI << endl
+        FatalErrorInFunction
+            << "illegal point label " << pointI << endl
             << "Valid point labels are 0 .. " << points_.size()-1
             << abort(FatalError);
     }
     if (pointRemoved(pointI) || pointMap_[pointI] == -1)
     {
-        FatalErrorIn
-        (
-            "polyTopoChange::modifyPoint(const label, const point&)"
-        )   << "point " << pointI << " already marked for removal"
+        FatalErrorInFunction
+            << "point " << pointI << " already marked for removal"
             << abort(FatalError);
     }
     points_[pointI] = pt;
@@ -2776,7 +2739,7 @@ void Foam::polyTopoChange::movePoints(const pointField& newPoints)
 {
     if (newPoints.size() != points_.size())
     {
-        FatalErrorIn("polyTopoChange::movePoints(const pointField&)")
+        FatalErrorInFunction
             << "illegal pointField size." << endl
             << "Size:" << newPoints.size() << endl
             << "Points in mesh:" << points_.size()
@@ -2798,7 +2761,7 @@ void Foam::polyTopoChange::removePoint
 {
     if (pointI < 0 || pointI >= points_.size())
     {
-        FatalErrorIn("polyTopoChange::removePoint(const label, const label)")
+        FatalErrorInFunction
             << "illegal point label " << pointI << endl
             << "Valid point labels are 0 .. " << points_.size()-1
             << abort(FatalError);
@@ -2810,7 +2773,7 @@ void Foam::polyTopoChange::removePoint
      && (pointRemoved(pointI) || pointMap_[pointI] == -1)
     )
     {
-        FatalErrorIn("polyTopoChange::removePoint(const label, const label)")
+        FatalErrorInFunction
             << "point " << pointI << " already marked for removal" << nl
             << "Point:" << points_[pointI] << " pointMap:" << pointMap_[pointI]
             << abort(FatalError);
@@ -2818,7 +2781,7 @@ void Foam::polyTopoChange::removePoint
 
     if (pointI == mergePointI)
     {
-        FatalErrorIn("polyTopoChange::removePoint(const label, const label)")
+        FatalErrorInFunction
             << "Cannot remove/merge point " << pointI << " onto itself."
             << abort(FatalError);
     }
@@ -2882,7 +2845,7 @@ Foam::label Foam::polyTopoChange::addFace
     else
     {
         // Allow inflate-from-nothing?
-        //FatalErrorIn("polyTopoChange::addFace")
+        //FatalErrorInFunction
         //    << "Need to specify a master point, edge or face"
         //    << "face:" << f << " own:" << own << " nei:" << nei
         //    << abort(FatalError);
@@ -2952,7 +2915,7 @@ void Foam::polyTopoChange::removeFace(const label faceI, const label mergeFaceI)
 {
     if (faceI < 0 || faceI >= faces_.size())
     {
-        FatalErrorIn("polyTopoChange::removeFace(const label, const label)")
+        FatalErrorInFunction
             << "illegal face label " << faceI << endl
             << "Valid face labels are 0 .. " << faces_.size()-1
             << abort(FatalError);
@@ -2964,7 +2927,7 @@ void Foam::polyTopoChange::removeFace(const label faceI, const label mergeFaceI)
      && (faceRemoved(faceI) || faceMap_[faceI] == -1)
     )
     {
-        FatalErrorIn("polyTopoChange::removeFace(const label, const label)")
+        FatalErrorInFunction
             << "face " << faceI
             << " already marked for removal"
             << abort(FatalError);
@@ -3042,7 +3005,7 @@ void Foam::polyTopoChange::removeCell(const label cellI, const label mergeCellI)
 {
     if (cellI < 0 || cellI >= cellMap_.size())
     {
-        FatalErrorIn("polyTopoChange::removeCell(const label, const label)")
+        FatalErrorInFunction
             << "illegal cell label " << cellI << endl
             << "Valid cell labels are 0 .. " << cellMap_.size()-1
             << abort(FatalError);
@@ -3050,7 +3013,7 @@ void Foam::polyTopoChange::removeCell(const label cellI, const label mergeCellI)
 
     if (strict_ && cellMap_[cellI] == -2)
     {
-        FatalErrorIn("polyTopoChange::removeCell(const label, const label)")
+        FatalErrorInFunction
             << "cell " << cellI
             << " already marked for removal"
             << abort(FatalError);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H
index edf115b3a8..debb1ed094 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ inline bool Foam::refinementData::updateCell
 {
     if (!valid(td))
     {
-        FatalErrorIn("refinementData::updateCell") << "problem"
+        FatalErrorInFunction
             << abort(FatalError);
         return false;
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H
index 28d2401775..954f3eb1eb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ inline bool Foam::refinementDistanceData::update
     {
         if (!neighbourInfo.valid(td))
         {
-            FatalErrorIn("refinementDistanceData::update(..)")
+            FatalErrorInFunction
                 << "problem" << abort(FatalError);
         }
         operator=(neighbourInfo);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
index bf5ad0acbe..803544f3f2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,13 +116,23 @@ Foam::labelList Foam::removeCells::getExposedFaces
     }
 
     // Coupled faces: add number of cells using face across couple.
-    if (syncPar_)
     {
-        syncTools::syncFaceList
+        // Note cyclics done always, parallel bits only done if syncPar_
+
+        SubList<label> bndValues
+        (
+            nCellsUsingFace,
+            mesh_.nFaces()-mesh_.nInternalFaces(),
+            mesh_.nInternalFaces()
+        );
+
+        syncTools::syncBoundaryFaceList
         (
             mesh_,
-            nCellsUsingFace,
-            plusEqOp<label>()
+            bndValues,
+            plusEqOp<label>(),
+            mapDistribute::transform(),
+            syncPar_
         );
     }
 
@@ -187,11 +197,8 @@ void Foam::removeCells::setRefinement
 
     if (exposedFaceLabels.size() != exposedPatchIDs.size())
     {
-        FatalErrorIn
-        (
-            "removeCells::setRefinement(const labelList&"
-            ", const labelList&, const labelList&, polyTopoChange&)"
-        )   << "Size of exposedFaceLabels " << exposedFaceLabels.size()
+        FatalErrorInFunction
+            << "Size of exposedFaceLabels " << exposedFaceLabels.size()
             << " differs from size of exposedPatchIDs "
             << exposedPatchIDs.size()
             << abort(FatalError);
@@ -206,11 +213,8 @@ void Foam::removeCells::setRefinement
 
         if (patchI < 0 || patchI >= patches.size())
         {
-            FatalErrorIn
-            (
-                "removeCells::setRefinement(const labelList&"
-                ", const labelList&, const labelList&, polyTopoChange&)"
-            )   << "Invalid patch " << patchI
+            FatalErrorInFunction
+                << "Invalid patch " << patchI
                 << " for exposed face " << exposedFaceLabels[i] << endl
                 << "Valid patches 0.." << patches.size()-1
                 << abort(FatalError);
@@ -218,11 +222,8 @@ void Foam::removeCells::setRefinement
 
         if (patches[patchI].coupled())
         {
-            FatalErrorIn
-            (
-                "removeCells::setRefinement(const labelList&"
-                ", const labelList&, const labelList&, polyTopoChange&)"
-            )   << "Trying to put exposed face " << exposedFaceLabels[i]
+            FatalErrorInFunction
+                << "Trying to put exposed face " << exposedFaceLabels[i]
                 << " into a coupled patch : " << patches[patchI].name()
                 << endl
                 << "This is illegal."
@@ -295,12 +296,8 @@ void Foam::removeCells::setRefinement
             {
                 if (newPatchID[faceI] == -1)
                 {
-                    FatalErrorIn
-                    (
-                        "removeCells::setRefinement(const labelList&"
-                        ", const labelList&, const labelList&"
-                        ", polyTopoChange&)"
-                    )   << "No patchID provided for exposed face " << faceI
+                    FatalErrorInFunction
+                        << "No patchID provided for exposed face " << faceI
                         << " on cell " << nei << nl
                         << "Did you provide patch IDs for all exposed faces?"
                         << abort(FatalError);
@@ -344,12 +341,8 @@ void Foam::removeCells::setRefinement
         {
             if (newPatchID[faceI] == -1)
             {
-                FatalErrorIn
-                (
-                    "removeCells::setRefinement(const labelList&"
-                    ", const labelList&, const labelList&"
-                    ", polyTopoChange&)"
-                )   << "No patchID provided for exposed face " << faceI
+                FatalErrorInFunction
+                    << "No patchID provided for exposed face " << faceI
                     << " on cell " << own << nl
                     << "Did you provide patch IDs for all exposed faces?"
                     << abort(FatalError);
@@ -450,12 +443,8 @@ void Foam::removeCells::setRefinement
             {
                 if (newPatchID[faceI] != -1)
                 {
-                    FatalErrorIn
-                    (
-                        "removeCells::setRefinement(const labelList&"
-                        ", const labelList&, const labelList&"
-                        ", polyTopoChange&)"
-                    )   << "new patchID provided for boundary face " << faceI
+                    FatalErrorInFunction
+                        << "new patchID provided for boundary face " << faceI
                         << " even though it is not on a coupled face."
                         << abort(FatalError);
                 }
@@ -491,12 +480,8 @@ void Foam::removeCells::setRefinement
         }
         else if (nFacesUsingPoint[pointI] == 1)
         {
-            WarningIn
-            (
-                "removeCells::setRefinement(const labelList&"
-                ", const labelList&, const labelList&"
-                ", polyTopoChange&)"
-            )   << "point " << pointI << " at coordinate "
+            WarningInFunction
+                << "point " << pointI << " at coordinate "
                 << mesh_.points()[pointI]
                 << " is only used by 1 face after removing cells."
                 << " This probably results in an illegal mesh."
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
index e639ec9db1..619c7fee52 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -257,7 +257,7 @@ void Foam::removeFaces::mergeFaces
     if (fp.edgeLoops().size() != 1)
     {
         writeOBJ(fp, mesh_.time().path()/"facesToBeMerged.obj");
-        FatalErrorIn("removeFaces::mergeFaces")
+        FatalErrorInFunction
             << "Cannot merge faces " << faceLabels
             << " into single face since outside vertices " << fp.edgeLoops()
             << " do not form single loop but form " << fp.edgeLoops().size()
@@ -311,7 +311,7 @@ void Foam::removeFaces::mergeFaces
     if (masterIndex == -1)
     {
         writeOBJ(fp, mesh_.time().path()/"facesToBeMerged.obj");
-        FatalErrorIn("removeFaces::mergeFaces")
+        FatalErrorInFunction
             << "Problem" << abort(FatalError);
     }
 
@@ -602,11 +602,8 @@ Foam::label Foam::removeFaces::compatibleRemoves
 
         if (!mesh_.isInternalFace(faceI))
         {
-            FatalErrorIn
-            (
-                "removeFaces::compatibleRemoves(const labelList&"
-                ", labelList&, labelList&, labelList&)"
-            )   << "Not internal face:" << faceI << abort(FatalError);
+            FatalErrorInFunction
+                << "Not internal face:" << faceI << abort(FatalError);
         }
 
 
@@ -706,11 +703,8 @@ Foam::label Foam::removeFaces::compatibleRemoves
 
                 if (cellI < regionMaster[r])
                 {
-                    FatalErrorIn
-                    (
-                        "removeFaces::compatibleRemoves(const labelList&"
-                        ", labelList&, labelList&, labelList&)"
-                    )   << "Not lowest numbered : cell:" << cellI
+                    FatalErrorInFunction
+                        << "Not lowest numbered : cell:" << cellI
                         << " region:" << r
                         << " regionmaster:" << regionMaster[r]
                         << abort(FatalError);
@@ -722,11 +716,8 @@ Foam::label Foam::removeFaces::compatibleRemoves
         {
             if (nCells[region] == 1)
             {
-                FatalErrorIn
-                (
-                    "removeFaces::compatibleRemoves(const labelList&"
-                    ", labelList&, labelList&, labelList&)"
-                )   << "Region " << region
+                FatalErrorInFunction
+                    << "Region " << region
                     << " has only " << nCells[region] << " cells in it"
                     << abort(FatalError);
             }
@@ -792,11 +783,8 @@ void Foam::removeFaces::setRefinement
 
         if (!mesh_.isInternalFace(faceI))
         {
-            FatalErrorIn
-            (
-                "removeFaces::setRefinement(const labelList&"
-                ", const labelList&, const labelList&, polyTopoChange&)"
-            )   << "Face to remove is not internal face:" << faceI
+            FatalErrorInFunction
+                << "Face to remove is not internal face:" << faceI
                 << abort(FatalError);
         }
 
@@ -878,7 +866,7 @@ void Foam::removeFaces::setRefinement
                 {
                     const edge& e = mesh_.edges()[edgeI];
 
-                    FatalErrorIn("removeFaces::setRefinement")
+                    FatalErrorInFunction
                         << "Problem : edge has too few face neighbours:"
                         << eFaces << endl
                         << "edge:" << edgeI
@@ -959,7 +947,7 @@ void Foam::removeFaces::setRefinement
                     if (patch0 != patch1)
                     {
                         // Different patches. Do not merge edge.
-                        WarningIn("removeFaces::setRefinement")
+                        WarningInFunction
                             << "not merging faces " << f0 << " and "
                             << f1 << " across patch boundary edge " << edgeI
                             << endl;
@@ -982,7 +970,7 @@ void Foam::removeFaces::setRefinement
                             < minCos_
                         )
                         {
-                            WarningIn("removeFaces::setRefinement")
+                            WarningInFunction
                                 << "not merging faces " << f0 << " and "
                                 << f1 << " across edge " << edgeI
                                 << endl;
@@ -998,7 +986,7 @@ void Foam::removeFaces::setRefinement
                     const edge& e = mesh_.edges()[edgeI];
 
                     // Only found one boundary face. Problem.
-                    FatalErrorIn("removeFaces::setRefinement")
+                    FatalErrorInFunction
                         << "Problem : edge would have one boundary face"
                         << " and one internal face using it." << endl
                         << "Your remove pattern is probably incorrect." << endl
@@ -1023,7 +1011,7 @@ void Foam::removeFaces::setRefinement
             {
                 const edge& e = mesh_.edges()[edgeI];
 
-                FatalErrorIn("removeFaces::setRefinement")
+                FatalErrorInFunction
                     << "Problem : edge would get 1 face using it only"
                     << " edge:" << edgeI
                     << " nFaces:" << nFacesPerEdge[edgeI]
@@ -1163,7 +1151,7 @@ void Foam::removeFaces::setRefinement
 
             if (nRegion < 1)
             {
-                FatalErrorIn("setRefinement") << "Problem" << abort(FatalError);
+                FatalErrorInFunction << "Problem" << abort(FatalError);
             }
             else if (nRegion == 1)
             {
@@ -1206,7 +1194,7 @@ void Foam::removeFaces::setRefinement
             {
                 if (nbrRegion != myRegion)
                 {
-                    FatalErrorIn("removeFaces::setRefinement")
+                    FatalErrorInFunction
                         << "Inconsistent face region across coupled patches."
                         << endl
                         << "This side has for faceI:" << faceI
@@ -1227,7 +1215,7 @@ void Foam::removeFaces::setRefinement
                 // Second visit of this region.
                 if (toNbrRegion[myRegion] != nbrRegion)
                 {
-                    FatalErrorIn("removeFaces::setRefinement")
+                    FatalErrorInFunction
                         << "Inconsistent face region across coupled patches."
                         << endl
                         << "This side has for faceI:" << faceI
@@ -1288,7 +1276,7 @@ void Foam::removeFaces::setRefinement
         {
             if (nEdgesPerPoint[pointI] == 1)
             {
-                FatalErrorIn("removeFaces::setRefinement")
+                FatalErrorInFunction
                     << "Problem : point would get 1 edge using it only."
                     << " pointI:" << pointI
                     << " coord:" << mesh_.points()[pointI]
@@ -1420,7 +1408,7 @@ void Foam::removeFaces::setRefinement
 
             if (rFaces.size() <= 1)
             {
-                FatalErrorIn("setRefinement")
+                FatalErrorInFunction
                     << "Region:" << regionI
                     << " contains only faces " << rFaces
                     << abort(FatalError);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index 1fb4e2452a..154d0e442e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -462,7 +462,7 @@ void Foam::removePoints::setRefinement
 
                 if (meshPoints != keptPoints)
                 {
-                    FatalErrorIn("setRefinement")
+                    FatalErrorInFunction
                         << "faceI:" << savedFaceLabels_[saveI] << nl
                         << "meshPoints:" << meshPoints << nl
                         << "keptPoints:" << keptPoints << nl
@@ -486,10 +486,8 @@ void Foam::removePoints::updateMesh(const mapPolyMesh& map)
 
                 if (newFaceI == -1)
                 {
-                    FatalErrorIn
-                    (
-                        "removePoints::updateMesh(const mapPolyMesh&)"
-                    )   << "Old face " << savedFaceLabels_[localI]
+                    FatalErrorInFunction
+                        << "Old face " << savedFaceLabels_[localI]
                         << " seems to have dissapeared."
                         << abort(FatalError);
                 }
@@ -514,10 +512,8 @@ void Foam::removePoints::updateMesh(const mapPolyMesh& map)
 
                     if (f[fp] == -1)
                     {
-                        FatalErrorIn
-                        (
-                            "removePoints::updateMesh(const mapPolyMesh&)"
-                        )   << "Old point " << pointI
+                        FatalErrorInFunction
+                            << "Old point " << pointI
                             << " seems to have dissapeared."
                             << abort(FatalError);
                     }
@@ -556,7 +552,7 @@ void Foam::removePoints::updateMesh(const mapPolyMesh& map)
                     // face::operator== takes care of this)
                     if (keptFace != f)
                     {
-                        FatalErrorIn("setRefinement")
+                        FatalErrorInFunction
                             << "faceI:" << savedFaceLabels_[saveI] << nl
                             << "face:" << f << nl
                             << "keptFace:" << keptFace << nl
@@ -588,11 +584,8 @@ void Foam::removePoints::getUnrefimentSet
 {
     if (!undoable_)
     {
-        FatalErrorIn
-        (
-            "removePoints::getUnrefimentSet(const labelList&"
-            ", labelList&, labelList&) const"
-        )   << "removePoints not constructed with"
+        FatalErrorInFunction
+            << "removePoints not constructed with"
             << " unrefinement capability."
             << abort(FatalError);
     }
@@ -606,11 +599,8 @@ void Foam::removePoints::getUnrefimentSet
         undoFacesSet.sync(mesh_);
         if (sz != undoFacesSet.size())
         {
-            FatalErrorIn
-            (
-                "removePoints::getUnrefimentSet(const labelList&"
-                ", labelList&, labelList&) const"
-            )   << "undoFaces not synchronised across coupled faces." << endl
+            FatalErrorInFunction
+                << "undoFaces not synchronised across coupled faces." << endl
                 << "Size before sync:" << sz
                 << "  after sync:" << undoFacesSet.size()
                 << abort(FatalError);
@@ -640,11 +630,8 @@ void Foam::removePoints::getUnrefimentSet
         {
             if (savedFaceLabels_[saveI] < 0)
             {
-                FatalErrorIn
-                (
-                    "removePoints::getUnrefimentSet(const labelList&"
-                    ", labelList&, labelList&) const"
-                )   << "Illegal face label " << savedFaceLabels_[saveI]
+                FatalErrorInFunction
+                    << "Illegal face label " << savedFaceLabels_[saveI]
                     << " at index " << saveI
                     << abort(FatalError);
             }
@@ -661,12 +648,8 @@ void Foam::removePoints::getUnrefimentSet
 
                         if (savedPoints_[savedPointI] == vector::max)
                         {
-                            FatalErrorIn
-                            (
-                                "removePoints::getUnrefimentSet"
-                                "(const labelList&, labelList&, labelList&)"
-                                " const"
-                            )   << "Trying to restore point " << savedPointI
+                            FatalErrorInFunction
+                                << "Trying to restore point " << savedPointI
                                 << " from mesh face " << savedFaceLabels_[saveI]
                                 << " saved face:" << savedFace
                                 << " which has already been undone."
@@ -746,12 +729,8 @@ void Foam::removePoints::getUnrefimentSet
                     {
                         if (savedFace[fp] >= 0)
                         {
-                            FatalErrorIn
-                            (
-                                "removePoints::getUnrefimentSet"
-                                "(const labelList&, labelList&, labelList&)"
-                                " const"
-                            )   << "Problem: on coupled face:"
+                            FatalErrorInFunction
+                                << "Problem: on coupled face:"
                                 << savedFaceLabels_[saveI]
                                 << " fc:"
                                 << mesh_.faceCentres()[savedFaceLabels_[saveI]]
@@ -817,11 +796,8 @@ void Foam::removePoints::setUnrefinement
 {
     if (!undoable_)
     {
-        FatalErrorIn
-        (
-            "removePoints::setUnrefinement(const labelList&"
-            ", labelList&, polyTopoChange&)"
-        )   << "removePoints not constructed with"
+        FatalErrorInFunction
+            << "removePoints not constructed with"
             << " unrefinement capability."
             << abort(FatalError);
     }
@@ -836,11 +812,8 @@ void Foam::removePoints::setUnrefinement
 
         if (savedPoints_[localI] == vector::max)
         {
-            FatalErrorIn
-            (
-                "removePoints::setUnrefinement(const labelList&"
-                ", labelList&, polyTopoChange&)"
-            )   << "Saved point " << localI << " already restored!"
+            FatalErrorInFunction
+                << "Saved point " << localI << " already restored!"
                 << abort(FatalError);
         }
 
@@ -941,7 +914,7 @@ void Foam::removePoints::setUnrefinement
 
                     if (addedPointI != -1)
                     {
-                        FatalErrorIn("setUnrefinement")
+                        FatalErrorInFunction
                             << "Face:" << savedFaceLabels_[saveI]
                             << " savedVerts:" << savedFace
                             << " uses restored point:" << -savedFace[fp]-1
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index 57023168bd..0dc80d75fc 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -149,7 +149,7 @@ Foam::label Foam::tetDecomposer::triIndex(const label faceI, const label fp)
 const
 {
     const face& f = mesh_.faces()[faceI];
-    const label fp0 = mesh_.tetBasePtIs()[faceI];
+    const label fp0 = max(0, mesh_.tetBasePtIs()[faceI]);
 
     // Work out triangle index on this face
     label thisTriI;
@@ -436,7 +436,7 @@ void Foam::tetDecomposer::setRefinement
         }
         else
         {
-            label fp0 = mesh_.tetBasePtIs()[faceI];
+            label fp0 = max(mesh_.tetBasePtIs()[faceI], 0);
             label fp = f.fcIndex(fp0);
 
             for (label triI = 0; triI < f.size()-2; triI++)
@@ -606,7 +606,7 @@ void Foam::tetDecomposer::setRefinement
                     }
                     else
                     {
-                        FatalErrorIn("tetDecomposer::setRefinement(..)")
+                        FatalErrorInFunction
                             << "problem." << abort(FatalError);
                     }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index 2c7a064b29..05f06958d5 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ void Foam::polyTopoChanger::readModifiers()
     {
         if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
         {
-            WarningIn("polyTopoChanger::readModifiers()")
+            WarningInFunction
                 << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
                 << " does not support automatic re-reading."
                 << endl;
@@ -299,13 +299,8 @@ void Foam::polyTopoChanger::addTopologyModifiers
     {
         if (tm[tmI]->topoChanger() != *this)
         {
-            FatalErrorIn
-            (
-                "void polyTopoChanger::addTopologyModifiers"
-                "("
-                    "const List<polyMeshModifier*>&"
-                ")"
-            )   << "Mesh modifier created with different mesh reference."
+            FatalErrorInFunction
+                << "Mesh modifier created with different mesh reference."
                 << abort(FatalError);
         }
         set(tmI, tm[tmI]);
@@ -333,8 +328,7 @@ Foam::label Foam::polyTopoChanger::findModifierID
     // Modifier not found
     if (debug)
     {
-        WarningIn("label polyTopoChanger::findModifierID(const word&) const")
-            << "Modifier named " << modName << " not found.  "
+        WarningInFunction
             << "List of available modifier names: " << names() << endl;
     }
 
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
index 88d94e73b1..4c1e0855c6 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,10 +65,8 @@ void Foam::repatchPolyTopoChanger::changePatches
 {
     if (meshModPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "repatchPolyTopoChanger::changePatches(const List<polyPatch*>&)"
-        )   << "Cannot change patches after having changed faces. " << nl
+        FatalErrorInFunction
+            << "Cannot change patches after having changed faces. " << nl
             << "Please call changePatches first."
             << exit(FatalError);
     }
@@ -94,14 +92,7 @@ void Foam::repatchPolyTopoChanger::changePatchID
          || mesh_.isInternalFace(faceID)
         )
         {
-            FatalErrorIn
-            (
-                "void Foam::repatchPolyTopoChanger::changePatchID\n"
-                "(\n"
-                "    const label faceID,\n"
-                "    const label patchID\n"
-                ")\n"
-            )   << "Error in definition.  faceID: " << faceID
+            FatalErrorInFunction
                 << " patchID: " << patchID << ".  "
                 << "Labels out of range or internal face."
                 << abort(FatalError);
@@ -149,15 +140,7 @@ void Foam::repatchPolyTopoChanger::setFaceZone
         // Check that the request is possible
         if (faceID > mesh_.faces().size())
         {
-            FatalErrorIn
-            (
-                "void Foam::repatchPolyTopoChanger::setFaceZone"
-                "(\n"
-                "    const label faceID,\n"
-                "    const label zoneID,\n"
-                "    const bool flip\n"
-                ")\n"
-            )   << "Error in definition.  faceID: " << faceID
+            FatalErrorInFunction
                 << "out of range."
                 << abort(FatalError);
         }
@@ -192,15 +175,7 @@ void Foam::repatchPolyTopoChanger::changeAnchorPoint
         // Check that the request is possible
         if (faceID > mesh_.faces().size())
         {
-            FatalErrorIn
-            (
-                "void Foam::repatchPolyTopoChanger::setFaceZone"
-                "(\n"
-                "    const label faceID,\n"
-                "    const label zoneID,\n"
-                "    const bool flip\n"
-                ")\n"
-            )   << "Error in definition.  faceID: " << faceID
+            FatalErrorInFunction
                 << "out of range."
                 << abort(FatalError);
         }
@@ -210,14 +185,8 @@ void Foam::repatchPolyTopoChanger::changeAnchorPoint
 
     if ((fp < 0) || (fp >= f.size()))
     {
-        FatalErrorIn
-        (
-            "void Foam::repatchPolyTopoChanger::changeAnchorPoint"
-            "(\n"
-            "    const label faceID,\n"
-            "    const label fp\n"
-            ")\n"
-        )   << "Error in definition.  Face point: " << fp
+        FatalErrorInFunction
+            << "Error in definition.  Face point: " << fp
             << "indexes out of face " << f
             << abort(FatalError);
     }
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 12acbb115a..6138a7785b 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,11 +125,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         )
     )
     {
-        FatalErrorIn
-        (
-            "void slidingInterface::coupleInterface("
-            "polyTopoChange& ref) const"
-        )   << "Point projection addressing not available."
+        FatalErrorInFunction
+            << "Point projection addressing not available."
             << abort(FatalError);
     }
 
@@ -398,11 +395,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     if (!cutPointEdgePairMapPtr_)
     {
-        FatalErrorIn
-        (
-            "void slidingInterface::coupleInterface("
-            "polyTopoChange& ref) const"
-        )   << "Cut point edge pair map pointer not set."
+        FatalErrorInFunction
+            << "Cut point edge pair map pointer not set."
             << abort(FatalError);
     }
 
@@ -1045,11 +1039,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         }
         else
         {
-            FatalErrorIn
-            (
-                "void slidingInterface::coupleInterface("
-                "polyTopoChange& ref) const"
-            )   << "Face " << faceI << " in cut faces has neither a master "
+            FatalErrorInFunction
+                << "Face " << faceI << " in cut faces has neither a master "
                 << "nor a slave.  Error in the cutting algorithm on modify."
                 << abort(FatalError);
         }
@@ -1173,11 +1164,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             }
             else
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::coupleInterface("
-                    "polyTopoChange& ref) const"
-                )   << "Face " << faceI << " in cut faces has neither a master "
+                FatalErrorInFunction
+                    << "Face " << faceI << " in cut faces has neither a master "
                     << "nor a slave.  Error in the cutting algorithm on add."
                     << abort(FatalError);
             }
@@ -1414,12 +1402,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                                      || max(edgePointWeights) > 1
                                     )
                                     {
-                                        FatalErrorIn
-                                        (
-                                            "void slidingInterface::"
-                                            "coupleInterface("
-                                            "polyTopoChange& ref) const"
-                                        )   << "Error in master stick-out edge "
+                                        FatalErrorInFunction
+                                            << "Error in master stick-out edge "
                                             << "point collection."
                                             << abort(FatalError);
                                     }
@@ -1474,11 +1458,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         {
             if (newFaceLabels.size() < 3)
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::coupleInterface("
-                    "polyTopoChange& ref) const"
-                )   << "Face " << curFaceID << " reduced to less than "
+                FatalErrorInFunction
+                    << "Face " << curFaceID << " reduced to less than "
                     << "3 points.  Topological/cutting error A." << nl
                     << "Old face: " << oldFace << " new face: " << newFaceLabels
                     << abort(FatalError);
@@ -1728,12 +1709,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                                      || max(edgePointWeights) > 1
                                     )
                                     {
-                                        FatalErrorIn
-                                        (
-                                            "void slidingInterface::"
-                                            "coupleInterface("
-                                            "polyTopoChange& ref) const"
-                                        )   << "Error in slave stick-out edge "
+                                        FatalErrorInFunction
+                                            << "Error in slave stick-out edge "
                                             << "point collection."
                                             << abort(FatalError);
                                         }
@@ -1788,11 +1765,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         {
             if (newFaceLabels.size() < 3)
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::coupleInterface("
-                    "polyTopoChange& ref) const"
-                )   << "Face " << curFaceID << " reduced to less than "
+                FatalErrorInFunction
+                    << "Face " << curFaceID << " reduced to less than "
                     << "3 points.  Topological/cutting error B." << nl
                     << "Old face: " << oldFace << " new face: " << newFaceLabels
                     << abort(FatalError);
@@ -1866,11 +1840,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     if (!retiredPointMapPtr_)
     {
-        FatalErrorIn
-        (
-            "void slidingInterface::coupleInterface("
-            "polyTopoChange& ref) const"
-        )   << "Retired point map pointer not set."
+        FatalErrorInFunction
+            << "Retired point map pointer not set."
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
index ef3fd455c7..43c3e5692a 100644
--- a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,11 +211,8 @@ void Foam::slidingInterface::decoupleInterface
         {
             if (newFaceLabels.size() < 3)
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::decoupleInterface("
-                    "polyTopoChange& ref) const"
-                )   << "Face " << curFaceID << " reduced to less than "
+                FatalErrorInFunction
+                    << "Face " << curFaceID << " reduced to less than "
                     << "3 points.  Topological/cutting error." << nl
                     << "Old face: " << oldFace << " new face: " << newFaceLabels
                     << abort(FatalError);
@@ -341,11 +338,8 @@ void Foam::slidingInterface::decoupleInterface
         {
             if (newFaceLabels.size() < 3)
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::decoupleInterface("
-                    "polyTopoChange& ref) const"
-                )   << "Face " << curFaceID << " reduced to less than "
+                FatalErrorInFunction
+                    << "Face " << curFaceID << " reduced to less than "
                     << "3 points.  Topological/cutting error." << nl
                     << "Old face: " << oldFace << " new face: " << newFaceLabels
                     << abort(FatalError);
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
index d7f6e83027..7afcb62ae7 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ void Foam::enrichedPatch::calcMeshPoints() const
 {
     if (meshPointsPtr_)
     {
-        FatalErrorIn("void enrichedPatch::calcMeshPoints() const")
+        FatalErrorInFunction
             << "Mesh points already calculated."
             << abort(FatalError);
     }
@@ -58,7 +58,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
 {
     if (localFacesPtr_)
     {
-        FatalErrorIn("void enrichedPatch::calcLocalFaces() const")
+        FatalErrorInFunction
             << "Local faces already calculated."
             << abort(FatalError);
     }
@@ -98,7 +98,7 @@ void Foam::enrichedPatch::calcLocalPoints() const
 {
     if (localPointsPtr_)
     {
-        FatalErrorIn("void enrichedPatch::calcLocalPoints() const")
+        FatalErrorInFunction
             << "Local points already calculated."
             << abort(FatalError);
     }
@@ -233,7 +233,7 @@ bool Foam::enrichedPatch::checkSupport() const
         {
             if (!pointMap().found(curFace[pointI]))
             {
-                WarningIn("void enrichedPatch::checkSupport()")
+                WarningInFunction
                     << "Point " << pointI << " of face " << faceI
                     << " global point index: " << curFace[pointI]
                     << " not supported in point map.  This is not allowed."
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 6100e9bd30..26450d01f4 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 {
     if (cutFacesPtr_ || cutFaceMasterPtr_ || cutFaceSlavePtr_)
     {
-        FatalErrorIn("void enrichedPatch::calcCutFaces() const")
+        FatalErrorInFunction
             << "Cut faces addressing already calculated."
             << abort(FatalError);
     }
@@ -256,11 +256,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                         if (magNewDir < SMALL)
                         {
-                            FatalErrorIn
-                            (
-                                "void enrichedPatch::"
-                                "calcCutFaces() const"
-                            )   << "Zero length edge detected.  Probable "
+                            FatalErrorInFunction
                                 << "projection error: slave patch probably "
                                 << "does not project onto master.  "
                                 << "Please switch on "
@@ -617,11 +613,8 @@ void Foam::enrichedPatch::calcCutFaces() const
                                             [faceI - slavePatch_.size()];
                                     }
 
-                                    FatalErrorIn
-                                    (
-                                        "void enrichedPatch::"
-                                        "calcCutFaces() const"
-                                    )   << "Duplicate point found in cut face. "
+                                    FatalErrorInFunction
+                                        << "Duplicate point found in cut face. "
                                         << "Error in the face cutting "
                                         << "algorithm for global face "
                                         << origFace << " local face "
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 4cfb53d4c5..21291aacf1 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,15 +42,8 @@ void Foam::enrichedPatch::calcEnrichedFaces
 {
     if (enrichedFacesPtr_)
     {
-        FatalErrorIn
-        (
-            "void enrichedPatch::calcEnrichedFaces\n"
-            "(\n"
-            "    const labelListList& pointsIntoMasterEdges,\n"
-            "    const labelListList& pointsIntoSlaveEdges,\n"
-            "    const pointField& projectedSlavePoints\n"
-            ")"
-        )   << "Enriched faces already calculated."
+        FatalErrorInFunction
+            << "Enriched faces already calculated."
             << abort(FatalError);
     }
 
@@ -155,15 +148,8 @@ void Foam::enrichedPatch::calcEnrichedFaces
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "void enrichedPatch::calcEnrichedFaces\n"
-                        "(\n"
-                        "    const labelListList& pointsIntoMasterEdges,\n"
-                        "    const labelListList& pointsIntoSlaveEdges,\n"
-                        "    const pointField& projectedSlavePoints\n"
-                        ")"
-                    )   << "Zero length edge in slave patch for face " << i
+                    FatalErrorInFunction
+                        << "Zero length edge in slave patch for face " << i
                         << ".  This is not allowed."
                         << abort(FatalError);
                 }
@@ -184,15 +170,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
                     // Check weights: all new points should be on the edge
                     if (min(edgePointWeights) < 0 || max(edgePointWeights) > 1)
                     {
-                        FatalErrorIn
-                        (
-                            "void enrichedPatch::calcEnrichedFaces\n"
-                            "(\n"
-                            "    const labelListList& pointsIntoMasterEdges,\n"
-                            "    const labelListList& pointsIntoSlaveEdges,\n"
-                            "    const pointField& projectedSlavePoints\n"
-                            ")"
-                        )   << "Invalid point edge weights.  Some of points are"
+                        FatalErrorInFunction
                             << " not on the edge for edge " << curEdges[i]
                             << " of face " << faceI << " in slave patch." << nl
                             << "Min weight: " << min(edgePointWeights)
@@ -306,15 +284,8 @@ void Foam::enrichedPatch::calcEnrichedFaces
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "void enrichedPatch::calcEnrichedFaces\n"
-                        "(\n"
-                        "    const labelListList& pointsIntoMasterEdges,\n"
-                        "    const labelListList& pointsIntoSlaveEdges,\n"
-                        "    const pointField& projectedSlavePoints\n"
-                        ")"
-                    )   << "Zero length edge in master patch for face " << i
+                    FatalErrorInFunction
+                        << "Zero length edge in master patch for face " << i
                         << ".  This is not allowed."
                         << abort(FatalError);
                 }
@@ -335,15 +306,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
                     // Check weights: all new points should be on the edge
                     if (min(edgePointWeights) < 0 || max(edgePointWeights) > 1)
                     {
-                        FatalErrorIn
-                        (
-                            "void enrichedPatch::calcEnrichedFaces\n"
-                            "(\n"
-                            "    const labelListList& pointsIntoMasterEdges,\n"
-                            "    const labelListList& pointsIntoSlaveEdges,\n"
-                            "    const pointField& projectedSlavePoints\n"
-                            ")"
-                        )   << "Invalid point edge weights.  Some of points are"
+                        FatalErrorInFunction
                             << " not on the edge for edge " << curEdges[i]
                             << " of face " << faceI << " in master patch." << nl
                             << "Min weight: " << min(edgePointWeights)
@@ -403,15 +366,8 @@ void Foam::enrichedPatch::calcEnrichedFaces
         }
         else
         {
-            FatalErrorIn
-            (
-                "void enrichedPatch::calcEnrichedFaces\n"
-                "(\n"
-                "    const labelListList& pointsIntoMasterEdges,\n"
-                "    const labelListList& pointsIntoSlaveEdges,\n"
-                "    const pointField& projectedSlavePoints\n"
-                ")"
-            )   << "Error in enriched patch support"
+            FatalErrorInFunction
+                << "Error in enriched patch support"
                 << abort(FatalError);
         }
     }
@@ -424,8 +380,7 @@ const Foam::faceList& Foam::enrichedPatch::enrichedFaces() const
 {
     if (!enrichedFacesPtr_)
     {
-        FatalErrorIn("const faceList& enrichedPatch::enrichedFaces() const")
-            << "Enriched faces not available yet.  Please use "
+        FatalErrorInFunction
             << "void enrichedPatch::calcEnrichedFaces\n"
             << "(\n"
             << "    const labelListList& pointsIntoMasterEdges,\n"
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index 07ad50dc74..6ca5214419 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
 {
     if (masterPointFacesPtr_)
     {
-        FatalErrorIn("void enrichedPatch::calcMasterPointFaces() const")
+        FatalErrorInFunction
             << "Master point face addressing already calculated."
             << abort(FatalError);
     }
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
index 27f2ef4e52..a0f0ca0f9d 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ void Foam::enrichedPatch::completePointMap() const
 {
     if (pointMapComplete_)
     {
-        FatalErrorIn("void enrichedPatch::completePointMap() const")
+        FatalErrorInFunction
             << "Point map already completed"
             << abort(FatalError);
     }
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index e726ab95b7..f2fd9e3aac 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -37,7 +37,7 @@ void Foam::enrichedPatch::calcPointPoints() const
     // Calculate point-point addressing
     if (pointPointsPtr_)
     {
-        FatalErrorIn("void enrichedPatch::calcPointPoints() const")
+        FatalErrorInFunction
             << "Point-point addressing already calculated."
             << abort(FatalError);
     }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index cccfbda5d6..79d1faa891 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,10 +79,8 @@ void Foam::slidingInterface::checkDefinition()
      || !slavePatchID_.active()
     )
     {
-        FatalErrorIn
-        (
-            "void slidingInterface::checkDefinition()"
-        )   << "Not all zones and patches needed in the definition "
+        FatalErrorInFunction
+            << "Not all zones and patches needed in the definition "
             << "have been found.  Please check your mesh definition."
             << abort(FatalError);
     }
@@ -94,8 +92,7 @@ void Foam::slidingInterface::checkDefinition()
      || mesh.faceZones()[slaveFaceZoneID_.index()].empty()
     )
     {
-        FatalErrorIn("void slidingInterface::checkDefinition()")
-            << "Master or slave face zone contain no faces.  "
+        FatalErrorInFunction
             << "Please check your mesh definition."
             << abort(FatalError);
     }
@@ -199,23 +196,8 @@ Foam::slidingInterface::slidingInterface
 
     if (attached_)
     {
-        FatalErrorIn
-        (
-            "Foam::slidingInterface::slidingInterface\n"
-            "(\n"
-            "    const word& name,\n"
-            "    const label index,\n"
-            "    const polyTopoChanger& mme,\n"
-            "    const word& masterFaceZoneName,\n"
-            "    const word& slaveFaceZoneName,\n"
-            "    const word& cutFaceZoneName,\n"
-            "    const word& cutPointZoneName,\n"
-            "    const word& masterPatchName,\n"
-            "    const word& slavePatchName,\n"
-            "    const typeOfMatch tom,\n"
-            "    const bool coupleDecouple\n"
-            ")"
-        )   << "Creation of a sliding interface from components "
+        FatalErrorInFunction
+            << "Creation of a sliding interface from components "
             << "in attached state not supported."
             << abort(FatalError);
     }
@@ -644,11 +626,8 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "void slidingInterface::modifyMotionPoints"
-                        "(pointField&) const"
-                    )   << "Cut point " << cutPoints[pointI]
+                    FatalErrorInFunction
+                        << "Cut point " << cutPoints[pointI]
                         << " not recognised as either the projected "
                         << "or as intersection point.  Error in point "
                         << "projection or data mapping"
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index 305bc68d58..e30f099746 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,11 +132,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
                 }
             }
 
-            FatalErrorIn
-            (
-                "void slidingInterface::calcAttachedAddressing()"
-                "const"
-            )   << "Error is zone face-cell addressing.  Probable error in "
+            FatalErrorInFunction
                 << "decoupled mesh or sliding interface definition."
                 << abort(FatalError);
         }
@@ -221,10 +217,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "void slidingInterface::calcAttachedAddressing() const"
-        )   << "The interface is attached.  The zone face-cell addressing "
+        FatalErrorInFunction
             << "cannot be assembled for object " << name()
             << abort(FatalError);
     }
@@ -304,11 +297,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
         // Check if all the mapped cells are live
         if (min(newMfc) < 0 || min(newSfc) < 0)
         {
-            FatalErrorIn
-            (
-                "void slidingInterface::renumberAttachedAddressing("
-                "const mapPolyMesh& m) const"
-            )   << "Error in cell renumbering for object " << name()
+            FatalErrorInFunction
+                << "Error in cell renumbering for object " << name()
                 << ".  Some of master cells next "
                 << "to the interface have been removed."
                 << abort(FatalError);
@@ -356,11 +346,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
         // Check if all the mapped cells are live
         if (min(newMsof) < 0 || min(newSsof) < 0)
         {
-            FatalErrorIn
-            (
-                "void slidingInterface::renumberAttachedAddressing("
-                "const mapPolyMesh& m) const"
-            )   << "Error in face renumbering for object " << name()
+            FatalErrorInFunction
+                << "Error in face renumbering for object " << name()
                 << ".  Some of stick-out next "
                 << "to the interface have been removed."
                 << abort(FatalError);
@@ -391,11 +378,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
             // Check if all the mapped cells are live
             if (key < 0 || value < 0)
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::renumberAttachedAddressing("
-                    "const mapPolyMesh& m) const"
-                )   << "Error in retired point numbering for object "
+                FatalErrorInFunction
+                    << "Error in retired point numbering for object "
                     << name() << ".  Some of master "
                     << "points have been removed."
                     << abort(FatalError);
@@ -431,11 +415,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
             // Check if all the mapped cells are live
             if (key < 0 || ms < 0 || me < 0 || ss < 0 || se < 0)
             {
-                FatalErrorIn
-                (
-                    "void slidingInterface::renumberAttachedAddressing("
-                    "const mapPolyMesh& m) const"
-                )   << "Error in cut point edge pair map numbering for object "
+                FatalErrorInFunction
+                    << "Error in cut point edge pair map numbering for object "
                     << name() << ".  Some of master points have been removed."
                     << abort(FatalError);
             }
@@ -446,11 +427,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
 
     if (!projectedSlavePointsPtr_)
     {
-        FatalErrorIn
-        (
-            "void slidingInterface::renumberAttachedAddressing("
-            "const mapPolyMesh& m) const"
-        )   << "Error in projected point numbering for object " << name()
+        FatalErrorInFunction
+            << "Error in projected point numbering for object " << name()
             << abort(FatalError);
     }
 
@@ -496,10 +474,8 @@ const Foam::labelList& Foam::slidingInterface::masterFaceCells() const
 {
     if (!masterFaceCellsPtr_)
     {
-        FatalErrorIn
-        (
-            "const labelList& slidingInterface::masterFaceCells() const"
-        )   << "Master zone face-cell addressing not available for object "
+        FatalErrorInFunction
+            << "Master zone face-cell addressing not available for object "
             << name()
             << abort(FatalError);
     }
@@ -512,10 +488,8 @@ const Foam::labelList& Foam::slidingInterface::slaveFaceCells() const
 {
     if (!slaveFaceCellsPtr_)
     {
-        FatalErrorIn
-        (
-            "const labelList& slidingInterface::slaveFaceCells() const"
-        )   << "Slave zone face-cell addressing not available for object "
+        FatalErrorInFunction
+            << "Slave zone face-cell addressing not available for object "
             << name()
             << abort(FatalError);
     }
@@ -528,10 +502,8 @@ const Foam::labelList& Foam::slidingInterface::masterStickOutFaces() const
 {
     if (!masterStickOutFacesPtr_)
     {
-        FatalErrorIn
-        (
-            "const labelList& slidingInterface::masterStickOutFaces() const"
-        )   << "Master zone stick-out face addressing not available for object "
+        FatalErrorInFunction
+            << "Master zone stick-out face addressing not available for object "
             << name()
             << abort(FatalError);
     }
@@ -544,10 +516,8 @@ const Foam::labelList& Foam::slidingInterface::slaveStickOutFaces() const
 {
     if (!slaveStickOutFacesPtr_)
     {
-        FatalErrorIn
-        (
-            "const labelList& slidingInterface::slaveStickOutFaces() const"
-        )   << "Slave zone stick-out face addressing not available for object "
+        FatalErrorInFunction
+            << "Slave zone stick-out face addressing not available for object "
             << name()
             << abort(FatalError);
     }
@@ -560,10 +530,8 @@ const Foam::Map<Foam::label>& Foam::slidingInterface::retiredPointMap() const
 {
     if (!retiredPointMapPtr_)
     {
-        FatalErrorIn
-        (
-            "const Map<label>& slidingInterface::retiredPointMap() const"
-        )   << "Retired point map not available for object " << name()
+        FatalErrorInFunction
+            << "Retired point map not available for object " << name()
             << abort(FatalError);
     }
 
@@ -576,11 +544,8 @@ Foam::slidingInterface::cutPointEdgePairMap() const
 {
     if (!cutPointEdgePairMapPtr_)
     {
-        FatalErrorIn
-        (
-            "const Map<Pair<edge> >& slidingInterface::"
-            "cutPointEdgePairMap() const"
-        )   << "Retired point map not available for object " << name()
+        FatalErrorInFunction
+            << "Retired point map not available for object " << name()
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index fd8f913e1f..e937c18d18 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -368,10 +368,7 @@ bool Foam::slidingInterface::projectPoints() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "bool slidingInterface::projectPoints() const"
-        )   << "Problem in point projection.  Unknown sliding match type "
+        FatalErrorInFunction
             << " for object " << name()
             << abort(FatalError);
     }
@@ -404,10 +401,7 @@ bool Foam::slidingInterface::projectPoints() const
 
         if (nShortEdges > 0)
         {
-            FatalErrorIn
-            (
-                "bool slidingInterface::projectPoints() const"
-            )   << "Problem in point projection.  " << nShortEdges
+            FatalErrorInFunction
                 << " short projected edges "
                 << "after adjustment for object " << name()
                 << abort(FatalError);
@@ -522,10 +516,7 @@ bool Foam::slidingInterface::projectPoints() const
 
         if (minEdgeLength < SMALL)
         {
-            FatalErrorIn
-            (
-                "bool slidingInterface::projectPoints() const"
-            )   << "Problem in point projection.  Short projected edge "
+            FatalErrorInFunction
                 << " after point merge for object " << name()
                 << abort(FatalError);
         }
@@ -687,10 +678,7 @@ bool Foam::slidingInterface::projectPoints() const
 
         if (minEdgeLength < SMALL)
         {
-            FatalErrorIn
-            (
-                "bool slidingInterface::projectPoints() const"
-            )   << "Problem in point projection.  Short projected edge "
+            FatalErrorInFunction
             << " after correction for object " << name()
             << abort(FatalError);
         }
diff --git a/src/edgeMesh/edgeMesh.C b/src/edgeMesh/edgeMesh.C
index 0e8cb2acad..af3d5d1a89 100644
--- a/src/edgeMesh/edgeMesh.C
+++ b/src/edgeMesh/edgeMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,7 +107,7 @@ void Foam::edgeMesh::calcPointEdges() const
 {
     if (pointEdgesPtr_.valid())
     {
-        FatalErrorIn("edgeMesh::calcPointEdges() const")
+        FatalErrorInFunction
             << "pointEdges already calculated." << abort(FatalError);
     }
 
@@ -286,7 +286,11 @@ void Foam::edgeMesh::scalePoints(const scalar scaleFactor)
 }
 
 
-void Foam::edgeMesh::mergePoints(const scalar mergeDist)
+void Foam::edgeMesh::mergePoints
+(
+    const scalar mergeDist,
+    labelList& reversePointMap
+)
 {
     pointField newPoints;
     labelList pointMap;
@@ -307,6 +311,9 @@ void Foam::edgeMesh::mergePoints(const scalar mergeDist)
 
         points_.transfer(newPoints);
 
+        // connectivity changed
+        pointEdgesPtr_.clear();
+
         // Renumber and make sure e[0] < e[1] (not really necessary)
         forAll(edges_, edgeI)
         {
@@ -383,6 +390,9 @@ void Foam::edgeMesh::mergeEdges()
     {
         edges_[iter()] = iter.key();
     }
+
+    // connectivity changed
+    pointEdgesPtr_.clear();
 }
 
 
diff --git a/src/edgeMesh/edgeMesh.H b/src/edgeMesh/edgeMesh.H
index d3397a290b..9962ca9176 100644
--- a/src/edgeMesh/edgeMesh.H
+++ b/src/edgeMesh/edgeMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -247,11 +247,12 @@ public:
         //- Scale points. A non-positive factor is ignored
         virtual void scalePoints(const scalar);
 
-        //- Merge common points (points within mergeDist)
-        void mergePoints(const scalar mergeDist);
+        //- Merge common points (points within mergeDist). Return map from
+        //  old to new points.
+        virtual void mergePoints(const scalar mergeDist, labelList&);
 
-        //- Merge similar edges
-        void mergeEdges();
+        //- Merge duplicate edges
+        virtual void mergeEdges();
 
 
     // Write
diff --git a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C b/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
index 581d161d36..e07e3f3185 100644
--- a/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ bool Foam::fileFormats::edgeMeshFormat::read
 
     if (!io.headerOk())
     {
-        FatalErrorIn("fileFormats::edgeMeshFormat::read(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -109,11 +109,7 @@ bool Foam::fileFormats::edgeMeshFormat::read
 {
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::edgeMeshFormat::read"
-            "(Istream&, pointField&, edgeList&)"
-        )
+        FatalErrorInFunction
             << "read error "
             << exit(FatalError);
     }
@@ -137,11 +133,7 @@ Foam::Ostream& Foam::fileFormats::edgeMeshFormat::write
 {
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::edgeMeshFormat::write"
-            "(Ostream&, const fileName&, const edgeMesh&)"
-        )
+        FatalErrorInFunction
             << "bad output stream " << os.name()
             << exit(FatalError);
     }
@@ -194,10 +186,8 @@ void Foam::fileFormats::edgeMeshFormat::write
 
     if (!osPtr().good())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "fileFormats::edgeMeshFormat::write"
-            "(const fileName&, const edgeMesh&)",
             osPtr()
         )   << "Cannot open file for writing " << filename
             << exit(FatalIOError);
@@ -208,10 +198,8 @@ void Foam::fileFormats::edgeMeshFormat::write
 
     if (!ok)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "fileFormats::edgeMeshFormat::write"
-            "(const fileName&, const edgeMesh&)",
             os
         )   << "Cannot write header"
             << exit(FatalIOError);
diff --git a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C b/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C
index 5f20b3016b..3c72541702 100644
--- a/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,7 @@ bool Foam::fileFormats::extendedFeatureEdgeMeshFormat::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::extendedFeatureEdgeMeshFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
diff --git a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C b/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
index 921778fa04..5045d031b3 100644
--- a/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,10 +51,7 @@ bool Foam::fileFormats::NASedgeFormat::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::NASedgeFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -149,10 +146,7 @@ bool Foam::fileFormats::NASedgeFormat::read
             is.getLine(line);
             if (line[0] != '*')
             {
-                FatalErrorIn
-                (
-                    "fileFormats::NASedgeFormat::read(const fileName&)"
-                )
+                FatalErrorInFunction
                     << "Expected continuation symbol '*' when reading GRID*"
                     << " (double precision coordinate) format" << nl
                     << "Read:" << line << nl
diff --git a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C b/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
index 12cad6b89d..8b6e64cc59 100644
--- a/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,10 +101,7 @@ bool Foam::fileFormats::OBJedgeFormat::read(const fileName& filename)
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OBJedgeFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -241,11 +238,7 @@ void Foam::fileFormats::OBJedgeFormat::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OBJedgeFormat::write"
-            "(const fileName&, const edgeMesh&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C
index 05eb1cfe02..7fd3141d1b 100644
--- a/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/starcd/STARCDedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,10 +140,7 @@ bool Foam::fileFormats::STARCDedgeFormat::read
     IFstream is(baseName + ".cel");
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STARCDedgeFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << is.name()
             << exit(FatalError);
     }
diff --git a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C b/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
index f0eda7aaa4..01e792e2ce 100644
--- a/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
+++ b/src/edgeMesh/edgeMeshFormats/vtk/VTKedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,10 +94,8 @@ bool Foam::fileFormats::VTKedgeFormat::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::VTKedgeFormat::read(const fileName&)"
-        )   << "Cannot read file " << filename
+        FatalErrorInFunction
+            << "Cannot read file " << filename
             << exit(FatalError);
     }
 
@@ -162,11 +160,8 @@ void Foam::fileFormats::VTKedgeFormat::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::VTKedgeFormat::write"
-            "(const fileName&, const edgeMesh&)"
-        )   << "Cannot open file for writing " << filename
+        FatalErrorInFunction
+            << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
 
diff --git a/src/edgeMesh/edgeMeshIO.C b/src/edgeMesh/edgeMeshIO.C
index 3887f9d679..074510f2c1 100644
--- a/src/edgeMesh/edgeMeshIO.C
+++ b/src/edgeMesh/edgeMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,11 +104,8 @@ void Foam::edgeMesh::write
 
     if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "MeshedSurface::write"
-            "(const fileName&, const MeshedSurface&)"
-        )   << "Unknown file extension " << ext << nl << nl
+        FatalErrorInFunction
+            << "Unknown file extension " << ext << nl << nl
             << "Valid types are :" << endl
             << writefileExtensionMemberFunctionTablePtr_->sortedToc()
             << exit(FatalError);
diff --git a/src/edgeMesh/edgeMeshNew.C b/src/edgeMesh/edgeMeshNew.C
index df52d7cf63..8258da4b57 100644
--- a/src/edgeMesh/edgeMeshNew.C
+++ b/src/edgeMesh/edgeMeshNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,11 +38,8 @@ Foam::autoPtr<Foam::edgeMesh> Foam::edgeMesh::New
 
     if (cstrIter == fileExtensionConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "edgeMesh<Face>::New(const fileName&, const word&) : "
-            "constructing edgeMesh"
-        )   << "Unknown file extension " << ext
+        FatalErrorInFunction
+            << "Unknown file extension " << ext
             << " for file " << name << nl << nl
             << "Valid extensions are :" << nl
             << fileExtensionConstructorTablePtr_->sortedToc()
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index d7bfa4b2f6..8ce9f94ee0 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,8 @@ License
 #include "DynamicField.H"
 #include "edgeMeshFormatsCore.H"
 #include "IOmanip.H"
+#include "searchableSurface.H"
+#include "triSurfaceMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -118,7 +120,6 @@ Foam::wordHashSet Foam::extendedEdgeMesh::writeTypes()
 }
 
 
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 bool Foam::extendedEdgeMesh::canReadType
@@ -176,7 +177,7 @@ Foam::extendedEdgeMesh::classifyFeaturePoint
     label ptI
 ) const
 {
-    labelList ptEds(pointEdges()[ptI]);
+    const labelList& ptEds(pointEdges()[ptI]);
 
     label nPtEds = ptEds.size();
     label nExternal = 0;
@@ -217,46 +218,182 @@ Foam::extendedEdgeMesh::classifyFeaturePoint
 }
 
 
-Foam::extendedEdgeMesh::edgeStatus
-Foam::extendedEdgeMesh::classifyEdge
+void Foam::extendedEdgeMesh::cut
 (
-    const List<vector>& norms,
-    const labelList& edNorms,
-    const vector& fC0tofC1
+    const searchableSurface& surf,
+
+    labelList& pointMap,
+    labelList& edgeMap,
+    labelList& pointsFromEdge,
+    labelList& oldEdge,
+    labelList& surfTri
 )
 {
-    label nEdNorms = edNorms.size();
+    const edgeList& edges = this->edges();
+    const pointField& points = this->points();
 
-    if (nEdNorms == 1)
+
+    List<List<pointIndexHit> > edgeHits(edges.size());
     {
-        return OPEN;
+        pointField start(edges.size());
+        pointField end(edges.size());
+        forAll(edges, edgeI)
+        {
+            const edge& e = edges[edgeI];
+            start[edgeI] = points[e[0]];
+            end[edgeI] = points[e[1]];
+        }
+        surf.findLineAll(start, end, edgeHits);
     }
-    else if (nEdNorms == 2)
-    {
-        const vector& n0(norms[edNorms[0]]);
-        const vector& n1(norms[edNorms[1]]);
 
-        if ((n0 & n1) > cosNormalAngleTol_)
+    // Count number of hits
+    label nHits = 0;
+    forAll(edgeHits, edgeI)
+    {
+        nHits += edgeHits[edgeI].size();
+    }
+
+    DynamicField<point> newPoints(points);
+    DynamicList<label> newToOldPoint(identity(points.size()));
+
+    newPoints.setCapacity(newPoints.size()+nHits);
+    newToOldPoint.setCapacity(newPoints.capacity());
+
+    DynamicList<edge> newEdges(edges);
+    DynamicList<label> newToOldEdge(identity(edges.size()));
+
+    newEdges.setCapacity(newEdges.size()+nHits);
+    newToOldEdge.setCapacity(newEdges.capacity());
+
+    // Information on additional points
+    DynamicList<label> dynPointsFromEdge(nHits);
+    DynamicList<label> dynOldEdge(nHits);
+    DynamicList<label> dynSurfTri(nHits);
+
+    forAll(edgeHits, edgeI)
+    {
+        const List<pointIndexHit>& eHits = edgeHits[edgeI];
+
+        if (eHits.size())
         {
-            return FLAT;
-        }
-        else if ((fC0tofC1 & n0) > 0.0)
-        {
-            return INTERNAL;
-        }
-        else
-        {
-            return EXTERNAL;
+            label prevPtI = edges[edgeI][0];
+            forAll(eHits, eHitI)
+            {
+                label newPtI = newPoints.size();
+
+                newPoints.append(eHits[eHitI].hitPoint());
+                newToOldPoint.append(edges[edgeI][0]);  // map from start point
+                dynPointsFromEdge.append(newPtI);
+                dynOldEdge.append(edgeI);
+                dynSurfTri.append(eHits[eHitI].index());
+
+                if (eHitI == 0)
+                {
+                    newEdges[edgeI] = edge(prevPtI, newPtI);
+                }
+                else
+                {
+                    newEdges.append(edge(prevPtI, newPtI));
+                    newToOldEdge.append(edgeI);
+                }
+                prevPtI = newPtI;
+            }
+            newEdges.append(edge(prevPtI, edges[edgeI][1]));
+            newToOldEdge.append(edgeI);
         }
     }
-    else if (nEdNorms > 2)
+
+    pointField allPoints;
+    allPoints.transfer(newPoints);
+    pointMap.transfer(newToOldPoint);
+
+    edgeList allEdges;
+    allEdges.transfer(newEdges);
+    edgeMap.transfer(newToOldEdge);
+
+    pointsFromEdge.transfer(dynPointsFromEdge);
+    oldEdge.transfer(dynOldEdge);
+    surfTri.transfer(dynSurfTri);
+
+    // Update local information
+    autoMap(allPoints, allEdges, pointMap, edgeMap);
+}
+
+
+void Foam::extendedEdgeMesh::select
+(
+    const searchableSurface& surf,
+    const volumeType volType,   // side to keep
+    labelList& pointMap,        // sub to old points
+    labelList& edgeMap          // sub to old edges
+)
+{
+    const edgeList& edges = this->edges();
+    const pointField& points = this->points();
+
+    // Test edge centres for inside/outside
+    if (volType == volumeType::INSIDE || volType == volumeType::OUTSIDE)
     {
-        return MULTIPLE;
+        pointField edgeCentres(edges.size());
+        forAll(edgeCentres, edgeI)
+        {
+            const edge& e = edges[edgeI];
+            edgeCentres[edgeI] = e.centre(points);
+        }
+        List<volumeType> volTypes;
+        surf.getVolumeType(edgeCentres, volTypes);
+
+        // Extract edges on correct side
+        edgeMap.setSize(edges.size());
+        label compactEdgeI = 0;
+
+        forAll(volTypes, edgeI)
+        {
+            if (volTypes[edgeI] == volType)
+            {
+                edgeMap[compactEdgeI++] = edgeI;
+            }
+        }
+        edgeMap.setSize(compactEdgeI);
+
+        // Extract used points
+        labelList pointToCompact(points.size(), -1);
+        forAll(edgeMap, i)
+        {
+            const edge& e = edges[edgeMap[i]];
+            pointToCompact[e[0]] = labelMax;       // tag with a value
+            pointToCompact[e[1]] = labelMax;
+        }
+
+        pointMap.setSize(points.size());
+        label compactPointI = 0;
+        forAll(pointToCompact, pointI)
+        {
+            if (pointToCompact[pointI] != -1)
+            {
+                pointToCompact[pointI] = compactPointI;
+                pointMap[compactPointI++] = pointI;
+            }
+        }
+        pointMap.setSize(compactPointI);
+        pointField subPoints(points, pointMap);
+
+        // Renumber edges
+        edgeList subEdges(edgeMap.size());
+        forAll(edgeMap, i)
+        {
+            const edge& e = edges[edgeMap[i]];
+            subEdges[i][0] = pointToCompact[e[0]];
+            subEdges[i][1] = pointToCompact[e[1]];
+        }
+
+        // Reset primitives and map other quantities
+        autoMap(subPoints, subEdges, pointMap, edgeMap);
     }
     else
     {
-        // There is a problem - the edge has no normals
-        return NONE;
+        pointMap = identity(points.size());
+        edgeMap = identity(edges.size());
     }
 }
 
@@ -287,10 +424,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh()
 {}
 
 
-Foam::extendedEdgeMesh::extendedEdgeMesh
-(
-    const extendedEdgeMesh& fem
-)
+Foam::extendedEdgeMesh::extendedEdgeMesh(const extendedEdgeMesh& fem)
 :
     edgeMesh(fem),
     concaveStart_(fem.concaveStart()),
@@ -1332,126 +1466,649 @@ void Foam::extendedEdgeMesh::flipNormals()
 }
 
 
-void Foam::extendedEdgeMesh::writeObj
+void Foam::extendedEdgeMesh::autoMap
 (
-    const fileName& prefix
-) const
+    const pointField& subPoints,
+    const edgeList& subEdges,
+    const labelList& pointMap,
+    const labelList& edgeMap
+)
+{
+    // Determine slicing for subEdges
+    label subIntStart = edgeMap.size();
+    label subFlatStart = edgeMap.size();
+    label subOpenStart = edgeMap.size();
+    label subMultipleStart = edgeMap.size();
+
+    forAll(edgeMap, subEdgeI)
+    {
+        label edgeI = edgeMap[subEdgeI];
+        if (edgeI >= internalStart() && subIntStart == edgeMap.size())
+        {
+            subIntStart = subEdgeI;
+        }
+        if (edgeI >= flatStart() && subFlatStart == edgeMap.size())
+        {
+            subFlatStart = subEdgeI;
+        }
+        if (edgeI >= openStart() && subOpenStart == edgeMap.size())
+        {
+            subOpenStart = subEdgeI;
+        }
+        if (edgeI >= multipleStart() && subMultipleStart == edgeMap.size())
+        {
+            subMultipleStart = subEdgeI;
+        }
+    }
+
+
+    // Determine slicing for subPoints
+
+    label subConcaveStart = pointMap.size();
+    label subMixedStart = pointMap.size();
+    label subNonFeatStart = pointMap.size();
+
+    forAll(pointMap, subPointI)
+    {
+        label pointI = pointMap[subPointI];
+        if (pointI >= concaveStart() && subConcaveStart == pointMap.size())
+        {
+            subConcaveStart = subPointI;
+        }
+        if (pointI >= mixedStart() && subMixedStart == pointMap.size())
+        {
+            subMixedStart = subPointI;
+        }
+        if
+        (
+            pointI >= nonFeatureStart()
+         && subNonFeatStart == pointMap.size()
+        )
+        {
+            subNonFeatStart = subPointI;
+        }
+    }
+
+
+
+    // Compact region edges
+    labelList subRegionEdges;
+    {
+        PackedBoolList isRegionEdge(edges().size());
+        forAll(regionEdges(), i)
+        {
+            label edgeI = regionEdges()[i];
+            isRegionEdge[edgeI] = true;
+        }
+
+        DynamicList<label> newRegionEdges(regionEdges().size());
+        forAll(edgeMap, subEdgeI)
+        {
+            label edgeI = edgeMap[subEdgeI];
+            if (isRegionEdge[edgeI])
+            {
+                newRegionEdges.append(subEdgeI);
+            }
+        }
+        subRegionEdges.transfer(newRegionEdges);
+    }
+
+
+    labelListList subFeaturePointEdges;
+    if (featurePointEdges().size())
+    {
+        subFeaturePointEdges.setSize(subNonFeatStart);
+        for (label subPointI = 0; subPointI < subNonFeatStart; subPointI++)
+        {
+            label pointI = pointMap[subPointI];
+            const labelList& pEdges = featurePointEdges()[pointI];
+
+            labelList& subPEdges = subFeaturePointEdges[subPointI];
+            subPEdges.setSize(pEdges.size());
+
+            if (pEdges.size())
+            {
+                forAll(pEdges, i)
+                {
+                    subPEdges[i] = edgeMap[pEdges[i]];
+                }
+            }
+        }
+    }
+
+
+    vectorField subEdgeDirections(edgeDirections(), edgeMap);
+
+    // Find used normals
+    labelList reverseNormalMap(normals().size(), -1);
+    DynamicList<label> normalMap(normals().size());
+
+    {
+        PackedBoolList isSubNormal(normals().size());
+        for (label subPointI = 0; subPointI < subNonFeatStart; subPointI++)
+        {
+            label pointI = pointMap[subPointI];
+            const labelList& pNormals = featurePointNormals()[pointI];
+
+            forAll(pNormals, i)
+            {
+                isSubNormal[pNormals[i]] = true;
+            }
+        }
+        forAll(edgeMap, subEdgeI)
+        {
+            label edgeI = edgeMap[subEdgeI];
+            const labelList& eNormals = edgeNormals()[edgeI];
+
+            forAll(eNormals, i)
+            {
+                isSubNormal[eNormals[i]] = true;
+            }
+        }
+
+        forAll(isSubNormal, normalI)
+        {
+            if (isSubNormal[normalI])
+            {
+                label subNormalI = normalMap.size();
+                reverseNormalMap[normalI] = subNormalI;
+                normalMap.append(subNormalI);
+            }
+        }
+    }
+
+
+    // Use compaction map on data referencing normals
+    labelListList subNormalDirections;
+
+    if (normalDirections().size())
+    {
+        subNormalDirections.setSize(edgeMap.size());
+
+        forAll(edgeMap, subEdgeI)
+        {
+            label edgeI = edgeMap[subEdgeI];
+            const labelList& eNormals = normalDirections()[edgeI];
+
+            labelList& subNormals = subNormalDirections[subEdgeI];
+            subNormals.setSize(eNormals.size());
+            forAll(eNormals, i)
+            {
+                if (eNormals[i] >= 0)
+                {
+                    subNormals[i] = reverseNormalMap[eNormals[i]];
+                }
+                else
+                {
+                    subNormals[i] = -1;
+                }
+            }
+        }
+    }
+
+    labelListList subEdgeNormals(edgeMap.size());
+    forAll(edgeMap, subEdgeI)
+    {
+        label edgeI = edgeMap[subEdgeI];
+        const labelList& eNormals = edgeNormals()[edgeI];
+        labelList& subNormals = subEdgeNormals[subEdgeI];
+
+        subNormals = UIndirectList<label>(reverseNormalMap, eNormals);
+    }
+
+    labelListList subPointNormals(pointMap.size());
+    for (label subPointI = 0; subPointI < subNonFeatStart; subPointI++)
+    {
+        label pointI = pointMap[subPointI];
+        const labelList& pNormals = featurePointNormals()[pointI];
+        labelList& subNormals = subPointNormals[subPointI];
+
+        subNormals = UIndirectList<label>(reverseNormalMap, pNormals);
+    }
+
+    // Use compaction map to compact normal data
+    vectorField subNormals(normals(), normalMap);
+
+    List<extendedEdgeMesh::sideVolumeType> subNormalVolumeTypes;
+    if (normalVolumeTypes().size())
+    {
+        subNormalVolumeTypes =
+            UIndirectList<extendedEdgeMesh::sideVolumeType>
+            (
+                normalVolumeTypes(),
+                normalMap
+            );
+    }
+
+    extendedEdgeMesh subMesh
+    (
+        subPoints,
+        subEdges,
+
+        // Feature points slices
+        subConcaveStart,
+        subMixedStart,
+        subNonFeatStart,
+
+        // Feature edges slices
+        subIntStart,
+        subFlatStart,
+        subOpenStart,
+        subMultipleStart,
+
+        // All normals
+        subNormals,
+        subNormalVolumeTypes,
+
+        // Per edge edge vector
+        subEdgeDirections,
+
+        // Per edge list of normal indices
+        subNormalDirections,
+        // Per edge list of normal indices
+        subEdgeNormals,
+
+        // Per point list of normal indices
+        subPointNormals,
+        subFeaturePointEdges,
+        subRegionEdges
+    );
+
+    transfer(subMesh);
+}
+
+
+void Foam::extendedEdgeMesh::trim
+(
+    const searchableSurface& surf,
+    const volumeType volType,
+    labelList& pointMap,
+    labelList& edgeMap
+)
+{
+    // Cut edges with the other surfaces
+
+    labelList allPointMap;      // from all to original point
+    labelList allEdgeMap;       // from all to original edge
+
+    labelList pointsFromEdge;   // list of new points created by cutting
+    labelList oldEdge;          // for each of these points the orginal edge
+    labelList surfTri;          // for each of these points the surface triangle
+    cut
+    (
+        surf,
+        allPointMap,
+        allEdgeMap,
+        pointsFromEdge,
+        oldEdge,
+        surfTri
+    );
+
+    const label nOldPoints = points().size();
+
+    // Remove outside edges and compact
+
+    labelList subPointMap;  // sub to old points
+    labelList subEdgeMap;   // sub to old edges
+    select(surf, volType, subPointMap, subEdgeMap);
+
+    // Update overall point maps
+    pointMap = UIndirectList<label>(allPointMap, subPointMap);
+    edgeMap = UIndirectList<label>(allEdgeMap, subEdgeMap);
+
+    // Extract current point and edge status
+    List<edgeStatus> edgeStat(edges().size());
+    List<pointStatus> pointStat(points().size());
+    forAll(edgeStat, edgeI)
+    {
+        edgeStat[edgeI] = getEdgeStatus(edgeI);
+    }
+    forAll(pointStat, pointI)
+    {
+        pointStat[pointI] = getPointStatus(pointI);
+    }
+
+    // Re-classify exposed points (from cutting)
+    labelList oldPointToIndex(nOldPoints, -1);
+    forAll(pointsFromEdge, i)
+    {
+        oldPointToIndex[pointsFromEdge[i]] = i;
+    }
+    forAll(subPointMap, pointI)
+    {
+        label oldPointI = subPointMap[pointI];
+        label index = oldPointToIndex[oldPointI];
+        if (index != -1)
+        {
+            pointStat[pointI] = classifyFeaturePoint(pointI);
+        }
+    }
+
+    // Reset based on new point and edge status
+    labelList sortedToOriginalPoint;
+    labelList sortedToOriginalEdge;
+    setFromStatus
+    (
+        pointStat,
+        edgeStat,
+        sortedToOriginalPoint,
+        sortedToOriginalEdge
+    );
+
+    // Update the overall pointMap, edgeMap
+    pointMap = UIndirectList<label>(pointMap, sortedToOriginalPoint)();
+    edgeMap = UIndirectList<label>(edgeMap, sortedToOriginalEdge)();
+}
+
+
+void Foam::extendedEdgeMesh::setFromStatus
+(
+    const List<extendedEdgeMesh::pointStatus>& pointStat,
+    const List<extendedEdgeMesh::edgeStatus>& edgeStat,
+    labelList& sortedToOriginalPoint,
+    labelList& sortedToOriginalEdge
+)
+{
+    // Use pointStatus and edgeStatus to determine new ordering
+    label pointConcaveStart;
+    label pointMixedStart;
+    label pointNonFeatStart;
+
+    label edgeInternalStart;
+    label edgeFlatStart;
+    label edgeOpenStart;
+    label edgeMultipleStart;
+    sortedOrder
+    (
+        pointStat,
+        edgeStat,
+        sortedToOriginalPoint,
+        sortedToOriginalEdge,
+
+        pointConcaveStart,
+        pointMixedStart,
+        pointNonFeatStart,
+
+        edgeInternalStart,
+        edgeFlatStart,
+        edgeOpenStart,
+        edgeMultipleStart
+    );
+
+
+    // Order points and edges
+    labelList reversePointMap(points().size(), -1);
+    forAll(sortedToOriginalPoint, sortedI)
+    {
+        reversePointMap[sortedToOriginalPoint[sortedI]] = sortedI;
+    }
+
+    edgeList sortedEdges(UIndirectList<edge>(edges(), sortedToOriginalEdge)());
+    forAll(sortedEdges, sortedI)
+    {
+        inplaceRenumber(reversePointMap, sortedEdges[sortedI]);
+    }
+
+    // Update local data
+    autoMap
+    (
+        pointField(points(), sortedToOriginalPoint),
+        sortedEdges,
+        sortedToOriginalPoint,
+        sortedToOriginalEdge
+    );
+
+    // Reset the slice starts
+    concaveStart_ = pointConcaveStart;
+    mixedStart_ = pointMixedStart;
+    nonFeatureStart_ = pointNonFeatStart;
+    internalStart_ = edgeInternalStart;
+    flatStart_ = edgeFlatStart;
+    openStart_ = edgeOpenStart;
+    multipleStart_ = edgeMultipleStart;
+}
+
+
+bool Foam::extendedEdgeMesh::mergePointsAndSort
+(
+    const scalar mergeDist,
+    labelList& pointMap,
+    labelList& edgeMap
+)
+{
+    const label nOldPoints = points().size();
+
+    // Detect and merge collocated feature points
+    labelList oldToMerged;
+    label nNewPoints = ::Foam::mergePoints
+    (
+        points(),
+        SMALL,
+        false,
+        oldToMerged
+    );
+
+    pointMap.setSize(nNewPoints);
+    pointMap = -1;
+    forAll(oldToMerged, oldI)
+    {
+        label newI = oldToMerged[oldI];
+        if (pointMap[newI] == -1)
+        {
+            pointMap[newI] = oldI;
+        }
+    }
+
+    // Renumber edges
+    edgeList newEdges(edges().size());
+    forAll(edges(), edgeI)
+    {
+        const edge& oldE = edges()[edgeI];
+        newEdges[edgeI] = edge(oldToMerged[oldE[0]], oldToMerged[oldE[1]]);
+    }
+
+    // Shuffle basic information (reorders point data)
+    autoMap
+    (
+        pointField(points(), pointMap),
+        newEdges,
+        pointMap,
+        identity(newEdges.size())
+    );
+
+    // Re-classify the merged points
+    List<edgeStatus> edgeStat(edges().size());
+    forAll(edgeStat, edgeI)
+    {
+        edgeStat[edgeI] = getEdgeStatus(edgeI);
+    }
+
+    List<pointStatus> pointStat(points().size());
+    forAll(pointStat, pointI)
+    {
+        pointStat[pointI] = getPointStatus(pointI);
+    }
+
+    // Re-classify merged points
+    labelList nPoints(nNewPoints, 0);
+    forAll(oldToMerged, oldPointI)
+    {
+        nPoints[oldToMerged[oldPointI]]++;
+    }
+
+    forAll(nPoints, pointI)
+    {
+        if (nPoints[pointI] != 1)
+        {
+            pointStat[pointI] = classifyFeaturePoint(pointI);
+        }
+    }
+
+    labelList sortedToOriginalPoint;
+    setFromStatus
+    (
+        pointStat,
+        edgeStat,
+        sortedToOriginalPoint,
+        edgeMap             // point merging above did not affect edge order
+    );
+    pointMap = UIndirectList<label>(pointMap, sortedToOriginalPoint)();
+
+    return nNewPoints != nOldPoints;
+}
+
+
+void Foam::extendedEdgeMesh::writeObj(const fileName& prefix) const
 {
     Info<< nl << "Writing extendedEdgeMesh components to " << prefix
         << endl;
 
     edgeMesh::write(prefix + "_edgeMesh.obj");
 
-    OBJstream convexFtPtStr(prefix + "_convexFeaturePts.obj");
-    Info<< "Writing convex feature points to " << convexFtPtStr.name() << endl;
-
-    for(label i = 0; i < concaveStart_; i++)
     {
-        convexFtPtStr.write(points()[i]);
-    }
+        OBJstream convexFtPtStr(prefix + "_convexFeaturePts.obj");
+        Info<< "Writing " << concaveStart_
+            << " convex feature points to " << convexFtPtStr.name() << endl;
 
-    OBJstream concaveFtPtStr(prefix + "_concaveFeaturePts.obj");
-    Info<< "Writing concave feature points to "
-        << concaveFtPtStr.name() << endl;
-
-    for(label i = concaveStart_; i < mixedStart_; i++)
-    {
-        convexFtPtStr.write(points()[i]);
-    }
-
-    OBJstream mixedFtPtStr(prefix + "_mixedFeaturePts.obj");
-    Info<< "Writing mixed feature points to " << mixedFtPtStr.name() << endl;
-
-    for(label i = mixedStart_; i < nonFeatureStart_; i++)
-    {
-        mixedFtPtStr.write(points()[i]);
-    }
-
-    OBJstream mixedFtPtStructureStr(prefix + "_mixedFeaturePtsStructure.obj");
-    Info<< "Writing mixed feature point structure to "
-        << mixedFtPtStructureStr.name() << endl;
-
-    for(label i = mixedStart_; i < nonFeatureStart_; i++)
-    {
-        const labelList& ptEds = pointEdges()[i];
-
-        forAll(ptEds, j)
+        for(label i = 0; i < concaveStart_; i++)
         {
-            const edge& e = edges()[ptEds[j]];
-            mixedFtPtStructureStr.write
-            (
-                linePointRef(points()[e[0]],
-                points()[e[1]])
-            );
+            convexFtPtStr.write(points()[i]);
         }
     }
 
-    OBJstream externalStr(prefix + "_externalEdges.obj");
-    Info<< "Writing external edges to " << externalStr.name() << endl;
-
-    for (label i = externalStart_; i < internalStart_; i++)
     {
-        const edge& e = edges()[i];
-        externalStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        OBJstream concaveFtPtStr(prefix + "_concaveFeaturePts.obj");
+        Info<< "Writing " << mixedStart_-concaveStart_
+            << " concave feature points to "
+            << concaveFtPtStr.name() << endl;
+
+        for(label i = concaveStart_; i < mixedStart_; i++)
+        {
+            concaveFtPtStr.write(points()[i]);
+        }
     }
 
-    OBJstream internalStr(prefix + "_internalEdges.obj");
-    Info<< "Writing internal edges to " << internalStr.name() << endl;
-
-    for (label i = internalStart_; i < flatStart_; i++)
     {
-        const edge& e = edges()[i];
-        internalStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        OBJstream mixedFtPtStr(prefix + "_mixedFeaturePts.obj");
+        Info<< "Writing " << nonFeatureStart_-mixedStart_
+            << " mixed feature points to " << mixedFtPtStr.name() << endl;
+
+        for(label i = mixedStart_; i < nonFeatureStart_; i++)
+        {
+            mixedFtPtStr.write(points()[i]);
+        }
     }
 
-    OBJstream flatStr(prefix + "_flatEdges.obj");
-    Info<< "Writing flat edges to " << flatStr.name() << endl;
-
-    for (label i = flatStart_; i < openStart_; i++)
     {
-        const edge& e = edges()[i];
-        flatStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        OBJstream mixedFtPtStructureStr(prefix+"_mixedFeaturePtsStructure.obj");
+        Info<< "Writing "
+            << nonFeatureStart_-mixedStart_
+            << " mixed feature point structure to "
+            << mixedFtPtStructureStr.name() << endl;
+
+        for(label i = mixedStart_; i < nonFeatureStart_; i++)
+        {
+            const labelList& ptEds = pointEdges()[i];
+
+            forAll(ptEds, j)
+            {
+                const edge& e = edges()[ptEds[j]];
+                mixedFtPtStructureStr.write
+                (
+                    linePointRef(points()[e[0]],
+                    points()[e[1]])
+                );
+            }
+        }
     }
 
-    OBJstream openStr(prefix + "_openEdges.obj");
-    Info<< "Writing open edges to " << openStr.name() << endl;
-
-    for (label i = openStart_; i < multipleStart_; i++)
     {
-        const edge& e = edges()[i];
-        openStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        OBJstream externalStr(prefix + "_externalEdges.obj");
+        Info<< "Writing " << internalStart_-externalStart_
+            << " external edges to " << externalStr.name() << endl;
+
+        for (label i = externalStart_; i < internalStart_; i++)
+        {
+            const edge& e = edges()[i];
+            externalStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        }
     }
 
-    OBJstream multipleStr(prefix + "_multipleEdges.obj");
-    Info<< "Writing multiple edges to " << multipleStr.name() << endl;
-
-    for (label i = multipleStart_; i < edges().size(); i++)
     {
-        const edge& e = edges()[i];
-        multipleStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        OBJstream internalStr(prefix + "_internalEdges.obj");
+        Info<< "Writing " << flatStart_-internalStart_
+            << " internal edges to " << internalStr.name() << endl;
+
+        for (label i = internalStart_; i < flatStart_; i++)
+        {
+            const edge& e = edges()[i];
+            internalStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        }
     }
 
-    OBJstream regionStr(prefix + "_regionEdges.obj");
-    Info<< "Writing region edges to " << regionStr.name() << endl;
-
-    forAll(regionEdges_, i)
     {
-        const edge& e = edges()[regionEdges_[i]];
-        regionStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        OBJstream flatStr(prefix + "_flatEdges.obj");
+        Info<< "Writing " << openStart_-flatStart_
+            << " flat edges to " << flatStr.name() << endl;
+
+        for (label i = flatStart_; i < openStart_; i++)
+        {
+            const edge& e = edges()[i];
+            flatStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        }
     }
 
-    OBJstream edgeDirsStr(prefix + "_edgeDirections.obj");
-    Info<< "Writing edge directions to " << edgeDirsStr.name() << endl;
-
-    forAll(edgeDirections_, i)
     {
-        const vector& eVec = edgeDirections_[i];
-        const edge& e = edges()[i];
+        OBJstream openStr(prefix + "_openEdges.obj");
+        Info<< "Writing " << multipleStart_-openStart_
+            << " open edges to " << openStr.name() << endl;
 
-        edgeDirsStr.write
-        (
-            linePointRef(points()[e.start()], eVec + points()[e.start()])
-        );
+        for (label i = openStart_; i < multipleStart_; i++)
+        {
+            const edge& e = edges()[i];
+            openStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        }
+    }
+
+    {
+        OBJstream multipleStr(prefix + "_multipleEdges.obj");
+        Info<< "Writing " << edges().size()-multipleStart_
+            << " multiple edges to " << multipleStr.name() << endl;
+
+        for (label i = multipleStart_; i < edges().size(); i++)
+        {
+            const edge& e = edges()[i];
+            multipleStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        }
+    }
+
+    {
+        OBJstream regionStr(prefix + "_regionEdges.obj");
+        Info<< "Writing " << regionEdges_.size()
+            << " region edges to " << regionStr.name() << endl;
+
+        forAll(regionEdges_, i)
+        {
+            const edge& e = edges()[regionEdges_[i]];
+            regionStr.write(linePointRef(points()[e[0]], points()[e[1]]));
+        }
+    }
+
+    {
+        OBJstream edgeDirsStr(prefix + "_edgeDirections.obj");
+        Info<< "Writing " << edgeDirections_.size()
+            << " edge directions to " << edgeDirsStr.name() << endl;
+
+        forAll(edgeDirections_, i)
+        {
+            const vector& eVec = edgeDirections_[i];
+            const edge& e = edges()[i];
+
+            edgeDirsStr.write
+            (
+                linePointRef(points()[e.start()], eVec + points()[e.start()])
+            );
+        }
     }
 }
 
@@ -1506,6 +2163,231 @@ void Foam::extendedEdgeMesh::writeStats(Ostream& os) const
 }
 
 
+Foam::extendedEdgeMesh::edgeStatus
+Foam::extendedEdgeMesh::classifyEdge
+(
+    const List<vector>& norms,
+    const labelList& edNorms,
+    const vector& fC0tofC1
+)
+{
+    label nEdNorms = edNorms.size();
+
+    if (nEdNorms == 1)
+    {
+        return OPEN;
+    }
+    else if (nEdNorms == 2)
+    {
+        const vector& n0(norms[edNorms[0]]);
+        const vector& n1(norms[edNorms[1]]);
+
+        if ((n0 & n1) > cosNormalAngleTol_)
+        {
+            return FLAT;
+        }
+        else if ((fC0tofC1 & n0) > 0.0)
+        {
+            return INTERNAL;
+        }
+        else
+        {
+            return EXTERNAL;
+        }
+    }
+    else if (nEdNorms > 2)
+    {
+        return MULTIPLE;
+    }
+    else
+    {
+        // There is a problem - the edge has no normals
+        return NONE;
+    }
+}
+
+
+void Foam::extendedEdgeMesh::sortedOrder
+(
+    const List<extendedEdgeMesh::pointStatus>& pointStat,
+    const List<extendedEdgeMesh::edgeStatus>& edgeStat,
+    labelList& sortedToOriginalPoint,
+    labelList& sortedToOriginalEdge,
+
+    label& pointConcaveStart,
+    label& pointMixedStart,
+    label& pointNonFeatStart,
+
+    label& edgeInternalStart,
+    label& edgeFlatStart,
+    label& edgeOpenStart,
+    label& edgeMultipleStart
+)
+{
+    sortedToOriginalPoint.setSize(pointStat.size());
+    sortedToOriginalPoint = -1;
+
+    sortedToOriginalEdge.setSize(edgeStat.size());
+    sortedToOriginalEdge = -1;
+
+
+    // Order edges
+    // ~~~~~~~~~~~
+
+    label nConvex = 0;
+    label nConcave = 0;
+    label nMixed = 0;
+    label nNonFeat = 0;
+
+    forAll(pointStat, pointI)
+    {
+        switch (pointStat[pointI])
+        {
+            case extendedEdgeMesh::CONVEX:
+                nConvex++;
+            break;
+
+            case extendedEdgeMesh::CONCAVE:
+                nConcave++;
+            break;
+
+            case extendedEdgeMesh::MIXED:
+                nMixed++;
+            break;
+
+            case extendedEdgeMesh::NONFEATURE:
+                nNonFeat++;
+            break;
+
+            default:
+                FatalErrorInFunction
+                    << "Problem" << exit(FatalError);
+            break;
+        }
+    }
+
+    label convexStart = 0;
+    label concaveStart = nConvex;
+    label mixedStart = concaveStart+nConcave;
+    label nonFeatStart = mixedStart+nMixed;
+
+
+    // Copy to parameters
+    pointConcaveStart = concaveStart;
+    pointMixedStart = mixedStart;
+    pointNonFeatStart = nonFeatStart;
+
+    forAll(pointStat, pointI)
+    {
+        switch (pointStat[pointI])
+        {
+            case extendedEdgeMesh::CONVEX:
+                sortedToOriginalPoint[convexStart++] = pointI;
+            break;
+
+            case extendedEdgeMesh::CONCAVE:
+                sortedToOriginalPoint[concaveStart++] = pointI;
+            break;
+
+            case extendedEdgeMesh::MIXED:
+                sortedToOriginalPoint[mixedStart++] = pointI;
+            break;
+
+            case extendedEdgeMesh::NONFEATURE:
+                sortedToOriginalPoint[nonFeatStart++] = pointI;
+            break;
+        }
+    }
+
+
+    // Order edges
+    // ~~~~~~~~~~~
+
+    label nExternal = 0;
+    label nInternal = 0;
+    label nFlat = 0;
+    label nOpen = 0;
+    label nMultiple = 0;
+
+    forAll(edgeStat, edgeI)
+    {
+        switch (edgeStat[edgeI])
+        {
+            case extendedEdgeMesh::EXTERNAL:
+                nExternal++;
+            break;
+
+            case extendedEdgeMesh::INTERNAL:
+                nInternal++;
+            break;
+
+            case extendedEdgeMesh::FLAT:
+                nFlat++;
+            break;
+
+            case extendedEdgeMesh::OPEN:
+                nOpen++;
+            break;
+
+            case extendedEdgeMesh::MULTIPLE:
+                nMultiple++;
+            break;
+
+            case extendedEdgeMesh::NONE:
+            default:
+                FatalErrorInFunction
+                    << "Problem" << exit(FatalError);
+            break;
+        }
+    }
+
+    label externalStart = 0;
+    label internalStart = nExternal;
+    label flatStart = internalStart + nInternal;
+    label openStart = flatStart + nFlat;
+    label multipleStart = openStart + nOpen;
+
+
+    // Copy to parameters
+    edgeInternalStart = internalStart;
+    edgeFlatStart = flatStart;
+    edgeOpenStart = openStart;
+    edgeMultipleStart = multipleStart;
+
+    forAll(edgeStat, edgeI)
+    {
+        switch (edgeStat[edgeI])
+        {
+            case extendedEdgeMesh::EXTERNAL:
+                sortedToOriginalEdge[externalStart++] = edgeI;
+            break;
+
+            case extendedEdgeMesh::INTERNAL:
+                sortedToOriginalEdge[internalStart++] = edgeI;
+            break;
+
+            case extendedEdgeMesh::FLAT:
+                sortedToOriginalEdge[flatStart++] = edgeI;
+            break;
+
+            case extendedEdgeMesh::OPEN:
+                sortedToOriginalEdge[openStart++] = edgeI;
+            break;
+
+            case extendedEdgeMesh::MULTIPLE:
+                sortedToOriginalEdge[multipleStart++] = edgeI;
+            break;
+
+            case extendedEdgeMesh::NONE:
+            default:
+                FatalErrorInFunction
+                    << "Problem" << exit(FatalError);
+            break;
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 58e2ba8cab..1dfb921e48 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +68,7 @@ namespace Foam
 {
 
 class surfaceFeatures;
-class objectRegistry;
+class searchableSurface;
 
 // Forward declaration of friend functions and operators
 class extendedEdgeMesh;
@@ -138,7 +138,7 @@ protected:
         static label externalStart_;
 
 
-    // Private data
+    // Protected data
 
         //- Index of the start of the concave feature points
         label concaveStart_;
@@ -200,12 +200,33 @@ protected:
         mutable PtrList<indexedOctree<treeDataEdge> > edgeTreesByType_;
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
-        //- Classify the type of feature point.  Requires valid stored member
+        //- Classify the type of feature point. Requires valid stored member
         //  data for edges and normals.
         pointStatus classifyFeaturePoint(label ptI) const;
 
+        //- Cut edges with surface. Return map from cut points&edges back
+        //  to original
+        void cut
+        (
+            const searchableSurface&,
+            labelList& pMap,
+            labelList& eMap,
+            labelList& pointsFromEdge,  // new points created by cutting
+            labelList& oldEdge,         // the orginal edge
+            labelList& surfTri          // the surface triangle index
+        );
+
+        //- Remove outside/inside edges. volType denotes which side to keep
+        void select
+        (
+            const searchableSurface& surf,
+            const volumeType volType,
+            labelList& pMap,
+            labelList& eMap
+        );
+
         template<class Patch>
         void sortPointsAndEdges
         (
@@ -262,9 +283,8 @@ public:
             const Xfer<edgeList>&
         );
 
-        //- Construct given a surface with selected edges,point
-        //  (surfaceFeatures), an objectRegistry and a
-        //  fileName to write to.
+        //- Construct given a surface with selected edges,points
+        //  (surfaceFeatures)
         //  Extracts, classifies and reorders the data from surfaceFeatures.
         extendedEdgeMesh
         (
@@ -501,6 +521,43 @@ public:
             //  etc.
             void flipNormals();
 
+            //- Update with derived geometry
+            void autoMap
+            (
+                const pointField&,
+                const edgeList&,
+                const labelList& pointMap,
+                const labelList& edgeMap
+            );
+
+            //- Trim to surface. Keep volType side. Return map from current back
+            //  to original points (-1 for newly introduced points), edges
+            void trim
+            (
+                const searchableSurface& surf,
+                const volumeType volType,
+                labelList& pointMap,
+                labelList& edgeMap
+            );
+
+            //- Order according to point and edge status
+            void setFromStatus
+            (
+                const List<extendedEdgeMesh::pointStatus>& pointStat,
+                const List<extendedEdgeMesh::edgeStatus>& edgeStat,
+                labelList& sortedToOriginalPoint,
+                labelList& sortedToOriginalEdge
+            );
+
+            //- Geometric merge points. Returns true if any points merged.
+            //  Return maps from new back to original points/edges.
+            bool mergePointsAndSort
+            (
+                const scalar mergeDist,
+                labelList& pointMap,
+                labelList& edgeMap
+            );
+
 
         // Read
 
@@ -532,6 +589,24 @@ public:
             const vector& fC0tofC1
         );
 
+        //- Determine the ordering
+        static void sortedOrder
+        (
+            const List<extendedEdgeMesh::pointStatus>& pointStat,
+            const List<extendedEdgeMesh::edgeStatus>& edgeStat,
+            labelList& sortedToOriginalPoint,
+            labelList& sortedToOriginalEdge,
+
+            label& pointConcaveStart,
+            label& pointMixedStart,
+            label& pointNonFeatStart,
+
+            label& edgeInternalStart,
+            label& edgeFlatStart,
+            label& edgeOpenStart,
+            label& edgeMultipleStart
+        );
+
 
         // Ostream Operator
 
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
index a8ee72c434..a046a1221d 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,8 +75,7 @@ bool Foam::fileFormats::extendedEdgeMeshFormat::read
 
     if (!io.headerOk())
     {
-        FatalErrorIn
-        ("fileFormats::extendedEdgeMeshFormat::read(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
index 8506fae9e9..55d2911346 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ inline Foam::vector Foam::extendedEdgeMesh::edgeDirection
     }
     else
     {
-        FatalErrorIn("Foam::extendedEdgeMesh::edgeDirection")
+        FatalErrorInFunction
             << "Requested ptI " << ptI << " is not a point on the requested "
             << "edgeI " << edgeI << ". edgeI start and end: "
             << e.start() << " " << e.end()
@@ -185,7 +185,7 @@ inline Foam::vectorField Foam::extendedEdgeMesh::featurePointNormals
 {
     if (!featurePoint(ptI))
     {
-        WarningIn("vectorField extendedEdgeMesh::featurePointNormals")
+        WarningInFunction
             << "Requesting the normals of a non-feature point. "
             << "Returned zero length vectorField."
             << endl;
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
index 5fa8572b6b..ad0c52966e 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,11 +47,8 @@ Foam::autoPtr<Foam::extendedEdgeMesh> Foam::extendedEdgeMesh::New
 
     if (cstrIter == fileExtensionConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "extendedEdgeMesh::New(const fileName&, const word&) : "
-            "constructing extendedEdgeMesh"
-        )   << "Unknown file extension " << ext
+        FatalErrorInFunction
+            << "Unknown file extension " << ext
             << " for file " << name << nl << nl
             << "Valid extensions are :" << nl
             << fileExtensionConstructorTablePtr_->sortedToc()
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index cdb19b441d..ffa8317fa7 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -242,15 +242,8 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
         }
         else if (eStat == NONE)
         {
-            FatalErrorIn
-            (
-                ":extendedEdgeMesh::sortPointsAndEdges"
-                "("
-                "    const Patch&,"
-                "    const labelList& featureEdges,"
-                "    const labelList& feaurePoints"
-                ")"
-            )   << nl << "classifyEdge returned NONE on edge "
+            FatalErrorInFunction
+                << nl << "classifyEdge returned NONE on edge "
                 << eds[i]
                 << ". There is a problem with definition of this edge."
                 << nl << abort(FatalError);
@@ -326,15 +319,8 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
         }
         else if (ptStatus == NONFEATURE)
         {
-            FatalErrorIn
-            (
-                ":extendedEdgeMesh::sortPointsAndEdges"
-                "("
-                "    const Patch&,"
-                "    const labelList& featureEdges,"
-                "    const labelList& feaurePoints"
-                ")"
-            )   << nl << "classifyFeaturePoint returned NONFEATURE on point at "
+            FatalErrorInFunction
+                << nl << "classifyFeaturePoint returned NONFEATURE on point at "
                 << points()[i]
                 << ". There is a problem with definition of this feature point."
                 << nl << abort(FatalError);
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index 126b9dcdf8..1ef5765dd3 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,11 +49,8 @@ Foam::extendedFeatureEdgeMesh::extendedFeatureEdgeMesh(const IOobject& io)
     {
         if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
         {
-            WarningIn
-            (
-                "extendedFeatureEdgeMesh::extendedFeatureEdgeMesh"
-                "(const IOobject&)"
-            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            WarningInFunction
+                << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
                 << " does not support automatic rereading."
                 << endl;
         }
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
index 9259b06cb5..103d6c78cd 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ inline Foam::vector Foam::extendedFeatureEdgeMesh::edgeDirection
     }
     else
     {
-        FatalErrorIn("Foam::extendedFeatureEdgeMesh::edgeDirection")
+        FatalErrorInFunction
             << "Requested ptI " << ptI << " is not a point on the requested "
             << "edgeI " << edgeI << ". edgeI start and end: "
             << e.start() << " " << e.end()
@@ -182,7 +182,7 @@ inline Foam::vectorField Foam::extendedFeatureEdgeMesh::featurePointNormals
 {
     if (!featurePoint(ptI))
     {
-        WarningIn("vectorField extendedFeatureEdgeMesh::featurePointNormals")
+        WarningInFunction
             << "Requesting the normals of a non-feature point. "
             << "Returned zero length vectorField."
             << endl;
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index 01b02a650a..9a33bcc96a 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -242,15 +242,8 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
         }
         else if (eStat == NONE)
         {
-            FatalErrorIn
-            (
-                ":extendedFeatureEdgeMesh::sortPointsAndEdges"
-                "("
-                "    const Patch&,"
-                "    const labelList& featureEdges,"
-                "    const labelList& feaurePoints"
-                ")"
-            )   << nl << "classifyEdge returned NONE on edge "
+            FatalErrorInFunction
+                << nl << "classifyEdge returned NONE on edge "
                 << eds[i]
                 << ". There is a problem with definition of this edge."
                 << nl << abort(FatalError);
@@ -326,15 +319,8 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
         }
         else if (ptStatus == NONFEATURE)
         {
-            FatalErrorIn
-            (
-                ":extendedFeatureEdgeMesh::sortPointsAndEdges"
-                "("
-                "    const Patch&,"
-                "    const labelList& featureEdges,"
-                "    const labelList& feaurePoints"
-                ")"
-            )   << nl << "classifyFeaturePoint returned NONFEATURE on point at "
+            FatalErrorInFunction
+                << nl << "classifyFeaturePoint returned NONFEATURE on point at "
                 << points()[i]
                 << ". There is a problem with definition of this feature point."
                 << nl << abort(FatalError);
diff --git a/src/engine/engineMesh/engineMesh/engineMesh.C b/src/engine/engineMesh/engineMesh/engineMesh.C
index d3a80edeea..c1554f127f 100644
--- a/src/engine/engineMesh/engineMesh/engineMesh.C
+++ b/src/engine/engineMesh/engineMesh/engineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,21 +76,21 @@ Foam::engineMesh::engineMesh(const IOobject& io)
 
     if (!foundPiston)
     {
-        FatalErrorIn("engineMesh::engineMesh(const IOobject& io)")
+        FatalErrorInFunction
             << "cannot find piston patch"
             << exit(FatalError);
     }
 
     if (!foundLiner)
     {
-        FatalErrorIn("engineMesh::engineMesh(const IOobject& io)")
+        FatalErrorInFunction
             << "cannot find liner patch"
             << exit(FatalError);
     }
 
     if (!foundCylinderHead)
     {
-        FatalErrorIn("engineMesh::engineMesh(const IOobject& io)")
+        FatalErrorInFunction
             << "cannot find cylinderHead patch"
             << exit(FatalError);
     }
diff --git a/src/engine/engineMesh/engineMesh/engineMeshNew.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C
index 1d0d48b9af..afbd421829 100644
--- a/src/engine/engineMesh/engineMesh/engineMeshNew.C
+++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,10 +58,8 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
 
     if (cstrIter == IOobjectConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "engineMesh::New(const IOobject&)"
-        )   << "Unknown engineMesh type "
+        FatalErrorInFunction
+            << "Unknown engineMesh type "
             << modelType << nl << nl
             << "Valid engineMesh types are :" << endl
             << IOobjectConstructorTablePtr_->sortedToc()
diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files
index 37f3bc0098..642d53dbad 100644
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@@ -8,6 +8,7 @@ setWriters = sampledSetWriters
 
 $(setWriters)/writers.C
 $(setWriters)/ensight/ensightSetWriterRunTime.C
+$(setWriters)/ensight/ensightPTraits.C
 $(setWriters)/gnuplot/gnuplotSetWriterRunTime.C
 $(setWriters)/jplot/jplotSetWriterRunTime.C
 $(setWriters)/raw/rawSetWriterRunTime.C
diff --git a/src/fileFormats/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C
index d8b37c5fdd..c65ae246b1 100644
--- a/src/fileFormats/coordSet/coordSet.C
+++ b/src/fileFormats/coordSet/coordSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,10 +115,8 @@ Foam::scalar Foam::coordSet::scalarCoord
     }
     else
     {
-        FatalErrorIn
-        (
-            "coordSet::scalarCoord(const label)"
-        )   << "Illegal axis specification " << axis_
+        FatalErrorInFunction
+            << "Illegal axis specification " << axis_
             << " for sampling line " << name_
             << exit(FatalError);
 
diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
index c1ed54b1cd..44762d043c 100644
--- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ void Foam::csvSetWriter<Type>::write
 
     if (valueSets.size() != valueSetNames.size())
     {
-        FatalErrorIn("csvSetWriter<Type>::write(..)")
+        FatalErrorInFunction
             << "Number of variables:" << valueSetNames.size() << endl
             << "Number of valueSets:" << valueSets.size()
             << exit(FatalError);
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightPTraits.C b/src/fileFormats/sampledSetWriters/ensight/ensightPTraits.C
similarity index 72%
rename from src/sampling/sampledSurface/writers/ensight/ensightPTraits.C
rename to src/fileFormats/sampledSetWriters/ensight/ensightPTraits.C
index 1511e636b3..bf29a96820 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightPTraits.C
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightPTraits.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,20 +27,57 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+template<>
 const char* const Foam::ensightPTraits<Foam::scalar>::typeName =
     Foam::pTraits<Foam::scalar>::typeName;
 
+template<>
+const Foam::direction
+Foam::ensightPTraits<Foam::scalar>::componentOrder[] = {0};
+
+template<>
 const char* const Foam::ensightPTraits<Foam::vector>::typeName =
     Foam::pTraits<Foam::vector>::typeName;
 
+template<>
+const Foam::direction
+Foam::ensightPTraits<Foam::vector>::componentOrder[] = {0, 1, 2};
+
+template<>
 const char* const Foam::ensightPTraits<Foam::sphericalTensor>::typeName =
     Foam::pTraits<Foam::scalar>::typeName;
 
+template<>
+const Foam::direction
+Foam::ensightPTraits<Foam::sphericalTensor>::componentOrder[] = {0};
+
+template<>
 const char* const Foam::ensightPTraits<Foam::symmTensor>::typeName =
     "tensor symm";
 
+
+template<>
+const Foam::direction
+Foam::ensightPTraits<Foam::symmTensor>::componentOrder[] = {0, 3, 5, 1, 2, 4};
+
+template<>
 const char* const Foam::ensightPTraits<Foam::tensor>::typeName =
     "tensor asym";
 
+template<>
+const Foam::direction
+Foam::ensightPTraits<Foam::tensor>::componentOrder[] =
+{
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8
+};
+
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightPTraits.H b/src/fileFormats/sampledSetWriters/ensight/ensightPTraits.H
similarity index 68%
rename from src/sampling/sampledSurface/writers/ensight/ensightPTraits.H
rename to src/fileFormats/sampledSetWriters/ensight/ensightPTraits.H
index 70e26756dc..99ed97bde1 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightPTraits.H
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightPTraits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ Description
 
 #include "pTraits.H"
 #include "fieldTypes.H"
+#include "direction.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,48 +54,41 @@ public:
 
         static const char* const typeName;
 
-};
-
-
-template<>
-class ensightPTraits<scalar>
-{
-public:
-
-    static const char* const typeName;
+        //- Ordering table: return OpenFOAM component given Ensight component
+        //  This is used for the symmTensor ordering: Ensight requires
+        //  xx yy zz xy xz yz
+        static const direction componentOrder[];
 };
 
 template<>
-class ensightPTraits<vector>
-{
-public:
-
-    static const char* const typeName;
-};
+const char* const ensightPTraits<scalar>::typeName;
 
 template<>
-class ensightPTraits<sphericalTensor>
-{
-public:
-
-    static const char* const typeName;
-};
+const direction ensightPTraits<scalar>::componentOrder[];
 
 template<>
-class ensightPTraits<symmTensor>
-{
-public:
-
-    static const char* const typeName;
-};
+const char* const ensightPTraits<vector>::typeName;
 
 template<>
-class ensightPTraits<tensor>
-{
-public:
+const direction ensightPTraits<vector>::componentOrder[];
 
-    static const char* const typeName;
-};
+template<>
+const char* const ensightPTraits<sphericalTensor>::typeName;
+
+template<>
+const direction ensightPTraits<sphericalTensor>::componentOrder[];
+
+template<>
+const char* const ensightPTraits<symmTensor>::typeName;
+
+template<>
+const direction ensightPTraits<symmTensor>::componentOrder[];
+
+template<>
+const char* const ensightPTraits<tensor>::typeName;
+
+template<>
+const direction ensightPTraits<tensor>::componentOrder[];
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
index 4b874e201d..b5571b4b81 100644
--- a/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "IOmanip.H"
 #include "foamVersion.H"
+#include "ensightPTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -57,7 +58,7 @@ Foam::fileName Foam::ensightSetWriter<Type>::getFileName
     return
         this->getBaseName(points, valueSetNames)
       //+ '_'
-      //+ pTraits<Type>::typeName
+      //+ ensightPTraits<Type>::typeName
       + ".case";
 }
 
@@ -88,7 +89,7 @@ void Foam::ensightSetWriter<Type>::write
         fileName dataFile(base + ".***." + valueSetNames[setI]);
 
         os.setf(ios_base::left);
-        os  << pTraits<Type>::typeName
+        os  << ensightPTraits<Type>::typeName
             << " per node:            1       "
             << setw(15) << valueSetNames[setI]
             << " " << dataFile.name().c_str()
@@ -151,12 +152,15 @@ void Foam::ensightSetWriter<Type>::write
         os.setf(ios_base::scientific, ios_base::floatfield);
         os.precision(5);
         {
-            os  << pTraits<Type>::typeName << nl
+            os  << ensightPTraits<Type>::typeName << nl
                 << "part" << nl
                 << setw(10) << 1 << nl
                 << "coordinates" << nl;
-            for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
+
+            for (direction i=0; i < pTraits<Type>::nComponents; ++i)
             {
+                label cmpt = ensightPTraits<Type>::componentOrder[i];
+
                 const scalarField fld(valueSets[setI]->component(cmpt));
                 forAll(fld, i)
                 {
@@ -202,7 +206,7 @@ void Foam::ensightSetWriter<Type>::write
         fileName dataFile(base + ".***." + valueSetNames[setI]);
 
         os.setf(ios_base::left);
-        os  << pTraits<Type>::typeName
+        os  << ensightPTraits<Type>::typeName
             << " per node:            1       "
             << setw(15) << valueSetNames[setI]
             << " " << dataFile.name().c_str()
@@ -277,7 +281,7 @@ void Foam::ensightSetWriter<Type>::write
         os.setf(ios_base::scientific, ios_base::floatfield);
         os.precision(5);
         {
-            os  << pTraits<Type>::typeName << nl;
+            os  << ensightPTraits<Type>::typeName << nl;
 
             const List<Field<Type> >& fieldVals = valueSets[setI];
             forAll(fieldVals, trackI)
@@ -286,13 +290,10 @@ void Foam::ensightSetWriter<Type>::write
                     << setw(10) << trackI+1 << nl
                     << "coordinates" << nl;
 
-                for
-                (
-                    direction cmpt = 0;
-                    cmpt < pTraits<Type>::nComponents;
-                    cmpt++
-                )
+                for (direction i=0; i < pTraits<Type>::nComponents; ++i)
                 {
+                    label cmpt = ensightPTraits<Type>::componentOrder[i];
+
                     const scalarField fld(fieldVals[trackI].component(cmpt));
                     forAll(fld, i)
                     {
diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
index 2679e1e702..5f2d2b66bb 100644
--- a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ void Foam::gnuplotSetWriter<Type>::write
 {
     if (valueSets.size() != valueSetNames.size())
     {
-        FatalErrorIn("gnuplotSetWriter<Type>::write(..)")
+        FatalErrorInFunction
             << "Number of variables:" << valueSetNames.size() << endl
             << "Number of valueSets:" << valueSets.size()
             << exit(FatalError);
diff --git a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
index 5b09456642..613b7f6b5e 100644
--- a/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,17 +96,7 @@ public:
             Ostream&
         ) const
         {
-            notImplemented
-            (
-                "jplotSetWriter<Type>::write\n"
-                "(\n"
-                "    const bool,\n"
-                "    const PtrList<coordSet>&,\n"
-                "    const wordList&,\n"
-                "    const List<List<Field<Type> > >&,\n"
-                "    Ostream&\n"
-                ") const"
-            );
+            NotImplemented;
         }
 };
 
diff --git a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
index 403b9e7111..bd1b5e5525 100644
--- a/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ void Foam::rawSetWriter<Type>::write
 {
     if (valueSets.size() != valueSetNames.size())
     {
-        FatalErrorIn("rawSetWriter<Type>::write(..)")
+        FatalErrorInFunction
             << "Number of variables:" << valueSetNames.size() << endl
             << "Number of valueSets:" << valueSets.size()
             << exit(FatalError);
diff --git a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
index 3ab2736175..d3208e968d 100644
--- a/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ void Foam::vtkSetWriter<Type>::write
 {
     if (valueSets.size() != valueSetNames.size())
     {
-        FatalErrorIn("vtkSetWriter<Type>::write(..)")
+        FatalErrorInFunction
             << "Number of variables:" << valueSetNames.size() << endl
             << "Number of valueSets:" << valueSets.size()
             << exit(FatalError);
diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C
index e031615ff6..6ccf51c743 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,8 @@ Foam::autoPtr< Foam::writer<Type> > Foam::writer<Type>::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "writer::New(const word&)"
-        )   << "Unknown write type "
+        FatalErrorInFunction
+            << "Unknown write type "
             << writeType << nl << nl
             << "Valid write types : " << endl
             << wordConstructorTablePtr_->sortedToc()
diff --git a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
index 3825868196..15f2e0eaf8 100644
--- a/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ void Foam::xmgraceSetWriter<Type>::write
 {
     if (valueSets.size() != valueSetNames.size())
     {
-        FatalErrorIn("gnuplotSetWriter<Type>::write(..)")
+        FatalErrorInFunction
             << "Number of variables:" << valueSetNames.size() << endl
             << "Number of valueSets:" << valueSets.size()
             << exit(FatalError);
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index 07afd63d10..5e1ef1fb08 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,11 +45,7 @@ bool Foam::fileFormats::STARCDCore::readHeader
 {
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STARCDCore::readHeader(...)"
-        )
-            << "cannot read " << signature  << "  " << is.name()
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
@@ -105,10 +101,7 @@ bool Foam::fileFormats::STARCDCore::readPoints
 {
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STARCDedgeFormat::readPoints(...)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << is.name()
             << exit(FatalError);
     }
diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 8259ed1924..8460f61487 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ void Foam::vtkUnstructuredReader::warnUnhandledType
 {
     if (warningGiven.insert(type))
     {
-        IOWarningIn("vtkUnstructuredReader::warnUnhandledType(..)", inFile)
+        IOWarningInFunction(inFile)
             << "Skipping unknown cell type " << type << endl;
     }
 }
@@ -143,9 +143,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 1)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 1 for VTK_VERTEX but found "
                         << nRead << exit(FatalIOError);
@@ -168,9 +167,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 2)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 2 for VTK_LINE but found "
                         << nRead << exit(FatalIOError);
@@ -205,9 +203,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 3)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 3 for VTK_TRIANGLE but found "
                         << nRead << exit(FatalIOError);
@@ -226,9 +223,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 4)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 4 for VTK_QUAD but found "
                         << nRead << exit(FatalIOError);
@@ -258,9 +254,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 4)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 4 for VTK_TETRA but found "
                         << nRead << exit(FatalIOError);
@@ -279,9 +274,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 5)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 5 for VTK_PYRAMID but found "
                         << nRead << exit(FatalIOError);
@@ -301,9 +295,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 6)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 6 for VTK_WEDGE but found "
                         << nRead << exit(FatalIOError);
@@ -324,9 +317,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 8)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "vtkUnstructuredReader::extractCells(..)",
                         inFile
                     )   << "Expected size 8 for VTK_HEXAHEDRON but found "
                         << nRead << exit(FatalIOError);
@@ -453,7 +445,7 @@ void Foam::vtkUnstructuredReader::readField
 
         default:
         {
-            IOWarningIn("vtkUnstructuredReader::extractCells(..)", inFile)
+            IOWarningInFunction(inFile)
                 << "Unhandled type " << vtkDataTypeNames[dataType] << endl
                 << "Skipping " << size
                 << " words." << endl;
@@ -501,7 +493,7 @@ Foam::wordList Foam::vtkUnstructuredReader::readFieldArray
 
         if (wantedSize != -1 && numTuples != wantedSize)
         {
-            FatalIOErrorIn("vtkUnstructuredReader::readFieldArray(..)", inFile)
+            FatalIOErrorInFunction(inFile)
                 << "Expected " << wantedSize << " tuples but only have "
                 << numTuples << exit(FatalIOError);
         }
@@ -576,7 +568,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
 
     if (dataType_ == "BINARY")
     {
-        FatalIOErrorIn("vtkUnstructuredReader::read(ISstream&)", inFile)
+        FatalIOErrorInFunction(inFile)
             << "Binary reading not supported " << exit(FatalIOError);
     }
 
@@ -625,7 +617,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
             word primitiveTag(inFile);
             if (primitiveTag != "float" && primitiveTag != "double")
             {
-                FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
+                FatalIOErrorInFunction(inFile)
                     << "Expected 'float' entry but found "
                     << primitiveTag
                     << exit(FatalIOError);
@@ -654,7 +646,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
 
             if (cellTypes.size() > 0 && cellVerts.size() == 0)
             {
-                FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
+                FatalIOErrorInFunction(inFile)
                     << "Found " << cellTypes.size()
                     << " cellTypes but no cells."
                     << exit(FatalIOError);
@@ -730,7 +722,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
             label nPoints(readLabel(inFile));
             if (nPoints != wantedSize)
             {
-                FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
+                FatalIOErrorInFunction(inFile)
                     << "Reading POINT_DATA : expected " << wantedSize
                     << " but read " << nPoints << exit(FatalIOError);
             }
@@ -743,7 +735,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
             label nCells(readLabel(inFile));
             if (nCells != wantedSize)
             {
-                FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
+                FatalIOErrorInFunction(inFile)
                     << "Reading CELL_DATA : expected "
                     << wantedSize
                     << " but read " << nCells << exit(FatalIOError);
@@ -773,7 +765,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
             word lookupTableTag(inFile);
             if (lookupTableTag != "LOOKUP_TABLE")
             {
-                FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
+                FatalIOErrorInFunction(inFile)
                     << "Expected tag LOOKUP_TABLE but read "
                     << lookupTableTag
                     << exit(FatalIOError);
@@ -920,7 +912,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
         }
         else
         {
-            FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
+            FatalIOErrorInFunction(inFile)
                 << "Unsupported tag "
                 << tag << exit(FatalIOError);
         }
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 1b9c242765..e4ff95aee9 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -2,7 +2,6 @@ fvMesh/fvMeshGeometry.C
 fvMesh/fvMesh.C
 
 fvMesh/singleCellFvMesh/singleCellFvMesh.C
-fvMesh/fvMeshSubset/fvMeshSubset.C
 
 fvBoundaryMesh = fvMesh/fvBoundaryMesh
 $(fvBoundaryMesh)/fvBoundaryMesh.C
@@ -134,7 +133,6 @@ $(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
 $(derivedFvPatchFields)/codedFixedValue/codedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/codedMixed/codedMixedFvPatchFields.C
 $(derivedFvPatchFields)/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
-$(derivedFvPatchFields)/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
 $(derivedFvPatchFields)/fan/fanFvPatchFields.C
 $(derivedFvPatchFields)/fanPressure/fanPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -169,6 +167,7 @@ $(derivedFvPatchFields)/pressureInletOutletVelocity/pressureInletOutletVelocityF
 $(derivedFvPatchFields)/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+$(derivedFvPatchFields)/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -200,6 +199,7 @@ $(derivedFvPatchFields)/waveSurfacePressure/waveSurfacePressureFvPatchScalarFiel
 $(derivedFvPatchFields)/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/prghPressure/prghPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/prghTotalPressure/prghTotalPressureFvPatchScalarField.C
+$(derivedFvPatchFields)/fixedProfile/fixedProfileFvPatchFields.C
 
 fvsPatchFields = fields/fvsPatchFields
 $(fvsPatchFields)/fvsPatchField/fvsPatchFields.C
@@ -424,4 +424,10 @@ $(SRF)/SRFModel/rpm/rpm.C
 $(SRF)/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
 $(SRF)/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
 
+fvOptions = $(general)/fvOptions
+$(fvOptions)/fvOption.C
+$(fvOptions)/fvOptionIO.C
+$(fvOptions)/fvOptionList.C
+$(fvOptions)/fvOptions.C
+
 LIB = $(FOAM_LIBBIN)/libfiniteVolume
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 916345b077..42c6e04834 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -289,16 +289,7 @@ Foam::MRFZone::MRFZone
 
         if (!cellZoneFound)
         {
-            FatalErrorIn
-            (
-                "MRFZone"
-                "("
-                    "const word&, "
-                    "const fvMesh&, "
-                    "const dictionary&, "
-                    "const word&"
-                ")"
-            )
+            FatalErrorInFunction
                 << "cannot find MRF cellZone " << cellZoneName_
                 << exit(FatalError);
         }
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index d6a41fcf9d..dfe213c390 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -164,7 +164,7 @@ public:
         //- Return clone
         autoPtr<MRFZone> clone() const
         {
-            notImplemented("autoPtr<MRFZone> clone() const");
+            NotImplemented;
             return autoPtr<MRFZone>(NULL);
         }
 
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
index 68002a02ea..afcf8cef51 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,10 +57,8 @@ Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "SRFModel::New(const fvMesh&)"
-        )   << "Unknown SRFModel type "
+        FatalErrorInFunction
+            << "Unknown SRFModel type "
             << modelType << nl << nl
             << "Valid SRFModel types are :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.H b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.H
index 75bef5835d..ba70362f49 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::SRFVelocityFvPatchVectorField
+    Foam::SRFFreestreamVelocityFvPatchVectorField
 
 Description
     Freestream velocity condition to be used in conjunction with the single
@@ -32,17 +32,17 @@ Description
     applies the appropriate rotation transformation in time and space to
     determine the local velocity using:
 
-        \f[
-            U_p = cos(\theta)*U_{Inf} + sin(theta) (n^UInf) - U_{p,srf}
-        \f]
+    \f[
+        U_p = cos(\theta) U_{Inf} + sin(\theta) (n \times U_{Inf}) - U_{p,srf}
+    \f]
 
     where
     \vartable
-        U_p     = patch velocity [m/s]
-        U_{Inf} = free stream velocity in the absolute frame [m/s]
-        theta   = swept angle [rad]
-        n       = axis direction of the SRF
-        U_{p,srf} = SRF velocity of the patch
+        U_p     | patch velocity [m/s]
+        U_{Inf} | free stream velocity in the absolute frame [m/s]
+        \theta  | swept angle [rad]
+        n       | axis direction of the SRF
+        U_{p,srf} | SRF velocity of the patch [m/s]
     \endvartable
 
 
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.H b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.H
index 33b0314cef..61a5119ba9 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.H
@@ -52,9 +52,9 @@ Description
 
     where
     \vartable
-        U_p     = patch velocity [m/s]
-        U_{in}  = user-specified inlet velocity
-        U_{p,srf} = SRF velocity
+        U_p     | patch velocity [m/s]
+        U_{in}  | user-specified inlet velocity
+        U_{p,srf} | SRF velocity
     \endvartable
 
 
diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
index 9a175a4294..6f0742b26e 100644
--- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
+++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
@@ -103,15 +103,8 @@ bool Foam::adjustPhi
         }
         else if (mag(fixedMassOut - massIn)/totalFlux > 1e-8)
         {
-            FatalErrorIn
-            (
-                "adjustPhi"
-                "("
-                    "surfaceScalarField&, "
-                    "const volVectorField&,"
-                    "volScalarField&"
-                ")"
-            )   << "Continuity error cannot be removed by adjusting the"
+            FatalErrorInFunction
+                << "Continuity error cannot be removed by adjusting the"
                    " outflow.\nPlease check the velocity boundary conditions"
                    " and/or run potentialFoam to initialise the outflow." << nl
                 << "Total flux              : " << totalFlux << nl
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index 46dcf8411d..0d24e83a7b 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -52,16 +52,8 @@ void Foam::setRefCell
 
                 if (refCelli < 0 || refCelli >= field.mesh().nCells())
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "void Foam::setRefCell\n"
-                        "    (\n"
-                        "        const volScalarField&,\n"
-                        "        const volScalarField&,\n"
-                        "        const dictionary&,\n"
-                        "        label& scalar&,\n"
-                        "        bool\n"
-                        ")",
                         dict
                     )   << "Illegal master cellID " << refCelli
                         << ". Should be 0.." << field.mesh().nCells()
@@ -95,16 +87,8 @@ void Foam::setRefCell
 
             if (sumHasRef != 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "void Foam::setRefCell\n"
-                    "    (\n"
-                    "        const volScalarField&,\n"
-                    "        const volScalarField&,\n"
-                    "        const dictionary&,\n"
-                    "        label& scalar&,\n"
-                    "        bool\n"
-                    "    )",
                     dict
                 )   << "Unable to set reference cell for field " << field.name()
                     << nl << "    Reference point " << refPointName
@@ -115,16 +99,8 @@ void Foam::setRefCell
         }
         else
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "void Foam::setRefCell\n"
-                "    (\n"
-                "        const volScalarField&,\n"
-                "        const volScalarField&,\n"
-                "        const dictionary&,\n"
-                "        label& scalar&,\n"
-                "        bool\n"
-                "    )",
                 dict
             )   << "Unable to set reference cell for field " << field.name()
                 << nl
diff --git a/src/fvOptions/fvOption/fvOption.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C
similarity index 96%
rename from src/fvOptions/fvOption/fvOption.C
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOption.C
index ff944d4fe5..967ee01cea 100644
--- a/src/fvOptions/fvOption/fvOption.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C
@@ -80,10 +80,8 @@ Foam::autoPtr<Foam::fv::option> Foam::fv::option::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "option::New(const word&, const dictionary&, const fvMesh&)"
-        )   << "Unknown Model type " << modelType << nl << nl
+        FatalErrorInFunction
+            << "Unknown Model type " << modelType << nl << nl
             << "Valid model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
@@ -117,7 +115,7 @@ void Foam::fv::option::checkApplied() const
     {
         if (!applied_[i])
         {
-            WarningIn("void option::checkApplied() const")
+            WarningInFunction
                 << "Source " << name_ << " defined for field "
                 << fieldNames_[i] << " but never used" << endl;
         }
diff --git a/src/fvOptions/fvOption/fvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
similarity index 99%
rename from src/fvOptions/fvOption/fvOption.H
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
index 364b0e1953..8362aee7a0 100644
--- a/src/fvOptions/fvOption/fvOption.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.H
@@ -131,7 +131,7 @@ public:
         //- Return clone
         autoPtr<option> clone() const
         {
-            notImplemented("autoPtr<option> clone() const");
+            NotImplemented;
             return autoPtr<option>(NULL);
         }
 
diff --git a/src/fvOptions/fvOption/fvOptionI.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionI.H
similarity index 100%
rename from src/fvOptions/fvOption/fvOptionI.H
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptionI.H
diff --git a/src/fvOptions/fvOption/fvOptionIO.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C
similarity index 100%
rename from src/fvOptions/fvOption/fvOptionIO.C
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptionIO.C
diff --git a/src/fvOptions/fvOption/fvOptionList.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.C
similarity index 100%
rename from src/fvOptions/fvOption/fvOptionList.C
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.C
diff --git a/src/fvOptions/fvOption/fvOptionList.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
similarity index 86%
rename from src/fvOptions/fvOption/fvOptionList.H
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
index f6e36d9a41..c881fb01b8 100644
--- a/src/fvOptions/fvOption/fvOptionList.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionList.H
@@ -38,6 +38,7 @@ SourceFile
 #include "fvOption.H"
 #include "PtrList.H"
 #include "GeometricField.H"
+#include "geometricOneField.H"
 #include "fvPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -173,6 +174,33 @@ public:
                 const word& fieldName
             );
 
+            //- Return source for equation
+            template<class Type>
+            tmp<fvMatrix<Type> > operator()
+            (
+                const volScalarField& alpha,
+                const geometricOneField& rho,
+                GeometricField<Type, fvPatchField, volMesh>& field
+            );
+
+            //- Return source for equation
+            template<class Type>
+            tmp<fvMatrix<Type> > operator()
+            (
+                const geometricOneField& alpha,
+                const volScalarField& rho,
+                GeometricField<Type, fvPatchField, volMesh>& field
+            );
+
+            //- Return source for equation
+            template<class Type>
+            tmp<fvMatrix<Type> > operator()
+            (
+                const geometricOneField& alpha,
+                const geometricOneField& rho,
+                GeometricField<Type, fvPatchField, volMesh>& field
+            );
+
 
         // Constraints
 
diff --git a/src/fvOptions/fvOption/fvOptionListTemplates.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
similarity index 84%
rename from src/fvOptions/fvOption/fvOptionListTemplates.C
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
index 21805dd9ff..58e362df07 100644
--- a/src/fvOptions/fvOption/fvOptionListTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptionListTemplates.C
@@ -191,6 +191,57 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
 }
 
 
+template<class Type>
+Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+(
+    const geometricOneField& alpha,
+    const geometricOneField& rho,
+    GeometricField<Type, fvPatchField, volMesh>& field
+)
+{
+    return this->operator()(field, field.name());
+}
+
+
+template<class Type>
+Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+(
+    const volScalarField& alpha,
+    const geometricOneField& rho,
+    GeometricField<Type, fvPatchField, volMesh>& field
+)
+{
+    volScalarField one
+    (
+        IOobject
+        (
+            "one",
+            this->mesh_.time().timeName(),
+            this->mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        this->mesh_,
+        dimensionedScalar("one", dimless, 1.0)
+    );
+
+    return this->operator()(alpha, one, field, field.name());
+}
+
+
+template<class Type>
+Foam::tmp<Foam::fvMatrix<Type> > Foam::fv::optionList::operator()
+(
+    const geometricOneField& alpha,
+    const volScalarField& rho,
+    GeometricField<Type, fvPatchField, volMesh>& field
+)
+{
+    return this->operator()(rho, field, field.name());
+}
+
+
 template<class Type>
 void Foam::fv::optionList::constrain(fvMatrix<Type>& eqn)
 {
diff --git a/src/fvOptions/fvOption/fvIOoptionList.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C
similarity index 74%
rename from src/fvOptions/fvOption/fvIOoptionList.C
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C
index b26f40649c..b9fe6d1493 100644
--- a/src/fvOptions/fvOption/fvIOoptionList.C
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C
@@ -23,20 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "fvIOoptionList.H"
+#include "fvOptions.H"
 #include "fvMesh.H"
 #include "Time.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace fv
+    {
+        defineTypeNameAndDebug(options, 0);
+    }
+}
+
+
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-Foam::IOobject Foam::fv::IOoptionList::createIOobject
+Foam::IOobject Foam::fv::options::createIOobject
 (
     const fvMesh& mesh
 ) const
 {
     IOobject io
     (
-        "fvOptions",
+        typeName,
         mesh.time().constant(),
         mesh,
         IOobject::MUST_READ,
@@ -79,7 +90,7 @@ Foam::IOobject Foam::fv::IOoptionList::createIOobject
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::fv::IOoptionList::IOoptionList
+Foam::fv::options::options
 (
     const fvMesh& mesh
 )
@@ -89,9 +100,34 @@ Foam::fv::IOoptionList::IOoptionList
 {}
 
 
-bool Foam::fv::IOoptionList::read()
+Foam::fv::options& Foam::fv::options::New(const fvMesh& mesh)
 {
-    if (regIOobject::read())
+    if (mesh.thisDb().foundObject<options>(typeName))
+    {
+        return const_cast<options&>
+        (
+            mesh.lookupObject<options>(typeName)
+        );
+    }
+    else
+    {
+        if (debug)
+        {
+            InfoInFunction
+                << "Constructing " << typeName
+                << " for region " << mesh.name() << endl;
+        }
+
+        options* objectPtr = new options(mesh);
+        regIOobject::store(objectPtr);
+        return *objectPtr;
+    }
+}
+
+
+bool Foam::fv::options::read()
+{
+    if (IOdictionary::regIOobject::read())
     {
         optionList::read(*this);
         return true;
diff --git a/src/fvOptions/fvOption/fvIOoptionList.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H
similarity index 81%
rename from src/fvOptions/fvOption/fvIOoptionList.H
rename to src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H
index 135c3367fa..3d4ffefe35 100644
--- a/src/fvOptions/fvOption/fvIOoptionList.H
+++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H
@@ -22,18 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::fv::IOoptionList
+    Foam::fv::options
 
 Description
-    IOoptionList
+    Finite-volume options
 
 SourceFiles
-    IOoptionList.C
+    options.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOoptionList_H
-#define IOoptionList_H
+#ifndef options_H
+#define options_H
 
 #include "fvOptionList.H"
 #include "IOdictionary.H"
@@ -47,38 +47,44 @@ namespace fv
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class IOoptionList Declaration
+                        Class options Declaration
 \*---------------------------------------------------------------------------*/
 
-class IOoptionList
+class options
 :
     public IOdictionary,
     public optionList
 {
-private:
-
     // Private Member Functions
 
         //- Create IO object if dictionary is present
         IOobject createIOobject(const fvMesh& mesh) const;
 
         //- Disallow default bitwise copy construct
-        IOoptionList(const IOoptionList&);
+        options(const options&);
 
         //- Disallow default bitwise assignment
-        void operator=(const IOoptionList&);
+        void operator=(const options&);
 
 
 public:
 
+    // Declare name of the class and its debug switch
+    ClassName("fvOptions");
+
+
     // Constructors
 
         //- Construct from components with list of field names
-        IOoptionList(const fvMesh& mesh);
+        options(const fvMesh& mesh);
+
+        //- Construct fvOptions and register to datbase if not present
+        //  otherwise lookup and return
+        static options& New(const fvMesh& mesh);
 
 
     //- Destructor
-    virtual ~IOoptionList()
+    virtual ~options()
     {}
 
 
diff --git a/src/fvOptions/fvOption/makeFvOption.H b/src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
similarity index 100%
rename from src/fvOptions/fvOption/makeFvOption.H
rename to src/finiteVolume/cfdTools/general/fvOptions/makeFvOption.H
diff --git a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
index f50dc6f890..475cb4c194 100644
--- a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
+++ b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
@@ -1,6 +1,6 @@
 if (!isA<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
 {
-    FatalErrorIn("wall-function evaluation")
+    FatalErrorInFunction
         << k_.boundaryField()[patchi].type()
         << " is the wrong k patchField type for wall-functions on patch "
         << curPatch.name() << nl
@@ -10,7 +10,7 @@ if (!isA<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
 
 if (!isA<zeroGradientFvPatchScalarField>(epsilon_.boundaryField()[patchi]))
 {
-    FatalErrorIn("wall-function evaluation")
+    FatalErrorInFunction
         << epsilon_.boundaryField()[patchi].type()
         << " is the wrong epsilon patchField type for wall-functions on patch "
         << curPatch.name() << nl
diff --git a/src/finiteVolume/cfdTools/general/include/createFvOptions.H b/src/finiteVolume/cfdTools/general/include/createFvOptions.H
new file mode 100644
index 0000000000..aa02a3604d
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/include/createFvOptions.H
@@ -0,0 +1 @@
+fv::options& fvOptions(fv::options::New(mesh));
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index 54df8c5bad..20ac7a29b1 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,8 +52,8 @@ Foam::porosityModels::DarcyForchheimer::DarcyForchheimer
 )
 :
     porosityModel(name, modelType, mesh, dict, cellZoneName),
-    dXYZ_(coeffs_.lookup("d")),
-    fXYZ_(coeffs_.lookup("f")),
+    dXYZ_("d", dimless/sqr(dimLength), coeffs_),
+    fXYZ_("f", dimless/dimLength, coeffs_),
     D_(cellZoneIDs_.size()),
     F_(cellZoneIDs_.size()),
     rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
@@ -63,7 +63,7 @@ Foam::porosityModels::DarcyForchheimer::DarcyForchheimer
     adjustNegativeResistance(dXYZ_);
     adjustNegativeResistance(fXYZ_);
 
-    calcTranformModelData();
+    calcTransformModelData();
 }
 
 
@@ -75,7 +75,7 @@ Foam::porosityModels::DarcyForchheimer::~DarcyForchheimer()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porosityModels::DarcyForchheimer::calcTranformModelData()
+void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
 {
     if (coordSys_.R().uniform())
     {
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
index 119cb9df68..4f1751e1b8 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,8 +70,6 @@ class DarcyForchheimer
 :
     public porosityModel
 {
-private:
-
     // Private data
 
         //- Darcy coeffient XYZ components (user-supplied) [1/m2]
@@ -149,7 +147,7 @@ public:
     // Member Functions
 
         //- Transform the model data wrt mesh changes
-        virtual void calcTranformModelData();
+        virtual void calcTransformModelData();
 
         //- Calculate the porosity force
         virtual void calcForce
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
index c858fc287f..eeb4bb3e9c 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,15 +111,15 @@ Foam::porosityModels::fixedCoeff::fixedCoeff
 )
 :
     porosityModel(name, modelType, mesh, dict, cellZoneName),
-    alphaXYZ_(coeffs_.lookup("alpha")),
-    betaXYZ_(coeffs_.lookup("beta")),
+    alphaXYZ_("alpha", dimless/dimTime, coeffs_),
+    betaXYZ_("beta", dimless/dimLength, coeffs_),
     alpha_(cellZoneIDs_.size()),
     beta_(cellZoneIDs_.size())
 {
     adjustNegativeResistance(alphaXYZ_);
     adjustNegativeResistance(betaXYZ_);
 
-    calcTranformModelData();
+    calcTransformModelData();
 }
 
 
@@ -131,7 +131,7 @@ Foam::porosityModels::fixedCoeff::~fixedCoeff()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porosityModels::fixedCoeff::calcTranformModelData()
+void Foam::porosityModels::fixedCoeff::calcTransformModelData()
 {
     if (coordSys_.R().uniform())
     {
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
index 7bb52032d7..4ccfa87da5 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
@@ -60,8 +60,6 @@ class fixedCoeff
 :
     public porosityModel
 {
-private:
-
     // Private data
 
         //- Alpha coefficient XYZ components (user-supplied) [1/s]
@@ -126,7 +124,7 @@ public:
     // Member Functions
 
         //- Transform the model data wrt mesh changes
-        virtual void calcTranformModelData();
+        virtual void calcTransformModelData();
 
         //- Calculate the porosity force
         virtual void calcForce
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 613248b05f..8dd817f293 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,13 +43,8 @@ void Foam::porosityModel::adjustNegativeResistance(dimensionedVector& resist)
 
     if (maxCmpt < 0)
     {
-        FatalErrorIn
-        (
-            "void Foam::porosityModel::adjustNegativeResistance"
-            "("
-                "dimensionedVector&"
-            ")"
-        )   << "Negative resistances are invalid, resistance = " << resist
+        FatalErrorInFunction
+            << "Negative resistances are invalid, resistance = " << resist
             << exit(FatalError);
     }
     else
@@ -123,17 +118,8 @@ Foam::porosityModel::porosityModel
 
     if (!foundZone && Pstream::master())
     {
-        FatalErrorIn
-        (
-            "Foam::porosityModel::porosityModel"
-            "("
-                "const word&, "
-                "const word&, "
-                "const fvMesh&, "
-                "const dictionary&"
-                "const word&, "
-            ")"
-        )   << "cannot find porous cellZone " << zoneName_
+        FatalErrorInFunction
+            << "cannot find porous cellZone " << zoneName_
             << exit(FatalError);
     }
 }
@@ -151,7 +137,7 @@ void Foam::porosityModel::transformModelData()
 {
     if (!mesh_.upToDatePoints(*this))
     {
-        calcTranformModelData();
+        calcTransformModelData();
 
         // set model up-to-date wrt points
         mesh_.setUpToDatePoints(*this);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
index 3a76645d99..c3f5b838dd 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
@@ -57,8 +57,6 @@ class porosityModel
 :
     public regIOobject
 {
-private:
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -101,7 +99,7 @@ protected:
 
 
         //- Transform the model data wrt mesh changes
-        virtual void calcTranformModelData() = 0;
+        virtual void calcTransformModelData() = 0;
 
         //- Adjust negative resistance values to be multiplier of max value
         void adjustNegativeResistance(dimensionedVector& resist);
@@ -268,6 +266,7 @@ public:
         virtual bool read(const dictionary& dict);
 };
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
index d0fe203537..592ff1f961 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,16 +45,7 @@ Foam::autoPtr<Foam::porosityModel> Foam::porosityModel::New
 
     if (cstrIter == meshConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "porosityModel::New"
-            "("
-                "const word&, "
-                "const fvMesh&, "
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Unknown " << typeName << " type " << modelType << nl << nl
             << "Valid " << typeName << " types are:" << nl
             << meshConstructorTablePtr_->sortedToc()
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
index 8a8361db8e..e49e2a410a 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::porosityModels::powerLaw::~powerLaw()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porosityModels::powerLaw::calcTranformModelData()
+void Foam::porosityModels::powerLaw::calcTransformModelData()
 {
     // nothing to be transformed
 }
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
index 7233693378..f17a639e09 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
@@ -64,8 +64,6 @@ class powerLaw
 :
     public porosityModel
 {
-private:
-
     // Private data
 
         //- C0 coefficient
@@ -128,7 +126,7 @@ public:
     // Member Functions
 
         //- Transform the model data wrt mesh changes
-        virtual void calcTranformModelData();
+        virtual void calcTransformModelData();
 
         //- Calculate the porosity force
         virtual void calcForce
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
index 25b9d3568b..7fa666071c 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
@@ -70,15 +70,15 @@ bool Foam::pimpleControl::criteriaSatisfied()
         const label fieldI = applyToField(variableName);
         if (fieldI != -1)
         {
-            const List<solverPerformance> sp(iter().stream());
-            const scalar residual = sp.last().initialResidual();
+            scalar residual = 0;
+            const scalar firstResidual =
+                maxResidual(variableName, iter().stream(), residual);
 
             checked = true;
 
             if (storeIni)
             {
-                residualControl_[fieldI].initialResidual =
-                    sp.first().initialResidual();
+                residualControl_[fieldI].initialResidual = firstResidual;
             }
 
             const bool absCheck = residual < residualControl_[fieldI].absTol;
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
index 27557eac3c..5544497e50 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,8 +59,9 @@ bool Foam::simpleControl::criteriaSatisfied()
         const label fieldI = applyToField(variableName);
         if (fieldI != -1)
         {
-            const List<solverPerformance> sp(iter().stream());
-            const scalar residual = sp.first().initialResidual();
+            scalar lastResidual = 0;
+            const scalar residual =
+                maxResidual(variableName, iter().stream(), lastResidual);
 
             checked = true;
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index 1d028e8c4d..da151d335b 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -81,7 +81,7 @@ void Foam::solutionControl::read(const bool absTolOnly)
                 }
                 else
                 {
-                    FatalErrorIn("bool Foam::solutionControl::read()")
+                    FatalErrorInFunction
                         << "Residual data for " << iter().keyword()
                         << " must be specified as a dictionary"
                         << exit(FatalError);
@@ -107,7 +107,7 @@ void Foam::solutionControl::read(const bool absTolOnly)
                 }
                 else
                 {
-                    FatalErrorIn("bool Foam::solutionControl::read()")
+                    FatalErrorInFunction
                         << "Residual data for " << iter().keyword()
                         << " must be specified as a dictionary"
                         << exit(FatalError);
@@ -172,6 +172,45 @@ void Foam::solutionControl::storePrevIterFields() const
 }
 
 
+template<class Type>
+void Foam::solutionControl::maxTypeResidual
+(
+    const word& fieldName,
+    ITstream& data,
+    scalar& firstRes,
+    scalar& lastRes
+) const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (mesh_.foundObject<fieldType>(fieldName))
+    {
+        const List<SolverPerformance<Type> > sp(data);
+        firstRes = cmptMax(sp.first().initialResidual());
+        lastRes = cmptMax(sp.last().initialResidual());
+    }
+}
+
+
+Foam::scalar Foam::solutionControl::maxResidual
+(
+    const word& fieldName,
+    ITstream& data,
+    scalar& lastRes
+) const
+{
+    scalar firstRes = 0;
+
+    maxTypeResidual<scalar>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<vector>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<sphericalTensor>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<symmTensor>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<tensor>(fieldName, data, firstRes, lastRes);
+
+    return firstRes;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::solutionControl::solutionControl(fvMesh& mesh, const word& algorithmName)
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
index 3517f7121f..c9c7b87633 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
@@ -122,6 +122,25 @@ protected:
         template<class Type>
         void storePrevIter() const;
 
+        template<class Type>
+        void maxTypeResidual
+        (
+            const word& fieldName,
+            ITstream& data,
+            scalar& firstRes,
+            scalar& lastRes
+        ) const;
+
+        scalar maxResidual
+        (
+            const word& fieldName,
+            ITstream& data,
+            scalar& lastRes
+        ) const;
+
+
+private:
+
         //- Disallow default bitwise copy construct
         solutionControl(const solutionControl&);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
index 9f25a143e2..401e456881 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,12 +147,8 @@ Foam::calculatedFvPatchField<Type>::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    FatalErrorIn
-    (
-        "calculatedFvPatchField<Type>::"
-        "valueInternalCoeffs(const tmp<scalarField>&) const"
-    )   << "\n    "
-           "valueInternalCoeffs cannot be called for a calculatedFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a calculatedFvPatchField"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
         << " in file " << this->dimensionedInternalField().objectPath()
@@ -171,12 +167,8 @@ Foam::calculatedFvPatchField<Type>::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    FatalErrorIn
-    (
-        "calculatedFvPatchField<Type>::"
-        "valueBoundaryCoeffs(const tmp<scalarField>&) const"
-    )   << "\n    "
-           "valueBoundaryCoeffs cannot be called for a calculatedFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a calculatedFvPatchField"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
         << " in file " << this->dimensionedInternalField().objectPath()
@@ -192,13 +184,8 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::calculatedFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    FatalErrorIn
-    (
-        "calculatedFvPatchField<Type>::"
-        "gradientInternalCoeffs() const"
-    )   << "\n    "
-           "gradientInternalCoeffs cannot be called for a "
-           "calculatedFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a calculatedFvPatchField"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
         << " in file " << this->dimensionedInternalField().objectPath()
@@ -214,13 +201,8 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::calculatedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    FatalErrorIn
-    (
-        "calculatedFvPatchField<Type>::"
-        "gradientBoundaryCoeffs() const"
-    )   << "\n    "
-           "gradientBoundaryCoeffs cannot be called for a "
-           "calculatedFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a calculatedFvPatchField"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
         << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 1a0aacd030..38b1e11a10 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,7 +181,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::coupledFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    notImplemented("coupledFvPatchField<Type>::gradientInternalCoeffs()");
+    NotImplemented;
     return -Type(pTraits<Type>::one)*this->patch().deltaCoeffs();
 }
 
@@ -201,7 +201,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::coupledFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    notImplemented("coupledFvPatchField<Type>::gradientBoundaryCoeffs()");
+    NotImplemented;
     return -this->gradientInternalCoeffs();
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 4a443c6f11..546e2ee5f8 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,10 +147,7 @@ public:
             //- Return patch-normal gradient
             virtual tmp<Field<Type> > snGrad() const
             {
-                notImplemented
-                (
-                    type() + "::coupledFvPatchField<Type>::snGrad()"
-                );
+                NotImplemented;
                 return *this;
             }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
index 49bfa59614..200dabf29a 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,16 +58,8 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
 {
     if (notNull(iF) && mapper.hasUnmapped())
     {
-        WarningIn
-        (
-            "directionMixedFvPatchField<Type>::directionMixedFvPatchField\n"
-            "(\n"
-            "    const directionMixedFvPatchField<Type>&,\n"
-            "    const fvPatch&,\n"
-            "    const DimensionedField<Type, volMesh>&,\n"
-            "    const fvPatchFieldMapper&\n"
-            ")\n"
-        )   << "On field " << iF.name() << " patch " << p.name()
+        WarningInFunction
+            << "On field " << iF.name() << " patch " << p.name()
             << " patchField " << this->type()
             << " : mapper does not map all values." << nl
             << "    To avoid this warning fully specify the mapping in derived"
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index 33974a547d..112ddb42f4 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,16 +59,8 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
 {
     if (notNull(iF) && mapper.hasUnmapped())
     {
-        WarningIn
-        (
-            "fixedGradientFvPatchField<Type>::fixedGradientFvPatchField\n"
-            "(\n"
-            "    const fixedGradientFvPatchField<Type>&,\n"
-            "    const fvPatch&,\n"
-            "    const DimensionedField<Type, volMesh>&,\n"
-            "    const fvPatchFieldMapper&\n"
-            ")\n"
-        )   << "On field " << iF.name() << " patch " << p.name()
+        WarningInFunction
+            << "On field " << iF.name() << " patch " << p.name()
             << " patchField " << this->type()
             << " : mapper does not map all values." << nl
             << "    To avoid this warning fully specify the mapping in derived"
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index 951cdda5ad..6ab4ce6e13 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,16 +68,8 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
 {
     if (notNull(iF) && mapper.hasUnmapped())
     {
-        WarningIn
-        (
-            "fixedValueFvPatchField<Type>::fixedValueFvPatchField\n"
-            "(\n"
-            "    const fixedValueFvPatchField<Type>&,\n"
-            "    const fvPatch&,\n"
-            "    const DimensionedField<Type, volMesh>&,\n"
-            "    const fvPatchFieldMapper&\n"
-            ")\n"
-        )   << "On field " << iF.name() << " patch " << p.name()
+        WarningInFunction
+            << "On field " << iF.name() << " patch " << p.name()
             << " patchField " << this->type()
             << " : mapper does not map all values." << nl
             << "    To avoid this warning fully specify the mapping in derived"
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 68c82a4939..23eef7e24b 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,16 +62,8 @@ mixedFvPatchField<Type>::mixedFvPatchField
 {
     if (notNull(iF) && mapper.hasUnmapped())
     {
-        WarningIn
-        (
-            "mixedFvPatchField<Type>::mixedFvPatchField\n"
-            "(\n"
-            "    const mixedFvPatchField<Type>&,\n"
-            "    const fvPatch&,\n"
-            "    const DimensionedField<Type, volMesh>&,\n"
-            "    const fvPatchFieldMapper&\n"
-            ")\n"
-        )   << "On field " << iF.name() << " patch " << p.name()
+        WarningInFunction
+            << "On field " << iF.name() << " patch " << p.name()
             << " patchField " << this->type()
             << " : mapper does not map all values." << nl
             << "    To avoid this warning fully specify the mapping in derived"
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index ffb59873df..9e581c6e90 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,12 +69,7 @@ slicedFvPatchField<Type>::slicedFvPatchField
 :
     fvPatchField<Type>(ptf, p, iF, mapper)
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "slicedFvPatchField(const slicedFvPatchField<Type>&, "
-        "const fvPatch&, const Field<Type>&, const fvPatchFieldMapper&)"
-    );
+    NotImplemented;
 }
 
 
@@ -88,11 +83,7 @@ slicedFvPatchField<Type>::slicedFvPatchField
 :
     fvPatchField<Type>(p, iF, dict)
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "slicedFvPatchField(const Field<Type>&, const dictionary&)"
-    );
+    NotImplemented;
 }
 
 
@@ -164,11 +155,7 @@ slicedFvPatchField<Type>::~slicedFvPatchField<Type>()
 template<class Type>
 tmp<Field<Type> > slicedFvPatchField<Type>::snGrad() const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "snGrad()"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -177,22 +164,14 @@ tmp<Field<Type> > slicedFvPatchField<Type>::snGrad() const
 template<class Type>
 void slicedFvPatchField<Type>::updateCoeffs()
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "updateCoeffs()"
-    );
+    NotImplemented;
 }
 
 
 template<class Type>
 tmp<Field<Type> > slicedFvPatchField<Type>::patchInternalField() const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "patchInternalField()"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -201,11 +180,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchInternalField() const
 template<class Type>
 void slicedFvPatchField<Type>::patchInternalField(Field<Type>&) const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "patchInternalField(Field<Type>&)"
-    );
+    NotImplemented;
 }
 
 
@@ -215,11 +190,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField
     const Field<Type>& iField
 ) const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "patchNeighbourField(const DimensionedField<Type, volMesh>& iField)"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -228,11 +199,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField
 template<class Type>
 tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField() const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "patchNeighbourField()"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -244,11 +211,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "valueInternalCoeffs(const tmp<scalarField>&)"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -260,11 +223,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "valueBoundaryCoeffs(const tmp<scalarField>&)"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -273,11 +232,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueBoundaryCoeffs
 template<class Type>
 tmp<Field<Type> > slicedFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "gradientInternalCoeffs()"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
@@ -286,11 +241,7 @@ tmp<Field<Type> > slicedFvPatchField<Type>::gradientInternalCoeffs() const
 template<class Type>
 tmp<Field<Type> > slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    notImplemented
-    (
-        "slicedFvPatchField<Type>::"
-        "gradientBoundaryCoeffs()"
-    );
+    NotImplemented;
 
     return Field<Type>::null();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 0e23db6c3c..9090ec02bb 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,16 +59,7 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
 {
     if (!isA<cyclicFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicFvPatchField<Type>::cyclicFvPatchField"
-            "("
-                "const cyclicFvPatchField<Type>& ,"
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const fvPatchFieldMapper&"
-            ")"
-        )   << "    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -91,14 +82,8 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
 {
     if (!isA<cyclicFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicFvPatchField<Type>::cyclicFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const Field<Type>&, "
-                "const dictionary&"
-            ")",
             dict
         )   << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index 9cdbff68e2..33db8bfe64 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,16 +56,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
 {
     if (!isA<cyclicACMIFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField"
-            "("
-                "const cyclicACMIFvPatchField<Type>& ,"
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const fvPatchFieldMapper&"
-            ")"
-        )   << "    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -89,14 +80,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
 {
     if (!isA<cyclicACMIFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const dictionary&"
-            ")",
             dict
         )   << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 3fe24cfad8..b4d804c978 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,16 +53,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
 {
     if (!isA<cyclicAMIFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField"
-            "("
-                "const cyclicAMIFvPatchField<Type>& ,"
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const fvPatchFieldMapper&"
-            ")"
-        )   << "    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -86,14 +77,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
 {
     if (!isA<cyclicAMIFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const dictionary&"
-            ")",
             dict
         )   << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
index 0f93df198b..49357e3bf7 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,15 +26,10 @@ License
 #include "emptyFvPatchField.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-emptyFvPatchField<Type>::emptyFvPatchField
+Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -45,7 +40,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
 
 
 template<class Type>
-emptyFvPatchField<Type>::emptyFvPatchField
+Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
     const emptyFvPatchField<Type>&,
     const fvPatch& p,
@@ -57,16 +52,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
 {
     if (!isType<emptyFvPatch>(p))
     {
-        FatalErrorIn
-        (
-            "emptyFvPatchField<Type>::emptyFvPatchField\n"
-            "(\n"
-            "    const emptyFvPatchField<Type>&,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -77,7 +63,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
 
 
 template<class Type>
-emptyFvPatchField<Type>::emptyFvPatchField
+Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -88,14 +74,8 @@ emptyFvPatchField<Type>::emptyFvPatchField
 {
     if (!isType<emptyFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "emptyFvPatchField<Type>::emptyFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
@@ -108,7 +88,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
 
 
 template<class Type>
-emptyFvPatchField<Type>::emptyFvPatchField
+Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
     const emptyFvPatchField<Type>& ptf
 )
@@ -123,7 +103,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
 
 
 template<class Type>
-emptyFvPatchField<Type>::emptyFvPatchField
+Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
     const emptyFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -136,28 +116,11 @@ emptyFvPatchField<Type>::emptyFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void emptyFvPatchField<Type>::updateCoeffs()
+void Foam::emptyFvPatchField<Type>::updateCoeffs()
 {
-    //- Check moved to checkMesh. Test here breaks down if multiple empty
-    //  patches.
-    //if
-    //(
-    //    this->patch().patch().size()
-    //  % this->dimensionedInternalField().mesh().nCells()
-    //)
-    //{
-    //    FatalErrorIn("emptyFvPatchField<Type>::updateCoeffs()")
-    //        << "This mesh contains patches of type empty but is not"
-    //        << "1D or 2D\n"
-    //           "    by virtue of the fact that the number of faces of this\n"
-    //           "    empty patch is not divisible by the number of cells."
-    //        << exit(FatalError);
-    //}
+    // Check moved to checkMesh.
+    // Test here fails if multiple empty patches.
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index 6313dab9c1..d8564fae53 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,17 +138,7 @@ void Foam::jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
     const Pstream::commsTypes
 ) const
 {
-    notImplemented
-    (
-        "void Foam::jumpCyclicFvPatchField<Type>::updateInterfaceMatrix"
-        "("
-            "scalarField&, "
-            "const scalarField&, "
-            "const scalarField&, "
-            "const direction, "
-            "const Pstream::commsTypes"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
index 7e13ba75f4..38e6dcf08b 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,17 +140,7 @@ void Foam::jumpCyclicAMIFvPatchField<Type>::updateInterfaceMatrix
     const Pstream::commsTypes
 ) const
 {
-    notImplemented
-    (
-        "void Foam::jumpCyclicAMIFvPatchField<Type>::updateInterfaceMatrix"
-        "("
-            "scalarField&, "
-            "const scalarField&, "
-            "const scalarField& coeffs,"
-            "const direction, "
-            "const Pstream::commsTypes"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 8d81c408f0..287bebfb33 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,16 +88,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 {
     if (!isA<processorFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "processorFvPatchField<Type>::processorFvPatchField\n"
-            "(\n"
-            "    const processorFvPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -106,7 +97,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
     }
     if (debug && !ptf.ready())
     {
-        FatalErrorIn("processorFvPatchField<Type>::processorFvPatchField(..)")
+        FatalErrorInFunction
             << "On patch " << procPatch_.name() << " outstanding request."
             << abort(FatalError);
     }
@@ -132,14 +123,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 {
     if (!isA<processorFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "processorFvPatchField<Type>::processorFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
@@ -169,7 +154,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 {
     if (debug && !ptf.ready())
     {
-        FatalErrorIn("processorFvPatchField<Type>::processorFvPatchField(..)")
+        FatalErrorInFunction
             << "On patch " << procPatch_.name() << " outstanding request."
             << abort(FatalError);
     }
@@ -194,7 +179,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 {
     if (debug && !ptf.ready())
     {
-        FatalErrorIn("processorFvPatchField<Type>::processorFvPatchField(..)")
+        FatalErrorInFunction
             << "On patch " << procPatch_.name() << " outstanding request."
             << abort(FatalError);
     }
@@ -216,7 +201,7 @@ Foam::processorFvPatchField<Type>::patchNeighbourField() const
 {
     if (debug && !this->ready())
     {
-        FatalErrorIn("processorFvPatchField<Type>::patchNeighbourField()")
+        FatalErrorInFunction
             << "On patch " << procPatch_.name()
             << " outstanding request."
             << abort(FatalError);
@@ -333,10 +318,8 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
         // Fast path.
         if (debug && !this->ready())
         {
-            FatalErrorIn
-            (
-                "processorFvPatchField<Type>::initInterfaceMatrixUpdate(..)"
-            )   << "On patch " << procPatch_.name()
+            FatalErrorInFunction
+                << "On patch " << procPatch_.name()
                 << " outstanding request."
                 << abort(FatalError);
         }
@@ -454,10 +437,8 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
         // Fast path.
         if (debug && !this->ready())
         {
-            FatalErrorIn
-            (
-                "processorFvPatchField<Type>::initInterfaceMatrixUpdate(..)"
-            )   << "On patch " << procPatch_.name()
+            FatalErrorInFunction
+                << "On patch " << procPatch_.name()
                 << " outstanding request."
                 << abort(FatalError);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
index 1164f3146d..40ba0865fc 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,10 +49,8 @@ void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
         // Fast path.
         if (debug && !this->ready())
         {
-            FatalErrorIn
-            (
-                "processorFvPatchField<scalar>::initInterfaceMatrixUpdate(..)"
-            )   << "On patch " << procPatch_.name()
+            FatalErrorInFunction
+                << "On patch " << procPatch_.name()
                 << " outstanding request."
                 << abort(FatalError);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 3a0f7fd1b4..59483e6ee9 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,16 +72,7 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
 {
     if (!isType<processorCyclicFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
-            "(\n"
-            "    const processorCyclicFvPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -105,14 +96,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
 {
     if (!isType<processorCyclicFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
@@ -124,15 +109,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
 
     if (Pstream::defaultCommsType == Pstream::scheduled)
     {
-        WarningIn
-        (
-            "processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "Scheduled communication with split cyclics not supported."
+        WarningInFunction
+            << "Scheduled communication with split cyclics not supported."
             << endl;
     }
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
index 870795327b..c6a2dc126a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,16 +56,7 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
 {
     if (!isType<symmetryFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "symmetryFvPatchField<Type>::symmetryFvPatchField\n"
-            "(\n"
-            "    const symmetryFvPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -87,14 +78,8 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
 {
     if (!isType<symmetryFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "symmetryFvPatchField<Type>::symmetryFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
index 053a56689b..7ab5a129d7 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,16 +54,7 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 {
     if (!isType<symmetryPlaneFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField\n"
-            "(\n"
-            "    const symmetryPlaneFvPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -86,14 +77,8 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 {
     if (!isType<symmetryPlaneFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
index 73955b7c2b..03f382fa21 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,16 +56,7 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 {
     if (!isType<wedgeFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "wedgeFvPatchField<Type>::wedgeFvPatchField\n"
-            "(\n"
-            "    const wedgeFvPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, volMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->dimensionedInternalField().name()
@@ -87,14 +78,8 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 {
     if (!isType<wedgeFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "wedgeFvPatchField<Type>::wedgeFvPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    dictionary& dict\n"
-            ")\n",
             dict
         )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 86c7aaa146..daa2d5694b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,6 +30,7 @@ License
 #include "EulerDdtScheme.H"
 #include "CrankNicolsonDdtScheme.H"
 #include "backwardDdtScheme.H"
+#include "localEulerDdtScheme.H"
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -106,15 +107,8 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
 
         if (lInf_ < 0.0)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "advectiveFvPatchField<Type>::"
-                "advectiveFvPatchField"
-                "("
-                    "const fvPatch&, "
-                    "const DimensionedField<Type, volMesh>&, "
-                    "const dictionary&"
-                ")",
                 dict
             )   << "unphysical lInf specified (lInf < 0)" << nl
                 << "    on patch " << this->patch().name()
@@ -196,10 +190,11 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
         return;
     }
 
+    const fvMesh& mesh = this->dimensionedInternalField().mesh();
+
     word ddtScheme
     (
-        this->dimensionedInternalField().mesh()
-       .ddtScheme(this->dimensionedInternalField().name())
+        mesh.ddtScheme(this->dimensionedInternalField().name())
     );
     scalar deltaT = this->db().time().deltaTValue();
 
@@ -250,10 +245,33 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
 
             this->valueFraction() = (1.5 + k)/(1.5 + alpha + k);
         }
+        else if
+        (
+            ddtScheme == fv::localEulerDdtScheme<scalar>::typeName
+        )
+        {
+            const volScalarField& rDeltaT =
+                fv::localEulerDdt::localRDeltaT(mesh);
+
+            // Calculate the field wave coefficient alpha (See notes)
+            const scalarField alpha
+            (
+                w*this->patch().deltaCoeffs()/rDeltaT.boundaryField()[patchi]
+            );
+
+            // Calculate the field relaxation coefficient k (See notes)
+            const scalarField k(w/(rDeltaT.boundaryField()[patchi]*lInf_));
+
+            this->refValue() =
+            (
+                field.oldTime().boundaryField()[patchi] + k*fieldInf_
+            )/(1.0 + k);
+
+            this->valueFraction() = (1.0 + k)/(1.0 + alpha + k);
+        }
         else
         {
-            FatalErrorIn("advectiveFvPatchField<Type>::updateCoeffs()")
-                << "    Unsupported temporal differencing scheme : "
+            FatalErrorInFunction
                 << ddtScheme << nl
                 << "    on patch " << this->patch().name()
                 << " of field " << this->dimensionedInternalField().name()
@@ -283,12 +301,27 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
 
             this->valueFraction() = 1.5/(1.5 + alpha);
         }
+        else if
+        (
+            ddtScheme == fv::localEulerDdtScheme<scalar>::typeName
+        )
+        {
+            const volScalarField& rDeltaT =
+                fv::localEulerDdt::localRDeltaT(mesh);
+
+            // Calculate the field wave coefficient alpha (See notes)
+            const scalarField alpha
+            (
+                w*this->patch().deltaCoeffs()/rDeltaT.boundaryField()[patchi]
+            );
+
+            this->refValue() = field.oldTime().boundaryField()[patchi];
+
+            this->valueFraction() = 1.0/(1.0 + alpha);
+        }
         else
         {
-            FatalErrorIn
-            (
-                "advectiveFvPatchField<Type>::updateCoeffs()"
-            )   << "    Unsupported temporal differencing scheme : "
+            FatalErrorInFunction
                 << ddtScheme
                 << "\n    on patch " << this->patch().name()
                 << " of field " << this->dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
index 3b4e0f1b5c..443c8472a8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
     This boundary condition provides an advective outflow condition, based on
     solving DDt(psi, U) = 0 at the boundary.
 
-    The standard (Euler, backward, CrankNicolson) time schemes are
+    The standard (Euler, backward, CrankNicolson, localEuler) time schemes are
     supported.  Additionally an optional mechanism to relax the value at
     the boundary to a specified far-field value is provided which is
     switched on by specifying the relaxation length-scale \c lInf and the
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index 238bb5d21d..3bdfa9e6e9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,9 +60,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     centre_(ptf.centre_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_().clone().ptr()),
-    radialVelocity_(ptf.radialVelocity_().clone().ptr()),
-    rpm_(ptf.rpm_().clone().ptr())
+    axialVelocity_(ptf.axialVelocity_, false),
+    radialVelocity_(ptf.radialVelocity_, false),
+    rpm_(ptf.rpm_, false)
 {}
 
 
@@ -92,9 +92,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf),
     centre_(ptf.centre_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_().clone().ptr()),
-    radialVelocity_(ptf.radialVelocity_().clone().ptr()),
-    rpm_(ptf.rpm_().clone().ptr())
+    axialVelocity_(ptf.axialVelocity_, false),
+    radialVelocity_(ptf.radialVelocity_, false),
+    rpm_(ptf.rpm_, false)
 {}
 
 
@@ -108,9 +108,9 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, iF),
     centre_(ptf.centre_),
     axis_(ptf.axis_),
-    axialVelocity_(ptf.axialVelocity_().clone().ptr()),
-    radialVelocity_(ptf.radialVelocity_().clone().ptr()),
-    rpm_(ptf.rpm_().clone().ptr())
+    axialVelocity_(ptf.axialVelocity_, false),
+    radialVelocity_(ptf.radialVelocity_, false),
+    rpm_(ptf.rpm_, false)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
deleted file mode 100644
index f930a1ef5c..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
+++ /dev/null
@@ -1,851 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "externalCoupledMixedFvPatchField.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "IFstream.H"
-#include "globalIndex.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::word Foam::externalCoupledMixedFvPatchField<Type>::lockName = "OpenFOAM";
-
-template<class Type>
-Foam::string
-Foam::externalCoupledMixedFvPatchField<Type>::patchKey = "# Patch: ";
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::fileName Foam::externalCoupledMixedFvPatchField<Type>::baseDir() const
-{
-    word regionName(this->dimensionedInternalField().mesh().name());
-    if (regionName == polyMesh::defaultRegion)
-    {
-        regionName = ".";
-    }
-
-    fileName result(commsDir_/regionName);
-    result.clean();
-
-    return result;
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::setMaster
-(
-    const labelList& patchIDs
-)
-{
-    const volFieldType& cvf =
-        static_cast<const volFieldType&>(this->dimensionedInternalField());
-
-    volFieldType& vf = const_cast<volFieldType&>(cvf);
-
-    typename volFieldType::GeometricBoundaryField& bf = vf.boundaryField();
-
-    // number of patches can be different in parallel...
-    label nPatch = bf.size();
-    reduce(nPatch, maxOp<label>());
-
-    offsets_.setSize(nPatch);
-    forAll(offsets_, i)
-    {
-        offsets_[i].setSize(Pstream::nProcs());
-        offsets_[i] = 0;
-    }
-
-    // set the master patch
-    forAll(patchIDs, i)
-    {
-        label patchI = patchIDs[i];
-
-        patchType& pf = refCast<patchType>(bf[patchI]);
-
-        offsets_[patchI][Pstream::myProcNo()] = pf.size();
-
-        if (i == 0)
-        {
-            pf.master() = true;
-        }
-        else
-        {
-            pf.master() = false;
-        }
-    }
-
-    // set the patch offsets
-    int tag = Pstream::msgType() + 1;
-    forAll(offsets_, i)
-    {
-        Pstream::gatherList(offsets_[i], tag);
-        Pstream::scatterList(offsets_[i], tag);
-    }
-
-    label patchOffset = 0;
-    forAll(offsets_, patchI)
-    {
-        label sumOffset = 0;
-        List<label>& procOffsets = offsets_[patchI];
-
-        forAll(procOffsets, procI)
-        {
-            label o = procOffsets[procI];
-            if (o > 0)
-            {
-                procOffsets[procI] = patchOffset + sumOffset;
-                sumOffset += o;
-            }
-        }
-        patchOffset += sumOffset;
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::writeGeometry
-(
-    OFstream& osPoints,
-    OFstream& osFaces
-) const
-{
-    int tag = Pstream::msgType() + 1;
-
-    const label procI = Pstream::myProcNo();
-    const polyPatch& p = this->patch().patch();
-    const polyMesh& mesh = p.boundaryMesh().mesh();
-
-    labelList pointToGlobal;
-    labelList uniquePointIDs;
-    (void)mesh.globalData().mergePoints
-    (
-        p.meshPoints(),
-        p.meshPointMap(),
-        pointToGlobal,
-        uniquePointIDs
-    );
-
-    List<pointField> allPoints(Pstream::nProcs());
-    allPoints[procI] = pointField(mesh.points(), uniquePointIDs);
-    Pstream::gatherList(allPoints, tag);
-
-    List<faceList> allFaces(Pstream::nProcs());
-    faceList& patchFaces = allFaces[procI];
-    patchFaces = p.localFaces();
-    forAll(patchFaces, faceI)
-    {
-        inplaceRenumber(pointToGlobal, patchFaces[faceI]);
-    }
-
-    Pstream::gatherList(allFaces, tag);
-
-    if (Pstream::master())
-    {
-        pointField pts
-        (
-            ListListOps::combine<pointField>(allPoints, accessOp<pointField>())
-        );
-
-        // write points
-        osPoints << patchKey.c_str() << this->patch().name() << pts << endl;
-
-        faceList fcs
-        (
-            ListListOps::combine<faceList>(allFaces, accessOp<faceList>())
-        );
-
-        // write faces
-        osFaces<< patchKey.c_str() << this->patch().name() << fcs << endl;
-    }
-}
-
-
-template<class Type>
-Foam::fileName Foam::externalCoupledMixedFvPatchField<Type>::lockFile() const
-{
-    return fileName(baseDir()/(lockName + ".lock"));
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::createLockFile() const
-{
-    if (!master_ || !Pstream::master())
-    {
-        return;
-    }
-
-    const fileName fName(lockFile());
-    IFstream is(fName);
-
-    // only create lock file if it doesn't already exist
-    if (!is.good())
-    {
-        if (log_)
-        {
-            Info<< type() << ": creating lock file" << endl;
-        }
-
-        OFstream os(fName);
-        os  << "lock file";
-        os.flush();
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::removeLockFile() const
-{
-    if (!master_ || !Pstream::master())
-    {
-        return;
-    }
-
-    if (log_)
-    {
-        Info<< type() << ": removing lock file" << endl;
-    }
-
-    rm(lockFile());
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::startWait() const
-{
-    // only wait on master patch
-
-    const volFieldType& cvf =
-        static_cast<const volFieldType&>(this->dimensionedInternalField());
-
-    const typename volFieldType::GeometricBoundaryField& bf =
-        cvf.boundaryField();
-
-    forAll(coupledPatchIDs_, i)
-    {
-        label patchI = coupledPatchIDs_[i];
-
-        const patchType& pf = refCast<const patchType>(bf[patchI]);
-
-        if (pf.master())
-        {
-            pf.wait();
-            break;
-        }
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::wait() const
-{
-    const fileName fName(lockFile());
-    label found = 0;
-    label totalTime = 0;
-
-    if (log_)
-    {
-        Info<< type() << ": beginning wait for lock file " << fName << endl;
-    }
-
-    while (found == 0)
-    {
-        if (Pstream::master())
-        {
-            if (totalTime > timeOut_)
-            {
-                FatalErrorIn
-                (
-                    "void "
-                    "Foam::externalCoupledMixedFvPatchField<Type>::wait() "
-                    "const"
-                )
-                    << "Wait time exceeded time out time of " << timeOut_
-                    << " s" << abort(FatalError);
-            }
-
-            IFstream is(fName);
-
-            if (is.good())
-            {
-                found++;
-
-                if (log_)
-                {
-                    Info<< type() << ": found lock file " << fName << endl;
-                }
-            }
-            else
-            {
-                sleep(waitInterval_);
-                totalTime += waitInterval_;
-
-                if (log_)
-                {
-                    Info<< type() << ": wait time = " << totalTime << endl;
-                }
-            }
-        }
-
-        // prevent other procs from racing ahead
-        reduce(found, sumOp<label>());
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::initialiseRead
-(
-    IFstream& is
-) const
-{
-    if (!is.good())
-    {
-        FatalErrorIn
-        (
-            "void Foam::externalCoupledMixedFvPatchField<Type>::"
-            "initialiseRead"
-            "("
-                "IFstream&"
-            ") const"
-        )
-            << "Unable to open data transfer file " << is.name()
-            << " for patch " << this->patch().name()
-            << exit(FatalError);
-    }
-
-    label offset = offsets_[this->patch().index()][Pstream::myProcNo()];
-
-    // scan forward to start reading at relevant line/position
-    string line;
-    for (label i = 0; i < offset; i++)
-    {
-        if (is.good())
-        {
-            is.getLine(line);
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "void Foam::externalCoupledMixedFvPatchField<Type>::"
-                "initialiseRead"
-                "("
-                    "IFstream&"
-                ") const"
-            )
-                << "Unable to scan forward to appropriate read position for "
-                << "data transfer file " << is.name()
-                << " for patch " << this->patch().name()
-                << exit(FatalError);
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::readData
-(
-    const fileName& transferFile
-)
-{
-    // read data passed back from external source
-    IFstream is(transferFile + ".in");
-
-    // pre-process the input transfer file
-    initialiseRead(is);
-
-    // read data from file
-    forAll(this->patch(), faceI)
-    {
-        if (is.good())
-        {
-            is  >> this->refValue()[faceI]
-                >> this->refGrad()[faceI]
-                >> this->valueFraction()[faceI];
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "void Foam::externalCoupledMixedFvPatchField<Type>::readData"
-                "("
-                    "const fileName&"
-                ")"
-            )
-                << "Insufficient data for patch "
-                << this->patch().name()
-                << " in file " << is.name()
-                << exit(FatalError);
-        }
-    }
-
-    initialised_ = true;
-
-    // update the value from the mixed condition
-    mixedFvPatchField<Type>::evaluate();
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::writeData
-(
-    const fileName& transferFile
-) const
-{
-    if (!master_)
-    {
-        return;
-    }
-
-    OFstream os(transferFile);
-
-    writeHeader(os);
-
-    const volFieldType& cvf =
-        static_cast<const volFieldType&>(this->dimensionedInternalField());
-
-    const typename volFieldType::GeometricBoundaryField& bf =
-        cvf.boundaryField();
-
-    forAll(coupledPatchIDs_, i)
-    {
-        label patchI = coupledPatchIDs_[i];
-
-        const patchType& pf = refCast<const patchType>(bf[patchI]);
-
-        pf.transferData(os);
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::writeHeader
-(
-    OFstream& os
-) const
-{
-    os  << "# Values: magSf value snGrad" << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-externalCoupledMixedFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    mixedFvPatchField<Type>(p, iF),
-    commsDir_("unknown-commsDir"),
-    fName_("unknown-fName"),
-    waitInterval_(0),
-    timeOut_(0),
-    calcFrequency_(0),
-    initByExternal_(false),
-    log_(false),
-    master_(false),
-    offsets_(),
-    initialised_(false),
-    coupledPatchIDs_()
-{
-    this->refValue() = pTraits<Type>::zero;
-    this->refGrad() = pTraits<Type>::zero;
-    this->valueFraction() = 0.0;
-}
-
-
-template<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-externalCoupledMixedFvPatchField
-(
-    const externalCoupledMixedFvPatchField& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(ptf, p, iF, mapper),
-    commsDir_(ptf.commsDir_),
-    fName_(ptf.fName_),
-    waitInterval_(ptf.waitInterval_),
-    timeOut_(ptf.timeOut_),
-    calcFrequency_(ptf.calcFrequency_),
-    initByExternal_(ptf.initByExternal_),
-    log_(ptf.log_),
-    master_(ptf.master_),
-    offsets_(ptf.offsets_),
-    initialised_(ptf.initialised_),
-    coupledPatchIDs_(ptf.coupledPatchIDs_)
-{}
-
-
-template<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-externalCoupledMixedFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    mixedFvPatchField<Type>(p, iF),
-    commsDir_(dict.lookup("commsDir")),
-    fName_(dict.lookup("fileName")),
-    waitInterval_(dict.lookupOrDefault("waitInterval", 1)),
-    timeOut_(dict.lookupOrDefault("timeOut", 100*waitInterval_)),
-    calcFrequency_(dict.lookupOrDefault("calcFrequency", 1)),
-    initByExternal_(readBool(dict.lookup("initByExternal"))),
-    log_(dict.lookupOrDefault("log", false)),
-    master_(true),
-    offsets_(),
-    initialised_(false),
-    coupledPatchIDs_()
-{
-    if (dict.found("value"))
-    {
-        fvPatchField<Type>::operator=
-        (
-            Field<Type>("value", dict, p.size())
-        );
-    }
-    else
-    {
-        fvPatchField<Type>::operator=(this->patchInternalField());
-    }
-
-    commsDir_.expand();
-
-    if (Pstream::master())
-    {
-        mkDir(baseDir());
-    }
-
-    if (!initByExternal_)
-    {
-        createLockFile();
-    }
-
-    // initialise as a fixed value
-    this->refValue() = *this;
-    this->refGrad() = pTraits<Type>::zero;
-    this->valueFraction() = 1.0;
-}
-
-
-template<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-externalCoupledMixedFvPatchField
-(
-    const externalCoupledMixedFvPatchField& ecmpf
-)
-:
-    mixedFvPatchField<Type>(ecmpf),
-    commsDir_(ecmpf.commsDir_),
-    fName_(ecmpf.fName_),
-    waitInterval_(ecmpf.waitInterval_),
-    timeOut_(ecmpf.timeOut_),
-    calcFrequency_(ecmpf.calcFrequency_),
-    initByExternal_(ecmpf.initByExternal_),
-    log_(ecmpf.log_),
-    master_(ecmpf.master_),
-    offsets_(ecmpf.offsets_),
-    initialised_(ecmpf.initialised_),
-    coupledPatchIDs_(ecmpf.coupledPatchIDs_)
-{}
-
-
-template<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-externalCoupledMixedFvPatchField
-(
-    const externalCoupledMixedFvPatchField& ecmpf,
-    const DimensionedField<Type, volMesh>& iF
-)
-:
-    mixedFvPatchField<Type>(ecmpf, iF),
-    commsDir_(ecmpf.commsDir_),
-    fName_(ecmpf.fName_),
-    waitInterval_(ecmpf.waitInterval_),
-    timeOut_(ecmpf.timeOut_),
-    calcFrequency_(ecmpf.calcFrequency_),
-    initByExternal_(ecmpf.initByExternal_),
-    log_(ecmpf.log_),
-    master_(ecmpf.master_),
-    offsets_(ecmpf.offsets_),
-    initialised_(ecmpf.initialised_),
-    coupledPatchIDs_(ecmpf.coupledPatchIDs_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-~externalCoupledMixedFvPatchField()
-{
-    removeLockFile();
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::initialise
-(
-    const fileName& transferFile
-)
-{
-    if (initialised_)
-    {
-        return;
-    }
-
-    const volFieldType& cvf =
-        static_cast<const volFieldType&>(this->dimensionedInternalField());
-
-    volFieldType& vf = const_cast<volFieldType&>(cvf);
-
-    typename volFieldType::GeometricBoundaryField& bf = vf.boundaryField();
-
-    // identify all coupled patches
-    DynamicList<label> coupledPatchIDs(bf.size());
-
-    forAll(bf, patchI)
-    {
-        if (isA<patchType>(bf[patchI]))
-        {
-            coupledPatchIDs.append(patchI);
-        }
-    }
-
-    coupledPatchIDs_.transfer(coupledPatchIDs);
-
-
-    // initialise by external solver, or just set the master patch
-    if (initByExternal_)
-    {
-        // remove lock file, signalling external source to execute
-//        removeLockFile();
-
-        forAll(coupledPatchIDs_, i)
-        {
-            label patchI = coupledPatchIDs_[i];
-
-            patchType& pf = refCast<patchType>(bf[patchI]);
-
-            pf.setMaster(coupledPatchIDs_);
-        }
-
-
-        // wait for initial data to be made available
-        startWait();
-
-        // read the initial data
-        if (master_)
-        {
-            forAll(coupledPatchIDs_, i)
-            {
-                label patchI = coupledPatchIDs_[i];
-
-                patchType& pf = refCast<patchType>(bf[patchI]);
-
-                pf.readData(transferFile);
-            }
-        }
-    }
-    else
-    {
-        setMaster(coupledPatchIDs_);
-    }
-
-    initialised_ = true;
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::evaluate
-(
-    const Pstream::commsTypes comms
-)
-{
-    if (!initialised_ || this->db().time().timeIndex() % calcFrequency_ == 0)
-    {
-        const fileName transferFile(baseDir()/fName_);
-
-        // initialise the coupling
-        initialise(transferFile);
-
-        // write data for external source
-        writeData(transferFile + ".out");
-
-        // remove lock file, signalling external source to execute
-        removeLockFile();
-
-        // wait for response
-        startWait();
-
-        if (master_ && Pstream::master())
-        {
-            // remove old data file from OpenFOAM
-            rm(transferFile + ".out");
-        }
-
-        // read data passed back from external source
-        readData(transferFile);
-
-        // create lock file for external source
-        createLockFile();
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::transferData
-(
-    OFstream& os
-) const
-{
-    if (log_)
-    {
-        Info<< type() << ": writing data to " << os.name()  << endl;
-    }
-
-    if (Pstream::parRun())
-    {
-        int tag = Pstream::msgType() + 1;
-
-        List<Field<scalar> > magSfs(Pstream::nProcs());
-        magSfs[Pstream::myProcNo()].setSize(this->patch().size());
-        magSfs[Pstream::myProcNo()] = this->patch().magSf();
-        Pstream::gatherList(magSfs, tag);
-
-        List<Field<Type> > values(Pstream::nProcs());
-        values[Pstream::myProcNo()].setSize(this->patch().size());
-        values[Pstream::myProcNo()] = this->refValue();
-        Pstream::gatherList(values, tag);
-
-        List<Field<Type> > snGrads(Pstream::nProcs());
-        snGrads[Pstream::myProcNo()].setSize(this->patch().size());
-        snGrads[Pstream::myProcNo()] = this->snGrad();
-        Pstream::gatherList(snGrads, tag);
-
-        if (Pstream::master())
-        {
-            forAll(values, procI)
-            {
-                const Field<scalar>& magSf = magSfs[procI];
-                const Field<Type>& value = values[procI];
-                const Field<Type>& snGrad = snGrads[procI];
-
-                forAll(magSf, faceI)
-                {
-                    os  << magSf[faceI] << token::SPACE
-                        << value[faceI] << token::SPACE
-                        << snGrad[faceI] << nl;
-                }
-            }
-
-            os.flush();
-        }
-    }
-    else
-    {
-        const Field<scalar>& magSf(this->patch().magSf());
-        const Field<Type>& value(this->refValue());
-        const Field<Type> snGrad(this->snGrad());
-
-        forAll(magSf, faceI)
-        {
-            os  << magSf[faceI] << token::SPACE
-                << value[faceI] << token::SPACE
-                << snGrad[faceI] << nl;
-        }
-
-        os.flush();
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::writeGeometry() const
-{
-    const volFieldType& cvf =
-        static_cast<const volFieldType&>(this->dimensionedInternalField());
-
-    const typename volFieldType::GeometricBoundaryField& bf =
-        cvf.boundaryField();
-
-    OFstream osPoints(baseDir()/"patchPoints");
-    OFstream osFaces(baseDir()/"patchFaces");
-
-    if (log_)
-    {
-        Info<< "writing collated patch points to: " << osPoints.name() << nl
-            << "writing collated patch faces to: " << osFaces.name() << endl;
-    }
-
-    forAll(bf, patchI)
-    {
-        if (isA<patchType>(bf[patchI]))
-        {
-            const patchType& pf = refCast<const patchType>(bf[patchI]);
-
-            pf.writeGeometry(osPoints, osFaces);
-        }
-    }
-}
-
-
-template<class Type>
-void Foam::externalCoupledMixedFvPatchField<Type>::write(Ostream& os) const
-{
-    mixedFvPatchField<Type>::write(os);
-
-    os.writeKeyword("commsDir") << commsDir_ << token::END_STATEMENT << nl;
-    os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("waitInterval") << waitInterval_ << token::END_STATEMENT
-        << nl;
-    os.writeKeyword("timeOut") << timeOut_ << token::END_STATEMENT << nl;
-    os.writeKeyword("calcFrequency") << calcFrequency_ << token::END_STATEMENT
-        << nl;
-    os.writeKeyword("initByExternal") << initByExternal_ << token::END_STATEMENT
-        << nl;
-    os.writeKeyword("log") << log_ << token::END_STATEMENT << nl;
-
-    this->writeEntry("value", os);
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
deleted file mode 100644
index 322ba3810b..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
+++ /dev/null
@@ -1,355 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::externalCoupledMixedFvPatchField
-
-Group
-    grpGenericBoundaryConditions grpCoupledBoundaryConditions
-
-Description
-    This boundary condition provides an interface to an external application.
-    Values are transferred as plain text files, where OpenFOAM data is written
-    as:
-
-        # Patch: <patch name>
-        <magSf1> <value1> <surfaceNormalGradient1>
-        <magSf2> <value2> <surfaceNormalGradient2>
-        <magSf3> <value3> <surfaceNormalGradient3>
-        ...
-        <magSfN> <valueN> <surfaceNormalGradientN>
-
-    and received as the constituent pieces of the `mixed' condition, i.e.
-
-        # Patch: <patch name>
-        <value1> <gradient1> <valueFracion1>
-        <value2> <gradient2> <valueFracion2>
-        <value3> <gradient3> <valueFracion3>
-        ...
-        <valueN> <gradientN> <valueFracionN>
-
-    Data is sent/received as a single file for all patches from the directory
-
-        $FOAM_CASE/<commsDir>
-
-    At start-up, the boundary creates a lock file, i.e..
-
-        OpenFOAM.lock
-
-    ... to signal the external source to wait.  During the boundary condition
-    update, boundary values are written to file, e.g.
-
-        <fileName>.out
-
-    The lock file is then removed, instructing the external source to take
-    control of the program execution.  When ready, the external program
-    should create the return values, e.g. to file
-
-        <fileName>.in
-
-    ... and then re-instate the lock file.  The boundary condition will then
-    read the return values, and pass program execution back to OpenFOAM.
-
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        commsDir     | communications directory   | yes         |
-        fileName     | transfer file name      | yes         |
-        waitInterval | interval [s] between file checks | no | 1
-        timeOut      | time after which error invoked [s] |no |100*waitInterval
-        calcFrequency | calculation frequency  | no          | 1
-        initByExternal | external app to initialises values  | yes |
-        log          | log program control     | no          | no
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            externalCoupled;
-        commsDir        "$FOAM_CASE/comms";
-        fileName        data;
-        calcFrequency   1;
-        initByExternal  yes;
-    }
-    \endverbatim
-
-SeeAlso
-    mixedFvPatchField
-
-SourceFiles
-    externalCoupledMixedFvPatchField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef externalCoupledMixedFvPatchField_H
-#define externalCoupledMixedFvPatchField_H
-
-#include "mixedFvPatchFields.H"
-#include "OFstream.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class IFstream;
-
-/*---------------------------------------------------------------------------*\
-              Class externalCoupledMixedFvPatchField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class externalCoupledMixedFvPatchField
-:
-    public mixedFvPatchField<Type>
-{
-
-private:
-
-    // Private data
-
-        //- Convenience typedefs
-        typedef externalCoupledMixedFvPatchField<Type> patchType;
-        typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
-
-        //- Path to communications directory
-        fileName commsDir_;
-
-        //- Name of data file
-        word fName_;
-
-        //- Interval time between checking for return data [s]
-        label waitInterval_;
-
-        //- Time out time [s]
-        label timeOut_;
-
-        //- Calculation frequency
-        label calcFrequency_;
-
-        //- Flag to indicate values are initialised by external application
-        bool initByExternal_;
-
-        //- Log flag
-        bool log_;
-
-        //- Master patch flag - controls when to pause/resume execution
-        //  Note: only valid when collate option is selected
-        bool master_;
-
-        //- Offsets in data file to start reading at correct position
-        List<List<label> > offsets_;
-
-        //- Initialised flag
-        bool initialised_;
-
-        //- List of coupled patch IDs
-        List<label> coupledPatchIDs_;
-
-
-    // Private Member Functions
-
-        //- Initialise
-        void initialise(const fileName& transferFile);
-
-        //- Set the master flag when collate option is selected
-        void setMaster(const labelList& patchIDs);
-
-        //- Return the file path to the base communications directory
-        fileName baseDir() const;
-
-        //- Write the geometry to the comms dir
-        void writeGeometry(OFstream& osPoints, OFstream& osFaces) const;
-
-        //- Return the file path to the lock file
-        fileName lockFile() const;
-
-        //- Create lock file
-        void createLockFile() const;
-
-        //- Remove lock file
-        void removeLockFile() const;
-
-        //- Wait for response from external source
-        void startWait() const;
-
-        //- Wait for response from external source
-        void wait() const;
-
-        //- Initialise input stream for reading
-        void initialiseRead(IFstream& is) const;
-
-
-protected:
-
-    // Protected Member Functions
-
-        //- Read data from external source
-        virtual void readData(const fileName& transferFile);
-
-        //- Write data for external source - calls transferData
-        virtual void writeData(const fileName& transferFile) const;
-
-        //- Write header to transfer file
-        virtual void writeHeader(OFstream& os) const;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("externalCoupled");
-
-    //- Name of lock file
-    static word lockName;
-
-    //- Name of patch key, e.g. '# Patch:' when looking for start of patch data
-    static string patchKey;
-
-
-    // Constructors
-
-        //- Construct from patch and internal field
-        externalCoupledMixedFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct from patch, internal field and dictionary
-        externalCoupledMixedFvPatchField
-        (
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const dictionary&
-        );
-
-        //- Construct by mapping given externalCoupledMixedFvPatchField
-        //  onto a new patch
-        externalCoupledMixedFvPatchField
-        (
-            const externalCoupledMixedFvPatchField<Type>&,
-            const fvPatch&,
-            const DimensionedField<Type, volMesh>&,
-            const fvPatchFieldMapper&
-        );
-
-        //- Construct as copy
-        externalCoupledMixedFvPatchField
-        (
-            const externalCoupledMixedFvPatchField&
-        );
-
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new externalCoupledMixedFvPatchField<Type>(*this)
-            );
-        }
-
-        //- Construct as copy setting internal field reference
-        externalCoupledMixedFvPatchField
-        (
-            const externalCoupledMixedFvPatchField&,
-            const DimensionedField<Type, volMesh>&
-        );
-
-        //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
-        (
-            const DimensionedField<Type, volMesh>& iF
-        ) const
-        {
-            return tmp<fvPatchField<Type> >
-            (
-                new externalCoupledMixedFvPatchField<Type>(*this, iF)
-            );
-        }
-
-
-    //- Destructor
-    virtual ~externalCoupledMixedFvPatchField();
-
-
-    // Member functions
-
-        // Access
-
-            //- Return the log flag
-            bool log() const
-            {
-                return log_;
-            }
-
-            //- Return the master flag
-            bool master() const
-            {
-                return master_;
-            }
-
-            //- Return the master flag
-            bool& master()
-            {
-                return master_;
-            }
-
-
-        // Evaluation functions
-
-            //- Evaluate the patch field
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::blocking
-            );
-
-            //- Transfer data for external source
-            virtual void transferData(OFstream& os) const;
-
-
-        //- Write the geometry to the comms dir
-        void writeGeometry() const;
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "externalCoupledMixedFvPatchField.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index 9e0726e6ac..dab9977118 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn("fanPressureFvPatchScalarField::updateCoeffs()")
+        FatalErrorInFunction
             << "dimensions of phi are not correct"
                 << "\n    on patch " << patch().name()
                 << " of field " << dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index 0a5a4b4809..0b330ec9cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,6 +42,32 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 {}
 
 
+Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    curTimeIndex_(-1)
+{
+    if (dict.found("value") && dict.found("gradient"))
+    {
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+        gradient() = scalarField("gradient", dict, p.size());
+    }
+    else
+    {
+        fvPatchField<scalar>::operator=(patchInternalField());
+        gradient() = 0.0;
+    }
+}
+
+
 Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fixedFluxPressureFvPatchScalarField& ptf,
@@ -73,32 +99,6 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 }
 
 
-Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedGradientFvPatchScalarField(p, iF),
-    curTimeIndex_(-1)
-{
-    if (dict.found("value") && dict.found("gradient"))
-    {
-        fvPatchField<scalar>::operator=
-        (
-            scalarField("value", dict, p.size())
-        );
-        gradient() = scalarField("gradient", dict, p.size());
-    }
-    else
-    {
-        fvPatchField<scalar>::operator=(patchInternalField());
-        gradient() = 0.0;
-    }
-}
-
-
 Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fixedFluxPressureFvPatchScalarField& wbppsf
@@ -148,7 +148,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
 
     if (curTimeIndex_ != this->db().time().timeIndex())
     {
-        FatalErrorIn("fixedFluxPressureFvPatchScalarField::updateCoeffs()")
+        FatalErrorInFunction
             << "updateCoeffs(const scalarField& snGradp) MUST be called before"
                " updateCoeffs() or evaluate() to set the boundary gradient."
             << exit(FatalError);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
new file mode 100644
index 0000000000..a9db1a7036
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedProfileFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<Type>(p, iF),
+    profile_(),
+    dir_(pTraits<vector>::zero),
+    origin_(0)
+{}
+
+
+template<class Type>
+Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const Field<Type>& fld
+)
+:
+    fixedValueFvPatchField<Type>(p, iF, fld),
+    profile_(),
+    dir_(pTraits<vector>::zero),
+    origin_(0)
+{}
+
+
+template<class Type>
+Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<Type>(p, iF),
+    profile_(DataEntry<Type>::New("profile", dict)),
+    dir_(dict.lookup("direction")),
+    origin_(readScalar(dict.lookup("origin")))
+{
+    if (mag(dir_) < SMALL)
+    {
+        FatalErrorInFunction
+            << "magnitude Direction must be greater than zero"
+            << abort(FatalError);
+    }
+
+    // Ensure direction vector is normalized
+    dir_ /= mag(dir_);
+
+    // Evaluate profile
+    this->evaluate();
+}
+
+
+template<class Type>
+Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
+(
+    const fixedProfileFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(p, iF),  // Don't map
+    profile_(ptf.profile_, false),
+    dir_(ptf.dir_),
+    origin_(ptf.origin_)
+{
+    // Evaluate profile since value not mapped
+    this->evaluate();
+}
+
+
+template<class Type>
+Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
+(
+    const fixedProfileFvPatchField<Type>& ptf
+)
+:
+    fixedValueFvPatchField<Type>(ptf),
+    profile_(ptf.profile_, false),
+    dir_(ptf.dir_),
+    origin_(ptf.origin_)
+{}
+
+
+template<class Type>
+Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
+(
+    const fixedProfileFvPatchField<Type>& ptf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<Type>(ptf, iF),
+    profile_(ptf.profile_, false),
+    dir_(ptf.dir_),
+    origin_(ptf.origin_)
+{
+    // Evaluate the profile if defined
+    if (ptf.profile_.valid())
+    {
+        this->evaluate();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::fixedProfileFvPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const scalarField dirCmpt((dir_ & this->patch().Cf()) - origin_);
+    fvPatchField<Type>::operator==(profile_->value(dirCmpt));
+
+    fixedValueFvPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::fixedProfileFvPatchField<Type>::write(Ostream& os) const
+{
+    fvPatchField<Type>::write(os);
+    profile_->writeData(os);
+    os.writeKeyword("direction") << dir_ << token::END_STATEMENT << nl;
+    os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
+    this->writeEntry("value", os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
new file mode 100644
index 0000000000..d644a8e73c
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fixedProfileFvPatchField
+
+Group
+    grpGenericBoundaryConditions
+
+Description
+    This boundary condition provides a fixed value profile condition.
+
+    \heading Patch usage
+
+    \table
+        Property     | Description              | Required | Default value
+        profile      | Profile DataEntry        | yes |
+        direction    | Profile direction        | yes |
+        origin       | Profile origin           | yes |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type            fixedProfile;
+        profile    csvFile;
+
+        profileCoeffs
+        {
+            nHeaderLine         0;          // Number of header lines
+            refColumn           0;          // Reference column index
+            componentColumns    (1 2 3);    // Component column indices
+            separator           ",";        // Optional (defaults to ",")
+            mergeSeparators     no;         // Merge multiple separators
+            fileName            "Uprofile.csv";  // name of csv data file
+            outOfBounds         clamp;      // Optional out-of-bounds handling
+            interpolationScheme linear;     // Optional interpolation scheme
+        }
+        direction        (0 1 0);
+        origin           0;
+    }
+    \endverbatim
+
+    Example setting a parabolic inlet profile for the PitzDaily case:
+    \verbatim
+    inlet
+    {
+        type            fixedProfile;
+
+        profile         polynomial
+        (
+            ((1 0 0)        (0 0 0))
+            ((-6200 0 0)    (2 0 0))
+        );
+        direction       (0 1 0);
+        origin          0.0127;
+    }
+    \endverbatim
+
+Note
+    The profile entry is a DataEntry type.  The example above gives the
+    usage for supplying csv file.
+
+SeeAlso
+    Foam::fixedValueFvPatchField
+    Foam::DataEntry
+    Foam::timeVaryingMappedFixedValueFvPatchField
+
+SourceFiles
+    fixedProfileFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedProfileFvPatchField_H
+#define fixedProfileFvPatchField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class fixedProfileFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class fixedProfileFvPatchField
+:
+    public fixedValueFvPatchField<Type>
+{
+    // Private data
+
+        //- Profile data
+        autoPtr<DataEntry<Type> > profile_;
+
+        //- Profile direction
+        vector dir_;
+
+        //- Profile origin
+        scalar origin_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedProfile");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        fixedProfileFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch and internal field and patch field
+        fixedProfileFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const Field<Type>& fld
+        );
+
+        //- Construct from patch, internal field and dictionary
+        fixedProfileFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given fixedProfileFvPatchField
+        //  onto a new patch
+        fixedProfileFvPatchField
+        (
+            const fixedProfileFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        fixedProfileFvPatchField
+        (
+            const fixedProfileFvPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new fixedProfileFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        fixedProfileFvPatchField
+        (
+            const fixedProfileFvPatchField<Type>&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new fixedProfileFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "fixedProfileFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFields.C
new file mode 100644
index 0000000000..155f369672
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedProfileFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(fixedProfile);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFields.H
similarity index 79%
rename from applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.H
rename to src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFields.H
index 0c1391f80a..0896b8c760 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,24 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef createExternalCoupledPatchGeometryTemplates_H
-#define createExternalCoupledPatchGeometryTemplates_H
+#ifndef fixedProfileFvPatchFields_H
+#define fixedProfileFvPatchFields_H
 
-#include "word.H"
+#include "fixedProfileFvPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    template<class Type>
-    void processField(bool& processed, const word& fieldName);
-}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "createExternalCoupledPatchGeometryTemplates.C"
-#endif
+makePatchTypeFieldTypedefs(fixedProfile);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H
new file mode 100644
index 0000000000..e324c24dc9
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedProfileFvPatchFieldsFwd_H
+#define fixedProfileFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class fixedProfileFvPatchField;
+
+makePatchTypeFieldTypedefs(fixedValue);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index b5948bed4a..7dc2d9497b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
-    flowRate_(ptf.flowRate_().clone().ptr()),
+    flowRate_(ptf.flowRate_, false),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoInlet_(ptf.rhoInlet_)
@@ -88,12 +88,8 @@ flowRateInletVelocityFvPatchVectorField
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "flowRateInletVelocityFvPatchVectorField::"
-            "flowRateInletVelocityFvPatchVectorField"
-            "(const fvPatch&, const DimensionedField<vector, volMesh>&,"
-            " const dictionary&)",
             dict
         )   << "Please supply either 'volumetricFlowRate' or"
             << " 'massFlowRate' and 'rho'" << exit(FatalIOError);
@@ -121,7 +117,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf),
-    flowRate_(ptf.flowRate_().clone().ptr()),
+    flowRate_(ptf.flowRate_, false),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoInlet_(ptf.rhoInlet_)
@@ -136,7 +132,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(ptf, iF),
-    flowRate_(ptf.flowRate_().clone().ptr()),
+    flowRate_(ptf.flowRate_, false),
     volumetric_(ptf.volumetric_),
     rhoName_(ptf.rhoName_),
     rhoInlet_(ptf.rhoInlet_)
@@ -179,10 +175,8 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
             // Use constant density
             if (rhoInlet_ < 0)
             {
-                FatalErrorIn
-                (
-                    "flowRateInletVelocityFvPatchVectorField::updateCoeffs()"
-                )   << "Did not find registered density field " << rhoName_
+                FatalErrorInFunction
+                    << "Did not find registered density field " << rhoName_
                     << " and no constant density 'rhoInlet' specified"
                     << exit(FatalError);
             }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index a3f7387390..ac76973cb3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,10 +124,7 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
     }
     else
     {
-        FatalErrorIn
-        (
-            "fluxCorrectedVelocityFvPatchVectorField::evaluate()"
-        )
+        FatalErrorInFunction
             << "dimensions of phi are incorrect\n"
             << "    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
index c2f272244c..b50eac91b8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
@@ -141,7 +141,7 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn("freestreamPressureFvPatchScalarField::updateCoeffs()")
+        FatalErrorInFunction
             << "dimensions of phi are not correct"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index 03edc6c480..5e8c48df97 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -243,10 +243,8 @@ tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
 
             if (nbrPatchID < 0)
             {
-                FatalErrorIn
-                (
-                    "void mappedPatchFieldBase<Type>::updateCoeffs()"
-                )<< "Unable to find sample patch " << mapper_.samplePatch()
+                FatalErrorInFunction
+                 << "Unable to find sample patch " << mapper_.samplePatch()
                  << " in region " << mapper_.sampleRegion()
                  << " for patch " << patchField_.patch().name() << nl
                  << abort(FatalError);
@@ -284,10 +282,8 @@ tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
         }
         default:
         {
-            FatalErrorIn
-            (
-                "mappedPatchFieldBase<Type>::updateCoeffs()"
-            )<< "Unknown sampling mode: " << mapper_.mode()
+            FatalErrorInFunction
+             << "Unknown sampling mode: " << mapper_.mode()
              << nl << abort(FatalError);
         }
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
index 680d3f89f0..ba3a0e0209 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,10 +121,8 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
     {
         case mappedPatchBase::NEARESTCELL:
         {
-            FatalErrorIn
-            (
-                "void mappedFixedValueFvPatchField<Type>::updateCoeffs()"
-            )   << "Cannot apply "
+            FatalErrorInFunction
+                << "Cannot apply "
                 << mappedPatchBase::sampleModeNames_
                    [
                        mappedPatchBase::NEARESTCELL
@@ -171,7 +169,7 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
         }
         default:
         {
-            FatalErrorIn("mappedFixedValueFvPatchField<Type>::updateCoeffs()")
+            FatalErrorInFunction
                 << "Unknown sampling mode: " << mpp.mode()
                 << abort(FatalError);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
index 851344194b..0100f09730 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,10 +107,7 @@ const mappedPatchBase& mappedFixedValueFvPatchField<Type>::mapper
 {
     if (!isA<mappedPatchBase>(p.patch()))
     {
-        FatalErrorIn
-        (
-            "mappedFixedValueFvPatchField<Type>::mapper()"
-        )   << "\n    patch type '" << p.patch().type()
+        FatalErrorInFunction
             << "' not type '" << mappedPatchBase::typeName << "'"
             << "\n    for patch " << p.patch().name()
             << " of field " << iF.name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
index 63aadec6a1..ecd04b5e70 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,10 +165,8 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "mappedFlowRateFvPatchVectorField::updateCoeffs()"
-        )   << "dimensions of " << phiName_ << " are incorrect" << nl
+        FatalErrorInFunction
+            << "dimensions of " << phiName_ << " are incorrect" << nl
             << "    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
index 00be69fc85..713b94492e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,17 +59,8 @@ mappedVelocityFluxFixedValueFvPatchField
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
-        FatalErrorIn
-        (
-            "mappedVelocityFluxFixedValueFvPatchField::"
-            "mappedVelocityFluxFixedValueFvPatchField"
-            "("
-                "const mappedVelocityFluxFixedValueFvPatchField&, "
-                "const fvPatch&, "
-                "const DimensionedField<vector, volMesh>&, "
-                "const fvPatchFieldMapper&"
-            ")"
-        )   << "Patch type '" << p.type()
+        FatalErrorInFunction
+            << "Patch type '" << p.type()
             << "' not type '" << mappedPatchBase::typeName << "'"
             << " for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
@@ -92,16 +83,8 @@ mappedVelocityFluxFixedValueFvPatchField
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
-        FatalErrorIn
-        (
-            "mappedVelocityFluxFixedValueFvPatchField::"
-            "mappedVelocityFluxFixedValueFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<vector, volMesh>&, "
-                "const dictionary&"
-            ")"
-        )   << "Patch type '" << p.type()
+        FatalErrorInFunction
+            << "Patch type '" << p.type()
             << "' not type '" << mappedPatchBase::typeName << "'"
             << " for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
@@ -115,16 +98,8 @@ mappedVelocityFluxFixedValueFvPatchField
     );
     if (mpp.mode() == mappedPolyPatch::NEARESTCELL)
     {
-        FatalErrorIn
-        (
-            "mappedVelocityFluxFixedValueFvPatchField::"
-            "mappedVelocityFluxFixedValueFvPatchField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<vector, volMesh>&, "
-                "const dictionary&"
-            ")"
-        )   << "Patch " << p.name()
+        FatalErrorInFunction
+            << "Patch " << p.name()
             << " of type '" << p.type()
             << "' can not be used in 'nearestCell' mode"
             << " of field " << dimensionedInternalField().name()
@@ -234,11 +209,8 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
         }
         default:
         {
-            FatalErrorIn
-            (
-                "mappedVelocityFluxFixedValueFvPatchField::"
-                "updateCoeffs()"
-            )   << "patch can only be used in NEARESTPATCHFACE, "
+            FatalErrorInFunction
+                << "patch can only be used in NEARESTPATCHFACE, "
                 << "NEARESTPATCHFACEAMI or NEARESTFACE mode" << nl
                 << abort(FatalError);
         }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
index be5b50e6f8..13685e8d1c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,7 @@ Description
     {
         type            movingWallVelocity;
         U               U;
-        value           uniform 0; // initial value
+        value           uniform (0 0 0);    // initial value
     }
     \endverbatim
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index 42d52401d8..715586a369 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,8 +74,8 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
     fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
     refValue_(ptf.refValue_, mapper),
     offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_().clone().ptr()),
-    frequency_(ptf.frequency_().clone().ptr()),
+    amplitude_(ptf.amplitude_, false),
+    frequency_(ptf.frequency_, false),
     curTimeIndex_(-1)
 {}
 
@@ -122,8 +122,8 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
     fixedValueFvPatchField<Type>(ptf),
     refValue_(ptf.refValue_),
     offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_().clone().ptr()),
-    frequency_(ptf.frequency_().clone().ptr()),
+    amplitude_(ptf.amplitude_, false),
+    frequency_(ptf.frequency_, false),
     curTimeIndex_(-1)
 {}
 
@@ -138,8 +138,8 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
     fixedValueFvPatchField<Type>(ptf, iF),
     refValue_(ptf.refValue_),
     offset_(ptf.offset_),
-    amplitude_(ptf.amplitude_().clone().ptr()),
-    frequency_(ptf.frequency_().clone().ptr()),
+    amplitude_(ptf.amplitude_, false),
+    frequency_(ptf.frequency_, false),
     curTimeIndex_(-1)
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 46c021c7f3..7804ed43f2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,10 +126,8 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::updateCoeffs()
 
     if (outletPatchID < 0)
     {
-        FatalErrorIn
-        (
-            "void outletMappedUniformInletFvPatchField<Type>::updateCoeffs()"
-        )   << "Unable to find outlet patch " << outletPatchName_
+        FatalErrorInFunction
+            << "Unable to find outlet patch " << outletPatchName_
             << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index 14e704c507..a6a18a61cc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,11 +169,8 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "pressureDirectedInletOutletVelocityFvPatchVectorField::"
-            "updateCoeffs()"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
index 11b8f7f32e..d5a74f7a98 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,10 +162,8 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 0eb6a52034..0e15350470 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,11 +143,8 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "pressureInletOutletParSlipVelocityFvPatchVectorField::"
-            "updateCoeffs()"
-        )   << "dimensions of phi are not correct" << nl
+        FatalErrorInFunction
+            << "dimensions of phi are not correct" << nl
             << "    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
index 3482deefbf..08a6334eca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn("pressureInletVelocityFvPatchVectorField::updateCoeffs()")
+        FatalErrorInFunction
             << "dimensions of phi are not correct"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 52b7d65295..70ce9adedc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,11 +139,8 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "pressureNormalInletOutletVelocityFvPatchVectorField::"
-            "updateCoeffs()"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..9b5e347fbd
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -0,0 +1,399 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pressurePIDControlInletVelocityFvPatchVectorField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+#include "linear.H"
+#include "steadyStateDdtScheme.H"
+#include "syncTools.H"
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+const Foam::surfaceScalarField&
+Foam::pressurePIDControlInletVelocityFvPatchVectorField::facePressure() const
+{
+    const volScalarField& p(db().lookupObject<volScalarField>(pName_));
+
+    const word pfName(pName_ + "f");
+
+    if (!db().foundObject<surfaceScalarField>(pfName))
+    {
+        surfaceScalarField* pfPtr
+        (
+            new surfaceScalarField(pfName, linearInterpolate(p))
+        );
+
+        pfPtr->store();
+    }
+
+    surfaceScalarField& pf
+    (
+        const_cast<surfaceScalarField&>
+        (
+            db().lookupObject<surfaceScalarField>(pfName)
+        )
+    );
+
+    if (!pf.upToDate(p))
+    {
+        pf = linearInterpolate(p);
+    }
+
+    return pf;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pressurePIDControlInletVelocityFvPatchVectorField::
+pressurePIDControlInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    upstreamName_(word::null),
+    downstreamName_(word::null),
+    deltaP_(1),
+    shapeFactor_(0),
+    pName_("p"),
+    phiName_("phi"),
+    rhoName_("none"),
+    P_(0),
+    I_(0),
+    D_(0),
+    Q_(- gSum(*this & patch().Sf())),
+    error_(0),
+    errorIntegral_(0),
+    oldQ_(0),
+    oldError_(0),
+    oldErrorIntegral_(0),
+    timeIndex_(db().time().timeIndex())
+{}
+
+
+Foam::pressurePIDControlInletVelocityFvPatchVectorField::
+pressurePIDControlInletVelocityFvPatchVectorField
+(
+    const pressurePIDControlInletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    upstreamName_(ptf.upstreamName_),
+    downstreamName_(ptf.downstreamName_),
+    deltaP_(ptf.deltaP_),
+    shapeFactor_(ptf.shapeFactor_),
+    pName_(ptf.pName_),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_),
+    P_(ptf.P_),
+    I_(ptf.I_),
+    D_(ptf.D_),
+    Q_(ptf.Q_),
+    error_(ptf.error_),
+    errorIntegral_(ptf.errorIntegral_),
+    oldQ_(ptf.oldQ_),
+    oldError_(ptf.oldError_),
+    oldErrorIntegral_(ptf.oldErrorIntegral_),
+    timeIndex_(ptf.timeIndex_)
+{}
+
+
+Foam::pressurePIDControlInletVelocityFvPatchVectorField::
+pressurePIDControlInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    upstreamName_(dict.lookup("upstream")),
+    downstreamName_(dict.lookup("downstream")),
+    deltaP_(readScalar(dict.lookup("deltaP"))),
+    shapeFactor_(dict.lookupOrDefault<scalar>("shapeFactor", 0)),
+    pName_(dict.lookupOrDefault<word>("p", "p")),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "none")),
+    P_(readScalar(dict.lookup("P"))),
+    I_(readScalar(dict.lookup("I"))),
+    D_(readScalar(dict.lookup("D"))),
+    Q_(- gSum(*this & patch().Sf())),
+    error_(dict.lookupOrDefault<scalar>("error", 0)),
+    errorIntegral_(dict.lookupOrDefault<scalar>("errorIntegral", 0)),
+    oldQ_(0),
+    oldError_(0),
+    oldErrorIntegral_(0),
+    timeIndex_(db().time().timeIndex())
+{}
+
+
+Foam::pressurePIDControlInletVelocityFvPatchVectorField::
+pressurePIDControlInletVelocityFvPatchVectorField
+(
+    const pressurePIDControlInletVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    upstreamName_(ptf.upstreamName_),
+    downstreamName_(ptf.downstreamName_),
+    deltaP_(ptf.deltaP_),
+    shapeFactor_(ptf.shapeFactor_),
+    pName_(ptf.pName_),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_),
+    P_(ptf.P_),
+    I_(ptf.I_),
+    D_(ptf.D_),
+    Q_(ptf.Q_),
+    error_(ptf.error_),
+    errorIntegral_(ptf.errorIntegral_),
+    oldQ_(ptf.oldQ_),
+    oldError_(ptf.oldError_),
+    oldErrorIntegral_(ptf.oldErrorIntegral_),
+    timeIndex_(ptf.timeIndex_)
+{}
+
+
+Foam::pressurePIDControlInletVelocityFvPatchVectorField::
+pressurePIDControlInletVelocityFvPatchVectorField
+(
+    const pressurePIDControlInletVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    upstreamName_(ptf.upstreamName_),
+    downstreamName_(ptf.downstreamName_),
+    deltaP_(ptf.deltaP_),
+    shapeFactor_(ptf.shapeFactor_),
+    pName_(ptf.pName_),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_),
+    P_(ptf.P_),
+    I_(ptf.I_),
+    D_(ptf.D_),
+    Q_(ptf.Q_),
+    error_(ptf.error_),
+    errorIntegral_(ptf.errorIntegral_),
+    oldQ_(ptf.oldQ_),
+    oldError_(ptf.oldError_),
+    oldErrorIntegral_(ptf.oldErrorIntegral_),
+    timeIndex_(ptf.timeIndex_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::pressurePIDControlInletVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Get the mesh
+    const fvMesh& mesh(patch().boundaryMesh().mesh());
+
+    // Get the time step
+    const scalar deltaT(db().time().deltaTValue());
+
+    // Get the flux field
+    const surfaceScalarField& phi
+    (
+        db().lookupObject<surfaceScalarField>(phiName_)
+    );
+
+    // Update the old-time quantities
+    if (timeIndex_ != db().time().timeIndex())
+    {
+        timeIndex_ = db().time().timeIndex();
+        oldQ_ = Q_;
+        oldError_ = error_;
+        oldErrorIntegral_ = errorIntegral_;
+    }
+
+    // Get the density
+    scalar rho = 1;
+    if (phi.dimensions() == dimVelocity*dimArea)
+    {
+        // do nothing ...
+    }
+    else if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
+    {
+        const fvPatchField<scalar>& rhoField =
+            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+        rho = gSum(rhoField*patch().magSf())/gSum(patch().magSf());
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "The dimensions of the field " << phiName_
+            << "are not recognised. The dimensions are " << phi.dimensions()
+            << ". The dimensions should be either " << dimVelocity*dimArea
+            << " for an incompressible case, or "
+            << dimDensity*dimVelocity*dimArea << " for a compressible case."
+            << exit(FatalError);
+    }
+
+    // Patch properties
+    const scalar patchA = gSum(patch().magSf());
+    Q_ = - gSum(*this & patch().Sf());
+
+    // Face-zone properties (a is upstream, b is downstream)
+    scalar Aa, Ab;
+    vector xa, xb;
+    faceZoneAverage(upstreamName_, mesh.Cf(), Aa, xa);
+    faceZoneAverage(downstreamName_, mesh.Cf(), Ab, xb);
+    const scalar L = mag(xa - xb);
+    const scalar LbyALinear = L/(Aa - Ab)*log(Aa/Ab);
+    const scalar LbyAStep = L/2*(1/Aa + 1/Ab);
+    const scalar LbyA = (1 - shapeFactor_)*LbyALinear + shapeFactor_*LbyAStep;
+
+    // Initialise the pressure drop. If the pressure field does not exist, the
+    // pressure drop is assumed to be that specified. This removes the error,
+    // so there is no control and the analytic inlet velocity is applied. This
+    // scenario only ever going to be applicable to potentialFoam.
+    scalar deltaP = deltaP_;
+    if (db().foundObject<volScalarField>(pName_))
+    {
+        scalar pa, pb;
+        faceZoneAverage(upstreamName_, facePressure(), Aa, pa);
+        faceZoneAverage(downstreamName_, facePressure(), Ab, pb);
+        deltaP = pa - pb;
+    }
+    else
+    {
+        WarningInFunction
+            << "The pressure field name, \"pName\", is \"" << pName_ << "\", "
+            << "but a field of that name was not found. The inlet velocity "
+            << "will be set to an analytical value calculated from the "
+            << "specified pressure drop. No PID control will be done and "
+            << "transient effects will be ignored. This behaviour is designed "
+            << "to be appropriate for potentialFoam solutions. If you are "
+            << "getting this warning from another solver, you have probably "
+            << "specified an incorrect pressure name."
+            << endl << endl;
+    }
+
+    // Target and measured flow rates
+    scalar QTarget, QMeasured;
+    const scalar a = (1/sqr(Ab) - 1/sqr(Aa))/(2*rho);
+    if (!mesh.steady() && db().foundObject<volScalarField>(pName_))
+    {
+        const scalar b = LbyA/deltaT;
+        const scalar c = - LbyA/deltaT*oldQ_ /* - deltaP */;
+        QTarget = (- b + sqrt(sqr(b) - 4*a*(c - deltaP_)))/(2*a);
+        QMeasured = (- b + sqrt(sqr(b) - 4*a*(c - deltaP)))/(2*a);
+    }
+    else
+    {
+        QTarget = sqrt(deltaP_/a);
+        QMeasured = sqrt(deltaP/a);
+    }
+
+    // Errors
+    error_ = QTarget - QMeasured;
+    errorIntegral_ = oldErrorIntegral_ + 0.5*(error_ + oldError_);
+    const scalar errorDifferential = oldError_ - error_;
+
+    // Update the field
+    operator==
+    (
+      - patch().nf()
+       *(
+            QTarget
+          + P_*error_
+          + I_*errorIntegral_
+          + D_*errorDifferential
+        )/patchA
+    );
+
+    // Log output
+    if (debug)
+    {
+        const dimensionSet pDimensions(phi.dimensions()*dimVelocity/dimArea);
+        const scalar error = deltaP/deltaP_ - 1;
+        const scalar newQ = - gSum(*this & patch().Sf());
+        Info<< "pressurePIDControlInletVelocityFvPatchField " << patch().name()
+            << endl << "         "
+            << dimensionedScalar("U", dimVelocity, newQ/patchA)
+            << endl << "    "
+            << dimensionedScalar("deltaP", pDimensions, deltaP)
+            << " (" << mag(error)*100 << "\% "
+            << (error < 0 ? "below" : "above") << " the target)" << endl;
+    }
+
+    fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::pressurePIDControlInletVelocityFvPatchVectorField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<vector>::write(os);
+
+    os.writeKeyword("deltaP") << deltaP_ << token::END_STATEMENT << nl;
+    os.writeKeyword("upstream") << upstreamName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("downstream")
+        << downstreamName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("shapeFactor") << shapeFactor_
+        << token::END_STATEMENT << nl;
+    writeEntryIfDifferent<word>(os, "p", "p", pName_);
+    writeEntryIfDifferent<word>(os, "rho", "none", rhoName_);
+    os.writeKeyword("P") << P_ << token::END_STATEMENT << nl;
+    os.writeKeyword("I") << I_ << token::END_STATEMENT << nl;
+    os.writeKeyword("D") << D_ << token::END_STATEMENT << nl;
+    os.writeKeyword("error") << error_ << token::END_STATEMENT << nl;
+    os.writeKeyword("errorIntegral")
+        << errorIntegral_ << token::END_STATEMENT << nl;
+
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       pressurePIDControlInletVelocityFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..dac45b242d
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.H
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pressurePIDControlInletVelocityFvPatchVectorField
+
+Group
+    grpInletBoundaryConditions
+
+Description
+    This boundary condition tries to generate an inlet velocity that maintains
+    a specified pressure drop between two face zones downstream. The zones
+    should fully span a duct through which all the inlet flow passes.
+
+    An incompressible, lossless analysis of the flow between the inlet and the
+    two face-zones is performed. An ideal inlet velocity is thereby calculated
+    from the user-specified pressure drop. This analysis can include the
+    transient effect of the inlet velocity change. In this case, a shape factor
+    is included to represent non-linearity in the duct cross section.
+
+    The average pressure drop between the two face zones is measured. The same
+    incompressible, lossless analysis is performed using this pressure drop.
+    The difference between the two computed velocities is considered as an
+    error. The ideal inlet is modified so as to drive this error to zero. This
+    is accomplished by means of a PID control algorithm, for which
+    non-dimensional gains are specified by the user.
+
+    The shape factor takes a value of 0 for a linear change in cross sectional
+    area between the two face zones. A value of 1 represents a step change in
+    area at the mid-point between the zones. A smooth cubic or cosine profile
+    between two zones with zero divergence is typically represented by a factor
+    of between 0.2 and 0.25.
+
+    \heading Patch usage
+
+    \table
+        Property    | Description                 | Required | Default value
+        upstream    | upstream face zone name     | yes      |
+        downstream  | downstream face zone name   | yes      |
+        deltaP      | desired pressure drop       | yes      |
+        shapeFactor | non-linearity in the nozzle | no       | 0
+        p           | pressure field name         | no       | p
+        phi         | flux field name             | yes      | phi
+        rho         | density field name          | no       | none
+        P           | proportional gain           | yes      |
+        I           | integral gain               | yes      |
+        D           | differential gain           | yes      |
+    \endtable
+
+    Example of the boundary condition specification:
+
+    \verbatim
+    myPatch
+    {
+        type            pressurePIDControlInletVelocity;
+        upstream        upstream;
+        downstream      downstream;
+        deltaP          200;
+        shapeFactor     0;
+        p               p;
+        phi             phi;
+        rho             none;
+        P               0.5;
+        I               0.5;
+        D               0.1;
+        value           uniform (0 0 0);
+    }
+
+SeeAlso
+    Foam::fixedValueFvPatchField
+
+SourceFiles
+    pressurePIDControlInletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pressurePIDControlInletVelocityFvPatchVectorField_H
+#define pressurePIDControlInletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+     Class pressurePIDControlInletVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class pressurePIDControlInletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Name of the upstream face zone
+        const word upstreamName_;
+
+        //- Name of the downstream face zone
+        const word downstreamName_;
+
+        //- Desired pressure difference between upstream and downstream
+        const scalar deltaP_;
+
+        //- Nozzle shape factor
+        const scalar shapeFactor_;
+
+        //- Name of the pressure field
+        const word pName_;
+
+        //- Name of the flux field
+        const word phiName_;
+
+        //- Name of the density field (if any)
+        const word rhoName_;
+
+        //- Proportional gain
+        const scalar P_;
+
+        //- Integral gain
+        const scalar I_;
+
+        //- Derivative gain
+        const scalar D_;
+
+        //- Volumetric flow rate
+        scalar Q_;
+
+        //- Error
+        scalar error_;
+
+        //- Error integral w.r.t. time
+        scalar errorIntegral_;
+
+        //- Old volumetric flow rate
+        scalar oldQ_;
+
+        //- Old error
+        scalar oldError_;
+
+        //- Old error integral w.r.t. time
+        scalar oldErrorIntegral_;
+
+        //- Time index of the last update
+        label timeIndex_;
+
+
+    // Private member functions
+
+        //- Return the pressure interpolated to the faces
+        const surfaceScalarField& facePressure() const;
+
+        //- Calculate the average on a face zone
+        template <class Type>
+        void faceZoneAverage
+        (
+            const word& name,
+            const GeometricField<Type, fvsPatchField, surfaceMesh>& field,
+            scalar& area,
+            Type& average
+        ) const;
+
+
+public:
+
+   //- Runtime type information
+   TypeName("pressurePIDControlInletVelocity");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        pressurePIDControlInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        pressurePIDControlInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  flowRateInletVelocityFvPatchVectorField
+        //  onto a new patch
+        pressurePIDControlInletVelocityFvPatchVectorField
+        (
+            const pressurePIDControlInletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        pressurePIDControlInletVelocityFvPatchVectorField
+        (
+            const pressurePIDControlInletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new pressurePIDControlInletVelocityFvPatchVectorField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        pressurePIDControlInletVelocityFvPatchVectorField
+        (
+            const pressurePIDControlInletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new pressurePIDControlInletVelocityFvPatchVectorField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
new file mode 100644
index 0000000000..6bd1d95bc5
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceFields.H"
+#include "syncTools.H"
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template <class Type>
+void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage
+(
+    const word& name,
+    const GeometricField<Type, fvsPatchField, surfaceMesh>& field,
+    scalar& area,
+    Type& average
+) const
+{
+    const fvMesh& mesh(patch().boundaryMesh().mesh());
+
+    PackedBoolList isMasterFace(syncTools::getInternalOrMasterFaces(mesh));
+
+    const faceZone& zone = mesh.faceZones()[name];
+
+    area = 0;
+    average = pTraits<Type>::zero;
+
+    forAll(zone, faceI)
+    {
+        const label f(zone[faceI]);
+
+        if (mesh.isInternalFace(f))
+        {
+            const scalar da(mesh.magSf()[f]);
+
+            area += da;
+            average += da*field[f];
+        }
+        else if (isMasterFace[f])
+        {
+            const label bf(f-mesh.nInternalFaces());
+            const label patchID = mesh.boundaryMesh().patchID()[bf];
+            const label lf(mesh.boundaryMesh()[patchID].whichFace(f));
+            const scalar da(mesh.magSf().boundaryField()[patchID][lf]);
+
+            area += da;
+            average += da*field.boundaryField()[patchID][lf];
+        }
+    }
+
+    reduce(area, sumOp<scalar>());
+    reduce(average, sumOp<Type>());
+
+    average /= area;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 22b36b0844..3a49f4a680 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(ptf, p, iF, mapper),
-    omega_(ptf.omega_().clone().ptr())
+    omega_(ptf.omega_, false)
 {
     calcTangentialVelocity();
 }
@@ -99,7 +99,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(rppvf),
-    omega_(rppvf.omega_().clone().ptr())
+    omega_(rppvf.omega_, false)
 {
     calcTangentialVelocity();
 }
@@ -113,7 +113,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(rppvf, iF),
-    omega_(rppvf.omega_().clone().ptr())
+    omega_(rppvf.omega_, false)
 {
     calcTangentialVelocity();
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
index 87a9912861..83647fb782 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(ptf, p, iF, mapper),
-    omega_(ptf.omega_().clone().ptr())
+    omega_(ptf.omega_, false)
 {}
 
 
@@ -77,7 +77,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(rtppsf),
-    omega_(rtppsf.omega_().clone().ptr())
+    omega_(rtppsf.omega_, false)
 {}
 
 
@@ -89,7 +89,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(rtppsf, iF),
-    omega_(rtppsf.omega_().clone().ptr())
+    omega_(rtppsf.omega_, false)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index daa6a83903..82f5d2e28b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     origin_(ptf.origin_),
     axis_(ptf.axis_),
-    omega_(ptf.omega_().clone().ptr())
+    omega_(ptf.omega_, false)
 {}
 
 
@@ -97,7 +97,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(rwvpvf),
     origin_(rwvpvf.origin_),
     axis_(rwvpvf.axis_),
-    omega_(rwvpvf.omega_().clone().ptr())
+    omega_(rwvpvf.omega_, false)
 {}
 
 
@@ -111,7 +111,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(rwvpvf, iF),
     origin_(rwvpvf.origin_),
     axis_(rwvpvf.axis_),
-    omega_(rwvpvf.omega_().clone().ptr())
+    omega_(rwvpvf.omega_, false)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 2f2195c8ff..2d4b1691ce 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,11 +107,8 @@ supersonicFreestreamFvPatchVectorField
 
     if (pInf_ < SMALL)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "supersonicFreestreamFvPatchVectorField::"
-            "supersonicFreestreamFvPatchVectorField"
-            "(const fvPatch&, const vectorField&, const dictionary&)",
             dict
         )   << "    unphysical pInf specified (pInf <= 0.0)"
             << "\n    on patch " << this->patch().name()
@@ -183,10 +180,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
 
     if (MachInf < 1.0)
     {
-        FatalErrorIn
-        (
-            "supersonicFreestreamFvPatchVectorField::updateCoeffs()"
-        )   << "    MachInf < 1.0, free stream must be supersonic"
+        FatalErrorInFunction
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
@@ -283,10 +277,8 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
             }
             else // If subsonic
             {
-                FatalErrorIn
-                (
-                    "supersonicFreestreamFvPatchVectorField::updateCoeffs()"
-                )   << "unphysical subsonic inflow has been generated"
+                FatalErrorInFunction
+                    << "unphysical subsonic inflow has been generated"
                     << "\n    on patch " << this->patch().name()
                     << " of field " << this->dimensionedInternalField().name()
                     << " in file "
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 859006cd44..a871e91de0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,8 +59,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    flowRate_(ptf.flowRate_().clone().ptr()),
-    rpm_(ptf.rpm_().clone().ptr())
+    flowRate_(ptf.flowRate_, false),
+    rpm_(ptf.rpm_, false)
 {}
 
 
@@ -89,8 +89,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    flowRate_(ptf.flowRate_().clone().ptr()),
-    rpm_(ptf.rpm_().clone().ptr())
+    flowRate_(ptf.flowRate_, false),
+    rpm_(ptf.rpm_, false)
 {}
 
 
@@ -104,8 +104,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(ptf, iF),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
-    flowRate_(ptf.flowRate_().clone().ptr()),
-    rpm_(ptf.rpm_().clone().ptr())
+    flowRate_(ptf.flowRate_, false),
+    rpm_(ptf.rpm_, false)
 {}
 
 
@@ -155,10 +155,8 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()"
-        )   << "dimensions of " << phiName_ << " are incorrect" << nl
+        FatalErrorInFunction
+            << "dimensions of " << phiName_ << " are incorrect" << nl
             << "    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
             << " in file " << this->dimensionedInternalField().objectPath()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 3318c15dd6..20690258a3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -213,7 +213,7 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn("syringePressureFvPatchScalarField::updateCoeffs()")
+        FatalErrorInFunction
             << "dimensions of phi are not correct"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 48c3af199e..9187241217 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,38 +58,6 @@ timeVaryingMappedFixedValueFvPatchField
 {}
 
 
-template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
-timeVaryingMappedFixedValueFvPatchField
-(
-    const timeVaryingMappedFixedValueFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    fieldTableName_(ptf.fieldTableName_),
-    setAverage_(ptf.setAverage_),
-    perturb_(ptf.perturb_),
-    mapMethod_(ptf.mapMethod_),
-    mapperPtr_(NULL),
-    sampleTimes_(0),
-    startSampleTime_(-1),
-    startSampledValues_(0),
-    startAverage_(pTraits<Type>::zero),
-    endSampleTime_(-1),
-    endSampledValues_(0),
-    endAverage_(pTraits<Type>::zero),
-    offset_
-    (
-        ptf.offset_.valid()
-      ? ptf.offset_().clone().ptr()
-      : NULL
-    )
-{}
-
-
 template<class Type>
 timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
@@ -127,15 +95,8 @@ timeVaryingMappedFixedValueFvPatchField
      && mapMethod_ != "nearest"
     )
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "timeVaryingMappedFixedValueFvPatchField<Type>::\n"
-            "timeVaryingMappedFixedValueFvPatchField\n"
-            "(\n"
-            "    const fvPatch&\n"
-            "    const DimensionedField<Type, volMesh>&\n"
-            "    const dictionary&\n"
-            ")\n",
             dict
         )   << "mapMethod should be one of 'planarInterpolation'"
             << ", 'nearest'" << exit(FatalIOError);
@@ -159,6 +120,33 @@ timeVaryingMappedFixedValueFvPatchField
 }
 
 
+template<class Type>
+timeVaryingMappedFixedValueFvPatchField<Type>::
+timeVaryingMappedFixedValueFvPatchField
+(
+    const timeVaryingMappedFixedValueFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+    fieldTableName_(ptf.fieldTableName_),
+    setAverage_(ptf.setAverage_),
+    perturb_(ptf.perturb_),
+    mapMethod_(ptf.mapMethod_),
+    mapperPtr_(NULL),
+    sampleTimes_(0),
+    startSampleTime_(-1),
+    startSampledValues_(0),
+    startAverage_(pTraits<Type>::zero),
+    endSampleTime_(-1),
+    endSampledValues_(0),
+    endAverage_(pTraits<Type>::zero),
+    offset_(ptf.offset_, false)
+{}
+
+
 template<class Type>
 timeVaryingMappedFixedValueFvPatchField<Type>::
 timeVaryingMappedFixedValueFvPatchField
@@ -179,12 +167,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offset_
-    (
-        ptf.offset_.valid()
-      ? ptf.offset_().clone().ptr()
-      : NULL
-    )
+    offset_(ptf.offset_, false)
 {}
 
 
@@ -209,12 +192,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offset_
-    (
-        ptf.offset_.valid()
-      ? ptf.offset_().clone().ptr()
-      : NULL
-    )
+    offset_(ptf.offset_, false)
 {}
 
 
@@ -272,7 +250,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
             IOobject
             (
                 "points",
-                this->db().time().constant(),
+                this->db().time().caseConstant(),
                 "boundaryData"/this->patch().name(),
                 this->db(),
                 IOobject::MUST_READ,
@@ -304,7 +282,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
             new pointToPointPlanarInterpolation
             (
                 samplePoints,
-                 this->patch().patch().faceCentres(),
+                this->patch().patch().faceCentres(),
                 perturb_,
                 nearestOnly
             )
@@ -339,10 +317,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
 
     if (!foundTime)
     {
-        FatalErrorIn
-        (
-            "timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()"
-        )   << "Cannot find starting sampling values for current time "
+        FatalErrorInFunction
+            << "Cannot find starting sampling values for current time "
             << this->db().time().value() << nl
             << "Have sampling values for times "
             << pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl
@@ -392,7 +368,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
                 IOobject
                 (
                     fieldTableName_,
-                    this->db().time().constant(),
+                    this->db().time().caseConstant(),
                     "boundaryData"
                    /this->patch().name()
                    /sampleTimes_[startSampleTime_].name(),
@@ -405,11 +381,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
 
             if (vals.size() != mapperPtr_().sourceSize())
             {
-                FatalErrorIn
-                (
-                    "timeVaryingMappedFixedValueFvPatchField<Type>::"
-                    "checkTable()"
-                )   << "Number of values (" << vals.size()
+                FatalErrorInFunction
+                    << "Number of values (" << vals.size()
                     << ") differs from the number of points ("
                     <<  mapperPtr_().sourceSize()
                     << ") in file " << vals.objectPath() << exit(FatalError);
@@ -450,7 +423,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
                 IOobject
                 (
                     fieldTableName_,
-                    this->db().time().constant(),
+                    this->db().time().caseConstant(),
                     "boundaryData"
                    /this->patch().name()
                    /sampleTimes_[endSampleTime_].name(),
@@ -463,11 +436,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
 
             if (vals.size() != mapperPtr_().sourceSize())
             {
-                FatalErrorIn
-                (
-                    "timeVaryingMappedFixedValueFvPatchField<Type>::"
-                    "checkTable()"
-                )   << "Number of values (" << vals.size()
+                FatalErrorInFunction
+                    << "Number of values (" << vals.size()
                     << ") differs from the number of points ("
                     <<  mapperPtr_().sourceSize()
                     << ") in file " << vals.objectPath() << exit(FatalError);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index c6af05f254..b7b46003c9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -204,10 +204,8 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
     }
     else
     {
-        FatalErrorIn
-        (
-            "totalPressureFvPatchScalarField::updateCoeffs()"
-        )   << " rho or psi set inconsistently, rho = " << rhoName_
+        FatalErrorInFunction
+            << " rho or psi set inconsistently, rho = " << rhoName_
             << ", psi = " << psiName_ << ".\n"
             << "    Set either rho or psi or neither depending on the "
                "definition of total pressure." << nl
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index a506694147..432d1e908d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,16 +77,8 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
 
     if (intensity_ < 0 || intensity_ > 1)
     {
-        FatalErrorIn
-        (
-            "turbulentIntensityKineticEnergyInletFvPatchScalarField::"
-            "turbulentIntensityKineticEnergyInletFvPatchScalarField"
-            "("
-                "const fvPatch&, "
-                "const DimensionedField<scalar, volMesh>&, "
-                "const dictionary&"
-            ")"
-        )   << "Turbulence intensity should be specified as a fraction 0-1 "
+        FatalErrorInFunction
+            << "Turbulence intensity should be specified as a fraction 0-1 "
                "of the mean velocity\n"
                "    value given is " << intensity_ << nl
             << "    on patch " << this->patch().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index 0a5a113d90..aa7c057a7a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -52,24 +52,6 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 {}
 
 
-template<class Type>
-Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
-(
-    const uniformFixedGradientFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedGradientFvPatchField<Type>(ptf, p, iF, mapper),
-    uniformGradient_(ptf.uniformGradient_().clone().ptr())
-{
-    // For safety re-evaluate
-    const scalar t = this->db().time().timeOutputValue();
-    this->gradient() = uniformGradient_->value(t);
-}
-
-
 template<class Type>
 Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 (
@@ -81,20 +63,24 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
     fixedGradientFvPatchField<Type>(p, iF),
     uniformGradient_(DataEntry<Type>::New("uniformGradient", dict))
 {
-    if (dict.found("gradient"))
-    {
-        this->gradient() = Field<Type>("gradient", dict, p.size());
-    }
-    else
-    {
-        const scalar t = this->db().time().timeOutputValue();
-        this->gradient() = uniformGradient_->value(t);
-    }
-
-    fixedGradientFvPatchField<Type>::evaluate();
+    this->evaluate();
 }
 
 
+template<class Type>
+Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
+(
+    const uniformFixedGradientFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchField<Type>(ptf, p, iF, mapper),
+    uniformGradient_(ptf.uniformGradient_, false)
+{}
+
+
 template<class Type>
 Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 (
@@ -102,12 +88,7 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf),
-    uniformGradient_
-    (
-        ptf.uniformGradient_.valid()
-      ? ptf.uniformGradient_().clone().ptr()
-      : NULL
-    )
+    uniformGradient_(ptf.uniformGradient_, false)
 {}
 
 
@@ -119,19 +100,12 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
 )
 :
     fixedGradientFvPatchField<Type>(ptf, iF),
-    uniformGradient_
-    (
-        ptf.uniformGradient_.valid()
-      ? ptf.uniformGradient_().clone().ptr()
-      : NULL
-    )
+    uniformGradient_(ptf.uniformGradient_, false)
 {
-    // For safety re-evaluate
-    const scalar t = this->db().time().timeOutputValue();
-
+    // Evaluate the profile if defined
     if (ptf.uniformGradient_.valid())
     {
-        this->gradient() = uniformGradient_->value(t);
+        this->evaluate();
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
index 5659297fec..2ad895b362 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,12 +164,8 @@ public:
 
     // Member functions
 
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
+        //- 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/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
index e587038890..8d52b8700d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C
@@ -52,24 +52,6 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 {}
 
 
-template<class Type>
-Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
-(
-    const uniformFixedValueFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(p, iF),  // bypass mapper
-    uniformValue_(ptf.uniformValue_().clone().ptr())
-{
-    // Evaluate since value not mapped
-    const scalar t = this->db().time().timeOutputValue();
-    fvPatchField<Type>::operator==(uniformValue_->value(t));
-}
-
-
 template<class Type>
 Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 (
@@ -81,8 +63,24 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
     fixedValueFvPatchField<Type>(p, iF),
     uniformValue_(DataEntry<Type>::New("uniformValue", dict))
 {
-    const scalar t = this->db().time().timeOutputValue();
-    fvPatchField<Type>::operator==(uniformValue_->value(t));
+    this->evaluate();
+}
+
+
+template<class Type>
+Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
+(
+    const uniformFixedValueFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(p, iF),   // Don't map
+    uniformValue_(ptf.uniformValue_, false)
+{
+    // Evaluate since value not mapped
+    this->evaluate();
 }
 
 
@@ -93,12 +91,7 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf),
-    uniformValue_
-    (
-        ptf.uniformValue_.valid()
-      ? ptf.uniformValue_().clone().ptr()
-      : NULL
-    )
+    uniformValue_(ptf.uniformValue_, false)
 {}
 
 
@@ -110,19 +103,12 @@ Foam::uniformFixedValueFvPatchField<Type>::uniformFixedValueFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(ptf, iF),
-    uniformValue_
-    (
-        ptf.uniformValue_.valid()
-      ? ptf.uniformValue_().clone().ptr()
-      : NULL
-    )
+    uniformValue_(ptf.uniformValue_, false)
 {
-    // For safety re-evaluate
-    const scalar t = this->db().time().timeOutputValue();
-
+    // Evaluate the profile if defined
     if (ptf.uniformValue_.valid())
     {
-        fvPatchField<Type>::operator==(uniformValue_->value(t));
+        this->evaluate();
     }
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
index 072d02f1b6..6d77aa8857 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,12 +163,8 @@ public:
 
     // Member functions
 
-
-        // Evaluation functions
-
-            //- Update the coefficients associated with the patch field
-            virtual void updateCoeffs();
-
+        //- 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/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 4f195b3544..8ef6ab0d42 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,37 +43,6 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 }
 
 
-template<class Type>
-Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
-(
-    const uniformInletOutletFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(p, iF),
-    phiName_(ptf.phiName_),
-    uniformInletValue_(ptf.uniformInletValue_, false)
-{
-    this->patchType() = ptf.patchType();
-
-    // For safety re-evaluate
-    const scalar t = this->db().time().timeOutputValue();
-    this->refValue() = uniformInletValue_->value(t);
-    this->refGrad() = pTraits<Type>::zero;
-    this->valueFraction() = 0.0;
-
-    // Map value (unmapped get refValue)
-    if (notNull(iF) && iF.size())
-    {
-        fvPatchField<Type>::operator=(this->refValue());
-    }
-    this->map(ptf, mapper);
-
-}
-
-
 template<class Type>
 Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 (
@@ -106,6 +75,35 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 }
 
 
+template<class Type>
+Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
+(
+    const uniformInletOutletFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(p, iF),  // Don't map
+    phiName_(ptf.phiName_),
+    uniformInletValue_(ptf.uniformInletValue_, false)
+{
+    this->patchType() = ptf.patchType();
+
+    // Evaluate refValue since not mapped
+    const scalar t = this->db().time().timeOutputValue();
+    this->refValue() = uniformInletValue_->value(t);
+
+    this->refGrad() = pTraits<Type>::zero;
+    this->valueFraction() = 0.0;
+
+    // Initialize the patch value to the refValue
+    fvPatchField<Type>::operator=(this->refValue());
+
+    this->map(ptf, mapper);
+}
+
+
 template<class Type>
 Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
index cc9e2d0a9d..2ab8c72ee8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -193,7 +193,6 @@ public:
     // Member operators
 
         virtual void operator=(const fvPatchField<Type>& pvf);
-
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index 250442dad0..046d9bbeb8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(ptf, p, iF, mapper),
-    jumpTable_(ptf.jumpTable_().clone().ptr())
+    jumpTable_(ptf.jumpTable_, false)
 {}
 
 
@@ -90,7 +90,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(ptf),
-    jumpTable_(ptf.jumpTable_().clone().ptr())
+    jumpTable_(ptf.jumpTable_, false)
 {}
 
 
@@ -102,7 +102,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 )
 :
     fixedJumpFvPatchField<Type>(ptf, iF),
-    jumpTable_(ptf.jumpTable_().clone().ptr())
+    jumpTable_(ptf.jumpTable_, false)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
index 0670119ab0..7b2d55e1eb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(ptf, p, iF, mapper),
-    jumpTable_(ptf.jumpTable_().clone().ptr())
+    jumpTable_(ptf.jumpTable_, false)
 {}
 
 
@@ -87,7 +87,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(ptf),
-    jumpTable_(ptf.jumpTable_().clone().ptr())
+    jumpTable_(ptf.jumpTable_, false)
 {}
 
 
@@ -99,7 +99,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 )
 :
     fixedJumpAMIFvPatchField<Type>(ptf, iF),
-    jumpTable_(ptf.jumpTable_().clone().ptr())
+    jumpTable_(ptf.jumpTable_, false)
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 7b7c08ed95..52ecf6fe4f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,8 +73,8 @@ uniformTotalPressureFvPatchScalarField
     }
     else
     {
-        scalar p0 = pressure_->value(this->db().time().timeOutputValue());
-        fvPatchField<scalar>::operator=(p0);
+        const scalar t = this->db().time().timeOutputValue();
+        fvPatchScalarField::operator==(pressure_->value(t));
     }
 }
 
@@ -88,15 +88,18 @@ uniformTotalPressureFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(p, iF),  // bypass mapper
+    fixedValueFvPatchScalarField(p, iF),  // Don't map
     UName_(ptf.UName_),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
     psiName_(ptf.psiName_),
     gamma_(ptf.gamma_),
-    pressure_(ptf.pressure_().clone().ptr())
+    pressure_(ptf.pressure_, false)
 {
-    // Evaluate since value not mapped
+    patchType() = ptf.patchType();
+
+    // Set the patch pressure to the current total pressure
+    // This is not ideal but avoids problems with the creation of patch faces
     const scalar t = this->db().time().timeOutputValue();
     fvPatchScalarField::operator==(pressure_->value(t));
 }
@@ -114,12 +117,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(ptf.rhoName_),
     psiName_(ptf.psiName_),
     gamma_(ptf.gamma_),
-    pressure_
-    (
-        ptf.pressure_.valid()
-      ? ptf.pressure_().clone().ptr()
-      : NULL
-    )
+    pressure_(ptf.pressure_, false)
 {}
 
 
@@ -136,12 +134,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(ptf.rhoName_),
     psiName_(ptf.psiName_),
     gamma_(ptf.gamma_),
-    pressure_
-    (
-        ptf.pressure_.valid()
-      ? ptf.pressure_().clone().ptr()
-      : NULL
-    )
+    pressure_(ptf.pressure_, false)
 {}
 
 
@@ -199,7 +192,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
     }
     else
     {
-        FatalErrorIn("uniformTotalPressureFvPatchScalarField::updateCoeffs()")
+        FatalErrorInFunction
             << " rho or psi set inconsitently, rho = " << rhoName_
             << ", psi = " << psiName_ << ".\n"
             << "    Set either rho or psi or neither depending on the "
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index ba6db1315c..04d46c8eed 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -208,10 +208,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
         }
         default:
         {
-            FatalErrorIn
-            (
-                "waveSurfacePressureFvPatchScalarField<Type>::updateCoeffs()"
-            )   << "    Unsupported temporal differencing scheme : "
+            FatalErrorInFunction
                 << ddtSchemeName << nl
                 << "    on patch " << this->patch().name()
                 << " of field " << this->dimensionedInternalField().name()
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 21aad2c1ce..ac50365efd 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -98,7 +98,7 @@ Foam::fvPatchField<Type>::fvPatchField
     patchType_(ptf.patchType_)
 {
     // For unmapped faces set to internal field value (zero-gradient)
-    if (notNull(iF) && iF.size())
+    if (notNull(iF) && mapper.hasUnmapped())
     {
         fvPatchField<Type>::operator=(this->patchInternalField());
     }
@@ -135,15 +135,8 @@ Foam::fvPatchField<Type>::fvPatchField
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "fvPatchField<Type>::fvPatchField"
-            "("
-            "const fvPatch& p,"
-            "const DimensionedField<Type, volMesh>& iF,"
-            "const dictionary& dict,"
-            "const bool valueRequired"
-            ")",
             dict
         )   << "Essential entry 'value' missing"
             << exit(FatalIOError);
@@ -196,7 +189,7 @@ void Foam::fvPatchField<Type>::check(const fvPatchField<Type>& ptf) const
 {
     if (&patch_ != &(ptf.patch_))
     {
-        FatalErrorIn("PatchField<Type>::check(const fvPatchField<Type>&)")
+        FatalErrorInFunction
             << "different patches for fvPatchField<Type>s"
             << abort(FatalError);
     }
@@ -233,7 +226,7 @@ void Foam::fvPatchField<Type>::autoMap
 {
     Field<Type>& f = *this;
 
-    if (!this->size())
+    if (!this->size() && !mapper.distributed())
     {
         f.setSize(mapper.size());
         if (f.size())
@@ -246,39 +239,41 @@ void Foam::fvPatchField<Type>::autoMap
         // Map all faces provided with mapping data
         Field<Type>::autoMap(mapper);
 
+
         // For unmapped faces set to internal field value (zero-gradient)
-        if
-        (
-            mapper.direct()
-         && notNull(mapper.directAddressing())
-         && mapper.directAddressing().size()
-        )
+        if (mapper.hasUnmapped())
         {
             Field<Type> pif(this->patchInternalField());
 
-            const labelList& mapAddressing = mapper.directAddressing();
-
-            forAll(mapAddressing, i)
+            if
+            (
+                mapper.direct()
+             && notNull(mapper.directAddressing())
+             && mapper.directAddressing().size()
+            )
             {
-                if (mapAddressing[i] < 0)
+                const labelList& mapAddressing = mapper.directAddressing();
+
+                forAll(mapAddressing, i)
                 {
-                    f[i] = pif[i];
+                    if (mapAddressing[i] < 0)
+                    {
+                        f[i] = pif[i];
+                    }
                 }
             }
-        }
-        else if (!mapper.direct() && mapper.addressing().size())
-        {
-            Field<Type> pif(this->patchInternalField());
-
-            const labelListList& mapAddressing = mapper.addressing();
-
-            forAll(mapAddressing, i)
+            else if (!mapper.direct() && mapper.addressing().size())
             {
-                const labelList& localAddrs = mapAddressing[i];
+                const labelListList& mapAddressing = mapper.addressing();
 
-                if (!localAddrs.size())
+                forAll(mapAddressing, i)
                 {
-                    f[i] = pif[i];
+                    const labelList& localAddrs = mapAddressing[i];
+
+                    if (!localAddrs.size())
+                    {
+                        f[i] = pif[i];
+                    }
                 }
             }
         }
@@ -433,10 +428,8 @@ void Foam::fvPatchField<Type>::operator*=
 {
     if (&patch_ != &ptf.patch())
     {
-        FatalErrorIn
-        (
-            "PatchField<Type>::operator*=(const fvPatchField<scalar>& ptf)"
-        )   << "incompatible patches for patch fields"
+        FatalErrorInFunction
+            << "incompatible patches for patch fields"
             << abort(FatalError);
     }
 
@@ -452,10 +445,7 @@ void Foam::fvPatchField<Type>::operator/=
 {
     if (&patch_ != &ptf.patch())
     {
-        FatalErrorIn
-        (
-            "PatchField<Type>::operator/=(const fvPatchField<scalar>& ptf)"
-        )   << "    incompatible patches for patch fields"
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 5e9682634f..dae962c303 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -386,10 +386,7 @@ public:
                 const scalarField& deltaCoeffs
             ) const
             {
-                notImplemented
-                (
-                    type() + "::snGrad(const scalarField& deltaCoeffs)"
-                );
+                NotImplemented;
                 return *this;
             }
 
@@ -411,7 +408,7 @@ public:
             //- Return patchField on the opposite patch of a coupled patch
             virtual tmp<Field<Type> > patchNeighbourField() const
             {
-                notImplemented(type() + "patchNeighbourField()");
+                NotImplemented;
                 return *this;
             }
 
@@ -436,11 +433,7 @@ public:
                 const tmp<Field<scalar> >&
             ) const
             {
-                notImplemented
-                (
-                    type()
-                  + "::valueInternalCoeffs(const tmp<Field<scalar> >&)"
-                );
+                NotImplemented;
                 return *this;
             }
 
@@ -451,11 +444,7 @@ public:
                 const tmp<Field<scalar> >&
             ) const
             {
-                notImplemented
-                (
-                    type()
-                  + "::valueBoundaryCoeffs(const tmp<Field<scalar> >&)"
-                );
+                NotImplemented;
                 return *this;
             }
 
@@ -463,7 +452,7 @@ public:
             //  evaluation of the gradient of this patchField
             virtual tmp<Field<Type> > gradientInternalCoeffs() const
             {
-                notImplemented(type() + "::gradientInternalCoeffs()");
+                NotImplemented;
                 return *this;
             }
 
@@ -475,11 +464,7 @@ public:
                 const scalarField& deltaCoeffs
             ) const
             {
-                notImplemented
-                (
-                    type()
-                  + "::gradientInternalCoeffs(const scalarField& deltaCoeffs)"
-                );
+                NotImplemented;
                 return *this;
             }
 
@@ -487,7 +472,7 @@ public:
             //  evaluation of the gradient of this patchField
             virtual tmp<Field<Type> > gradientBoundaryCoeffs() const
             {
-                notImplemented(type() + "::gradientBoundaryCoeffs()");
+                NotImplemented;
                 return *this;
             }
 
@@ -499,11 +484,7 @@ public:
                 const scalarField& deltaCoeffs
             ) const
             {
-                notImplemented
-                (
-                    type()
-                  + "::gradientBoundaryCoeffs(const scalarField& deltaCoeffs)"
-                );
+                NotImplemented;
                 return *this;
             }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index e9eed24fae..a88caa7b66 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,11 +49,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
 
     if (cstrIter == patchConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "fvPatchField<Type>::New(const word&, const word&, const fvPatch&,"
-            "const DimensionedField<Type, volMesh>&)"
-        )   << "Unknown patchField type "
+        FatalErrorInFunction
+            << "Unknown patchField type "
             << patchFieldType << nl << nl
             << "Valid patchField types are :" << endl
             << patchConstructorTablePtr_->sortedToc()
@@ -134,11 +131,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "fvPatchField<Type>::New(const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const dictionary&)",
                 dict
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << nl << nl
@@ -163,11 +157,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
          && patchTypeCstrIter() != cstrIter()
         )
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "fvPatchField<Type>::New(const fvPatch&, "
-                "const DimensionedField<Type, volMesh>&, "
-                "const dictionary&)",
                 dict
             )   << "inconsistent patch and patchField types for \n"
                    "    patch type " << p.type()
@@ -203,12 +194,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
 
     if (cstrIter == patchMapperConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "fvPatchField<Type>::New(const fvPatchField<Type>&, "
-            "const fvPatch&, const DimensionedField<Type, volMesh>&, "
-            "const fvPatchFieldMapper&)"
-        )   << "Unknown patchField type " << ptf.type() << nl << nl
+        FatalErrorInFunction
+            << "Unknown patchField type " << ptf.type() << nl << nl
             << "Valid patchField types are :" << endl
             << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index d9c4e7b236..acef68f928 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,12 +69,7 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
 :
     fvsPatchField<Type>(ptf, p, iF, mapper)
 {
-    notImplemented
-    (
-        "slicedFvsPatchField<Type>::"
-        "slicedFvsPatchField(const slicedFvsPatchField<Type>&, "
-        "const fvPatch&, const Field<Type>&, const fvPatchFieldMapper&)"
-    );
+    NotImplemented;
 }
 
 
@@ -88,11 +83,7 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
 :
     fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
 {
-    notImplemented
-    (
-        "slicedFvsPatchField<Type>::"
-        "slicedFvsPatchField(const Field<Type>&, const dictionary&)"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
index fc6aa90d67..6134ed61fa 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,16 +58,8 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
 {
     if (!isA<cyclicFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicFvsPatchField<Type>::cyclicFvsPatchField\n"
-            "(\n"
-            "    const cyclicFvsPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -89,14 +81,8 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
 {
     if (!isA<cyclicFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicFvsPatchField<Type>::cyclicFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not cyclic type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C
index 7fc9d7688c..d230e64d5a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,16 +53,8 @@ Foam::cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField
 {
     if (!isA<cyclicACMIFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField\n"
-            "("
-                "const cyclicACMIFvsPatchField<Type>&, "
-                "const fvPatch&, "
-                "const DimensionedField<Type, surfaceMesh>&, "
-                "const fvPatchFieldMapper&"
-            ")"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -84,14 +76,8 @@ Foam::cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField
 {
     if (!isA<cyclicACMIFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField"
-            "("
-                "const fvPatch&, "
-                "const Field<Type>&, "
-                "const dictionary&"
-            ")",
             dict
         )   << "patch " << this->patch().index() << " not cyclicACMI type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C
index 0ffe6b9c95..4b92ffe893 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,16 +53,8 @@ Foam::cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField
 {
     if (!isA<cyclicAMIFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField\n"
-            "("
-                "const cyclicAMIFvsPatchField<Type>&, "
-                "const fvPatch&, "
-                "const DimensionedField<Type, surfaceMesh>&, "
-                "const fvPatchFieldMapper&"
-            ")"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -84,14 +76,8 @@ Foam::cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField
 {
     if (!isA<cyclicAMIFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField"
-            "("
-                "const fvPatch&, "
-                "const Field<Type>&, "
-                "const dictionary&"
-            ")",
             dict
         )   << "patch " << this->patch().index() << " not cyclicAMI type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
index c8929e3761..3af9ea3168 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,16 +58,8 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
 {
     if (!isType<emptyFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "emptyFvsPatchField<Type>::emptyFvsPatchField\n"
-            "(\n"
-            "    const emptyFvsPatchField<Type>&,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -88,14 +80,8 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
 {
     if (!isType<emptyFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "emptyFvsPatchField<Type>::emptyFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not empty type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
index 68a89e8a76..68eaf04816 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,16 +72,8 @@ processorFvsPatchField<Type>::processorFvsPatchField
 {
     if (!isType<processorFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "processorFvsPatchField<Type>::processorFvsPatchField\n"
-            "(\n"
-            "    const processorFvsPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -103,14 +95,8 @@ processorFvsPatchField<Type>::processorFvsPatchField
 {
     if (!isType<processorFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "processorFvsPatchField<Type>::processorFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not processor type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
index fd63df9dd2..e633442aca 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,16 +72,8 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 {
     if (!isType<processorCyclicFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField\n"
-            "(\n"
-            "    const processorCyclicFvsPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -103,14 +95,8 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 {
     if (!isType<processorCyclicFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not processor type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
index 21ec540826..104052a54b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,16 +56,8 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
 {
     if (!isType<symmetryFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "symmetryFvsPatchField<Type>::symmetryFvsPatchField\n"
-            "(\n"
-            "    const symmetryFvsPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -86,14 +78,8 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
 {
     if (!isType<symmetryFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "symmetryFvsPatchField<Type>::symmetryFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not symmetry type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
index 9e3477d586..ade5b53c0e 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,16 +56,8 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 {
     if (!isType<symmetryPlaneFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField\n"
-            "(\n"
-            "    const symmetryPlaneFvsPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -86,14 +78,8 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 {
     if (!isType<symmetryPlaneFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not symmetryPlane type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
index efa68137bd..ec31c57f1b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,16 +56,8 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
 {
     if (!isType<wedgeFvPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "wedgeFvsPatchField<Type>::wedgeFvsPatchField\n"
-            "(\n"
-            "    const wedgeFvsPatchField<Type>& ptf,\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const fvPatchFieldMapper& mapper\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
@@ -86,14 +78,8 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
 {
     if (!isType<wedgeFvPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "wedgeFvsPatchField<Type>::wedgeFvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const Field<Type>& field,\n"
-            "    dictionary& dict\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not wedge type. "
             << "Patch type = " << p.type()
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 99dea901df..713f876c7d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,14 +98,8 @@ fvsPatchField<Type>::fvsPatchField
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "fvsPatchField<Type>::fvsPatchField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<Type, surfaceMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n",
             dict
         )   << "essential value entry not provided"
             << exit(FatalIOError);
@@ -152,7 +146,7 @@ void fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
 {
     if (&patch_ != &(ptf.patch_))
     {
-        FatalErrorIn("PatchField<Type>::check(const fvsPatchField<Type>&)")
+        FatalErrorInFunction
             << "different patches for fvsPatchField<Type>s"
             << abort(FatalError);
     }
@@ -244,10 +238,8 @@ void fvsPatchField<Type>::operator*=
 {
     if (&patch_ != &ptf.patch())
     {
-        FatalErrorIn
-        (
-            "PatchField<Type>::operator*=(const fvsPatchField<scalar>& ptf)"
-        )   << "incompatible patches for patch fields"
+        FatalErrorInFunction
+            << "incompatible patches for patch fields"
             << abort(FatalError);
     }
 
@@ -263,10 +255,7 @@ void fvsPatchField<Type>::operator/=
 {
     if (&patch_ != &ptf.patch())
     {
-        FatalErrorIn
-        (
-            "PatchField<Type>::operator/=(const fvsPatchField<scalar>& ptf)"
-        )   << "    incompatible patches for patch fields"
+        FatalErrorInFunction
             << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
index 038b874f14..b1f0d186da 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,11 +52,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 
     if (cstrIter == patchConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "fvsPatchField<Type>::New(const word&, const word&, const fvPatch&"
-            ", const Field<Type>&)"
-        )   << "Unknown patchField type "
+        FatalErrorInFunction
+            << "Unknown patchField type "
             << patchFieldType << nl << nl
             << "Valid patchField types are :" << endl
             << patchConstructorTablePtr_->sortedToc()
@@ -130,10 +127,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "fvsPatchField<Type>::New(const fvPatch&, const Field<Type>&, "
-                "const dictionary&)",
                 dict
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << nl << nl
@@ -158,10 +153,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
          && patchTypeCstrIter() != cstrIter()
         )
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "fvsPatchField<Type>const fvPatch&, const Field<Type>&, "
-                "const dictionary&)",
                 dict
             )   << "inconsistent patch and patchField types for \n"
                    "    patch type " << p.type()
@@ -199,12 +192,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 
     if (cstrIter == patchMapperConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "fvsPatchField<Type>::New(const fvsPatchField<Type>&, "
-            "const fvPatch&, const Field<Type>&, "
-            "const fvPatchFieldMapper&)"
-        )   << "Unknown patchField type " << ptf.type() << nl << nl
+        FatalErrorInFunction
+            << "Unknown patchField type " << ptf.type() << nl << nl
             << "Valid patchField types are :" << endl
             << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index 14290732fb..a7bbdeed72 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,10 +71,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "convectionScheme<Type>::New"
-            "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
@@ -89,10 +87,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "convectionScheme<Type>::New"
-            "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Unknown convection scheme " << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
@@ -126,12 +122,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "convectionScheme<Type>::New"
-               "(const fvMesh&, "
-               "const typename multivariateSurfaceInterpolationScheme<Type>"
-               "::fieldTable&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
@@ -146,12 +138,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
 
     if (cstrIter == MultivariateConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "convectionScheme<Type>::New"
-            "(const fvMesh&, "
-            "const typename multivariateSurfaceInterpolationScheme<Type>"
-            "::fieldTable&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Unknown convection scheme " << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
@@ -177,10 +165,8 @@ void convectionScheme<Type>::operator=(const convectionScheme<Type>& cs)
 {
     if (this == &cs)
     {
-        FatalErrorIn
-        (
-            "convectionScheme<Type>::operator=(const convectionScheme<Type>&)"
-        )   << "attempted assignment to self"
+        FatalErrorInFunction
+            << "attempted assignment to self"
             << abort(FatalError);
     }
 }
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
index 158ff21a13..83b50416e9 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ public:
             {
                 fileNameList controlDictFiles(findEtcFiles("controlDict"));
 
-                IOWarningIn("gaussConvectionScheme", is)
+                IOWarningInFunction(is)
                     << "Unbounded 'Gauss' div scheme used in "
                        "steady-state solver, use 'bounded Gauss' "
                        "to ensure boundedness.\n"
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index e884642c71..da24924115 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,9 +57,8 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "d2dt2Scheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "D2dt2 scheme not specified" << endl << endl
             << "Valid d2dt2 schemes are :" << endl
@@ -74,9 +73,8 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "d2dt2Scheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Unknown d2dt2 scheme " << schemeName << nl << nl
             << "Valid d2dt2 schemes are :" << endl
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index b35a6d2d44..64cfa89943 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,7 +141,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::CofrDeltaT() const
     }
     else
     {
-        FatalErrorIn("CoEulerDdtScheme<Type>::CofrDeltaT() const")
+        FatalErrorInFunction
             << "Incorrect dimensions of phi: " << phi.dimensions()
             << abort(FatalError);
 
@@ -717,10 +717,8 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "CoEulerDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of Uf are not correct"
+        FatalErrorInFunction
+            << "dimensions of Uf are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
@@ -781,10 +779,8 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "CoEulerDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 7513ac2870..79f89460bd 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1323,10 +1323,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of Uf are not correct"
+        FatalErrorInFunction
+            << "dimensions of Uf are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
@@ -1420,10 +1418,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index 1568890ded..db2c5a08f0 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -208,9 +208,8 @@ public:
         {
             if (ocCoeff_ < 0 || ocCoeff_ > 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "CrankNicolsonDdtScheme(const fvMesh& mesh, Istream& is)",
                     is
                 )   << "Off-centreing coefficient = " << ocCoeff_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 085bb99716..1d64797ac7 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -606,10 +606,8 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "EulerDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of Uf are not correct"
+        FatalErrorInFunction
+            << "dimensions of Uf are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
@@ -670,10 +668,8 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "EulerDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 9693974f59..6873c38431 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
     }
     else
     {
-        FatalErrorIn("SLTSDdtScheme<Type>::CofrDeltaT() const")
+        FatalErrorInFunction
             << "Incorrect dimensions of phi: " << phi.dimensions()
             << abort(FatalError);
     }
@@ -719,10 +719,8 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "SLTSDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of Uf are not correct"
+        FatalErrorInFunction
+            << "dimensions of Uf are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
@@ -783,10 +781,8 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "SLTSDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 049fd781ab..9d17e8dbfc 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -828,10 +828,8 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "backwardDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
@@ -906,10 +904,8 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "backwardDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 8428f981f6..8777ec8973 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -57,9 +57,8 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "ddtScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Ddt scheme not specified" << endl << endl
             << "Valid ddt schemes are :" << endl
@@ -74,9 +73,8 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "ddtScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Unknown ddt scheme " << schemeName << nl << nl
             << "Valid ddt schemes are :" << endl
@@ -105,7 +103,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > ddtScheme<Type>::fvcDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    notImplemented("fvmDdt(alpha, rho, psi");
+    NotImplemented;
 
     return tmp<GeometricField<Type, fvPatchField, volMesh> >
     (
@@ -122,7 +120,7 @@ tmp<fvMatrix<Type> > ddtScheme<Type>::fvmDdt
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    notImplemented("fvmDdt(alpha, rho, psi");
+    NotImplemented;
 
     return tmp<fvMatrix<Type> >
     (
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index a8d4301c57..5c35996c38 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -288,7 +288,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtUfCorr                               \
     const surfaceScalarField& Uf                                               \
 )                                                                              \
 {                                                                              \
-    notImplemented(#SS"<scalar>::fvcDdtUfCorr");                               \
+    NotImplemented;                               \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
@@ -299,7 +299,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr                              \
     const surfaceScalarField& phi                                              \
 )                                                                              \
 {                                                                              \
-    notImplemented(#SS"<scalar>::fvcDdtPhiCorr");                              \
+    NotImplemented;                              \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
@@ -311,7 +311,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtUfCorr                               \
     const surfaceScalarField& Uf                                               \
 )                                                                              \
 {                                                                              \
-    notImplemented(#SS"<scalar>::fvcDdtUfCorr");                               \
+    NotImplemented;                               \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
@@ -323,7 +323,7 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr                              \
     const surfaceScalarField& phi                                              \
 )                                                                              \
 {                                                                              \
-    notImplemented(#SS"<scalar>::fvcDdtPhiCorr");                              \
+    NotImplemented;                              \
     return surfaceScalarField::null();                                         \
 }                                                                              \
                                                                                \
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
index 4b56cd4c3c..e18f10c95c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@@ -613,10 +613,8 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "localEulerDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of Uf are not correct"
+        FatalErrorInFunction
+            << "dimensions of Uf are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
@@ -677,10 +675,8 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
     }
     else
     {
-        FatalErrorIn
-        (
-            "localEulerDdtScheme<Type>::fvcDdtPhiCorr"
-        )   << "dimensions of phi are not correct"
+        FatalErrorInFunction
+            << "dimensions of phi are not correct"
             << abort(FatalError);
 
         return fluxFieldType::null();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 3ac456d555..3e2ec1350a 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -294,7 +294,7 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
             dimensioned<typename flux<Type>::type>
             (
                 "0",
-                mesh().Sf().dimensions()*Uf.dimensions()*dimArea/dimTime,
+                Uf.dimensions()*dimArea/dimTime,
                 pTraits<typename flux<Type>::type>::zero
             )
         )
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index 884e4770e9..59622c9dc4 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,9 +58,8 @@ tmp<divScheme<Type> > divScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "divScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Div scheme not specified" << endl << endl
             << "Valid div schemes are :" << endl
@@ -75,9 +74,8 @@ tmp<divScheme<Type> > divScheme<Type>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "divScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "unknown div scheme "
             << schemeName << nl << nl
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
index 2756f56de5..c9b1052b8a 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,6 +47,8 @@ average
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
 )
 {
+    Info<< "average" << endl;
+
     const fvMesh& mesh = ssf.mesh();
 
     tmp<GeometricField<Type, fvPatchField, volMesh> > taverage
@@ -70,8 +72,9 @@ average
 
     av.internalField() =
     (
-        surfaceSum(mesh.magSf()*ssf)/surfaceSum(mesh.magSf())
-    )().internalField();
+        surfaceSum(mesh.magSf()*ssf)().internalField()
+       /surfaceSum(mesh.magSf())().internalField()
+    );
 
     typename GeometricField<Type, fvPatchField, volMesh>::
     GeometricBoundaryField& bav = av.boundaryField();
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
index 63c718375b..7d8294b1e6 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,8 @@ template<class Type, class CombineOp>
 tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf,
-    const CombineOp& cop
+    const CombineOp& cop,
+    const Type& nullValue
 )
 {
     typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
@@ -65,7 +66,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensioned<Type>("0", ssf.dimensions(), pTraits<Type>::zero),
+            dimensioned<Type>("initialValue", ssf.dimensions(), nullValue),
             zeroGradientFvPatchField<Type>::typeName
         )
     );
@@ -75,15 +76,29 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
     const labelUList& own = mesh.owner();
     const labelUList& nbr = mesh.neighbour();
 
-    forAll(own, i)
+    // Internal field
+    const Field<Type>& iField = ssf.internalField();
+    forAll(iField, faceI)
     {
-        label cellI = own[i];
-        cop(result[cellI], ssf[i]);
+        label cellOwn = own[faceI];
+        cop(result[cellOwn], iField[faceI]);
+
+        label cellNbr = nbr[faceI];
+        cop(result[cellNbr], iField[faceI]);
     }
-    forAll(nbr, i)
+
+    // Boundary field
+    forAll(ssf.boundaryField(), patchI)
     {
-        label cellI = nbr[i];
-        cop(result[cellI], ssf[i]);
+        const fvsPatchField<Type>& pf = ssf.boundaryField()[patchI];
+        const label start = pf.patch().start();
+
+        forAll(pf, i)
+        {
+            label faceI = start + i;
+            label cellI = own[faceI];
+            cop(result[cellI], pf[i]);
+        }
     }
 
     result.correctBoundaryConditions();
@@ -96,13 +111,14 @@ template<class Type, class CombineOp>
 tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
 (
     const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>&> tssf,
-    const CombineOp& cop
+    const CombineOp& cop,
+    const Type& nullValue
 )
 {
     tmp<GeometricField<Type, fvPatchField, volMesh> >
-        tvf(cellReduce(cop, tssf));
+        tvf(cellReduce(cop, tssf, nullValue));
 
-   tssf.clear();
+    tssf.clear();
     return tvf;
 }
 
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
index 19bd24135a..d355fd4a51 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,14 +53,16 @@ namespace fvc
     tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
     (
         const GeometricField<Type, fvsPatchField, surfaceMesh>&,
-        const CombineOp& cop
+        const CombineOp& cop,
+        const Type& nullValue = pTraits<Type>::zero
     );
 
     template<class Type, class CombineOp>
     tmp<GeometricField<Type, fvPatchField, volMesh> > cellReduce
     (
         const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&,
-        const CombineOp& cop
+        const CombineOp& cop,
+        const Type& nullValue = pTraits<Type>::zero
     );
 }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index c7f49d3c83..503c8a978f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,10 +46,8 @@ Foam::tmp<Foam::fv::gradScheme<Type> > Foam::fv::gradScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "gradScheme<Type>::New"
-            "(const fvMesh& mesh, Istream& schemeData)",
             schemeData
         )   << "Grad scheme not specified" << endl << endl
             << "Valid grad schemes are :" << endl
@@ -64,10 +62,8 @@ Foam::tmp<Foam::fv::gradScheme<Type> > Foam::fv::gradScheme<Type>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "gradScheme<Type>::New"
-            "(const fvMesh& mesh, Istream& schemeData)",
             schemeData
         )   << "Unknown grad scheme " << schemeName << nl << nl
             << "Valid grad schemes are :" << endl
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
index 7e5074234b..6ee95bdbcc 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,9 +95,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "cellLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
index 1e5530a80e..0ef0b44ad6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,9 +95,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "cellMDLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
index 8ff5d8e21f..a3ce867666 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,9 +104,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "faceLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
index 6012f0fb2c..9da9990353 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,9 +104,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "faceMDLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index c81d53da54..09c7def178 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,9 +56,8 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Laplacian scheme not specified" << endl << endl
             << "Valid laplacian schemes are :" << endl
@@ -73,9 +72,8 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Unknown laplacian scheme " << schemeName << nl << nl
             << "Valid laplacian schemes are :" << endl
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
index 36a363ea1f..f71471dc9a 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,11 +156,8 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
             // (not good fit so increase weight in the centre and weight
             //  for constant and linear terms)
 
-            WarningIn
-            (
-                "CentredFitSnGradData<Polynomial>::calcFit"
-                "(const List<point>& C, const label facei"
-            )   << "Cannot fit face " << facei << " iteration " << iIt
+            WarningInFunction
+                << "Cannot fit face " << facei << " iteration " << iIt
                 << " with sum of weights " << sum(coeffsi) << nl
                 << "    Weights " << coeffsi << nl
                 << "    Linear weights " << wLin << " " << 1 - wLin << nl
@@ -198,10 +195,8 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
     }
     else
     {
-        WarningIn
-        (
-            "CentredFitSnGradData<Polynomial>::calcFit(..)"
-        )   << "Could not fit face " << facei
+        WarningInFunction
+            << "Could not fit face " << facei
             << "    Coefficients = " << coeffsi
             << ", reverting to uncorrected." << endl;
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index 5d1ffd2b94..ca9b2a8a5d 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,11 +34,11 @@ Description
     non-orthogonal contribution does not exceed the orthogonal part.
 
     Format:
-        limited <corrected scheme> <coefficient>;
+        limited \<corrected scheme\> \<coefficient\>;
 
         or
 
-        limited <coefficient>;  // Backward compatibility
+        limited \<coefficient\>;  // Backward compatibility
 
 SourceFiles
     limitedSnGrad.C
@@ -135,9 +135,8 @@ public:
         {
             if (limitCoeff_ < 0 || limitCoeff_ > 1)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "limitedSnGrad(const fvMesh& mesh, Istream& schemeData) : ",
                     schemeData
                 )   << "limitCoeff is specified as " << limitCoeff_
                     << " but should be >= 0 && <= 1"
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
index 39866b78ab..8ae3b15243 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,11 +56,7 @@ orthogonalSnGrad<Type>::correction
     const GeometricField<Type, fvPatchField, volMesh>&
 ) const
 {
-    notImplemented
-    (
-        "orthogonalSnGrad<Type>::correction"
-        "(const GeometricField<Type, fvPatchField, volMesh>&)"
-    );
+    NotImplemented;
     return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
 }
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 2f8ef75d9c..7484c060a2 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,9 +57,8 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "snGradScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Discretisation scheme not specified"
             << endl << endl
@@ -75,9 +74,8 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
 
     if (constructorIter == MeshConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "snGradScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
index 6ef30f47de..32344459fd 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,11 +56,7 @@ uncorrectedSnGrad<Type>::correction
     const GeometricField<Type, fvPatchField, volMesh>&
 ) const
 {
-    notImplemented
-    (
-        "uncorrectedSnGrad<Type>::correction"
-        "(const GeometricField<Type, fvPatchField, volMesh>&)"
-    );
+    NotImplemented;
     return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
 }
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 8da078fbc4..8825177218 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -43,11 +43,8 @@ void Foam::fvMatrix<Type>::addToInternalField
 {
     if (addr.size() != pf.size())
     {
-        FatalErrorIn
-        (
-            "fvMatrix<Type>::addToInternalField(const labelUList&, "
-            "const Field&, Field&)"
-        )   << "sizes of addressing and field are different"
+        FatalErrorInFunction
+            << "sizes of addressing and field are different"
             << abort(FatalError);
     }
 
@@ -83,11 +80,8 @@ void Foam::fvMatrix<Type>::subtractFromInternalField
 {
     if (addr.size() != pf.size())
     {
-        FatalErrorIn
-        (
-            "fvMatrix<Type>::addToInternalField(const labelUList&, "
-            "const Field&, Field&)"
-        )   << "sizes of addressing and field are different"
+        FatalErrorInFunction
+            << "sizes of addressing and field are different"
             << abort(FatalError);
     }
 
@@ -531,7 +525,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
 
     if (debug)
     {
-        InfoIn("fvMatrix<Type>::relax(const scalar alpha)")
+        InfoInFunction
             << "Relaxing " << psi_.name() << " by " << alpha
             << endl;
     }
@@ -622,7 +616,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
             psi_.mesh().comm()
         );
 
-        InfoIn("fvMatrix<Type>::relax(const scalar alpha)")
+        InfoInFunction
             << "Matrix dominance test for " << psi_.name() << nl
             << "    number of non-dominant cells   : " << nNon << nl
             << "    maximum relative non-dominance : " << maxNon << nl
@@ -808,11 +802,7 @@ Foam::fvMatrix<Type>::H() const
 
     typename Type::labelType validComponents
     (
-        pow
-        (
-            psi_.mesh().solutionD(),
-            pTraits<typename powProduct<Vector<label>, Type::rank>::type>::zero
-        )
+        psi_.mesh().template validComponents<Type>()
     );
 
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
@@ -884,7 +874,7 @@ flux() const
 {
     if (!psi_.mesh().fluxRequired(psi_.name()))
     {
-        FatalErrorIn("fvMatrix<Type>::flux()")
+        FatalErrorInFunction
             << "flux requested but " << psi_.name()
             << " not specified in the fluxRequired sub-dictionary"
                " of fvSchemes."
@@ -968,14 +958,14 @@ void Foam::fvMatrix<Type>::operator=(const fvMatrix<Type>& fvmv)
 {
     if (this == &fvmv)
     {
-        FatalErrorIn("fvMatrix<Type>::operator=(const fvMatrix<Type>&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
 
     if (&psi_ != &(fvmv.psi_))
     {
-        FatalErrorIn("fvMatrix<Type>::operator=(const fvMatrix<Type>&)")
+        FatalErrorInFunction
             << "different fields"
             << abort(FatalError);
     }
@@ -1213,11 +1203,8 @@ void Foam::fvMatrix<Type>::operator*=
 
     if (faceFluxCorrectionPtr_)
     {
-        FatalErrorIn
-        (
-            "fvMatrix<Type>::operator*="
-            "(const DimensionedField<scalar, volMesh>&)"
-        )   << "cannot scale a matrix containing a faceFluxCorrection"
+        FatalErrorInFunction
+            << "cannot scale a matrix containing a faceFluxCorrection"
             << abort(FatalError);
     }
 }
@@ -1276,10 +1263,8 @@ void Foam::checkMethod
 {
     if (&fvm1.psi() != &fvm2.psi())
     {
-        FatalErrorIn
-        (
-            "checkMethod(const fvMatrix<Type>&, const fvMatrix<Type>&)"
-        )   << "incompatible fields for operation "
+        FatalErrorInFunction
+            << "incompatible fields for operation "
             << endl << "    "
             << "[" << fvm1.psi().name() << "] "
             << op
@@ -1289,10 +1274,8 @@ void Foam::checkMethod
 
     if (dimensionSet::debug && fvm1.dimensions() != fvm2.dimensions())
     {
-        FatalErrorIn
-        (
-            "checkMethod(const fvMatrix<Type>&, const fvMatrix<Type>&)"
-        )   << "incompatible dimensions for operation "
+        FatalErrorInFunction
+            << "incompatible dimensions for operation "
             << endl << "    "
             << "[" << fvm1.psi().name() << fvm1.dimensions()/dimVolume << " ] "
             << op
@@ -1312,11 +1295,7 @@ void Foam::checkMethod
 {
     if (dimensionSet::debug && fvm.dimensions()/dimVolume != df.dimensions())
     {
-        FatalErrorIn
-        (
-            "checkMethod(const fvMatrix<Type>&, const GeometricField<Type, "
-            "fvPatchField, volMesh>&)"
-        )   <<  "incompatible dimensions for operation "
+        FatalErrorInFunction
             << endl << "    "
             << "[" << fvm.psi().name() << fvm.dimensions()/dimVolume << " ] "
             << op
@@ -1336,10 +1315,8 @@ void Foam::checkMethod
 {
     if (dimensionSet::debug && fvm.dimensions()/dimVolume != dt.dimensions())
     {
-        FatalErrorIn
-        (
-            "checkMethod(const fvMatrix<Type>&, const dimensioned<Type>&)"
-        )   << "incompatible dimensions for operation "
+        FatalErrorInFunction
+            << "incompatible dimensions for operation "
             << endl << "    "
             << "[" << fvm.psi().name() << fvm.dimensions()/dimVolume << " ] "
             << op
@@ -1350,7 +1327,7 @@ void Foam::checkMethod
 
 
 template<class Type>
-Foam::solverPerformance Foam::solve
+Foam::SolverPerformance<Type> Foam::solve
 (
     fvMatrix<Type>& fvm,
     const dictionary& solverControls
@@ -1360,13 +1337,13 @@ Foam::solverPerformance Foam::solve
 }
 
 template<class Type>
-Foam::solverPerformance Foam::solve
+Foam::SolverPerformance<Type> Foam::solve
 (
     const tmp<fvMatrix<Type> >& tfvm,
     const dictionary& solverControls
 )
 {
-    solverPerformance solverPerf =
+    SolverPerformance<Type> solverPerf =
         const_cast<fvMatrix<Type>&>(tfvm()).solve(solverControls);
 
     tfvm.clear();
@@ -1376,15 +1353,15 @@ Foam::solverPerformance Foam::solve
 
 
 template<class Type>
-Foam::solverPerformance Foam::solve(fvMatrix<Type>& fvm)
+Foam::SolverPerformance<Type> Foam::solve(fvMatrix<Type>& fvm)
 {
     return fvm.solve();
 }
 
 template<class Type>
-Foam::solverPerformance Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
+Foam::SolverPerformance<Type> Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
 {
-    solverPerformance solverPerf =
+    SolverPerformance<Type> solverPerf =
         const_cast<fvMatrix<Type>&>(tfvm()).solve();
 
     tfvm.clear();
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index c9282af68b..32596afc13 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -239,11 +239,11 @@ public:
 
             //- Solve returning the solution statistics.
             //  Use the given solver controls
-            solverPerformance solve(const dictionary&);
+            SolverPerformance<Type> solve(const dictionary&);
 
             //- Solve returning the solution statistics.
             //  Solver controls read from fvSolution
-            solverPerformance solve();
+            SolverPerformance<Type> solve();
     };
 
 
@@ -389,19 +389,19 @@ public:
 
             //- Solve segregated or coupled returning the solution statistics.
             //  Use the given solver controls
-            solverPerformance solve(const dictionary&);
+            SolverPerformance<Type> solve(const dictionary&);
 
             //- Solve segregated returning the solution statistics.
             //  Use the given solver controls
-            solverPerformance solveSegregated(const dictionary&);
+            SolverPerformance<Type> solveSegregated(const dictionary&);
 
             //- Solve coupled returning the solution statistics.
             //  Use the given solver controls
-            solverPerformance solveCoupled(const dictionary&);
+            SolverPerformance<Type> solveCoupled(const dictionary&);
 
             //- Solve returning the solution statistics.
             //  Solver controls read from fvSolution
-            solverPerformance solve();
+            SolverPerformance<Type> solve();
 
             //- Return the matrix residual
             tmp<Field<Type> > residual() const;
@@ -549,14 +549,14 @@ void checkMethod
 //- Solve returning the solution statistics given convergence tolerance
 //  Use the given solver controls
 template<class Type>
-solverPerformance solve(fvMatrix<Type>&, const dictionary&);
+SolverPerformance<Type> solve(fvMatrix<Type>&, const dictionary&);
 
 
 //- Solve returning the solution statistics given convergence tolerance,
 //  deleting temporary matrix after solution.
 //  Use the given solver controls
 template<class Type>
-solverPerformance solve
+SolverPerformance<Type> solve
 (
     const tmp<fvMatrix<Type> >&,
     const dictionary&
@@ -566,14 +566,14 @@ solverPerformance solve
 //- Solve returning the solution statistics given convergence tolerance
 //  Solver controls read fvSolution
 template<class Type>
-solverPerformance solve(fvMatrix<Type>&);
+SolverPerformance<Type> solve(fvMatrix<Type>&);
 
 
 //- Solve returning the solution statistics given convergence tolerance,
 //  deleting temporary matrix after solution.
 //  Solver controls read fvSolution
 template<class Type>
-solverPerformance solve(const tmp<fvMatrix<Type> >&);
+SolverPerformance<Type> solve(const tmp<fvMatrix<Type> >&);
 
 
 //- Return the correction form of the given matrix
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index eec5c77c71..ff588e947f 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ void Foam::fvMatrix<Type>::setComponentReference
 
 
 template<class Type>
-Foam::solverPerformance Foam::fvMatrix<Type>::solve
+Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve
 (
     const dictionary& solverControls
 )
@@ -71,7 +71,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solve
     {
         if (maxIter == 0)
         {
-            return solverPerformance();
+            return SolverPerformance<Type>();
         }
     }
 
@@ -87,21 +87,20 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solve
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "fvMatrix<Type>::solve(const dictionary& solverControls)",
             solverControls
         )   << "Unknown type " << type
             << "; currently supported solver types are segregated and coupled"
             << exit(FatalIOError);
 
-        return solverPerformance();
+        return SolverPerformance<Type>();
     }
 }
 
 
 template<class Type>
-Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
+Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveSegregated
 (
     const dictionary& solverControls
 )
@@ -118,7 +117,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
     GeometricField<Type, fvPatchField, volMesh>& psi =
        const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
 
-    solverPerformance solverPerfVec
+    SolverPerformance<Type> solverPerfVec
     (
         "fvMatrix<Type>::solveSegregated",
         psi.name()
@@ -135,11 +134,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
 
     typename Type::labelType validComponents
     (
-        pow
-        (
-            psi.mesh().solutionD(),
-            pTraits<typename powProduct<Vector<label>, Type::rank>::type>::zero
-        )
+        psi.mesh().template validComponents<Type>()
     );
 
     for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
@@ -200,13 +195,12 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
             solverControls
         )->solve(psiCmpt, sourceCmpt, cmpt);
 
-        if (solverPerformance::debug)
+        if (SolverPerformance<Type>::debug)
         {
             solverPerf.print(Info.masterStream(this->mesh().comm()));
         }
 
-        solverPerfVec = max(solverPerfVec, solverPerf);
-        solverPerfVec.solverName() = solverPerf.solverName();
+        solverPerfVec.replace(cmpt, solverPerf);
 
         psi.internalField().replace(cmpt, psiCmpt);
         diag() = saveDiag;
@@ -221,7 +215,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
 
 
 template<class Type>
-Foam::solverPerformance Foam::fvMatrix<Type>::solveCoupled
+Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveCoupled
 (
     const dictionary& solverControls
 )
@@ -274,9 +268,9 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveCoupled
 
     psi.correctBoundaryConditions();
 
-    // psi.mesh().setSolverPerformance(psi.name(), solverPerf);
+    psi.mesh().setSolverPerformance(psi.name(), solverPerf);
 
-    return solverPerformance();
+    return solverPerf;
 }
 
 
@@ -299,7 +293,7 @@ Foam::fvMatrix<Type>::solver()
 
 
 template<class Type>
-Foam::solverPerformance Foam::fvMatrix<Type>::fvSolver::solve()
+Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::fvSolver::solve()
 {
     return solve
     (
@@ -316,7 +310,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::fvSolver::solve()
 
 
 template<class Type>
-Foam::solverPerformance Foam::fvMatrix<Type>::solve()
+Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve()
 {
     return solve
     (
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C
index fa473164e4..4cc8cd128c 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C
@@ -39,10 +39,7 @@ namespace MULES
     template<class RhoType>
     inline tmp<surfaceScalarField> interpolate(const RhoType& rho)
     {
-        notImplemented
-        (
-            "tmp<surfaceScalarField> interpolate(const RhoType& rho)"
-        );
+        NotImplemented;
         return tmp<surfaceScalarField>(NULL);
     }
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C
index 4852332c32..54e0eb446e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,11 +43,8 @@ Foam::extendedCellToCellStencil::extendedCellToCellStencil(const polyMesh& mesh)
 
             if (!cpp.parallel() || cpp.separated())
             {
-                FatalErrorIn
-                (
-                    "extendedCellToCellStencil::extendedCellToCellStencil"
-                    "(const polyMesh&)"
-                )   << "Coupled patches with transformations not supported."
+                FatalErrorInFunction
+                    << "Coupled patches with transformations not supported."
                     << endl
                     << "Problematic patch " << cpp.name() << exit(FatalError);
             }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index c2bc9d7e7f..fd48842f43 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,7 @@ void Foam::cellToCellStencil::merge
 
     if (resultI != result.size())
     {
-        FatalErrorIn("cellToCellStencil::merge(..)")
+        FatalErrorInFunction
             << "problem" << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
index a960f5a851..5409e01b98 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,11 +113,8 @@ Foam::extendedCellToFaceStencil::extendedCellToFaceStencil(const polyMesh& mesh)
 
             if (!cpp.parallel() || cpp.separated())
             {
-                FatalErrorIn
-                (
-                    "extendedCellToFaceStencil::extendedCellToFaceStencil"
-                    "(const polyMesh&)"
-                )   << "Coupled patches with transformations not supported."
+                FatalErrorInFunction
+                    << "Coupled patches with transformations not supported."
                     << endl
                     << "Problematic patch " << cpp.name() << exit(FatalError);
             }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
index f63109fa0b..e3f4c79ebd 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -168,10 +168,8 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencil
         }
         if (n != transportedStencil.size())
         {
-            FatalErrorIn
-            (
-                "extendedUpwindCellToFaceStencil::transportStencil(..)"
-            )   << "problem:" << faceStencilSet
+            FatalErrorInFunction
+                << "problem:" << faceStencilSet
                 << abort(FatalError);
         }
     }
@@ -190,10 +188,8 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencil
         }
         if (n != transportedStencil.size())
         {
-            FatalErrorIn
-            (
-                "extendedUpwindCellToFaceStencil::transportStencil(..)"
-            )   << "problem:" << faceStencilSet
+            FatalErrorInFunction
+                << "problem:" << faceStencilSet
                 << abort(FatalError);
         }
     }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
index 78425f1190..235091fa3a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
         {
             if (iter.key() == globalOwn || iter.key() == globalNei)
             {
-                FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
+                FatalErrorInFunction
                     << "problem:" << faceStencilSet
                     << abort(FatalError);
             }
@@ -272,10 +272,8 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
                 {
                     if (iter.key() == globalOwn || iter.key() == globalNei)
                     {
-                        FatalErrorIn
-                        (
-                            "FECCellToFaceStencil::calcFaceStencil(..)"
-                        )   << "problem:" << faceStencilSet
+                        FatalErrorInFunction
+                            << "problem:" << faceStencilSet
                             << abort(FatalError);
                     }
                     faceStencil[faceI][n++] = iter.key();
@@ -283,7 +281,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
 
                 if (n != faceStencil[faceI].size())
                 {
-                    FatalErrorIn("problem") << "n:" << n
+                    FatalErrorInFunction
                         << " size:" << faceStencil[faceI].size()
                         << abort(FatalError);
                 }
@@ -338,10 +336,8 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
                 {
                     if (iter.key() == globalOwn)
                     {
-                        FatalErrorIn
-                        (
-                            "FECCellToFaceStencil::calcFaceStencil(..)"
-                        )   << "problem:" << faceStencilSet
+                        FatalErrorInFunction
+                            << "problem:" << faceStencilSet
                             << abort(FatalError);
                     }
                     faceStencil[faceI][n++] = iter.key();
@@ -358,7 +354,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
         label globalOwn = globalNumbering().toGlobal(own[faceI]);
         if (faceStencil[faceI][0] != globalOwn)
         {
-            FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
+            FatalErrorInFunction
                 << "problem:" << faceStencil[faceI]
                 << " globalOwn:" << globalOwn
                 << abort(FatalError);
@@ -366,7 +362,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
         label globalNei = globalNumbering().toGlobal(nei[faceI]);
         if (faceStencil[faceI][1] != globalNei)
         {
-            FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
+            FatalErrorInFunction
                 << "problem:" << faceStencil[faceI]
                 << " globalNei:" << globalNei
                 << abort(FatalError);
@@ -387,7 +383,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
                 label globalOwn = globalNumbering().toGlobal(own[faceI]);
                 if (faceStencil[faceI][0] != globalOwn)
                 {
-                    FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
+                    FatalErrorInFunction
                         << "problem:" << faceStencil[faceI]
                         << " globalOwn:" << globalOwn
                         << abort(FatalError);
@@ -395,7 +391,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
                 label globalNei = neiGlobalCell[faceI-mesh().nInternalFaces()];
                 if (faceStencil[faceI][1] != globalNei)
                 {
-                    FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
+                    FatalErrorInFunction
                         << "problem:" << faceStencil[faceI]
                         << " globalNei:" << globalNei
                         << abort(FatalError);
@@ -411,7 +407,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
                 label globalOwn = globalNumbering().toGlobal(own[faceI]);
                 if (faceStencil[faceI][0] != globalOwn)
                 {
-                    FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
+                    FatalErrorInFunction
                         << "problem:" << faceStencil[faceI]
                         << " globalOwn:" << globalOwn
                         << abort(FatalError);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index c57cf9e100..f61744941e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,7 +124,7 @@ void Foam::cellToFaceStencil::merge
 
     if (resultI != result.size())
     {
-        FatalErrorIn("cellToFaceStencil::merge(..)")
+        FatalErrorInFunction
             << "problem" << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C
index 4f364dc288..ea4899d57d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,11 +45,8 @@ Foam::extendedFaceToCellStencil::extendedFaceToCellStencil(const polyMesh& mesh)
 
             if (!cpp.parallel() || cpp.separated())
             {
-                FatalErrorIn
-                (
-                    "extendedFaceToCellStencil::extendedFaceToCellStencil"
-                    "(const polyMesh&)"
-                )   << "Coupled patches with transformations not supported."
+                FatalErrorInFunction
+                    << "Coupled patches with transformations not supported."
                     << endl
                     << "Problematic patch " << cpp.name() << exit(FatalError);
             }
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
index 035ab42615..0d7f7ebabb 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,10 +149,8 @@ const Foam::fvPatch& Foam::fvBoundaryMesh::operator[]
 
     if (patchI < 0)
     {
-        FatalErrorIn
-        (
-            "fvBoundaryMesh::operator[](const word&) const"
-        )   << "Patch named " << patchName << " not found." << nl
+        FatalErrorInFunction
+            << "Patch named " << patchName << " not found." << nl
             << abort(FatalError);
     }
 
@@ -169,10 +167,8 @@ Foam::fvPatch& Foam::fvBoundaryMesh::operator[]
 
     if (patchI < 0)
     {
-        FatalErrorIn
-        (
-            "fvBoundaryMesh::operator[](const word&)"
-        )   << "Patch named " << patchName << " not found." << nl
+        FatalErrorInFunction
+            << "Patch named " << patchName << " not found." << nl
             << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 1a48576fc2..dc19051e71 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -466,10 +466,8 @@ void Foam::fvMesh::addFvPatches
 {
     if (boundary().size())
     {
-        FatalErrorIn
-        (
-            "fvMesh::addFvPatches(const List<polyPatch*>&, const bool)"
-        )   << " boundary already exists"
+        FatalErrorInFunction
+            << " boundary already exists"
             << abort(FatalError);
     }
 
@@ -586,7 +584,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
      || meshMap.faceMap().size() != nFaces()
     )
     {
-        FatalErrorIn("fvMesh::mapFields(const mapPolyMesh&)")
+        FatalErrorInFunction
             << "mapPolyMesh does not correspond to the old mesh."
             << " nCells:" << nCells()
             << " cellMap:" << meshMap.cellMap().size()
@@ -815,7 +813,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
         // Few checks
         if (VPtr_ && (V().size() != mpm.nOldCells()))
         {
-            FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)")
+            FatalErrorInFunction
                 << "V:" << V().size()
                 << " not equal to the number of old cells "
                 << mpm.nOldCells()
@@ -823,7 +821,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
         }
         if (V0Ptr_ && (V0Ptr_->size() != mpm.nOldCells()))
         {
-            FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)")
+            FatalErrorInFunction
                 << "V0:" << V0Ptr_->size()
                 << " not equal to the number of old cells "
                 << mpm.nOldCells()
@@ -831,7 +829,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
         }
         if (V00Ptr_ && (V00Ptr_->size() != mpm.nOldCells()))
         {
-            FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)")
+            FatalErrorInFunction
                 << "V0:" << V00Ptr_->size()
                 << " not equal to the number of old cells "
                 << mpm.nOldCells()
@@ -884,6 +882,14 @@ bool Foam::fvMesh::write() const
 }
 
 
+template<>
+typename Foam::pTraits<Foam::sphericalTensor>::labelType
+Foam::fvMesh::validComponents<Foam::sphericalTensor>() const
+{
+    return Foam::pTraits<Foam::sphericalTensor>::labelType(1);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 bool Foam::fvMesh::operator!=(const fvMesh& bm) const
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 876ec34e7a..268e76939d 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -324,6 +324,12 @@ public:
             //- Return face deltas as surfaceVectorField
             tmp<surfaceVectorField> delta() const;
 
+            //- Return a labelType of valid component indicators
+            //  1 : valid (solved)
+            // -1 : invalid (not solved)
+            template<class Type>
+            typename pTraits<Type>::labelType validComponents() const;
+
 
         // Edit
 
@@ -371,6 +377,11 @@ public:
 };
 
 
+template<>
+typename pTraits<sphericalTensor>::labelType
+fvMesh::validComponents<sphericalTensor>() const;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
@@ -378,6 +389,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
+#   include "fvMeshTemplates.C"
 #   include "fvPatchFvMeshTemplates.C"
 #endif
 
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 3c61706f46..b16164fa53 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ void fvMesh::makeSf() const
     // if the pointer is already set
     if (SfPtr_)
     {
-        FatalErrorIn("fvMesh::makeSf()")
+        FatalErrorInFunction
             << "face areas already exist"
             << abort(FatalError);
     }
@@ -90,7 +90,7 @@ void fvMesh::makeMagSf() const
     // if the pointer is already set
     if (magSfPtr_)
     {
-        FatalErrorIn("void fvMesh::makeMagSf()")
+        FatalErrorInFunction
             << "mag face areas already exist"
             << abort(FatalError);
     }
@@ -128,7 +128,7 @@ void fvMesh::makeC() const
     // if the pointer is already set
     if (CPtr_)
     {
-        FatalErrorIn("fvMesh::makeC()")
+        FatalErrorInFunction
             << "cell centres already exist"
             << abort(FatalError);
     }
@@ -170,7 +170,7 @@ void fvMesh::makeCf() const
     // if the pointer is already set
     if (CfPtr_)
     {
-        FatalErrorIn("fvMesh::makeCf()")
+        FatalErrorInFunction
             << "face centres already exist"
             << abort(FatalError);
     }
@@ -232,7 +232,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V0() const
 {
     if (!V0Ptr_)
     {
-        FatalErrorIn("fvMesh::V0() const")
+        FatalErrorInFunction
             << "V0 is not available"
             << abort(FatalError);
     }
@@ -245,7 +245,7 @@ volScalarField::DimensionedInternalField& fvMesh::setV0()
 {
     if (!V0Ptr_)
     {
-        FatalErrorIn("fvMesh::setV0()")
+        FatalErrorInFunction
             << "V0 is not available"
             << abort(FatalError);
     }
@@ -439,7 +439,7 @@ const surfaceScalarField& fvMesh::phi() const
 {
     if (!phiPtr_)
     {
-        FatalErrorIn("fvMesh::phi()")
+        FatalErrorInFunction
             << "mesh flux field does not exist, is the mesh actually moving?"
             << abort(FatalError);
     }
@@ -459,7 +459,7 @@ surfaceScalarField& fvMesh::setPhi()
 {
     if (!phiPtr_)
     {
-        FatalErrorIn("fvMesh::setPhi()")
+        FatalErrorInFunction
             << "mesh flux field does not exist, is the mesh actually moving?"
             << abort(FatalError);
     }
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index ada0749df3..a1039f2a71 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,8 @@ void Foam::fvPatchMapper::calcAddressing() const
      || weightsPtr_
     )
     {
-        FatalErrorIn
-        (
-            "void fvPatchMapper::calcAddressing() const)"
-        )   << "Addressing already calculated"
+        FatalErrorInFunction
+            << "Addressing already calculated"
             << abort(FatalError);
     }
 
@@ -94,13 +92,9 @@ void Foam::fvPatchMapper::calcAddressing() const
         {
             if (min(addr) < 0)
             {
-                //FatalErrorIn
-                WarningIn
-                (
-                    "void fvPatchMapper::calcAddressing() const"
-                )   << "Unmapped entry in patch mapping for patch "
+                WarningInFunction
+                    << "Unmapped entry in patch mapping for patch "
                     << patch_.index() << " named " << patch_.name()
-                    //<< abort(FatalError);
                     << endl;
             }
         }
@@ -195,10 +189,8 @@ void Foam::fvPatchMapper::calcAddressing() const
             {
                 if (min(addr[i]) < 0)
                 {
-                    FatalErrorIn
-                    (
-                        "void fvPatchMapper::calcAddressing() const"
-                    )   << "Error in patch mapping for patch "
+                    FatalErrorInFunction
+                        << "Error in patch mapping for patch "
                         << patch_.index() << " named " << patch_.name()
                         << abort(FatalError);
                 }
@@ -250,10 +242,8 @@ const Foam::labelUList& Foam::fvPatchMapper::directAddressing() const
 {
     if (!direct())
     {
-        FatalErrorIn
-        (
-            "const labelUList& fvPatchMapper::directAddressing() const"
-        )   << "Requested direct addressing for an interpolative mapper."
+        FatalErrorInFunction
+            << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
 
@@ -270,10 +260,8 @@ const Foam::labelListList& Foam::fvPatchMapper::addressing() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const labelListList& fvPatchMapper::addressing() const"
-        )   << "Requested interpolative addressing for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative addressing for a direct mapper."
             << abort(FatalError);
     }
 
@@ -290,10 +278,8 @@ const Foam::scalarListList& Foam::fvPatchMapper::weights() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const scalarListList& fvPatchMapper::weights() const"
-        )   << "Requested interpolative weights for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative weights for a direct mapper."
             << abort(FatalError);
     }
 
@@ -306,13 +292,4 @@ const Foam::scalarListList& Foam::fvPatchMapper::weights() const
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index 206f57d47b..c9889b7030 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
      || insertedObjectLabelsPtr_
     )
     {
-        FatalErrorIn("void fvSurfaceMapper::calcAddressing() const)")
+        FatalErrorInFunction
             << "Addressing already calculated"
             << abort(FatalError);
     }
@@ -174,11 +174,8 @@ const Foam::labelUList& Foam::fvSurfaceMapper::directAddressing() const
 {
     if (!direct())
     {
-        FatalErrorIn
-        (
-            "const labelUList& fvSurfaceMapper::"
-            "directAddressing() const"
-        )   << "Requested direct addressing for an interpolative mapper."
+        FatalErrorInFunction
+            << "Requested direct addressing for an interpolative mapper."
             << abort(FatalError);
     }
 
@@ -195,10 +192,8 @@ const Foam::labelListList& Foam::fvSurfaceMapper::addressing() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const labelListList& fvSurfaceMapper::addressing() const"
-        )   << "Requested interpolative addressing for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative addressing for a direct mapper."
             << abort(FatalError);
     }
 
@@ -215,10 +210,8 @@ const Foam::scalarListList& Foam::fvSurfaceMapper::weights() const
 {
     if (direct())
     {
-        FatalErrorIn
-        (
-            "const scalarListList& fvSurfaceMapper::weights() const"
-        )   << "Requested interpolative weights for a direct mapper."
+        FatalErrorInFunction
+            << "Requested interpolative weights for a direct mapper."
             << abort(FatalError);
     }
 
diff --git a/src/finiteVolume/fvMesh/fvMeshTemplates.C b/src/finiteVolume/fvMesh/fvMeshTemplates.C
new file mode 100644
index 0000000000..0fb2a211bb
--- /dev/null
+++ b/src/finiteVolume/fvMesh/fvMeshTemplates.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+typename Foam::pTraits<Type>::labelType Foam::fvMesh::validComponents() const
+{
+    return pow
+    (
+        this->solutionD(),
+        pTraits
+        <
+            typename powProduct<Vector<label>,
+            pTraits<Type>::rank>::type
+        >::zero
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
index 5d8935139d..0f6064471f 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,13 @@ namespace Foam
 {
     defineTypeNameAndDebug(cyclicAMIFvPatch, 0);
     addToRunTimeSelectionTable(fvPatch, cyclicAMIFvPatch, polyPatch);
+    addNamedToRunTimeSelectionTable
+    (
+        fvPatch,
+        cyclicAMIFvPatch,
+        polyPatch,
+        cyclicPeriodicAMI
+    );
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
index d43c48ac9b..6f68e1abff 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,10 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    coupledFvPatch is an abstract base class for patches that couple regions
-    of the computational domain e.g. cyclic and processor-processor links.
-
 \*---------------------------------------------------------------------------*/
 
 #include "regionCoupledFvPatch.H"
@@ -62,18 +58,10 @@ Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::internalFieldTransfer
     }
     else
     {
-        /*
-        WarningIn
-        (
-            "regionCoupledFvPatch::internalFieldTransfer"
-            "( const Pstream::commsTypes, const labelUList&)"
-            " the internal field can not be transfered "
-            " as the neighbFvPatch are in different meshes "
-        );
-        */
         return tmp<labelField>(new labelField(iF.size(), 0));
 
     }
+
     return tmp<labelField>(NULL);
 }
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchFvMeshTemplates.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchFvMeshTemplates.C
index e28242d955..d8fbc1f918 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchFvMeshTemplates.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchFvMeshTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
index cb8973ebc9..257825ea61 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
 
     if (cstrIter == polyPatchConstructorTablePtr_->end())
     {
-        FatalErrorIn("fvPatch::New(const polyPatch&, const fvBoundaryMesh&)")
+        FatalErrorInFunction
             << "Unknown fvPatch type " << patch.type() << nl
             << "Valid fvPatch types are :"
             << polyPatchConstructorTablePtr_->sortedToc()
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 22ba9a1393..6cb95ee928 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,10 +55,8 @@ void Foam::singleCellFvMesh::agglomerateMesh
             {
                 if (agglom[patchI][i] < 0  || agglom[patchI][i] >= pp.size())
                 {
-                    FatalErrorIn
-                    (
-                        "singleCellFvMesh::agglomerateMesh(..)"
-                    )   << "agglomeration on patch " << patchI
+                    FatalErrorInFunction
+                        << "agglomeration on patch " << patchI
                         << " is out of range 0.." << pp.size()-1
                         << exit(FatalError);
                 }
@@ -116,10 +114,8 @@ void Foam::singleCellFvMesh::agglomerateMesh
                         // Check that zone numbers are still the same.
                         if (iter() != nbrZone)
                         {
-                            FatalErrorIn
-                            (
-                                "singleCellFvMesh::agglomerateMesh(..)"
-                            )   << "agglomeration is not synchronised across"
+                            FatalErrorInFunction
+                                << "agglomeration is not synchronised across"
                                 << " coupled patch " << pp.name()
                                 << endl
                                 << "Local agglomeration " << myZone
@@ -206,10 +202,8 @@ void Foam::singleCellFvMesh::agglomerateMesh
 
                     if (upp.edgeLoops().size() != 1)
                     {
-                        FatalErrorIn
-                        (
-                            "singleCellFvMesh::agglomerateMesh(..)"
-                        )   << "agglomeration does not create a"
+                        FatalErrorInFunction
+                            << "agglomeration does not create a"
                             << " single, non-manifold"
                             << " face for agglomeration " << myAgglom
                             << " on patch " <<  patchI
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
index d84a03a5a1..617671bef4 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
@@ -65,7 +65,7 @@ Foam::autoPtr<Foam::patchDistMethod> Foam::patchDistMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("patchDistMethod::New")
+        FatalErrorInFunction
             << "Unknown patchDistMethodType type "
             << patchDistMethodType << endl << endl
             << "Valid patchDistMethod types are : " << endl
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index 991592baeb..b84c345a14 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -169,7 +169,7 @@ const Foam::volVectorField& Foam::wallDist::n() const
 {
     if (isNull(n_()))
     {
-        WarningIn("Foam::wallDist::n()")
+        WarningInFunction
             << "n requested but 'nRequired' not specified in the "
             << (patchTypeName_ & "Dist") << " dictionary" << nl
             << "    Recalculating y and n fields." << endl;
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
index 4b206b84e0..341ad89124 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,8 @@ Foam::autoPtr<Foam::interpolation<Type> > Foam::interpolation<Type>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "interpolation::New(const word&, "
-            "const GeometricField<Type, fvPatchField, volMesh>&)"
-        )   << "Unknown interpolation type " << interpolationType
+        FatalErrorInFunction
+            << "Unknown interpolation type " << interpolationType
             << " for field " << psi.name() << nl << nl
             << "Valid interpolation types : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H
index 529e6a7991..8d641af37b 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,15 +72,7 @@ inline Type Foam::interpolationCellPoint<Type>::interpolate
     {
         if (faceI != tetIs.face())
         {
-            FatalErrorIn
-            (
-                "inline Type Foam::interpolationCellPoint<Type>::interpolate"
-                "("
-                    "const vector& position, "
-                    "const tetIndices& tetIs, "
-                    "const label faceI"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "specified face " << faceI << " inconsistent with the face "
                 << "stored by tetIndices: " << tetIs.face()
                 << exit(FatalError);
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
index 7514d6908d..b776dae378 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,16 +76,7 @@ inline Type Foam::interpolationCellPointWallModified<Type>::interpolate
     {
         if (faceI != tetIs.face())
         {
-            FatalErrorIn
-            (
-                "inline Type "
-                "Foam::interpolationCellPointWallModifie<Type>::interpolate"
-                "("
-                    "const vector& position, "
-                    "const tetIndices& tetIs, "
-                    "const label faceI"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "specified face " << faceI << " inconsistent with the face "
                 << "stored by tetIndices: " << tetIs.face()
                 << exit(FatalError);
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
index 3891ef4dc6..d77af00d4e 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-defineDebugSwitchWithName(pointMVCWeight, "pointMVCWeight", 0);
+    defineDebugSwitchWithName(pointMVCWeight, "pointMVCWeight", 0);
 }
 
 Foam::scalar Foam::pointMVCWeight::tol(SMALL);
@@ -143,14 +143,6 @@ void Foam::pointMVCWeight::calcWeights
         scalar vNorm = mag(v);
         v /= vNorm;
 
-        // Make sure v points towards the polygon
-        //if (((v&u[0]) < 0) != (mesh.faceOwner()[faceI] != cellIndex_))
-        //{
-        //    FatalErrorIn("pointMVCWeight::calcWeights(..)")
-        //        << "v:" << v << " u[0]:" << u[0]
-        //        << exit(FatalError);
-        //}
-
         if ((v & u[0]) < 0)
         {
             v = -v;
diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
index ec13c40b3a..40dfd16f79 100644
--- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
+++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,14 +63,8 @@ void MapInternalField<Type, MeshMapper, surfaceMesh>::operator()
 {
     if (field.size() != mapper.surfaceMap().sizeBeforeMapping())
     {
-        FatalErrorIn
-        (
-            "void MapInternalField<Type, MeshMapper, surfaceMesh>::operator()\n"
-            "(\n"
-            "    Field<Type>& field,\n"
-            "    const MeshMapper& mapper\n"
-            ") const"
-        )  << "Incompatible size before mapping.  Field size: " << field.size()
+        FatalErrorInFunction
+           << "Incompatible size before mapping.  Field size: " << field.size()
            << " map size: " << mapper.surfaceMap().sizeBeforeMapping()
            << abort(FatalError);
     }
diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H
index 87458cc6e6..db8c9ce72b 100644
--- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H
+++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,14 +63,8 @@ void MapInternalField<Type, MeshMapper, volMesh>::operator()
 {
     if (field.size() != mapper.volMap().sizeBeforeMapping())
     {
-        FatalErrorIn
-        (
-            "void MapInternalField<Type, MeshMapper, volMesh>::operator()\n"
-            "(\n"
-            "    Field<Type>& field,\n"
-            "    const MeshMapper& mapper\n"
-            ") const"
-        )  << "Incompatible size before mapping.  Field size: " << field.size()
+        FatalErrorInFunction
+           << "Incompatible size before mapping.  Field size: " << field.size()
            << " map size: " << mapper.volMap().sizeBeforeMapping()
            << abort(FatalError);
     }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
index 672228b4db..20283602f6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("GammaLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H
index f6c8f94199..48291ea360 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ class LimitedLimiter
     {
         if (lowerBound_ > upperBound_)
         {
-            FatalIOErrorIn("checkParameters()", is)
+            FatalIOErrorInFunction(is)
                 << "Invalid bounds.  Lower = " << lowerBound_
                 << "  Upper = " << upperBound_
                 << ".  Lower bound is higher than the upper bound."
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
index cdbaf1ea6b..92ae810946 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("PhiLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index 8126f7cc12..28cc9fa1db 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,11 +76,8 @@ Foam::PhiScheme<Type, PhiLimiter>::limiter
     }
     else if (this->faceFlux_.dimensions() != dimVelocity*dimArea)
     {
-        FatalErrorIn
-        (
-            "PhiScheme<PhiLimiter>::limiter"
-            "(const GeometricField<Type, fvPatchField, volMesh>& phi)"
-        )   << "dimensions of faceFlux are not correct"
+        FatalErrorInFunction
+            << "dimensions of faceFlux are not correct"
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
index 308d40b6b2..99a136ef59 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("filteredLinearV2Limiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
@@ -92,7 +92,7 @@ public:
 
         if (l_ < 0 || l_ > 1)
         {
-            FatalIOErrorIn("filteredLinearV2Limiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << l_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
index c22ea1646a..bc4639718e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("filteredLinear2VLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
@@ -92,7 +92,7 @@ public:
 
         if (l_ < 0 || l_ > 1)
         {
-            FatalIOErrorIn("filteredLinear2VLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << l_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
index b99f2a5494..52e3d8ab51 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("filteredLinear3Limiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
index 075515ed68..7083b3800d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("filteredLinear3VLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H
index 1dbe087752..de85f2684b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("limitedCubicLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H
index 3fb771ae38..391313b7ff 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("limitedCubicVLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
index dcdfd75dea..260ab8271c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ public:
     {
         if (k_ < 0 || k_ > 1)
         {
-            FatalIOErrorIn("limitedLinearLimiter(Istream& is)", is)
+            FatalIOErrorInFunction(is)
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index c50f514dae..fa92112352 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,8 @@ limitedSurfaceInterpolationScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "limitedSurfaceInterpolationScheme<Type>::"
-            "New(const fvMesh&, Istream&)",
             schemeData
         )   << "Discretisation scheme not specified"
             << endl << endl
@@ -72,10 +70,8 @@ limitedSurfaceInterpolationScheme<Type>::New
 
     if (constructorIter == MeshConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "limitedSurfaceInterpolationScheme<Type>::"
-            "New(const fvMesh&, Istream&)",
             schemeData
         )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
@@ -108,10 +104,8 @@ limitedSurfaceInterpolationScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "limitedSurfaceInterpolationScheme<Type>::New"
-            "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Discretisation scheme not specified"
             << endl << endl
@@ -127,10 +121,8 @@ limitedSurfaceInterpolationScheme<Type>::New
 
     if (constructorIter == MeshFluxConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "limitedSurfaceInterpolationScheme<Type>::New"
-            "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index 46bb2e4c22..b2f683dac2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,11 +83,8 @@ multivariateSurfaceInterpolationScheme<Type>::New
 
     if (constructorIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "multivariateSurfaceInterpolationScheme<Type>::New"
-            "(const fvMesh& mesh, const fieldTable&, "
-            "const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Unknown discretisation scheme " << schemeName << nl << nl
             << "Valid schemes are :" << endl
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
index b282e36c93..c2aa8498f9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,7 +143,7 @@ public:
         {
             if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_)
             {
-                FatalIOErrorIn("CoBlended(const fvMesh&, Istream&)", is)
+                FatalIOErrorInFunction(is)
                     << "coefficients = " << Co1_ << " and " << Co2_
                     << " should be > 0 and Co2 > Co1"
                     << exit(FatalIOError);
@@ -174,7 +174,7 @@ public:
         {
             if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_)
             {
-                FatalIOErrorIn("CoBlended(const fvMesh&, Istream&)", is)
+                FatalIOErrorInFunction(is)
                     << "coefficients = " << Co1_ << " and " << Co2_
                     << " should be > 0 and Co2 > Co1"
                     << exit(FatalIOError);
@@ -205,10 +205,8 @@ public:
             }
             else if (faceFlux_.dimensions() != dimVelocity*dimArea)
             {
-                FatalErrorIn
-                (
-                    "CoBlended::blendingFactor()"
-                )   << "dimensions of faceFlux are not correct"
+                FatalErrorInFunction
+                    << "dimensions of faceFlux are not correct"
                     << exit(FatalError);
             }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
index c1d322ff4e..ba213d0d08 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::FitData<Form, ExtendedStencil, Polynomial>::FitData
     // Check input
     if (linearLimitFactor <= SMALL || linearLimitFactor > 3)
     {
-        FatalErrorIn("FitData<Polynomial>::FitData(..)")
+        FatalErrorInFunction
             << "linearLimitFactor requested = " << linearLimitFactor
             << " should be between zero and 3"
             << exit(FatalError);
@@ -114,7 +114,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::findFaceDirs
 
         if (magk < SMALL)
         {
-            FatalErrorIn("findFaceDirs(..)") << " calculated kdir = zero"
+            FatalErrorInFunction
                 << exit(FatalError);
         }
         else
@@ -253,11 +253,8 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
         {
             // if (iIt == 7)
             // {
-            //     WarningIn
-            //     (
-            //         "FitData<Polynomial>::calcFit"
-            //         "(const List<point>& C, const label facei"
-            //     )   << "Cannot fit face " << facei << " iteration " << iIt
+            //     WarningInFunction
+            //         << "Cannot fit face " << facei << " iteration " << iIt
             //         << " with sum of weights " << sum(coeffsi) << nl
             //         << "    Weights " << coeffsi << nl
             //         << "    Linear weights " << wLin << " " << 1 - wLin << nl
@@ -302,10 +299,8 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
     {
         // if (debug)
         // {
-            WarningIn
-            (
-                "FitData<Polynomial>::calcFit(..)"
-            )   << "Could not fit face " << facei
+            WarningInFunction
+                << "Could not fit face " << facei
                 << "    Weights = " << coeffsi
                 << ", reverting to linear." << nl
                 << "    Linear weights " << wLin << " " << 1 - wLin << endl;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
index 2fd816b701..11e24700a4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@@ -153,7 +153,7 @@ public:
         {
             if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_)
             {
-                FatalIOErrorIn("cellCoBlended(const fvMesh&, Istream&)", is)
+                FatalIOErrorInFunction(is)
                     << "coefficients = " << Co1_ << " and " << Co2_
                     << " should be > 0 and Co2 > Co1"
                     << exit(FatalIOError);
@@ -184,7 +184,7 @@ public:
         {
             if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_)
             {
-                FatalIOErrorIn("cellCoBlended(const fvMesh&, Istream&)", is)
+                FatalIOErrorInFunction(is)
                     << "coefficients = " << Co1_ << " and " << Co2_
                     << " should be > 0 and Co2 > Co1"
                     << exit(FatalIOError);
@@ -215,10 +215,8 @@ public:
             }
             else if (faceFlux_.dimensions() != dimVelocity*dimArea)
             {
-                FatalErrorIn
-                (
-                    "cellCoBlended::blendingFactor()"
-                )   << "dimensions of faceFlux are not correct"
+                FatalErrorInFunction
+                    << "dimensions of faceFlux are not correct"
                     << exit(FatalError);
             }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index b69b2a05dc..b704841a40 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ class clippedLinear
         {
             if (cellSizeRatio_ <= 0 || cellSizeRatio_ > 1)
             {
-                FatalErrorIn("clippedLinear::calcWfLimit()")
+                FatalErrorInFunction
                     << "Given cellSizeRatio of " << cellSizeRatio_
                     << " is not between 0 and 1"
                     << exit(FatalError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
index 083ddc9c4e..d521157dad 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
         {
             if (blendingFactor_ < 0 || blendingFactor_ > 1)
             {
-                FatalIOErrorIn("fixedBlended(const fvMesh&, Istream&)", is)
+                FatalIOErrorInFunction(is)
                     << "coefficient = " << blendingFactor_
                     << " should be >= 0 and <= 1"
                     << exit(FatalIOError);
@@ -146,7 +146,7 @@ public:
         {
             if (blendingFactor_ < 0 || blendingFactor_ > 1)
             {
-                FatalIOErrorIn("fixedBlended(const fvMesh&, Istream&)", is)
+                FatalIOErrorInFunction(is)
                     << "coefficient = " << blendingFactor_
                     << " should be >= 0 and <= 1"
                     << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
index 8918fc0abc..4dd2e87ba3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,11 +108,7 @@ public:
             const GeometricField<scalar, fvPatchField, volMesh>&
         ) const
         {
-            notImplemented
-            (
-                "harmonic::weights"
-                "(const GeometricField<scalar, fvPatchField, volMesh>&)"
-            );
+            NotImplemented;
 
             return tmp<surfaceScalarField>(NULL);
         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index 8ddaf8c452..e6d5849bd4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,11 +108,7 @@ public:
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const
         {
-            notImplemented
-            (
-                "localMax::weights"
-                "(const GeometricField<Type, fvPatchField, volMesh>&)"
-            );
+            NotImplemented;
 
             return tmp<surfaceScalarField>(NULL);
         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index 85c8375db5..9cd25a8352 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,11 +108,7 @@ public:
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const
         {
-            notImplemented
-            (
-                "localMin::weights"
-                "(const GeometricField<Type, fvPatchField, volMesh>&)"
-            );
+            NotImplemented;
 
             return tmp<surfaceScalarField>(NULL);
         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 810a72a5c6..9068212517 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -48,9 +48,8 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 {
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "surfaceInterpolationScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Discretisation scheme not specified"
             << endl << endl
@@ -75,9 +74,8 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 
     if (constructorIter == MeshConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "surfaceInterpolationScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
         )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
@@ -101,10 +99,8 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 {
     if (schemeData.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "surfaceInterpolationScheme<Type>::New"
-            "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Discretisation scheme not specified"
             << endl << endl
@@ -129,10 +125,8 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 
     if (constructorIter == MeshFluxConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "surfaceInterpolationScheme<Type>::New"
-            "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
         )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 2c9bf7d5e4..a39468535c 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -159,6 +159,66 @@ void volPointInterpolation::interpolateInternalField
 }
 
 
+template<class Type>
+void volPointInterpolation::interpolateDimensionedInternalField
+(
+    const DimensionedField<Type, volMesh>& vf,
+    DimensionedField<Type, pointMesh>& pf
+) const
+{
+    if (debug)
+    {
+        Pout<< "volPointInterpolation::interpolateDimensionedInternalField("
+            << "const DimensionedField<Type, volMesh>&, "
+            << "DimensionedField<Type, pointMesh>&) : "
+            << "interpolating field from cells to points"
+            << endl;
+    }
+
+    const fvMesh& mesh = vf.mesh();
+
+    const labelListList& pointCells = mesh.pointCells();
+    const pointField& points = mesh.points();
+    const vectorField& cellCentres = mesh.cellCentres();
+
+    // Re-do weights and interpolation since normal interpolation
+    // pointWeights_ are for non-boundary points only. Not efficient but
+    // then saves on space.
+
+    // Multiply volField by weighting factor matrix to create pointField
+    scalarField sumW(points.size(), 0.0);
+    forAll(pointCells, pointi)
+    {
+        const labelList& ppc = pointCells[pointi];
+
+        pf[pointi] = pTraits<Type>::zero;
+
+        forAll(ppc, pointCelli)
+        {
+            label celli = ppc[pointCelli];
+            scalar pw = 1.0/mag(points[pointi] - cellCentres[celli]);
+
+            pf[pointi] += pw*vf[celli];
+            sumW[pointi] += pw;
+        }
+    }
+
+    // Sum collocated contributions
+    pointConstraints::syncUntransformedData(mesh, sumW, plusEqOp<scalar>());
+    pointConstraints::syncUntransformedData(mesh, pf, plusEqOp<Type>());
+
+    // Normalise
+    forAll(pf, pointi)
+    {
+        scalar s = sumW[pointi];
+        if (s > ROOTVSMALL)
+        {
+            pf[pointi] /= s;
+        }
+    }
+}
+
+
 template<class Type>
 tmp<Field<Type> > volPointInterpolation::flatBoundaryField
 (
@@ -424,24 +484,13 @@ volPointInterpolation::interpolate
             if (pf.upToDate(vf))    //TBD: , vf.mesh().points()))
             {
                 solution::cachePrintMessage("Reusing", name, vf);
-                return pf;
             }
             else
             {
-                solution::cachePrintMessage("Deleting", name, vf);
-                pf.release();
-                delete &pf;
-
-                solution::cachePrintMessage("Recalculating", name, vf);
-                tmp<PointFieldType> tpf = interpolate(vf, name, false);
-
-                solution::cachePrintMessage("Storing", name, vf);
-                PointFieldType* pfPtr = tpf.ptr();
-                regIOobject::store(pfPtr);
-
-                // Note: return reference, not pointer
-                return *pfPtr;
+                solution::cachePrintMessage("Updating", name, vf);
+                interpolate(vf, pf);
             }
+            return pf;
         }
     }
 }
@@ -473,6 +522,116 @@ volPointInterpolation::interpolate
 }
 
 
+template<class Type>
+tmp<DimensionedField<Type, pointMesh> >
+volPointInterpolation::interpolate
+(
+    const DimensionedField<Type, volMesh>& vf,
+    const word& name,
+    const bool cache
+) const
+{
+    typedef DimensionedField<Type, pointMesh> PointFieldType;
+
+    const pointMesh& pm = pointMesh::New(vf.mesh());
+    const objectRegistry& db = pm.thisDb();
+
+    if (!cache || vf.mesh().changing())
+    {
+        // Delete any old occurences to avoid double registration
+        if (db.objectRegistry::template foundObject<PointFieldType>(name))
+        {
+            PointFieldType& pf = const_cast<PointFieldType&>
+            (
+                db.objectRegistry::template lookupObject<PointFieldType>(name)
+            );
+
+            if (pf.ownedByRegistry())
+            {
+                solution::cachePrintMessage("Deleting", name, vf);
+                pf.release();
+                delete &pf;
+            }
+        }
+
+
+        tmp<DimensionedField<Type, pointMesh> > tpf
+        (
+            new DimensionedField<Type, pointMesh>
+            (
+                IOobject
+                (
+                    name,
+                    vf.instance(),
+                    pm.thisDb()
+                ),
+                pm,
+                vf.dimensions()
+            )
+        );
+
+        interpolateDimensionedInternalField(vf, tpf());
+
+        return tpf;
+    }
+    else
+    {
+        if (!db.objectRegistry::template foundObject<PointFieldType>(name))
+        {
+            solution::cachePrintMessage("Calculating and caching", name, vf);
+            tmp<PointFieldType> tpf = interpolate(vf, name, false);
+            PointFieldType* pfPtr = tpf.ptr();
+            regIOobject::store(pfPtr);
+            return *pfPtr;
+        }
+        else
+        {
+            PointFieldType& pf = const_cast<PointFieldType&>
+            (
+                db.objectRegistry::template lookupObject<PointFieldType>(name)
+            );
+
+            if (pf.upToDate(vf))    //TBD: , vf.mesh().points()))
+            {
+                solution::cachePrintMessage("Reusing", name, vf);
+            }
+            else
+            {
+                solution::cachePrintMessage("Updating", name, vf);
+                interpolateDimensionedInternalField(vf, pf);
+            }
+
+            return pf;
+        }
+    }
+}
+
+
+template<class Type>
+tmp<DimensionedField<Type, pointMesh> >
+volPointInterpolation::interpolate
+(
+    const DimensionedField<Type, volMesh>& vf
+) const
+{
+    return interpolate(vf, "volPointInterpolate(" + vf.name() + ')', false);
+}
+
+
+template<class Type>
+tmp<DimensionedField<Type, pointMesh> >
+volPointInterpolation::interpolate
+(
+    const tmp<DimensionedField<Type, volMesh> >& tvf
+) const
+{
+    // Construct tmp<pointField>
+    tmp<DimensionedField<Type, pointMesh> > tpf = interpolate(tvf());
+    tvf.clear();
+    return tpf;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index 6e82d741e4..fac26df10c 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -187,6 +187,22 @@ public:
             const wordList& patchFieldTypes
         ) const;
 
+        //- Interpolate dimensionedField using inverse distance weighting
+        //  returning pointField
+        template<class Type>
+        tmp<DimensionedField<Type, pointMesh> > interpolate
+        (
+            const DimensionedField<Type, volMesh>&
+        ) const;
+
+        //- Interpolate tmp<dimensionedField> using inverse distance
+        //  weighting returning pointField
+        template<class Type>
+        tmp<DimensionedField<Type, pointMesh> > interpolate
+        (
+            const tmp<DimensionedField<Type, volMesh> >&
+        ) const;
+
 
         // Low level
 
@@ -236,6 +252,24 @@ public:
                 const bool cache
             ) const;
 
+            //- Interpolate dimensioned internal field from cells to points
+            //  using inverse distance weighting
+            template<class Type>
+            void interpolateDimensionedInternalField
+            (
+                const DimensionedField<Type, volMesh>& vf,
+                DimensionedField<Type, pointMesh>& pf
+            ) const;
+
+            //- Interpolate dimensionedField using inverse distance weighting
+            //  returning pointField with name. Optionally caches
+            template<class Type>
+            tmp<DimensionedField<Type, pointMesh> > interpolate
+            (
+                const DimensionedField<Type, volMesh>&,
+                const word& name,
+                const bool cache
+            ) const;
 
         // Interpolation for displacement (applies 2D correction)
 
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index 46fc5f1853..33c19f801a 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -271,15 +271,8 @@ bool Foam::pairPatchAgglomeration::agglomeratePatch
 {
     if (min(fineToCoarse) == -1)
     {
-        FatalErrorIn
-        (
-            "pairPatchAgglomeration::agglomeratePatch"
-            "("
-                "const bPatch&, "
-                "const labelList&, "
-                "const label"
-            ")"
-        )   << "min(fineToCoarse) == -1" << exit(FatalError);
+        FatalErrorInFunction
+            << "min(fineToCoarse) == -1" << exit(FatalError);
     }
 
     if (fineToCoarse.size() == 0)
@@ -289,15 +282,8 @@ bool Foam::pairPatchAgglomeration::agglomeratePatch
 
     if (fineToCoarse.size() != patch.size())
     {
-        FatalErrorIn
-        (
-            "pairPatchAgglomeration::agglomeratePatch"
-            "("
-                "const bPatch&, "
-                "const labelList&, "
-                "const label"
-            ")"
-        )   << "restrict map does not correspond to fine level. " << endl
+        FatalErrorInFunction
+            << "restrict map does not correspond to fine level. " << endl
             << " Sizes: restrictMap: " << fineToCoarse.size()
             << " nEqns: " << patch.size()
             << abort(FatalError);
@@ -540,11 +526,8 @@ Foam::tmp<Foam::labelField> Foam::pairPatchAgglomeration::agglomerateOneLevel
     {
         if (coarseCellMap[facei] < 0)
         {
-            FatalErrorIn
-            (
-                "pairPatchAgglomeration::agglomerateOneLevel "
-                "(label&, const bPatch&) "
-            ) << " face " << facei
+            FatalErrorInFunction
+              << " face " << facei
             << " is not part of a cluster"
             << exit(FatalError);
         }
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C
index 73b8cff0ad..9ddc691bb7 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,12 +39,8 @@ void Foam::pairPatchAgglomeration::restrictField
 
     if (ff.size() != fineToCoarse.size())
     {
-        FatalErrorIn
-        (
-            "void pairPatchAgglomeration::restrictField"
-            "(Field<Type>& cf, const Field<Type>& ff, "
-            "const label fineLevelIndex) const"
-        )   << "field does not correspond to level " << fineLevelIndex
+        FatalErrorInFunction
+            << "field does not correspond to level " << fineLevelIndex
             << " sizes: field = " << ff.size()
             << " level = " << fineToCoarse.size()
             << abort(FatalError);
diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files
index 13204042af..19475e258b 100644
--- a/src/fvMotionSolver/Make/files
+++ b/src/fvMotionSolver/Make/files
@@ -4,6 +4,7 @@ fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
 fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
 fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
 fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalk.C
+fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
 
 fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
 fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -22,6 +23,10 @@ motionDiffusivity/file/fileDiffusivity.C
 motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.C
 motionDiffusivity/manipulators/exponential/exponentialDiffusivity.C
 
+motionInterpolation/motionInterpolation/motionInterpolation.C
+motionInterpolation/patchCorrected/patchCorrectedInterpolation.C
+motionInterpolation/patchTransformed/patchTransformedInterpolation.C
+
 fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C
 fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFields.C
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index 8f90cb8444..e8d3d4eb93 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "displacementComponentLaplacianFvMotionSolver.H"
+#include "motionInterpolation.H"
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
 #include "mapPolyMesh.H"
-#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -76,6 +76,12 @@ displacementComponentLaplacianFvMotionSolver
         cellMotionBoundaryTypes<scalar>(pointDisplacement_.boundaryField())
     ),
     pointLocation_(NULL),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
     diffusivityPtr_
     (
         motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
@@ -140,7 +146,7 @@ Foam::displacementComponentLaplacianFvMotionSolver::
 Foam::tmp<Foam::pointField>
 Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
 {
-    volPointInterpolation::New(fvMesh_).interpolate
+    interpolationPtr_->interpolate
     (
         cellDisplacement_,
         pointDisplacement_
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index 56a6f932dd..91575ae99d 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,7 @@ namespace Foam
 {
 
 // Forward class declarations
+class motionInterpolation;
 class motionDiffusivity;
 
 /*---------------------------------------------------------------------------*\
@@ -65,6 +66,9 @@ class displacementComponentLaplacianFvMotionSolver
         //  boundary conditions.
         mutable autoPtr<pointVectorField> pointLocation_;
 
+        //- Interpolation used to transfer cell displacement to the points
+        autoPtr<motionInterpolation> interpolationPtr_;
+
         //- Diffusivity used to control the motion
         autoPtr<motionDiffusivity> diffusivityPtr_;
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
index 124a679e15..aab69c3d85 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,10 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "velocityComponentLaplacianFvMotionSolver.H"
+#include "motionInterpolation.H"
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
-#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -74,6 +74,12 @@ velocityComponentLaplacianFvMotionSolver
         ),
         cellMotionBoundaryTypes<scalar>(pointMotionU_.boundaryField())
     ),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
     diffusivityPtr_
     (
         motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
@@ -93,7 +99,7 @@ Foam::velocityComponentLaplacianFvMotionSolver::
 Foam::tmp<Foam::pointField>
 Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const
 {
-    volPointInterpolation::New(fvMesh_).interpolate
+    interpolationPtr_->interpolate
     (
         cellMotionU_,
         pointMotionU_
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index 1f58ddf414..aee616cb21 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,7 @@ namespace Foam
 {
 
 // Forward class declarations
+class motionInterpolation;
 class motionDiffusivity;
 
 /*---------------------------------------------------------------------------*\
@@ -61,6 +62,9 @@ class velocityComponentLaplacianFvMotionSolver
         //- Cell-centre motion field
         mutable volScalarField cellMotionU_;
 
+        //- Interpolation used to transfer cell displacement to the points
+        autoPtr<motionInterpolation> interpolationPtr_;
+
         //- Diffusivity used to control the motion
         autoPtr<motionDiffusivity> diffusivityPtr_;
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 7aafefc0c5..508c5b3be1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "displacementSBRStressFvMotionSolver.H"
+#include "motionInterpolation.H"
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
@@ -32,7 +33,6 @@ License
 #include "surfaceInterpolate.H"
 #include "fvcLaplacian.H"
 #include "mapPolyMesh.H"
-#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -46,6 +46,13 @@ namespace Foam
         displacementSBRStressFvMotionSolver,
         dictionary
     );
+
+    addToRunTimeSelectionTable
+    (
+        displacementMotionSolver,
+        displacementSBRStressFvMotionSolver,
+        displacement
+    );
 }
 
 
@@ -78,6 +85,58 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
         ),
         cellMotionBoundaryTypes<vector>(pointDisplacement().boundaryField())
     ),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
+    diffusivityPtr_
+    (
+        motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
+    )
+{}
+
+
+Foam::displacementSBRStressFvMotionSolver::
+displacementSBRStressFvMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict,
+    const pointVectorField& pointDisplacement,
+    const pointIOField& points0
+)
+:
+    displacementMotionSolver(mesh, dict, pointDisplacement, points0, typeName),
+    fvMotionSolverCore(mesh),
+    cellDisplacement_
+    (
+        IOobject
+        (
+            "cellDisplacement",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        fvMesh_,
+        dimensionedVector
+        (
+            "cellDisplacement",
+            displacementMotionSolver::pointDisplacement().dimensions(),
+            vector::zero
+        ),
+        cellMotionBoundaryTypes<vector>
+        (
+            displacementMotionSolver::pointDisplacement().boundaryField()
+        )
+    ),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
     diffusivityPtr_
     (
         motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
@@ -97,7 +156,7 @@ Foam::displacementSBRStressFvMotionSolver::
 Foam::tmp<Foam::pointField>
 Foam::displacementSBRStressFvMotionSolver::curPoints() const
 {
-    volPointInterpolation::New(fvMesh_).interpolate
+    interpolationPtr_->interpolate
     (
         cellDisplacement_,
         pointDisplacement_
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index 566a98686b..cb7de0c6d3 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,7 @@ namespace Foam
 {
 
 // Forward class declarations
+class motionInterpolation;
 class motionDiffusivity;
 
 /*---------------------------------------------------------------------------*\
@@ -61,6 +62,9 @@ class displacementSBRStressFvMotionSolver
         //- Cell-centre motion field
         mutable volVectorField cellDisplacement_;
 
+        //- Interpolation used to transfer cell displacement to the points
+        autoPtr<motionInterpolation> interpolationPtr_;
+
         //- Diffusivity used to control the motion
         autoPtr<motionDiffusivity> diffusivityPtr_;
 
@@ -92,6 +96,15 @@ public:
             const IOdictionary&
         );
 
+        //- Construct from components
+        displacementSBRStressFvMotionSolver
+        (
+            const polyMesh& mesh,
+            const IOdictionary& dict,
+            const pointVectorField& pointDisplacement,
+            const pointIOField& points0
+        );
+
 
     //- Destructor
     ~displacementSBRStressFvMotionSolver();
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index 6029c8383f..156815f45e 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,6 +44,13 @@ namespace Foam
         dictionary
     );
 
+    addToRunTimeSelectionTable
+    (
+        displacementMotionSolver,
+        displacementInterpolationMotionSolver,
+        displacement
+    );
+
     template<>
     const word IOList<Tuple2<scalar, vector> >::typeName("scalarVectorTable");
 }
@@ -51,16 +58,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::displacementInterpolationMotionSolver::
-displacementInterpolationMotionSolver
-(
-    const polyMesh& mesh,
-    const IOdictionary& dict
-)
-:
-    displacementMotionSolver(mesh, dict, typeName)
+void Foam::displacementInterpolationMotionSolver::calcInterpolation()
 {
     // Get zones and their interpolation tables for displacement
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -70,7 +68,7 @@ displacementInterpolationMotionSolver
         coeffDict().lookup("interpolationTables")
     );
 
-    const faceZoneMesh& fZones = mesh.faceZones();
+    const faceZoneMesh& fZones = mesh().faceZones();
 
     times_.setSize(fZones.size());
     displacements_.setSize(fZones.size());
@@ -82,13 +80,9 @@ displacementInterpolationMotionSolver
 
         if (zoneI == -1)
         {
-            FatalErrorIn
-            (
-                "displacementInterpolationMotionSolver::"
-                "displacementInterpolationMotionSolver(const polyMesh&,"
-                "Istream&)"
-            )   << "Cannot find zone " << zoneName << endl
-                << "Valid zones are " << mesh.faceZones().names()
+            FatalErrorInFunction
+                << "Cannot find zone " << zoneName << endl
+                << "Valid zones are " << fZones.names()
                 << exit(FatalError);
         }
 
@@ -99,9 +93,9 @@ displacementInterpolationMotionSolver
             IOobject
             (
                 tableName,
-                mesh.time().constant(),
+                mesh().time().constant(),
                 "tables",
-                mesh,
+                mesh(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
                 false
@@ -250,12 +244,8 @@ displacementInterpolationMotionSolver
 
             if (rangeI == -1 || rangeI == rangeToCoord.size()-1)
             {
-                FatalErrorIn
-                (
-                    "displacementInterpolationMotionSolver::"
-                    "displacementInterpolationMotionSolver"
-                    "(const polyMesh&, Istream&)"
-                )   << "Did not find point " << points0()[pointI]
+                FatalErrorInFunction
+                    << "Did not find point " << points0()[pointI]
                     << " coordinate " << meshCoords[pointI]
                     << " in ranges " << rangeToCoord
                     << abort(FatalError);
@@ -299,6 +289,36 @@ displacementInterpolationMotionSolver
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::displacementInterpolationMotionSolver::
+displacementInterpolationMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict
+)
+:
+    displacementMotionSolver(mesh, dict, typeName)
+{
+    calcInterpolation();
+}
+
+
+Foam::displacementInterpolationMotionSolver::
+displacementInterpolationMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict,
+    const pointVectorField& pointDisplacement,
+    const pointIOField& points0
+)
+:
+    displacementMotionSolver(mesh, dict, pointDisplacement, points0, typeName)
+{
+    calcInterpolation();
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::displacementInterpolationMotionSolver::
@@ -313,10 +333,8 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
 {
     if (mesh().nPoints() != points0().size())
     {
-        FatalErrorIn
-        (
-            "displacementInterpolationMotionSolver::curPoints() const"
-        )   << "The number of points in the mesh seems to have changed." << endl
+        FatalErrorInFunction
+            << "The number of points in the mesh seems to have changed." << endl
             << "In constant/polyMesh there are " << points0().size()
             << " points; in the current mesh there are " << mesh().nPoints()
             << " points." << exit(FatalError);
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
index b5da0b5b3b..3742417349 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -86,6 +86,9 @@ class displacementInterpolationMotionSolver
 
     // Private Member Functions
 
+        //- Read settings
+        void calcInterpolation();
+
         //- Disallow default bitwise copy construct
         displacementInterpolationMotionSolver
         (
@@ -111,6 +114,15 @@ public:
             const IOdictionary& dict
         );
 
+        //- Construct from components
+        displacementInterpolationMotionSolver
+        (
+            const polyMesh& mesh,
+            const IOdictionary& dict,
+            const pointVectorField& pointDisplacement,
+            const pointIOField& points0
+        );
+
 
     //- Destructor
     ~displacementInterpolationMotionSolver();
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index d4a3ca5a0a..15e1a4cf8d 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,13 +24,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "displacementLaplacianFvMotionSolver.H"
+#include "motionInterpolation.H"
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
 #include "OFstream.H"
 #include "meshTools.H"
 #include "mapPolyMesh.H"
-#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -44,6 +44,13 @@ namespace Foam
         displacementLaplacianFvMotionSolver,
         dictionary
     );
+
+    addToRunTimeSelectionTable
+    (
+        displacementMotionSolver,
+        displacementLaplacianFvMotionSolver,
+        displacement
+    );
 }
 
 
@@ -77,6 +84,102 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
         cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
     ),
     pointLocation_(NULL),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
+    diffusivityPtr_
+    (
+        motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
+    ),
+    frozenPointsZone_
+    (
+        coeffDict().found("frozenPointsZone")
+      ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
+      : -1
+    )
+{
+    IOobject io
+    (
+        "pointLocation",
+        fvMesh_.time().timeName(),
+        fvMesh_,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    );
+
+    if (debug)
+    {
+        Info<< "displacementLaplacianFvMotionSolver:" << nl
+            << "    diffusivity       : " << diffusivityPtr_().type() << nl
+            << "    frozenPoints zone : " << frozenPointsZone_ << endl;
+    }
+
+
+    if (io.headerOk())
+    {
+        pointLocation_.reset
+        (
+            new pointVectorField
+            (
+                io,
+                pointMesh::New(fvMesh_)
+            )
+        );
+
+        if (debug)
+        {
+            Info<< "displacementLaplacianFvMotionSolver :"
+                << " Read pointVectorField "
+                << io.name()
+                << " to be used for boundary conditions on points."
+                << nl
+                << "Boundary conditions:"
+                << pointLocation_().boundaryField().types() << endl;
+        }
+    }
+}
+
+
+Foam::displacementLaplacianFvMotionSolver::
+displacementLaplacianFvMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict,
+    const pointVectorField& pointDisplacement,
+    const pointIOField& points0
+)
+:
+    displacementMotionSolver(mesh, dict, pointDisplacement, points0, typeName),
+    fvMotionSolverCore(mesh),
+    cellDisplacement_
+    (
+        IOobject
+        (
+            "cellDisplacement",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        fvMesh_,
+        dimensionedVector
+        (
+            "cellDisplacement",
+            pointDisplacement_.dimensions(),
+            vector::zero
+        ),
+        cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
+    ),
+    pointLocation_(NULL),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
     diffusivityPtr_
     (
         motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
@@ -157,7 +260,7 @@ Foam::displacementLaplacianFvMotionSolver::diffusivity()
 Foam::tmp<Foam::pointField>
 Foam::displacementLaplacianFvMotionSolver::curPoints() const
 {
-    volPointInterpolation::New(fvMesh_).interpolate
+    interpolationPtr_->interpolate
     (
         cellDisplacement_,
         pointDisplacement_
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index 47ad2c672c..bcaa96e166 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,7 @@ namespace Foam
 {
 
 // Forward class declarations
+class motionInterpolation;
 class motionDiffusivity;
 
 /*---------------------------------------------------------------------------*\
@@ -65,6 +66,9 @@ class displacementLaplacianFvMotionSolver
         //  boundary conditions.
         mutable autoPtr<pointVectorField> pointLocation_;
 
+        //- Interpolation used to transfer cell displacement to the points
+        autoPtr<motionInterpolation> interpolationPtr_;
+
         //- Diffusivity used to control the motion
         autoPtr<motionDiffusivity> diffusivityPtr_;
 
@@ -100,6 +104,15 @@ public:
             const IOdictionary&
         );
 
+        //- Construct from components
+        displacementLaplacianFvMotionSolver
+        (
+            const polyMesh& mesh,
+            const IOdictionary& dict,
+            const pointVectorField& pointDisplacement,
+            const pointIOField& points0
+        );
+
 
     //- Destructor
     ~displacementLaplacianFvMotionSolver();
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index 137283c1ba..a676438f7b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,13 @@ namespace Foam
         displacementLayeredMotionMotionSolver,
         dictionary
     );
+
+    addToRunTimeSelectionTable
+    (
+        displacementMotionSolver,
+        displacementLayeredMotionMotionSolver,
+        displacement
+    );
 }
 
 
@@ -241,18 +248,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
     {
         if ((patchI % 2) != 1)
         {
-            FatalIOErrorIn
-            (
-                "displacementLayeredMotionMotionSolver::faceZoneEvaluate"
-                "("
-                    "const faceZone&, "
-                    "const labelList&, "
-                    "const dictionary&, "
-                    "const PtrList<pointVectorField>&, "
-                    "const label"
-                ") const",
-                *this
-            )   << "slip can only be used on second faceZone patch of pair.  "
+            FatalIOErrorInFunction(*this)
                 << "FaceZone:" << fz.name()
                 << exit(FatalIOError);
         }
@@ -278,18 +274,8 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "displacementLayeredMotionMotionSolver::faceZoneEvaluate"
-            "("
-                "const faceZone&, "
-                "const labelList&, "
-                "const dictionary&, "
-                "const PtrList<pointVectorField>&, "
-                "const label"
-            ") const",
-            *this
-        )   << "Unknown faceZonePatch type " << type << " for faceZone "
+        FatalIOErrorInFunction(*this)
+            << "Unknown faceZonePatch type " << type << " for faceZone "
             << fz.name() << exit(FatalIOError);
     }
     return tfld;
@@ -310,12 +296,8 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
 
     if (patchesDict.size() != 2)
     {
-        FatalIOErrorIn
-        (
-            "displacementLayeredMotionMotionSolver::"
-            "cellZoneSolve(const label, const dictionary&)",
-            *this
-        )   << "Two faceZones (patches) must be specifed per cellZone. "
+        FatalIOErrorInFunction(*this)
+            << "Two faceZones (patches) must be specifed per cellZone. "
             << " cellZone:" << cellZoneI
             << " patches:" << patchesDict.toc()
             << exit(FatalIOError);
@@ -332,12 +314,8 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
         label zoneI = mesh().faceZones().findZoneID(faceZoneName);
         if (zoneI == -1)
         {
-            FatalIOErrorIn
-            (
-                "displacementLayeredMotionMotionSolver::"
-                "cellZoneSolve(const label, const dictionary&)",
-                *this
-            )   << "Cannot find faceZone " << faceZoneName
+            FatalIOErrorInFunction(*this)
+                << "Cannot find faceZone " << faceZoneName
                 << endl << "Valid zones are " << mesh().faceZones().names()
                 << exit(FatalIOError);
         }
@@ -506,11 +484,7 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
     }
     else
     {
-        FatalErrorIn
-        (
-            "displacementLayeredMotionMotionSolver::"
-            "cellZoneSolve(const label, const dictionary&)"
-        )
+        FatalErrorInFunction
             << "Invalid interpolationScheme: " << interpolationScheme
             << ". Valid schemes are 'oneSided' and 'linear'"
             << exit(FatalError);
@@ -531,6 +505,19 @@ displacementLayeredMotionMotionSolver
 {}
 
 
+Foam::displacementLayeredMotionMotionSolver::
+displacementLayeredMotionMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict,
+    const pointVectorField& pointDisplacement,
+    const pointIOField& points0
+)
+:
+    displacementMotionSolver(mesh, dict, pointDisplacement, points0, typeName)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::displacementLayeredMotionMotionSolver::
@@ -573,11 +560,8 @@ void Foam::displacementLayeredMotionMotionSolver::solve()
 
         if (zoneI == -1)
         {
-            FatalIOErrorIn
-            (
-                "displacementLayeredMotionMotionSolver::solve()",
-                *this
-            )   << "Cannot find cellZone " << cellZoneName
+            FatalIOErrorInFunction(*this)
+                << "Cannot find cellZone " << cellZoneName
                 << endl << "Valid zones are " << mesh().cellZones().names()
                 << exit(FatalIOError);
         }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
index 1aa7884f52..6b77a8aa60 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -136,6 +136,16 @@ public:
             const IOdictionary&
         );
 
+        //- Construct from polyMesh, IOdictionary and displacement and
+        //  zero-time fields
+        displacementLayeredMotionMotionSolver
+        (
+            const polyMesh&,
+            const IOdictionary&,
+            const pointVectorField&,
+            const pointIOField&
+        );
+
 
     //- Destructor
     ~displacementLayeredMotionMotionSolver();
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
new file mode 100644
index 0000000000..3593db771f
--- /dev/null
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
@@ -0,0 +1,423 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceAlignedSBRStressFvMotionSolver.H"
+#include "addToRunTimeSelectionTable.H"
+#include "pointIndexHit.H"
+#include "fvmLaplacian.H"
+#include "fvcDiv.H"
+#include "surfaceInterpolate.H"
+#include "unitConversion.H"
+#include "motionDiffusivity.H"
+#include "fvcSmooth.H"
+#include "pointMVCWeight.H"
+#include "dimensionedSymmTensor.H"
+#include "quaternion.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(surfaceAlignedSBRStressFvMotionSolver, 0);
+
+    addToRunTimeSelectionTable
+    (
+        motionSolver,
+        surfaceAlignedSBRStressFvMotionSolver,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::surfaceAlignedSBRStressFvMotionSolver::
+surfaceAlignedSBRStressFvMotionSolver
+(
+    const polyMesh& mesh,
+    const IOdictionary& dict
+)
+:
+    displacementSBRStressFvMotionSolver(mesh, dict),
+    surfaceNames_(coeffDict().lookup("surfaces")),
+    surfaceMesh_(surfaceNames_.size()),
+    cellRot_
+    (
+        IOobject
+        (
+            "cellRot",
+            fvMesh_.time().timeName(),
+            fvMesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        fvMesh_,
+        dimensionedVector("zero", dimless, vector::zero)
+    ),
+    maxAng_(coeffDict().lookupOrDefault<scalar>("maxAng", 80.0)),
+    minAng_(coeffDict().lookupOrDefault<scalar>("minAng", 20.0)),
+    accFactor_(coeffDict().lookupOrDefault<scalar>("accFactor", 1.0)),
+    smoothFactor_(coeffDict().lookupOrDefault<scalar>("smoothFactor", 0.9)),
+    nNonOrthogonalCorr_(readLabel(coeffDict().lookup("nNonOrthogonalCorr"))),
+    pointDisplacement_(pointDisplacement()),
+    sigmaD_
+    (
+        IOobject
+        (
+            "sigmaD",
+            fvMesh_.time().timeName(),
+            fvMesh_,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE
+        ),
+        fvMesh_,
+        dimensionedSymmTensor("zero", dimless, symmTensor::zero)
+    ),
+    minSigmaDiff_(coeffDict().lookupOrDefault<scalar>("minSigmaDiff", 1e-4))
+{
+    forAll (surfaceNames_, i)
+    {
+        surfaceMesh_.set
+        (
+            i,
+            new triSurfaceMesh
+            (
+                IOobject
+                (
+                    surfaceNames_[i],
+                    mesh.time().constant(),
+                    "triSurface",
+                    mesh.time(),
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                )
+            )
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::surfaceAlignedSBRStressFvMotionSolver::
+~surfaceAlignedSBRStressFvMotionSolver()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+void Foam::surfaceAlignedSBRStressFvMotionSolver::calculateCellRot()
+{
+    cellRot_.internalField() = vector::zero;
+    pointDisplacement_.internalField() = vector::zero;
+
+    // Find intersections
+    pointField start(fvMesh_.nInternalFaces());
+    pointField end(start.size());
+
+    for (label faceI = 0; faceI < fvMesh_.nInternalFaces(); faceI++)
+    {
+        start[faceI] = fvMesh_.cellCentres()[fvMesh_.faceOwner()[faceI]];
+        end[faceI] = fvMesh_.cellCentres()[fvMesh_.faceNeighbour()[faceI]];
+    }
+
+    DynamicList<label> hitCells;
+
+    forAll (surfaceMesh_, surfI)
+    {
+        List<pointIndexHit> hit(start.size());
+        surfaceMesh_[surfI].findLineAny(start, end, hit);
+
+        labelField pointsCount(fvMesh_.nPoints(), 1);
+
+        const vectorField& nf = surfaceMesh_[surfI].faceNormals();
+
+        const vectorField& SfMesh = fvMesh_.faceAreas();
+
+        const vectorField nSfMesh(SfMesh/mag(SfMesh));
+
+        DynamicList<label> cellsHit;
+
+        forAll(hit, faceI)
+        {
+            if (hit[faceI].hit())
+            {
+                label rotCellId(-1);
+                const vector hitPoint = hit[faceI].hitPoint();
+
+                if (fvMesh_.isInternalFace(faceI))
+                {
+                    const vector cCOne =
+                        fvMesh_.cellCentres()[fvMesh_.faceOwner()[faceI]];
+
+                    const vector cCTwo =
+                        fvMesh_.cellCentres()[fvMesh_.faceNeighbour()[faceI]];
+
+                    if (mag(cCOne - hitPoint) < mag(cCTwo - hitPoint))
+                    {
+                        rotCellId = fvMesh_.faceOwner()[faceI];
+                    }
+                    else
+                    {
+                        rotCellId = fvMesh_.faceNeighbour()[faceI];
+                    }
+                }
+                else
+                {
+                    label patchI = fvMesh_.boundaryMesh().whichPatch(faceI);
+                    if
+                    (
+                        isA<processorPolyPatch>(fvMesh_.boundaryMesh()[patchI])
+                    )
+                    {
+                        const point& ownCc =
+                            fvMesh_.cellCentres()[fvMesh_.faceOwner()[faceI]];
+
+                        const vector cCentreOne = ownCc - hitPoint;
+
+                        const vector nbrCc =
+                            refCast<const processorPolyPatch>
+                            (
+                                fvMesh_.boundaryMesh()[patchI]
+                            ).neighbFaceCellCentres()[faceI];
+
+                        const vector cCentreTwo = nbrCc - hitPoint;
+
+                        if (cCentreOne < cCentreTwo)
+                        {
+                            rotCellId = fvMesh_.faceOwner()[faceI];
+                        }
+                    }
+                }
+
+                // Note: faces on boundaries that get hit are noy included as
+                // the pointDisplacement on boundaries is usually zero for
+                // this solver.
+
+                // Search for closest direction on faces on mesh
+                // and surface normal.
+                if (rotCellId != -1)
+                {
+                    const labelList& cFaces = fvMesh_.cells()[rotCellId];
+
+                    scalar cosMax(-GREAT);
+                    label faceId(-1);
+                    forAll(cFaces, k)
+                    {
+                        scalar tmp =
+                            mag(nf[hit[faceI].index()] & nSfMesh[cFaces[k]]);
+
+                        if (tmp > cosMax)
+                        {
+                            cosMax = tmp;
+                            faceId = cFaces[k];
+                        }
+                    }
+                    if
+                    (
+                        faceId != -1
+                    &&
+                        (
+                            ::cos(degToRad(minAng_)) > cosMax
+                            || cosMax > ::cos(degToRad(maxAng_))
+
+                        )
+                    )
+                    {
+                        cellRot_[rotCellId] =
+                            nSfMesh[faceId] ^ nf[hit[faceI].index()];
+
+                        const scalar magRot = mag(cellRot_[rotCellId]);
+
+                        if (magRot > 0)
+                        {
+                            const scalar theta = ::asin(magRot);
+                            quaternion q(cellRot_[rotCellId]/magRot, theta);
+                            const tensor R = q.R();
+                            const labelList& cPoints =
+                                fvMesh_.cellPoints(rotCellId);
+
+                            forAll (cPoints, j)
+                            {
+                                const label pointId = cPoints[j];
+
+                                pointsCount[pointId]++;
+
+                                const vector pointPos =
+                                    fvMesh_.points()[pointId];
+
+                                pointDisplacement_[pointId] +=
+                                    (R & (pointPos - hitPoint))
+                                  - (pointPos - hitPoint);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        forAll (pointDisplacement_.internalField(), iPoint)
+        {
+            vector& point = pointDisplacement_.internalField()[iPoint];
+            point /= pointsCount[iPoint];
+        }
+
+
+    }
+}
+
+
+void Foam::surfaceAlignedSBRStressFvMotionSolver::solve()
+{
+    // The points have moved so before interpolation update
+    // the mtionSolver accordingly
+    this->movePoints(fvMesh_.points());
+
+    volVectorField& cellDisp = cellDisplacement();
+
+    diffusivity().correct();
+
+    // Calculate rotations on surface intersection
+    calculateCellRot();
+
+    tmp<volVectorField> tUd
+    (
+        new volVectorField
+        (
+            IOobject
+            (
+                "Ud",
+                fvMesh_.time().timeName(),
+                fvMesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            fvMesh_,
+            dimensionedVector("zero", dimLength, vector::zero),
+            cellMotionBoundaryTypes<vector>
+            (
+                pointDisplacement().boundaryField()
+            )
+        )
+    );
+
+    volVectorField& Ud = tUd();
+
+    const vectorList& C = fvMesh_.C();
+    forAll (Ud, i)
+    {
+        pointMVCWeight pointInter(fvMesh_, C[i], i);
+        Ud[i] = pointInter.interpolate(pointDisplacement_);
+    }
+
+    volScalarField Udx(Ud.component(vector::X));
+    fvc::smooth(Udx, smoothFactor_);
+
+    volScalarField Udy(Ud.component(vector::Y));
+    fvc::smooth(Udy, smoothFactor_);
+
+    volScalarField Udz(Ud.component(vector::Z));
+    fvc::smooth(Udz, smoothFactor_);
+
+    Ud.replace(vector::X, Udx);
+    Ud.replace(vector::Y, Udy);
+    Ud.replace(vector::Z, Udz);
+
+    const volTensorField gradD("gradD", fvc::grad(Ud));
+
+    tmp<volScalarField> tmu
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "mu",
+                fvMesh_.time().timeName(),
+                fvMesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            fvMesh_,
+            dimensionedScalar("zero", dimless, 0.0)
+        )
+    );
+    volScalarField& mu =  tmu();
+
+    const scalarList& V = fvMesh_.V();
+    mu.internalField() = (1.0/V);
+
+    const volScalarField lambda(-mu);
+
+    const volSymmTensorField newSigmaD
+    (
+        mu*twoSymm(gradD) + (lambda*I)*tr(gradD)
+    );
+
+    const volSymmTensorField magNewSigmaD(sigmaD_ + accFactor_*newSigmaD);
+
+    const scalar diffSigmaD =
+        gSum(mag(sigmaD_.oldTime().internalField()))
+     -  gSum(mag(magNewSigmaD.internalField()));
+
+    if (mag(diffSigmaD) > minSigmaDiff_)
+    {
+        sigmaD_ = magNewSigmaD;
+    }
+
+    const surfaceScalarField Df(diffusivity().operator()());
+    pointDisplacement_.boundaryField().updateCoeffs();
+
+    const volTensorField gradCd(fvc::grad(cellDisp));
+
+    for (int nonOrth=0; nonOrth<=nNonOrthogonalCorr_; nonOrth++)
+    {
+        fvVectorMatrix DEqn
+        (
+            fvm::laplacian
+            (
+                2*Df*fvc::interpolate(mu),
+                cellDisp,
+                "laplacian(diffusivity,cellDisplacement)"
+            )
+          + fvc::div
+            (
+                Df*
+                (
+                    fvc::interpolate(mu)
+                  * (fvMesh_.Sf() & fvc::interpolate(gradCd.T() - gradCd))
+                  - fvc::interpolate(lambda)*fvMesh_.Sf()
+                  * fvc::interpolate(tr(gradCd))
+                )
+            )
+          ==
+            fvc::div(sigmaD_)
+        );
+
+        DEqn.solve();
+    }
+}
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
new file mode 100644
index 0000000000..719c699449
--- /dev/null
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.H
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::surfaceAlignedSBRStressFvMotionSolver
+
+Description
+    Mesh motion solver for an fvMesh.  Based on solving the cell-centre
+    solid-body rotation stress equations for the motion displacement.
+    The model calculates the necessary rotation to align the stl surface
+    with the closest mesh face normals and it calculates the respective source
+    term for the SBRStress equation.
+
+    Input parameters:
+
+    \verbatim
+    surfaceAlignedSBRStressCoeffs
+    {
+        diffusivity         uniform;
+        surfaces            ("terrain.stl");
+        maxAng              85;
+        minAng              5;
+        nNonOrthogonalCorr  4;
+        accFactor           1.3;
+        smoothFactor        0.9;
+        minSigmaDiff        1e-4;
+    }
+    \endverbatim
+
+    surfaces: name of the stl surfaces to which apply alignment.
+
+    maxAng: Maximum angle (between surface and most aligned mesh face normal)
+            to which rotation is applied. (default 80 degress)
+
+    minAng: Minimum angle (between surface and most aligned mesh face normal)
+            to which rotation is applied (default 20 degress)
+
+    nNonOrthogonalCorr: Non-orthogonal correction of the SBRStress equation
+
+    accFactor: Proportionality constant applied to the source of the stress
+               equation.(default 1)
+
+    smoothFactor: Displacement smooth factor (1 very smooth , 0 no smoothing)
+                (default 0.9)
+
+    minSigmaDiff: Minimum magnitude difference between old and new magnitudes
+                 of the applied stress.
+
+                 If the difference between old and new is smaller than
+                 minSigmaDiff no further addition to the stress source term
+                 will be made (default: 1e-3)
+
+SourceFiles
+    surfaceAlignedSBRStressFvMotionSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef surfaceAlignedSBRStressFvMotionSolver_H
+#define surfaceAlignedSBRStressFvMotionSolver_H
+
+#include "triSurfaceMesh.H"
+#include "vectorList.H"
+#include "displacementSBRStressFvMotionSolver.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+             Class surfaceAlignedSBRStressFvMotionSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class surfaceAlignedSBRStressFvMotionSolver
+:
+    public displacementSBRStressFvMotionSolver
+{
+    // Private data
+
+        //- Names of the surfaces
+        wordList surfaceNames_;
+
+        //- TriSurfaceMesh
+        PtrList<triSurfaceMesh>  surfaceMesh_;
+
+        //- Rotation vector field
+        volVectorField cellRot_;
+
+        //- Maximum angle (between surface and most aligned mesh face normal)
+        // to which rotation is applied
+        scalar maxAng_;
+
+        //- Minimum angle (between surface and most aligned mesh face normal)
+        // to which rotation is applied
+        scalar minAng_;
+
+        //- Propotional constant applied to the source to accelerate
+        //  convergence
+        scalar accFactor_;
+
+        //- Displacement smooth factor
+        scalar smoothFactor_;
+
+        //- Non-orthogonal correction of the SBRStress equation
+        label nNonOrthogonalCorr_;
+
+        //- Point displacement field
+        pointVectorField& pointDisplacement_;
+
+        //- Stress tensor
+        volSymmTensorField sigmaD_;
+
+        //- Minimum magnitude difference between old and new magntides
+        //  stress applied
+        scalar minSigmaDiff_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        surfaceAlignedSBRStressFvMotionSolver
+        (
+            const surfaceAlignedSBRStressFvMotionSolver&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const surfaceAlignedSBRStressFvMotionSolver&);
+
+        //- Calculate cellRot
+        void calculateCellRot();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("surfaceAlignedSBRStress");
+
+
+    // Constructors
+
+        //- Construct from polyMesh and IOdictionary
+        surfaceAlignedSBRStressFvMotionSolver
+        (
+            const polyMesh&,
+            const IOdictionary&
+        );
+
+
+    //- Destructor
+    ~surfaceAlignedSBRStressFvMotionSolver();
+
+
+    // Member Functions
+
+        //- Solve for motion
+        virtual void solve();
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index ce63274ed9..98c17b7415 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,10 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "velocityLaplacianFvMotionSolver.H"
+#include "motionInterpolation.H"
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
-#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -73,6 +73,12 @@ Foam::velocityLaplacianFvMotionSolver::velocityLaplacianFvMotionSolver
         ),
         cellMotionBoundaryTypes<vector>(pointMotionU_.boundaryField())
     ),
+    interpolationPtr_
+    (
+        coeffDict().found("interpolation")
+      ? motionInterpolation::New(fvMesh_, coeffDict().lookup("interpolation"))
+      : motionInterpolation::New(fvMesh_)
+    ),
     diffusivityPtr_
     (
         motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
@@ -91,7 +97,7 @@ Foam::velocityLaplacianFvMotionSolver::~velocityLaplacianFvMotionSolver()
 Foam::tmp<Foam::pointField>
 Foam::velocityLaplacianFvMotionSolver::curPoints() const
 {
-    volPointInterpolation::New(fvMesh_).interpolate
+    interpolationPtr_->interpolate
     (
         cellMotionU_,
         pointMotionU_
@@ -130,13 +136,6 @@ void Foam::velocityLaplacianFvMotionSolver::solve()
 }
 
 
-//void Foam::velocityLaplacianFvMotionSolver::movePoints(const pointField& p)
-//{
-//    // Movement of pointMesh and volPointInterpolation already
-//    // done by polyMesh,fvMesh
-//}
-
-
 void Foam::velocityLaplacianFvMotionSolver::updateMesh
 (
     const mapPolyMesh& mpm
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index cb187022a2..486266507c 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,7 @@ namespace Foam
 {
 
 // Forward class declarations
+class motionInterpolation;
 class motionDiffusivity;
 
 /*---------------------------------------------------------------------------*\
@@ -61,6 +62,9 @@ class velocityLaplacianFvMotionSolver
         //- Cell-centre motion field
         mutable volVectorField cellMotionU_;
 
+        //- Interpolation used to transfer cell displacement to the points
+        autoPtr<motionInterpolation> interpolationPtr_;
+
         //- Diffusivity used to control the motion
         autoPtr<motionDiffusivity> diffusivityPtr_;
 
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
index 86c94a35b8..4c01a9ebf7 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,11 +59,8 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "motionDiffusivity::New(const fvMesh&, "
-            "const Istream& dict)"
-        )   << "Unknown diffusion type "
+        FatalErrorInFunction
+            << "Unknown diffusion type "
             << motionType << nl << nl
             << "Valid diffusion types are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
diff --git a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
new file mode 100644
index 0000000000..4e73a2cd4b
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "addToRunTimeSelectionTable.H"
+#include "motionInterpolation.H"
+#include "volPointInterpolation.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(motionInterpolation, 0);
+
+    defineRunTimeSelectionTable(motionInterpolation, Istream);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::motionInterpolation::motionInterpolation
+(
+    const fvMesh& mesh
+)
+:
+    mesh_(mesh)
+{}
+
+
+Foam::motionInterpolation::motionInterpolation
+(
+    const fvMesh& mesh,
+    Istream& entry
+)
+:
+    mesh_(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::motionInterpolation>
+Foam::motionInterpolation::New(const fvMesh& mesh)
+{
+    return autoPtr<motionInterpolation>(new motionInterpolation(mesh));
+}
+
+
+Foam::autoPtr<Foam::motionInterpolation>
+Foam::motionInterpolation::New(const fvMesh& mesh, Istream& entry)
+{
+    const word type(entry);
+
+    Info<< "Selecting motion interpolation: " << type << endl;
+
+    IstreamConstructorTable::iterator cstrIter =
+        IstreamConstructorTablePtr_->find(type);
+
+    if (cstrIter == IstreamConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown interpolation type "
+            << type << nl << nl
+            << "Valid interpolation types are :" << endl
+            << IstreamConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<motionInterpolation>(cstrIter()(mesh, entry));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::motionInterpolation::~motionInterpolation()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::motionInterpolation::interpolate
+(
+    const volScalarField& cellDisplacement,
+    pointScalarField& pointDisplacement
+) const
+{
+    volPointInterpolation::New(mesh()).interpolate
+    (
+        cellDisplacement,
+        pointDisplacement
+    );
+}
+
+
+void Foam::motionInterpolation::interpolate
+(
+    const volVectorField& cellDisplacement,
+    pointVectorField& pointDisplacement
+) const
+{
+    volPointInterpolation::New(mesh()).interpolate
+    (
+        cellDisplacement,
+        pointDisplacement
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H
new file mode 100644
index 0000000000..46cb4b0ecf
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::motionInterpolation
+
+Description
+    Base class for interpolation of cell displacement fields, generated by
+    fvMotionSolvers, to the points. This base class implements the default
+    method which applies volPointInterpolation only.
+
+SourceFiles
+    motionInterpolation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef motionInterpolation_H
+#define motionInterpolation_H
+
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class motionInterpolation Declaration
+\*---------------------------------------------------------------------------*/
+
+class motionInterpolation
+{
+    // Private data
+
+        //- Reference to the FV mesh
+        const fvMesh& mesh_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        motionInterpolation(const motionInterpolation&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const motionInterpolation&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("motionInterpolation");
+
+
+    // Declare run-time constructor selection tables
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            motionInterpolation,
+            Istream,
+            (
+                const fvMesh& mesh,
+                Istream& entry
+            ),
+            (mesh, entry)
+        );
+
+
+    // Selectors
+
+        //- Select default
+        static autoPtr<motionInterpolation> New(const fvMesh& mesh);
+
+        //- Select from stream
+        static autoPtr<motionInterpolation> New
+        (
+            const fvMesh& mesh,
+            Istream& entry
+        );
+
+
+    // Constructors
+
+        //- Construct from an fvMesh
+        motionInterpolation(const fvMesh& mesh);
+
+        //- Construct from an fvMesh and an Istream
+        motionInterpolation(const fvMesh& mesh, Istream& entry);
+
+
+    //- Destructor
+    virtual ~motionInterpolation();
+
+
+    // Member Functions
+
+        //- Return const-refernce to the mesh
+        const fvMesh& mesh() const
+        {
+            return mesh_;
+        }
+
+        //- Interpolate the given scalar cell displacement
+        virtual void interpolate
+        (
+            const volScalarField&,
+            pointScalarField&
+        ) const;
+
+        //- Interpolate the given vector cell displacement
+        virtual void interpolate
+        (
+            const volVectorField&,
+            pointVectorField&
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.C b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.C
new file mode 100644
index 0000000000..a389e7e08c
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.C
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "addToRunTimeSelectionTable.H"
+#include "patchCorrectedInterpolation.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(patchCorrectedInterpolation, 0);
+
+    addToRunTimeSelectionTable
+    (
+        motionInterpolation,
+        patchCorrectedInterpolation,
+        Istream
+    );
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::labelListList Foam::patchCorrectedInterpolation::getPatchGroups
+(
+    Istream& entry
+) const
+{
+    List<List<word> > patchGroupNames(entry);
+
+    labelListList patchGroups(patchGroupNames.size());
+
+    forAll(patchGroupNames, patchI)
+    {
+        patchGroups[patchI].resize(patchGroupNames[patchI].size());
+
+        forAll(patchGroupNames[patchI], patchJ)
+        {
+            patchGroups[patchI][patchJ] =
+                mesh().boundaryMesh().findPatchID
+                (
+                    patchGroupNames[patchI][patchJ]
+                );
+
+            if (patchGroups[patchI][patchJ] == -1)
+            {
+                FatalErrorInFunction
+                    << "patch \"" << patchGroupNames[patchI][patchJ]
+                    << "\" not found" << exit(FatalError);
+            }
+        }
+    }
+
+    return patchGroups;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::patchCorrectedInterpolation::patchCorrectedInterpolation
+(
+    const fvMesh& mesh,
+    Istream& entry
+)
+:
+    motionInterpolation(mesh, entry),
+    patchGroups_(getPatchGroups(entry))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::patchCorrectedInterpolation::~patchCorrectedInterpolation()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::patchCorrectedInterpolation::interpolate
+(
+    const volScalarField& cellDisplacement,
+    pointScalarField& pointDisplacement
+) const
+{
+    interpolateType(cellDisplacement, pointDisplacement);
+}
+
+
+void Foam::patchCorrectedInterpolation::interpolate
+(
+    const volVectorField& cellDisplacement,
+    pointVectorField& pointDisplacement
+) const
+{
+    interpolateType(cellDisplacement, pointDisplacement);
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.H b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.H
new file mode 100644
index 0000000000..0c7721dfbf
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolation.H
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::patchCorrectedInterpolation
+
+Description
+    Interpolation of cell-based displacements to the points with additional
+    correction for interpolation inconsistency on patches.
+
+    The default interpolation method interpolates from the cells to all points
+    except those on boundaries with value boundary conditions. The discrepancy
+    across the boundary cell can cause shearing and inversion if the cells are
+    of very high aspect ratio.
+
+    This method applies the default interpolation to *all* points, including
+    those on value boundaries. The difference between the interpolated value on
+    the boundary and the desired boundary condition is then propagated into the
+    mesh with a wave. Contributions from different patches are inverse-distance
+    weighted, and the result is added to the default interpolation. The result
+    of this is that thin boundary cells are maintained much more accurately for
+    non-uniform patch displacements.
+
+    The user must specify the patch groups from which to propagate the motion.
+    Ideally, these groups will be opposing; i.e. one group with the aerofoil,
+    and one with the far field:
+
+    \verbatim
+        interpolation patchCorrected
+        (
+            (aerofoilUpper aerofoilLower)
+            (farField)
+        );
+    \endverbatim
+
+SourceFiles
+    patchCorrectedInterpolation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef patchCorrectedInterpolation_H
+#define patchCorrectedInterpolation_H
+
+#include "motionInterpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class patchCorrectedInterpolation Declaration
+\*---------------------------------------------------------------------------*/
+
+class patchCorrectedInterpolation
+:
+    public motionInterpolation
+{
+    // Private data
+
+        //- Patch groups from which to propagate the displacement
+        const labelListList patchGroups_;
+
+
+    // Private member functions
+
+        //- Get patch groups from the input stream
+        labelListList getPatchGroups(Istream& entry) const;
+
+        //- Interpolate the given cell displacement
+        template <class Type>
+        void interpolateType
+        (
+            const GeometricField<Type, fvPatchField, volMesh>&,
+            GeometricField<Type, pointPatchField, pointMesh>&
+        ) const;
+
+        //- Interpolate patch data by inverse distance weighting
+        template <class Type>
+        void interpolateDataFromPatchGroups
+        (
+            GeometricField<Type, pointPatchField, pointMesh>&
+        ) const;
+
+        //- Propagate data from a number of patches into the field
+        template <class Type>
+        void propagateDataFromPatchGroup
+        (
+            const label,
+            pointScalarField&,
+            GeometricField<Type, pointPatchField, pointMesh>&
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("patchCorrected");
+
+
+    // Constructors
+
+        //- Construct from an fvMesh and an Istream
+        patchCorrectedInterpolation
+        (
+            const fvMesh& mesh,
+            Istream& entry
+        );
+
+
+    //- Destructor
+    virtual ~patchCorrectedInterpolation();
+
+
+    // Member Functions
+
+        //- Interpolate the given scalar cell displacement
+        virtual void interpolate
+        (
+            const volScalarField&,
+            pointScalarField&
+        ) const;
+
+        //- Interpolate the given vector cell displacement
+        virtual void interpolate
+        (
+            const volVectorField&,
+            pointVectorField&
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "patchCorrectedInterpolationTemplates.C"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
new file mode 100644
index 0000000000..5881ae7bcf
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
@@ -0,0 +1,223 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedValuePointPatchField.H"
+#include "PointData.H"
+#include "PointEdgeWave.H"
+#include "volPointInterpolation.H"
+#include "zeroGradientPointPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template <class Type>
+void Foam::patchCorrectedInterpolation::interpolateType
+(
+    const GeometricField<Type, fvPatchField, volMesh>& cellDisplacement,
+    GeometricField<Type, pointPatchField, pointMesh>& pointDisplacement
+) const
+{
+    // Create an uncorrected field
+    GeometricField<Type, pointPatchField, pointMesh>
+        pointUncorrectedDisplacement
+        (
+            IOobject
+            (
+                "pointUncorrectedDisplacement",
+                mesh().time().timeName(),
+                mesh()
+            ),
+            pointDisplacement.mesh(),
+            pointDisplacement.dimensions(),
+            fixedValuePointPatchField<Type>::typeName
+        );
+
+    // Interpolate to the uncorrected field, overwriting the fixed value
+    // boundary conditions
+    pointUncorrectedDisplacement ==
+        volPointInterpolation::New(mesh()).interpolate
+        (
+            cellDisplacement,
+            wordList
+            (
+                pointUncorrectedDisplacement.boundaryField().size(),
+                zeroGradientPointPatchField<Type>::typeName
+            )
+        );
+
+    // Set the point displacement to the uncorrected result everywhere except
+    // for on the boundary
+    pointDisplacement.internalField() =
+        pointUncorrectedDisplacement.internalField();
+    pointDisplacement.correctBoundaryConditions();
+
+    // Set the residual displacement as the difference between the boundary
+    // specification and the uncorrected solution
+    // (this reuses the uncorrected displacement field as the residual)
+    pointUncorrectedDisplacement ==
+        pointDisplacement - pointUncorrectedDisplacement;
+
+    // Interpolate the residual from the boundary into the field
+    interpolateDataFromPatchGroups(pointUncorrectedDisplacement);
+
+    // Add the residual to the point displacement and correct the boundary
+    pointDisplacement += pointUncorrectedDisplacement;
+    pointDisplacement.correctBoundaryConditions();
+}
+
+
+template <class Type>
+void Foam::patchCorrectedInterpolation::interpolateDataFromPatchGroups
+(
+    GeometricField<Type, pointPatchField, pointMesh>& data
+) const
+{
+    // Initialise
+    pointScalarField weight
+    (
+        IOobject
+        (
+            "weight",
+            mesh().time().timeName(),
+            mesh()
+        ),
+        data.mesh(),
+        dimensionedScalar("zero", dimless, 0),
+        zeroGradientPointPatchField<scalar>::typeName
+    );
+    data = dimensioned<Type>("zero", data.dimensions(), pTraits<Type>::zero);
+
+    forAll(patchGroups_, patchGroupI)
+    {
+        // Distance and data for the current group
+        pointScalarField patchDistance
+        (
+            IOobject
+            (
+                "patchDistance",
+                mesh().time().timeName(),
+                mesh()
+            ),
+            data.mesh(),
+            dimensionedScalar("zero", data.dimensions(), 0),
+            zeroGradientPointPatchField<scalar>::typeName
+        );
+        GeometricField<Type, pointPatchField, pointMesh> patchData(data);
+
+        // Wave the data through the mesh
+        propagateDataFromPatchGroup
+        (
+            patchGroupI,
+            patchDistance,
+            patchData
+        );
+
+        // Calculate the weight and add to weighted sum
+        const scalarField patchWeight
+        (
+            1/max(sqr(patchDistance.internalField()), SMALL)
+        );
+        data.internalField() += patchWeight*patchData.internalField();
+        weight.internalField() += patchWeight;
+    }
+
+    // Complete the average
+    data /= weight;
+}
+
+
+template <class Type>
+void Foam::patchCorrectedInterpolation::propagateDataFromPatchGroup
+(
+    const label patchGroupI,
+    pointScalarField& distance,
+    GeometricField<Type, pointPatchField, pointMesh>& data
+) const
+{
+    const labelList& patchGroup(patchGroups_[patchGroupI]);
+
+    // Get the size of the seed info
+    label nSeedInfo(0);
+    forAll(patchGroup, patchGroupI)
+    {
+        const label patchI(patchGroup[patchGroupI]);
+
+        nSeedInfo += data.boundaryField()[patchI].size();
+    }
+
+    // Generate the seed labels and info
+    labelList seedLabels(nSeedInfo);
+    List<PointData<Type> > seedInfo(nSeedInfo);
+    nSeedInfo = 0;
+    forAll(patchGroup, patchGroupI)
+    {
+        const label patchI(patchGroup[patchGroupI]);
+
+        pointPatchField<Type>& patchDataField(data.boundaryField()[patchI]);
+
+        patchDataField.updateCoeffs();
+
+        const pointPatch& patch(patchDataField.patch());
+        const Field<Type> patchData(patchDataField.patchInternalField());
+
+        forAll(patch.meshPoints(), patchPointI)
+        {
+            const label pointI(patch.meshPoints()[patchPointI]);
+
+            seedLabels[nSeedInfo] = pointI;
+
+            seedInfo[nSeedInfo] =
+                PointData<Type>
+                (
+                    mesh().points()[pointI],
+                    0,
+                    patchData[patchPointI]
+                );
+
+            nSeedInfo ++;
+        }
+    }
+
+    // Wave the data through the mesh
+    List<PointData<Type> > allPointInfo(mesh().nPoints());
+    List<PointData<Type> > allEdgeInfo(mesh().nEdges());
+    PointEdgeWave<PointData<Type> >
+    (
+        mesh(),
+        seedLabels,
+        seedInfo,
+        allPointInfo,
+        allEdgeInfo,
+        mesh().globalData().nTotalPoints()
+    );
+
+    // Copy result into the fields
+    forAll(allPointInfo, pointI)
+    {
+        distance[pointI] = sqrt(allPointInfo[pointI].distSqr());
+        data[pointI] = allPointInfo[pointI].data();
+    }
+}
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C b/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C
new file mode 100644
index 0000000000..22c9d28c32
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.C
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "addToRunTimeSelectionTable.H"
+#include "patchTransformedInterpolation.H"
+#include "pointFields.H"
+#include "symmTensor2D.H"
+#include "tensor2D.H"
+#include "syncTools.H"
+#include "volPointInterpolation.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(patchTransformedInterpolation, 0);
+
+    addToRunTimeSelectionTable
+    (
+        motionInterpolation,
+        patchTransformedInterpolation,
+        Istream
+    );
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::labelList Foam::patchTransformedInterpolation::getPatches
+(
+    Istream& entry
+) const
+{
+    wordList patchNames(entry);
+
+    labelList patches(patchNames.size(), -1);
+
+    forAll(patchNames, patchI)
+    {
+        patches[patchI] =
+            mesh().boundaryMesh().findPatchID
+            (
+                patchNames[patchI]
+            );
+
+        if (patches[patchI] == -1)
+        {
+            FatalErrorInFunction
+                << "patch \"" << patchNames[patchI]
+                << "\" not found" << exit(FatalError);
+        }
+    }
+
+    return patches;
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::patchTransformedInterpolation::patchTransformedInterpolation
+(
+    const fvMesh& mesh,
+    Istream& entry
+)
+:
+    motionInterpolation(mesh, entry),
+    patches_(getPatches(entry))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::patchTransformedInterpolation::~patchTransformedInterpolation()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::patchTransformedInterpolation::interpolate
+(
+    const volScalarField&,
+    pointScalarField&
+) const
+{
+    NotImplemented;
+}
+
+
+void Foam::patchTransformedInterpolation::interpolate
+(
+    const volVectorField& cellDisplacement,
+    pointVectorField& pointDisplacement
+) const
+{
+    const pointField& points(mesh().points());
+    const label nPoints(points.size());
+
+    volPointInterpolation::New(mesh()).interpolate
+    (
+        cellDisplacement,
+        pointDisplacement
+    );
+
+    pointDisplacement.correctBoundaryConditions();
+
+    vectorField pointRotation(nPoints, vector::zero);
+    scalarField pointExpansion(nPoints, scalar(0));
+
+    labelList pointDisplacementNSum(nPoints, 0);
+    vectorField pointDisplacementSum(nPoints, vector::zero);
+
+    forAll(patches_, patchI)
+    {
+        const polyPatch& patch(mesh().boundaryMesh()[patches_[patchI]]);
+
+        forAll(patch, pFaceI)
+        {
+            const face& f(patch[pFaceI]);
+
+            const label cellI(patch.faceCells()[pFaceI]);
+            const cell& c(mesh().cells()[cellI]);
+            const labelList cPoints(c.labels(mesh().faces()));
+
+            // Consider movement around the face centre
+            const point& xOrigin(patch.faceCentres()[pFaceI]);
+
+            // Mean translation
+            const vector uMean(f.average(points, pointDisplacement));
+
+            // Calculate rotation and expansion for each point
+            forAll(f, fPointI)
+            {
+                const label pointI(f[fPointI]);
+                const vector& x(points[pointI]);
+                const vector r(x - xOrigin);
+                const vector u(pointDisplacement[pointI] - uMean);
+
+                pointRotation[pointI] = 2*(r ^ u)/magSqr(r);
+                pointExpansion[pointI] = (r & u)/magSqr(r);
+            }
+
+            // Mean rotation and expansion
+            const vector omegaMean(f.average(points, pointRotation));
+            const scalar divMean(f.average(points, pointExpansion));
+
+            // Apply mean solid body motion to all cell points
+            forAll(cPoints, cPointI)
+            {
+                const label pointI(cPoints[cPointI]);
+                const vector& x(points[pointI]);
+                const vector r(x - xOrigin);
+
+                pointDisplacementNSum[pointI] += 1;
+                pointDisplacementSum[pointI] +=
+                    uMean + (omegaMean ^ r) + (divMean*r);
+            }
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh(),
+        pointDisplacementNSum,
+        plusEqOp<label>(),
+        label(0)
+    );
+
+    syncTools::syncPointList
+    (
+        mesh(),
+        pointDisplacementSum,
+        plusEqOp<vector>(),
+        vector::zero
+    );
+
+    forAll(points, pointI)
+    {
+        if (pointDisplacementNSum[pointI])
+        {
+            pointDisplacement[pointI] =
+                pointDisplacementSum[pointI]/pointDisplacementNSum[pointI];
+        }
+    }
+
+    // Correct the faces
+    pointDisplacement.correctBoundaryConditions();
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.H b/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.H
new file mode 100644
index 0000000000..c42948963c
--- /dev/null
+++ b/src/fvMotionSolver/motionInterpolation/patchTransformed/patchTransformedInterpolation.H
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::patchTransformedInterpolation
+
+Description
+    Interpolation of cell-based displacements to the points with additional
+    correction of patch-adjacent cells.
+
+    Snappy meshes often have moderately non-orthogonal faces next to patches.
+    If these partches are moved, these already quite distorted faces quickly
+    violate the quality criteria.
+
+    This method corrects patch-adjacent cells are by calculating the average
+    translation, rotation and expansion of points connected to the patch. This
+    transformation is then applied to all the points in the cell that are not
+    on the patch. This does a better job of preserving the cell shape on the
+    patch than pure interpolation, though it can simply move the problem into
+    the next layer of cells.
+
+    The user needs only to specify the patches on which this correction is
+    performed:
+
+    \verbatim
+        interpolation patchTransformed (movingPatch1 movingPatch2);
+    \endverbatim
+
+    Note that this method is not defined for scalar displacement fields.
+
+SourceFiles
+    patchTransformedInterpolation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef patchTransformedInterpolation_H
+#define patchTransformedInterpolation_H
+
+#include "motionInterpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class patchTransformedInterpolation Declaration
+\*---------------------------------------------------------------------------*/
+
+class patchTransformedInterpolation
+:
+    public motionInterpolation
+{
+    // Private data
+
+        //- Patches on which to enforce transformation on adjacent cells
+        const labelList patches_;
+
+
+    // Private member functions
+
+        //- Get patches from the input stream
+        labelList getPatches(Istream& entry) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("patchTransformed");
+
+
+    // Constructors
+
+        //- Construct from an fvMesh and an Istream
+        patchTransformedInterpolation
+        (
+            const fvMesh& mesh,
+            Istream& entry
+        );
+
+
+    //- Destructor
+    virtual ~patchTransformedInterpolation();
+
+
+    // Member Functions
+
+        //- Interpolate the given scalar cell displacement
+        virtual void interpolate
+        (
+            const volScalarField&,
+            pointScalarField&
+        ) const;
+
+        //- Interpolate the given vector cell displacement
+        virtual void interpolate
+        (
+            const volVectorField&,
+            pointVectorField&
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 30f48d6093..00a99a9056 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -333,16 +333,8 @@ surfaceDisplacementPointPatchVectorField
 {
     if (velocity_.x() < 0 || velocity_.y() < 0 || velocity_.z() < 0)
     {
-        FatalErrorIn
-        (
-            "surfaceDisplacementPointPatchVectorField::\n"
-            "surfaceDisplacementPointPatchVectorField\n"
-            "(\n"
-            "    const pointPatch& p,\n"
-            "    const DimensionedField<vector, pointMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "All components of velocity have to be positive : "
+        FatalErrorInFunction
+            << "All components of velocity have to be positive : "
             << velocity_ << nl
             << "Set velocity components to a great value if no clipping"
             << " necessary." << exit(FatalError);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index 54725088c6..a27dd4ab8c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -351,10 +351,8 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
 
     if (!foundTime)
     {
-        FatalErrorIn
-        (
-            "timeVaryingMappedFixedValuePointPatchField<Type>::checkTable"
-        )   << "Cannot find starting sampling values for current time "
+        FatalErrorInFunction
+            << "Cannot find starting sampling values for current time "
             << this->db().time().value() << nl
             << "Have sampling values for times "
             << pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl
@@ -416,11 +414,8 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
 
             if (vals.size() != mapperPtr_().sourceSize())
             {
-                FatalErrorIn
-                (
-                    "timeVaryingMappedFixedValuePointPatchField<Type>::"
-                    "checkTable()"
-                )   << "Number of values (" << vals.size()
+                FatalErrorInFunction
+                    << "Number of values (" << vals.size()
                     << ") differs from the number of points ("
                     <<  mapperPtr_().sourceSize()
                     << ") in file " << vals.objectPath() << exit(FatalError);
@@ -473,11 +468,8 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
 
             if (vals.size() != mapperPtr_().sourceSize())
             {
-                FatalErrorIn
-                (
-                    "timeVaryingMappedFixedValuePointPatchField<Type>::"
-                    "checkTable()"
-                )   << "Number of values (" << vals.size()
+                FatalErrorInFunction
+                    << "Number of values (" << vals.size()
                     << ") differs from the number of points ("
                     <<  mapperPtr_().sourceSize()
                     << ") in file " << vals.objectPath() << exit(FatalError);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index dd660e92b8..ad48d728f9 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,16 +96,8 @@ uniformInterpolatedDisplacementPointPatchVectorField
 
     if (timeNames_.size() < 1)
     {
-        FatalErrorIn
-        (
-            "uniformInterpolatedDisplacementPointPatchVectorField::\n"
-            "uniformInterpolatedDisplacementPointPatchVectorField\n"
-            "(\n"
-            "    const pointPatch&,\n"
-            "    const DimensionedField<vector, pointMesh>&,\n"
-            "    const dictionary&\n"
-            ")\n"
-        )   << "Did not find any times with " << fieldName_
+        FatalErrorInFunction
+            << "Did not find any times with " << fieldName_
             << exit(FatalError);
     }
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index 8695651745..43a5cd9269 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,14 +29,9 @@ License
 #include "Time.H"
 #include "polyMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-waveDisplacementPointPatchVectorField::
+Foam::waveDisplacementPointPatchVectorField::
 waveDisplacementPointPatchVectorField
 (
     const pointPatch& p,
@@ -50,7 +45,7 @@ waveDisplacementPointPatchVectorField
 {}
 
 
-waveDisplacementPointPatchVectorField::
+Foam::waveDisplacementPointPatchVectorField::
 waveDisplacementPointPatchVectorField
 (
     const pointPatch& p,
@@ -61,7 +56,7 @@ waveDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
     omega_(readScalar(dict.lookup("omega"))),
-    waveNumber_(dict.lookupOrDefault<vector>("waveLength", vector::zero))
+    waveNumber_(dict.lookupOrDefault<vector>("waveNumber", vector::zero))
 {
     if (!dict.found("value"))
     {
@@ -70,7 +65,7 @@ waveDisplacementPointPatchVectorField
 }
 
 
-waveDisplacementPointPatchVectorField::
+Foam::waveDisplacementPointPatchVectorField::
 waveDisplacementPointPatchVectorField
 (
     const waveDisplacementPointPatchVectorField& ptf,
@@ -86,7 +81,7 @@ waveDisplacementPointPatchVectorField
 {}
 
 
-waveDisplacementPointPatchVectorField::
+Foam::waveDisplacementPointPatchVectorField::
 waveDisplacementPointPatchVectorField
 (
     const waveDisplacementPointPatchVectorField& ptf,
@@ -102,7 +97,7 @@ waveDisplacementPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void waveDisplacementPointPatchVectorField::updateCoeffs()
+void Foam::waveDisplacementPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
     {
@@ -123,7 +118,7 @@ void waveDisplacementPointPatchVectorField::updateCoeffs()
 }
 
 
-void waveDisplacementPointPatchVectorField::write(Ostream& os) const
+void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
 {
     pointPatchField<vector>::write(os);
     os.writeKeyword("amplitude")
@@ -138,14 +133,13 @@ void waveDisplacementPointPatchVectorField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePointPatchTypeField
-(
-    pointPatchVectorField,
-    waveDisplacementPointPatchVectorField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePointPatchTypeField
+    (
+        pointPatchVectorField,
+        waveDisplacementPointPatchVectorField
+    );
+}
 
 // ************************************************************************* //
diff --git a/src/fvOptions/Make/files b/src/fvOptions/Make/files
index ff2f45032b..0bc89d8246 100644
--- a/src/fvOptions/Make/files
+++ b/src/fvOptions/Make/files
@@ -1,8 +1,3 @@
-fvOption/fvOption.C
-fvOption/fvOptionIO.C
-fvOption/fvOptionList.C
-fvOption/fvIOoptionList.C
-
 cellSetOption/cellSetOption.C
 cellSetOption/cellSetOptionIO.C
 
@@ -38,13 +33,19 @@ $(derivedSources)/solidificationMeltingSource/solidificationMeltingSource.C
 $(derivedSources)/solidificationMeltingSource/solidificationMeltingSourceIO.C
 $(derivedSources)/tabulatedAccelerationSource/tabulatedAccelerationSource.C
 $(derivedSources)/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
-
+$(derivedSources)/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
+$(derivedSources)/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
+$(derivedSources)/buoyancyForce/buoyancyForce.C
+$(derivedSources)/buoyancyForce/buoyancyForceIO.C
+$(derivedSources)/buoyancyEnergy/buoyancyEnergy.C
+$(derivedSources)/buoyancyEnergy/buoyancyEnergyIO.C
 
 interRegion = sources/interRegion
 $(interRegion)/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
 $(interRegion)/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C
 $(interRegion)/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C
 $(interRegion)/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+$(interRegion)/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
 $(interRegion)/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
 $(interRegion)/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
 
@@ -56,11 +57,7 @@ $(generalConstraints)/explicitSetValue/explicitSetValue.C
 
 derivedConstraints=constraints/derived
 $(derivedConstraints)/fixedTemperatureConstraint/fixedTemperatureConstraint.C
-
-
-/* Corrections */
-
-corrections/limitTemperature/limitTemperature.C
+$(derivedConstraints)/velocityDampingConstraint/velocityDampingConstraint.C
 
 
 LIB = $(FOAM_LIBBIN)/libfvOptions
diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options
index 124084c057..50b311988d 100644
--- a/src/fvOptions/Make/options
+++ b/src/fvOptions/Make/options
@@ -3,15 +3,19 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
+    -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
     -lturbulenceModels \
+    -lincompressibleTurbulenceModels \
     -lcompressibleTurbulenceModels
diff --git a/src/fvOptions/cellSetOption/cellSetOption.C b/src/fvOptions/cellSetOption/cellSetOption.C
index 0711348e8b..8864683ceb 100644
--- a/src/fvOptions/cellSetOption/cellSetOption.C
+++ b/src/fvOptions/cellSetOption/cellSetOption.C
@@ -79,7 +79,7 @@ void Foam::fv::cellSetOption::setSelection(const dictionary& dict)
         }
         default:
         {
-            FatalErrorIn("::setSelection(const dictionary&)")
+            FatalErrorInFunction
                 << "Unknown selectionMode "
                 << selectionModeTypeNames_[selectionMode_]
                 << ". Valid selectionMode types are" << selectionModeTypeNames_
@@ -110,7 +110,7 @@ void Foam::fv::cellSetOption::setCellSet()
                 label globalCellI = returnReduce(cellI, maxOp<label>());
                 if (globalCellI < 0)
                 {
-                    WarningIn("cellSetOption::setCellSet()")
+                    WarningInFunction
                         << "Unable to find owner cell for point " << points_[i]
                         << endl;
                 }
@@ -139,7 +139,7 @@ void Foam::fv::cellSetOption::setCellSet()
             label zoneID = mesh_.cellZones().findZoneID(cellSetName_);
             if (zoneID == -1)
             {
-                FatalErrorIn("cellSetOption::setCellIds()")
+                FatalErrorInFunction
                     << "Cannot find cellZone " << cellSetName_ << endl
                     << "Valid cellZones are " << mesh_.cellZones().names()
                     << exit(FatalError);
@@ -157,7 +157,7 @@ void Foam::fv::cellSetOption::setCellSet()
         }
         default:
         {
-            FatalErrorIn("cellSetOption::setCellSet()")
+            FatalErrorInFunction
                 << "Unknown selectionMode "
                 << selectionModeTypeNames_[selectionMode_]
                 << ". Valid selectionMode types are" << selectionModeTypeNames_
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
new file mode 100644
index 0000000000..57b78fe95a
--- /dev/null
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "velocityDampingConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvMatrix.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(velocityDampingConstraint, 0);
+    addToRunTimeSelectionTable
+    (
+        option,
+        velocityDampingConstraint,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::fv::velocityDampingConstraint::addDamping(fvMatrix<vector>& eqn)
+{
+    // Note: we want to add
+    //      deltaU/deltaT
+    // where deltaT is a local time scale:
+    //  U/(cbrt of volume)
+    // Since directly manipulating the diagonal we multiply by volume.
+
+    const scalarField& vol = mesh_.V();
+    const volVectorField& U = eqn.psi();
+    scalarField& diag = eqn.diag();
+
+    label nDamped = 0;
+
+    forAll(U, cellI)
+    {
+        scalar magU = mag(U[cellI]);
+        if (magU > UMax_)
+        {
+            scalar scale = sqr(Foam::cbrt(vol[cellI]));
+
+            diag[cellI] += scale*(magU-UMax_);
+
+            nDamped++;
+        }
+    }
+
+    reduce(nDamped, sumOp<label>());
+
+    Info<< type() << " " << name_ << " damped "
+        << nDamped << " ("
+        << 100*scalar(nDamped)/mesh_.globalData().nTotalCells()
+        << "%) of cells" << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::velocityDampingConstraint::velocityDampingConstraint
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    option(name, modelType, dict, mesh)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::fv::velocityDampingConstraint::alwaysApply() const
+{
+    return true;
+}
+
+
+void Foam::fv::velocityDampingConstraint::setValue
+(
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    addDamping(eqn);
+}
+
+
+void Foam::fv::velocityDampingConstraint::writeData(Ostream& os) const
+{
+    os  << indent << name_ << endl;
+    dict_.write(os);
+}
+
+
+bool Foam::fv::velocityDampingConstraint::read(const dictionary& dict)
+{
+    if (option::read(dict))
+    {
+        UMax_ = readScalar(coeffs_.lookup("UMax"));
+
+        if (coeffs_.found("UNames"))
+        {
+            coeffs_.lookup("UNames") >> fieldNames_;
+        }
+        else if (coeffs_.found("UName"))
+        {
+            word UName(coeffs_.lookup("UName"));
+            fieldNames_ = wordList(1, UName);
+        }
+        else
+        {
+            fieldNames_ = wordList(1, "U");
+        }
+
+        applied_.setSize(fieldNames_.size(), false);
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
new file mode 100644
index 0000000000..c5a11aa45d
--- /dev/null
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::velocityDampingConstraint
+
+Description
+    Constraint for velocity to dampen velocity fluctuations in
+    steady simulations
+
+    In case of velocity exceeding limit applies
+    a source sink to remove the excess velocity by adding a term
+    that drives the velocity to 0 (note that we cannot use the old
+    term velocity since it most likely is already excessive). This
+    additional constraint is scaled with (U-UMax)/dt
+    where dt is a local time scale (= velocity/cellsize) so it switches off
+    if the velocity is below UMax.
+
+    Constraint described by:
+
+        velocityDampingConstraintCoeffs
+        {
+            UMax        100;
+
+            // Optional: name of velocity field (default: U)
+            //UName       U;
+        }
+
+
+SourceFiles
+    velocityDampingConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef velocityDampingConstraint_H
+#define velocityDampingConstraint_H
+
+#include "fvOption.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+                 Class velocityDampingConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class velocityDampingConstraint
+:
+    public option
+{
+
+protected:
+
+    // Protected data
+
+        //- Maximum velocity
+        scalar UMax_;
+
+
+    // Protected Member Functions
+
+        void addDamping(fvMatrix<vector>& eqn);
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        velocityDampingConstraint(const velocityDampingConstraint&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const velocityDampingConstraint&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("velocityDampingConstraint");
+
+
+    // Constructors
+
+        //- Construct from components
+        velocityDampingConstraint
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    //- Destructor
+    virtual ~velocityDampingConstraint()
+    {}
+
+
+    // Member Functions
+
+        virtual bool alwaysApply() const;
+
+
+        // Set values directly
+
+            //- Constrain vector matrix
+            virtual void setValue
+            (
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+
+        // I-O
+
+            //- Write data
+            virtual void writeData(Ostream&) const;
+
+            //- Read dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvOptions/include/createFvOptions.H b/src/fvOptions/include/createFvOptions.H
deleted file mode 100644
index a4882baac1..0000000000
--- a/src/fvOptions/include/createFvOptions.H
+++ /dev/null
@@ -1 +0,0 @@
-fv::IOoptionList fvOptions(mesh);
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index 332d02dfeb..cb848dc4d8 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -29,10 +29,10 @@ License
 
 namespace Foam
 {
-namespace fv
-{
-    defineTypeNameAndDebug(interRegionOption, 0);
-}
+    namespace fv
+    {
+        defineTypeNameAndDebug(interRegionOption, 0);
+    }
 }
 
 
@@ -49,7 +49,7 @@ void Foam::fv::interRegionOption::setMapper()
 
         if (mesh_.name() == nbrMesh.name())
         {
-            FatalErrorIn("interRegionOption::setCellIds()")
+            FatalErrorInFunction
                 << "Inter-region model selected, but local and "
                 << "neighbour regions are the same: " << nl
                 << "    local region: " << mesh_.name() << nl
@@ -75,7 +75,7 @@ void Foam::fv::interRegionOption::setMapper()
         }
         else
         {
-            FatalErrorIn("interRegionOption::setCellSet()")
+            FatalErrorInFunction
                 << "regions " << mesh_.name() << " and "
                 << nbrMesh.name() <<  " do not intersect"
                 << exit(FatalError);
diff --git a/src/fvOptions/interRegionOption/interRegionOptionI.H b/src/fvOptions/interRegionOption/interRegionOptionI.H
index 12c73c4b89..738b699346 100644
--- a/src/fvOptions/interRegionOption/interRegionOptionI.H
+++ b/src/fvOptions/interRegionOption/interRegionOptionI.H
@@ -37,10 +37,8 @@ Foam::fv::interRegionOption::meshInterp() const
 {
     if (!meshInterpPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "const meshToMesh& interRegionOption::meshInterp() const"
-        )   << "Interpolation object not set"
+        FatalErrorInFunction
+            << "Interpolation object not set"
             << abort(FatalError);
     }
 
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
index 304f7c6198..9b9049e6bc 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
@@ -52,25 +52,25 @@ void Foam::fv::actuationDiskSource::checkData() const
 {
     if (magSqr(diskArea_) <= VSMALL)
     {
-        FatalErrorIn("Foam::fv::actuationDiskSource::checkData()")
+        FatalErrorInFunction
            << "diskArea is approximately zero"
            << exit(FatalIOError);
     }
     if (Cp_ <= VSMALL || Ct_ <= VSMALL)
     {
-        FatalErrorIn("Foam::fv::actuationDiskSource::checkData()")
+        FatalErrorInFunction
            << "Cp and Ct must be greater than zero"
            << exit(FatalIOError);
     }
     if (mag(diskDir_) < VSMALL)
     {
-        FatalErrorIn("Foam::fv::actuationDiskSource::checkData()")
+        FatalErrorInFunction
            << "disk direction vector is approximately zero"
            << exit(FatalIOError);
     }
     if (returnReduce(upstreamCellId_, maxOp<label>()) == -1)
     {
-        FatalErrorIn("Foam::fv::actuationDiskSource::checkData()")
+        FatalErrorInFunction
            << "upstream location " << upstreamPoint_  << " not found in mesh"
            << exit(FatalIOError);
     }
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
new file mode 100644
index 0000000000..70238da9b7
--- /dev/null
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "buoyancyEnergy.H"
+#include "fvMatrices.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(buoyancyEnergy, 0);
+
+    addToRunTimeSelectionTable
+    (
+        option,
+        buoyancyEnergy,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::buoyancyEnergy::buoyancyEnergy
+(
+    const word& sourceName,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    option(sourceName, modelType, dict, mesh),
+    UName_(coeffs_.lookupOrDefault<word>("UName", "U"))
+{
+    coeffs_.lookup("fieldNames") >> fieldNames_;
+
+    if (fieldNames_.size() != 1)
+    {
+        FatalErrorInFunction
+            << "settings are:" << fieldNames_ << exit(FatalError);
+    }
+
+    applied_.setSize(fieldNames_.size(), false);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::buoyancyEnergy::addSup
+(
+    const volScalarField& rho,
+    fvMatrix<scalar>& eqn,
+    const label fieldI
+)
+{
+    const uniformDimensionedVectorField& g =
+        mesh_.lookupObject<uniformDimensionedVectorField>("g");
+
+    const volVectorField& U = mesh_.lookupObject<volVectorField>(UName_);
+
+    eqn += rho*(U&g);
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
new file mode 100644
index 0000000000..7c59a950ac
--- /dev/null
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::buoyancyEnergy
+
+Description
+    Calculates and applies the buoyancy energy source rho*(U&g) to the energy
+    equation.
+
+    \heading Source usage
+    Example usage:
+    \verbatim
+    buoyancyEnergyCoeffs
+    {
+        fieldNames      (h);                    // Name of energy field
+    }
+    \endverbatim
+
+SourceFiles
+    buoyancyEnergy.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef buoyancyEnergy_H
+#define buoyancyEnergy_H
+
+#include "fvOption.H"
+#include "uniformDimensionedFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+               Class buoyancyEnergy Declaration
+\*---------------------------------------------------------------------------*/
+
+class buoyancyEnergy
+:
+    public option
+{
+    // Private data
+
+        //- Name of velocity field; default = U
+        word UName_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        buoyancyEnergy(const buoyancyEnergy&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const buoyancyEnergy&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("buoyancyEnergy");
+
+
+    // Constructors
+
+        //- Construct from explicit source name and mesh
+        buoyancyEnergy
+        (
+            const word& sourceName,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    // Member Functions
+
+        // Evaluate
+
+            //- Add explicit contribution to compressible momentum equation
+            virtual void addSup
+            (
+                const volScalarField& rho,
+                fvMatrix<scalar>& eqn,
+                const label fieldI
+            );
+
+
+        // IO
+
+            //- Read source dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergyIO.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergyIO.C
new file mode 100644
index 0000000000..c5c25d64e2
--- /dev/null
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergyIO.C
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "buoyancyEnergy.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::fv::buoyancyEnergy::read(const dictionary& dict)
+{
+    NotImplemented;
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
new file mode 100644
index 0000000000..63a0195e40
--- /dev/null
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "buoyancyForce.H"
+#include "fvMatrices.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(buoyancyForce, 0);
+
+    addToRunTimeSelectionTable
+    (
+        option,
+        buoyancyForce,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::buoyancyForce::buoyancyForce
+(
+    const word& sourceName,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    option(sourceName, modelType, dict, mesh),
+    g_
+    (
+        IOobject
+        (
+            "g",
+            mesh.time().constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    )
+{
+    coeffs_.lookup("fieldNames") >> fieldNames_;
+
+    if (fieldNames_.size() != 1)
+    {
+        FatalErrorInFunction
+            << "settings are:" << fieldNames_ << exit(FatalError);
+    }
+
+    applied_.setSize(fieldNames_.size(), false);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::buoyancyForce::addSup
+(
+    const volScalarField& rho,
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    eqn += rho*g_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
new file mode 100644
index 0000000000..a1ac3cc2ad
--- /dev/null
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::buoyancyForce
+
+Description
+    Calculates and applies the buoyancy force rho*g to the momentum equation
+    corresponding to the specified velocity field.
+
+    \heading Source usage
+    Example usage:
+    \verbatim
+    buoyancyForceCoeffs
+    {
+        fieldNames      (U);                    // Name of velocity field
+    }
+    \endverbatim
+
+SourceFiles
+    buoyancyForce.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef buoyancyForce_H
+#define buoyancyForce_H
+
+#include "fvOption.H"
+#include "uniformDimensionedFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+               Class buoyancyForce Declaration
+\*---------------------------------------------------------------------------*/
+
+class buoyancyForce
+:
+    public option
+{
+    // Private data
+
+        uniformDimensionedVectorField g_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        buoyancyForce(const buoyancyForce&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const buoyancyForce&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("buoyancyForce");
+
+
+    // Constructors
+
+        //- Construct from explicit source name and mesh
+        buoyancyForce
+        (
+            const word& sourceName,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    // Member Functions
+
+        // Evaluate
+
+            //- Add explicit contribution to compressible momentum equation
+            virtual void addSup
+            (
+                const volScalarField& rho,
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+
+        // IO
+
+            //- Read source dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForceIO.C b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForceIO.C
new file mode 100644
index 0000000000..223d42cfa1
--- /dev/null
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForceIO.C
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "buoyancyForce.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::fv::buoyancyForce::read(const dictionary& dict)
+{
+    NotImplemented;
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
new file mode 100644
index 0000000000..fec009d7f8
--- /dev/null
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.C
@@ -0,0 +1,543 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "directionalPressureGradientExplicitSource.H"
+#include "fvMatrices.H"
+#include "DimensionedField.H"
+#include "IFstream.H"
+#include "addToRunTimeSelectionTable.H"
+#include "transform.H"
+#include "surfaceInterpolate.H"
+#include "turbulenceModel.H"
+#include "turbulentTransportModel.H"
+#include "turbulentFluidThermoModel.H"
+#include "vectorFieldIOField.H"
+#include "FieldField.H"
+#include "emptyFvPatchFields.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    defineTypeNameAndDebug(directionalPressureGradientExplicitSource, 0);
+
+    addToRunTimeSelectionTable
+    (
+        option,
+        directionalPressureGradientExplicitSource,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::fv::
+        directionalPressureGradientExplicitSource::
+        pressureDropModel,
+        3
+    >::names[] =
+    {
+        "volumetricFlowRateTable",
+        "constant",
+        "DarcyForchheimer"
+    };
+}
+
+const Foam::NamedEnum
+<
+    Foam::fv::directionalPressureGradientExplicitSource::pressureDropModel,
+    3
+> Foam::fv::directionalPressureGradientExplicitSource::PressureDropModelNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::fv::directionalPressureGradientExplicitSource::initialise()
+{
+    const faceZone& fZone = mesh_.faceZones()[zoneID_];
+
+    faceId_.setSize(fZone.size());
+    facePatchId_.setSize(fZone.size());
+
+    label count = 0;
+    forAll(fZone, i)
+    {
+        label faceI = fZone[i];
+
+        label faceId = -1;
+        label facePatchId = -1;
+        if (mesh_.isInternalFace(faceI))
+        {
+            faceId = faceI;
+            facePatchId = -1;
+        }
+        else
+        {
+            facePatchId = mesh_.boundaryMesh().whichPatch(faceI);
+            const polyPatch& pp = mesh_.boundaryMesh()[facePatchId];
+            if (isA<coupledPolyPatch>(pp))
+            {
+                if (refCast<const coupledPolyPatch>(pp).owner())
+                {
+                    faceId = pp.whichFace(faceI);
+                }
+                else
+                {
+                    faceId = -1;
+                }
+            }
+            else if (!isA<emptyPolyPatch>(pp))
+            {
+                faceId = faceI - pp.start();
+            }
+            else
+            {
+                faceId = -1;
+                facePatchId = -1;
+            }
+        }
+
+        if (faceId >= 0)
+        {
+            facePatchId_[count] = facePatchId;
+            faceId_[count] = faceId;
+            count++;
+        }
+    }
+    faceId_.setSize(count);
+    facePatchId_.setSize(count);
+}
+
+
+void Foam::fv::directionalPressureGradientExplicitSource::writeProps
+(
+    const vectorField& gradP
+) const
+{
+    // Only write on output time
+    if (mesh_.time().outputTime())
+    {
+        IOdictionary propsDict
+        (
+            IOobject
+            (
+                name_ + "Properties",
+                mesh_.time().timeName(),
+                "uniform",
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            )
+        );
+        propsDict.add("gradient", gradP);
+        propsDict.regIOobject::write();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::directionalPressureGradientExplicitSource::
+directionalPressureGradientExplicitSource
+(
+    const word& sourceName,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    cellSetOption(sourceName, modelType, dict, mesh),
+    model_(PressureDropModelNames_.read(coeffs_.lookup("model"))),
+    gradP0_(cells_.size(), vector::zero),
+    dGradP_(cells_.size(), vector::zero),
+    gradPporous_(cells_.size(), vector::zero),
+    flowDir_(coeffs_.lookup("flowDir")),
+    invAPtr_(NULL),
+    D_(0),
+    I_(0),
+    length_(0),
+    pressureDrop_(0),
+    flowRate_(),
+    faceZoneName_(coeffs_.lookup("faceZone")),
+    zoneID_(mesh_.faceZones().findZoneID(faceZoneName_)),
+    faceId_(),
+    facePatchId_(),
+    relaxationFactor_(coeffs_.lookupOrDefault<scalar>("relaxationFactor",0.3)),
+    cellFaceMap_(cells_.size(), -1)
+{
+    coeffs_.lookup("fieldNames") >> fieldNames_;
+
+    flowDir_ /= mag(flowDir_);
+
+    if (fieldNames_.size() != 1)
+    {
+        FatalErrorInFunction
+            << "Source can only be applied to a single field.  Current "
+            << "settings are:" << fieldNames_ << exit(FatalError);
+    }
+
+    if (zoneID_ < 0)
+    {
+        FatalErrorInFunction
+            << type() << " " << this->name() << ": "
+            << "    Unknown face zone name: " << faceZoneName_
+            << ". Valid face zones are: " << mesh_.faceZones().names()
+            << nl << exit(FatalError);
+    }
+
+    if (model_ == pVolumetricFlowRateTable)
+    {
+        flowRate_ = interpolationTable<scalar>(coeffs_);
+    }
+    else if (model_ == pConstant)
+    {
+        coeffs_.lookup("pressureDrop") >> pressureDrop_;
+    }
+    else if (model_ == pDarcyForchheimer)
+    {
+        coeffs_.lookup("D") >> D_;
+        coeffs_.lookup("I") >> I_;
+        coeffs_.lookup("length") >> length_;
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Did not find mode " << model_
+            << nl
+            << "Please set 'model' to one of "
+            << PressureDropModelNames_.toc()
+            << exit(FatalError);
+    }
+
+    applied_.setSize(fieldNames_.size(), false);
+
+    // Read the initial pressure gradient from file if it exists
+    IFstream propsFile
+    (
+        mesh_.time().timePath()/"uniform"/(name_ + "Properties")
+    );
+
+    if (propsFile.good())
+    {
+        Info<< "    Reading pressure gradient from file" << endl;
+        dictionary propsDict(dictionary::null, propsFile);
+        propsDict.lookup("gradient") >> gradP0_;
+    }
+
+    Info<< "    Initial pressure gradient = " << gradP0_ << nl << endl;
+
+    initialise();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::directionalPressureGradientExplicitSource::correct
+(
+    volVectorField& U
+)
+{
+    const scalarField& rAU = invAPtr_().internalField();
+
+    const scalarField magUn(mag(U), cells_);
+
+    const surfaceScalarField& phi =
+            mesh().lookupObject<surfaceScalarField>("phi");
+
+    switch (model_)
+    {
+        case pDarcyForchheimer:
+        {
+            if (phi.dimensions() == dimVelocity*dimArea)
+            {
+                const incompressible::turbulenceModel& turbModel =
+                    mesh().lookupObject<incompressible::turbulenceModel>
+                    (
+                        turbulenceModel::propertiesName
+                    );
+
+                const scalarField nu(turbModel.nu(), cells_);
+
+                gradPporous_ = -flowDir_*(D_*nu + I_*0.5*magUn)*magUn*length_;
+                break;
+            }
+            else
+            {
+                const compressible::turbulenceModel& turbModel =
+                    mesh().lookupObject<compressible::turbulenceModel>
+                    (
+                        turbulenceModel::propertiesName
+                    );
+
+                const scalarField mu(turbModel.mu(),cells_);
+
+                const scalarField rho(turbModel.rho(),cells_);
+
+                gradPporous_ =
+                    - flowDir_*(D_*mu + I_*0.5*rho*magUn)*magUn*length_;
+            }
+        }
+        case pConstant:
+        {
+            gradPporous_ = -flowDir_*pressureDrop_;
+            break;
+        }
+
+        case pVolumetricFlowRateTable:
+        {
+            scalar volFlowRate = 0;
+            scalar totalphi = 0;
+
+            forAll(faceId_, i)
+            {
+                label faceI = faceId_[i];
+                if (facePatchId_[i] != -1)
+                {
+                    label patchI = facePatchId_[i];
+                    totalphi += phi.boundaryField()[patchI][faceI];
+                }
+                else
+                {
+                    totalphi += phi[faceI];
+                }
+            }
+            reduce(totalphi, sumOp<scalar>());
+
+            if (phi.dimensions() == dimVelocity*dimArea)
+            {
+                volFlowRate = mag(totalphi);
+            }
+            else
+            {
+                const compressible::turbulenceModel& turbModel =
+                    mesh().lookupObject<compressible::turbulenceModel>
+                    (
+                        turbulenceModel::propertiesName
+                    );
+                const scalarField rho(turbModel.rho(),cells_);
+                const scalarField cv(mesh_.V(), cells_);
+                scalar rhoAve = gSumProd(rho, cv)/gSum(cv);
+                volFlowRate = mag(totalphi)/rhoAve;
+            }
+
+            gradPporous_ = -flowDir_*flowRate_(volFlowRate);
+            break;
+        }
+    }
+
+    const faceZone& fZone = mesh_.faceZones()[zoneID_];
+
+    labelList meshToLocal(mesh_.nCells(), -1);
+    forAll(cells_, i)
+    {
+        meshToLocal[cells_[i]] = i;
+    }
+
+    labelList faceToCellIndex(fZone.size(), -1);
+    const labelList& mc = fZone.masterCells();
+    const labelList& sc = fZone.slaveCells();
+
+    forAll(fZone, i)
+    {
+        label masterCellI = mc[i];
+
+        if (meshToLocal[masterCellI] != -1 && masterCellI != -1)
+        {
+            faceToCellIndex[i] = meshToLocal[masterCellI];
+        }
+        else if (meshToLocal[masterCellI] == -1)
+        {
+            FatalErrorInFunction
+                << "Did not find  cell " << masterCellI
+                << "in cellZone :" << cellSetName()
+                << exit(FatalError);
+        }
+    }
+
+    // Accumulate 'upstream' velocity into cells
+    vectorField UfCells(cells_.size(), vector::zero);
+    scalarField UfCellWeights(cells_.size(), 0.0);
+
+    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+
+    FieldField<Field, vector> upwindValues(pbm.size());
+
+    forAll(U.boundaryField(), patchI)
+    {
+        const fvPatchVectorField& pf = U.boundaryField()[patchI];
+
+        if (pf.coupled())
+        {
+            upwindValues.set(patchI, pf.patchNeighbourField());
+        }
+        else if (!isA<emptyFvPatchScalarField>(pf))
+        {
+            upwindValues.set(patchI, new vectorField(pf));
+        }
+    }
+
+    forAll(fZone, i)
+    {
+        label faceI = fZone[i];
+        label cellId = faceToCellIndex[i];
+
+        if (cellId != -1)
+        {
+            label sourceCellId = sc[i];
+            if (mesh_.isInternalFace(faceI))
+            {
+                scalar w = mesh_.magSf()[faceI];
+                UfCells[cellId] += U[sourceCellId]*w;
+                UfCellWeights[cellId] += w;
+            }
+            else if (fZone.flipMap()[i])
+            {
+                label patchI = pbm.patchID()[faceI-mesh_.nInternalFaces()];
+                label localFaceI = pbm[patchI].whichFace(faceI);
+
+                scalar w = mesh_.magSf().boundaryField()[patchI][localFaceI];
+
+                if (upwindValues.set(patchI))
+                {
+                    UfCells[cellId] += upwindValues[patchI][localFaceI]*w;
+                    UfCellWeights[cellId] += w;
+                }
+            }
+        }
+    }
+
+    UfCells /= UfCellWeights;
+
+    forAll(cells_, i)
+    {
+        label cellI = cells_[i];
+
+        const vector Ufnorm = UfCells[i]/mag(UfCells[i]);
+
+        const tensor D = rotationTensor(Ufnorm, flowDir_);
+
+        dGradP_[i] +=
+            relaxationFactor_*
+            (
+                (D & UfCells[i]) - U[cellI]
+            )/rAU[cellI];
+
+
+        if (debug)
+        {
+            Info<< "Difference mag(U) = "
+                << mag(UfCells[i]) - mag(U[cellI])
+                << endl;
+            Info<< "Pressure drop in flowDir direction : "
+                << gradPporous_[i] << endl;
+            Info<< "UfCell:= " << UfCells[i] << "U : " << U[cellI] << endl;
+        }
+    }
+
+    writeProps(gradP0_ + dGradP_);
+}
+
+
+void Foam::fv::directionalPressureGradientExplicitSource::addSup
+(
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    DimensionedField<vector, volMesh> Su
+    (
+        IOobject
+        (
+            name_ + fieldNames_[fieldI] + "Sup",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedVector("zero", eqn.dimensions()/dimVolume, vector::zero)
+    );
+
+    UIndirectList<vector>(Su, cells_) = gradP0_ + dGradP_ + gradPporous_;
+
+    eqn += Su;
+}
+
+
+void Foam::fv::directionalPressureGradientExplicitSource::addSup
+(
+    const volScalarField& rho,
+    fvMatrix<vector>& eqn,
+    const label fieldI
+)
+{
+    this->addSup(eqn, fieldI);
+}
+
+
+void Foam::fv::directionalPressureGradientExplicitSource::constrain
+(
+    fvMatrix<vector>& eqn,
+    const label
+)
+{
+    if (invAPtr_.empty())
+    {
+        invAPtr_.reset
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    name_ + ":invA",
+                    mesh_.time().timeName(),
+                    mesh_,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                1.0/eqn.A()
+            )
+        );
+    }
+    else
+    {
+        invAPtr_() = 1.0/eqn.A();
+    }
+
+    gradP0_ += dGradP_;
+    dGradP_ = vector::zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
new file mode 100644
index 0000000000..a36cbfe2d6
--- /dev/null
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSource.H
@@ -0,0 +1,268 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::directionalPressureGradientExplicitSource
+
+Description
+    Creates an explicit  pressure gradient source in such a way to deflect the
+    flow towards an specific direction (flowDir). Alternatively add an extra
+    pressure drop in the flowDir direction using a model.
+
+    \heading Source usage
+    Example usage:
+    \verbatim
+    airDeflection
+    {
+        type            directionalPressureGradientExplicitSource;
+        active          true;
+
+        directionalPressureGradientExplicitSourceCoeffs
+        {
+            selectionMode   cellZone;
+            cellZone        cZone;
+
+            fieldNames  (U);            // Name of the field
+            flowDir     (1 1 0);        // Desired flow direction
+            faceZone    f0Zone;         // Face zone upstream cell zone
+            relaxationFactor    0.3;    // Relaxation factor for flow
+                                        // deflection (default 0.3)
+
+            //Pressure drop model [Pa]
+            model       volumetricFlowRateTable;//constant;//DarcyForchheimer;
+
+            //DarcyForchheimer model
+            // deltaP = (D*mu + 0.5*rho*magUn)*magUn*length_
+
+            D           5e7;
+            I           0;
+            length      1e-3;
+
+            //constant model
+            pressureDrop    40;
+
+            //volumetricFlowRateTable model
+            outOfBounds     clamp;
+            fileName        "volFlowRateTable";
+        }
+    }
+    \endverbatim
+
+    NOTE: In order to obtain the upwind velocities this function loops over
+    the slaves cells of the faceZone specified in the dictionary, on the other
+    hand, the cellZone to which this source term is applied should be composed
+    of the master cells and they should be 'downwind' the faceZone.
+
+SourceFiles
+    directionalPressureGradientExplicitSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef directionalPressureGradientExplicitSource_H
+#define directionalPressureGradientExplicitSource_H
+
+#include "cellSetOption.H"
+#include "autoPtr.H"
+#include "topoSetSource.H"
+#include "cellSet.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "fvOption.H"
+#include "interpolationTable.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+          Class directionalPressureGradientExplicitSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class directionalPressureGradientExplicitSource
+:
+    public cellSetOption
+{
+public:
+
+    //  Public enumeration
+
+        //- Modes of pressure drop
+        enum pressureDropModel
+        {
+            pVolumetricFlowRateTable,
+            pConstant,
+            pDarcyForchheimer
+        };
+
+
+private:
+
+    // Private data
+
+        static const NamedEnum<pressureDropModel, 3> PressureDropModelNames_;
+
+         //- Pressure drop model
+        pressureDropModel model_;
+
+        //- Pressure gradient before correction
+        vectorField gradP0_;
+
+        //- Change in pressure gradient
+        vectorField dGradP_;
+
+        //- Pressure drop due to porous media
+        vectorField gradPporous_;
+
+        //- Flow direction
+        vector flowDir_;
+
+        //- Matrix 1/A coefficients field pointer
+        autoPtr<volScalarField> invAPtr_;
+
+        //- Darcy pressure loss coefficient
+        scalar D_;
+
+        //- Inertia pressure lost coefficient
+        scalar I_;
+
+        //- Porous media length
+        scalar length_;
+
+        //- Constant pressure drop
+        scalar pressureDrop_;
+
+        //- Volumetric flow rate vs pressure drop table
+        interpolationTable<scalar> flowRate_;
+
+        //- Name of the faceZone at the heat exchange inlet
+        word faceZoneName_;
+
+        //- Id for the face zone
+        label zoneID_;
+
+         //- Local list of face IDs
+        labelList faceId_;
+
+        //- Local list of patch ID per face
+        labelList facePatchId_;
+
+        //- Relaxation factor
+        scalar relaxationFactor_;
+
+        //- Cells faces mapping
+        labelList cellFaceMap_;
+
+
+    // Private Member Functions
+
+        //- Init
+        void initialise();
+
+        //- Write the pressure gradient to file (for restarts etc)
+        void writeProps(const vectorField& gradP) const;
+
+        //- Correct driving force for a constant mass flow rate
+        void update(fvMatrix<vector>& eqn);
+
+        //- Disallow default bitwise copy construct
+        directionalPressureGradientExplicitSource
+        (
+            const directionalPressureGradientExplicitSource&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const directionalPressureGradientExplicitSource&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("directionalPressureGradientExplicitSource");
+
+
+    // Constructors
+
+        //- Construct from explicit source name and mesh
+        directionalPressureGradientExplicitSource
+        (
+            const word& sourceName,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    // Member Functions
+
+        // Evaluate
+
+            //- Correct the pressure gradient
+            virtual void correct(volVectorField& U);
+
+            //- Add explicit contribution to momentum equation
+            virtual void addSup
+            (
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+            //- Add explicit contribution to compressible momentum equation
+            virtual void addSup
+            (
+                const volScalarField& rho,
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+            //- Set 1/A coefficient
+            virtual void constrain
+            (
+                fvMatrix<vector>& eqn,
+                const label fieldI
+            );
+
+
+        // I-O
+
+            //- Write the source properties
+            virtual void writeData(Ostream&) const;
+
+            //- Read source dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
new file mode 100644
index 0000000000..171b2dce20
--- /dev/null
+++ b/src/fvOptions/sources/derived/directionalPressureGradientExplicitSource/directionalPressureGradientExplicitSourceIO.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "directionalPressureGradientExplicitSource.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::fv::directionalPressureGradientExplicitSource::writeData
+(
+    Ostream& os
+) const
+{
+    NotImplemented;
+}
+
+
+bool Foam::fv::directionalPressureGradientExplicitSource::read
+(
+    const dictionary& dict
+)
+{
+    const dictionary coeffs(dict.subDict(typeName + "Coeffs"));
+
+    relaxationFactor_ =
+        coeffs.lookupOrDefault<scalar>("relaxationFactor", 0.3);
+
+    coeffs.lookup("flowDir") >> flowDir_;
+    flowDir_ /= mag(flowDir_);
+
+    if (model_ == pConstant)
+    {
+        coeffs.lookup("pressureDrop") >> pressureDrop_;
+    }
+    else if (model_ == pDarcyForchheimer)
+    {
+        coeffs.lookup("D") >> D_;
+        coeffs.lookup("I") >> I_;
+        coeffs.lookup("length") >> length_;
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index 106db47075..d354c44303 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -168,16 +168,7 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
 {
     if (zoneID_ < 0)
     {
-        FatalErrorIn
-        (
-            "effectivenessHeatExchangerSource::effectivenessHeatExchangerSource"
-            "("
-                "const word&, "
-                "const word&, "
-                "const dictionary&, "
-                "const fvMesh&"
-            ")"
-        )
+        FatalErrorInFunction
             << type() << " " << this->name() << ": "
             << "    Unknown face zone name: " << faceZoneName_
             << ". Valid face zones are: " << mesh_.faceZones().names()
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
index 72212d5412..663e81de65 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H
@@ -254,11 +254,7 @@ public:
                 const label fieldI
             )
             {
-                notImplemented
-                (
-                    "effectivenessHeatExchangerSource::addSup(eqn, fieldI): "
-                    "only compressible solvers supported."
-                );
+                NotImplemented;
             }
 
 
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index e3c8d8a94a..deca3d4445 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -63,8 +63,7 @@ Foam::fv::explicitPorositySource::explicitPorositySource
 
     if (selectionMode_ != smCellZone)
     {
-        FatalErrorIn("void Foam::fv::explicitPorositySource::initialise()")
-            << "The porosity region must be specified as a cellZone.  Current "
+        FatalErrorInFunction
             << "selection mode is " << selectionModeTypeNames_[selectionMode_]
             << exit(FatalError);
     }
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index 4b717229ce..f4a6ca68e6 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -97,17 +97,7 @@ Foam::fv::meanVelocityForce::meanVelocityForce
 
     if (fieldNames_.size() != 1)
     {
-        FatalErrorIn
-        (
-            "Foam::fv::meanVelocityForce::"
-            "meanVelocityForce"
-            "("
-                "const word&, "
-                "const word&, "
-                "const dictionary&, "
-                "const fvMesh&"
-            ")"
-        )   << "Source can only be applied to a single field.  Current "
+        FatalErrorInFunction
             << "settings are:" << fieldNames_ << exit(FatalError);
     }
 
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForceIO.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForceIO.C
index 9a74a48e28..cccffc523e 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForceIO.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForceIO.C
@@ -29,13 +29,7 @@ License
 
 bool Foam::fv::meanVelocityForce::read(const dictionary& dict)
 {
-    notImplemented
-    (
-        "bool Foam::fv::meanVelocityForce::read"
-        "("
-            "const dictionary&"
-        ") const"
-    );
+    NotImplemented;
 
     return false;
 }
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
index 8fdf8a9881..9b1acd02b3 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.C
@@ -60,7 +60,7 @@ Foam::fv::patchMeanVelocityForce::patchMeanVelocityForce
 {
     if (patchi_ < 0)
     {
-        FatalErrorIn("fv::patchMeanVelocityForce::patchMeanVelocityForce")
+        FatalErrorInFunction
             << "Cannot find patch " << patch_
             << exit(FatalError);
     }
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
index 0f8978c4ee..e716ccd03a 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
@@ -125,7 +125,7 @@ Foam::bladeModel::bladeModel(const dictionary& dict)
     }
     else
     {
-        FatalErrorIn("Foam::bladeModel::bladeModel(const dictionary&)")
+        FatalErrorInFunction
             << "No blade data specified" << exit(FatalError);
     }
 }
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
index f07821c27b..ce355867b1 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
@@ -126,14 +126,8 @@ Foam::lookupProfile::lookupProfile
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::lookupProfile::lookupProfile"
-            "("
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )   << "No profile data specified" << exit(FatalError);
+        FatalErrorInFunction
+            << "No profile data specified" << exit(FatalError);
     }
 }
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
index b70c677423..8934fa53ad 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ Foam::autoPtr<Foam::profileModel> Foam::profileModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("profileModel::New(const dictionary&)")
+        FatalErrorInFunction
             << "Unknown profile model type " << modelType
             << nl << nl
             << "Valid model types are :" << nl
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C
index 7b7a2bed5d..f39131df6b 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ void Foam::profileModelList::connectBlades
                 profileNames[i] = pm.name();
             }
 
-            FatalErrorIn("void Foam::connectBlades(List<word>& names) const")
+            FatalErrorInFunction
                 << "Profile " << profileName << " could not be found "
                 << "in profile list.  Available profiles are"
                 << profileNames << exit(FatalError);
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
index 56750e8d86..eb7746dea2 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,25 +100,13 @@ Foam::seriesProfile::seriesProfile
 
     if (CdCoeffs_.empty())
     {
-        FatalErrorIn
-        (
-            "Foam::seriesProfile::seriesProfile"
-            "("
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )   << "CdCoeffs must be specified" << exit(FatalError);
+        FatalErrorInFunction
+            << "CdCoeffs must be specified" << exit(FatalError);
     }
     if (ClCoeffs_.empty())
     {
-        FatalErrorIn
-        (
-            "Foam::seriesProfile::seriesProfile"
-            "("
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )   << "ClCoeffs must be specified" << exit(FatalError);
+        FatalErrorInFunction
+            << "ClCoeffs must be specified" << exit(FatalError);
     }
 }
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 73e11394e7..e88c02c664 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -101,7 +101,7 @@ void Foam::fv::rotorDiskSource::checkData()
                 }
                 default:
                 {
-                    FatalErrorIn("void rotorDiskSource::checkData()")
+                    FatalErrorInFunction
                         << "Unknown inlet velocity type" << abort(FatalError);
                 }
             }
@@ -111,7 +111,7 @@ void Foam::fv::rotorDiskSource::checkData()
         }
         default:
         {
-            FatalErrorIn("void rotorDiskSource::checkData()")
+            FatalErrorInFunction
                 << "Source cannot be used with '"
                 << selectionModeTypeNames_[selectionMode()]
                 << "' mode.  Please use one of: " << nl
@@ -374,7 +374,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
         }
         default:
         {
-            FatalErrorIn("rotorDiskSource::createCoordinateSystem()")
+            FatalErrorInFunction
                 << "Unknown geometryMode " << geometryModeTypeNames_[gm]
                 << ". Available geometry modes include "
                 << geometryModeTypeNames_ << exit(FatalError);
@@ -454,12 +454,8 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Foam::tmp<Foam::vectorField> "
-                "Foam::fv::rotorDiskSource::inflowVelocity"
-                "(const volVectorField&) const"
-            )   << "Unknown inlet flow specification" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown inlet flow specification" << abort(FatalError);
         }
     }
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index a0664e696d..181db2575e 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -190,7 +190,7 @@ void Foam::fv::rotorDiskSource::writeField
 
         if (cells_.size() != values.size())
         {
-            FatalErrorIn("") << "cells_.size() != values_.size()"
+            FatalErrorInFunction
                 << abort(FatalError);
         }
 
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
index 401e04ae8d..e8c01c639b 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,10 +42,8 @@ Foam::autoPtr<Foam::trimModel> Foam::trimModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "trimModel::New(const rotorDiskSource&, const dictionary&)"
-        )   << "Unknown " << typeName << " type "
+        FatalErrorInFunction
+            << "Unknown " << typeName << " type "
             << modelType << nl << nl
             << "Valid " << typeName << " types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index b4120b984a..f7ce048afa 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -116,11 +116,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Foam::tmp<Foam::volScalarField> "
-                "Foam::fv::solidificationMeltingSource::Cp() const"
-            )
+            FatalErrorInFunction
                 << "Unhandled thermo mode: " << thermoModeTypeNames_[mode_]
                 << abort(FatalError);
         }
@@ -240,10 +236,8 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
         }
         default:
         {
-            FatalErrorIn
-            (
-                "fv::solidificationMeltingSource::solidificationMeltingSource"
-            )   << "Unhandled thermo mode: " << thermoModeTypeNames_[mode_]
+            FatalErrorInFunction
+                << "Unhandled thermo mode: " << thermoModeTypeNames_[mode_]
                 << abort(FatalError);
         }
     }
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 552c3d8531..14a34a82f5 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -34,13 +34,12 @@ Description
     phase change is added as an enthalpy contribution.
 
     Based on the references:
-
-      1. V.R. Voller and C. Prakash, A fixed grid numerical modelling
-         methodology for convection-diffusion mushy phase-change problems,
-         Int. J. Heat Mass Transfer 30(8):17091719, 1987.
-      2. C.R. Swaminathan. and V.R. Voller, A general enthalpy model for
-         modeling solidification processes, Metallurgical Transactions
-         23B:651664, 1992.
+    -# V.R. Voller and C. Prakash, A fixed grid numerical modelling
+       methodology for convection-diffusion mushy phase-change problems,
+       Int. J. Heat Mass Transfer 30(8):17091719, 1987.
+    -# C.R. Swaminathan. and V.R. Voller, A general enthalpy model for
+       modeling solidification processes, Metallurgical Transactions
+       23B:651664, 1992.
 
     The model generates a field \c \<name\>:alpha1 which can be visualised to
     to show the melt distribution as a fraction [0-1]
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
index 9a482b7012..aae2e1e07a 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
@@ -66,10 +66,8 @@ Foam::tabulated6DoFAcceleration::acceleration() const
 
     if (t < times_[0])
     {
-        FatalErrorIn
-        (
-            "tabulated6DoFAcceleration::acceleration()"
-        )   << "current time (" << t
+        FatalErrorInFunction
+            << "current time (" << t
             << ") is less than the minimum in the data table ("
             << times_[0] << ')'
             << exit(FatalError);
@@ -77,10 +75,8 @@ Foam::tabulated6DoFAcceleration::acceleration() const
 
     if (t > times_.last())
     {
-        FatalErrorIn
-        (
-            "tabulated6DoFAcceleration::acceleration()"
-        )   << "current time (" << t
+        FatalErrorInFunction
+            << "current time (" << t
             << ") is greater than the maximum in the data table ("
             << times_.last() << ')'
             << exit(FatalError);
@@ -138,10 +134,8 @@ bool Foam::tabulated6DoFAcceleration::read
         }
         else
         {
-            FatalErrorIn
-            (
-                "tabulated6DoFAcceleration::read(const dictionary&)"
-            )   << "Cannot open time data file " << timeDataFileName_
+            FatalErrorInFunction
+                << "Cannot open time data file " << timeDataFileName_
                 << exit(FatalError);
         }
     }
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index 091ea2ec66..c657bf55fa 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -65,7 +65,6 @@ void Foam::fv::CodedSource<Type>::prepare
     dynCode.setMakeOptions
         (
             "EXE_INC = -g \\\n"
-            "-I$(LIB_SRC)/fvOptions/lnInclude \\\n"
             "-I$(LIB_SRC)/finiteVolume/lnInclude \\\n"
             "-I$(LIB_SRC)/meshTools/lnInclude \\\n"
             "-I$(LIB_SRC)/sampling/lnInclude \\\n"
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index 4b8c48b411..c7643dd71a 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -55,11 +55,8 @@ Foam::fv::SemiImplicitSource<Type>::wordToVolumeModeType
         }
     }
 
-    FatalErrorIn
-    (
-        "SemiImplicitSource<Type>::volumeModeType"
-        "SemiImplicitSource<Type>::wordToVolumeModeType(const word&)"
-    )   << "Unknown volumeMode type " << vmtName
+    FatalErrorInFunction
+        << "Unknown volumeMode type " << vmtName
         << ". Valid volumeMode types are:" << nl << volumeModeTypeNames_
         << exit(FatalError);
 
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 5452142948..10636cf4a2 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -84,10 +84,7 @@ void Foam::fv::interRegionExplicitPorositySource::initialise()
     }
     else
     {
-        FatalErrorIn
-        (
-            "void Foam::fv::interRegionExplicitPorositySource::initialise()"
-        )
+        FatalErrorInFunction
             << "Unable to create porous cellZone " << zoneName
             << ": zone already exists"
             << abort(FatalError);
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 213f96a24e..170f72517b 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -71,7 +71,7 @@ void Foam::fv::interRegionHeatTransferModel::setNbrModel()
 
     if (!nbrModelFound)
     {
-        FatalErrorIn("interRegionHeatTransferModel::setNbrModel()")
+        FatalErrorInFunction
             << "Neighbour model not found" << nbrModelName_
             << " in region " << nbrMesh.name() << nl
             << exit(FatalError);
@@ -241,14 +241,8 @@ void Foam::fv::interRegionHeatTransferModel::addSup
             }
             else
             {
-                FatalErrorIn
-                (
-                    "void Foam::fv::interRegionHeatTransferModel::addSup"
-                    "("
-                    "   fvMatrix<scalar>&, "
-                    "   const label "
-                    ")"
-                )   << " on mesh " << mesh_.name()
+                FatalErrorInFunction
+                    << " on mesh " << mesh_.name()
                     << " could not find object basicThermo."
                     << " The available objects are: "
                     << mesh_.names()
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
index 89c6771a6f..42f7fd28a5 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelI.H
@@ -37,10 +37,8 @@ Foam::fv::interRegionHeatTransferModel::meshInterp() const
 {
     if (!meshInterpPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "const meshToMesh& interRegionHeatTransferModel::meshInterp() const"
-        )   << "Interpolation object not set"
+        FatalErrorInFunction
+            << "Interpolation object not set"
             << abort(FatalError);
     }
 
@@ -60,7 +58,7 @@ Foam::fv::interRegionHeatTransferModel::nbrModel() const
 {
     if (nbrModel_ == NULL)
     {
-        FatalErrorIn("const interRegionHeatTransferModel& nbrModel() const")
+        FatalErrorInFunction
             << "Neighbour model not set"
             << abort(FatalError);
     }
@@ -74,7 +72,7 @@ Foam::fv::interRegionHeatTransferModel::nbrModel()
 {
     if (nbrModel_ == NULL)
     {
-        FatalErrorIn("interRegionHeatTransferModel& nbrModel()")
+        FatalErrorInFunction
             << "Neighbour model not set"
             << abort(FatalError);
     }
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
new file mode 100644
index 0000000000..0cb51e13bb
--- /dev/null
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -0,0 +1,296 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "tabulatedNTUHeatTransfer.H"
+#include "addToRunTimeSelectionTable.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace fv
+    {
+        defineTypeNameAndDebug(tabulatedNTUHeatTransfer, 0);
+        addToRunTimeSelectionTable
+        (
+            option,
+            tabulatedNTUHeatTransfer,
+            dictionary
+        );
+    }
+
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::fv::tabulatedNTUHeatTransfer::geometryModeType,
+        2
+    >::names[] =
+    {
+        "calculated",
+        "user"
+    };
+}
+
+const Foam::NamedEnum<Foam::fv::tabulatedNTUHeatTransfer::geometryModeType, 2>
+Foam::fv::tabulatedNTUHeatTransfer::geometryModelNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+const Foam::interpolation2DTable<Foam::scalar>&
+Foam::fv::tabulatedNTUHeatTransfer::ntuTable()
+{
+    if (!ntuTable_.valid())
+    {
+        ntuTable_.reset(new interpolation2DTable<scalar>(coeffs_));
+    }
+
+    return ntuTable_();
+}
+
+
+const Foam::basicThermo& Foam::fv::tabulatedNTUHeatTransfer::thermo
+(
+    const fvMesh& mesh
+) const
+{
+    if (!mesh.foundObject<basicThermo>("thermophysicalProperties"))
+    {
+        FatalErrorInFunction
+            << " on mesh " << mesh.name()
+            << " could not find thermophysicalProperties "
+            << exit(FatalError);
+    }
+
+    return mesh.lookupObject<basicThermo>("thermophysicalProperties");
+}
+
+
+void Foam::fv::tabulatedNTUHeatTransfer::initialiseGeometry()
+{
+    if (Ain_ < 0)
+    {
+        geometryMode_ =
+            geometryModelNames_.read(coeffs_.lookup("geometryMode"));
+
+        Info<< "Region " << mesh_.name() << " " << type() << " " << name_ << " "
+            << geometryModelNames_[geometryMode_] << " geometry:" << nl;
+
+        switch (geometryMode_)
+        {
+            case gmCalculated:
+            {
+                const fvMesh& nbrMesh =
+                    mesh_.time().lookupObject<fvMesh>(nbrRegionName());
+
+                word inletPatchName(coeffs_.lookup("inletPatch"));
+                word inletPatchNbrName(coeffs_.lookup("inletPatchNbr"));
+
+                Info<< "    Inlet patch           : " << inletPatchName << nl
+                    << "    Inlet patch neighbour : " << inletPatchNbrName
+                    << nl;
+
+                label patchI = mesh_.boundary().findPatchID(inletPatchName);
+                label patchINbr =
+                    nbrMesh.boundary().findPatchID(inletPatchNbrName);
+
+                scalar alpha(readScalar(coeffs_.lookup("inletBlockageRatio")));
+
+                if ((alpha < 0) || (alpha > 1))
+                {
+                    FatalErrorInFunction
+                        << "Inlet patch blockage ratio must be between 0 and 1"
+                        << ".  Current value: " << alpha
+                        << abort(FatalError);
+                }
+
+                scalar alphaNbr
+                (
+                    readScalar(coeffs_.lookup("inletBlockageRatioNbr"))
+                );
+
+                if ((alphaNbr < 0) || (alphaNbr > 1))
+                {
+                    FatalErrorInFunction
+                        << "Inlet patch neighbour blockage ratio must be "
+                        << "between 0 and 1.  Current value: " << alphaNbr
+                        << abort(FatalError);
+                }
+
+                Info<< "    Inlet blockage ratio  : " << alpha << nl
+                    << "    Inlet blockage ratio neighbour : " << alphaNbr
+                    << nl;
+
+                Ain_ =
+                    (scalar(1) - alpha)
+                   *gSum(mesh_.magSf().boundaryField()[patchI]);
+
+                AinNbr_ =
+                    (scalar(1) - alphaNbr)
+                   *gSum(nbrMesh.magSf().boundaryField()[patchINbr]);
+
+                scalar beta(readScalar(coeffs_.lookup("coreBlockageRatio")));
+
+                if ((beta < 0) || (beta > 1))
+                {
+                    FatalErrorInFunction
+                        << "Core volume blockage ratio must be between 0 and 1"
+                        << ".  Current value: " << beta
+                        << abort(FatalError);
+                }
+
+                Info<< "    Core volume blockage ratio : " << beta << nl;
+
+                Vcore_ = (scalar(1) - beta)*meshInterp().V();
+
+                break;
+            }
+            case gmUser:
+            {
+                coeffs_.lookup("Ain") >> Ain_;
+                coeffs_.lookup("AinNbr") >> AinNbr_;
+
+                if (!coeffs_.readIfPresent("Vcore", Vcore_))
+                {
+                    Vcore_ = meshInterp().V();
+                }
+
+                break;
+            }
+            default:
+            {
+                FatalErrorInFunction
+                    << "Unhandled enumeration " << geometryMode_
+                    << abort(FatalError);
+            }
+        }
+
+        Info<< "    Inlet area local      : " << Ain_ << nl
+            << "    Inlet area neighbour  : " << AinNbr_ << nl
+            << "    Core volume           : " << Vcore_ << nl
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fv::tabulatedNTUHeatTransfer::tabulatedNTUHeatTransfer
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    interRegionHeatTransferModel(name, modelType, dict, mesh),
+    UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
+    UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
+    rhoName_(coeffs_.lookupOrDefault<word>("rhoName", "rho")),
+    rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbrName", "rho")),
+    ntuTable_(),
+    geometryMode_(gmCalculated),
+    Ain_(-1),
+    AinNbr_(-1),
+    Vcore_(-1)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fv::tabulatedNTUHeatTransfer::~tabulatedNTUHeatTransfer()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fv::tabulatedNTUHeatTransfer::calculateHtc()
+{
+    initialiseGeometry();
+
+    const fvMesh& nbrMesh = mesh_.time().lookupObject<fvMesh>(nbrRegionName());
+
+    const basicThermo& thermo = this->thermo(mesh_);
+    const basicThermo& thermoNbr = this->thermo(nbrMesh);
+    const volScalarField Cp(thermo.Cp());
+    const volScalarField CpNbr(thermoNbr.Cp());
+
+    // Calculate scaled mass flow for primary region
+    const volVectorField& U = mesh_.lookupObject<volVectorField>(UName_);
+    const volScalarField& rho = mesh_.lookupObject<volScalarField>(rhoName_);
+    const scalarField mDot(mag(U)*rho*Ain_);
+
+    // Calculate scaled mass flow for neighbour region
+    const volVectorField& UNbr =
+        nbrMesh.lookupObject<volVectorField>(UNbrName_);
+    const scalarField UMagNbr(mag(UNbr));
+    const scalarField UMagNbrMapped(interpolate(UMagNbr));
+    const scalarField& rhoNbr =
+        nbrMesh.lookupObject<volScalarField>(rhoNbrName_).internalField();
+    const scalarField rhoNbrMapped(interpolate(rhoNbr));
+    const scalarField mDotNbr(UMagNbrMapped*rhoNbrMapped*AinNbr_);
+
+
+    scalarField& htcc = htc_.internalField();
+    const interpolation2DTable<Foam::scalar>& ntuTable = this->ntuTable();
+
+    forAll(htcc, cellI)
+    {
+        scalar Cpc = Cp[cellI];
+        scalar CpcNbr = CpNbr[cellI];
+        scalar mDotc = mDot[cellI];
+        scalar mDotcNbr = mDotNbr[cellI];
+        scalar Cmin = min(Cpc*mDotc, CpcNbr*mDotcNbr);
+        scalar ntu = ntuTable(mDotc, mDotcNbr);
+
+        htcc[cellI] = Cmin*ntu/Vcore_;
+    }
+}
+
+
+bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
+{
+    if (option::read(dict))
+    {
+        coeffs_.readIfPresent("UName", UName_);
+        coeffs_.readIfPresent("UNbrName", UNbrName_);
+        coeffs_.readIfPresent("rhoName", rhoName_);
+        coeffs_.readIfPresent("rhoNbrName", rhoNbrName_);
+
+        // Force geometry re-initialisation
+        Ain_ = -1;
+        initialiseGeometry();
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
new file mode 100644
index 0000000000..777d533af4
--- /dev/null
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::tabulatedNTUHeatTransfer
+
+Description
+    Tabulated heat transfer model.
+
+    The heat flux is calculated based on the Number of Thermal Units (NTU).
+    A 2-D table of NTU as functions of the primary and secondary mass flow
+    rates is required.
+
+    The exchanger geometry can be specified using either:
+    - \c calculated:
+        - inlet area of each region and core volume determined by interrogating
+          mesh patches, and mesh-to-mesh interpolation volume
+        - calculated core volume canbe partially blocked by specifying a
+          \c coreBlockageRatio [0-1] entry
+    - \c user:
+        - inlet area of each region privided by the user
+        - core volume automatically calculated by the mesh-to-mesh
+          interpolation volume if not provided by user
+
+    Heat transfer coefficient calculated by:
+
+    \f[
+        htc = C_{min} \frac{NTU}{V_{core}}
+    \f]
+
+    Where \f$ C_{min} \f$ is given by:
+
+    \f[
+        C_{min} = min \left(Cp_1 \dot{m}_1, Cp_2 \dot{m}_2 \right)
+    \f]
+
+    \heading Example usage
+
+    \verbatim
+    coolerToAir
+    {
+        type            tabulatedNTUHeatTransfer;
+        active          yes;
+
+        tabulatedNTUHeatTransferCoeffs
+        {
+            interpolationMethod cellVolumeWeight;
+            nbrRegionName   air;
+            master          true;
+
+            fieldNames      (h);
+            outOfBounds     clamp;
+            fileName        "ntuTable";
+            nbrModelName    airToCooler;
+            semiImplicit    no;
+
+
+            geometryMode    user;
+            Ain             0.01728;
+            AinNbr          0.3456;
+            Vcore           0.01244;  // Optional
+    
+            // geometryMode    calculated;
+            // inletPatch      inlet_HWK;
+            // inletPatchNbr   inlet_air;
+            // inletBlockageRatio 0.10;
+            // inletBlockageRatioNbr 0.04;
+            // coreBlockageRatio 0;
+        }
+    }
+
+SourceFiles
+    tabulatedNTUHeatTransfer.C
+
+SeeAlso
+    interRegionHeatTransferModel.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tabulatedNTUHeatTransfer_H
+#define tabulatedNTUHeatTransfer_H
+
+#include "interRegionHeatTransferModel.H"
+#include "autoPtr.H"
+#include "interpolation2DTable.H"
+#include "NamedEnum.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class tabulatedNTUHeatTransfer Declaration
+\*---------------------------------------------------------------------------*/
+
+class tabulatedNTUHeatTransfer
+:
+    public interRegionHeatTransferModel
+{
+public:
+
+    // Public enumerations
+
+        enum geometryModeType
+        {
+            gmCalculated,
+            gmUser
+        };
+
+        static const NamedEnum<geometryModeType, 2> geometryModelNames_;
+
+
+private:
+
+    // Private data
+
+        //- Name of velocity field; default = U
+        word UName_;
+
+        //- Name of neighbour velocity field; default = U
+        word UNbrName_;
+
+        //- Name of density field; default = rho
+        word rhoName_;
+
+        //- Name of neighbour density field; default = rho
+        word rhoNbrName_;
+
+        //- Pointer to 2-D look-up table of NTU f(mDot1, mDot2)
+        autoPtr<interpolation2DTable<scalar> > ntuTable_;
+
+        //- Geometry input mode
+        geometryModeType geometryMode_;
+
+        //- Inlet area [m2]
+        scalar Ain_;
+
+        //- Neighbour region inlet area [m2]
+        scalar AinNbr_;
+
+        //- Heat exchanger core volume
+        scalar Vcore_;
+
+
+    // Private Member functions
+
+        //- NTU table helper
+        const interpolation2DTable<Foam::scalar>& ntuTable();
+
+        //- Thermophysical properties helper
+        const basicThermo& thermo(const fvMesh& mesh) const;
+
+        //- Initialise geometry
+        void initialiseGeometry();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("tabulatedNTUHeatTransfer");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        tabulatedNTUHeatTransfer
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    //- Destructor
+    virtual ~tabulatedNTUHeatTransfer();
+
+
+    // Public Functions
+
+        //- Calculate the heat transfer coefficient
+        virtual void calculateHtc();
+
+
+        // I-O
+
+            //- Read dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 120d7b1c52..0a7afe5cb2 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,11 +37,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 :
     calculatedFvPatchField<Type>(p, iF)
 {
-    FatalErrorIn
-    (
-        "genericFvPatchField<Type>::genericFvPatchField"
-        "(const fvPatch& p, const DimensionedField<Type, volMesh>& iF)"
-    )   << "Not Implemented\n    "
+    FatalErrorInFunction
         << "Trying to construct an genericFvPatchField on patch "
         << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
@@ -63,10 +59,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 {
     if (!dict.found("value"))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "genericFvPatchField<Type>::genericFvPatchField"
-            "(const fvPatch&, const Field<Type>&, const dictionary&)",
             dict
         )   << "\n    Cannot find 'value' entry"
             << " on patch " << this->patch().name()
@@ -120,11 +114,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                         }
                         else
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    token following 'nonuniform' "
                                   "is not a compound"
@@ -153,11 +144,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -190,11 +178,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -230,11 +215,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -270,11 +252,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -307,11 +286,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -329,11 +305,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     }
                     else
                     {
-                        FatalIOErrorIn
+                        FatalIOErrorInFunction
                         (
-                            "genericFvPatchField<Type>::genericFvPatchField"
-                            "(const fvPatch&, const Field<Type>&, "
-                            "const dictionary&)",
                             dict
                         )   << "\n    compound " << fieldToken.compoundToken()
                             << " not supported"
@@ -419,11 +392,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                         }
                         else
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericFvPatchField<Type>::genericFvPatchField"
-                                "(const fvPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    unrecognised native type " << l
                                 << "\n    on patch " << this->patch().name()
@@ -724,12 +694,8 @@ Foam::genericFvPatchField<Type>::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    FatalErrorIn
-    (
-        "genericFvPatchField<Type>::"
-        "valueInternalCoeffs(const tmp<scalarField>&) const"
-    )   << "\n    "
-           "valueInternalCoeffs cannot be called for a genericFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a genericFvPatchField"
            " (actual type " << actualTypeName_ << ")"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
@@ -749,12 +715,8 @@ Foam::genericFvPatchField<Type>::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    FatalErrorIn
-    (
-        "genericFvPatchField<Type>::"
-        "valueBoundaryCoeffs(const tmp<scalarField>&) const"
-    )   << "\n    "
-           "valueBoundaryCoeffs cannot be called for a genericFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a genericFvPatchField"
            " (actual type " << actualTypeName_ << ")"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
@@ -771,12 +733,8 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::genericFvPatchField<Type>::gradientInternalCoeffs() const
 {
-    FatalErrorIn
-    (
-        "genericFvPatchField<Type>::"
-        "gradientInternalCoeffs() const"
-    )   << "\n    "
-           "gradientInternalCoeffs cannot be called for a genericFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a genericFvPatchField"
            " (actual type " << actualTypeName_ << ")"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
@@ -792,12 +750,8 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::genericFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
-    FatalErrorIn
-    (
-        "genericFvPatchField<Type>::"
-        "gradientBoundaryCoeffs() const"
-    )   << "\n    "
-           "gradientBoundaryCoeffs cannot be called for a genericFvPatchField"
+    FatalErrorInFunction
+        << "cannot be called for a genericFvPatchField"
            " (actual type " << actualTypeName_ << ")"
         << "\n    on patch " << this->patch().name()
         << " of field " << this->dimensionedInternalField().name()
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 838757bf32..08b254e658 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,11 +42,7 @@ genericPointPatchField<Type>::genericPointPatchField
 :
     calculatedPointPatchField<Type>(p, iF)
 {
-    notImplemented
-    (
-        "genericPointPatchField<Type>::genericPointPatchField"
-        "(const pointPatch& p, const DimensionedField<Type, volMesh>& iF)"
-    );
+    NotImplemented;
 }
 
 
@@ -101,12 +97,8 @@ genericPointPatchField<Type>::genericPointPatchField
                         }
                         else
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericPointPatchField<Type>::"
-                                "genericPointPatchField"
-                                "(const pointPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    token following 'nonuniform' "
                                   "is not a compound"
@@ -135,12 +127,8 @@ genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericPointPatchField<Type>::"
-                                "genericPointPatchField"
-                                "(const pointPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -173,12 +161,8 @@ genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericPointPatchField<Type>::"
-                                "genericPointPatchField"
-                                "(const pointPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -214,12 +198,8 @@ genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericPointPatchField<Type>::"
-                                "genericPointPatchField"
-                                "(const pointPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -255,12 +235,8 @@ genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericPointPatchField<Type>::"
-                                "genericPointPatchField"
-                                "(const pointPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -293,12 +269,8 @@ genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "genericPointPatchField<Type>::"
-                                "genericPointPatchField"
-                                "(const pointPatch&, const Field<Type>&, "
-                                "const dictionary&)",
                                 dict
                             )   << "\n    size of field " << iter().keyword()
                                 << " (" << fPtr->size() << ')'
@@ -316,12 +288,8 @@ genericPointPatchField<Type>::genericPointPatchField
                     }
                     else
                     {
-                        FatalIOErrorIn
+                        FatalIOErrorInFunction
                         (
-                            "genericPointPatchField<Type>::"
-                            "genericPointPatchField"
-                            "(const pointPatch&, const Field<Type>&, "
-                            "const dictionary&)",
                             dict
                         )   << "\n    compound " << fieldToken.compoundToken()
                             << " not supported"
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index aafa52ca59..3cc13ad356 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -131,7 +131,7 @@ void Foam::DSMCCloud<ParcelType>::initialise
 
                 if (typeId == -1)
                 {
-                    FatalErrorIn("Foam::DSMCCloud<ParcelType>::initialise")
+                    FatalErrorInFunction
                         << "typeId " << moleculeName << "not defined." << nl
                         << abort(FatalError);
                 }
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 4d0ee08b6c..16801a7bf7 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
@@ -107,7 +107,7 @@ Foam::DSMCCloud<ParcelType>::constProps
 {
     if (typeId < 0 || typeId >= constProps_.size())
     {
-        FatalErrorIn("Foam::DSMCCloud<ParcelType>::constProps(label typeId)")
+        FatalErrorInFunction
             << "constantProperties for requested typeId index "
             << typeId << " do not exist" << nl
             << abort(FatalError);
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
index f01e28c916..4d528d0304 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
@@ -44,11 +44,7 @@ Foam::BinaryCollisionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "BinaryCollisionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
+        FatalErrorInFunction
             << "Unknown BinaryCollisionModel type "
             << modelType << nl << nl
             << "Valid BinaryCollisionModel types are:" << nl
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
index 587d10a3bb..d5c2d19b41 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
@@ -64,14 +64,7 @@ Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR
     const typename CloudType::parcelType& pQ
 ) const
 {
-    FatalErrorIn
-    (
-        "Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR"
-        "("
-            "const typename CloudType::parcelType&, "
-            "const typename CloudType::parcelType"
-        ") const"
-    )
+    FatalErrorInFunction
         << "sigmaTcR called on NoBinaryCollision model, this should "
         << "not happen, this is not an actual model." << nl
         << "Enclose calls to sigmaTcR within a if (binaryCollision().active()) "
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index c497b21d0f..7fd2bc7537 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -97,14 +97,8 @@ Foam::FreeStream<CloudType>::FreeStream
 
         if (moleculeTypeIds_[i] == -1)
         {
-            FatalErrorIn
-            (
-                "Foam::FreeStream<CloudType>::FreeStream"
-                "("
-                    "const dictionary&, "
-                    "CloudType&"
-                ")"
-            )   << "typeId " << molecules[i] << "not defined in cloud." << nl
+            FatalErrorInFunction
+                << "typeId " << molecules[i] << "not defined in cloud." << nl
                 << abort(FatalError);
         }
     }
@@ -190,7 +184,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
             if (min(boundaryT[patchi]) < SMALL)
             {
-                FatalErrorIn ("Foam::FreeStream<CloudType>::inflow()")
+                FatalErrorInFunction
                     << "Zero boundary temperature detected, check boundaryT "
                     << "condition." << nl
                     << nl << abort(FatalError);
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
index c80e58159d..9fd145d104 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
@@ -44,11 +44,8 @@ Foam::InflowBoundaryModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "InflowBoundaryModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )   << "Unknown InflowBoundaryModel type "
+        FatalErrorInFunction
+            << "Unknown InflowBoundaryModel type "
             << modelType << nl << nl
             << "Valid InflowBoundaryModel types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
index 1100028c86..179bdc6d59 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
@@ -44,11 +44,7 @@ Foam::WallInteractionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "WallInteractionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
+        FatalErrorInFunction
             << "Unknown WallInteractionModel type "
             << modelType << nl << nl
             << "Valid WallInteractionModel types are:" << nl
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 8c36579974..c42136c92d 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ void Foam::Cloud<ParticleType>::checkPatches() const
 
     if (!ok)
     {
-        FatalErrorIn("void Foam::Cloud<ParticleType>::initCloud(const bool)")
+        FatalErrorInFunction
             << "Particle tracking across AMI patches is only currently "
             << "supported for cases where the AMI patches reside on a "
             << "single processor" << abort(FatalError);
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 1845d54165..8a297d9414 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,11 +219,8 @@ void Foam::Cloud<ParticleType>::checkFieldIOobject
 {
     if (data.size() != c.size())
     {
-        FatalErrorIn
-        (
-            "void Cloud<ParticleType>::checkFieldIOobject"
-            "(const Cloud<ParticleType>&, const IOField<DataType>&) const"
-        )   << "Size of " << data.name()
+        FatalErrorInFunction
+            << "Size of " << data.name()
             << " field " << data.size()
             << " does not match the number of particles " << c.size()
             << abort(FatalError);
@@ -241,14 +238,8 @@ void Foam::Cloud<ParticleType>::checkFieldFieldIOobject
 {
     if (data.size() != c.size())
     {
-        FatalErrorIn
-        (
-            "void Cloud<ParticleType>::checkFieldFieldIOobject"
-            "("
-                "const Cloud<ParticleType>&, "
-                "const CompactIOField<Field<DataType>, DataType>&"
-            ") const"
-        )   << "Size of " << data.name()
+        FatalErrorInFunction
+            << "Size of " << data.name()
             << " field " << data.size()
             << " does not match the number of particles " << c.size()
             << abort(FatalError);
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index 5bb41e5fd8..b89b2c0b4c 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -107,9 +107,8 @@ void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "void IOPosition<CloudType>::readData(CloudType&, bool)",
                 is
             )   << "incorrect first token, '(', found "
                 << firstToken.info() << exit(FatalIOError);
@@ -133,9 +132,8 @@ void Foam::IOPosition<CloudType>::readData(CloudType& c, bool checkClass)
     }
     else
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "void IOPosition<ParticleType>::readData(CloudType&, bool)",
             is
         )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info() << exit(FatalIOError);
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 4ec03e34b9..ec2967ee44 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -1165,14 +1165,7 @@ void Foam::InteractionLists<ParticleType>::sendReferredData
 {
     if (mesh_.changing())
     {
-        WarningIn
-        (
-            "void Foam::InteractionLists<ParticleType>::sendReferredData"
-            "("
-                "const List<DynamicList<ParticleType*> >& cellOccupancy,"
-                "PstreamBuffers& pBufs"
-            ")"
-        )
+        WarningInFunction
             << "Mesh changing, rebuilding InteractionLists form scratch."
             << endl;
 
diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
index b6e8c91da6..bf497dd2c8 100644
--- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,15 +48,8 @@ Foam::referredWallFace::referredWallFace
 {
     if (this->size() != pts_.size())
     {
-        FatalErrorIn
-        (
-            "Foam::referredWallFace::referredWallFace"
-            "("
-                "const face& f, "
-                "const pointField& pts, "
-                "label patchI"
-            ")"
-        )   << "Face and pointField are not the same size. " << nl << (*this)
+        FatalErrorInFunction
+            << "Face and pointField are not the same size. " << nl << (*this)
             << abort(FatalError);
     }
 }
@@ -70,13 +63,8 @@ Foam::referredWallFace::referredWallFace(const referredWallFace& rWF)
 {
     if (this->size() != pts_.size())
     {
-        FatalErrorIn
-        (
-            "Foam::referredWallFace::referredWallFace"
-            "("
-                "const referredWallFace& rWF"
-            ")"
-        )   << "Face and pointField are not the same size. " << nl << (*this)
+        FatalErrorInFunction
+            << "Face and pointField are not the same size. " << nl << (*this)
             << abort(FatalError);
     }
 }
diff --git a/src/lagrangian/basic/particle/particleI.H b/src/lagrangian/basic/particle/particleI.H
index 0ebd9748b4..c1960b37d0 100644
--- a/src/lagrangian/basic/particle/particleI.H
+++ b/src/lagrangian/basic/particle/particleI.H
@@ -331,10 +331,7 @@ inline void Foam::particle::tetNeighbour(label triI)
 
     if (tetBasePtI == -1)
     {
-        FatalErrorIn
-        (
-            "inline void Foam::particle::tetNeighbour(label triI)"
-        )
+        FatalErrorInFunction
             << "No base point for face " << tetFaceI_ << ", " << f
             << ", produces a valid tet decomposition."
             << abort(FatalError);
@@ -447,11 +444,7 @@ inline void Foam::particle::tetNeighbour(label triI)
         }
         default:
         {
-            FatalErrorIn
-            (
-                "inline void "
-                "Foam::particle::tetNeighbour(label triI)"
-            )
+            FatalErrorInFunction
                 << "Tet tri face index error, can only be 0..3, supplied "
                 << triI << abort(FatalError);
 
@@ -530,17 +523,7 @@ inline void Foam::particle::crossEdgeConnectedFace
 
             if (tetBasePtI == -1)
             {
-                FatalErrorIn
-                (
-                    "inline void "
-                    "Foam::particle::crossEdgeConnectedFace"
-                    "("
-                        "const label& cellI,"
-                        "label& tetFaceI,"
-                        "label& tetPtI,"
-                        "const edge& e"
-                    ")"
-                )
+                FatalErrorInFunction
                     << "No base point for face " << fI << ", " << f
                     << ", produces a decomposition that has a minimum "
                     << "volume greater than tolerance."
@@ -586,7 +569,7 @@ inline Foam::label Foam::particle::getNewParticleID() const
 
     if (id == labelMax)
     {
-        WarningIn("particle::getNewParticleID() const")
+        WarningInFunction
             << "Particle counter has overflowed. This might cause problems"
             << " when reconstructing particle tracks." << endl;
     }
@@ -698,7 +681,7 @@ inline void Foam::particle::initCellFacePt()
 
         if (cellI_ == -1)
         {
-            FatalErrorIn("void Foam::particle::initCellFacePt()")
+            FatalErrorInFunction
                 << "cell, tetFace and tetPt search failure at position "
                 << position_ << abort(FatalError);
         }
@@ -732,8 +715,7 @@ inline void Foam::particle::initCellFacePt()
                     // it should be in, then this is considered an
                     // error.
 
-                    FatalErrorIn("void Foam::particle::initCellFacePt()")
-                        << "    cell, tetFace and tetPt search failure at "
+                    FatalErrorInFunction
                         << "position " << position_ << nl
                         << "    for requested cell " << oldCellI << nl
                         << "    If this is a restart or "
@@ -783,14 +765,14 @@ inline void Foam::particle::initCellFacePt()
 
                 if (tetFaceI_ == -1)
                 {
-                    FatalErrorIn("void Foam::particle::initCellFacePt()")
+                    FatalErrorInFunction
                         << "cell, tetFace and tetPt search failure at position "
                         << position_ << abort(FatalError);
                 }
 
                 if (debug)
                 {
-                    WarningIn("void Foam::particle::initCellFacePt()")
+                    WarningInFunction
                         << "Particle moved from " << position_
                         << " to " << newPosition
                         << " in cell " << cellI_
@@ -809,7 +791,7 @@ inline void Foam::particle::initCellFacePt()
 
             if (debug && cellI_ != oldCellI)
             {
-                WarningIn("void Foam::particle::initCellFacePt()")
+                WarningInFunction
                     << "Particle at position " << position_
                     << " searched for a cell, tetFace and tetPt." << nl
                     << "    Found"
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index 382df588f2..68bc5ab1e3 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -546,7 +546,7 @@ Foam::scalar Foam::particle::trackToFace
         }
         else
         {
-            FatalErrorIn("Particle::trackToFace(const vector&, TrackData&)")
+            FatalErrorInFunction
                 << "addressing failure" << abort(FatalError);
         }
     }
@@ -948,14 +948,8 @@ void Foam::particle::hitWedgePatch
     TrackData&
 )
 {
-    FatalErrorIn
-    (
-        "void Foam::particle::hitWedgePatch"
-        "("
-            "const wedgePolyPatch& wpp, "
-            "TrackData&"
-        ")"
-    )   << "Hitting a wedge patch should not be possible."
+    FatalErrorInFunction
+        << "Hitting a wedge patch should not be possible."
         << abort(FatalError);
 
     vector nf = normal();
@@ -1059,16 +1053,7 @@ void Foam::particle::hitCyclicAMIPatch
 
     if (patchFaceI < 0)
     {
-        FatalErrorIn
-        (
-            "template<class TrackData>"
-            "void Foam::particle::hitCyclicAMIPatch"
-            "("
-                "const cyclicAMIPolyPatch&, "
-                "TrackData&, "
-                "const vector&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Particle lost across " << cyclicAMIPolyPatch::typeName
             << " patches " << cpp.name() << " and " << receiveCpp.name()
             << " at position " << position_ << abort(FatalError);
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticle.H b/src/lagrangian/basic/passiveParticle/passiveParticle.H
index 5309722ebf..4b23d84190 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticle.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticle.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -105,6 +105,30 @@ public:
         {
             return autoPtr<particle>(new passiveParticle(*this));
         }
+
+
+        //- Factory class to read-construct particles used for
+        //  parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<passiveParticle> operator()(Istream& is) const
+            {
+                return autoPtr<passiveParticle>
+                (
+                    new passiveParticle(mesh_, is, true)
+                );
+            }
+        };
+
 };
 
 
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 04b133ba05..87e1d6a710 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -18,6 +18,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -43,6 +44,7 @@ LIB_LIBS = \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
+    -ldynamicMesh \
     -ldynamicFvMesh \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index 7196440897..7f7a9c25fd 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -60,14 +60,8 @@ Foam::COxidationDiffusionLimitedRate<CloudType>::COxidationDiffusionLimitedRate
 
     if (Sb_ < 0)
     {
-        FatalErrorIn
-        (
-            "COxidationDiffusionLimitedRate<CloudType>"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
+        FatalErrorInFunction
+            << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
index 3e6b6a8d55..5934002848 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
@@ -66,14 +66,8 @@ Foam::COxidationIntrinsicRate<CloudType>::COxidationIntrinsicRate
 
     if (Sb_ < 0)
     {
-        FatalErrorIn
-        (
-            "COxidationIntrinsicRate<CloudType>"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
+        FatalErrorInFunction
+            << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index b97b8ab0c1..30f9b1bb40 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -208,10 +208,8 @@ Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::calculate
 
     if (iter > maxIters_)
     {
-        WarningIn
-        (
-            "scalar Foam::COxidationMurphyShaddix<CloudType>::calculate(...)"
-        )   << "iter limit reached (" << maxIters_ << ")" << nl << endl;
+        WarningInFunction
+            << "iter limit reached (" << maxIters_ << ")" << nl << endl;
     }
 
     // Calculate the number of molar units reacted
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModel.C b/src/lagrangian/distributionModels/distributionModel/distributionModel.C
index c04856d3ae..af5aa745cb 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModel.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.C
@@ -43,7 +43,7 @@ void Foam::distributionModels::distributionModel::check() const
 {
     if (minValue() < 0)
     {
-        FatalErrorIn("distributionModels::distributionModel::check() const")
+        FatalErrorInFunction
             << type() << "distribution: Minimum value must be greater than "
             << "zero." << nl << "Supplied minValue = " << minValue()
             << abort(FatalError);
@@ -51,7 +51,7 @@ void Foam::distributionModels::distributionModel::check() const
 
     if (maxValue() < minValue())
     {
-        FatalErrorIn("distributionModels::distributionModel::check() const")
+        FatalErrorInFunction
             << type() << "distribution: Maximum value is smaller than the "
             << "minimum value:" << nl << "    maxValue = " << maxValue()
             << ", minValue = " << minValue()
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
index 81e8210712..fabb796e0b 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,14 +43,7 @@ Foam::distributionModels::distributionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "distributionModels::distributionModel::New"
-            "("
-                "const dictionary&, "
-                "cachedRandom&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Unknown distribution model type " << modelType << nl << nl
             << "Valid distribution model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/distributionModels/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C
index c9e4cc0184..a585ee59a1 100644
--- a/src/lagrangian/distributionModels/normal/normal.C
+++ b/src/lagrangian/distributionModels/normal/normal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ Foam::distributionModels::normal::normal
 {
     if (minValue_ < 0)
     {
-        FatalErrorIn("normal::normal(const dictionary&, Random&)")
+        FatalErrorInFunction
             << "Minimum value must be greater than zero. "
             << "Supplied minValue = " << minValue_
             << abort(FatalError);
@@ -63,7 +63,7 @@ Foam::distributionModels::normal::normal
 
     if (maxValue_ < minValue_)
     {
-        FatalErrorIn("normal::normal(const dictionary&, Random&)")
+        FatalErrorInFunction
             << "Maximum value is smaller than the minimum value:"
             << "    maxValue = " << maxValue_ << ", minValue = " << minValue_
             << abort(FatalError);
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
index eda0cdc220..1e8f951741 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,10 +46,8 @@ Foam::IntegrationScheme<Type>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "IntegrationScheme::New(const dictionary&)"
-        )   << "Unknown integration scheme type "
+        FatalErrorInFunction
+            << "Unknown integration scheme type "
             << schemeName << nl << nl
             << "Valid integration scheme types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 9cadf55117..3abb93961e 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -1,3 +1,5 @@
+submodels/CloudFunctionObjects/CloudToVTK/vtkTools.C
+
 PARCELS=parcels
 BASEPARCELS=$(PARCELS)/baseClasses
 DERIVEDPARCELS=$(PARCELS)/derived
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index a5a3b3c8eb..dc893c1148 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -14,6 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -35,6 +36,7 @@ LIB_LIBS = \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
+    -ldynamicMesh \
     -ldynamicFvMesh \
     -lsampling \
     -lfiniteVolume \
diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
index 3ad01176c0..f89ee163cf 100644
--- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,18 +97,8 @@ Foam::CollidingCloud<CloudType>::CollidingCloud
 {
     if (this->solution().steadyState())
     {
-        FatalErrorIn
-        (
-            "Foam::CollidingCloud<CloudType>::CollidingCloud"
-            "("
-                "const word&, "
-                "const volScalarField&, "
-                "const volVectorField&, "
-                "const volScalarField&, "
-                "const dimensionedVector&, "
-                "bool"
-            ")"
-        )   << "Collision modelling not currently available for steady state "
+        FatalErrorInFunction
+            << "Collision modelling not currently available for steady state "
             << "calculations" << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index ed0f74793f..626d207070 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -363,13 +363,7 @@ inline Foam::scalar Foam::KinematicCloud<CloudType>::penetration
 {
     if ((fraction < 0) || (fraction > 1))
     {
-        FatalErrorIn
-        (
-            "inline Foam::scalar Foam::KinematicCloud<CloudType>::penetration"
-            "("
-                "const scalar"
-            ") const"
-        )
+        FatalErrorInFunction
             << "fraction should be in the range 0 < fraction < 1"
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
index 8a0001f842..c609b2d272 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,11 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cloudSolution::cloudSolution
-(
-    const fvMesh& mesh,
-    const dictionary& dict
-)
+Foam::cloudSolution::cloudSolution(const fvMesh& mesh, const dictionary& dict)
 :
     mesh_(mesh),
     dict_(dict),
@@ -42,6 +38,7 @@ Foam::cloudSolution::cloudSolution
     maxCo_(0.3),
     iter_(1),
     trackTime_(0.0),
+    deltaTMax_(GREAT),
     coupled_(false),
     cellValueSourceCorrection_(false),
     maxTrackTime_(0.0),
@@ -52,13 +49,25 @@ Foam::cloudSolution::cloudSolution
     {
         read();
     }
+    else
+    {
+        // see if existing source terms should be reset
+        const dictionary sourceTerms(dict_.subOrEmptyDict("sourceTerms"));
+        sourceTerms.readIfPresent("resetOnStartup", resetSourcesOnStartup_);
+
+        if (resetSourcesOnStartup_)
+        {
+            Info<< "Cloud source terms will be reset" << endl;
+        }
+        else
+        {
+            Info<< "Cloud source terms will be held constant" << endl;
+        }
+    }
 }
 
 
-Foam::cloudSolution::cloudSolution
-(
-    const cloudSolution& cs
-)
+Foam::cloudSolution::cloudSolution(const cloudSolution& cs)
 :
     mesh_(cs.mesh_),
     dict_(cs.dict_),
@@ -68,6 +77,7 @@ Foam::cloudSolution::cloudSolution
     maxCo_(cs.maxCo_),
     iter_(cs.iter_),
     trackTime_(cs.trackTime_),
+    deltaTMax_(cs.deltaTMax_),
     coupled_(cs.coupled_),
     cellValueSourceCorrection_(cs.cellValueSourceCorrection_),
     maxTrackTime_(cs.maxTrackTime_),
@@ -76,10 +86,7 @@ Foam::cloudSolution::cloudSolution
 {}
 
 
-Foam::cloudSolution::cloudSolution
-(
-    const fvMesh& mesh
-)
+Foam::cloudSolution::cloudSolution(const fvMesh& mesh)
 :
     mesh_(mesh),
     dict_(dictionary::null),
@@ -89,6 +96,7 @@ Foam::cloudSolution::cloudSolution
     maxCo_(GREAT),
     iter_(0),
     trackTime_(0.0),
+    deltaTMax_(GREAT),
     coupled_(false),
     cellValueSourceCorrection_(false),
     maxTrackTime_(0.0),
@@ -111,6 +119,7 @@ void Foam::cloudSolution::read()
     dict_.lookup("coupled") >> coupled_;
     dict_.lookup("cellValueSourceCorrection") >> cellValueSourceCorrection_;
     dict_.readIfPresent("maxCo", maxCo_);
+    dict_.readIfPresent("deltaTMax", deltaTMax_);
 
     if (steadyState())
     {
@@ -149,7 +158,7 @@ void Foam::cloudSolution::read()
             }
             else
             {
-                FatalErrorIn("void cloudSolution::read()")
+                FatalErrorInFunction
                     << "Invalid scheme " << scheme << ". Valid schemes are "
                     << "explicit and semiImplicit" << exit(FatalError);
             }
@@ -171,7 +180,7 @@ Foam::scalar Foam::cloudSolution::relaxCoeff(const word& fieldName) const
         }
     }
 
-    FatalErrorIn("scalar cloudSolution::relaxCoeff(const word&) const")
+    FatalErrorInFunction
         << "Field name " << fieldName << " not found in schemes"
         << abort(FatalError);
 
@@ -189,7 +198,7 @@ bool Foam::cloudSolution::semiImplicit(const word& fieldName) const
         }
     }
 
-    FatalErrorIn("bool cloudSolution::semiImplicit(const word&) const")
+    FatalErrorInFunction
         << "Field name " << fieldName << " not found in schemes"
         << abort(FatalError);
 
@@ -229,4 +238,23 @@ bool Foam::cloudSolution::output() const
 }
 
 
+Foam::scalar Foam::cloudSolution::deltaTMax(const scalar trackTime) const
+{
+    if (transient_)
+    {
+        return min(deltaTMax_, maxCo_*trackTime);
+    }
+    else
+    {
+        return min(deltaTMax_, trackTime);
+    }
+}
+
+
+Foam::scalar Foam::cloudSolution::deltaLMax(const scalar lRef) const
+{
+    return maxCo_*lRef;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
index e155abc375..01e5c88025 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,6 +80,9 @@ class cloudSolution
         //- Particle track time
         scalar trackTime_;
 
+        //- Maximum integration time step (optional)
+        scalar deltaTMax_;
+
 
         // Run-time options
 
@@ -171,6 +174,9 @@ public:
             //- Return the particle track time
             inline scalar trackTime() const;
 
+            //- Return the maximum integation time step
+            inline scalar deltaTMax() const;
+
             //- Return const access to the coupled flag
             inline const Switch coupled() const;
 
@@ -207,6 +213,12 @@ public:
 
         //- Returns true if writing this step
         bool output() const;
+
+        //- Return the maximum integration time
+        scalar deltaTMax(const scalar trackTime) const;
+
+        //- Return the maximum integration length
+        scalar deltaLMax(const scalar lRef) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
index 6280b97837..27b0b38fde 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolutionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,6 +101,12 @@ inline Foam::scalar Foam::cloudSolution::trackTime() const
 }
 
 
+inline Foam::scalar Foam::cloudSolution::deltaTMax() const
+{
+    return deltaTMax_;
+}
+
+
 inline Foam::Switch& Foam::cloudSolution::coupled()
 {
     return coupled_;
diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
index 8c7c2cbb55..b5715726b4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,25 +80,15 @@ Foam::MPPICCloud<CloudType>::MPPICCloud
     dampingModel_(NULL),
     isotropyModel_(NULL)
 {
-    if (this->solution().steadyState())
-    {
-        FatalErrorIn
-        (
-            "Foam::MPPICCloud<CloudType>::MPPICCloud"
-            "("
-                "const word&, "
-                "const volScalarField&, "
-                "const volVectorField&, "
-                "const volScalarField&, "
-                "const dimensionedVector&, "
-                "bool"
-            ")"
-        )   << "MPPIC modelling not available for steady state calculations"
-            << exit(FatalError);
-    }
-
     if (this->solution().active())
     {
+        if (this->solution().steadyState())
+        {
+            FatalErrorInFunction
+                << "MPPIC modelling not available for steady state calculations"
+                << exit(FatalError);
+        }
+
         setModels();
 
         if (readFields)
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index f99ac8bbbd..fee005bb29 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,15 +63,8 @@ void Foam::ReactingCloud<CloudType>::checkSuppliedComposition
 {
     if (YSupplied.size() != Y.size())
     {
-        FatalErrorIn
-        (
-            "ReactingCloud<CloudType>::checkSuppliedComposition"
-            "("
-                "const scalarField&, "
-                "const scalarField&, "
-                "const word&"
-            ")"
-        )   << YName << " supplied, but size is not compatible with "
+        FatalErrorInFunction
+            << YName << " supplied, but size is not compatible with "
             << "parcel composition: " << nl << "    "
             << YName << "(" << YSupplied.size() << ") vs required composition "
             << YName << "(" << Y.size() << ")" << nl
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 69666fedde..24c9cc1b9d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,10 +51,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
         ).ptr()
     );
 
-    if (this->solution().coupled())
-    {
-        this->subModelProperties().lookup("radiation") >> radiation_;
-    }
+    this->subModelProperties().lookup("radiation") >> radiation_;
 
     if (radiation_)
     {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index ea1b79f194..ceab06a387 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,11 +103,8 @@ Foam::ThermoCloud<CloudType>::radAreaP()
 {
     if (!radiation_)
     {
-        FatalErrorIn
-        (
-            "inline Foam::DimensionedField<Foam::scalar, Foam::volMesh> "
-            "Foam::ThermoCloud<CloudType>::radAreaP()"
-        )   << "Radiation field requested, but radiation model not active"
+        FatalErrorInFunction
+            << "Radiation field requested, but radiation model not active"
             << abort(FatalError);
     }
 
@@ -121,11 +118,8 @@ Foam::ThermoCloud<CloudType>::radAreaP() const
 {
     if (!radiation_)
     {
-        FatalErrorIn
-        (
-            "inline Foam::DimensionedField<Foam::scalar, Foam::volMesh> "
-            "Foam::ThermoCloud<CloudType>::radAreaP()"
-        )   << "Radiation field requested, but radiation model not active"
+        FatalErrorInFunction
+            << "Radiation field requested, but radiation model not active"
             << abort(FatalError);
     }
 
@@ -139,11 +133,8 @@ Foam::ThermoCloud<CloudType>::radT4()
 {
     if (!radiation_)
     {
-        FatalErrorIn
-        (
-            "inline Foam::DimensionedField<Foam::scalar, Foam::volMesh> "
-            "Foam::ThermoCloud<CloudType>::radT4()"
-        )   << "Radiation field requested, but radiation model not active"
+        FatalErrorInFunction
+            << "Radiation field requested, but radiation model not active"
             << abort(FatalError);
     }
 
@@ -157,11 +148,8 @@ Foam::ThermoCloud<CloudType>::radT4() const
 {
     if (!radiation_)
     {
-        FatalErrorIn
-        (
-            "inline Foam::DimensionedField<Foam::scalar, Foam::volMesh> "
-            "Foam::ThermoCloud<CloudType>::radT4()"
-        )   << "Radiation field requested, but radiation model not active"
+        FatalErrorInFunction
+            << "Radiation field requested, but radiation model not active"
             << abort(FatalError);
     }
 
@@ -175,11 +163,8 @@ Foam::ThermoCloud<CloudType>::radAreaPT4()
 {
     if (!radiation_)
     {
-        FatalErrorIn
-        (
-            "inline Foam::DimensionedField<Foam::scalar, Foam::volMesh> "
-            "Foam::ThermoCloud<CloudType>::radAreaPT4()"
-        )   << "Radiation field requested, but radiation model not active"
+        FatalErrorInFunction
+            << "Radiation field requested, but radiation model not active"
             << abort(FatalError);
     }
 
@@ -193,11 +178,8 @@ Foam::ThermoCloud<CloudType>::radAreaPT4() const
 {
     if (!radiation_)
     {
-        FatalErrorIn
-        (
-            "inline Foam::DimensionedField<Foam::scalar, Foam::volMesh> "
-            "Foam::ThermoCloud<CloudType>::radAreaPT4()"
-        )   << "Radiation field requested, but radiation model not active"
+        FatalErrorInFunction
+            << "Radiation field requested, but radiation model not active"
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
index 36f146d77a..500ac6fb3e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,8 @@ bool Foam::CollidingParcel<ParcelType>::move
     typename TrackData::cloudType::parcelType& p =
         static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
+    td.keepParticle = true;
+
     switch (td.part())
     {
         case TrackData::tpVelocityHalfStep:
@@ -94,17 +96,15 @@ bool Foam::CollidingParcel<ParcelType>::move
 
         case TrackData::tpRotationalTrack:
         {
-            notImplemented("TrackData::tpRotationalTrack");
+            NotImplemented;
 
             break;
         }
 
         default:
         {
-            FatalErrorIn
-            (
-                "CollidingParcel<ParcelType>::move(TrackData&, const scalar)"
-            )   << td.part() << " is an invalid part of the tracking method."
+            FatalErrorInFunction
+                << td.part() << " is an invalid part of the tracking method."
                 << abort(FatalError);
         }
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
index 451e6e225f..d72a7fc49e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,19 +75,7 @@ Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList
      || pairData.size() != nPair
     )
     {
-        FatalErrorIn
-        (
-            "Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList"
-            "("
-                "const labelField& pairAccessed,"
-                "const labelField& pairOrigProcOfOther,"
-                "const labelField& pairOrigIdOfOther,"
-                "const Field<PairType>& pairData,"
-                "const labelField& wallAccessed,"
-                "const vectorField& wallPRel,"
-                "const Field<WallType>& wallData"
-            ")"
-        )
+        FatalErrorInFunction
             << "Pair field size mismatch." << nl
             << pairAccessed << nl
             << pairOrigProcOfOther << nl
@@ -114,19 +102,7 @@ Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList
 
     if (wallPRel.size() != nWall || wallData.size() != nWall)
     {
-        FatalErrorIn
-        (
-            "Foam::CollisionRecordList<PairType, WallType>::CollisionRecordList"
-            "("
-                "const labelField& pairAccessed,"
-                "const labelField& pairOrigProcOfOther,"
-                "const labelField& pairOrigIdOfOther,"
-                "const Field<PairType>& pairData,"
-                "const labelField& wallAccessed,"
-                "const vectorField& wallPRel,"
-                "const Field<WallType>& wallData"
-            ")"
-        )
+        FatalErrorInFunction
             << "Wall field size mismatch." << nl
             << wallAccessed << nl
             << wallPRel << nl
@@ -423,11 +399,7 @@ void Foam::CollisionRecordList<PairType, WallType>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::CollisionRecordList<PairType, WallType>::operator="
-            "(const Foam::CollisionRecordList<PairType, WallType>&)"
-        )
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
index d97da2b223..572e5a41d0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,11 +88,7 @@ void Foam::PairCollisionRecord<Type>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::PairCollisionRecord<Type>::operator="
-            "(const Foam::PairCollisionRecord<Type>&)"
-        )
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
index 3037917b57..3e4470eaf3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,11 +86,7 @@ void Foam::WallCollisionRecord<Type>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::WallCollisionRecord<Type>::operator="
-            "(const Foam::WallCollisionRecord<Type>&)"
-        )
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
index 97ddffe680..cc5031020c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,14 +47,7 @@ inline bool Foam::WallCollisionRecord<Type>::match
             << nl << "cosAcceptanceAngle " << cosAcceptanceAngle
             << endl;
 
-        FatalErrorIn
-        (
-            "inline bool Foam::WallCollisionRecord<Type>::match"
-            "("
-                "const vector& pRel,"
-                "scalar radius"
-            ") const"
-        )
+        FatalErrorInFunction
             << "Problem with matching WallCollisionRecord." << nl
             << "The given radius, " << radius << ", is smaller than distance "
             << "to the relative position of the WallInteractionSite, "
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index f34f4b2f28..8595876eb4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "forceSuSp.H"
 #include "IntegrationScheme.H"
 #include "meshTools.H"
+#include "cloudSolution.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -53,15 +54,8 @@ void Foam::KinematicParcel<ParcelType>::setCellValues
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::KinematicParcel<ParcelType>::setCellValues"
-                "("
-                    "TrackData&, "
-                    "const scalar, "
-                    "const label"
-                ")"
-            )   << "Limiting observed density in cell " << cellI << " to "
+            WarningInFunction
+                << "Limiting observed density in cell " << cellI << " to "
                 << td.cloud().constProps().rhoMin() <<  nl << endl;
         }
 
@@ -271,15 +265,11 @@ bool Foam::KinematicParcel<ParcelType>::move
 
     const polyMesh& mesh = td.cloud().pMesh();
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
+    const cloudSolution& solution = td.cloud().solution();
     const scalarField& cellLengthScale = td.cloud().cellLengthScale();
-    const scalar maxCo = td.cloud().solution().maxCo();
 
     scalar tEnd = (1.0 - p.stepFraction())*trackTime;
-    scalar dtMax = trackTime;
-    if (td.cloud().solution().transient())
-    {
-        dtMax *= maxCo;
-    }
+    scalar dtMax = solution.deltaTMax(trackTime);
 
     bool tracking = true;
     label nTrackingStalled = 0;
@@ -301,7 +291,8 @@ bool Foam::KinematicParcel<ParcelType>::move
         if (p.active() && tracking && (magU > ROOTVSMALL))
         {
             const scalar d = dt*magU;
-            const scalar dCorr = min(d, maxCo*cellLengthScale[cellI]);
+            const scalar deltaLMax = solution.deltaLMax(cellLengthScale[cellI]);
+            const scalar dCorr = min(d, deltaLMax);
             dt *=
                 dCorr/d
                *p.trackToFace(p.position() + dCorr*U_/magU, td);
@@ -309,7 +300,7 @@ bool Foam::KinematicParcel<ParcelType>::move
 
         tEnd -= dt;
 
-        scalar newStepFraction = 1.0 - tEnd/trackTime;
+        const scalar newStepFraction = 1.0 - tEnd/trackTime;
 
         if (tracking)
         {
@@ -335,7 +326,7 @@ bool Foam::KinematicParcel<ParcelType>::move
         p.stepFraction() = newStepFraction;
 
         bool calcParcel = true;
-        if (!tracking && td.cloud().solution().steadyState())
+        if (!tracking && solution.steadyState())
         {
             calcParcel = false;
         }
@@ -346,7 +337,7 @@ bool Foam::KinematicParcel<ParcelType>::move
             // Update cell based properties
             p.setCellValues(td, dt, cellI);
 
-            if (td.cloud().solution().cellValueSourceCorrection())
+            if (solution.cellValueSourceCorrection())
             {
                 p.cellValueSourceCorrection(td, dt, cellI);
             }
@@ -466,6 +457,8 @@ void Foam::KinematicParcel<ParcelType>::hitPatch
 )
 {
     td.keepParticle = false;
+
+    td.cloud().patchInteraction().addToEscapedParcels(nParticle_*mass());
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 289127b18b..5516e7c947 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -121,7 +121,13 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
 
     YMix[GAS] = massGas/massNew;
     YMix[LIQ] = massLiquid/massNew;
-    YMix[SLD] = 1.0 - YMix[GAS] - YMix[LIQ];
+    YMix[SLD] = massSolid/massNew;
+
+    scalar Ytotal = sum(YMix);
+
+    YMix[GAS] /= Ytotal;
+    YMix[LIQ] /= Ytotal;
+    YMix[SLD] /= Ytotal;
 
     return massNew;
 }
@@ -169,7 +175,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const CompositionModel<reactingCloudType>& composition =
         td.cloud().composition();
 
-
     // Define local properties at beginning of timestep
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -285,7 +290,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         Cs
     );
 
-
     // Surface reactions
     // ~~~~~~~~~~~~~~~~~
 
@@ -318,27 +322,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         dhsTrans
     );
 
-
     // 2. Update the parcel properties due to change in mass
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     scalarField dMassGas(dMassDV + dMassSRGas);
     scalarField dMassLiquid(dMassPC + dMassSRLiquid);
     scalarField dMassSolid(dMassSRSolid);
-    scalar mass1 =
-        updateMassFractions(mass0, dMassGas, dMassLiquid, dMassSolid);
 
-    this->Cp_ = CpEff(td, pc, T0, idG, idL, idS);
-
-    // Update particle density or diameter
-    if (td.cloud().constProps().constantVolume())
-    {
-        this->rho_ = mass1/this->volume();
-    }
-    else
-    {
-        this->d_ = cbrt(mass1/this->rho_*6.0/pi);
-    }
+    scalar mass1 = mass0 - sum(dMassGas) - sum(dMassLiquid) - sum(dMassSolid);
 
     // Remove the particle when mass falls below minimum threshold
     if (np0*mass1 < td.cloud().constProps().minParcelMass())
@@ -380,6 +371,18 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         return;
     }
 
+    (void)updateMassFractions(mass0, dMassGas, dMassLiquid, dMassSolid);
+
+     // Update particle density or diameter
+    if (td.cloud().constProps().constantVolume())
+    {
+        this->rho_ = mass1/this->volume();
+    }
+    else
+    {
+        this->d_ = cbrt(mass1/this->rho_*6.0/pi);
+    }
+
     // Correct surface values due to emitted species
     this->correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
     Res = this->Re(U0, this->d_, rhos, mus);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 6bcd5c52b9..ee14895298 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,11 +157,8 @@ hRetentionCoeff() const
 
     if ((value < 0) || (value > 1))
     {
-        FatalErrorIn
-        (
-            "ReactingMultiphaseParcel<ParcelType>::constantProperties::"
-            "constantProperties"
-        )   << "hRetentionCoeff must be in the range 0 to 1" << nl
+        FatalErrorInFunction
+            << "hRetentionCoeff must be in the range 0 to 1" << nl
             << exit(FatalError) << endl;
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index f94c19f396..b5b7f1cf1f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -219,15 +219,8 @@ void Foam::ReactingParcel<ParcelType>::setCellValues
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::ReactingParcel<ParcelType>::setCellValues"
-                "("
-                    "TrackData&, "
-                    "const scalar, "
-                    "const label"
-                ")"
-            )   << "Limiting observed pressure in cell " << cellI << " to "
+            WarningInFunction
+                << "Limiting observed pressure in cell " << cellI << " to "
                 << td.cloud().constProps().pMin() <<  nl << endl;
         }
 
@@ -287,16 +280,8 @@ void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::ReactingParcel<ParcelType>::"
-                "cellValueSourceCorrection"
-                "("
-                    "TrackData&, "
-                    "const scalar, "
-                    "const label"
-                ")"
-            )   << "Limiting observed temperature in cell " << cellI << " to "
+            WarningInFunction
+                << "Limiting observed temperature in cell " << cellI << " to "
                 << td.cloud().constProps().TMin() <<  nl << endl;
         }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 4198420d38..98e0c16756 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -51,15 +51,8 @@ void Foam::ThermoParcel<ParcelType>::setCellValues
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::ThermoParcel<ParcelType>::setCellValues"
-                "("
-                    "TrackData&, "
-                    "const scalar, "
-                    "const label"
-                ")"
-            )   << "Limiting observed temperature in cell " << cellI << " to "
+            WarningInFunction
+                << "Limiting observed temperature in cell " << cellI << " to "
                 << td.cloud().constProps().TMin() <<  nl << endl;
         }
 
@@ -80,21 +73,17 @@ void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection
     this->Uc_ += td.cloud().UTrans()[cellI]/this->massCell(cellI);
 
     const scalar CpMean = td.CpInterp().psi()[cellI];
+
+    tetIndices tetIs = this->currentTetIndices();
+    Tc_ = td.TInterp().interpolate(this->position(), tetIs);
     Tc_ += td.cloud().hsTrans()[cellI]/(CpMean*this->massCell(cellI));
 
     if (Tc_ < td.cloud().constProps().TMin())
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection"
-                "("
-                    "TrackData&, "
-                    "const scalar, "
-                    "const label"
-                ")"
-            )   << "Limiting observed temperature in cell " << cellI << " to "
+            WarningInFunction
+                << "Limiting observed temperature in cell " << cellI << " to "
                 << td.cloud().constProps().TMin() <<  nl << endl;
         }
 
@@ -124,20 +113,8 @@ void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::ThermoParcel<ParcelType>::calcSurfaceValues"
-                "("
-                    "TrackData&, "
-                    "const label, "
-                    "const scalar, "
-                    "scalar&, "
-                    "scalar&, "
-                    "scalar&, "
-                    "scalar&, "
-                    "scalar&"
-                ") const"
-            )   << "Limiting parcel surface temperature to "
+            WarningInFunction
+                << "Limiting parcel surface temperature to "
                 << td.cloud().constProps().TMin() <<  nl << endl;
         }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
index 5b0c42ed87..22d7ccf85a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,12 +127,8 @@ Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::GInterp() const
 {
     if (!GInterp_.valid())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::interpolation<Foam::scalar>&"
-            "Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::"
-            "GInterp() const"
-        )   << "Radiation G interpolation object not set"
+        FatalErrorInFunction
+            << "Radiation G interpolation object not set"
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index 783878f480..a181ae19b1 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,6 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "CloudToVTK.H"
 #include "FacePostProcessing.H"
 #include "ParticleCollector.H"
 #include "ParticleErosion.H"
@@ -42,6 +43,7 @@ License
                                                                               \
     makeCloudFunctionObject(CloudType);                                       \
                                                                               \
+    makeCloudFunctionObjectType(CloudToVTK, CloudType);                       \
     makeCloudFunctionObjectType(FacePostProcessing, CloudType);               \
     makeCloudFunctionObjectType(ParticleCollector, CloudType);                \
     makeCloudFunctionObjectType(ParticleErosion, CloudType);                  \
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 691815e2cd..3041ab5c54 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -90,10 +90,8 @@ void Foam::phaseProperties::reorder(const wordList& specieNames)
 
         if (!found)
         {
-            FatalErrorIn
-            (
-                "void phaseProperties::reorder(const wordList&)"
-            )   << "Could not find specie " << names0[i]
+            FatalErrorInFunction
+                << "Could not find specie " << names0[i]
                 << " in list " <<  names_
                 << " for phase " << phaseTypeNames[phase_]
                 << exit(FatalError);
@@ -121,11 +119,8 @@ void Foam::phaseProperties::setCarrierIds
         }
         if (carrierIds_[i] == -1)
         {
-            FatalErrorIn
-            (
-                "void phaseProperties::setCarrierIds"
-                "(const wordList& carrierNames)"
-            )   << "Could not find carrier specie " << names_[i]
+            FatalErrorInFunction
+                << "Could not find carrier specie " << names_[i]
                 << " in species list" <<  nl
                 << "Available species are: " << nl << carrierNames << nl
                 << exit(FatalError);
@@ -144,10 +139,8 @@ void Foam::phaseProperties::checkTotalMassFraction() const
 
     if (Y_.size() != 0 && mag(total - 1.0) > SMALL)
     {
-        FatalErrorIn
-        (
-            "void phaseProperties::checkTotalMassFraction() const"
-        )   << "Specie fractions must total to unity for phase "
+        FatalErrorInFunction
+            << "Specie fractions must total to unity for phase "
             << phaseTypeNames[phase_] << nl
             << "Species: " << nl << names_ << nl
             << exit(FatalError);
@@ -177,10 +170,8 @@ Foam::word Foam::phaseProperties::phaseToStateLabel(const phaseType pt) const
         }
         default:
         {
-            FatalErrorIn
-            (
-                "phaseProperties::phaseToStateLabel(phaseType pt)"
-            )   << "Invalid phase: " << phaseTypeNames[pt] << nl
+            FatalErrorInFunction
+                << "Invalid phase: " << phaseTypeNames[pt] << nl
                 << "    phase must be gas, liquid or solid" << nl
                 << exit(FatalError);
         }
@@ -258,15 +249,8 @@ void Foam::phaseProperties::reorder
         }
         default:
         {
-            FatalErrorIn
-            (
-                "phaseProperties::reorder"
-                "("
-                    "const wordList& gasNames, "
-                    "const wordList& liquidNames, "
-                    "const wordList& solidNames"
-                ")"
-            )   << "Invalid phase: " << phaseTypeNames[phase_] << nl
+            FatalErrorInFunction
+                << "Invalid phase: " << phaseTypeNames[phase_] << nl
                 << "    phase must be gas, liquid or solid" << nl
                 << exit(FatalError);
         }
@@ -302,10 +286,8 @@ const Foam::word& Foam::phaseProperties::name(const label speciei) const
 {
     if (speciei >= names_.size())
     {
-        FatalErrorIn
-        (
-            "const word& phaseProperties::name(const label) const"
-        )   << "Requested specie " << speciei << "out of range" << nl
+        FatalErrorInFunction
+            << "Requested specie " << speciei << "out of range" << nl
             << "Available phase species:" << nl << names_ << nl
             << exit(FatalError);
     }
@@ -324,10 +306,8 @@ Foam::scalar& Foam::phaseProperties::Y(const label speciei)
 {
     if (speciei >= Y_.size())
     {
-        FatalErrorIn
-        (
-            "const scalar& phaseProperties::Y(const label) const"
-        )   << "Requested specie " << speciei << "out of range" << nl
+        FatalErrorInFunction
+            << "Requested specie " << speciei << "out of range" << nl
             << "Available phase species:" << nl << names_ << nl
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
index b0399c5acf..bf79b15c21 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class CloudType>
 void Foam::CloudFunctionObject<CloudType>::write()
 {
-    notImplemented("void Foam::CloudFunctionObject<CloudType>::write()");
+    NotImplemented;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
index f105d6b3cb..dd9b77145e 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,16 +45,8 @@ Foam::CloudFunctionObject<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "CloudFunctionObject<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&, "
-                "const word&, "
-                "const word&"
-            ")"
-        )   << "Unknown cloud function type "
+        FatalErrorInFunction
+            << "Unknown cloud function type "
             << objectType << nl << nl
             << "Valid cloud function types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C
new file mode 100644
index 0000000000..240154edf3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CloudToVTK.H"
+#include "vtkTools.H"
+#include "floatScalar.H"
+
+// * * * * * * * * * * * * * Protectd Member Functions * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::CloudToVTK<CloudType>::writeData
+(
+    std::ostream& vtkOs,
+    const bool binary,
+    const List<floatScalar>& data
+) const
+{
+    const label procI = Pstream::myProcNo();
+
+    List<List<floatScalar> > allProcData(Pstream::nProcs());
+    allProcData[procI] = data;
+    Pstream::gatherList(allProcData);
+    List<floatScalar> allData =
+        ListListOps::combine<List<floatScalar> >
+        (
+            allProcData,
+            accessOp<List<floatScalar> >()
+        );
+
+    vtkTools::write(vtkOs, binary, allData);
+}
+
+
+template<class CloudType>
+template<class Type>
+void Foam::CloudToVTK<CloudType>::writeFieldData
+(
+    std::ostream& vtkOs,
+    const bool binary,
+    const List<floatScalar>& data,
+    const word& title,
+    const label nParcels
+) const
+{
+    vtkOs
+        << title << ' ' << pTraits<Type>::nComponents << ' '
+        << nParcels << " float" << std::endl;
+    writeData(vtkOs, binary, data);
+}
+
+
+template<class CloudType>
+void Foam::CloudToVTK<CloudType>::write()
+{
+    label nParcels = this->owner().size();
+    DynamicList<floatScalar> position(3*nParcels);
+    DynamicList<floatScalar> U(3*nParcels);
+    DynamicList<floatScalar> d(nParcels);
+    DynamicList<floatScalar> age(nParcels);
+    DynamicList<floatScalar> rho(nParcels);
+
+    forAllConstIter(typename CloudType, this->owner(), iter)
+    {
+        vtkTools::insert(iter().position(), position);
+        vtkTools::insert(iter().U(), U);
+        vtkTools::insert(iter().d(), d);
+        vtkTools::insert(iter().age(), age);
+        vtkTools::insert(iter().rho(), rho);
+    }
+
+    reduce(nParcels, sumOp<label>());
+
+
+binary_ = false;
+    if (Pstream::master())
+    {
+        // Create directory if does not exist
+        mkDir(this->outputTimeDir());
+
+        // Open new file at start up
+
+        const fileName fName = this->outputTimeDir()/(type() + ".vtk");
+        this->setModelProperty("file", fName);
+
+        OFstream os(fName, binary_ ? IOstream::BINARY : IOstream::ASCII);
+        std::ostream& vtkOs = os.stdStream();
+
+
+        vtkTools::writeHeader(vtkOs, binary_, this->modelName().c_str());
+        vtkOs
+            << "DATASET POLYDATA" << std::endl
+            << "POINTS " << nParcels << " float" << std::endl;
+
+        writeData(vtkOs, binary_, position);
+
+        vtkOs
+            << "POINT_DATA " << nParcels << std::endl
+            << "FIELD attributes " << 4
+            << std::endl;
+
+        writeFieldData<vector>(vtkOs, binary_, U, "U", nParcels);
+        writeFieldData<scalar>(vtkOs, binary_, d, "d", nParcels);
+        writeFieldData<scalar>(vtkOs, binary_, age, "age", nParcels);
+        writeFieldData<scalar>(vtkOs, binary_, rho, "rho", nParcels);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CloudToVTK<CloudType>::CloudToVTK
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& modelName
+)
+:
+    CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
+    binary_(dict.lookupOrDefault<bool>("binary", true))
+{}
+
+
+template<class CloudType>
+Foam::CloudToVTK<CloudType>::CloudToVTK
+(
+    const CloudToVTK<CloudType>& c
+)
+:
+    CloudFunctionObject<CloudType>(c),
+    binary_(c.binary_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CloudToVTK<CloudType>::~CloudToVTK()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H
new file mode 100644
index 0000000000..13a68f1879
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::CloudToVTK
+
+Description
+    Write cloud data in VTK format
+
+SourceFiles
+    CloudToVTK.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CloudToVTK_H
+#define CloudToVTK_H
+
+#include "CloudFunctionObject.H"
+#include "volFields.H"
+#include "OFstream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class CloudToVTK Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class CloudToVTK
+:
+    public CloudFunctionObject<CloudType>
+{
+
+protected:
+
+    // Protected data
+
+        //- Ascii/binary output flag
+        bool binary_;
+
+
+    // Protected Member Functions
+
+        //- Write post-processing info
+        virtual void write();
+
+        //- Helper function to write VTK data
+        void writeData
+        (
+            std::ostream& vtkOs,
+            const bool binary,
+            const List<floatScalar>& data
+        ) const;
+
+        //- Helper function to write VTK field data
+        template<class Type>
+        void writeFieldData
+        (
+            std::ostream& vtkOs,
+            const bool binary,
+            const List<floatScalar>& data,
+            const word& title,
+            const label nParcels
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cloudToVTK");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        CloudToVTK
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& modelName
+        );
+
+        //- Construct copy
+        CloudToVTK(const CloudToVTK<CloudType>& c);
+
+        //- Construct and return a clone
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        {
+            return autoPtr<CloudFunctionObject<CloudType> >
+            (
+                new CloudToVTK<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~CloudToVTK();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CloudToVTK.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.C
new file mode 100644
index 0000000000..71de625526
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.C
@@ -0,0 +1,287 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vtkTools.H"
+
+#if defined(__mips)
+#include <standards.h>
+#include <sys/endian.h>
+#endif
+
+// MacOSX
+#ifdef __DARWIN_BYTE_ORDER
+#if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN
+#undef LITTLE_ENDIAN
+#else
+#undef BIG_ENDIAN
+#endif
+#endif
+
+#if defined(LITTLE_ENDIAN) \
+ || defined(_LITTLE_ENDIAN) \
+ || defined(__LITTLE_ENDIAN)
+#   define LITTLEENDIAN 1
+#elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN)
+#   undef LITTLEENDIAN
+#else
+#   error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined."
+#   error "Please add to compilation options"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+void Foam::vtkTools::swapWord(label& word32)
+{
+    char* mem = reinterpret_cast<char*>(&word32);
+
+    char a = mem[0];
+    mem[0] = mem[3];
+    mem[3] = a;
+
+    a = mem[1];
+    mem[1] = mem[2];
+    mem[2] = a;
+}
+
+
+void Foam::vtkTools::swapWords(const label nWords, label* words32)
+{
+    for (label i = 0; i < nWords; i++)
+    {
+        swapWord(words32[i]);
+    }
+}
+
+
+void Foam::vtkTools::write
+(
+    std::ostream& os,
+    const bool binary,
+    List<floatScalar>& fField
+)
+{
+    if (binary)
+    {
+#       ifdef LITTLEENDIAN
+        swapWords(fField.size(), reinterpret_cast<label*>(fField.begin()));
+#       endif
+        os.write
+        (
+            reinterpret_cast<char*>(fField.begin()),
+            fField.size()*sizeof(float)
+        );
+
+        os  << std::endl;
+    }
+    else
+    {
+        forAll(fField, i)
+        {
+            os  << fField[i];
+
+            if (i > 0 && (i % 10) == 0)
+            {
+                os  << std::endl;
+            }
+            else
+            {
+                os  << ' ';
+            }
+        }
+        os  << std::endl;
+    }
+}
+
+
+void Foam::vtkTools::write
+(
+    std::ostream& os,
+    const bool binary,
+    DynamicList<floatScalar>& fField
+)
+{
+    List<floatScalar>& fld = fField.shrink();
+
+    write(os, binary, fld);
+}
+
+
+void Foam::vtkTools::write
+(
+    std::ostream& os,
+    const bool binary,
+    labelList& elems
+)
+{
+    if (binary)
+    {
+#       ifdef LITTLEENDIAN
+        swapWords(elems.size(), reinterpret_cast<label*>(elems.begin()));
+#       endif
+        os.write
+        (
+            reinterpret_cast<char*>(elems.begin()),
+            elems.size()*sizeof(label)
+        );
+
+        os  << std::endl;
+    }
+    else
+    {
+        forAll(elems, i)
+        {
+            os  << elems[i];
+
+            if (i > 0 && (i % 10) == 0)
+            {
+                os  << std::endl;
+            }
+            else
+            {
+                os  << ' ';
+            }
+        }
+        os  << std::endl;
+    }
+}
+
+
+void Foam::vtkTools::write
+(
+    std::ostream& os,
+    const bool binary,
+    DynamicList<label>& elems
+)
+{
+    labelList& fld = elems.shrink();
+
+    write(os, binary, fld);
+}
+
+
+void Foam::vtkTools::writeHeader
+(
+    std::ostream& os,
+    const bool binary,
+    const std::string& title
+)
+{
+    os  << "# vtk DataFile Version 2.0" << std::endl
+        << title << std::endl;
+
+    if (binary)
+    {
+        os  << "BINARY" << std::endl;
+    }
+    else
+    {
+        os  << "ASCII" << std::endl;
+    }
+}
+
+
+void Foam::vtkTools::writeCellDataHeader
+(
+    std::ostream& os,
+    const label nCells,
+    const label nFields
+)
+{
+    os  << "CELL_DATA " << nCells << std::endl
+        << "FIELD attributes " << nFields << std::endl;
+}
+
+
+void Foam::vtkTools::writePointDataHeader
+(
+    std::ostream& os,
+    const label nPoints,
+    const label nFields
+)
+{
+    os  << "POINT_DATA  " << nPoints << std::endl
+        << "FIELD attributes " << nFields << std::endl;
+}
+
+
+void Foam::vtkTools::insert(const scalar src, DynamicList<floatScalar>& dest)
+{
+    dest.append(float(src));
+}
+
+
+void Foam::vtkTools::insert(const vector& src, DynamicList<floatScalar>& dest)
+{
+    for (direction cmpt = 0; cmpt < vector::nComponents; ++cmpt)
+    {
+        dest.append(float(src[cmpt]));
+    }
+}
+
+
+void Foam::vtkTools::insert
+(
+    const sphericalTensor& src,
+    DynamicList<floatScalar>& dest
+)
+{
+    for (direction cmpt = 0; cmpt < sphericalTensor::nComponents; ++cmpt)
+    {
+        dest.append(float(src[cmpt]));
+    }
+}
+
+
+void Foam::vtkTools::insert
+(
+    const symmTensor& src,
+    DynamicList<floatScalar>& dest
+)
+{
+    dest.append(float(src.xx()));
+    dest.append(float(src.yy()));
+    dest.append(float(src.zz()));
+    dest.append(float(src.xy()));
+    dest.append(float(src.yz()));
+    dest.append(float(src.xz()));
+}
+
+
+void Foam::vtkTools::insert(const tensor& src, DynamicList<floatScalar>& dest)
+{
+    for (direction cmpt = 0; cmpt < tensor::nComponents; ++cmpt)
+    {
+        dest.append(float(src[cmpt]));
+    }
+}
+
+
+void Foam::vtkTools::insert(const labelList& src, DynamicList<label>& dest)
+{
+    dest.append(src);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.H
new file mode 100644
index 0000000000..12bdda1f38
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkTools.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::vtkTools
+
+Description
+    Various functions for collecting and writing binary data.
+
+SourceFiles
+    vtkTools.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vtkTools_H
+#define vtkTools_H
+
+#include "floatScalar.H"
+#include "DynamicList.H"
+#include "volFieldsFwd.H"
+#include "pointFieldsFwd.H"
+#include "volPointInterpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class vtkTools Declaration
+\*---------------------------------------------------------------------------*/
+
+class vtkTools
+{
+    // Private Member Functions
+
+        // Swap halves of word.
+
+            static void swapWord(label& word32);
+            static void swapWords(const label nWords, label* words32);
+
+
+public:
+
+    // Write ascii or binary. If binary optionally in-place swaps argument
+
+        static void write(std::ostream&, const bool, List<floatScalar>&);
+        static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
+        static void write(std::ostream&, const bool, labelList&);
+        static void write(std::ostream&, const bool, DynamicList<label>&);
+
+
+    // Write header
+
+        static void writeHeader
+        (
+            std::ostream&,
+            const bool isBinary,
+            const std::string& title
+        );
+        static void writeCellDataHeader
+        (
+            std::ostream&,
+            const label nCells,
+            const label nFields
+        );
+        static void writePointDataHeader
+        (
+            std::ostream&,
+            const label nPoints,
+            const label nFields
+        );
+
+
+    // Convert to VTK and store
+
+        static void insert(const scalar, DynamicList<floatScalar>&);
+        static void insert(const point&, DynamicList<floatScalar>&);
+        static void insert(const sphericalTensor&, DynamicList<floatScalar>&);
+        static void insert(const symmTensor&, DynamicList<floatScalar>&);
+        static void insert(const tensor&, DynamicList<floatScalar>&);
+
+
+    //- Append elements to DynamicList
+    static void insert(const labelList&, DynamicList<label>&);
+
+    template<class Type>
+    static void insert(const List<Type>&, DynamicList<floatScalar>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "vtkToolsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkToolsTemplates.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkToolsTemplates.C
new file mode 100644
index 0000000000..53ea67e398
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/vtkToolsTemplates.C
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vtkTools.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::vtkTools::insert
+(
+    const List<Type>& source,
+    DynamicList<floatScalar>& dest
+)
+{
+    forAll(source, i)
+    {
+        insert(source[i], dest);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index bf347c9f30..42d4c7a33d 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,11 +119,7 @@ void Foam::ParticleCollector<CloudType>::initPolygons
         label np = polygons[polyI].size();
         if (np < 3)
         {
-            FatalIOErrorIn
-            (
-                "Foam::ParticleCollector<CloudType>::initPolygons()",
-                this->coeffDict()
-            )
+            FatalIOErrorInFunction(this->coeffDict())
                 << "polygons must consist of at least 3 points"
                 << exit(FatalIOError);
         }
@@ -457,7 +453,15 @@ void Foam::ParticleCollector<CloudType>::write()
     {
         if (Pstream::master())
         {
-            autoPtr<surfaceWriter> writer(surfaceWriter::New(surfaceFormat_));
+            autoPtr<surfaceWriter> writer
+            (
+                surfaceWriter::New
+                (
+                    surfaceFormat_,
+                    this->coeffDict().subOrEmptyDict("formatOptions").
+                        subOrEmptyDict(surfaceFormat_)
+                )
+            );
 
             writer->write
             (
@@ -584,16 +588,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
     }
     else
     {
-        FatalIOErrorIn
-        (
-            "Foam::ParticleCollector<CloudType>::ParticleCollector"
-            "("
-                "const dictionary&,"
-                "CloudType&, "
-                "const word&"
-            ")",
-            this->coeffDict()
-        )
+        FatalIOErrorInFunction(this->coeffDict())
             << "Unknown mode " << mode << ".  Available options are "
             << "polygon, polygonWithNormal and concentricCircle"
             << exit(FatalIOError);
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index f4fd96bb17..d4d90fbf6e 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ void Foam::ParticleErosion<CloudType>::write()
     }
     else
     {
-        FatalErrorIn("void Foam::ParticleErosion<CloudType>::write()")
+        FatalErrorInFunction
             << "QPtr not valid" << abort(FatalError);
     }
 }
@@ -87,14 +87,8 @@ Foam::ParticleErosion<CloudType>::ParticleErosion
 
         if (patchIDs.empty())
         {
-            WarningIn
-            (
-                "Foam::ParticleErosion<CloudType>::ParticleErosion"
-                "("
-                    "const dictionary&, "
-                    "CloudType& "
-                ")"
-            )   << "Cannot find any patch names matching " << patchName[i]
+            WarningInFunction
+                << "Cannot find any patch names matching " << patchName[i]
                 << endl;
         }
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index 856ace872a..b1057c92bc 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,14 +125,8 @@ void Foam::ParticleTracks<CloudType>::postFace
     {
         if (!cloudPtr_.valid())
         {
-            FatalErrorIn
-            (
-                "Foam::ParticleTracks<CloudType>::postFace"
-                "("
-                    "const parcelType&, "
-                    "const label"
-                ")"
-            )<< "Cloud storage not allocated" << abort(FatalError);
+            FatalErrorInFunction
+             << "Cloud storage not allocated" << abort(FatalError);
         }
 
         hitTableType::iterator iter =
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index dc60b4206e..d037b32b61 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,14 +144,8 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
 
         if (patchIDs.empty())
         {
-            WarningIn
-            (
-                "Foam::PatchPostProcessing<CloudType>::PatchPostProcessing"
-                "("
-                    "const dictionary&, "
-                    "CloudType& "
-                ")"
-            )   << "Cannot find any patch names matching " << patchName[i]
+            WarningInFunction
+                << "Cannot find any patch names matching " << patchName[i]
                 << endl;
         }
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
index 7314d531ba..d8ea47cd74 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ void Foam::VoidFraction<CloudType>::write()
     }
     else
     {
-        FatalErrorIn("void Foam::VoidFraction<CloudType>::write()")
+        FatalErrorInFunction
             << "thetaPtr not valid" << abort(FatalError);
     }
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
index 03a1b80595..5c0d407586 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::CollisionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "CollisionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown collision model type " << modelType
+        FatalErrorInFunction
+            << "Unknown collision model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid collision model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 9a5e199416..185bfb2f52 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -608,13 +608,7 @@ Foam::PairCollision<CloudType>::PairCollision
     il_(cm.owner().mesh())
 {
     // Need to clone to PairModel and WallModel
-    notImplemented
-    (
-        "Foam::PairCollision<CloudType>::PairCollision"
-        "("
-            "PairCollision<CloudType>& cm"
-        ")"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
index 612c0983d4..f06dcbd813 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::PairModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PairModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown pair model type "
+        FatalErrorInFunction
+            << "Unknown pair model type "
             << PairModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid pair model types are:" << nl
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
index f5e4b31ff9..01336c8518 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -41,7 +41,7 @@ Description
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                    Class PairSpringSliderDashpot Declaration
+                   Class PairSpringSliderDashpot Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -71,7 +71,7 @@ class PairSpringSliderDashpot
         //- Cohesion energy density [J/m^3]
         scalar cohesionEnergyDensity_;
 
-        // Switch cohesion on and off
+        //- Switch cohesion on and off
         bool cohesion_;
 
         //- The number of steps over which to resolve the minimum
@@ -104,7 +104,7 @@ class PairSpringSliderDashpot
     // Private Member Functions
 
         //- Find the appropriate properties for determining the minimum
-        //- Allowable timestep
+        //  allowable timestep
         void findMinMaxProperties
         (
             scalar& RMin,
@@ -136,8 +136,8 @@ public:
             return volumeFactor_;
         }
 
-        // Return the area of overlap between two spheres of radii rA and rB,
-        // centres separated by a distance rAB.  Assumes rAB < (rA + rB).
+        //- Return the area of overlap between two spheres of radii rA and rB,
+        //  centres separated by a distance rAB.  Assumes rAB < (rA + rB).
         inline scalar overlapArea(scalar rA, scalar rB, scalar rAB) const
         {
             // From:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
index e48e949f57..699c9cda2c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H
@@ -68,7 +68,7 @@ class WallLocalSpringSliderDashpot
         //- Cohesion energy density [J/m^3]
         scalarList cohesionEnergyDensity_;
 
-        // Switch cohesion on and off
+        //- Switch cohesion on and off
         boolList cohesion_;
 
         //- Mapping the patch index to the model data
@@ -107,7 +107,7 @@ class WallLocalSpringSliderDashpot
     // Private Member Functions
 
         //- Find the appropriate properties for determining the minimum
-        //- Allowable timestep
+        //  allowable timestep
         void findMinMaxProperties
         (
             scalar& rMin,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
index 65ab04f35d..f53ffd0094 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::WallModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "WallModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown wall model type type " << WallModelType
+        FatalErrorInFunction
+            << "Unknown wall model type type " << WallModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid wall model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
index 88dca9b66c..0087d01197 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -101,7 +101,7 @@ class WallSpringSliderDashpot
     // Private Member Functions
 
         //- Find the appropriate properties for determining the minimum
-        //- Allowable timestep
+        //  allowable timestep
         void findMinMaxProperties
         (
             scalar& rMin,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
index 68aa221a1b..7a3ddd9810 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::DispersionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "DispersionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown dispersion model type "
+        FatalErrorInFunction
+            << "Unknown dispersion model type "
             << modelType << nl << nl
             << "Valid dispersion model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
index cb2084c658..c6375d1dd9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -204,7 +204,7 @@ Foam::CellZoneInjection<CloudType>::CellZoneInjection
     injectorTetPts_(im.injectorTetPts_),
     diameters_(im.diameters_),
     U0_(im.U0_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr())
+    sizeDistribution_(im.sizeDistribution_, false)
 {}
 
 
@@ -226,7 +226,7 @@ void Foam::CellZoneInjection<CloudType>::updateMesh()
 
     if (zoneI < 0)
     {
-        FatalErrorIn("Foam::CellZoneInjection<CloudType>::updateMesh()")
+        FatalErrorInFunction
             << "Unknown cell zone name: " << cellZoneName_
             << ". Valid cell zones are: " << mesh.cellZones().names()
             << nl << exit(FatalError);
@@ -242,7 +242,7 @@ void Foam::CellZoneInjection<CloudType>::updateMesh()
 
     if ((nCellsTotal == 0) || (VCellsTotal*numberDensity_ < 1))
     {
-        WarningIn("Foam::CellZoneInjection<CloudType>::updateMesh()")
+        WarningInFunction
             << "Number of particles to be added to cellZone " << cellZoneName_
             << " is zero" << endl;
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
index 9edd88736e..ece119404d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
@@ -27,10 +27,12 @@ Class
 Description
     Injection positions specified by a particle number density within a cell set
 
-    - User specifies
-      - Number density of particles in cell set (effective)
-      - Total mass to inject
-      - Initial parcel velocity
+    User specifies
+    - Number density of particles in cell set (effective)
+    - Total mass to inject
+    - Initial parcel velocity
+
+    Additional
     - Parcel diameters obtained by PDF model
     - All parcels introduced at SOI
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index d71e1b070e..0cca8f321e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -147,7 +147,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     Umag_(im.Umag_),
     thetaInner_(im.thetaInner_),
     thetaOuter_(im.thetaOuter_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr()),
+    sizeDistribution_(im.sizeDistribution_, false),
     nInjected_(im.nInjected_),
     tanVec1_(im.tanVec1_),
     tanVec2_(im.tanVec2_)
@@ -203,8 +203,6 @@ Foam::label Foam::ConeInjection<CloudType>::parcelsToInject
 
         const label nToInject = targetParcels - nInjected_;
 
-        nInjected_ += nToInject;
-
         return positionAxis_.size()*nToInject;
     }
     else
@@ -264,7 +262,7 @@ void Foam::ConeInjection<CloudType>::setProperties
 {
     cachedRandom& rnd = this->owner().rndGen();
 
-    // set particle velocity
+    // Set particle velocity
     const label i = parcelI % positionAxis_.size();
 
     scalar t = time - this->SOI_;
@@ -283,8 +281,11 @@ void Foam::ConeInjection<CloudType>::setProperties
 
     parcel.U() = Umag_.value(t)*dirVec;
 
-    // set particle diameter
+    // Set particle diameter
     parcel.d() = sizeDistribution_().sample();
+
+    // Increment number of particles injected
+    nInjected_++;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index f45fd4a4f0..56519243e4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -26,12 +26,15 @@ Class
 
 Description
     Multi-point cone injection model
-    - User specifies
-      - time of start of injection
-      - list of injector positions and directions (along injection axes)
-      - number of parcels to inject per injector
-      - parcel velocities
-      - inner and outer half-cone angles
+
+    User specifies
+    - time of start of injection
+    - list of injector positions and directions (along injection axes)
+    - number of parcels to inject per injector
+    - parcel velocities
+    - inner and outer half-cone angles
+
+    Additional
     - Parcel diameters obtained by distribution model
 
 SourceFiles
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 97c3c819a0..c748a8684b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,7 @@ void Foam::ConeNozzleInjection<CloudType>::setInjectionMethod()
     }
     else
     {
-        FatalErrorIn("Foam::InjectionModel<CloudType>::setInjectionMethod()")
+        FatalErrorInFunction
             << "injectionMethod must be either 'point' or 'disc'"
             << exit(FatalError);
     }
@@ -84,7 +84,7 @@ void Foam::ConeNozzleInjection<CloudType>::setFlowType()
     }
     else
     {
-        FatalErrorIn("Foam::InjectionModel<CloudType>::setFlowType()")
+        FatalErrorInFunction
             << "flowType must be either 'constantVelocity', "
             <<"'pressureDrivenVelocity' or 'flowRateAndDischarge'"
             << exit(FatalError);
@@ -162,16 +162,11 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
 {
     if (innerDiameter_ >= outerDiameter_)
     {
-        FatalErrorIn
-        (
-            "Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection"
-            "("
-                "const dictionary&, "
-                "CloudType&, "
-                "const word&"
-            ")"
-        )<< "innerNozzleDiameter >= outerNozzleDiameter" << nl
-         << exit(FatalError);
+        FatalErrorInFunction
+            << "Inner diameter must be less than the outer diameter:" << nl
+            << "    innerDiameter: " << innerDiameter_ << nl
+            << "    outerDiameter: " << outerDiameter_
+            << exit(FatalError);
     }
 
     duration_ = owner.db().time().userTimeToTime(duration_);
@@ -228,7 +223,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     flowRateProfile_(im.flowRateProfile_),
     thetaInner_(im.thetaInner_),
     thetaOuter_(im.thetaOuter_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr()),
+    sizeDistribution_(im.sizeDistribution_, false),
     tanVec1_(im.tanVec1_),
     tanVec2_(im.tanVec1_),
     normal_(im.normal_),
@@ -265,7 +260,7 @@ void Foam::ConeNozzleInjection<CloudType>::updateMesh()
         }
         default:
         {
-            // do nothing
+            // Do nothing
         }
     }
 }
@@ -344,9 +339,10 @@ void Foam::ConeNozzleInjection<CloudType>::setPositionAndCell
         }
         case imDisc:
         {
-            scalar frac = rndGen.sample01<scalar>();
+            scalar frac = rndGen.globalSample01<scalar>();
             scalar dr = outerDiameter_ - innerDiameter_;
             scalar r = 0.5*(innerDiameter_ + frac*dr);
+
             position = position_ + r*normal_;
 
             this->findCellAtPosition
@@ -354,26 +350,14 @@ void Foam::ConeNozzleInjection<CloudType>::setPositionAndCell
                 cellOwner,
                 tetFaceI,
                 tetPtI,
-                position,
-                false
+                position
             );
             break;
         }
         default:
         {
-            FatalErrorIn
-            (
-                "void Foam::ConeNozzleInjection<CloudType>::setPositionAndCell"
-                "("
-                    "const label, "
-                    "const label, "
-                    "const scalar, "
-                    "vector&, "
-                    "label&, "
-                    "label&, "
-                    "label&"
-                ")"
-            )<< "Unknown injectionMethod type" << nl
+            FatalErrorInFunction
+             << "Unknown injectionMethod type" << nl
              << exit(FatalError);
         }
     }
@@ -391,7 +375,7 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
 {
     cachedRandom& rndGen = this->owner().rndGen();
 
-    // set particle velocity
+    // Set particle velocity
     const scalar deg2Rad = mathematical::pi/180.0;
 
     scalar t = time - this->SOI_;
@@ -441,7 +425,7 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
         }
     }
 
-    // set particle diameter
+    // Set particle diameter
     parcel.d() = sizeDistribution_->sample();
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index bd67443ce1..9490c31128 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -27,19 +27,18 @@ Class
 Description
     Cone injection
 
-    - User specifies
-      - time of start of injection
-      - injector position
-      - direction (along injection axis)
-      - parcel flow rate
-      - inner and outer half-cone angles
+    User specifies
+    - time of start of injection
+    - injector position
+    - direction (along injection axis)
+    - parcel flow rate
+    - inner and outer half-cone angles
 
+    Additional
     - Parcel diameters obtained by size distribution model
-
     - Parcel velocity is calculated as:
-
         - Constant velocity
-            U = <specified by user>
+            U = \<specified by user\>
         - Pressure driven velocity
             U = sqrt(2*(Pinj - Pamb)/rho)
         - Flow rate and discharge
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index d6b59b9043..b5528c1b38 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,7 +119,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
     nParcelsInjected_(im.nParcelsInjected_),
     U0_(im.U0_),
     diameters_(im.diameters_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr())
+    sizeDistribution_(im.sizeDistribution_, false)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 704345d8f5..8e7c7d682d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -25,18 +25,19 @@ Class
     Foam::FieldActivatedInjection
 
 Description
-    Injection at specified positions, with the conditions:
+    Conditional injection at specified positions.
 
-    - for injection to be allowed
+    For injection to be allowed, the equality must be satisfied:
 
         factor*referenceField[cellI] >= thresholdField[cellI]
 
-        where:
-          - referenceField is the field used to supply the look-up values
-          - thresholdField supplies the values beyond which the injection is
+        Where:
+        - referenceField is the field used to supply the look-up values
+        - thresholdField supplies the values beyond which the injection is
             permitted
 
-    - limited to a user-supllied number of injections per injector location
+    Note:
+    - Limited to a user-supplied number of injections per injector location
 
 SourceFiles
     FieldActivatedInjection.C
@@ -56,7 +57,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class FieldActivatedInjection Declaration
+                   Class FieldActivatedInjection Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 31b746625d..f3442fc61d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -140,7 +140,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
     fraction_(im.fraction_),
     selfSeed_(im.selfSeed_),
     dSeed_(im.dSeed_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr())
+    sizeDistribution_(im.sizeDistribution_, false)
 {}
 
 
@@ -236,15 +236,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
     {
         if (iterationNo > maxIterations)
         {
-            WarningIn
-            (
-                "Foam::label "
-                "Foam::InflationInjection<CloudType>::parcelsToInject"
-                "("
-                    "const scalar, "
-                    "const scalar"
-                ")"
-            )
+            WarningInFunction
                 << "Maximum particle split iterations ("
                 << maxIterations << ") exceeded" << endl;
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 5be9e15ebf..c1ea66b90c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -158,17 +158,8 @@ bool Foam::InjectionModel<CloudType>::findCellAtPosition
     {
         if (errorOnNotFound)
         {
-            FatalErrorIn
-            (
-                "Foam::InjectionModel<CloudType>::findCellAtPosition"
-                "("
-                    "label&, "
-                    "label&, "
-                    "label&, "
-                    "vector&, "
-                    "bool"
-                ")"
-            )   << "Cannot find parcel injection cell. "
+            FatalErrorInFunction
+                << "Cannot find parcel injection cell. "
                 << "Parcel position = " << p0 << nl
                 << abort(FatalError);
         }
@@ -215,17 +206,8 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
         default:
         {
             nP = 0.0;
-            FatalErrorIn
-            (
-                "Foam::scalar "
-                "Foam::InjectionModel<CloudType>::setNumberOfParticles"
-                "("
-                    "const label, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar"
-                ")"
-            )<< "Unknown parcelBasis type" << nl
+            FatalErrorInFunction
+             << "Unknown parcelBasis type" << nl
              << exit(FatalError);
         }
     }
@@ -285,7 +267,8 @@ Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
     nParticleFixed_(0.0),
     time0_(0.0),
     timeStep0_(this->template getModelProperty<scalar>("timeStep0")),
-    delayedVolume_(0.0)
+    delayedVolume_(0.0),
+    injectorID_(-1)
 {}
 
 
@@ -313,7 +296,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
     nParticleFixed_(0.0),
     time0_(owner.db().time().value()),
     timeStep0_(this->template getModelProperty<scalar>("timeStep0")),
-    delayedVolume_(0.0)
+    delayedVolume_(0.0),
+    injectorID_(this->coeffDict().lookupOrDefault("injectorID", -1))
 {
     // Provide some info
     // - also serves to initialise mesh dimensions - needed for parallel runs
@@ -321,18 +305,25 @@ Foam::InjectionModel<CloudType>::InjectionModel
     Info<< "    Constructing " << owner.mesh().nGeometricD() << "-D injection"
         << endl;
 
+    if (injectorID_ != -1)
+    {
+        Info<< "    injector ID: " << injectorID_ << endl;
+    }
+
     if (owner.solution().transient())
     {
         this->coeffDict().lookup("massTotal") >> massTotal_;
         this->coeffDict().lookup("SOI") >> SOI_;
-        SOI_ = owner.db().time().userTimeToTime(SOI_);
     }
     else
     {
         massFlowRate_.reset(this->coeffDict());
         massTotal_ = massFlowRate_.value(owner.db().time().value());
+        this->coeffDict().readIfPresent("SOI", SOI_);
     }
 
+    SOI_ = owner.db().time().userTimeToTime(SOI_);
+
     const word parcelBasisType = this->coeffDict().lookup("parcelBasisType");
 
     if (parcelBasisType == "mass")
@@ -355,15 +346,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::InjectionModel<CloudType>::InjectionModel"
-            "("
-                "const dictionary&, "
-                "CloudType&, "
-                "const word&"
-            ")"
-        )<< "parcelBasisType must be either 'number', 'mass' or 'fixed'" << nl
+        FatalErrorInFunction
+         << "parcelBasisType must be either 'number', 'mass' or 'fixed'" << nl
          << exit(FatalError);
     }
 }
@@ -387,7 +371,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
     nParticleFixed_(im.nParticleFixed_),
     time0_(im.time0_),
     timeStep0_(im.timeStep0_),
-    delayedVolume_(im.delayedVolume_)
+    delayedVolume_(im.delayedVolume_),
+    injectorID_(im.injectorID_)
 {}
 
 
@@ -440,10 +425,10 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     scalar massAdded = 0.0;
     label newParcels = 0;
     scalar newVolumeFraction = 0.0;
+    scalar delayedVolume = 0;
 
     if (prepareForNextTimeStep(time, newParcels, newVolumeFraction))
     {
-        scalar delayedVolume = 0;
 
         const scalar trackTime = this->owner().solution().trackTime();
         const polyMesh& mesh = this->owner().mesh();
@@ -529,7 +514,8 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
 
                         if (pPtr->move(td, dt))
                         {
-                            td.cloud().addParticle(pPtr);
+                            pPtr->typeId() = injectorID_;
+                            cloud.addParticle(pPtr);
                         }
                         else
                         {
@@ -544,10 +530,10 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 }
             }
         }
-
-        delayedVolume_ = delayedVolume;
     }
 
+    delayedVolume_ = returnReduce(delayedVolume, sumOp<scalar>());
+
     postInjectCheck(parcelsAdded, massAdded);
 }
 
@@ -565,6 +551,13 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
         return;
     }
 
+    const scalar time = this->owner().db().time().value();
+
+    if (time < SOI_)
+    {
+        return;
+    }
+
     const polyMesh& mesh = this->owner().mesh();
     typename TrackData::cloudType& cloud = td.cloud();
 
@@ -634,8 +627,10 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
                     pPtr->rho()
                 );
 
+            pPtr->typeId() = injectorID_;
+
             // Add the new parcel
-            td.cloud().addParticle(pPtr);
+            cloud.addParticle(pPtr);
 
             massAdded += pPtr->nParticle()*pPtr->mass();
             parcelsAdded++;
@@ -649,9 +644,9 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::info(Ostream& os)
 {
-    os  << "    " << this->modelName() << ":" << nl
-        << "        number of parcels added     = " << parcelsAddedTotal_ << nl
-        << "        mass introduced             = " << massInjected_ << nl;
+    os  << "    Injector " << this->modelName() << ":" << nl
+        << "      - parcels added               = " << parcelsAddedTotal_ << nl
+        << "      - mass introduced             = " << massInjected_ << nl;
 
     if (this->outputTime())
     {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index b570a6bf4a..fc0e285608 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -138,6 +138,9 @@ protected:
             //  less than 1 particle per parcel
             scalar delayedVolume_;
 
+            //- Optional injector ID
+            label injectorID_;
+
 
     // Protected Member Functions
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
index c268f7a96d..e9a8af2f08 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::InjectionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "InjectionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown injection model type "
+        FatalErrorInFunction
+            << "Unknown injection model type "
             << modelType << nl << nl
             << "Valid injection model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
@@ -78,16 +72,8 @@ Foam::InjectionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "InjectionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "const word&, "
-                "const word&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown injection model type "
+        FatalErrorInFunction
+            << "Unknown injection model type "
             << modelType << nl << nl
             << "Valid injection model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H
index ee76e3b806..eaea797878 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H
@@ -152,14 +152,7 @@ public:
             const kinematicParcelInjectionData& b
         )
         {
-            notImplemented
-            (
-                "operator=="
-                "("
-                    "const kinematicParcelInjectionData&, "
-                    "const kinematicParcelInjectionData&"
-                ")"
-            );
+            NotImplemented;
 
             return false;
         }
@@ -170,14 +163,7 @@ public:
             const kinematicParcelInjectionData& b
         )
         {
-            notImplemented
-            (
-                "operator=="
-                "("
-                    "const kinematicParcelInjectionData&, "
-                    "const kinematicParcelInjectionData&"
-                ")"
-            );
+            NotImplemented;
 
             return false;
         }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 418ad79e28..24f3986465 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -97,7 +97,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
     injectorTetFaces_(im.injectorTetFaces_),
     injectorTetPts_(im.injectorTetPts_),
     U0_(im.U0_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr()),
+    sizeDistribution_(im.sizeDistribution_, false),
     ignoreOutOfBounds_(im.ignoreOutOfBounds_)
 {}
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index bbadab5409..c9a91e8be6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -26,10 +26,13 @@ Class
 
 Description
     Manual injection
-    - User specifies
-      - Total mass to inject
-      - Parcel positions in file \c positionsFile
-      - Initial parcel velocity
+
+    User specifies
+    - Total mass to inject
+    - Parcel positions in file \c positionsFile
+    - Initial parcel velocity
+
+    Additional
     - Parcel diameters obtained by distribution model
     - All parcels introduced at SOI
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index da721e70b2..11f6a28ca0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -90,7 +90,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     duration_(im.duration_),
     concentration_(im.concentration_),
     parcelConcentration_(im.parcelConcentration_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr())
+    sizeDistribution_(im.sizeDistribution_, false)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index c858a27d01..57c8f91537 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -84,7 +84,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
     parcelsPerSecond_(im.parcelsPerSecond_),
     U0_(im.U0_),
     flowRateProfile_(im.flowRateProfile_),
-    sizeDistribution_(im.sizeDistribution_().clone().ptr())
+    sizeDistribution_(im.sizeDistribution_, false)
 {}
 
 
@@ -121,9 +121,8 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
     if ((time0 >= 0.0) && (time0 < duration_))
     {
         scalar nParcels = (time1 - time0)*parcelsPerSecond_;
-
         cachedRandom& rnd = this->owner().rndGen();
-
+        scalar rndPos = rnd.globalPosition(scalar(0), scalar(1));
         label nParcelsToInject = floor(nParcels);
 
         // Inject an additional parcel with a probability based on the
@@ -131,10 +130,7 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
         if
         (
             nParcelsToInject > 0
-         && (
-               nParcels - scalar(nParcelsToInject)
-             > rnd.globalPosition(scalar(0), scalar(1))
-            )
+         && (nParcels - scalar(nParcelsToInject) > rndPos)
         )
         {
             ++nParcelsToInject;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index c782ad860d..e32b291851 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -26,12 +26,15 @@ Class
 
 Description
     Patch injection
-    - User specifies
-      - Total mass to inject
-      - Name of patch
-      - Injection duration
-      - Initial parcel velocity
-      - Injection volume flow rate
+
+    User specifies
+    - Total mass to inject
+    - Name of patch
+    - Injection duration
+    - Initial parcel velocity
+    - Injection volume flow rate
+
+    Additional
     - Parcel diameters obtained by distribution model
     - Parcels injected randomly across the patch
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
index eef73729c9..6e52a06dba 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
@@ -49,14 +49,8 @@ Foam::patchInjectionBase::patchInjectionBase
 {
     if (patchId_ < 0)
     {
-        FatalErrorIn
-        (
-            "patchInjectionBase::patchInjectionBase"
-            "("
-                "const polyMesh& mesh, "
-                "const word& patchName"
-            ")"
-        )   << "Requested patch " << patchName_ << " not found" << nl
+        FatalErrorInFunction
+            << "Requested patch " << patchName_ << " not found" << nl
             << "Available patches are: " << mesh.boundaryMesh().names() << nl
             << exit(FatalError);
     }
@@ -221,8 +215,20 @@ void Foam::patchInjectionBase::setPositionAndCell
             // first face of the cell as the tetFace and the first point after
             // the base point on the face as the tetPt.  The tracking will pick
             // the cell consistent with the motion in the first tracking step
-            tetFaceI = mesh.cells()[cellOwner][0];
-            tetPtI = 1;
+            //tetFaceI = mesh.cells()[cellOwner][0];
+            //tetPtI = 1;
+
+            //SAF: temporary fix for patchInjection.
+            // This function finds both cellOwner and tetFaceI. The particle
+            // was injected in a non-boundary cell and the tracking function
+            // could not find the cellOwner
+            mesh.findCellFacePt
+            (
+                position,
+                cellOwner,
+                tetFaceI,
+                tetPtI
+            );
         }
         else
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
index acf63677a1..489079f524 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,14 +53,8 @@ Foam::NonSphereDragForce<CloudType>::NonSphereDragForce
 {
     if (phi_ <= 0 || phi_ > 1)
     {
-        FatalErrorIn
-        (
-            "NonSphereDrag<CloudType>::NonSphereDrag"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Ratio of surface of sphere having same volume as particle to "
+        FatalErrorInFunction
+            << "Ratio of surface of sphere having same volume as particle to "
             << "actual surface area of particle (phi) must be greater than 0 "
             << "and less than or equal to 1" << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
index 970dee90f9..0dd49b7f0a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
@@ -104,7 +104,7 @@ Foam::forceSuSp Foam::PlessisMasliyahDragForce<CloudType>::calcCoupled
 {
     scalar alphac(alphac_[p.cell()]);
 
-    scalar cbrtAlphap(pow(1.0 - alphac, 1.0/3.0));
+    scalar cbrtAlphap(cbrt(1.0 - alphac));
 
     scalar A =
         26.8*pow3(alphac)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
index 00c3c7813a..6c4aeab596 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,11 +31,8 @@ Foam::LiftForce<CloudType>::curlUcInterp() const
 {
     if (!curlUcInterpPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::interpolation<Foam::vector>&"
-            "Foam::LiftForce<CloudType>::curlUcInterp() const"
-        )   << "Carrier phase curlUc interpolation object not set"
+        FatalErrorInFunction
+            << "Carrier phase curlUc interpolation object not set"
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
index 7adbb47ebd..a5a07d7baa 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,16 +43,8 @@ Foam::ParticleForce<CloudType>::ParticleForce
 {
     if (readCoeffs && (coeffs_.dictName() != forceType))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "Foam::ParticleForce<CloudType>::ParticleForce"
-            "("
-                "CloudType&, "
-                "const fvMesh&, "
-                "const dictionary&, "
-                "const word&, "
-                "const bool"
-            ")",
             dict
         )   << "Force " << forceType << " must be specified as a dictionary"
             << exit(FatalIOError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
index 38c4bdc584..7e37875658 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,15 +44,8 @@ Foam::ParticleForce<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "ParticleForce<CloudType>::New"
-            "("
-                "CloudType&, "
-                "const fvMesh&, "
-                "const dictionary&"
-            ")"
-        )   << "Unknown particle force type "
+        FatalErrorInFunction
+            << "Unknown particle force type "
             << forceType
             << ", constructor not in hash table" << nl << nl
             << "    Valid particle force types are:" << nl
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
index dc58dde52a..c9813d8ee0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,11 +31,8 @@ Foam::PressureGradientForce<CloudType>::DUcDtInterp() const
 {
     if (!DUcDtInterpPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::interpolation<Foam::vector>&"
-            "Foam::PressureGradientForce<CloudType>::DUcDtInterp() const"
-        )   << "Carrier phase DUcDt interpolation object not set"
+        FatalErrorInFunction
+            << "Carrier phase DUcDt interpolation object not set"
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 7a2a3edf49..8f3f43b7e4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,7 +70,7 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
         if (it == PatchInteractionModel<CloudType>::itOther)
         {
             const word& patchName = patchData_[patchI].patchName();
-            FatalErrorIn("LocalInteraction(const dictionary&, CloudType&)")
+            FatalErrorInFunction
                 << "Unknown patch interaction type "
                 << interactionTypeName << " for patch " << patchName
                 << ". Valid selections are:"
@@ -255,17 +255,8 @@ bool Foam::LocalInteraction<CloudType>::correct
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "bool LocalInteraction<CloudType>::correct"
-                    "("
-                        "typename CloudType::parcelType&, "
-                        "const polyPatch&, "
-                        "bool&, "
-                        "const scalar, "
-                        "const tetIndices&"
-                    ") const"
-                )   << "Unknown interaction type "
+                FatalErrorInFunction
+                    << "Unknown interaction type "
                     << patchData_[patchI].interactionTypeName()
                     << "(" << it << ") for patch "
                     << patchData_[patchI].patchName()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
index 3564eacf93..30aa85357f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
@@ -56,14 +56,8 @@ Foam::patchInteractionDataList::patchInteractionDataList
 
         if (patchIDs.empty())
         {
-            WarningIn
-            (
-                "Foam::patchInteractionDataList::patchInteractionDataList"
-                "("
-                    "const polyMesh&, "
-                    "const dictionary&"
-                ")"
-            )   << "Cannot find any patch names matching " << patchName
+            WarningInFunction
+                << "Cannot find any patch names matching " << patchName
                 << endl;
         }
 
@@ -88,14 +82,8 @@ Foam::patchInteractionDataList::patchInteractionDataList
 
     if (badPatches.size() > 0)
     {
-        FatalErrorIn
-        (
-            "Foam::patchInteractionDataList::patchInteractionDataList"
-            "("
-                "const polyMesh&, "
-                "const dictionary&"
-            ")"
-        )   << "All patches must be specified when employing local patch "
+        FatalErrorInFunction
+            << "All patches must be specified when employing local patch "
             << "interaction. Please specify data for patches:" << nl
             << badPatches << nl << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index 5ccaf9bc02..d219177107 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,9 @@ Foam::PatchInteractionModel<CloudType>::PatchInteractionModel
 )
 :
     CloudSubModelBase<CloudType>(owner, dict, typeName, type),
-    UName_(this->coeffDict().lookupOrDefault("UName", word("U")))
+    UName_(this->coeffDict().lookupOrDefault("UName", word("U"))),
+    escapedParcels_(0),
+    escapedMass_(0.0)
 {}
 
 
@@ -134,7 +136,9 @@ Foam::PatchInteractionModel<CloudType>::PatchInteractionModel
 )
 :
     CloudSubModelBase<CloudType>(pim),
-    UName_(pim.UName_)
+    UName_(pim.UName_),
+    escapedParcels_(pim.escapedParcels_),
+    escapedMass_(pim.escapedMass_)
 {}
 
 
@@ -154,10 +158,42 @@ const Foam::word& Foam::PatchInteractionModel<CloudType>::UName() const
 }
 
 
+template<class CloudType>
+void Foam::PatchInteractionModel<CloudType>::addToEscapedParcels
+(
+    const scalar mass
+)
+{
+    escapedMass_ += mass;
+    escapedParcels_++;
+}
+
+
 template<class CloudType>
 void Foam::PatchInteractionModel<CloudType>::info(Ostream& os)
 {
-    // do nothing
+    const label escapedParcels0 =
+        this->template getBaseProperty<label>("escapedParcels");
+    const label escapedParcelsTotal =
+        escapedParcels0 + returnReduce(escapedParcels_, sumOp<label>());
+
+    const scalar escapedMass0 =
+        this->template getBaseProperty<scalar>("escapedMass");
+    const scalar escapedMassTotal =
+        escapedMass0 + returnReduce(escapedMass_, sumOp<scalar>());
+
+    os  << "    Parcel fate: system (number, mass)" << nl
+        << "      - escape                      = " << escapedParcelsTotal
+        << ", " << escapedMassTotal << endl;
+
+    if (this->outputTime())
+    {
+        this->setBaseProperty("escapedParcels", escapedParcelsTotal);
+        escapedParcels_ = 0;
+
+        this->setBaseProperty("escapedMass", escapedMassTotal);
+        escapedMass_ = 0.0;
+    }
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index bfc4ae277b..66fc753f07 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -74,7 +74,7 @@ public:
         static wordList interactionTypeNames_;
 
 
-private:
+protected:
 
     // Private data
 
@@ -82,6 +82,16 @@ private:
         const word UName_;
 
 
+        // Counters
+
+            //- Number of parcels escaped
+            label escapedParcels_;
+
+            //- Mass of parcels escaped
+            scalar escapedMass_;
+
+
+
 public:
 
     //- Runtime type information
@@ -158,6 +168,9 @@ public:
             const tetIndices& tetIs
         ) = 0;
 
+        //- Add to escaped parcels
+        void addToEscapedParcels(const scalar mass);
+
 
         // I-O
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
index eaa89563f3..82c1ada60c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::PatchInteractionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PatchInteractionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown patch interaction model type "
+        FatalErrorInFunction
+            << "Unknown patch interaction model type "
             << modelType << nl << nl
             << "Valid patch interaction model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index 1545e62d57..d24a3f6b7d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,14 +52,8 @@ Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
         {
             const word interactionTypeName(this->coeffDict().lookup("type"));
 
-            FatalErrorIn
-            (
-                "StandardWallInteraction<CloudType>::StandardWallInteraction"
-                "("
-                    "const dictionary&, "
-                    "CloudType&"
-                ")"
-            )   << "Unknown interaction result type "
+            FatalErrorInFunction
+                << "Unknown interaction result type "
                 << interactionTypeName
                 << ". Valid selections are:" << this->interactionTypeNames_
                 << endl << exit(FatalError);
@@ -172,17 +166,8 @@ bool Foam::StandardWallInteraction<CloudType>::correct
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "bool StandardWallInteraction<CloudType>::correct"
-                    "("
-                        "typename CloudType::parcelType&, "
-                        "const polyPatch&, "
-                        "bool& keepParticle, "
-                        "const scalar, "
-                        "const tetIndices&"
-                    ") const"
-                )   << "Unknown interaction type "
+                FatalErrorInFunction
+                    << "Unknown interaction type "
                     << this->interactionTypeToWord(interactionType_)
                     << "(" << interactionType_ << ")" << endl
                     << abort(FatalError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
index 5c2a4b80f0..8faa120fe2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::StochasticCollisionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "StochasticCollisionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown model type type "
+        FatalErrorInFunction
+            << "Unknown model type type "
             << modelType << ", constructor not in hash table" << nl << nl
             << "    Valid model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
index d2dbb92d6c..3f3d997403 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
@@ -266,8 +266,9 @@ void Foam::SurfaceFilmModel<CloudType>::info(Ostream& os)
     label nInjectTotal =
         nInject0 + returnReduce(nParcelsInjected_, sumOp<label>());
 
-    os  << "    Parcels absorbed into film      = " << nTransTotal << nl
-        << "    New film detached parcels       = " << nInjectTotal << endl;
+    os  << "    Surface film:" << nl
+        << "      - parcels absorbed            = " << nTransTotal << nl
+        << "      - parcels ejected             = " << nInjectTotal << endl;
 
     if (this->outputTime())
     {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
index b2e7d47966..492a1e1f37 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::SurfaceFilmModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "SurfaceFilmModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown surface film model type "
+        FatalErrorInFunction
+            << "Unknown surface film model type "
             << modelType << nl << nl
             << "Valid surface film model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
index cc29f5810b..7ef6edb34d 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,15 +87,8 @@ Foam::AveragingMethod<Type>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "Foam::AveragingMethod<Type>::New"
-            "("
-                "const IOobject&, "
-                "const dictionary&, "
-                "const fvMesh&"
-            ")"
-        )   << "Unknown averaging method " << averageType
+        FatalErrorInFunction
+            << "Unknown averaging method " << averageType
             << ", constructor not in hash table" << nl << nl
             << "    Valid averaging methods are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
index 3c6b0ca885..a7ac4c3638 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,13 +65,8 @@ Foam::CorrectionLimitingMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "CorrectionLimitingMethod::New"
-            "("
-                "const dictionary&"
-            ")"
-        )   << "Unknown correction limiter type " << modelType
+        FatalErrorInFunction
+            << "Unknown correction limiter type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid correction limiter types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
index c91831966e..4c765da9c4 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,14 +89,8 @@ Foam::DampingModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "DampingModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown damping model type " << modelType
+        FatalErrorInFunction
+            << "Unknown damping model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid damping model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
index da454553cf..eb52e2e5c5 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,14 +93,8 @@ Foam::IsotropyModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "IsotropyModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown isotropy model type " << modelType
+        FatalErrorInFunction
+            << "Unknown isotropy model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid isotropy model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
index fd29b22769..bacf4d0bc9 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,14 +91,8 @@ Foam::PackingModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PackingModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown packing model type " << modelType
+        FatalErrorInFunction
+            << "Unknown packing model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid packing model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
index 9962149fbd..90f3603773 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,12 +108,7 @@ Foam::ParticleStressModels::Lun::dTaudTheta
     const Field<scalar>& uSqr
 ) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::ParticleStressModels::Lun::dTau_dTheta"
-        "(const Field<scalar>&, const Field<scalar>&, const Field<scalar>&) "
-        "const"
-    );
+    NotImplemented;
 
     return tmp<Field<scalar> >(NULL);
 }
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
index d95d42c4a1..0f0c8d6556 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,13 +72,8 @@ Foam::autoPtr<Foam::ParticleStressModel> Foam::ParticleStressModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "ParticleStressModel::New"
-            "("
-                "const dictionary&"
-            ")"
-        )   << "Unknown particle stress model type " << modelType
+        FatalErrorInFunction
+            << "Unknown particle stress model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid particle stress model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
index bc4c7d5397..c700a01efc 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,13 +74,8 @@ Foam::autoPtr<Foam::TimeScaleModel> Foam::TimeScaleModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "TimeScaleModel::New"
-            "("
-                "const dictionary&"
-            ")"
-        )   << "Unknown time scale model type " << modelType
+        FatalErrorInFunction
+            << "Unknown time scale model type " << modelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid time scale model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 2b4e987a73..26127eaf12 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -164,14 +164,8 @@ Foam::label Foam::CompositionModel<CloudType>::carrierId
 
     if (id < 0 && !allowNotFound)
     {
-        FatalErrorIn
-        (
-            "label CompositionModel<CloudType>::carrierId"
-            "("
-                "const word&, "
-                "const bool"
-            ") const"
-        )   << "Unable to determine global id for requested component "
+        FatalErrorInFunction
+            << "Unable to determine global id for requested component "
             << cmptName << ". Available components are " << nl
             << thermo_.carrier().species()
             << abort(FatalError);
@@ -193,15 +187,8 @@ Foam::label Foam::CompositionModel<CloudType>::localId
 
     if (id < 0 && !allowNotFound)
     {
-        FatalErrorIn
-        (
-            "label CompositionModel<CloudType>::localId"
-            "("
-                "const label, "
-                "const word&, "
-                "const bool"
-            ") const"
-        )   << "Unable to determine local id for component " << cmptName
+        FatalErrorInFunction
+            << "Unable to determine local id for component " << cmptName
             << abort(FatalError);
     }
 
@@ -221,16 +208,8 @@ Foam::label Foam::CompositionModel<CloudType>::localToCarrierId
 
     if (cid < 0 && !allowNotFound)
     {
-        FatalErrorIn
-        (
-            "label "
-            "CompositionModel<CloudType>::localToCarrierId"
-            "("
-                "const label, "
-                "const label, "
-                "const bool"
-            ") const"
-        )   << "Unable to determine global carrier id for phase "
+        FatalErrorInFunction
+            << "Unable to determine global carrier id for phase "
             << phasei << " with local id " << id
             << abort(FatalError);
     }
@@ -250,7 +229,7 @@ const Foam::scalarField& Foam::CompositionModel<CloudType>::Y0
 
 
 template<class CloudType>
-Foam::scalarField Foam::CompositionModel<CloudType>::X
+Foam::tmp<Foam::scalarField> Foam::CompositionModel<CloudType>::X
 (
     const label phasei,
     const scalarField& Y
@@ -282,21 +261,14 @@ Foam::scalarField Foam::CompositionModel<CloudType>::X
         }
         default:
         {
-            FatalErrorIn
-            (
-                "scalarField CompositionModel<CloudType>::X"
-                "("
-                    "const label, "
-                    "const scalarField&"
-                ") const"
-            )   << "Only possible to convert gas and liquid mass fractions"
+            FatalErrorInFunction
+                << "Only possible to convert gas and liquid mass fractions"
                 << abort(FatalError);
         }
     }
 
-    X /= WInv;
-
-    return X;
+    tmp<scalarField> tfld = X/(WInv + ROOTVSMALL);
+    return tfld;
 }
 
 
@@ -345,16 +317,8 @@ Foam::scalar Foam::CompositionModel<CloudType>::H
         }
         default:
         {
-            FatalErrorIn
-            (
-                "scalar CompositionModel<CloudType>::H"
-                "("
-                "    const label, "
-                "    const scalarField&, "
-                "    const scalar, "
-                "    const scalar"
-                ") const"
-            )   << "Unknown phase enumeration" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown phase enumeration" << abort(FatalError);
         }
     }
 
@@ -407,16 +371,8 @@ Foam::scalar Foam::CompositionModel<CloudType>::Hs
         }
         default:
         {
-            FatalErrorIn
-            (
-                "scalar CompositionModel<CloudType>::Hs"
-                "("
-                "    const label, "
-                "    const scalarField&, "
-                "    const scalar, "
-                "    const scalar"
-                ") const"
-            )   << "Unknown phase enumeration"
+            FatalErrorInFunction
+                << "Unknown phase enumeration"
                 << abort(FatalError);
         }
     }
@@ -466,16 +422,8 @@ Foam::scalar Foam::CompositionModel<CloudType>::Hc
         }
         default:
         {
-            FatalErrorIn
-            (
-                "scalar CompositionModel<CloudType>::Hc"
-                "("
-                "    const label, "
-                "    const scalarField&, "
-                "    const scalar, "
-                "    const scalar"
-                ") const"
-            )   << "Unknown phase enumeration"
+            FatalErrorInFunction
+                << "Unknown phase enumeration"
                 << abort(FatalError);
         }
     }
@@ -524,16 +472,8 @@ Foam::scalar Foam::CompositionModel<CloudType>::Cp
         }
         default:
         {
-            FatalErrorIn
-            (
-                "scalar CompositionModel<CloudType>::Cp"
-                "("
-                    "const label, "
-                    "const scalarField&, "
-                    "const scalar, "
-                    "const scalar"
-                ") const"
-            )   << "Unknown phase enumeration"
+            FatalErrorInFunction
+                << "Unknown phase enumeration"
                 << abort(FatalError);
         }
     }
@@ -559,16 +499,8 @@ Foam::scalar Foam::CompositionModel<CloudType>::L
         {
             if (debug)
             {
-                WarningIn
-                (
-                    "scalar CompositionModel<CloudType>::L"
-                    "("
-                        "const label, "
-                        "const scalarField&, "
-                        "const scalar, "
-                        "const scalar"
-                    ") const\n"
-                )   << "No support for gaseous components" << endl;
+                WarningInFunction
+                    << "No support for gaseous components" << endl;
             }
             break;
         }
@@ -584,31 +516,15 @@ Foam::scalar Foam::CompositionModel<CloudType>::L
         {
             if (debug)
             {
-                WarningIn
-                (
-                    "scalar CompositionModel<CloudType>::L"
-                    "("
-                        "const label, "
-                        "const scalarField&, "
-                        "const scalar, "
-                        "const scalar"
-                    ") const\n"
-                )   << "No support for solid components" << endl;
+                WarningInFunction
+                    << "No support for solid components" << endl;
             }
             break;
         }
         default:
         {
-            FatalErrorIn
-            (
-                "scalar CompositionModel<CloudType>::L"
-                "("
-                    "const label, "
-                    "const scalarField&, "
-                    "const scalar, "
-                    "const scalar"
-                ") const"
-            )   << "Unknown phase enumeration"
+            FatalErrorInFunction
+                << "Unknown phase enumeration"
                 << abort(FatalError);
         }
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index b57da79fde..97aa1c5c7c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -188,7 +188,11 @@ public:
 
                 //- Return the list of phase phaseI volume fractions fractions
                 //  based on supplied mass fractions Y
-                scalarField X(const label phaseI, const scalarField& Y) const;
+                tmp<scalarField> X
+                (
+                    const label phaseI,
+                    const scalarField& Y
+                ) const;
 
 
             // Mixture properties
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
index ba09858376..a21bcddea8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::CompositionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "CompositionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown composition model type "
+        FatalErrorInFunction
+            << "Unknown composition model type "
             << modelType << nl << nl
             << "Valid composition model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
index 3209c04fa5..e86974da9c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
@@ -51,30 +51,27 @@ void Foam::SingleMixtureFraction<CloudType>::constructIds()
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "void Foam::SingleMixtureFraction<CloudType>::"
-                    "constructIds()"
-                )   << "Unknown phase enumeration" << nl << abort(FatalError);
+                FatalErrorInFunction
+                    << "Unknown phase enumeration" << nl << abort(FatalError);
             }
         }
     }
 
     if (idGas_ < 0)
     {
-        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+        FatalErrorInFunction
             << "No gas phase found in phase list:" << nl
             << this->phaseTypes() << exit(FatalError);
     }
     if (idLiquid_ < 0)
     {
-        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+        FatalErrorInFunction
             << "No liquid phase found in phase list:" << nl
             << this->phaseTypes() << exit(FatalError);
     }
     if (idSolid_ < 0)
     {
-        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+        FatalErrorInFunction
             << "No solid phase found in phase list:" << nl
             << this->phaseTypes() << exit(FatalError);
     }
@@ -102,15 +99,8 @@ Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction
 
     if (this->phaseProps().size() != 3)
     {
-        FatalErrorIn
-        (
-            "Foam::SingleMixtureFraction<CloudType>::"
-            "SingleMixtureFraction"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Incorrect numebr of phases: " << nl
+        FatalErrorInFunction
+            << "Incorrect numebr of phases: " << nl
             << "    Please specify 1 gas, 1 liquid and 1 solid"
             << exit(FatalError);
     }
@@ -121,15 +111,8 @@ Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction
 
     if (mag(sum(YMixture0_) - 1.0) > SMALL)
     {
-        FatalErrorIn
-        (
-            "Foam::SingleMixtureFraction<CloudType>::"
-            "SingleMixtureFraction"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Sum of phases should be 1. Phase fractions:" << nl
+        FatalErrorInFunction
+            << "Sum of phases should be 1. Phase fractions:" << nl
             << YMixture0_ << exit(FatalError);
     }
 }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
index 1fe61169cb..5ed0917cca 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
@@ -32,17 +32,13 @@ void Foam::SinglePhaseMixture<CloudType>::constructIds()
 {
     if (this->phaseProps().size() == 0)
     {
-        FatalErrorIn
-        (
-            "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
-        )   << "Phase list is empty" << exit(FatalError);
+        FatalErrorInFunction
+            << "Phase list is empty" << exit(FatalError);
     }
     else if (this->phaseProps().size() > 1)
     {
-        FatalErrorIn
-        (
-            "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
-        )   << "Only one phase permitted" << exit(FatalError);
+        FatalErrorInFunction
+            << "Only one phase permitted" << exit(FatalError);
     }
 
     switch (this->phaseProps()[0].phase())
@@ -64,10 +60,8 @@ void Foam::SinglePhaseMixture<CloudType>::constructIds()
         }
         default:
         {
-            FatalErrorIn
-            (
-                "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
-            )   << "Unknown phase enumeration" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown phase enumeration" << abort(FatalError);
         }
     }
 }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 2ebb2bcb16..ad57ba6136 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -78,14 +78,8 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
 {
     if (activeLiquids_.size() == 0)
     {
-        WarningIn
-        (
-            "Foam::LiquidEvaporation<CloudType>::LiquidEvaporation"
-            "("
-                "const dictionary& dict, "
-                "CloudType& owner"
-            ")"
-        )   << "Evaporation model selected, but no active liquids defined"
+        WarningInFunction
+            << "Evaporation model selected, but no active liquids defined"
             << nl << endl;
     }
     else
@@ -156,24 +150,8 @@ void Foam::LiquidEvaporation<CloudType>::calculate
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::LiquidEvaporation<CloudType>::calculate"
-                "("
-                    "const scalar, "
-                    "const label, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalarField&, "
-                    "scalarField&"
-                ") const"
-            )   << "Parcel reached critical conditions: "
+            WarningInFunction
+                << "Parcel reached critical conditions: "
                 << "evaporating all avaliable mass" << endl;
         }
 
@@ -259,16 +237,8 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::dh
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Foam::scalar Foam::LiquidEvaporation<CloudType>::dh"
-                "("
-                    "const label, "
-                    "const label, "
-                    "const scalar, "
-                    "const scalar"
-                ") const"
-            )   << "Unknown enthalpyTransfer type" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown enthalpyTransfer type" << abort(FatalError);
         }
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
index b51614bc48..42e04e1c2c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
@@ -78,14 +78,8 @@ Foam::LiquidEvaporationBoil<CloudType>::LiquidEvaporationBoil
 {
     if (activeLiquids_.size() == 0)
     {
-        WarningIn
-        (
-            "Foam::LiquidEvaporationBoil<CloudType>::LiquidEvaporationBoil"
-            "("
-                "const dictionary& dict, "
-                "CloudType& owner"
-            ")"
-        )   << "Evaporation model selected, but no active liquids defined"
+        WarningInFunction
+            << "Evaporation model selected, but no active liquids defined"
             << nl << endl;
     }
     else
@@ -156,24 +150,8 @@ void Foam::LiquidEvaporationBoil<CloudType>::calculate
     {
         if (debug)
         {
-            WarningIn
-            (
-                "void Foam::LiquidEvaporationBoil<CloudType>::calculate"
-                "("
-                    "const scalar, "
-                    "const label, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalar, "
-                    "const scalarField&, "
-                    "scalarField&"
-                ") const"
-            )   << "Parcel reached critical conditions: "
+            WarningInFunction
+                << "Parcel reached critical conditions: "
                 << "evaporating all avaliable mass" << endl;
         }
 
@@ -355,16 +333,8 @@ Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::dh
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::dh"
-                "("
-                    "const label, "
-                    "const label, "
-                    "const scalar, "
-                    "const scalar"
-                ") const"
-            )   << "Unknown enthalpyTransfer type" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown enthalpyTransfer type" << abort(FatalError);
         }
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 7e2999ccfb..c06b79bd51 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -56,11 +56,8 @@ const
         }
     }
 
-    FatalErrorIn
-    (
-        "PhaseChangeModel<CloudType>::enthalpyTransferType"
-        "PhaseChangeModel<CloudType>::wordToEnthalpyTransfer(const word&) const"
-    )   << "Unknown enthalpyType " << etName << ". Valid selections are:" << nl
+    FatalErrorInFunction
+        << "Unknown enthalpyType " << etName << ". Valid selections are:" << nl
         << enthalpyTransferTypeNames << exit(FatalError);
 
     return enthalpyTransferType(0);
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
index 503afe2ad8..dcacd8e4b6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::PhaseChangeModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "PhaseChangeModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown phase change model type "
+        FatalErrorInFunction
+            << "Unknown phase change model type "
             << modelType << nl << nl
             << "Valid phase change model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index a98e959392..9aeee431d0 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,15 +42,8 @@ Foam::ConstantRateDevolatilisation<CloudType>::ConstantRateDevolatilisation
 {
     if (volatileData_.empty())
     {
-        WarningIn
-        (
-            "Foam::ConstantRateDevolatilisation<CloudType>::"
-            "ConstantRateDevolatilisation"
-            "("
-                "const dictionary& dict, "
-                "CloudType& owner"
-            ")"
-        )   << "Devolatilisation model selected, but no volatiles defined"
+        WarningInFunction
+            << "Devolatilisation model selected, but no volatiles defined"
             << nl << endl;
     }
     else
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
index f76905787b..8e7970ac49 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::DevolatilisationModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "DevolatilisationModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown devolatilisation model type "
+        FatalErrorInFunction
+            << "Unknown devolatilisation model type "
             << modelType << nl << nl
             << "Valid devolatilisation model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 935b357188..a4a5b1c184 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -43,15 +43,8 @@ SingleKineticRateDevolatilisation
 {
     if (volatileData_.empty())
     {
-        WarningIn
-        (
-            "Foam::SingleKineticRateDevolatilisation<CloudType>::"
-            "SingleKineticRateDevolatilisation"
-            "("
-                "const dictionary& dict, "
-                "CloudType& owner"
-            ")"
-        )   << "Devolatilisation model selected, but no volatiles defined"
+        WarningInFunction
+            << "Devolatilisation model selected, but no volatiles defined"
             << nl << endl;
     }
     else
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
index cbc4bc4d63..935fd37e60 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::SurfaceReactionModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "SurfaceReactionModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown surface reaction model type "
+        FatalErrorInFunction
+            << "Unknown surface reaction model type "
             << modelType << nl << nl
             << "Valid surface reaction model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
index 524fb70bec..609a317e38 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::HeatTransferModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "HeatTransferModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown heat transfer model type "
+        FatalErrorInFunction
+            << "Unknown heat transfer model type "
             << modelType << nl << nl
             << "Valid heat transfer model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 2d47253de9..2aa0da83ab 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,14 +56,8 @@ Foam::ThermoSurfaceFilm<CloudType>::interactionTypeEnum(const word& it) const
         }
     }
 
-    FatalErrorIn
-    (
-        "ThermoSurfaceFilm<CloudType>::interactionType "
-        "ThermoSurfaceFilm<CloudType>::interactionTypeEnum"
-        "("
-            "const word& it"
-        ") const"
-    )   << "Unknown interaction type " << it
+    FatalErrorInFunction
+        << "Unknown interaction type " << it
         << ". Valid interaction types include: " << interactionTypeNames_
         << abort(FatalError);
 
@@ -79,14 +73,8 @@ Foam::word Foam::ThermoSurfaceFilm<CloudType>::interactionTypeStr
 {
     if (it >= interactionTypeNames_.size())
     {
-        FatalErrorIn
-        (
-            "ThermoSurfaceFilm<CloudType>::interactionType "
-            "ThermoSurfaceFilm<CloudType>::interactionTypeStr"
-            "("
-                "const interactionType& it"
-            ") const"
-        )   << "Unknown interaction type enumeration" << abort(FatalError);
+        FatalErrorInFunction
+            << "Unknown interaction type enumeration" << abort(FatalError);
     }
 
     return interactionTypeNames_[it];
@@ -617,15 +605,8 @@ bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "bool ThermoSurfaceFilm<CloudType>::transferParcel"
-                    "("
-                        "parcelType&, "
-                        "const polyPatch&, "
-                        "bool&"
-                    ")"
-                )   << "Unknown interaction type enumeration"
+                FatalErrorInFunction
+                    << "Unknown interaction type enumeration"
                     << abort(FatalError);
             }
         }
@@ -686,7 +667,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::info(Ostream& os)
     label nSplashTotal =
         nSplash0 + returnReduce(nParcelsSplashed_, sumOp<label>());
 
-    os  << "    New film splash parcels         = " << nSplashTotal << endl;
+    os  << "      - new splash parcels          = " << nSplashTotal << endl;
 
     if (this->outputTime())
     {
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index 4f4aa8c2af..56153ff88b 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -24,9 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cloudAbsorptionEmission.H"
-#include "addToRunTimeSelectionTable.H"
-
 #include "thermoCloud.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -159,6 +158,7 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
         tE() += tc.Ep();
     }
 
+    // Total emission is 4 times the projected emission
     return 4*tE;
 }
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
index 2163688da9..f04b7363a4 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ Foam::label Foam::bufferedAccumulator<Type>::addToBuffers
         {
             if (bufferToRefill != -1)
             {
-                FatalErrorIn("bufferedAccumulator<Type>::addToBuffers ")
+                FatalErrorInFunction
                     << "More than one bufferedAccumulator accumulation "
                     << "buffer filled at once, this is considered an error."
                     << abort(FatalError);
@@ -181,10 +181,8 @@ Foam::Field<Type> Foam::bufferedAccumulator<Type>::averaged() const
     }
     else
     {
-        WarningIn
-        (
-            "bufferedAccumulator<Type>::averagedbufferedAccumulator() const"
-        )   << "Averaged correlation function requested but averagesTaken = "
+        WarningInFunction
+            << "Averaged correlation function requested but averagesTaken = "
             << averagesTaken_
             << ". Returning empty field."
             << endl;
@@ -214,10 +212,8 @@ void Foam::bufferedAccumulator<Type>::operator=
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "bufferedAccumulator<Type>::operator=(const bufferedAccumulator&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index 0928783a53..54ac66d1fa 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,7 +134,7 @@ void Foam::correlationFunction<Type>::calculateCorrelationFunction
 {
     if (measurandFieldSize() != currentValues.size())
     {
-        FatalErrorIn("correlationFunction<Type>::calculateCorrelationFunction")
+        FatalErrorInFunction
             << "Trying to supply a Field of length"
             << currentValues.size()
             << " to calculate the correlation function. "
@@ -186,7 +186,7 @@ void Foam::correlationFunction<Type>::calculateCorrelationFunction
 {
     if (measurandFieldSize() != 1)
     {
-        FatalErrorIn("correlationFunction<Type>::calculateCorrelationFunction")
+        FatalErrorInFunction
             << "Trying to supply a single value to calculate the correlation "
             << "function.  Expecting a Field of length "
             << measurandFieldSize()
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index ecae0dc465..bc02f151a1 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ Foam::label Foam::distribution::totalEntries() const
 
         if (sumOfEntries < 0)
         {
-            WarningIn("label distribution::totalEntries()")
+            WarningInFunction
                 << "Accumulated distribution values total has become negative: "
                 << "sumOfEntries = " << sumOfEntries
                 << ". This is most likely to be because too many samples "
@@ -228,7 +228,7 @@ void Foam::distribution::add(const scalar valueToAdd)
 
     if ((*this)[n] < 0)
     {
-        FatalErrorIn("distribution::add(const scalar valueToAdd)")
+        FatalErrorInFunction
             << "Accumulated distribution value has become negative: "
             << "bin = " << (0.5 + scalar(n)) * binWidth_
             << ", value = " << (*this)[n]
@@ -446,7 +446,7 @@ void Foam::distribution::operator=(const distribution& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn("distribution::operator=(const distribution&)")
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
index 72af8f3657..f077bad9e1 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ if (writeVacf)
 
     if (!vacf.writeAveraged(vacfFile))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing to "
             << vacfFile.name()
             << abort(FatalError);
@@ -45,7 +45,7 @@ if (writePacf)
 
     if (!pacf.writeAveraged(pacfFile))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing to "
             << pacfFile.name()
             << abort(FatalError);
@@ -65,7 +65,7 @@ if (writeHFacf)
 
     if (!hfacf.writeAveraged(hfacfFile))
     {
-        FatalErrorIn(args.executable())
+        FatalErrorInFunction
             << "Failed writing to "
             << hfacfFile.name()
             << abort(FatalError);
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index d45bcc9633..75312848bd 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -180,7 +180,7 @@ bool Foam::molecule::move(molecule::trackingData& td, const scalar trackTime)
     }
     else
     {
-        FatalErrorIn("molecule::move(trackingData&, const scalar)") << nl
+        FatalErrorInFunction
             << td.part() << " is an invalid part of the integration method."
             << abort(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index 2b858980e1..062395ba6b 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,7 +151,7 @@ inline Foam::molecule::constantProperties::constantProperties
 
         if (eigenValues(momOfInertia).x() < VSMALL)
         {
-            FatalErrorIn("molecule::constantProperties::constantProperties")
+            FatalErrorInFunction
                 << "An eigenvalue of the inertia tensor is zero, the molecule "
                 << dict.name() << " is not a valid 6DOF shape."
                 << nl << abort(FatalError);
@@ -264,7 +264,7 @@ inline void Foam::molecule::constantProperties::checkSiteListSizes() const
      || siteIds_.size() != siteCharges_.size()
     )
     {
-        FatalErrorIn("molecule::constantProperties::checkSiteListSizes")
+        FatalErrorInFunction
             << "Sizes of site id, charge and "
             << "referencePositions are not the same. "
             << nl << abort(FatalError);
@@ -378,7 +378,7 @@ inline bool Foam::molecule::constantProperties::pairPotentialSite
 
     if (s == -1)
     {
-        FatalErrorIn("moleculeI.H") << nl
+        FatalErrorInFunction
             << sId << " site not found."
             << nl << abort(FatalError);
     }
@@ -403,10 +403,8 @@ inline bool Foam::molecule::constantProperties::electrostaticSite
 
     if (s == -1)
     {
-        FatalErrorIn
-        (
-            "molecule::constantProperties::electrostaticSite(label)"
-        )   << sId << " site not found."
+        FatalErrorInFunction
+            << sId << " site not found."
             << nl << abort(FatalError);
     }
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index d0e0dfdd98..3e48822f03 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ void Foam::moleculeCloud::buildConstProps()
 
             if (siteIds[sI] == -1)
             {
-                FatalErrorIn("moleculeCloud::buildConstProps()")
+                FatalErrorInFunction
                     << siteId << " site not found."
                     << nl << abort(FatalError);
             }
@@ -485,7 +485,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
     if (!cellZones.size())
     {
-        FatalErrorIn("void Foam::moleculeCloud::initialiseMolecules")
+        FatalErrorInFunction
             << "No cellZones found in the mesh."
             << abort(FatalError);
     }
@@ -525,7 +525,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 if (latticeIds.size() != latticePositions.size())
                 {
-                    FatalErrorIn("Foam::moleculeCloud::initialiseMolecules")
+                    FatalErrorInFunction
                         << "latticeIds and latticePositions must be the same "
                         << " size." << nl
                         << abort(FatalError);
@@ -547,7 +547,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                     if (numberDensity < VSMALL)
                     {
-                        WarningIn("moleculeCloud::initialiseMolecules")
+                        WarningInFunction
                             << "numberDensity too small, not filling zone "
                             << zone.name() << endl;
 
@@ -580,7 +580,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                     if (massDensity < VSMALL)
                     {
-                        WarningIn("moleculeCloud::initialiseMolecules")
+                        WarningInFunction
                             << "massDensity too small, not filling zone "
                             << zone.name() << endl;
 
@@ -596,7 +596,7 @@ void Foam::moleculeCloud::initialiseMolecules
                 }
                 else
                 {
-                    FatalErrorIn("Foam::moleculeCloud::initialiseMolecules")
+                    FatalErrorInFunction
                         << "massDensity or numberDensity not specified " << nl
                         << abort(FatalError);
                 }
@@ -963,7 +963,7 @@ void Foam::moleculeCloud::initialiseMolecules
                      && !partOfLayerInBounds
                     )
                     {
-                        WarningIn("Foam::moleculeCloud::initialiseMolecules()")
+                        WarningInFunction
                             << "A whole layer of unit cells was placed "
                             << "outside the bounds of the mesh, but no "
                             << "molecules have been placed in zone '"
@@ -1011,7 +1011,7 @@ void Foam::moleculeCloud::createMolecule
 
     if (cell == -1)
     {
-        FatalErrorIn("Foam::moleculeCloud::createMolecule")
+        FatalErrorInFunction
             << "Position specified does not correspond to a mesh cell." << nl
             << abort(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index 2cf2e52bb1..553606bd9f 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -207,7 +207,7 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
 
                     if (rsIsJMag < SMALL)
                     {
-                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
+                        WarningInFunction
                             << "Molecule site pair closer than "
                             << SMALL
                             << ": mag separation = " << rsIsJMag
@@ -256,7 +256,7 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
 
                     if (rsIsJMag < SMALL)
                     {
-                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
+                        WarningInFunction
                             << "Molecule site pair closer than "
                             << SMALL
                             << ": mag separation = " << rsIsJMag
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
index 61c768c9fe..5ce30a1d60 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ void Foam::reducedUnits::calcRefValues()
      || refMass_ < VSMALL
     )
     {
-        FatalErrorIn("Foam::reducedUnits::calcRefValues() ")
+        FatalErrorInFunction
             << "One of more referencence values too small for floating point "
             << "calculation: "
             << "refTime_ = " << refTime_
@@ -152,10 +152,8 @@ void Foam::reducedUnits::operator=(const reducedUnits& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::reducedUnits::operator=(const Foam::reducedUnits&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 }
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
index dea6f7965e..0ea36b20e0 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,10 +46,8 @@ Foam::autoPtr<Foam::energyScalingFunction> Foam::energyScalingFunction::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "energyScalingFunction::New()"
-        )   << "Unknown energyScalingFunction type "
+        FatalErrorInFunction
+            << "Unknown energyScalingFunction type "
             << scalingType << nl << nl
             << "Valid energyScalingFunctions are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index ce5ed42692..0775247d7e 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ Foam::scalar Foam::pairPotential::force(const scalar r) const
 
     if (k < 0)
     {
-        FatalErrorIn("pairPotential::force(const scalar) const")
+        FatalErrorInFunction
             << "r less than rMin in pair potential " << name_ << nl
             << abort(FatalError);
     }
@@ -137,7 +137,7 @@ Foam::scalar Foam::pairPotential::energy(const scalar r) const
 
     if (k < 0)
     {
-        FatalErrorIn("pairPotential::energy(const scalar) const")
+        FatalErrorInFunction
             << "r less than rMin in pair potential " << name_ << nl
             << abort(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
index 26f1cff6f8..ff3f925682 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,10 +45,8 @@ Foam::autoPtr<Foam::pairPotential> Foam::pairPotential::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "pairPotential::New()"
-        )   << "Unknown pairPotential type "
+        FatalErrorInFunction
+            << "Unknown pairPotential type "
             << potentialType << nl << nl
             << "Valid pairPotentials are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
index d423141a58..6a7da5a59a 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ void Foam::pairPotentialList::readPairPotentialDict
                 }
                 else
                 {
-                    FatalErrorIn("pairPotentialList::buildPotentials") << nl
+                    FatalErrorInFunction
                         << "Pair pairPotential specification subDict "
                         << idA << "-" << idB << " not found"
                         << nl << abort(FatalError);
@@ -78,7 +78,7 @@ void Foam::pairPotentialList::readPairPotentialDict
 
                 else
                 {
-                    FatalErrorIn("pairPotentialList::buildPotentials") << nl
+                    FatalErrorInFunction
                         << "Pair pairPotential specification subDict "
                         << idA << "-" << idB << " or "
                         << idB << "-" << idA << " not found"
@@ -91,7 +91,7 @@ void Foam::pairPotentialList::readPairPotentialDict
                  && pairPotentialDict.found(idB+"-"+idA)
                 )
                 {
-                    FatalErrorIn("pairPotentialList::buildPotentials") << nl
+                    FatalErrorInFunction
                         << "Pair pairPotential specification subDict "
                         << idA << "-" << idB << " and "
                         << idB << "-" << idA << " found multiple definition"
@@ -126,7 +126,7 @@ void Foam::pairPotentialList::readPairPotentialDict
                     )
                 )
                 {
-                    FatalErrorIn("pairPotentialList::readPairPotentialDict")
+                    FatalErrorInFunction
                         << "Failed writing to "
                         << ppTabFile.name() << nl
                         << abort(FatalError);
@@ -137,7 +137,7 @@ void Foam::pairPotentialList::readPairPotentialDict
 
     if (!pairPotentialDict.found("electrostatic"))
     {
-        FatalErrorIn("pairPotentialList::buildPotentials") << nl
+        FatalErrorInFunction
             << "Pair pairPotential specification subDict electrostatic"
             << nl << abort(FatalError);
     }
@@ -159,7 +159,7 @@ void Foam::pairPotentialList::readPairPotentialDict
 
         if (!electrostaticPotential_->writeEnergyAndForceTables(ppTabFile))
         {
-            FatalErrorIn("pairPotentialList::readPairPotentialDict")
+            FatalErrorInFunction
                 << "Failed writing to "
                 << ppTabFile.name() << nl
                 << abort(FatalError);
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
index 5dc7de1c31..04fb468871 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ inline Foam::label Foam::pairPotentialList::pairPotentialIndex
 
     if (index > size() - 1)
     {
-        FatalErrorIn("Foam::pairPotentialList::pairPotentialIndex ")
+        FatalErrorInFunction
             << "Attempting to access a pairPotential with too high an index."
             << nl << "a = " << a << ", b = " << b << ", index = " << index
             << nl << "max index = " << size() - 1
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index f14b0e5856..b33d39987c 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ void Foam::potential::setSiteIdList(const dictionary& moleculePropertiesDict)
 
         if (!moleculePropertiesDict.found(id))
         {
-            FatalErrorIn("potential::setSiteIdList(const dictionary&)")
+            FatalErrorInFunction
                 << id << " molecule subDict not found"
                 << nl << abort(FatalError);
         }
@@ -65,7 +65,7 @@ void Foam::potential::setSiteIdList(const dictionary& moleculePropertiesDict)
 
             if (findIndex(siteIdNames, siteId) == -1)
             {
-                FatalErrorIn("potential::setSiteIdList(const dictionary&)")
+                FatalErrorInFunction
                     << siteId << " in pairPotentialSiteIds is not in siteIds: "
                     << siteIdNames << nl << abort(FatalError);
             }
@@ -173,7 +173,7 @@ void Foam::potential::potential::readPotentialDict()
 
             if (removalOrder_[rO] == -1)
             {
-                FatalErrorIn("potential::readPotentialDict()")
+                FatalErrorInFunction
                     << "removalOrder entry: " << remOrd[rO]
                     << " not found in idList."
                     << nl << abort(FatalError);
@@ -186,7 +186,7 @@ void Foam::potential::potential::readPotentialDict()
 
     if (!potentialDict.found("pair"))
     {
-        FatalErrorIn("potential::readPotentialDict()")
+        FatalErrorInFunction
             << "pair potential specification subDict not found"
             << abort(FatalError);
     }
@@ -207,7 +207,7 @@ void Foam::potential::potential::readPotentialDict()
     {
         if (!potentialDict.found("tether"))
         {
-            FatalErrorIn("potential::readPotentialDict()")
+            FatalErrorInFunction
                 << "tether potential specification subDict not found"
                 << abort(FatalError);
         }
@@ -282,14 +282,8 @@ void Foam::potential::potential::readMdInitialiseDict
 
             if (!moleculePropertiesDict.found(id))
             {
-                FatalErrorIn
-                (
-                    "potential::readMdInitialiseDict"
-                    "("
-                        "const IOdictionary&, "
-                        "IOdictionary&"
-                    ")"
-                )   << "Molecule type " << id
+                FatalErrorInFunction
+                    << "Molecule type " << id
                     << " not found in moleculeProperties dictionary." << nl
                     << abort(FatalError);
             }
@@ -337,14 +331,7 @@ void Foam::potential::potential::readMdInitialiseDict
             }
             else
             {
-                FatalErrorIn
-                (
-                    "potential::readMdInitialiseDict"
-                    "("
-                        "const IOdictionary&, "
-                        "IOdictionary&"
-                    ")"
-                )   << "Tether id  " << tetherSiteId
+                FatalErrorInFunction
                     << " not found as a site of any molecule in zone." << nl
                     << abort(FatalError);
             }
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
index 7b6889b07d..58da03728d 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,10 +43,8 @@ Foam::autoPtr<Foam::tetherPotential> Foam::tetherPotential::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "tetherPotential::New()"
-        )   << "Unknown tetherPotential type "
+        FatalErrorInFunction
+            << "Unknown tetherPotential type "
             << potentialType << nl << nl
             << "Valid tetherPotentials are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
index 341b950b51..8833d79304 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ void Foam::tetherPotentialList::readTetherPotentialDict
 
         if (tetherId == -1)
         {
-            FatalErrorIn("tetherPotentialList::readTetherPotentialDict")
+            FatalErrorInFunction
                 << nl
                 << "No matching entry found in siteIdList for tether name "
                 << tetherPotentialName
@@ -57,7 +57,7 @@ void Foam::tetherPotentialList::readTetherPotentialDict
         }
         else if (!tetherPotentialDict.found(tetherPotentialName))
         {
-            FatalErrorIn("tetherPotentialList::readTetherPotentialDict")
+            FatalErrorInFunction
                 << nl << "tether potential specification subDict "
                 << tetherPotentialName << " not found"
                 << abort(FatalError);
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
index d89bbbe1f9..9ab909f011 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,10 +34,7 @@ inline Foam::label Foam::tetherPotentialList::tetherPotentialIndex
 
     if (index == -1 || a >= idMap_.size())
     {
-        FatalErrorIn
-        (
-            "Foam::tetherPotentialList::tetherPotentialIndex(const label a)"
-        )
+        FatalErrorInFunction
         << "Attempting to access an undefined tetherPotential."
         << abort(FatalError);
 
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 3b5a4e72e9..b45129b838 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -19,6 +19,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -45,6 +46,7 @@ LIB_LIBS = \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
+    -ldynamicMesh \
     -ldynamicFvMesh \
     -lsampling \
     -lfiniteVolume \
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
index ae1651e78d..f4f562543d 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SprayParcel.H"
+#include "BreakupModel.H"
 #include "CompositionModel.H"
 #include "AtomizationModel.H"
 
@@ -153,13 +154,19 @@ void Foam::SprayParcel<ParcelType>::calcAtomization
     const label cellI
 )
 {
+    typedef typename TrackData::cloudType::sprayCloudType sprayCloudType;
+    const AtomizationModel<sprayCloudType>& atomization =
+        td.cloud().atomization();
+
+    if (!atomization.active())
+    {
+        return;
+    }
+
     typedef typename TrackData::cloudType::reactingCloudType reactingCloudType;
     const CompositionModel<reactingCloudType>& composition =
         td.cloud().composition();
 
-    typedef typename TrackData::cloudType::sprayCloudType sprayCloudType;
-    const AtomizationModel<sprayCloudType>& atomization =
-        td.cloud().atomization();
 
     // Average molecular weight of carrier mix - assumes perfect gas
     scalar Wc = this->rhoc_*RR*this->Tc()/this->pc();
@@ -223,11 +230,19 @@ void Foam::SprayParcel<ParcelType>::calcBreakup
     typedef typename TrackData::cloudType cloudType;
     typedef typename cloudType::parcelType parcelType;
     typedef typename cloudType::forceType forceType;
+    typedef typename TrackData::cloudType::sprayCloudType sprayCloudType;
+
+    BreakupModel<sprayCloudType>& breakup = td.cloud().breakup();
+
+    if (!breakup.active())
+    {
+        return;
+    }
 
     const parcelType& p = static_cast<const parcelType&>(*this);
     const forceType& forces = td.cloud().forces();
 
-    if (td.cloud().breakup().solveOscillationEq())
+    if (breakup.solveOscillationEq())
     {
         solveTABEq(td, dt);
     }
@@ -247,7 +262,7 @@ void Foam::SprayParcel<ParcelType>::calcBreakup
     const scalar mass = p.mass();
     const forceSuSp Fcp = forces.calcCoupled(p, dt, mass, Re, muAv);
     const forceSuSp Fncp = forces.calcNonCoupled(p, dt, mass, Re, muAv);
-    this->tMom() = mass/(Fcp.Sp() + Fncp.Sp());
+    this->tMom() = mass/(Fcp.Sp() + Fncp.Sp() + ROOTVSMALL);
 
     const vector g = td.cloud().g().value();
 
@@ -255,7 +270,7 @@ void Foam::SprayParcel<ParcelType>::calcBreakup
     scalar dChild = 0.0;
     if
     (
-        td.cloud().breakup().update
+        breakup.update
         (
             dt,
             g,
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
index 4e1fab22d0..4d7f289260 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
@@ -181,6 +181,25 @@ public:
         //- Runtime type information
         TypeName("SprayParcel");
 
+        //- String representation of properties
+        AddToPropertyList
+        (
+            ParcelType,
+          + " d0"
+          + " position0"
+          + " sigma"
+          + " mu"
+          + " liquidCore"
+          + " KHindex"
+          + " y"
+          + " yDot"
+          + " tc"
+          + " ms"
+          + " injector"
+          + " tMom"
+          + " user"
+        );
+
 
     // Constructors
 
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 7d85441b1e..6188ccf735 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -28,6 +28,11 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+template<class ParcelType>
+Foam::string Foam::SprayParcel<ParcelType>::propertyList_ =
+    Foam::SprayParcel<ParcelType>::propertyList();
+
+
 template<class ParcelType>
 const std::size_t Foam::SprayParcel<ParcelType>::sizeofFields_
 (
@@ -89,7 +94,7 @@ Foam::SprayParcel<ParcelType>::SprayParcel
     (
         "SprayParcel<ParcelType>::SprayParcel"
         "("
-            "const polyMesh, "
+            "const polyMesh&, "
             "Istream&, "
             "bool"
         ")"
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
index 8759588856..3ef9a30928 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::AtomizationModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "AtomizationModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown AtomizationModelType type "
+        FatalErrorInFunction
+            << "Unknown AtomizationModelType type "
             << AtomizationModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid AtomizationModel types are:" << nl
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
index caddbe4acb..d60bfc051a 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,8 @@ Foam::BreakupModel<CloudType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "BreakupModel<CloudType>::New"
-            "("
-                "const dictionary&, "
-                "CloudType&"
-            ")"
-        )   << "Unknown BreakupModelType type "
+        FatalErrorInFunction
+            << "Unknown BreakupModelType type "
             << BreakupModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid BreakupModel types are:" << nl
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
index 92a92157ad..4f3607b6e9 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ Foam::TAB<CloudType>::TAB
     else
     {
         SMDMethod_ = method2;
-        WarningIn("Foam::TAB<CloudType>::TAB(const dictionary&, CloudType&)")
+        WarningInFunction
             << "Unknown SMDCalculationMethod. Valid options are "
             << "(method1 | method2). Using method2" << endl;
     }
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 63881bb1e6..b86451b145 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -49,11 +49,7 @@ Foam::DispersionRASModel<CloudType>::kModel() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::tmp<Foam::volScalarField>"
-            "Foam::DispersionRASModel<CloudType>::kModel() const"
-        )
+        FatalErrorInFunction
             << "Turbulence model not found in mesh database" << nl
             << "Database objects include: " << obr.sortedToc()
             << abort(FatalError);
@@ -83,11 +79,7 @@ Foam::DispersionRASModel<CloudType>::epsilonModel() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::tmp<Foam::volScalarField>"
-            "Foam::DispersionRASModel<CloudType>::epsilonModel() const"
-        )
+        FatalErrorInFunction
             << "Turbulence model not found in mesh database" << nl
             << "Database objects include: " << obr.sortedToc()
             << abort(FatalError);
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index d33b3057a3..563ab8c736 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -71,11 +71,7 @@ Foam::BrownianMotionForce<CloudType>::kModel() const
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::tmp<Foam::volScalarField>"
-            "Foam::DispersionRASModel<CloudType>::kModel() const"
-        )
+        FatalErrorInFunction
             << "Turbulence model not found in mesh database" << nl
             << "Database objects include: " << obr.sortedToc()
             << abort(FatalError);
diff --git a/src/mesh/autoMesh/Make/files b/src/mesh/autoMesh/Make/files
index 2bc9cd80a1..29001bafb7 100644
--- a/src/mesh/autoMesh/Make/files
+++ b/src/mesh/autoMesh/Make/files
@@ -2,7 +2,6 @@ autoHexMesh             = autoHexMesh
 autoHexMeshDriver       = $(autoHexMesh)/autoHexMeshDriver
 
 $(autoHexMeshDriver)/autoLayerDriver.C
-/* $(autoHexMeshDriver)/autoLayerDriverShrink.C */
 $(autoHexMeshDriver)/autoSnapDriver.C
 $(autoHexMeshDriver)/autoSnapDriverFeature.C
 $(autoHexMeshDriver)/autoRefineDriver.C
@@ -10,13 +9,13 @@ $(autoHexMeshDriver)/autoRefineDriver.C
 $(autoHexMeshDriver)/layerParameters/layerParameters.C
 $(autoHexMeshDriver)/refinementParameters/refinementParameters.C
 $(autoHexMeshDriver)/snapParameters/snapParameters.C
-$(autoHexMeshDriver)/pointData/pointData.C
 
 $(autoHexMesh)/meshRefinement/meshRefinementBaffles.C
 $(autoHexMesh)/meshRefinement/meshRefinement.C
 $(autoHexMesh)/meshRefinement/meshRefinementMerge.C
 $(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
 $(autoHexMesh)/meshRefinement/meshRefinementRefine.C
+$(autoHexMesh)/meshRefinement/meshRefinementGapRefine.C
 $(autoHexMesh)/meshRefinement/patchFaceOrientation.C
 
 $(autoHexMesh)/refinementFeatures/refinementFeatures.C
@@ -30,7 +29,10 @@ meshMover = $(autoHexMesh)/externalDisplacementMeshMover
 $(meshMover)/displacementMeshMoverMotionSolver.C
 $(meshMover)/externalDisplacementMeshMover.C
 $(meshMover)/medialAxisMeshMover.C
+$(meshMover)/displacementMotionSolverMeshMover.C
+/* $(meshMover)/pointSmoothingMeshMover.C */
 $(meshMover)/zeroFixedValue/zeroFixedValuePointPatchFields.C
+$(meshMover)/fieldSmoother/fieldSmoother.C
 
 LIB = $(FOAM_LIBBIN)/libautoMesh
 
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
index d37a26a9dd..88577d6c82 100644
--- a/src/mesh/autoMesh/Make/options
+++ b/src/mesh/autoMesh/Make/options
@@ -18,4 +18,5 @@ LIB_LIBS = \
     -ledgeMesh \
     -lsurfMesh \
     -ltriSurface \
+    -lfvMotionSolvers \
     -ldistributed
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 4999a16d3c..bd0d7d696d 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,9 +55,7 @@ Description
 #include "cyclicSlipPointPatchFields.H"
 #include "fixedValueFvPatchFields.H"
 #include "localPointRegion.H"
-
 #include "externalDisplacementMeshMover.H"
-#include "medialAxisMeshMover.H"
 #include "scalarIOField.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -743,7 +741,7 @@ void Foam::autoLayerDriver::setNumLayers
     {
         if (maxLayers[i] == labelMin || minLayers[i] == labelMax)
         {
-            FatalErrorIn("setNumLayers(..)")
+            FatalErrorInFunction
                 << "Patchpoint:" << i << " coord:" << pp.localPoints()[i]
                 << " maxLayers:" << maxLayers
                 << " minLayers:" << minLayers
@@ -973,34 +971,42 @@ void Foam::autoLayerDriver::determineSidePatches
     const labelListList& edgeGlobalFaces,
     const indirectPrimitivePatch& pp,
 
-    labelList& sidePatchID
+    labelList& edgePatchID,
+    labelList& edgeZoneID,
+    boolList& edgeFlip,
+    labelList& inflateFaceID
 )
 {
     // Sometimes edges-to-be-extruded are on more than 2 processors.
     // Work out which 2 hold the faces to be extruded and thus which procpatch
-    // the side-face should be in. As an additional complication this might
+    // the edge-face should be in. As an additional complication this might
     // mean that 2 procesors that were only edge-connected now suddenly need
     // to become face-connected i.e. have a processor patch between them.
 
     fvMesh& mesh = meshRefiner_.mesh();
 
-    // Determine sidePatchID. Any additional processor boundary gets added to
+    // Determine edgePatchID. Any additional processor boundary gets added to
     // patchToNbrProc,nbrProcToPatch and nPatches gets set to the new number
     // of patches.
     label nPatches;
     Map<label> nbrProcToPatch;
     Map<label> patchToNbrProc;
-    addPatchCellLayer::calcSidePatch
+    addPatchCellLayer::calcExtrudeInfo
     (
+        true,           // zoneFromAnyFace
+
         mesh,
         globalFaces,
         edgeGlobalFaces,
         pp,
 
-        sidePatchID,
+        edgePatchID,
         nPatches,
         nbrProcToPatch,
-        patchToNbrProc
+        patchToNbrProc,
+        edgeZoneID,
+        edgeFlip,
+        inflateFaceID
     );
 
     label nOldPatches = mesh.boundaryMesh().size();
@@ -1012,7 +1018,7 @@ void Foam::autoLayerDriver::determineSidePatches
     if (nAdded > 0)
     {
         // We might not add patches in same order as in patchToNbrProc
-        // so prepare to renumber sidePatchID
+        // so prepare to renumber edgePatchID
         Map<label> wantedToAddedPatch;
 
         for (label patchI = nOldPatches; patchI < nPatches; patchI++)
@@ -1046,14 +1052,14 @@ void Foam::autoLayerDriver::determineSidePatches
             wantedToAddedPatch.insert(patchI, procPatchI);
         }
 
-        // Renumber sidePatchID
-        forAll(sidePatchID, i)
+        // Renumber edgePatchID
+        forAll(edgePatchID, i)
         {
-            label patchI = sidePatchID[i];
+            label patchI = edgePatchID[i];
             Map<label>::const_iterator fnd = wantedToAddedPatch.find(patchI);
             if (fnd != wantedToAddedPatch.end())
             {
-                sidePatchID[i] = fnd();
+                edgePatchID[i] = fnd();
             }
         }
 
@@ -1189,7 +1195,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
          || max(layerParams.minThickness()) > 2
         )
         {
-            FatalErrorIn("calculateLayerThickness(..)")
+            FatalErrorInFunction
                 << "Thickness should be factor of local undistorted cell size."
                 << " Valid values are [0..2]." << nl
                 << " minThickness:" << layerParams.minThickness()
@@ -1654,7 +1660,7 @@ void Foam::autoLayerDriver::getVertexString
 
     if (fp == -1)
     {
-        FatalErrorIn("autoLayerDriver::getVertexString(..)")
+        FatalErrorInFunction
             << "problem." << abort(FatalError);
     }
 
@@ -1741,7 +1747,7 @@ Foam::label Foam::autoLayerDriver::truncateDisplacement
 
         if (mesh.isInternalFace(faceI))
         {
-            FatalErrorIn("truncateDisplacement(..)")
+            FatalErrorInFunction
                 << "Faceset " << illegalPatchFaces.name()
                 << " contains internal face " << faceI << nl
                 << "It should only contain patch faces" << abort(FatalError);
@@ -2427,6 +2433,67 @@ Foam::label Foam::autoLayerDriver::countExtrusion
 }
 
 
+Foam::List<Foam::labelPair> Foam::autoLayerDriver::getBafflesOnAddedMesh
+(
+    const polyMesh& mesh,
+    const labelList& newToOldFaces,
+    const List<labelPair>& baffles
+)
+{
+    // The problem is that the baffle faces are now inside the
+    // mesh (addPatchCellLayer modifies original boundary faces and
+    // adds new ones. So 2 pass:
+    // - find the boundary face for all faces originating from baffle
+    // - use the boundary face for the new baffles
+
+    Map<label> baffleSet(4*baffles.size());
+    forAll(baffles, baffleI)
+    {
+        baffleSet.insert(baffles[baffleI][0], baffleI);
+        baffleSet.insert(baffles[baffleI][1], baffleI);
+    }
+
+
+    List<labelPair> newBaffles(baffles.size(), labelPair(-1, -1));
+    for
+    (
+        label faceI = mesh.nInternalFaces();
+        faceI < mesh.nFaces();
+        faceI++
+    )
+    {
+        label oldFaceI = newToOldFaces[faceI];
+
+        Map<label>::const_iterator faceFnd = baffleSet.find(oldFaceI);
+        if (faceFnd != baffleSet.end())
+        {
+            label baffleI = faceFnd();
+            labelPair& p = newBaffles[baffleI];
+            if (p[0] == -1)
+            {
+                p[0] = faceI;
+            }
+            else if (p[1] == -1)
+            {
+                p[1] = faceI;
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Problem:" << faceI << " at:"
+                    << mesh.faceCentres()[faceI]
+                    << " is on same baffle as " << p[0]
+                    << " at:" << mesh.faceCentres()[p[0]]
+                    << " and " << p[1]
+                    << " at:" << mesh.faceCentres()[p[1]]
+                    << exit(FatalError);
+            }
+        }
+    }
+    return newBaffles;
+}
+
+
 // Collect layer faces and layer cells into mesh fields for ease of handling
 void Foam::autoLayerDriver::getLayerCellsFaces
 (
@@ -2457,6 +2524,7 @@ void Foam::autoLayerDriver::getLayerCellsFaces
 
         if (layer.size())
         {
+            // Leave out original internal face
             forAll(added, i)
             {
                 cellNLayers[added[i]] = layer.size()-1;
@@ -2577,6 +2645,69 @@ void Foam::autoLayerDriver::printLayerData
 }
 
 
+bool Foam::autoLayerDriver::writeLayerSets
+(
+    const fvMesh& mesh,
+    const labelList& cellNLayers,
+    const scalarField& faceRealThickness
+) const
+{
+    bool allOk = true;
+    {
+        label nAdded = 0;
+        forAll(cellNLayers, cellI)
+        {
+            if (cellNLayers[cellI] > 0)
+            {
+                nAdded++;
+            }
+        }
+        cellSet addedCellSet(mesh, "addedCells", nAdded);
+        forAll(cellNLayers, cellI)
+        {
+            if (cellNLayers[cellI] > 0)
+            {
+                addedCellSet.insert(cellI);
+            }
+        }
+        addedCellSet.instance() = meshRefiner_.timeName();
+        Info<< "Writing "
+            << returnReduce(addedCellSet.size(), sumOp<label>())
+            << " added cells to cellSet "
+            << addedCellSet.name() << endl;
+        bool ok = addedCellSet.write();
+        allOk = allOk && ok;
+    }
+    {
+        label nAdded = 0;
+        for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+        {
+            if (faceRealThickness[faceI] > 0)
+            {
+                nAdded++;
+            }
+        }
+
+        faceSet layerFacesSet(mesh, "layerFaces", nAdded);
+        for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+        {
+            if (faceRealThickness[faceI] > 0)
+            {
+                layerFacesSet.insert(faceI);
+            }
+        }
+        layerFacesSet.instance() = meshRefiner_.timeName();
+        Info<< "Writing "
+            << returnReduce(layerFacesSet.size(), sumOp<label>())
+            << " faces inside added layer to faceSet "
+            << layerFacesSet.name() << endl;
+        bool ok = layerFacesSet.write();
+        allOk = allOk && ok;
+    }
+    return allOk;
+}
+
+
 bool Foam::autoLayerDriver::writeLayerData
 (
     const fvMesh& mesh,
@@ -2590,57 +2721,8 @@ bool Foam::autoLayerDriver::writeLayerData
 
     if (meshRefinement::writeLevel() & meshRefinement::WRITELAYERSETS)
     {
-        {
-            label nAdded = 0;
-            forAll(cellNLayers, cellI)
-            {
-                if (cellNLayers[cellI] > 0)
-                {
-                    nAdded++;
-                }
-            }
-            cellSet addedCellSet(mesh, "addedCells", nAdded);
-            forAll(cellNLayers, cellI)
-            {
-                if (cellNLayers[cellI] > 0)
-                {
-                    addedCellSet.insert(cellI);
-                }
-            }
-            addedCellSet.instance() = meshRefiner_.timeName();
-            Info<< "Writing "
-                << returnReduce(addedCellSet.size(), sumOp<label>())
-                << " added cells to cellSet "
-                << addedCellSet.name() << endl;
-            bool ok = addedCellSet.write();
-            allOk = allOk & ok;
-        }
-        {
-            label nAdded = 0;
-            for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
-            {
-                if (faceRealThickness[faceI] > 0)
-                {
-                    nAdded++;
-                }
-            }
-
-            faceSet layerFacesSet(mesh, "layerFaces", nAdded);
-            for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
-            {
-                if (faceRealThickness[faceI] > 0)
-                {
-                    layerFacesSet.insert(faceI);
-                }
-            }
-            layerFacesSet.instance() = meshRefiner_.timeName();
-            Info<< "Writing "
-                << returnReduce(layerFacesSet.size(), sumOp<label>())
-                << " faces inside added layer to faceSet "
-                << layerFacesSet.name() << endl;
-            bool ok = layerFacesSet.write();
-            allOk = allOk & ok;
-        }
+        bool ok = writeLayerSets(mesh, cellNLayers, faceRealThickness);
+        allOk = allOk && ok;
     }
 
     if (meshRefinement::writeLevel() & meshRefinement::WRITELAYERFIELDS)
@@ -2663,6 +2745,10 @@ bool Foam::autoLayerDriver::writeLayerData
                 dimensionedScalar("zero", dimless, 0),
                 fixedValueFvPatchScalarField::typeName
             );
+            forAll(fld, cellI)
+            {
+                fld[cellI] = cellNLayers[cellI];
+            }
             const polyBoundaryMesh& pbm = mesh.boundaryMesh();
             forAll(patchIDs, i)
             {
@@ -2679,7 +2765,7 @@ bool Foam::autoLayerDriver::writeLayerData
             Info<< indent << fld.name() << "    : actual number of layers"
                 << endl;
             bool ok = fld.write();
-            allOk = allOk & ok;
+            allOk = allOk && ok;
         }
         {
             volScalarField fld
@@ -2709,7 +2795,7 @@ bool Foam::autoLayerDriver::writeLayerData
             Info<< indent << fld.name() << "         : overall layer thickness"
                 << endl;
             bool ok = fld.write();
-            allOk = allOk & ok;
+            allOk = allOk && ok;
         }
         {
             volScalarField fld
@@ -2757,23 +2843,11 @@ bool Foam::autoLayerDriver::writeLayerData
                 << " : overall layer thickness (fraction"
                 << " of desired thickness)" << endl;
             bool ok = fld.write();
-            allOk = allOk & ok;
+            allOk = allOk && ok;
         }
         Info<< decrIndent<< endl;
     }
 
-    //if (meshRefinement::outputLevel() & meshRefinement::OUTPUTLAYERINFO)
-    {
-        printLayerData
-        (
-            mesh,
-            patchIDs,
-            cellNLayers,
-            faceWantedThickness,
-            faceRealThickness
-        );
-    }
-
     return allOk;
 }
 
@@ -2803,7 +2877,7 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
 {
     // Clip to 30 degrees. Not helpful!
     //scalar planarAngle = min(30.0, layerParams.featureAngle());
-    scalar planarAngle = layerParams.featureAngle();
+    scalar planarAngle = layerParams.mergePatchFacesAngle();
     scalar minCos = Foam::cos(degToRad(planarAngle));
 
     scalar concaveCos = Foam::cos(degToRad(layerParams.concaveAngle()));
@@ -2814,8 +2888,7 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
         << "    - which are on the same patch" << nl
         << "    - which make an angle < " << planarAngle
         << " degrees"
-        << nl
-        << "      (cos:" << minCos << ')' << nl
+        << " (cos:" << minCos << ')' << nl
         << "    - as long as the resulting face doesn't become concave"
         << " by more than "
         << layerParams.concaveAngle() << " degrees" << nl
@@ -2859,34 +2932,326 @@ void Foam::autoLayerDriver::addLayers
 {
     fvMesh& mesh = meshRefiner_.mesh();
 
+
+    // faceZones of type internal or baffle (for merging points across)
+    labelList internalOrBaffleFaceZones;
+    {
+        List<surfaceZonesInfo::faceZoneType> fzTypes(2);
+        fzTypes[0] = surfaceZonesInfo::INTERNAL;
+        fzTypes[1] = surfaceZonesInfo::BAFFLE;
+        internalOrBaffleFaceZones = meshRefiner_.getZones(fzTypes);
+    }
+
+    // faceZones of type internal (for checking mesh quality across and
+    // merging baffles)
+    const labelList internalFaceZones
+    (
+        meshRefiner_.getZones
+        (
+            List<surfaceZonesInfo::faceZoneType>
+            (
+                1,
+                surfaceZonesInfo::INTERNAL
+            )
+        )
+    );
+
     // Create baffles (pairs of faces that share the same points)
     // Baffles stored as owner and neighbour face that have been created.
     List<labelPair> baffles;
-    meshRefiner_.createZoneBaffles
-    (
-        globalToMasterPatch_,
-        globalToSlavePatch_,
-        baffles
-    );
-
-    if (debug&meshRefinement::MESH)
     {
-        const_cast<Time&>(mesh.time())++;
-        Info<< "Writing baffled mesh to time "
-            << meshRefiner_.timeName() << endl;
-        meshRefiner_.write
+        labelList originatingFaceZone;
+        meshRefiner_.createZoneBaffles
         (
-            meshRefinement::debugType(debug),
-            meshRefinement::writeType
-            (
-                meshRefinement::writeLevel()
-              | meshRefinement::WRITEMESH
-            ),
-            mesh.time().path()/meshRefiner_.timeName()
+            identity(mesh.faceZones().size()),
+            baffles,
+            originatingFaceZone
         );
+
+        if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
+        {
+            const_cast<Time&>(mesh.time())++;
+            Info<< "Writing baffled mesh to time "
+                << meshRefiner_.timeName() << endl;
+            meshRefiner_.write
+            (
+                meshRefinement::debugType(debug),
+                meshRefinement::writeType
+                (
+                    meshRefinement::writeLevel()
+                  | meshRefinement::WRITEMESH
+                ),
+                mesh.time().path()/meshRefiner_.timeName()
+            );
+        }
     }
 
 
+    // Duplicate points on faceZones of type boundary. Should normally already
+    // be done by snapping phase
+    {
+        autoPtr<mapPolyMesh> map = meshRefiner_.dupNonManifoldBoundaryPoints();
+        if (map.valid())
+        {
+            const labelList& reverseFaceMap = map().reverseFaceMap();
+            forAll(baffles, i)
+            {
+                label f0 = reverseFaceMap[baffles[i].first()];
+                label f1 = reverseFaceMap[baffles[i].second()];
+                baffles[i] = labelPair(f0, f1);
+            }
+        }
+    }
+
+
+
+    // Now we have all patches determine the number of layer per patch
+    // This will be layerParams.numLayers() except for faceZones where one
+    // side does get layers and the other not in which case we want to
+    // suppress movement by explicitly setting numLayers 0
+    labelList numLayers(layerParams.numLayers());
+    {
+        labelHashSet layerIDs(patchIDs);
+        forAll(mesh.faceZones(), zoneI)
+        {
+            label mpI, spI;
+            surfaceZonesInfo::faceZoneType fzType;
+            bool hasInfo = meshRefiner_.getFaceZoneInfo
+            (
+                mesh.faceZones()[zoneI].name(),
+                mpI,
+                spI,
+                fzType
+            );
+            if (hasInfo)
+            {
+                const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+                if (layerIDs.found(mpI) && !layerIDs.found(spI))
+                {
+                    // Only layers on master side. Fix points on slave side
+                    Info<< "On faceZone " << mesh.faceZones()[zoneI].name()
+                        << " adding layers to master patch " << pbm[mpI].name()
+                        << " only. Freezing points on slave patch "
+                        << pbm[spI].name() << endl;
+                    numLayers[spI] = 0;
+                }
+                else if (!layerIDs.found(mpI) && layerIDs.found(spI))
+                {
+                    // Only layers on slave side. Fix points on master side
+                    Info<< "On faceZone " << mesh.faceZones()[zoneI].name()
+                        << " adding layers to slave patch " << pbm[spI].name()
+                        << " only. Freezing points on master patch "
+                        << pbm[mpI].name() << endl;
+                    numLayers[mpI] = 0;
+                }
+            }
+        }
+    }
+
+
+
+    // Duplicate points on faceZones that layers are added to
+    labelList pointToDuplicate;
+
+    {
+        // Check outside of baffles for non-manifoldness
+        PackedBoolList duplicatePoint(mesh.nPoints());
+        {
+            // Do full analysis to see if we need to extrude points
+            // so have to duplicate them
+            autoPtr<indirectPrimitivePatch> pp
+            (
+                meshRefinement::makePatch
+                (
+                    mesh,
+                    patchIDs
+                )
+            );
+
+            // Displacement for all pp.localPoints. Set to large value to
+            // avoid truncation in syncPatchDisplacement because of
+            // minThickness.
+            vectorField patchDisp(pp().nPoints(), vector(GREAT, GREAT, GREAT));
+            labelList patchNLayers(pp().nPoints(), 0);
+            label nIdealTotAddedCells = 0;
+            List<extrudeMode> extrudeStatus(pp().nPoints(), EXTRUDE);
+            // Get number of layers per point from number of layers per patch
+            setNumLayers
+            (
+                numLayers,              // per patch the num layers
+                patchIDs,               // patches that are being moved
+                pp,                     // indirectpatch for all faces moving
+
+                patchDisp,
+                patchNLayers,
+                extrudeStatus,
+                nIdealTotAddedCells
+            );
+            // Make sure displacement is equal on both sides of coupled patches.
+            // Note that we explicitly disable the minThickness truncation
+            // of the patchDisp here.
+            syncPatchDisplacement
+            (
+                pp,
+                scalarField(patchDisp.size(), 0.0), //minThickness,
+                patchDisp,
+                patchNLayers,
+                extrudeStatus
+            );
+
+            forAll(extrudeStatus, patchPointI)
+            {
+                if (extrudeStatus[patchPointI] != NOEXTRUDE)
+                {
+                    duplicatePoint[pp().meshPoints()[patchPointI]] = 1;
+                }
+            }
+        }
+
+
+        // Duplicate points only if all points agree
+        syncTools::syncPointList
+        (
+            mesh,
+            duplicatePoint,
+            andEqOp<unsigned int>(),    // combine op
+            0u                          // null value
+        );
+        label n = duplicatePoint.count();
+        labelList candidatePoints(n);
+        n = 0;
+        forAll(duplicatePoint, pointI)
+        {
+            if (duplicatePoint[pointI])
+            {
+                candidatePoints[n++] = pointI;
+            }
+        }
+
+        // Not duplicate points on either side of baffles that don't get any
+        // layers
+        labelPairList nonDupBaffles;
+
+        {
+            // faceZones that are not being duplicated
+            DynamicList<label> nonDupZones(mesh.faceZones().size());
+
+            labelHashSet layerIDs(patchIDs);
+            forAll(mesh.faceZones(), zoneI)
+            {
+                label mpI, spI;
+                surfaceZonesInfo::faceZoneType fzType;
+                bool hasInfo = meshRefiner_.getFaceZoneInfo
+                (
+                    mesh.faceZones()[zoneI].name(),
+                    mpI,
+                    spI,
+                    fzType
+                );
+                if (hasInfo && !layerIDs.found(mpI) && !layerIDs.found(spI))
+                {
+                    nonDupZones.append(zoneI);
+                }
+            }
+            nonDupBaffles = meshRefinement::subsetBaffles
+            (
+                mesh,
+                nonDupZones,
+                localPointRegion::findDuplicateFacePairs(mesh)
+            );
+        }
+
+
+        const localPointRegion regionSide(mesh, nonDupBaffles, candidatePoints);
+
+        autoPtr<mapPolyMesh> map = meshRefiner_.dupNonManifoldPoints
+        (
+            regionSide
+        );
+
+        if (map.valid())
+        {
+            // Store point duplication
+            pointToDuplicate.setSize(mesh.nPoints(), -1);
+
+            const labelList& pointMap = map().pointMap();
+            const labelList& reversePointMap = map().reversePointMap();
+
+            forAll(pointMap, pointI)
+            {
+                label oldPointI = pointMap[pointI];
+                label newMasterPointI = reversePointMap[oldPointI];
+
+                if (newMasterPointI != pointI)
+                {
+                    // Found slave. Mark both master and slave
+                    pointToDuplicate[pointI] = newMasterPointI;
+                    pointToDuplicate[newMasterPointI] = newMasterPointI;
+                }
+            }
+
+            // Update baffle numbering
+            {
+                const labelList& reverseFaceMap = map().reverseFaceMap();
+                forAll(baffles, i)
+                {
+                    label f0 = reverseFaceMap[baffles[i].first()];
+                    label f1 = reverseFaceMap[baffles[i].second()];
+                    baffles[i] = labelPair(f0, f1);
+                }
+            }
+
+
+            if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
+            {
+                const_cast<Time&>(mesh.time())++;
+                Info<< "Writing point-duplicate mesh to time "
+                    << meshRefiner_.timeName() << endl;
+
+                meshRefiner_.write
+                (
+                    meshRefinement::debugType(debug),
+                    meshRefinement::writeType
+                    (
+                        meshRefinement::writeLevel()
+                      | meshRefinement::WRITEMESH
+                    ),
+                    mesh.time().path()/meshRefiner_.timeName()
+                );
+
+                OBJstream str
+                (
+                    mesh.time().path()
+                  / "duplicatePoints_"
+                  + meshRefiner_.timeName()
+                  + ".obj"
+                );
+                Info<< "Writing point-duplicates to " << str.name() << endl;
+                const pointField& p = mesh.points();
+                forAll(pointMap, pointI)
+                {
+                    label newMasterI = reversePointMap[pointMap[pointI]];
+
+                    if (newMasterI != pointI)
+                    {
+                        str.write(linePointRef(p[pointI], p[newMasterI]));
+                    }
+                }
+            }
+        }
+    }
+
+
+    // Add layers to patches
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // Now we have
+    // - mesh with optional baffles and duplicated points for faceZones
+    //   where layers are to be added
+    // - pointToDuplicate : correspondence for duplicated points
+    // - baffles          : list of pairs of faces
+
+
     autoPtr<indirectPrimitivePatch> pp
     (
         meshRefinement::makePatch
@@ -2916,22 +3281,29 @@ void Foam::autoLayerDriver::addLayers
     // Determine patches for extruded boundary edges. Calculates if any
     // additional processor patches need to be constructed.
 
-    labelList sidePatchID;
+    labelList edgePatchID;
+    labelList edgeZoneID;
+    boolList edgeFlip;
+    labelList inflateFaceID;
     determineSidePatches
     (
         globalFaces,
         edgeGlobalFaces,
         pp,
 
-        sidePatchID
+        edgePatchID,
+        edgeZoneID,
+        edgeFlip,
+        inflateFaceID
     );
 
 
     // Point-wise extrusion data
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Displacement for all pp.localPoints.
-    vectorField patchDisp(pp().nPoints(), vector::one);
+    // Displacement for all pp.localPoints. Set to large value so does
+    // not trigger the minThickness truncation (see syncPatchDisplacement below)
+    vectorField patchDisp(pp().nPoints(), vector(GREAT, GREAT, GREAT));
 
     // Number of layers for all pp.localPoints. Note: only valid if
     // extrudeStatus = EXTRUDE.
@@ -2945,12 +3317,12 @@ void Foam::autoLayerDriver::addLayers
 
 
     {
-        // Get number of layer per point from number of layers per patch
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Get number of layers per point from number of layers per patch
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         setNumLayers
         (
-            layerParams.numLayers(),    // per patch the num layers
+            numLayers,                  // per patch the num layers
             patchIDs,                   // patches that are being moved
             pp,                         // indirectpatch for all faces moving
 
@@ -3077,41 +3449,6 @@ void Foam::autoLayerDriver::addLayers
 
 
 
-    // Overall displacement field
-    pointVectorField displacement
-    (
-        makeLayerDisplacementField
-        (
-            pointMesh::New(mesh),
-            layerParams.numLayers()
-        )
-    );
-
-    // Allocate run-time selectable mesh mover
-    autoPtr<externalDisplacementMeshMover> medialAxisMoverPtr;
-    {
-        // Set up controls for meshMover
-        dictionary combinedDict(layerParams.dict());
-        // Add mesh quality constraints
-        combinedDict.merge(motionDict);
-        // Where to get minThickness from
-        combinedDict.add("minThicknessName", minThickness.name());
-
-        // Take over patchDisp as boundary conditions on displacement
-        // pointVectorField
-        medialAxisMoverPtr = externalDisplacementMeshMover::New
-        (
-            layerParams.meshShrinker(),
-            combinedDict,
-            baffles,
-            displacement
-        );
-    }
-
-
-    // Saved old points
-    pointField oldPoints(mesh.points());
-
     // Current set of topology changes. (changing mesh clears out
     // polyTopoChange)
     polyTopoChange savedMeshMod(mesh.boundaryMesh().size());
@@ -3127,127 +3464,505 @@ void Foam::autoLayerDriver::addLayers
     }
 
 
-    for (label iteration = 0; iteration < layerParams.nLayerIter(); iteration++)
     {
-        Info<< nl
-            << "Layer addition iteration " << iteration << nl
-            << "--------------------------" << endl;
-
-
-        // Unset the extrusion at the pp.
-        const dictionary& meshQualityDict =
+        // Overall displacement field
+        pointVectorField displacement
         (
-            iteration < layerParams.nRelaxedIter()
-          ? motionDict
-          : motionDict.subDict("relaxed")
-        );
-
-        if (iteration >= layerParams.nRelaxedIter())
-        {
-            Info<< "Switched to relaxed meshQuality constraints." << endl;
-        }
-
-
-
-        // Make sure displacement is equal on both sides of coupled patches.
-        syncPatchDisplacement
-        (
-            pp,
-            minThickness,
-            patchDisp,
-            patchNLayers,
-            extrudeStatus
-        );
-
-        // Displacement acc. to pointnormals
-        getPatchDisplacement
-        (
-            pp,
-            thickness,
-            minThickness,
-            patchDisp,
-            patchNLayers,
-            extrudeStatus
-        );
-
-        // Shrink mesh by displacement value first.
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        {
-            pointField oldPatchPos(pp().localPoints());
-
-            // Take over patchDisp into pointDisplacement field and
-            // adjust both for multi-patch constraints
-            motionSmootherAlgo::setDisplacement
+            makeLayerDisplacementField
             (
-                patchIDs,
-                pp,
-                patchDisp,
-                displacement
-            );
-
-
-            // Move mesh
-            // ~~~~~~~~~
+                pointMesh::New(mesh),
+                numLayers
+            )
+        );
 
+        // Allocate run-time selectable mesh mover
+        autoPtr<externalDisplacementMeshMover> medialAxisMoverPtr;
+        {
             // Set up controls for meshMover
             dictionary combinedDict(layerParams.dict());
-            // Add standard quality constraints
+            // Add mesh quality constraints
             combinedDict.merge(motionDict);
-            // Add relaxed constraints (overrides standard ones)
-            combinedDict.merge(meshQualityDict);
             // Where to get minThickness from
             combinedDict.add("minThicknessName", minThickness.name());
 
-            labelList checkFaces(identity(mesh.nFaces()));
-            medialAxisMoverPtr().move
+            const List<labelPair> internalBaffles
             (
-                combinedDict,
-                nAllowableErrors,
-                checkFaces
+                meshRefinement::subsetBaffles
+                (
+                    mesh,
+                    internalFaceZones,
+                    localPointRegion::findDuplicateFacePairs(mesh)
+                )
             );
 
-            pp().movePoints(mesh.points());
-
-            // Update patchDisp (since not all might have been honoured)
-            patchDisp = oldPatchPos - pp().localPoints();
+            // Take over patchDisp as boundary conditions on displacement
+            // pointVectorField
+            medialAxisMoverPtr = externalDisplacementMeshMover::New
+            (
+                layerParams.meshShrinker(),
+                combinedDict,
+                internalBaffles,
+                displacement
+            );
         }
 
-        // Truncate displacements that are too small (this will do internal
-        // ones, coupled ones have already been truncated by
-        // syncPatchDisplacement)
-        faceSet dummySet(mesh, "wrongPatchFaces", 0);
-        truncateDisplacement
+
+        // Saved old points
+        const pointField oldPoints(mesh.points());
+
+        for
         (
-            globalFaces,
-            edgeGlobalFaces,
-            pp,
-            minThickness,
-            dummySet,
-            patchDisp,
-            patchNLayers,
-            extrudeStatus
-        );
-
-
-        // Dump to .obj file for debugging.
-        if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
+            label iteration = 0;
+            iteration < layerParams.nLayerIter();
+            iteration++
+        )
         {
-            dumpDisplacement
+            Info<< nl
+                << "Layer addition iteration " << iteration << nl
+                << "--------------------------" << endl;
+
+
+            // Unset the extrusion at the pp.
+            const dictionary& meshQualityDict =
             (
-                mesh.time().path()/"layer_" + meshRefiner_.timeName(),
-                pp(),
+                iteration < layerParams.nRelaxedIter()
+              ? motionDict
+              : motionDict.subDict("relaxed")
+            );
+
+            if (iteration >= layerParams.nRelaxedIter())
+            {
+                Info<< "Switched to relaxed meshQuality constraints." << endl;
+            }
+
+
+
+            // Make sure displacement is equal on both sides of coupled patches.
+            // Note that this also does the patchDisp < minThickness truncation
+            // so for the first pass make sure the patchDisp is larger than
+            // that.
+            syncPatchDisplacement
+            (
+                pp,
+                minThickness,
                 patchDisp,
+                patchNLayers,
                 extrudeStatus
             );
 
+            // Displacement acc. to pointnormals
+            getPatchDisplacement
+            (
+                pp,
+                thickness,
+                minThickness,
+                patchDisp,
+                patchNLayers,
+                extrudeStatus
+            );
+
+            // Shrink mesh by displacement value first.
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            {
+                const pointField oldPatchPos(pp().localPoints());
+
+                // We have patchDisp which is the outwards pointing
+                // extrusion distance. Convert into an inwards pointing
+                // shrink distance
+                patchDisp = -patchDisp;
+
+                // Take over patchDisp into pointDisplacement field and
+                // adjust both for multi-patch constraints
+                motionSmootherAlgo::setDisplacement
+                (
+                    patchIDs,
+                    pp,
+                    patchDisp,
+                    displacement
+                );
+
+
+                // Move mesh
+                // ~~~~~~~~~
+
+                // Set up controls for meshMover
+                dictionary combinedDict(layerParams.dict());
+                // Add standard quality constraints
+                combinedDict.merge(motionDict);
+                // Add relaxed constraints (overrides standard ones)
+                combinedDict.merge(meshQualityDict);
+                // Where to get minThickness from
+                combinedDict.add("minThicknessName", minThickness.name());
+
+                labelList checkFaces(identity(mesh.nFaces()));
+                medialAxisMoverPtr().move
+                (
+                    combinedDict,
+                    nAllowableErrors,
+                    checkFaces
+                );
+
+                pp().movePoints(mesh.points());
+
+                // Update patchDisp (since not all might have been honoured)
+                patchDisp = oldPatchPos - pp().localPoints();
+            }
+
+            // Truncate displacements that are too small (this will do internal
+            // ones, coupled ones have already been truncated by
+            // syncPatchDisplacement)
+            faceSet dummySet(mesh, "wrongPatchFaces", 0);
+            truncateDisplacement
+            (
+                globalFaces,
+                edgeGlobalFaces,
+                pp,
+                minThickness,
+                dummySet,
+                patchDisp,
+                patchNLayers,
+                extrudeStatus
+            );
+
+
+            // Dump to .obj file for debugging.
+            if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
+            {
+                dumpDisplacement
+                (
+                    mesh.time().path()/"layer_" + meshRefiner_.timeName(),
+                    pp(),
+                    patchDisp,
+                    extrudeStatus
+                );
+
+                const_cast<Time&>(mesh.time())++;
+                Info<< "Writing shrunk mesh to time "
+                    << meshRefiner_.timeName() << endl;
+
+                // See comment in autoSnapDriver why we should not remove
+                // meshPhi using mesh.clearOut().
+
+                meshRefiner_.write
+                (
+                    meshRefinement::debugType(debug),
+                    meshRefinement::writeType
+                    (
+                        meshRefinement::writeLevel()
+                      | meshRefinement::WRITEMESH
+                    ),
+                    mesh.time().path()/meshRefiner_.timeName()
+                );
+            }
+
+
+            // Mesh topo change engine. Insert current mesh.
+            polyTopoChange meshMod(mesh);
+
+            // Grow layer of cells on to patch. Handles zero sized displacement.
+            addPatchCellLayer addLayer(mesh);
+
+            // Determine per point/per face number of layers to extrude. Also
+            // handles the slow termination of layers when going switching
+            // layers
+
+            labelList nPatchPointLayers(pp().nPoints(), -1);
+            labelList nPatchFaceLayers(pp().size(), -1);
+            setupLayerInfoTruncation
+            (
+                pp,
+                patchNLayers,
+                extrudeStatus,
+                layerParams.nBufferCellsNoExtrude(),
+                nPatchPointLayers,
+                nPatchFaceLayers
+            );
+
+            // Calculate displacement for final layer for addPatchLayer.
+            // (layer of cells next to the original mesh)
+            vectorField finalDisp(patchNLayers.size(), vector::zero);
+
+            forAll(nPatchPointLayers, i)
+            {
+                scalar ratio = layerParams.finalLayerThicknessRatio
+                (
+                    nPatchPointLayers[i],
+                    expansionRatio[i]
+                );
+                finalDisp[i] = ratio*patchDisp[i];
+            }
+
+
+            const scalarField invExpansionRatio(1.0/expansionRatio);
+
+            // Add topo regardless of whether extrudeStatus is extruderemove.
+            // Not add layer if patchDisp is zero.
+            addLayer.setRefinement
+            (
+                globalFaces,
+                edgeGlobalFaces,
+
+                invExpansionRatio,
+                pp(),
+
+                edgePatchID,    // boundary patch for extruded boundary edges
+                edgeZoneID,     // zone for extruded edges
+                edgeFlip,
+                inflateFaceID,
+
+
+                labelList(0),   // exposed patchIDs, not used for adding layers
+                nPatchFaceLayers,   // layers per face
+                nPatchPointLayers,  // layers per point
+                finalDisp,      // thickness of layer nearest internal mesh
+                meshMod
+            );
+
+            if (debug)
+            {
+                const_cast<Time&>(mesh.time())++;
+            }
+
+            // Store mesh changes for if mesh is correct.
+            savedMeshMod = meshMod;
+
+
+            // With the stored topo changes we create a new mesh so we can
+            // undo if neccesary.
+
+            autoPtr<fvMesh> newMeshPtr;
+            autoPtr<mapPolyMesh> map = meshMod.makeMesh
+            (
+                newMeshPtr,
+                IOobject
+                (
+                    //mesh.name()+"_layer",
+                    mesh.name(),
+                    static_cast<polyMesh&>(mesh).instance(),
+                    mesh.time(),  // register with runTime
+                    IOobject::NO_READ,
+                    static_cast<polyMesh&>(mesh).writeOpt()
+                ),              // io params from original mesh but new name
+                mesh,           // original mesh
+                true            // parallel sync
+            );
+            fvMesh& newMesh = newMeshPtr();
+
+            //?neccesary? Update fields
+            newMesh.updateMesh(map);
+
+            newMesh.setInstance(meshRefiner_.timeName());
+
+            // Update numbering on addLayer:
+            // - cell/point labels to be newMesh.
+            // - patchFaces to remain in oldMesh order.
+            addLayer.updateMesh
+            (
+                map,
+                identity(pp().size()),
+                identity(pp().nPoints())
+            );
+
+            // Collect layer faces and cells for outside loop.
+            getLayerCellsFaces
+            (
+                newMesh,
+                addLayer,
+                avgPointData(pp, mag(patchDisp))(), // current thickness
+
+                cellNLayers,
+                faceRealThickness
+            );
+
+
+            // Count number of added cells
+            label nAddedCells = 0;
+            forAll(cellNLayers, cellI)
+            {
+                if (cellNLayers[cellI] > 0)
+                {
+                    nAddedCells++;
+                }
+            }
+
+
+            if (debug&meshRefinement::MESH)
+            {
+                Info<< "Writing layer mesh to time " << meshRefiner_.timeName()
+                    << endl;
+                newMesh.write();
+                writeLayerSets(newMesh, cellNLayers, faceRealThickness);
+
+                // Reset the instance of the original mesh so next iteration
+                // it dumps a complete mesh. This is just so that the inbetween
+                // newMesh does not upset e.g. paraFoam cycling through the
+                // times.
+                mesh.setInstance(meshRefiner_.timeName());
+            }
+
+
+            //- Get baffles in newMesh numbering. Note that we cannot detect
+            //  baffles here since the points are duplicated
+            List<labelPair> internalBaffles;
+            {
+                // From old mesh face to corresponding newMesh boundary face
+                labelList meshToNewMesh(mesh.nFaces(), -1);
+                for
+                (
+                    label faceI = newMesh.nInternalFaces();
+                    faceI < newMesh.nFaces();
+                    faceI++
+                )
+                {
+                    label newMeshFaceI = map().faceMap()[faceI];
+                    if (newMeshFaceI != -1)
+                    {
+                        meshToNewMesh[newMeshFaceI] = faceI;
+                    }
+                }
+
+                List<labelPair> newMeshBaffles(baffles.size());
+                label newI = 0;
+                forAll(baffles, i)
+                {
+                    const labelPair& p = baffles[i];
+                    labelPair newMeshBaffle
+                    (
+                        meshToNewMesh[p[0]],
+                        meshToNewMesh[p[1]]
+                    );
+                    if (newMeshBaffle[0] != -1 && newMeshBaffle[1] != -1)
+                    {
+                        newMeshBaffles[newI++] = newMeshBaffle;
+                    }
+                }
+                newMeshBaffles.setSize(newI);
+
+                internalBaffles = meshRefinement::subsetBaffles
+                (
+                    newMesh,
+                    internalFaceZones,
+                    newMeshBaffles
+                );
+
+                Info<< "Detected "
+                    << returnReduce(internalBaffles.size(), sumOp<label>())
+                    << " baffles across faceZones of type internal" << nl
+                    << endl;
+            }
+
+            label nTotChanged = checkAndUnmark
+            (
+                addLayer,
+                meshQualityDict,
+                layerParams.additionalReporting(),
+                internalBaffles,
+                pp(),
+                newMesh,
+
+                patchDisp,
+                patchNLayers,
+                extrudeStatus
+            );
+
+            label nTotExtruded = countExtrusion(pp, extrudeStatus);
+            label nTotFaces = returnReduce(pp().size(), sumOp<label>());
+            label nTotAddedCells = returnReduce(nAddedCells, sumOp<label>());
+
+            Info<< "Extruding " << nTotExtruded
+                << " out of " << nTotFaces
+                << " faces (" << 100.0*nTotExtruded/nTotFaces << "%)."
+                << " Removed extrusion at " << nTotChanged << " faces."
+                << endl
+                << "Added " << nTotAddedCells << " out of "
+                << nIdealTotAddedCells
+                << " cells (" << 100.0*nTotAddedCells/nIdealTotAddedCells
+                << "%)." << endl;
+
+            if (nTotChanged == 0)
+            {
+                break;
+            }
+
+            // Reset mesh points and start again
+            mesh.movePoints(oldPoints);
+            pp().movePoints(mesh.points());
+            medialAxisMoverPtr().movePoints(mesh.points());
+
+            // Grow out region of non-extrusion
+            for (label i = 0; i < layerParams.nGrow(); i++)
+            {
+                growNoExtrusion
+                (
+                    pp,
+                    patchDisp,
+                    patchNLayers,
+                    extrudeStatus
+                );
+            }
+
+            Info<< endl;
+        }
+    }
+
+
+    // At this point we have a (shrunk) mesh and a set of topology changes
+    // which will make a valid mesh with layer. Apply these changes to the
+    // current mesh.
+
+    {
+        // Apply the stored topo changes to the current mesh.
+        autoPtr<mapPolyMesh> map = savedMeshMod.changeMesh(mesh, false);
+
+        // Hack to remove meshPhi - mapped incorrectly. TBD.
+        mesh.clearOut();
+
+        // Update fields
+        mesh.updateMesh(map);
+
+        // Move mesh (since morphing does not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes.
+            mesh.clearOut();
+        }
+
+        // Reset the instance for if in overwrite mode
+        mesh.setInstance(meshRefiner_.timeName());
+
+        meshRefiner_.updateMesh(map, labelList(0));
+
+        // Update numbering of faceWantedThickness
+        meshRefinement::updateList
+        (
+            map().faceMap(),
+            scalar(0),
+            faceWantedThickness
+        );
+
+        // Print data now that we still have patches for the zones
+        //if (meshRefinement::outputLevel() & meshRefinement::OUTPUTLAYERINFO)
+        printLayerData
+        (
+            mesh,
+            patchIDs,
+            cellNLayers,
+            faceWantedThickness,
+            faceRealThickness
+        );
+
+
+        // Dump for debugging
+        if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
+        {
             const_cast<Time&>(mesh.time())++;
-            Info<< "Writing shrunk mesh to time "
+            Info<< "Writing mesh with layers but disconnected to time "
                 << meshRefiner_.timeName() << endl;
-
-            // See comment in autoSnapDriver why we should not remove meshPhi
-            // using mesh.clearOut().
-
             meshRefiner_.write
             (
                 meshRefinement::debugType(debug),
@@ -3261,288 +3976,243 @@ void Foam::autoLayerDriver::addLayers
         }
 
 
-        // Mesh topo change engine
-        polyTopoChange meshMod(mesh);
-
-        // Grow layer of cells on to patch. Handles zero sized displacement.
-        addPatchCellLayer addLayer(mesh);
-
-        // Determine per point/per face number of layers to extrude. Also
-        // handles the slow termination of layers when going switching layers
-
-        labelList nPatchPointLayers(pp().nPoints(), -1);
-        labelList nPatchFaceLayers(pp().size(), -1);
-        setupLayerInfoTruncation
-        (
-            pp,
-            patchNLayers,
-            extrudeStatus,
-            layerParams.nBufferCellsNoExtrude(),
-            nPatchPointLayers,
-            nPatchFaceLayers
-        );
-
-        // Calculate displacement for final layer for addPatchLayer.
-        // (layer of cells next to the original mesh)
-        vectorField finalDisp(patchNLayers.size(), vector::zero);
-
-        forAll(nPatchPointLayers, i)
-        {
-            scalar ratio = layerParams.finalLayerThicknessRatio
-            (
-                nPatchPointLayers[i],
-                expansionRatio[i]
-            );
-            finalDisp[i] = ratio*patchDisp[i];
-        }
-
-
-        const scalarField invExpansionRatio(1.0/expansionRatio);
-
-        // Add topo regardless of whether extrudeStatus is extruderemove.
-        // Not add layer if patchDisp is zero.
-        addLayer.setRefinement
-        (
-            globalFaces,
-            edgeGlobalFaces,
-
-            invExpansionRatio,
-            pp(),
-            sidePatchID,        // boundary patch for extruded boundary edges
-            labelList(0),       // exposed patchIDs, not used for adding layers
-            nPatchFaceLayers,   // layers per face
-            nPatchPointLayers,  // layers per point
-            finalDisp,          // thickness of layer nearest internal mesh
-            meshMod
-        );
-
-        if (debug)
-        {
-            const_cast<Time&>(mesh.time())++;
-        }
-
-        // Store mesh changes for if mesh is correct.
-        savedMeshMod = meshMod;
-
-
-        // With the stored topo changes we create a new mesh so we can
-        // undo if neccesary.
-
-        autoPtr<fvMesh> newMeshPtr;
-        autoPtr<mapPolyMesh> map = meshMod.makeMesh
-        (
-            newMeshPtr,
-            IOobject
-            (
-                //mesh.name()+"_layer",
-                mesh.name(),
-                static_cast<polyMesh&>(mesh).instance(),
-                mesh.time(),  // register with runTime
-                IOobject::NO_READ,
-                static_cast<polyMesh&>(mesh).writeOpt()
-            ),              // io params from original mesh but new name
-            mesh,           // original mesh
-            true            // parallel sync
-        );
-        fvMesh& newMesh = newMeshPtr();
-
-        //?neccesary? Update fields
-        newMesh.updateMesh(map);
-
-        newMesh.setInstance(meshRefiner_.timeName());
-
-        // Update numbering on addLayer:
-        // - cell/point labels to be newMesh.
-        // - patchFaces to remain in oldMesh order.
-        addLayer.updateMesh
-        (
-            map,
-            identity(pp().size()),
-            identity(pp().nPoints())
-        );
 
         // Update numbering of baffles
-        List<labelPair> newMeshBaffles(baffles.size());
-        forAll(baffles, i)
         {
-            const labelPair& p = baffles[i];
-            newMeshBaffles[i][0] = map().reverseFaceMap()[p[0]];
-            newMeshBaffles[i][1] = map().reverseFaceMap()[p[1]];
-        }
-
-        // Collect layer faces and cells for outside loop.
-        getLayerCellsFaces
-        (
-            newMesh,
-            addLayer,
-            avgPointData(pp, mag(patchDisp))(), // current thickness
-
-            cellNLayers,
-            faceRealThickness
-        );
-
-
-        // Count number of added cells
-        label nAddedCells = 0;
-        forAll(cellNLayers, cellI)
-        {
-            if (cellNLayers[cellI] > 0)
-            {
-                nAddedCells++;
-            }
-        }
-
-
-        if (debug&meshRefinement::MESH)
-        {
-            Info<< "Writing layer mesh to time " << meshRefiner_.timeName()
-                << endl;
-            newMesh.write();
-
-            cellSet addedCellSet(newMesh, "addedCells", nAddedCells);
-            forAll(cellNLayers, cellI)
-            {
-                if (cellNLayers[cellI] > 0)
-                {
-                    addedCellSet.insert(cellI);
-                }
-            }
-            addedCellSet.instance() = meshRefiner_.timeName();
-            Info<< "Writing "
-                << returnReduce(addedCellSet.size(), sumOp<label>())
-                << " added cells to cellSet " << addedCellSet.name() << endl;
-            addedCellSet.write();
-
-            faceSet layerFacesSet(newMesh, "layerFaces", newMesh.nFaces()/100);
-            for (label faceI = 0; faceI < newMesh.nInternalFaces(); faceI++)
-            {
-                if (faceRealThickness[faceI] > 0)
-                {
-                    layerFacesSet.insert(faceI);
-                }
-            }
-            layerFacesSet.instance() = meshRefiner_.timeName();
-            Info<< "Writing "
-                << returnReduce(layerFacesSet.size(), sumOp<label>())
-                << " faces inside added layer to faceSet "
-                << layerFacesSet.name() << endl;
-            layerFacesSet.write();
-        }
-
-
-        label nTotChanged = checkAndUnmark
-        (
-            addLayer,
-            meshQualityDict,
-            layerParams.additionalReporting(),
-            newMeshBaffles,
-            pp(),
-            newMesh,
-
-            patchDisp,
-            patchNLayers,
-            extrudeStatus
-        );
-
-        label nTotExtruded = countExtrusion(pp, extrudeStatus);
-        label nTotFaces = returnReduce(pp().size(), sumOp<label>());
-        label nTotAddedCells = returnReduce(nAddedCells, sumOp<label>());
-
-        Info<< "Extruding " << nTotExtruded
-            << " out of " << nTotFaces
-            << " faces (" << 100.0*nTotExtruded/nTotFaces << "%)."
-            << " Removed extrusion at " << nTotChanged << " faces."
-            << endl
-            << "Added " << nTotAddedCells << " out of " << nIdealTotAddedCells
-            << " cells (" << 100.0*nTotAddedCells/nIdealTotAddedCells << "%)."
-            << endl;
-
-        if (nTotChanged == 0)
-        {
-            break;
-        }
-
-        // Reset mesh points and start again
-        mesh.movePoints(oldPoints);
-        pp().movePoints(mesh.points());
-
-        // Grow out region of non-extrusion
-        for (label i = 0; i < layerParams.nGrow(); i++)
-        {
-            growNoExtrusion
+            // From old mesh face to corresponding newMesh boundary face.
+            // (we cannot just use faceMap or reverseFaceMap here since
+            //  multiple faces originate from the old face)
+            labelList oldMeshToNewMesh(map().nOldFaces(), -1);
+            for
             (
-                pp,
-                patchDisp,
-                patchNLayers,
-                extrudeStatus
-            );
+                label faceI = mesh.nInternalFaces();
+                faceI < mesh.nFaces();
+                faceI++
+            )
+            {
+                label oldFaceI = map().faceMap()[faceI];
+
+                if (oldFaceI != -1)
+                {
+                    oldMeshToNewMesh[oldFaceI] = faceI;
+                }
+            }
+
+            label newI = 0;
+            forAll(baffles, i)
+            {
+                const labelPair& p = baffles[i];
+
+                labelPair newB(oldMeshToNewMesh[p[0]], oldMeshToNewMesh[p[1]]);
+                if (newB[0] != -1 && newB[1] != -1)
+                {
+                    baffles[newI++] = newB;
+                }
+            }
+            baffles.setSize(newI);
         }
 
-        Info<< endl;
+
+
+        // Update numbering of pointToDuplicate
+        if (returnReduce(pointToDuplicate.size(), sumOp<label>()))
+        {
+            // The problem is that pointToDuplicate is valid for the old
+            // boundary points which are now internal. We need to find the
+            // corresponding new boundary point.
+
+
+            List<labelPair> mergePointBaffles
+            (
+                meshRefinement::subsetBaffles
+                (
+                    mesh,
+                    internalOrBaffleFaceZones,
+                    baffles
+                )
+            );
+            Info<< "Detected "
+                << returnReduce(mergePointBaffles.size(), sumOp<label>())
+                << " baffles to merge points across" << nl << endl;
+
+
+            label nPointPairs = 0;
+            forAll(pointToDuplicate, oldPointI)
+            {
+                label otherOldPointI = pointToDuplicate[oldPointI];
+                if (otherOldPointI != -1)
+                {
+                    nPointPairs++;
+                }
+            }
+
+            const labelList& pointMap = map().pointMap();
+
+            // 1. Construct map from old (possibly) internal point to
+            //    new boundary point
+            Map<label> oldPointToBoundaryPoint(2*nPointPairs);
+
+            forAll(mergePointBaffles, i)
+            {
+                const labelPair& baffle = mergePointBaffles[i];
+                forAll(baffle, j)
+                {
+                    const face& f = mesh.faces()[baffle[j]];
+                    forAll(f, fp)
+                    {
+                        label pointI = f[fp];
+                        label oldPointI = pointMap[pointI];
+                        if (pointToDuplicate[oldPointI] != -1)
+                        {
+                            oldPointToBoundaryPoint.insert(oldPointI, pointI);
+                        }
+                    }
+                }
+            }
+
+
+            // 2. Pick up old internal point
+
+            labelList oldPointToDuplicate(pointToDuplicate.xfer());
+            pointToDuplicate.setSize(mesh.nPoints(), -1);
+
+            forAll(mergePointBaffles, i)
+            {
+                const labelPair& baffle = mergePointBaffles[i];
+                forAll(baffle, j)
+                {
+                    const face& f = mesh.faces()[baffle[j]];
+                    forAll(f, fp)
+                    {
+                        label pointI = f[fp];
+                        label oldPointI = pointMap[pointI];
+                        label oldDupI = oldPointToDuplicate[oldPointI];
+                        if (oldDupI != -1)
+                        {
+                            label newPointI = oldPointToBoundaryPoint[oldDupI];
+                            pointToDuplicate[pointI] = newPointI;
+                        }
+                    }
+                }
+            }
+
+
+            // Check
+            forAll(pointToDuplicate, pointI)
+            {
+                label dupI = pointToDuplicate[pointI];
+                if (dupI != -1)
+                {
+                    const point& pt = mesh.points()[pointI];
+                    const point& dupPt = mesh.points()[dupI];
+                    if (mag(pt-dupPt) > meshRefiner_.mergeDistance())
+                    {
+                        WarningInFunction
+                            << "Trying to merge points "
+                            << pointI << " at:" << pt
+                            << "and " << dupI << " at:" << dupPt
+                            << " distance " << mag(pt-dupPt)
+                            << endl;
+                    }
+                }
+            }
+        }
     }
 
-
-    // At this point we have a (shrunk) mesh and a set of topology changes
-    // which will make a valid mesh with layer. Apply these changes to the
-    // current mesh.
-
-    // Apply the stored topo changes to the current mesh.
-    autoPtr<mapPolyMesh> map = savedMeshMod.changeMesh(mesh, false);
-
-    // Hack to remove meshPhi - mapped incorrectly. TBD.
-    mesh.clearOut();
-
-    // Update fields
-    mesh.updateMesh(map);
-
-    // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
+    // Count duplicate points
+    label nPointPairs = 0;
+    forAll(pointToDuplicate, pointI)
     {
-        mesh.movePoints(map().preMotionPoints());
+        label otherPointI = pointToDuplicate[pointI];
+        if (otherPointI != -1)
+        {
+            nPointPairs++;
+        }
     }
-    else
+    reduce(nPointPairs, sumOp<label>());
+    if (nPointPairs > 0)
     {
-        // Delete mesh volumes.
-        mesh.clearOut();
+        // Merge any duplicated points
+        Info<< "Merging " << nPointPairs << " duplicated points ..." << endl;
+
+        if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
+        {
+            OBJstream str
+            (
+                mesh.time().path()
+              / "mergePoints_"
+              + meshRefiner_.timeName()
+              + ".obj"
+            );
+            Info<< "Points to be merged to " << str.name() << endl;
+            forAll(pointToDuplicate, pointI)
+            {
+                label otherPointI = pointToDuplicate[pointI];
+                if (otherPointI != -1)
+                {
+                    const point& pt = mesh.points()[pointI];
+                    const point& otherPt = mesh.points()[otherPointI];
+                    str.write(linePointRef(pt, otherPt));
+                }
+            }
+        }
+
+
+        autoPtr<mapPolyMesh> map = meshRefiner_.mergePoints(pointToDuplicate);
+        if (map.valid())
+        {
+            inplaceReorder(map().reverseCellMap(), cellNLayers);
+
+            const labelList& reverseFaceMap = map().reverseFaceMap();
+            inplaceReorder(reverseFaceMap, faceWantedThickness);
+            inplaceReorder(reverseFaceMap, faceRealThickness);
+
+            Info<< "Merged points in = "
+                << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+        }
     }
 
-    // Reset the instance for if in overwrite mode
-    mesh.setInstance(meshRefiner_.timeName());
-
-    meshRefiner_.updateMesh(map, labelList(0));
-
-    // Update numbering of faceWantedThickness
-    meshRefinement::updateList(map().faceMap(), scalar(0), faceWantedThickness);
-
-    // Update numbering on baffles
-    forAll(baffles, i)
-    {
-        labelPair& p = baffles[i];
-        p[0] = map().reverseFaceMap()[p[0]];
-        p[1] = map().reverseFaceMap()[p[1]];
-    }
-
-
-    label nBaffles = returnReduce(baffles.size(), sumOp<label>());
-    if (nBaffles > 0)
+    if (mesh.faceZones().size() > 0)
     {
         // Merge any baffles
-        Info<< "Converting " << nBaffles
-            << " baffles back into zoned faces ..."
+        Info<< "Converting baffles back into zoned faces ..."
             << endl;
 
-        autoPtr<mapPolyMesh> map = meshRefiner_.mergeBaffles(baffles);
+        autoPtr<mapPolyMesh> map = meshRefiner_.mergeZoneBaffles
+        (
+            true,   // internal zones
+            false   // baffle zones
+        );
+        if (map.valid())
+        {
+            inplaceReorder(map().reverseCellMap(), cellNLayers);
 
-        inplaceReorder(map().reverseCellMap(), cellNLayers);
-        inplaceReorder(map().reverseFaceMap(), faceWantedThickness);
-        inplaceReorder(map().reverseFaceMap(), faceRealThickness);
+            const labelList& faceMap = map().faceMap();
+
+            // Make sure to keep the max since on two patches only one has
+            // layers.
+            scalarField newFaceRealThickness(mesh.nFaces(), 0.0);
+            scalarField newFaceWantedThickness(mesh.nFaces(), 0.0);
+            forAll(newFaceRealThickness, faceI)
+            {
+                label oldFaceI = faceMap[faceI];
+                if (oldFaceI >= 0)
+                {
+                    scalar& realThick = newFaceRealThickness[faceI];
+                    realThick = max(realThick, faceRealThickness[oldFaceI]);
+                    scalar& wanted = newFaceWantedThickness[faceI];
+                    wanted = max(wanted, faceWantedThickness[oldFaceI]);
+                }
+            }
+            faceRealThickness.transfer(newFaceRealThickness);
+            faceWantedThickness.transfer(newFaceWantedThickness);
+        }
 
         Info<< "Converted baffles in = "
             << meshRefiner_.mesh().time().cpuTimeIncrement()
             << " s\n" << nl << endl;
     }
 
-
     // Do final balancing
     // ~~~~~~~~~~~~~~~~~~
 
@@ -3594,6 +4264,7 @@ void Foam::autoLayerDriver::doLayers
     const dictionary& shrinkDict,
     const dictionary& motionDict,
     const layerParameters& layerParams,
+    const bool mergePatchFaces,
     const bool preBalance,
     decompositionMethod& decomposer,
     fvMeshDistribute& distributor
@@ -3606,10 +4277,15 @@ void Foam::autoLayerDriver::doLayers
         << "----------------------------------" << nl
         << endl;
 
+
     Info<< "Using mesh parameters " << motionDict << nl << endl;
 
     // Merge coplanar boundary faces
-    mergePatchFacesUndo(layerParams, motionDict);
+    if (mergePatchFaces)
+    {
+        mergePatchFacesUndo(layerParams, motionDict);
+    }
+
 
     // Per patch the number of layers (-1 or 0 if no layer)
     const labelList& numLayers = layerParams.numLayers();
@@ -3630,12 +4306,32 @@ void Foam::autoLayerDriver::doLayers
             }
             else
             {
-                WarningIn("autoLayerDriver::doLayers(..)")
+                WarningInFunction
                     << "Ignoring layers on coupled patch " << pp.name()
                     << endl;
             }
         }
     }
+
+    // Add contributions from faceZones that get layers
+    const faceZoneMesh& fZones = mesh.faceZones();
+    forAll(fZones, zoneI)
+    {
+        label mpI, spI;
+        surfaceZonesInfo::faceZoneType fzType;
+        meshRefiner_.getFaceZoneInfo(fZones[zoneI].name(), mpI, spI, fzType);
+
+        if (numLayers[mpI] > 0)
+        {
+            nFacesWithLayers += fZones[zoneI].size();
+        }
+        if (numLayers[spI] > 0)
+        {
+            nFacesWithLayers += fZones[zoneI].size();
+        }
+    }
+
+
     patchIDs.shrink();
 
     if (returnReduce(nFacesWithLayers, sumOp<label>()) == 0)
@@ -3683,12 +4379,45 @@ void Foam::autoLayerDriver::doLayers
                 }
             }
 
+            // Add contributions from faceZones that get layers
+            const faceZoneMesh& fZones = mesh.faceZones();
+            forAll(fZones, zoneI)
+            {
+                const faceZone& fZone = fZones[zoneI];
+                const word& fzName = fZone.name();
+
+                label mpI, spI;
+                surfaceZonesInfo::faceZoneType fzType;
+                meshRefiner_.getFaceZoneInfo(fzName, mpI, spI, fzType);
+
+                if (numLayers[mpI] > 0)
+                {
+                    // Get the owner side for unflipped faces, neighbour side
+                    // for flipped ones
+                    const labelList& cellIDs = fZone.slaveCells();
+                    forAll(cellIDs, i)
+                    {
+                        cellWeights[cellIDs[i]] += numLayers[mpI];
+                    }
+                }
+                if (numLayers[spI] > 0)
+                {
+                    const labelList& cellIDs = fZone.masterCells();
+                    forAll(cellIDs, i)
+                    {
+                        cellWeights[cellIDs[i]] += numLayers[mpI];
+                    }
+                }
+            }
+
+
+
             // Balance mesh (and meshRefinement). Restrict faceZones to
             // be on internal faces only since they will be converted into
             // baffles.
             autoPtr<mapDistributePolyMesh> map = meshRefiner_.balance
             (
-                true,   //false,    // keepZoneFaces
+                true,           // keepZoneFaces
                 false,
                 cellWeights,
                 decomposer,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 7aa5050a22..55db5ed9d0 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,6 @@ class removePoints;
 class pointSet;
 class motionSmoother;
 class addPatchCellLayer;
-class pointData;
 class faceSet;
 class layerParameters;
 
@@ -108,7 +107,6 @@ private:
         const labelList globalToSlavePatch_;
 
 
-
     // Private Member Functions
 
         // Layers
@@ -231,14 +229,17 @@ private:
                     List<extrudeMode>& extrudeStatus
                 ) const;
 
-                //- See what patches boundaryedges should be extruded into
+                //- See what zones and patches edges should be extruded into
                 void determineSidePatches
                 (
                     const globalIndex& globalFaces,
                     const labelListList& edgeGlobalFaces,
                     const indirectPrimitivePatch& pp,
 
-                    labelList& sidePatchID
+                    labelList& edgePatchID,
+                    labelList& edgeZoneID,
+                    boolList& edgeFlip,
+                    labelList& inflateFaceID
                 );
 
                 //- Calculate pointwise wanted and minimum thickness.
@@ -370,6 +371,14 @@ private:
                     const List<extrudeMode>& extrudeStatus
                 );
 
+                //- After adding to mesh get the new baffles
+                static List<labelPair> getBafflesOnAddedMesh
+                (
+                    const polyMesh& mesh,
+                    const labelList& newToOldFaces,
+                    const List<labelPair>& baffles
+                );
+
                 //- Collect layer faces and layer cells into bools
                 //  for ease of handling
                 static void getLayerCellsFaces
@@ -393,6 +402,15 @@ private:
                 ) const;
 
                 //- Write cellSet,faceSet for layers
+                bool writeLayerSets
+                (
+                    const fvMesh& mesh,
+                    const labelList& cellNLayers,
+                    const scalarField& faceRealThickness
+                ) const;
+
+                //- Write volFields,cellSet,faceSet for layers depending
+                //  on write level
                 bool writeLayerData
                 (
                     const fvMesh& mesh,
@@ -464,13 +482,6 @@ private:
                     pointVectorField& normals
                 ) const;
 
-                bool isMaxEdge
-                (
-                    const List<pointData>&,
-                    const label edgeI,
-                    const scalar minCos
-                ) const;
-
                 //- Stop layer growth where mesh wraps around edge with a
                 //  large feature angle
                 void handleFeatureAngleLayerTerminations
@@ -595,6 +606,7 @@ public:
                 const dictionary& shrinkDict,
                 const dictionary& motionDict,
                 const layerParameters& layerParams,
+                const bool mergePatchFaces,         // merging patch faces
                 const bool preBalance,              // balance before adding?
                 decompositionMethod& decomposer,
                 fvMeshDistribute& distributor
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
deleted file mode 100644
index e8c3d38cd6..0000000000
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ /dev/null
@@ -1,1835 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    Shrinking mesh (part of adding cell layers)
-
-\*----------------------------------------------------------------------------*/
-
-#include "autoLayerDriver.H"
-#include "fvMesh.H"
-#include "Time.H"
-#include "pointFields.H"
-#include "motionSmoother.H"
-#include "pointData.H"
-#include "PointEdgeWave.H"
-#include "OBJstream.H"
-#include "meshTools.H"
-#include "PatchTools.H"
-#include "unitConversion.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// Calculate inverse sum of edge weights (currently always 1.0)
-void Foam::autoLayerDriver::sumWeights
-(
-    const PackedBoolList& isMasterEdge,
-    const labelList& meshEdges,
-    const labelList& meshPoints,
-    const edgeList& edges,
-    scalarField& invSumWeight
-) const
-{
-    const pointField& pts = meshRefiner_.mesh().points();
-
-    invSumWeight = 0;
-
-    forAll(edges, edgeI)
-    {
-        if (isMasterEdge.get(meshEdges[edgeI]) == 1)
-        {
-            const edge& e = edges[edgeI];
-            //scalar eWeight = edgeWeights[edgeI];
-            //scalar eWeight = 1.0;
-
-            scalar eMag = max
-            (
-                VSMALL,
-                mag
-                (
-                    pts[meshPoints[e[1]]]
-                  - pts[meshPoints[e[0]]]
-                )
-            );
-            scalar eWeight = 1.0/eMag;
-
-            invSumWeight[e[0]] += eWeight;
-            invSumWeight[e[1]] += eWeight;
-        }
-    }
-
-    syncTools::syncPointList
-    (
-        meshRefiner_.mesh(),
-        meshPoints,
-        invSumWeight,
-        plusEqOp<scalar>(),
-        scalar(0.0)         // null value
-    );
-
-    forAll(invSumWeight, pointI)
-    {
-        scalar w = invSumWeight[pointI];
-
-        if (w > 0.0)
-        {
-            invSumWeight[pointI] = 1.0/w;
-        }
-    }
-}
-
-
-// Smooth field on moving patch
-void Foam::autoLayerDriver::smoothField
-(
-    const motionSmoother& meshMover,
-    const PackedBoolList& isMasterPoint,
-    const PackedBoolList& isMasterEdge,
-    const labelList& meshEdges,
-    const scalarField& fieldMin,
-    const label nSmoothDisp,
-    scalarField& field
-) const
-{
-    const indirectPrimitivePatch& pp = meshMover.patch();
-    const edgeList& edges = pp.edges();
-    const labelList& meshPoints = pp.meshPoints();
-
-    scalarField invSumWeight(pp.nPoints());
-    sumWeights
-    (
-        isMasterEdge,
-        meshEdges,
-        meshPoints,
-        edges,
-        invSumWeight
-    );
-
-    // Get smoothly varying patch field.
-    Info<< "shrinkMeshDistance : Smoothing field ..." << endl;
-
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        scalarField average(pp.nPoints());
-        averageNeighbours
-        (
-            meshMover.mesh(),
-            isMasterEdge,
-            meshEdges,
-            meshPoints,
-            edges,
-            invSumWeight,
-            field,
-            average
-        );
-
-        // Transfer to field
-        forAll(field, pointI)
-        {
-            //full smoothing neighbours + point value
-            average[pointI] = 0.5*(field[pointI]+average[pointI]);
-
-            // perform monotonic smoothing
-            if
-            (
-                average[pointI] < field[pointI]
-             && average[pointI] >= fieldMin[pointI]
-            )
-            {
-                field[pointI] = average[pointI];
-            }
-        }
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                meshMover.mesh(),
-                isMasterPoint,
-                meshPoints,
-                mag(field-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-    }
-}
-//XXXXXXXXX
-//void Foam::autoLayerDriver::smoothField
-//(
-//    const motionSmoother& meshMover,
-//    const PackedBoolList& isMasterEdge,
-//    const labelList& meshEdges,
-//    const scalarField& fieldMin,
-//    const label nSmoothDisp,
-//    scalarField& field
-//) const
-//{
-//    const indirectPrimitivePatch& pp = meshMover.patch();
-//    const edgeList& edges = pp.edges();
-//    const labelList& meshPoints = pp.meshPoints();
-//
-//    scalarField invSumWeight(pp.nPoints());
-//    sumWeights
-//    (
-//        isMasterEdge,
-//        meshEdges,
-//        meshPoints,
-//        edges,
-//        invSumWeight
-//    );
-//
-//    // Get smoothly varying patch field.
-//    Info<< "shrinkMeshDistance : (lambda-mu) Smoothing field ..." << endl;
-//
-//
-//    const scalar lambda = 0.33;
-//    const scalar mu = -0.34;
-//
-//    for (label iter = 0; iter < 90; iter++)
-//    {
-//        scalarField average(pp.nPoints());
-//
-//        // Calculate average of field
-//        averageNeighbours
-//        (
-//            meshMover.mesh(),
-//            isMasterEdge,
-//            meshEdges,
-//            meshPoints,
-//            pp.edges(),
-//            invSumWeight,
-//            field,
-//            average
-//        );
-//
-//        forAll(field, i)
-//        {
-//            if (field[i] >= fieldMin[i])
-//            {
-//                field[i] = (1-lambda)*field[i]+lambda*average[i];
-//            }
-//        }
-//
-//
-//        // Calculate average of field
-//        averageNeighbours
-//        (
-//            meshMover.mesh(),
-//            isMasterEdge,
-//            meshEdges,
-//            meshPoints,
-//            pp.edges(),
-//            invSumWeight,
-//            field,
-//            average
-//        );
-//
-//        forAll(field, i)
-//        {
-//            if (field[i] >= fieldMin[i])
-//            {
-//                field[i] = (1-mu)*field[i]+mu*average[i];
-//            }
-//        }
-//
-//
-//        // Do residual calculation every so often.
-//        if ((iter % 10) == 0)
-//        {
-//            Info<< "    Iteration " << iter << "   residual "
-//                <<  gSum(mag(field-average))
-//                   /returnReduce(average.size(), sumOp<label>())
-//                << endl;
-//        }
-//    }
-//}
-//XXXXXXXXX
-
-// Smooth normals on moving patch.
-void Foam::autoLayerDriver::smoothPatchNormals
-(
-    const motionSmoother& meshMover,
-    const PackedBoolList& isMasterPoint,
-    const PackedBoolList& isMasterEdge,
-    const labelList& meshEdges,
-    const label nSmoothDisp,
-    pointField& normals
-) const
-{
-    const indirectPrimitivePatch& pp = meshMover.patch();
-    const edgeList& edges = pp.edges();
-    const labelList& meshPoints = pp.meshPoints();
-
-    // Calculate inverse sum of weights
-
-    scalarField invSumWeight(pp.nPoints());
-    sumWeights
-    (
-        isMasterEdge,
-        meshEdges,
-        meshPoints,
-        edges,
-        invSumWeight
-    );
-
-    // Get smoothly varying internal normals field.
-    Info<< "shrinkMeshDistance : Smoothing normals ..." << endl;
-
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        vectorField average(pp.nPoints());
-        averageNeighbours
-        (
-            meshMover.mesh(),
-            isMasterEdge,
-            meshEdges,
-            meshPoints,
-            edges,
-            invSumWeight,
-            normals,
-            average
-        );
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                meshMover.mesh(),
-                isMasterPoint,
-                meshPoints,
-                mag(normals-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-
-        // Transfer to normals vector field
-        forAll(average, pointI)
-        {
-            // full smoothing neighbours + point value
-            average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-            normals[pointI] = average[pointI];
-            normals[pointI] /= mag(normals[pointI]) + VSMALL;
-        }
-    }
-}
-
-
-// Smooth normals in interior.
-void Foam::autoLayerDriver::smoothNormals
-(
-    const label nSmoothDisp,
-    const PackedBoolList& isMasterPoint,
-    const PackedBoolList& isMasterEdge,
-    const labelList& fixedPoints,
-    pointVectorField& normals
-) const
-{
-    // Get smoothly varying internal normals field.
-    Info<< "shrinkMeshDistance : Smoothing normals in interior ..." << endl;
-
-    const fvMesh& mesh = meshRefiner_.mesh();
-    const edgeList& edges = mesh.edges();
-
-    // Points that do not change.
-    PackedBoolList isFixedPoint(mesh.nPoints());
-
-    // Internal points that are fixed
-    forAll(fixedPoints, i)
-    {
-        label meshPointI = fixedPoints[i];
-        isFixedPoint.set(meshPointI, 1);
-    }
-
-    // Make sure that points that are coupled to meshPoints but not on a patch
-    // are fixed as well
-    syncTools::syncPointList(mesh, isFixedPoint, maxEqOp<unsigned int>(), 0);
-
-
-    // Correspondence between local edges/points and mesh edges/points
-    const labelList meshEdges(identity(mesh.nEdges()));
-    const labelList meshPoints(identity(mesh.nPoints()));
-
-    // Calculate inverse sum of weights
-
-    scalarField invSumWeight(mesh.nPoints(), 0);
-    sumWeights
-    (
-        isMasterEdge,
-        meshEdges,
-        meshPoints,
-        edges,
-        invSumWeight
-    );
-
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        vectorField average(mesh.nPoints());
-        averageNeighbours
-        (
-            mesh,
-            isMasterEdge,
-            meshEdges,
-            meshPoints,
-            edges,
-            invSumWeight,
-            normals,
-            average
-        );
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                mesh,
-                isMasterPoint,
-                mag(normals-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-
-
-        // Transfer to normals vector field
-        forAll(average, pointI)
-        {
-            if (isFixedPoint.get(pointI) == 0)
-            {
-                //full smoothing neighbours + point value
-                average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-                normals[pointI] = average[pointI];
-                normals[pointI] /= mag(normals[pointI]) + VSMALL;
-            }
-        }
-    }
-}
-
-
-// Tries and find a medial axis point. Done by comparing vectors to nearest
-// wall point for both vertices of edge.
-bool Foam::autoLayerDriver::isMaxEdge
-(
-    const List<pointData>& pointWallDist,
-    const label edgeI,
-    const scalar minCos
-) const
-{
-    const fvMesh& mesh = meshRefiner_.mesh();
-    const pointField& points = mesh.points();
-
-    // Do not mark edges with one side on moving wall.
-
-    const edge& e = mesh.edges()[edgeI];
-
-    vector v0(points[e[0]] - pointWallDist[e[0]].origin());
-    scalar magV0(mag(v0));
-
-    if (magV0 < SMALL)
-    {
-        return false;
-    }
-
-    vector v1(points[e[1]] - pointWallDist[e[1]].origin());
-    scalar magV1(mag(v1));
-
-    if (magV1 < SMALL)
-    {
-        return false;
-    }
-
-
-    //- Detect based on vector to nearest point differing for both endpoints
-    //v0 /= magV0;
-    //v1 /= magV1;
-    //
-    //// Test angle.
-    //if ((v0 & v1) < minCos)
-    //{
-    //    return true;
-    //}
-    //else
-    //{
-    //    return false;
-    //}
-
-    //- Detect based on extrusion vector differing for both endpoints
-    //  the idea is that e.g. a sawtooth wall can still be extruded
-    //  successfully as long as it is done all to the same direction.
-    if ((pointWallDist[e[0]].v() & pointWallDist[e[1]].v()) < minCos)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// Stop layer growth where mesh wraps around edge with a
-// large feature angle
-void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
-(
-    const scalar minCos,
-    const PackedBoolList& isMasterPoint,
-    const indirectPrimitivePatch& pp,
-    const labelList& meshEdges,
-    List<extrudeMode>& extrudeStatus,
-    pointField& patchDisp,
-    labelList& patchNLayers,
-    label& nPointCounter
-) const
-{
-    const fvMesh& mesh = meshRefiner_.mesh();
-
-    // Mark faces that have all points extruded
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    boolList extrudedFaces(pp.size(), true);
-
-    forAll(pp.localFaces(), faceI)
-    {
-        const face& f = pp.localFaces()[faceI];
-
-        forAll(f, fp)
-        {
-            if (extrudeStatus[f[fp]] == NOEXTRUDE)
-            {
-                extrudedFaces[faceI] = false;
-                break;
-            }
-        }
-    }
-
-
-
-    //label nOldPointCounter = nPointCounter;
-
-    // Detect situation where two featureedge-neighbouring faces are partly or
-    // not extruded and the edge itself is extruded. In this case unmark the
-    // edge for extrusion.
-
-
-    List<List<point> > edgeFaceNormals(pp.nEdges());
-    List<List<bool> > edgeFaceExtrude(pp.nEdges());
-
-    const labelListList& edgeFaces = pp.edgeFaces();
-    const vectorField& faceNormals = pp.faceNormals();
-    const labelList& meshPoints = pp.meshPoints();
-
-    forAll(edgeFaces, edgeI)
-    {
-        const labelList& eFaces = edgeFaces[edgeI];
-
-        edgeFaceNormals[edgeI].setSize(eFaces.size());
-        edgeFaceExtrude[edgeI].setSize(eFaces.size());
-        forAll(eFaces, i)
-        {
-            label faceI = eFaces[i];
-            edgeFaceNormals[edgeI][i] = faceNormals[faceI];
-            edgeFaceExtrude[edgeI][i] = extrudedFaces[faceI];
-        }
-    }
-
-    syncTools::syncEdgeList
-    (
-        mesh,
-        meshEdges,
-        edgeFaceNormals,
-        globalMeshData::ListPlusEqOp<List<point> >(),   // combine operator
-        List<point>()               // null value
-    );
-
-    syncTools::syncEdgeList
-    (
-        mesh,
-        meshEdges,
-        edgeFaceExtrude,
-        globalMeshData::ListPlusEqOp<List<bool> >(),    // combine operator
-        List<bool>()                // null value
-    );
-
-
-    forAll(edgeFaceNormals, edgeI)
-    {
-        const List<point>& eFaceNormals = edgeFaceNormals[edgeI];
-        const List<bool>& eFaceExtrude = edgeFaceExtrude[edgeI];
-
-        if (eFaceNormals.size() == 2)
-        {
-            const edge& e = pp.edges()[edgeI];
-            label v0 = e[0];
-            label v1 = e[1];
-
-            if
-            (
-                extrudeStatus[v0] != NOEXTRUDE
-             || extrudeStatus[v1] != NOEXTRUDE
-            )
-            {
-                if (!eFaceExtrude[0] || !eFaceExtrude[1])
-                {
-                    const vector& n0 = eFaceNormals[0];
-                    const vector& n1 = eFaceNormals[1];
-
-                    if ((n0 & n1) < minCos)
-                    {
-                        if
-                        (
-                            unmarkExtrusion
-                            (
-                                v0,
-                                patchDisp,
-                                patchNLayers,
-                                extrudeStatus
-                            )
-                        )
-                        {
-                            if (isMasterPoint[meshPoints[v0]])
-                            {
-                                nPointCounter++;
-                            }
-                        }
-                        if
-                        (
-                            unmarkExtrusion
-                            (
-                                v1,
-                                patchDisp,
-                                patchNLayers,
-                                extrudeStatus
-                            )
-                        )
-                        {
-                            if (isMasterPoint[meshPoints[v1]])
-                            {
-                                nPointCounter++;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    //Info<< "Added "
-    //    << returnReduce(nPointCounter-nOldPointCounter, sumOp<label>())
-    //    << " point not to extrude." << endl;
-}
-
-
-// Find isolated islands (points, edges and faces and layer terminations)
-// in the layer mesh and stop any layer growth at these points.
-void Foam::autoLayerDriver::findIsolatedRegions
-(
-    const scalar minCosLayerTermination,
-    const PackedBoolList& isMasterPoint,
-    const PackedBoolList& isMasterEdge,
-    const indirectPrimitivePatch& pp,
-    const labelList& meshEdges,
-    const scalarField& minThickness,
-    List<extrudeMode>& extrudeStatus,
-    pointField& patchDisp,
-    labelList& patchNLayers
-) const
-{
-    const fvMesh& mesh = meshRefiner_.mesh();
-
-    Info<< "shrinkMeshDistance : Removing isolated regions ..." << endl;
-
-    // Keep count of number of points unextruded
-    label nPointCounter = 0;
-
-    while (true)
-    {
-        // Stop layer growth where mesh wraps around edge with a
-        // large feature angle
-        handleFeatureAngleLayerTerminations
-        (
-            minCosLayerTermination,
-            isMasterPoint,
-            pp,
-            meshEdges,
-
-            extrudeStatus,
-            patchDisp,
-            patchNLayers,
-            nPointCounter
-        );
-
-        syncPatchDisplacement
-        (
-            pp,
-            minThickness,
-            patchDisp,
-            patchNLayers,
-            extrudeStatus
-        );
-
-
-        // Do not extrude from point where all neighbouring
-        // faces are not grown
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        boolList extrudedFaces(pp.size(), true);
-        forAll(pp.localFaces(), faceI)
-        {
-            const face& f = pp.localFaces()[faceI];
-            forAll(f, fp)
-            {
-                if (extrudeStatus[f[fp]] == NOEXTRUDE)
-                {
-                    extrudedFaces[faceI] = false;
-                    break;
-                }
-            }
-        }
-
-        const labelListList& pointFaces = pp.pointFaces();
-
-        boolList keptPoints(pp.nPoints(), false);
-        forAll(keptPoints, patchPointI)
-        {
-            const labelList& pFaces = pointFaces[patchPointI];
-
-            forAll(pFaces, i)
-            {
-                label faceI = pFaces[i];
-                if (extrudedFaces[faceI])
-                {
-                    keptPoints[patchPointI] = true;
-                    break;
-                }
-            }
-        }
-
-        syncTools::syncPointList
-        (
-            mesh,
-            pp.meshPoints(),
-            keptPoints,
-            orEqOp<bool>(),
-            false               // null value
-        );
-
-        label nChanged = 0;
-
-        forAll(keptPoints, patchPointI)
-        {
-            if (!keptPoints[patchPointI])
-            {
-                if
-                (
-                    unmarkExtrusion
-                    (
-                        patchPointI,
-                        patchDisp,
-                        patchNLayers,
-                        extrudeStatus
-                    )
-                )
-                {
-                   nPointCounter++;
-                   nChanged++;
-                }
-            }
-        }
-
-
-        if (returnReduce(nChanged, sumOp<label>()) == 0)
-        {
-            break;
-        }
-    }
-
-    const edgeList& edges = pp.edges();
-
-
-    // Count number of mesh edges using a point
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelList isolatedPoint(pp.nPoints(),0);
-
-    forAll(edges, edgeI)
-    {
-        if (isMasterEdge.get(meshEdges[edgeI]) == 1)
-        {
-            const edge& e = edges[edgeI];
-
-            label v0 = e[0];
-            label v1 = e[1];
-
-            if (extrudeStatus[v1] != NOEXTRUDE)
-            {
-                isolatedPoint[v0] += 1;
-            }
-            if (extrudeStatus[v0] != NOEXTRUDE)
-            {
-                isolatedPoint[v1] += 1;
-            }
-        }
-    }
-
-    syncTools::syncPointList
-    (
-        mesh,
-        pp.meshPoints(),
-        isolatedPoint,
-        plusEqOp<label>(),
-        label(0)        // null value
-    );
-
-    // stop layer growth on isolated faces
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    forAll(pp, faceI)
-    {
-        const face& f = pp.localFaces()[faceI];
-        bool failed = false;
-        forAll(f, fp)
-        {
-            if (isolatedPoint[f[fp]] > 2)
-            {
-                failed = true;
-                break;
-            }
-        }
-        bool allPointsExtruded = true;
-        if (!failed)
-        {
-            forAll(f, fp)
-            {
-                if (extrudeStatus[f[fp]] == NOEXTRUDE)
-                {
-                    allPointsExtruded = false;
-                    break;
-                }
-            }
-
-            if (allPointsExtruded)
-            {
-                forAll(f, fp)
-                {
-                    if
-                    (
-                        unmarkExtrusion
-                        (
-                            f[fp],
-                            patchDisp,
-                            patchNLayers,
-                            extrudeStatus
-                        )
-                    )
-                    {
-                        nPointCounter++;
-                    }
-                }
-            }
-        }
-    }
-
-    reduce(nPointCounter, sumOp<label>());
-    Info<< "Number isolated points extrusion stopped : "<< nPointCounter
-        << endl;
-}
-
-
-// Calculates medial axis fields:
-// dispVec     : normal of nearest wall. Where this normal changes direction
-//               defines the medial axis
-// medialDist  : distance to medial axis
-// medialRatio : ratio of medial distance to wall distance.
-//               (1 at wall, 0 at medial axis)
-void Foam::autoLayerDriver::medialAxisSmoothingInfo
-(
-    const motionSmoother& meshMover,
-    const label nSmoothNormals,
-    const label nSmoothSurfaceNormals,
-    const scalar minMedialAxisAngleCos,
-    const scalar featureAngle,
-
-    pointVectorField& dispVec,
-    pointScalarField& medialRatio,
-    pointScalarField& medialDist,
-    pointVectorField& medialVec
-) const
-{
-
-    Info<< "medialAxisSmoothingInfo :"
-        << " Calculate distance to Medial Axis ..." << endl;
-
-    const polyMesh& mesh = meshMover.mesh();
-    const pointField& points = mesh.points();
-
-    const indirectPrimitivePatch& pp = meshMover.patch();
-    const labelList& meshPoints = pp.meshPoints();
-
-    // Predetermine mesh edges
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Precalulate master point/edge (only relevant for shared points/edges)
-    const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
-    const PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
-    // Precalculate meshEdge per pp edge
-    const labelList meshEdges
-    (
-        pp.meshEdges
-        (
-            mesh.edges(),
-            mesh.pointEdges()
-        )
-    );
-
-
-    // Determine pointNormal
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    pointField pointNormals(PatchTools::pointNormals(mesh, pp));
-
-    // pointNormals
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        pointField meshPointNormals(mesh.nPoints(), point(1, 0, 0));
-        UIndirectList<point>(meshPointNormals, meshPoints) = pointNormals;
-        meshRefinement::testSyncPointList
-        (
-            "pointNormals",
-            mesh,
-            meshPointNormals
-        );
-    }
-
-    // Smooth patch normal vectors
-    smoothPatchNormals
-    (
-        meshMover,
-        isMasterPoint,
-        isMasterEdge,
-        meshEdges,
-        nSmoothSurfaceNormals,
-        pointNormals
-    );
-
-    // smoothed pointNormals
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        pointField meshPointNormals(mesh.nPoints(), point(1, 0, 0));
-        UIndirectList<point>(meshPointNormals, meshPoints) = pointNormals;
-        meshRefinement::testSyncPointList
-        (
-            "smoothed pointNormals",
-            mesh,
-            meshPointNormals
-        );
-    }
-
-    // Calculate distance to pp points
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // 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.
-    {
-        // Seed data.
-        List<pointData> wallInfo(meshPoints.size());
-
-        forAll(meshPoints, patchPointI)
-        {
-            label pointI = meshPoints[patchPointI];
-            wallInfo[patchPointI] = pointData
-            (
-                points[pointI],
-                0.0,
-                pointI,                       // passive scalar
-                pointNormals[patchPointI]     // surface normals
-            );
-        }
-
-        // Do all calculations
-        List<pointData> edgeWallDist(mesh.nEdges());
-        PointEdgeWave<pointData> wallDistCalc
-        (
-            mesh,
-            meshPoints,
-            wallInfo,
-            pointWallDist,
-            edgeWallDist,
-            mesh.globalData().nTotalPoints(),   // max iterations
-            dummyTrackData
-        );
-
-
-        label nUnvisit = returnReduce
-        (
-            wallDistCalc.getUnsetPoints(),
-            sumOp<label>()
-        );
-
-        if (nUnvisit > 0)
-        {
-            WarningIn("autoLayerDriver::medialAxisSmoothingInfo(..)")
-                << "Walking did not visit all points." << nl
-                << "    Did not visit " << nUnvisit
-                << " out of " << mesh.globalData().nTotalPoints()
-                << " points. This is not necessarily a problem" << nl
-                << "    and might be due to faceZones splitting of part"
-                << " of the domain." << nl << endl;
-        }
-    }
-
-
-    // Check sync of wall distance
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        pointField origin(pointWallDist.size());
-        scalarField distSqr(pointWallDist.size());
-        //NA scalarField passiveS(pointWallDist.size());
-        pointField passiveV(pointWallDist.size());
-        forAll(pointWallDist, pointI)
-        {
-            origin[pointI] = pointWallDist[pointI].origin();
-            distSqr[pointI] = pointWallDist[pointI].distSqr();
-            //passiveS[pointI] = pointWallDist[pointI].s();
-            passiveV[pointI] = pointWallDist[pointI].v();
-        }
-        meshRefinement::testSyncPointList("origin", mesh, origin);
-        meshRefinement::testSyncPointList("distSqr", mesh, distSqr);
-        //meshRefinement::testSyncPointList("passiveS", mesh, passiveS);
-        meshRefinement::testSyncPointList("passiveV", mesh, passiveV);
-    }
-
-
-    // 2. Find points with max distance and transport information back to
-    //    wall.
-    {
-        List<pointData> pointMedialDist(mesh.nPoints());
-        List<pointData> edgeMedialDist(mesh.nEdges());
-
-        // Seed point data.
-        DynamicList<pointData> maxInfo(meshPoints.size());
-        DynamicList<label> maxPoints(meshPoints.size());
-
-        // 1. Medial axis points
-
-        const edgeList& edges = mesh.edges();
-
-        forAll(edges, edgeI)
-        {
-            const edge& e = edges[edgeI];
-
-            if
-            (
-                !pointWallDist[e[0]].valid(dummyTrackData)
-             || !pointWallDist[e[1]].valid(dummyTrackData)
-            )
-            {
-                // Unvisited point. See above about nUnvisit warning
-            }
-            else if (isMaxEdge(pointWallDist, edgeI, minMedialAxisAngleCos))
-            {
-                // Both end points of edge have very different nearest wall
-                // point. Mark both points as medial axis points.
-
-                // Approximate medial axis location on edge.
-                //const point medialAxisPt = e.centre(points);
-                vector eVec = e.vec(points);
-                scalar eMag = mag(eVec);
-                if (eMag > VSMALL)
-                {
-                    eVec /= eMag;
-
-                    // Calculate distance along edge
-                    const point& p0 = points[e[0]];
-                    const point& p1 = points[e[1]];
-                    scalar dist0 = (p0-pointWallDist[e[0]].origin()) & eVec;
-                    scalar dist1 = (pointWallDist[e[1]].origin()-p1) & eVec;
-                    scalar s = 0.5*(dist1+eMag+dist0);
-
-                    point medialAxisPt;
-                    if (s <= dist0)
-                    {
-                        medialAxisPt = p0;
-                    }
-                    else if (s >= dist0+eMag)
-                    {
-                        medialAxisPt = p1;
-                    }
-                    else
-                    {
-                        medialAxisPt = p0+(s-dist0)*eVec;
-                    }
-
-                    forAll(e, ep)
-                    {
-                        label pointI = e[ep];
-
-                        if (!pointMedialDist[pointI].valid(dummyTrackData))
-                        {
-                            maxPoints.append(pointI);
-                            maxInfo.append
-                            (
-                                pointData
-                                (
-                                    medialAxisPt,   //points[pointI],
-                                    magSqr(points[pointI]-medialAxisPt),//0.0,
-                                    pointI,         // passive data
-                                    vector::zero    // passive data
-                                )
-                            );
-                            pointMedialDist[pointI] = maxInfo.last();
-                        }
-                    }
-                }
-            }
-        }
-
-
-        // 2. Seed non-adapt patches
-        const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-        labelHashSet adaptPatches(meshMover.adaptPatchIDs());
-
-
-        forAll(patches, patchI)
-        {
-            const polyPatch& pp = patches[patchI];
-            const pointPatchVectorField& pvf =
-                meshMover.displacement().boundaryField()[patchI];
-
-            if
-            (
-                !pp.coupled()
-             && !isA<emptyPolyPatch>(pp)
-             && !adaptPatches.found(patchI)
-            )
-            {
-                const labelList& meshPoints = pp.meshPoints();
-
-                // Check the type of the patchField. The types are
-                //  - fixedValue (0 or more layers) but the >0 layers have
-                //    already been handled in the adaptPatches loop
-                //  - constraint (but not coupled) types, e.g. symmetryPlane,
-                //    slip.
-                if (pvf.fixesValue())
-                {
-                    // Disable all movement on fixedValue patchFields
-                    Info<< "Inserting all points on patch " << pp.name()
-                        << endl;
-
-                    forAll(meshPoints, i)
-                    {
-                        label pointI = meshPoints[i];
-                        if (!pointMedialDist[pointI].valid(dummyTrackData))
-                        {
-                            maxPoints.append(pointI);
-                            maxInfo.append
-                            (
-                                pointData
-                                (
-                                    points[pointI],
-                                    0.0,
-                                    pointI,         // passive data
-                                    vector::zero    // passive data
-                                )
-                            );
-                            pointMedialDist[pointI] = maxInfo.last();
-                        }
-                    }
-                }
-                else
-                {
-                    // Based on geometry: analyse angle w.r.t. nearest moving
-                    // point. In the pointWallDist we transported the
-                    // normal as the passive vector. Note that this points
-                    // out of the originating wall so inside of the domain
-                    // on this patch.
-                    Info<< "Inserting points on patch " << pp.name()
-                        << " if angle to nearest layer patch > "
-                        << featureAngle << " degrees." << endl;
-
-                    scalar featureAngleCos = Foam::cos(degToRad(featureAngle));
-                    pointField pointNormals(PatchTools::pointNormals(mesh, pp));
-
-                    forAll(meshPoints, i)
-                    {
-                        label pointI = meshPoints[i];
-
-                        if
-                        (
-                            pointWallDist[pointI].valid(dummyTrackData)
-                        && !pointMedialDist[pointI].valid(dummyTrackData)
-                        )
-                        {
-                            // Check if angle not too large.
-                            scalar cosAngle =
-                            (
-                               -pointWallDist[pointI].v()
-                              & pointNormals[i]
-                            );
-                            if (cosAngle > featureAngleCos)
-                            {
-                                // Extrusion direction practically perpendicular
-                                // to the patch. Disable movement at the patch.
-
-                                maxPoints.append(pointI);
-                                maxInfo.append
-                                (
-                                    pointData
-                                    (
-                                        points[pointI],
-                                        0.0,
-                                        pointI,         // passive data
-                                        vector::zero    // passive data
-                                    )
-                                );
-                                pointMedialDist[pointI] = maxInfo.last();
-                            }
-                            else
-                            {
-                                // Extrusion direction makes angle with patch
-                                // so allow sliding - don't insert zero points
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        maxInfo.shrink();
-        maxPoints.shrink();
-
-        // Do all calculations
-        PointEdgeWave<pointData> medialDistCalc
-        (
-            mesh,
-            maxPoints,
-            maxInfo,
-
-            pointMedialDist,
-            edgeMedialDist,
-            mesh.globalData().nTotalPoints(),   // max iterations
-            dummyTrackData
-        );
-
-        // Extract medial axis distance as pointScalarField
-        forAll(pointMedialDist, pointI)
-        {
-            medialDist[pointI] = Foam::sqrt(pointMedialDist[pointI].distSqr());
-            medialVec[pointI] = pointMedialDist[pointI].origin();
-        }
-
-        // Check
-        if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-        {
-            meshRefinement::testSyncPointList("medialDist", mesh, medialDist);
-            meshRefinement::testSyncPointList("medialVec", mesh, medialVec);
-        }
-    }
-
-    // Extract transported surface normals as pointVectorField
-    forAll(dispVec, i)
-    {
-        if (!pointWallDist[i].valid(dummyTrackData))
-        {
-            dispVec[i] = vector(1, 0, 0);
-        }
-        else
-        {
-            dispVec[i] = pointWallDist[i].v();
-        }
-    }
-
-    // Smooth normal vectors. Do not change normals on pp.meshPoints
-    smoothNormals
-    (
-        nSmoothNormals,
-        isMasterPoint,
-        isMasterEdge,
-        meshPoints,
-        dispVec
-    );
-
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        meshRefinement::testSyncPointList("smoothed dispVec", mesh, dispVec);
-    }
-
-    // Calculate ratio point medial distance to point wall distance
-    forAll(medialRatio, pointI)
-    {
-        if (!pointWallDist[pointI].valid(dummyTrackData))
-        {
-            medialRatio[pointI] = 0.0;
-        }
-        else
-        {
-            scalar wDist2 = pointWallDist[pointI].distSqr();
-            scalar mDist = medialDist[pointI];
-
-            if (wDist2 < sqr(SMALL) && mDist < SMALL)
-            //- Note: maybe less strict:
-            //(
-            //    wDist2 < sqr(meshRefiner_.mergeDistance())
-            // && mDist < meshRefiner_.mergeDistance()
-            //)
-            {
-                medialRatio[pointI] = 0.0;
-            }
-            else
-            {
-                medialRatio[pointI] = mDist / (Foam::sqrt(wDist2) + mDist);
-            }
-        }
-    }
-
-
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        // medialRatio
-        meshRefinement::testSyncPointList("medialRatio", mesh, medialRatio);
-    }
-
-
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        Info<< "medialAxisSmoothingInfo :"
-            << " Writing:" << nl
-            << "    " << dispVec.name()
-            << " : normalised direction of nearest displacement" << nl
-            << "    " << medialDist.name()
-            << " : distance to medial axis" << nl
-            << "    " << medialVec.name()
-            << " : nearest point on medial axis" << nl
-            << "    " << medialRatio.name()
-            << " : ratio of medial distance to wall distance" << nl
-            << endl;
-        meshRefiner_.mesh().setInstance(meshRefiner_.timeName());
-        meshRefiner_.write
-        (
-            meshRefinement::debugType(debug),
-            meshRefinement::writeType
-            (
-                meshRefinement::writeLevel()
-              | meshRefinement::WRITEMESH
-            ),
-            mesh.time().path()/meshRefiner_.timeName()
-        );
-        dispVec.write();
-        medialDist.write();
-        medialVec.write();
-        medialRatio.write();
-    }
-}
-
-
-void Foam::autoLayerDriver::shrinkMeshMedialDistance
-(
-    motionSmoother& meshMover,
-    const dictionary& meshQualityDict,
-    const List<labelPair>& baffles,
-    const label nSmoothPatchThickness,
-    const label nSmoothDisplacement,
-    const scalar maxThicknessToMedialRatio,
-    const label nAllowableErrors,
-    const label nSnap,
-    const scalar minCosLayerTermination,
-
-    const scalarField& layerThickness,
-    const scalarField& minThickness,
-
-    const pointVectorField& dispVec,
-    const pointScalarField& medialRatio,
-    const pointScalarField& medialDist,
-    const pointVectorField& medialVec,
-
-    List<extrudeMode>& extrudeStatus,
-    pointField& patchDisp,
-    labelList& patchNLayers
-) const
-{
-    Info<< "shrinkMeshMedialDistance : Smoothing using Medial Axis ..." << endl;
-
-    const polyMesh& mesh = meshMover.mesh();
-
-    const indirectPrimitivePatch& pp = meshMover.patch();
-    const labelList& meshPoints = pp.meshPoints();
-
-    // Precalulate master points/edge (only relevant for shared points/edges)
-    const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
-    const PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
-    // Precalculate meshEdge per pp edge
-    const labelList meshEdges
-    (
-        pp.meshEdges
-        (
-            mesh.edges(),
-            mesh.pointEdges()
-        )
-    );
-
-
-    scalarField thickness(layerThickness.size());
-
-    thickness = mag(patchDisp);
-
-    forAll(thickness, patchPointI)
-    {
-        if (extrudeStatus[patchPointI] == NOEXTRUDE)
-        {
-            thickness[patchPointI] = 0.0;
-        }
-    }
-
-    label numThicknessRatioExclude = 0;
-
-    // reduce thickness where thickness/medial axis distance large
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    autoPtr<OBJstream> str;
-    if (debug)
-    {
-        str.reset
-        (
-            new OBJstream
-            (
-                mesh.time().path()
-              / "thicknessRatioExcludePoints_"
-              + meshRefiner_.timeName()
-              + ".obj"
-            )
-        );
-        Info<< "Writing points with too large an extrusion distance to "
-            << str().name() << endl;
-    }
-
-    autoPtr<OBJstream> medialVecStr;
-    if (debug)
-    {
-        medialVecStr.reset
-        (
-            new OBJstream
-            (
-                mesh.time().path()
-              / "thicknessRatioExcludeMedialVec_"
-              + meshRefiner_.timeName()
-              + ".obj"
-            )
-        );
-        Info<< "Writing points with too large an extrusion distance to "
-            << medialVecStr().name() << endl;
-    }
-
-    forAll(meshPoints, patchPointI)
-    {
-        if (extrudeStatus[patchPointI] != NOEXTRUDE)
-        {
-            label pointI = meshPoints[patchPointI];
-
-            //- Option 1: look only at extrusion thickness v.s. distance
-            //  to nearest (medial axis or static) point.
-            scalar mDist = medialDist[pointI];
-            scalar thicknessRatio = thickness[patchPointI]/(mDist+VSMALL);
-
-            //- Option 2: Look at component in the direction
-            //  of nearest (medial axis or static) point.
-            vector n =
-                patchDisp[patchPointI]
-              / (mag(patchDisp[patchPointI]) + VSMALL);
-            vector mVec = mesh.points()[pointI]-medialVec[pointI];
-            mVec /= mag(mVec)+VSMALL;
-            thicknessRatio *= (n&mVec);
-
-            if (thicknessRatio > maxThicknessToMedialRatio)
-            {
-                // Truncate thickness.
-                if (debug)
-                {
-                    Pout<< "truncating displacement at "
-                        << mesh.points()[pointI]
-                        << " from " << thickness[patchPointI]
-                        << " to "
-                        <<  0.5
-                           *(
-                                minThickness[patchPointI]
-                               +thickness[patchPointI]
-                            )
-                        << " medial direction:" << mVec
-                        << " extrusion direction:" << n
-                        << " with thicknessRatio:" << thicknessRatio
-                        << endl;
-                }
-
-                thickness[patchPointI] =
-                    0.5*(minThickness[patchPointI]+thickness[patchPointI]);
-
-                patchDisp[patchPointI] = thickness[patchPointI]*n;
-
-                if (isMasterPoint[pointI])
-                {
-                    numThicknessRatioExclude++;
-                }
-
-                if (str.valid())
-                {
-                    const point& pt = mesh.points()[pointI];
-                    str().write(linePointRef(pt, pt+patchDisp[patchPointI]));
-                }
-                if (medialVecStr.valid())
-                {
-                    const point& pt = mesh.points()[pointI];
-                    medialVecStr().write
-                    (
-                        linePointRef
-                        (
-                            pt,
-                            medialVec[pointI]
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-    reduce(numThicknessRatioExclude, sumOp<label>());
-    Info<< "shrinkMeshMedialDistance : Reduce layer thickness at "
-        << numThicknessRatioExclude
-        << " nodes where thickness to medial axis distance is large " << endl;
-
-
-    // find points where layer growth isolated to a lone point, edge or face
-
-    findIsolatedRegions
-    (
-        minCosLayerTermination,
-        isMasterPoint,
-        isMasterEdge,
-        pp,
-        meshEdges,
-        minThickness,
-
-        extrudeStatus,
-        patchDisp,
-        patchNLayers
-    );
-
-    // Update thickess for changed extrusion
-    forAll(thickness, patchPointI)
-    {
-        if (extrudeStatus[patchPointI] == NOEXTRUDE)
-        {
-            thickness[patchPointI] = 0.0;
-        }
-    }
-
-
-    // smooth layer thickness on moving patch
-    smoothField
-    (
-        meshMover,
-        isMasterPoint,
-        isMasterEdge,
-        meshEdges,
-        minThickness,
-        nSmoothPatchThickness,
-
-        thickness
-    );
-
-    // Dummy additional info for PointEdgeWave
-    int dummyTrackData = 0;
-
-    List<pointData> pointWallDist(mesh.nPoints());
-
-    const pointField& points = mesh.points();
-    // 1. Calculate distance to points where displacement is specified.
-    // This wave is used to transport layer thickness
-    {
-        // Distance to wall and medial axis on edges.
-        List<pointData> edgeWallDist(mesh.nEdges());
-        labelList wallPoints(meshPoints.size());
-
-        // Seed data.
-        List<pointData> wallInfo(meshPoints.size());
-
-        forAll(meshPoints, patchPointI)
-        {
-            label pointI = meshPoints[patchPointI];
-            wallPoints[patchPointI] = pointI;
-            wallInfo[patchPointI] = pointData
-            (
-                points[pointI],
-                0.0,
-                thickness[patchPointI],       // transport layer thickness
-                vector::zero                  // passive vector
-            );
-        }
-
-        // Do all calculations
-        PointEdgeWave<pointData> wallDistCalc
-        (
-            mesh,
-            wallPoints,
-            wallInfo,
-            pointWallDist,
-            edgeWallDist,
-            mesh.globalData().nTotalPoints(),   // max iterations
-            dummyTrackData
-        );
-    }
-
-    // Calculate scaled displacement vector
-    pointVectorField& displacement = meshMover.displacement();
-
-    forAll(displacement, pointI)
-    {
-        if (!pointWallDist[pointI].valid(dummyTrackData))
-        {
-            displacement[pointI] = vector::zero;
-        }
-        else
-        {
-            // 1) displacement on nearest wall point, scaled by medialRatio
-            //    (wall distance / medial distance)
-            // 2) pointWallDist[pointI].s() is layer thickness transported
-            //    from closest wall point.
-            // 3) shrink in opposite direction of addedPoints
-            displacement[pointI] =
-                -medialRatio[pointI]
-                *pointWallDist[pointI].s()
-                *dispVec[pointI];
-        }
-    }
-
-
-
-    // Smear displacement away from fixed values (medialRatio=0 or 1)
-    if (nSmoothDisplacement > 0)
-    {
-        scalarField invSumWeight(mesh.nPoints());
-        sumWeights
-        (
-            isMasterEdge,
-            identity(mesh.nEdges()),
-            identity(mesh.nPoints()),
-            mesh.edges(),
-            invSumWeight
-        );
-
-
-        // Get smoothly varying patch field.
-        Info<< "shrinkMeshDistance : Smoothing displacement ..." << endl;
-
-        const scalar lambda = 0.33;
-        const scalar mu = -0.34;
-
-        pointField average(mesh.nPoints());
-        for (label iter = 0; iter < nSmoothDisplacement; iter++)
-        {
-            // Calculate average of field
-            averageNeighbours
-            (
-                mesh,
-                isMasterEdge,
-                identity(mesh.nEdges()),    //meshEdges,
-                identity(mesh.nPoints()),   //meshPoints,
-                mesh.edges(),               //edges,
-                invSumWeight,
-                displacement,
-                average
-            );
-
-            forAll(displacement, i)
-            {
-                if (medialRatio[i] > SMALL && medialRatio[i] < 1-SMALL)
-                {
-                    displacement[i] =
-                        (1-lambda)*displacement[i]
-                       +lambda*average[i];
-                }
-            }
-
-
-            // Calculate average of field
-            averageNeighbours
-            (
-                mesh,
-                isMasterEdge,
-                identity(mesh.nEdges()),    //meshEdges,
-                identity(mesh.nPoints()),   //meshPoints,
-                mesh.edges(),               //edges,
-                invSumWeight,
-                displacement,
-                average
-            );
-
-            forAll(displacement, i)
-            {
-                if (medialRatio[i] > SMALL && medialRatio[i] < 1-SMALL)
-                {
-                    displacement[i] = (1-mu)*displacement[i]+mu*average[i];
-                }
-            }
-
-
-            // Do residual calculation every so often.
-            if ((iter % 10) == 0)
-            {
-                scalar resid = meshRefinement::gAverage
-                (
-                    mesh,
-                    syncTools::getMasterPoints(mesh),
-                    mag(displacement-average)()
-                );
-                Info<< "    Iteration " << iter << "   residual " << resid
-                    << endl;
-            }
-        }
-    }
-
-    // Make sure displacement boundary conditions is uptodate with
-    // internal field
-    meshMover.setDisplacementPatchFields();
-
-
-    // Check a bit the sync of displacements
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        // initial mesh
-        meshRefinement::testSyncPointList("mesh.points()", mesh, mesh.points());
-
-        // pointWallDist
-        scalarField pWallDist(pointWallDist.size());
-        forAll(pointWallDist, pointI)
-        {
-            pWallDist[pointI] = pointWallDist[pointI].s();
-        }
-        meshRefinement::testSyncPointList("pointWallDist", mesh, pWallDist);
-
-        // dispVec
-        meshRefinement::testSyncPointList("dispVec", mesh, dispVec);
-
-        // displacement before and after correction
-        meshRefinement::testSyncPointList
-        (
-            "displacement BEFORE",
-            mesh,
-            displacement
-        );
-
-        meshMover.correctBoundaryConditions(displacement);
-        meshRefinement::testSyncPointList
-        (
-            "displacement AFTER",
-            mesh,
-            displacement
-        );
-    }
-
-
-    if (debug&meshRefinement::MESH || debug&meshRefinement::LAYERINFO)
-    {
-        const_cast<Time&>(mesh.time())++;
-        Info<< "Writing wanted-displacement mesh (possibly illegal) to "
-            << meshRefiner_.timeName() << endl;
-        pointField oldPoints(mesh.points());
-
-        meshRefiner_.mesh().movePoints(meshMover.curPoints());
-        // Warn meshMover for changed geometry
-        meshMover.movePoints();
-
-        // Above move will have changed the instance only on the points (which
-        // is correct).
-        // However the previous mesh written will be the mesh with layers
-        // (see autoLayerDriver.C) so we now have to force writing all files
-        // so we can easily step through time steps. Note that if you
-        // don't write the mesh with layers this is not necessary.
-        meshRefiner_.mesh().setInstance(meshRefiner_.timeName());
-
-        meshRefiner_.write
-        (
-            meshRefinement::debugType(debug),
-            meshRefinement::writeType
-            (
-                meshRefinement::writeLevel()
-              | meshRefinement::WRITEMESH
-            ),
-            mesh.time().path()/meshRefiner_.timeName()
-        );
-        dispVec.write();
-        medialDist.write();
-        medialRatio.write();
-
-        // Move mesh back
-        meshRefiner_.mesh().movePoints(oldPoints);
-        // Warn meshMover for changed geometry
-        meshMover.movePoints();
-    }
-
-
-    // Current faces to check. Gets modified in meshMover.scaleMesh
-    labelList checkFaces(identity(mesh.nFaces()));
-
-    Info<< "shrinkMeshMedialDistance : Moving mesh ..." << endl;
-    scalar oldErrorReduction = -1;
-
-    for (label iter = 0; iter < 2*nSnap ; iter++)
-    {
-        Info<< "Iteration " << iter << endl;
-        if (iter == nSnap)
-        {
-            Info<< "Displacement scaling for error reduction set to 0." << endl;
-            oldErrorReduction = meshMover.setErrorReduction(0.0);
-        }
-
-        if
-        (
-            meshMover.scaleMesh
-            (
-                checkFaces,
-                baffles,
-                meshMover.paramDict(),
-                meshQualityDict,
-                true,
-                nAllowableErrors
-            )
-        )
-        {
-            Info<< "shrinkMeshMedialDistance : Successfully moved mesh" << endl;
-            break;
-        }
-    }
-
-    if (oldErrorReduction >= 0)
-    {
-        meshMover.setErrorReduction(oldErrorReduction);
-    }
-
-    Info<< "shrinkMeshMedialDistance : Finished moving mesh ..." << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 8c63239f39..edf2b6b564 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,8 @@ License
 #include "unitConversion.H"
 #include "snapParameters.H"
 #include "localPointRegion.H"
+#include "IOmanip.H"
+#include "labelVector.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -94,7 +96,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
             (
                 meshRefiner_.refineCandidates
                 (
-                    refineParams.keepPoints(),
+                    refineParams.locationsInMesh(),
                     refineParams.curvature(),
                     refineParams.planarAngle(),
 
@@ -103,7 +105,10 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
                     false,              // internalRefinement
                     false,              // surfaceRefinement
                     false,              // curvatureRefinement
+                    false,              // smallFeatureRefinement
                     false,              // gapRefinement
+                    false,              // bigGapRefinement
+                    false,              // spreadGapSize
                     refineParams.maxGlobalCells(),
                     refineParams.maxLocalCells()
                 )
@@ -177,6 +182,128 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
 }
 
 
+Foam::label Foam::autoRefineDriver::smallFeatureRefine
+(
+    const refinementParameters& refineParams,
+    const label maxIter
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+
+    label iter = 0;
+
+    // See if any surface has an extendedGapLevel
+    labelList surfaceMaxLevel(meshRefiner_.surfaces().maxGapLevel());
+    labelList shellMaxLevel(meshRefiner_.shells().maxGapLevel());
+
+    if (max(surfaceMaxLevel) == 0 && max(shellMaxLevel) == 0)
+    {
+        return iter;
+    }
+
+    for (; iter < maxIter; iter++)
+    {
+        Info<< nl
+            << "Small surface feature refinement iteration " << iter << nl
+            << "--------------------------------------------" << nl
+            << endl;
+
+
+        // Determine cells to refine
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        labelList candidateCells
+        (
+            meshRefiner_.refineCandidates
+            (
+                refineParams.locationsInMesh(),
+                refineParams.curvature(),
+                refineParams.planarAngle(),
+
+                false,              // featureRefinement
+                false,              // featureDistanceRefinement
+                false,              // internalRefinement
+                false,              // surfaceRefinement
+                false,              // curvatureRefinement
+                true,               // smallFeatureRefinement
+                false,              // gapRefinement
+                false,              // bigGapRefinement
+                false,              // spreadGapSize
+                refineParams.maxGlobalCells(),
+                refineParams.maxLocalCells()
+            )
+        );
+
+        labelList cellsToRefine
+        (
+            meshRefiner_.meshCutter().consistentRefinement
+            (
+                candidateCells,
+                true
+            )
+        );
+        Info<< "Determined cells to refine in = "
+            << mesh.time().cpuTimeIncrement() << " s" << endl;
+
+
+        label nCellsToRefine = cellsToRefine.size();
+        reduce(nCellsToRefine, sumOp<label>());
+
+        Info<< "Selected for refinement : " << nCellsToRefine
+            << " cells (out of " << mesh.globalData().nTotalCells()
+            << ')' << endl;
+
+        // Stop when no cells to refine or have done minimum necessary
+        // iterations and not enough cells to refine.
+        if (nCellsToRefine == 0)
+        {
+            Info<< "Stopping refining since too few cells selected."
+                << nl << endl;
+            break;
+        }
+
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+
+        if
+        (
+            returnReduce
+            (
+                (mesh.nCells() >= refineParams.maxLocalCells()),
+                orOp<bool>()
+            )
+        )
+        {
+            meshRefiner_.balanceAndRefine
+            (
+                "small feature refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+        else
+        {
+            meshRefiner_.refineAndBalance
+            (
+                "small feature refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+    }
+    return iter;
+}
+
+
 Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
 (
     const refinementParameters& refineParams,
@@ -207,7 +334,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
         (
             meshRefiner_.refineCandidates
             (
-                refineParams.keepPoints(),
+                refineParams.locationsInMesh(),
                 refineParams.curvature(),
                 refineParams.planarAngle(),
 
@@ -216,7 +343,10 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
                 false,              // internalRefinement
                 true,               // surfaceRefinement
                 true,               // curvatureRefinement
+                false,              // smallFeatureRefinement
                 false,              // gapRefinement
+                false,              // bigGapRefinement
+                false,              // spreadGapSize
                 refineParams.maxGlobalCells(),
                 refineParams.maxLocalCells()
             )
@@ -341,7 +471,7 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine
         (
             meshRefiner_.refineCandidates
             (
-                refineParams.keepPoints(),
+                refineParams.locationsInMesh(),
                 refineParams.curvature(),
                 refineParams.planarAngle(),
 
@@ -350,7 +480,10 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine
                 false,              // internalRefinement
                 false,              // surfaceRefinement
                 false,              // curvatureRefinement
+                false,              // smallFeatureRefinement
                 true,               // gapRefinement
+                false,              // bigGapRefinement
+                false,              // spreadGapSize
                 refineParams.maxGlobalCells(),
                 refineParams.maxLocalCells()
             )
@@ -525,6 +658,148 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine
 }
 
 
+Foam::label Foam::autoRefineDriver::bigGapOnlyRefine
+(
+    const refinementParameters& refineParams,
+    const bool spreadGapSize,
+    const label maxIter
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    label iter = 0;
+
+    // See if any surface has an extendedGapLevel
+    labelList surfaceMaxLevel(meshRefiner_.surfaces().maxGapLevel());
+    labelList shellMaxLevel(meshRefiner_.shells().maxGapLevel());
+
+    label overallMaxLevel(max(max(surfaceMaxLevel), max(shellMaxLevel)));
+
+    if (overallMaxLevel == 0)
+    {
+        return iter;
+    }
+
+
+    for (; iter < maxIter; iter++)
+    {
+        Info<< nl
+            << "Big gap refinement iteration " << iter << nl
+            << "------------------------------" << nl
+            << endl;
+
+
+        // Determine cells to refine
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        labelList candidateCells
+        (
+            meshRefiner_.refineCandidates
+            (
+                refineParams.locationsInMesh(),
+                refineParams.curvature(),
+                refineParams.planarAngle(),
+
+                false,              // featureRefinement
+                false,              // featureDistanceRefinement
+                false,              // internalRefinement
+                false,              // surfaceRefinement
+                false,              // curvatureRefinement
+                false,              // smallFeatureRefinement
+                false,              // gapRefinement
+                true,               // bigGapRefinement
+                spreadGapSize,      // spreadGapSize
+                refineParams.maxGlobalCells(),
+                refineParams.maxLocalCells()
+            )
+        );
+
+
+        if (debug&meshRefinement::MESH)
+        {
+            Pout<< "Dumping " << candidateCells.size()
+                << " cells to cellSet candidateCellsFromBigGap." << endl;
+            cellSet c(mesh, "candidateCellsFromBigGap", candidateCells);
+            c.instance() = meshRefiner_.timeName();
+            c.write();
+        }
+
+        labelList cellsToRefine
+        (
+            meshRefiner_.meshCutter().consistentRefinement
+            (
+                candidateCells,
+                true
+            )
+        );
+        Info<< "Determined cells to refine in = "
+            << mesh.time().cpuTimeIncrement() << " s" << endl;
+
+
+        label nCellsToRefine = cellsToRefine.size();
+        reduce(nCellsToRefine, sumOp<label>());
+
+        Info<< "Selected for refinement : " << nCellsToRefine
+            << " cells (out of " << mesh.globalData().nTotalCells()
+            << ')' << endl;
+
+        // Stop when no cells to refine or have done minimum necessary
+        // iterations and not enough cells to refine.
+        if
+        (
+            nCellsToRefine == 0
+         || (
+                iter >= overallMaxLevel
+             && nCellsToRefine <= refineParams.minRefineCells()
+            )
+        )
+        {
+            Info<< "Stopping refining since too few cells selected."
+                << nl << endl;
+            break;
+        }
+
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh.time())++;
+        }
+
+
+        if
+        (
+            returnReduce
+            (
+                (mesh.nCells() >= refineParams.maxLocalCells()),
+                orOp<bool>()
+            )
+        )
+        {
+            meshRefiner_.balanceAndRefine
+            (
+                "big gap refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+        else
+        {
+            meshRefiner_.refineAndBalance
+            (
+                "big gap refinement iteration " + name(iter),
+                decomposer_,
+                distributor_,
+                cellsToRefine,
+                refineParams.maxLoadUnbalance()
+            );
+        }
+    }
+    return iter;
+}
+
+
 Foam::label Foam::autoRefineDriver::danglingCellRefine
 (
     const refinementParameters& refineParams,
@@ -669,6 +944,348 @@ Foam::label Foam::autoRefineDriver::danglingCellRefine
 }
 
 
+// Detect cells with opposing intersected faces of differing refinement
+// level and refine them.
+Foam::label Foam::autoRefineDriver::refinementInterfaceRefine
+(
+    const refinementParameters& refineParams,
+    const label maxIter
+)
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    label iter = 0;
+
+    if (refineParams.interfaceRefine())
+    {
+        for (;iter < maxIter; iter++)
+        {
+            Info<< nl
+                << "Refinement transition refinement iteration " << iter << nl
+                << "--------------------------------------------" << nl
+                << endl;
+
+            const labelList& surfaceIndex = meshRefiner_.surfaceIndex();
+            const hexRef8& cutter = meshRefiner_.meshCutter();
+            const vectorField& fA = mesh.faceAreas();
+            const labelList& faceOwner = mesh.faceOwner();
+
+
+            // Determine cells to refine
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            const cellList& cells = mesh.cells();
+
+            labelList candidateCells;
+            {
+                // Pass1: pick up cells with differing face level
+
+                cellSet transitionCells
+                (
+                    mesh,
+                    "transitionCells",
+                    cells.size()/100
+                );
+
+                forAll(cells, cellI)
+                {
+                    const cell& cFaces = cells[cellI];
+                    label cLevel = cutter.cellLevel()[cellI];
+
+                    forAll(cFaces, cFaceI)
+                    {
+                        label faceI = cFaces[cFaceI];
+
+                        if (surfaceIndex[faceI] != -1)
+                        {
+                            label fLevel = cutter.faceLevel(faceI);
+                            if (fLevel != cLevel)
+                            {
+                                transitionCells.insert(cellI);
+                            }
+                        }
+                    }
+                }
+
+
+                cellSet candidateCellSet
+                (
+                    mesh,
+                    "candidateCells",
+                    cells.size()/1000
+                );
+
+                // Pass2: check for oppositeness
+
+                //forAllConstIter(cellSet, transitionCells, iter)
+                //{
+                //    label cellI = iter.key();
+                //    const cell& cFaces = cells[cellI];
+                //    const point& cc = cellCentres[cellI];
+                //    const scalar rCVol = pow(cellVolumes[cellI], -5.0/3.0);
+                //
+                //    // Determine principal axes of cell
+                //    symmTensor R(symmTensor::zero);
+                //
+                //    forAll(cFaces, i)
+                //    {
+                //        label faceI = cFaces[i];
+                //
+                //        const point& fc = faceCentres[faceI];
+                //
+                //        // Calculate face-pyramid volume
+                //        scalar pyrVol = 1.0/3.0 * fA[faceI] & (fc-cc);
+                //
+                //        if (faceOwner[faceI] != cellI)
+                //        {
+                //            pyrVol = -pyrVol;
+                //        }
+                //
+                //        // Calculate face-pyramid centre
+                //        vector pc = (3.0/4.0)*fc + (1.0/4.0)*cc;
+                //
+                //        R += pyrVol*sqr(pc-cc)*rCVol;
+                //    }
+                //
+                //    //- MEJ: Problem: truncation errors cause complex evs
+                //    vector lambdas(eigenValues(R));
+                //    const tensor axes(eigenVectors(R, lambdas));
+                //
+                //
+                //    // Check if this cell has
+                //    // - opposing sides intersected
+                //    // - which are of different refinement level
+                //    // - plus the inbetween face
+                //
+                //    labelVector plusFaceLevel(labelVector(-1, -1, -1));
+                //    labelVector minFaceLevel(labelVector(-1, -1, -1));
+                //
+                //    forAll(cFaces, cFaceI)
+                //    {
+                //        label faceI = cFaces[cFaceI];
+                //
+                //        if (surfaceIndex[faceI] != -1)
+                //        {
+                //            label fLevel = cutter.faceLevel(faceI);
+                //
+                //            // Get outwards pointing normal
+                //            vector n = fA[faceI]/mag(fA[faceI]);
+                //            if (faceOwner[faceI] != cellI)
+                //            {
+                //                n = -n;
+                //            }
+                //
+                //            // What is major direction and sign
+                //            direction cmpt = vector::X;
+                //            scalar maxComp = (n&axes.x());
+                //
+                //            scalar yComp = (n&axes.y());
+                //            scalar zComp = (n&axes.z());
+                //
+                //            if (mag(yComp) > mag(maxComp))
+                //            {
+                //                maxComp = yComp;
+                //                cmpt = vector::Y;
+                //            }
+                //
+                //            if (mag(zComp) > mag(maxComp))
+                //            {
+                //                maxComp = zComp;
+                //                cmpt = vector::Z;
+                //            }
+                //
+                //            if (maxComp > 0)
+                //            {
+                //                plusFaceLevel[cmpt] = max
+                //                (
+                //                    plusFaceLevel[cmpt],
+                //                    fLevel
+                //                );
+                //            }
+                //            else
+                //            {
+                //                minFaceLevel[cmpt] = max
+                //                (
+                //                    minFaceLevel[cmpt],
+                //                    fLevel
+                //                );
+                //            }
+                //        }
+                //    }
+                //
+                //    // Check if we picked up any opposite differing level
+                //    for (direction dir = 0; dir < vector::nComponents; dir++)
+                //    {
+                //        if
+                //        (
+                //            plusFaceLevel[dir] != -1
+                //         && minFaceLevel[dir] != -1
+                //         && plusFaceLevel[dir] != minFaceLevel[dir]
+                //        )
+                //        {
+                //            candidateCellSet.insert(cellI);
+                //        }
+                //    }
+                //}
+
+                const scalar oppositeCos = Foam::cos(Foam::degToRad(135));
+
+                forAllConstIter(cellSet, transitionCells, iter)
+                {
+                    label cellI = iter.key();
+                    const cell& cFaces = cells[cellI];
+                    label cLevel = cutter.cellLevel()[cellI];
+
+                    // Detect opposite intersection
+                    bool foundOpposite = false;
+
+                    forAll(cFaces, cFaceI)
+                    {
+                        label faceI = cFaces[cFaceI];
+
+                        if
+                        (
+                            surfaceIndex[faceI] != -1
+                         && cutter.faceLevel(faceI) > cLevel
+                        )
+                        {
+                            // Get outwards pointing normal
+                            vector n = fA[faceI]/mag(fA[faceI]);
+                            if (faceOwner[faceI] != cellI)
+                            {
+                                n = -n;
+                            }
+
+                            // Check for any opposite intersection
+                            forAll(cFaces, cFaceI2)
+                            {
+                                label face2I = cFaces[cFaceI2];
+
+                                if
+                                (
+                                    face2I != faceI
+                                 && surfaceIndex[face2I] != -1
+                                )
+                                {
+                                    // Get outwards pointing normal
+                                    vector n2 = fA[face2I]/mag(fA[face2I]);
+                                    if (faceOwner[face2I] != cellI)
+                                    {
+                                        n2 = -n2;
+                                    }
+
+
+                                    if ((n&n2) < oppositeCos)
+                                    {
+                                        foundOpposite = true;
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if (foundOpposite)
+                            {
+                                break;
+                            }
+                        }
+                    }
+
+
+                    if (foundOpposite)
+                    {
+                        candidateCellSet.insert(cellI);
+                    }
+                }
+
+                if (debug&meshRefinement::MESH)
+                {
+                    Pout<< "Dumping " << candidateCellSet.size()
+                        << " cells to cellSet candidateCellSet." << endl;
+                    candidateCellSet.instance() = meshRefiner_.timeName();
+                    candidateCellSet.write();
+                }
+                candidateCells = candidateCellSet.toc();
+            }
+
+
+
+            labelList cellsToRefine
+            (
+                meshRefiner_.meshCutter().consistentRefinement
+                (
+                    candidateCells,
+                    true
+                )
+            );
+            Info<< "Determined cells to refine in = "
+                << mesh.time().cpuTimeIncrement() << " s" << endl;
+
+
+            label nCellsToRefine = cellsToRefine.size();
+            reduce(nCellsToRefine, sumOp<label>());
+
+            Info<< "Selected for refinement : " << nCellsToRefine
+                << " cells (out of " << mesh.globalData().nTotalCells()
+                << ')' << endl;
+
+            // Stop when no cells to refine. After a few iterations check if too
+            // few cells
+            if
+            (
+                nCellsToRefine == 0
+             || (
+                    iter >= 1
+                 && nCellsToRefine <= refineParams.minRefineCells()
+                )
+            )
+            {
+                Info<< "Stopping refining since too few cells selected."
+                    << nl << endl;
+                break;
+            }
+
+
+            if (debug)
+            {
+                const_cast<Time&>(mesh.time())++;
+            }
+
+
+            if
+            (
+                returnReduce
+                (
+                    (mesh.nCells() >= refineParams.maxLocalCells()),
+                    orOp<bool>()
+                )
+            )
+            {
+                meshRefiner_.balanceAndRefine
+                (
+                    "interface cell refinement iteration " + name(iter),
+                    decomposer_,
+                    distributor_,
+                    cellsToRefine,
+                    refineParams.maxLoadUnbalance()
+                );
+            }
+            else
+            {
+                meshRefiner_.refineAndBalance
+                (
+                    "interface cell refinement iteration " + name(iter),
+                    decomposer_,
+                    distributor_,
+                    cellsToRefine,
+                    refineParams.maxLoadUnbalance()
+                );
+            }
+        }
+    }
+    return iter;
+}
+
+
 void Foam::autoRefineDriver::removeInsideCells
 (
     const refinementParameters& refineParams,
@@ -692,13 +1309,15 @@ void Foam::autoRefineDriver::removeInsideCells
         nBufferLayers,                  // nBufferLayers
         globalToMasterPatch_,
         globalToSlavePatch_,
-        refineParams.keepPoints()[0]
+        refineParams.locationsInMesh(),
+        refineParams.zonesInMesh(),
+        refineParams.locationsOutsideMesh()
     );
 
     if (debug&meshRefinement::MESH)
     {
         Pout<< "Writing subsetted mesh to time "
-            << meshRefiner_.timeName() << '.' << endl;
+            << meshRefiner_.timeName() << endl;
         meshRefiner_.write
         (
             meshRefinement::debugType(debug),
@@ -753,7 +1372,7 @@ Foam::label Foam::autoRefineDriver::shellRefine
         (
             meshRefiner_.refineCandidates
             (
-                refineParams.keepPoints(),
+                refineParams.locationsInMesh(),
                 refineParams.curvature(),
                 refineParams.planarAngle(),
 
@@ -762,7 +1381,10 @@ Foam::label Foam::autoRefineDriver::shellRefine
                 true,               // internalRefinement
                 false,              // surfaceRefinement
                 false,              // curvatureRefinement
+                false,              // smallFeatureRefinement
                 false,              // gapRefinement
+                false,              // bigGapRefinement
+                false,              // spreadGapSize
                 refineParams.maxGlobalCells(),
                 refineParams.maxLocalCells()
             )
@@ -900,6 +1522,11 @@ void Foam::autoRefineDriver::baffleAndSplitMesh
 
     const fvMesh& mesh = meshRefiner_.mesh();
 
+    if (debug)
+    {
+       const_cast<Time&>(mesh.time())++;
+    }
+
     // Introduce baffles at surface intersections. Note:
     // meshRefiment::surfaceIndex() will
     // be like boundary face from now on so not coupled anymore.
@@ -913,22 +1540,40 @@ void Foam::autoRefineDriver::baffleAndSplitMesh
         false,                          // perpendicular edge connected cells
         scalarField(0),                 // per region perpendicular angle
 
-        // Free standing baffles
-        !handleSnapProblems,            // merge free standing baffles?
-        refineParams.planarAngle(),
-
         motionDict,
         const_cast<Time&>(mesh.time()),
         globalToMasterPatch_,
         globalToSlavePatch_,
-        refineParams.keepPoints()[0]
+        refineParams.locationsInMesh(),
+        refineParams.zonesInMesh(),
+        refineParams.locationsOutsideMesh()
     );
+
+
+    if (!handleSnapProblems) // merge free standing baffles?
+    {
+        meshRefiner_.mergeFreeStandingBaffles
+        (
+            snapParams,
+            refineParams.useTopologicalSnapDetection(),
+            false,                  // perpendicular edge connected cells
+            scalarField(0),         // per region perpendicular angle
+            refineParams.planarAngle(),
+            motionDict,
+            const_cast<Time&>(mesh.time()),
+            globalToMasterPatch_,
+            globalToSlavePatch_,
+            refineParams.locationsInMesh(),
+            refineParams.locationsOutsideMesh()
+        );
+    }
 }
 
 
 void Foam::autoRefineDriver::zonify
 (
-    const refinementParameters& refineParams
+    const refinementParameters& refineParams,
+    wordPairHashTable& zonesToFaceZone
 )
 {
     // Mesh is at its finest. Do zoning
@@ -940,7 +1585,11 @@ void Foam::autoRefineDriver::zonify
     const labelList namedSurfaces =
         surfaceZonesInfo::getNamedSurfaces(meshRefiner_.surfaces().surfZones());
 
-    if (namedSurfaces.size())
+    if
+    (
+        namedSurfaces.size()
+     || refineParams.zonesInMesh().size()
+    )
     {
         Info<< nl
             << "Introducing zones for interfaces" << nl
@@ -956,14 +1605,16 @@ void Foam::autoRefineDriver::zonify
 
         meshRefiner_.zonify
         (
-            refineParams.keepPoints()[0],
-            refineParams.allowFreeStandingZoneFaces()
+            refineParams.allowFreeStandingZoneFaces(),
+            refineParams.locationsInMesh(),
+            refineParams.zonesInMesh(),
+            zonesToFaceZone
         );
 
         if (debug&meshRefinement::MESH)
         {
             Pout<< "Writing zoned mesh to time "
-                << meshRefiner_.timeName() << '.' << endl;
+                << meshRefiner_.timeName() << endl;
             meshRefiner_.write
             (
                 meshRefinement::debugType(debug),
@@ -1015,15 +1666,29 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
         handleSnapProblems,                 // remove perp edge connected cells
         perpAngle,                          // perp angle
 
-        // Free standing baffles
-        true,                               // merge free standing baffles?
-        refineParams.planarAngle(),         // planar angle
-
         motionDict,
         const_cast<Time&>(mesh.time()),
         globalToMasterPatch_,
         globalToSlavePatch_,
-        refineParams.keepPoints()[0]
+        refineParams.locationsInMesh(),
+        refineParams.zonesInMesh(),
+        refineParams.locationsOutsideMesh()
+    );
+
+    // Merge free-standing baffles always
+    meshRefiner_.mergeFreeStandingBaffles
+    (
+        snapParams,
+        refineParams.useTopologicalSnapDetection(),
+        handleSnapProblems,
+        perpAngle,
+        refineParams.planarAngle(),
+        motionDict,
+        const_cast<Time&>(mesh.time()),
+        globalToMasterPatch_,
+        globalToSlavePatch_,
+        refineParams.locationsInMesh(),
+        refineParams.locationsOutsideMesh()
     );
 
     if (debug)
@@ -1048,7 +1713,7 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
         // Actually merge baffles. Note: not exactly parallellized. Should
         // convert baffle faces into processor faces if they resulted
         // from them.
-        meshRefiner_.mergeBaffles(couples);
+        meshRefiner_.mergeBaffles(couples, Map<label>(0));
 
         if (debug)
         {
@@ -1061,7 +1726,8 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
         (
             globalToMasterPatch_,
             globalToSlavePatch_,
-            refineParams.keepPoints()[0]
+            refineParams.locationsInMesh(),
+            refineParams.locationsOutsideMesh()
         );
 
         if (debug)
@@ -1077,7 +1743,7 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
     if (debug&meshRefinement::MESH)
     {
         Pout<< "Writing handleProblemCells mesh to time "
-            << meshRefiner_.timeName() << '.' << endl;
+            << meshRefiner_.timeName() << endl;
         meshRefiner_.write
         (
             meshRefinement::debugType(debug),
@@ -1092,8 +1758,83 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
 }
 
 
+void Foam::autoRefineDriver::addFaceZones
+(
+    meshRefinement& meshRefiner,
+    const refinementParameters& refineParams,
+    const HashTable<Pair<word> >& faceZoneToPatches
+)
+{
+    if (faceZoneToPatches.size())
+    {
+        Info<< nl
+            << "Adding patches for face zones" << nl
+            << "-----------------------------" << nl
+            << endl;
+
+        Info<< setf(ios_base::left)
+            << setw(6) << "Patch"
+            << setw(20) << "Type"
+            << setw(30) << "Name"
+            << setw(30) << "FaceZone"
+            << setw(10) << "FaceType"
+            << nl
+            << setw(6) << "-----"
+            << setw(20) << "----"
+            << setw(30) << "----"
+            << setw(30) << "--------"
+            << setw(10) << "--------"
+            << endl;
+
+        const polyMesh& mesh = meshRefiner.mesh();
+
+        // Add patches for added inter-region faceZones
+        forAllConstIter(HashTable<Pair<word> >, faceZoneToPatches, iter)
+        {
+            const word& fzName = iter.key();
+            const Pair<word>& patchNames = iter();
+
+            // Get any user-defined faceZone data
+            surfaceZonesInfo::faceZoneType fzType;
+            dictionary patchInfo = refineParams.getZoneInfo(fzName, fzType);
+
+            const word& masterName = fzName;
+            //const word slaveName = fzName + "_slave";
+            //const word slaveName = czNames.second()+"_to_"+czNames.first();
+            const word& slaveName = patchNames.second();
+
+            label mpI = meshRefiner.addMeshedPatch(masterName, patchInfo);
+
+            Info<< setf(ios_base::left)
+                << setw(6) << mpI
+                << setw(20) << mesh.boundaryMesh()[mpI].type()
+                << setw(30) << masterName
+                << setw(30) << fzName
+                << setw(10) << surfaceZonesInfo::faceZoneTypeNames[fzType]
+                << nl;
+
+
+            label slI = meshRefiner.addMeshedPatch(slaveName, patchInfo);
+
+            Info<< setf(ios_base::left)
+                << setw(6) << slI
+                << setw(20) << mesh.boundaryMesh()[slI].type()
+                << setw(30) << slaveName
+                << setw(30) << fzName
+                << setw(10) << surfaceZonesInfo::faceZoneTypeNames[fzType]
+                << nl;
+
+            meshRefiner.addFaceZone(fzName, masterName, slaveName, fzType);
+        }
+
+        Info<< endl;
+    }
+}
+
+
 void Foam::autoRefineDriver::mergePatchFaces
 (
+    const bool geometricMerge,
     const refinementParameters& refineParams,
     const dictionary& motionDict
 )
@@ -1105,14 +1846,28 @@ void Foam::autoRefineDriver::mergePatchFaces
 
     const fvMesh& mesh = meshRefiner_.mesh();
 
-    meshRefiner_.mergePatchFacesUndo
-    (
-        Foam::cos(degToRad(45.0)),
-        Foam::cos(degToRad(45.0)),
-        meshRefiner_.meshedPatches(),
-        motionDict,
-        labelList(mesh.nFaces(), -1)
-    );
+    if (geometricMerge)
+    {
+        meshRefiner_.mergePatchFacesUndo
+        (
+            Foam::cos(degToRad(45.0)),
+            Foam::cos(degToRad(45.0)),
+            meshRefiner_.meshedPatches(),
+            motionDict,
+            labelList(mesh.nFaces(), -1)
+        );
+    }
+    else
+    {
+        // Still merge refined boundary faces if all four are on same patch
+        meshRefiner_.mergePatchFaces
+        (
+            Foam::cos(degToRad(45.0)),
+            Foam::cos(degToRad(45.0)),
+            4,          // only merge faces split into 4
+            meshRefiner_.meshedPatches()
+        );
+    }
 
     if (debug)
     {
@@ -1134,6 +1889,7 @@ void Foam::autoRefineDriver::doRefine
     const refinementParameters& refineParams,
     const snapParameters& snapParams,
     const bool prepareForSnapping,
+    const bool doMergePatchFaces,
     const dictionary& motionDict
 )
 {
@@ -1145,7 +1901,7 @@ void Foam::autoRefineDriver::doRefine
     const fvMesh& mesh = meshRefiner_.mesh();
 
     // Check that all the keep points are inside the mesh.
-    refineParams.findCells(mesh);
+    refineParams.findCells(true, mesh, refineParams.locationsInMesh());
 
     // Refine around feature edges
     featureEdgeRefine
@@ -1155,6 +1911,13 @@ void Foam::autoRefineDriver::doRefine
         0       // min cells to refine
     );
 
+    // Refine cells that contain a gap
+    smallFeatureRefine
+    (
+        refineParams,
+        100     // maxIter
+    );
+
     // Refine based on surface
     surfaceOnlyRefine
     (
@@ -1175,6 +1938,14 @@ void Foam::autoRefineDriver::doRefine
         1       // nBufferLayers
     );
 
+    // Refine consistently across narrow gaps (a form of shell refinement)
+    bigGapOnlyRefine
+    (
+        refineParams,
+        true,   // spreadGapSize
+        100     // maxIter
+    );
+
     // Internal mesh refinement
     shellRefine
     (
@@ -1196,6 +1967,13 @@ void Foam::autoRefineDriver::doRefine
         100     // maxIter
     );
 
+    // Refine any cells with differing refinement level on either side
+    refinementInterfaceRefine
+    (
+        refineParams,
+        10      // maxIter
+    );
+
     // Introduce baffles at surface intersections. Remove sections unreachable
     // from keepPoint.
     baffleAndSplitMesh
@@ -1206,8 +1984,31 @@ void Foam::autoRefineDriver::doRefine
         motionDict
     );
 
-    // Mesh is at its finest. Do optional zoning.
-    zonify(refineParams);
+    // Mesh is at its finest. Do optional zoning (cellZones and faceZones)
+    wordPairHashTable zonesToFaceZone;
+    zonify(refineParams, zonesToFaceZone);
+
+    // Create pairs of patches for faceZones
+    {
+        HashTable<Pair<word> > faceZoneToPatches(zonesToFaceZone.size());
+
+        //    Note: zonesToFaceZone contains the same data on different
+        //          processors but in different order. We could sort the
+        //          contents but instead just loop in sortedToc order.
+        List<Pair<word> > czs(zonesToFaceZone.sortedToc());
+
+        forAll(czs, i)
+        {
+            const Pair<word>& czNames = czs[i];
+            const word& fzName = zonesToFaceZone[czNames];
+
+            const word& masterName = fzName;
+            const word slaveName = czNames.second() + "_to_" + czNames.first();
+            Pair<word> patches(masterName, slaveName);
+            faceZoneToPatches.insert(fzName, patches);
+        }
+        addFaceZones(meshRefiner_, refineParams, faceZoneToPatches);
+    }
 
     // Pull baffles apart
     splitAndMergeBaffles
@@ -1221,7 +2022,7 @@ void Foam::autoRefineDriver::doRefine
     // Do something about cells with refined faces on the boundary
     if (prepareForSnapping)
     {
-        mergePatchFaces(refineParams, motionDict);
+        mergePatchFaces(doMergePatchFaces, refineParams, motionDict);
     }
 
 
@@ -1232,28 +2033,17 @@ void Foam::autoRefineDriver::doRefine
             << "---------------------" << nl
             << endl;
 
-        //if (debug)
-        //{
-        //    const_cast<Time&>(mesh.time())++;
-        //}
-
         // Do final balancing. Keep zoned faces on one processor since the
         // snap phase will convert them to baffles and this only works for
         // internal faces.
         meshRefiner_.balance
         (
-            true,
-            false,
-            scalarField(mesh.nCells(), 1), // dummy weights
+            true,                           // keepZoneFaces
+            false,                          // keepBaffles
+            scalarField(mesh.nCells(), 1),  // cellWeights
             decomposer_,
             distributor_
         );
-
-
-        if (debug)
-        {
-            meshRefiner_.checkZoneFaces();
-        }
     }
 }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
index a72f3c0796..19f8a03fbd 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,7 +34,8 @@ SourceFiles
 #ifndef autoRefineDriver_H
 #define autoRefineDriver_H
 
-#include "treeBoundBox.H"
+#include "wordPairHashTable.H"
+#include "labelList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -83,6 +84,13 @@ class autoRefineDriver
             const label minRefine
         );
 
+        //- Refine all cells containing small surface features
+        label smallFeatureRefine
+        (
+            const refinementParameters& refineParams,
+            const label maxIter
+        );
+
         //- Refine all cells interacting with the surface
         label surfaceOnlyRefine
         (
@@ -97,6 +105,14 @@ class autoRefineDriver
             const label maxIter
         );
 
+        //- Refine all cells in large gaps
+        label bigGapOnlyRefine
+        (
+            const refinementParameters& refineParams,
+            const bool spreadGapSize,
+            const label maxIter
+        );
+
         //- Refine cells with almost all sides refined
         label danglingCellRefine
         (
@@ -105,6 +121,13 @@ class autoRefineDriver
             const label maxIter
         );
 
+        //- Refine cells with opposite faces with differing refinement level
+        label refinementInterfaceRefine
+        (
+            const refinementParameters& refineParams,
+            const label maxIter
+        );
+
         //- Remove all cells within intersected region
         void removeInsideCells
         (
@@ -129,7 +152,11 @@ class autoRefineDriver
         );
 
         //- Add zones
-        void zonify(const refinementParameters& refineParams);
+        void zonify
+        (
+            const refinementParameters& refineParams,
+            wordPairHashTable& zonesToFaceZone
+        );
 
         void splitAndMergeBaffles
         (
@@ -142,11 +169,11 @@ class autoRefineDriver
         //- Merge refined boundary faces (from exposing coarser cell)
         void mergePatchFaces
         (
+            const bool geometricMerge,
             const refinementParameters& refineParams,
             const dictionary& motionDict
         );
 
-
         //- Disallow default bitwise copy construct
         autoRefineDriver(const autoRefineDriver&);
 
@@ -182,8 +209,18 @@ public:
             const refinementParameters& refineParams,
             const snapParameters& snapParams,
             const bool prepareForSnapping,
+            const bool mergePatchFaces,
             const dictionary& motionDict
         );
+
+        //- Helper: add faceZones and patches
+        static void addFaceZones
+        (
+            meshRefinement& meshRefiner,
+            const refinementParameters& refineParams,
+            const HashTable<Pair<word> >& faceZoneToPatches
+        );
+
 };
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index 41e6ca0dcc..a88fc283e4 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,9 +40,11 @@ Description
 #include "mergePoints.H"
 #include "snapParameters.H"
 #include "refinementSurfaces.H"
+#include "searchableSurfaces.H"
 #include "unitConversion.H"
 #include "localPointRegion.H"
 #include "PatchTools.H"
+#include "refinementFeatures.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -118,8 +120,187 @@ Foam::label Foam::autoSnapDriver::getCollocatedPoints
 }
 
 
+Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothInternalDisplacement
+(
+    const meshRefinement& meshRefiner,
+    const motionSmoother& meshMover
+)
+{
+    const indirectPrimitivePatch& pp = meshMover.patch();
+    const polyMesh& mesh = meshMover.mesh();
+
+    // Get neighbour refinement
+    const hexRef8& cutter = meshRefiner.meshCutter();
+    const labelList& cellLevel = cutter.cellLevel();
+
+
+    // Get the faces on the boundary
+    PackedBoolList isFront(mesh.nFaces());
+    forAll(pp.addressing(), i)
+    {
+        isFront[pp.addressing()[i]] = true;
+    }
+
+    // Walk out from the surface a bit. Poor man's FaceCellWave.
+    // Commented out for now - not sure if needed and if so how much
+    //for (label iter = 0; iter < 2; iter++)
+    //{
+    //    PackedBoolList newIsFront(mesh.nFaces());
+    //
+    //    forAll(isFront, faceI)
+    //    {
+    //        if (isFront[faceI])
+    //        {
+    //            label own = mesh.faceOwner()[faceI];
+    //            const cell& ownFaces = mesh.cells()[own];
+    //            forAll(ownFaces, i)
+    //            {
+    //                newIsFront[ownFaces[i]] = true;
+    //            }
+    //
+    //            if (mesh.isInternalFace(faceI))
+    //            {
+    //                label nei = mesh.faceNeighbour()[faceI];
+    //                const cell& neiFaces = mesh.cells()[nei];
+    //                forAll(neiFaces, i)
+    //                {
+    //                    newIsFront[neiFaces[i]] = true;
+    //                }
+    //            }
+    //        }
+    //    }
+    //
+    //    syncTools::syncFaceList
+    //    (
+    //        mesh,
+    //        newIsFront,
+    //        orEqOp<unsigned int>()
+    //    );
+    //
+    //    isFront = newIsFront;
+    //}
+
+    // Mark all points on faces
+    //  - not on the boundary
+    //  - inbetween differing refinement levels
+    PackedBoolList isMovingPoint(mesh.nPoints());
+
+    label nInterface = 0;
+
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        label ownLevel = cellLevel[mesh.faceOwner()[faceI]];
+        label neiLevel = cellLevel[mesh.faceNeighbour()[faceI]];
+
+        if (!isFront[faceI] && ownLevel != neiLevel)
+        {
+            const face& f = mesh.faces()[faceI];
+            forAll(f, fp)
+            {
+                isMovingPoint[f[fp]] = true;
+            }
+
+            nInterface++;
+        }
+    }
+
+    labelList neiCellLevel;
+    syncTools::swapBoundaryCellList(mesh, cellLevel, neiCellLevel);
+
+    for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
+    {
+        label ownLevel = cellLevel[mesh.faceOwner()[faceI]];
+        label neiLevel = neiCellLevel[faceI-mesh.nInternalFaces()];
+
+        if (!isFront[faceI] && ownLevel != neiLevel)
+        {
+            const face& f = mesh.faces()[faceI];
+            forAll(f, fp)
+            {
+                isMovingPoint[f[fp]] = true;
+            }
+
+            nInterface++;
+        }
+    }
+
+    if (debug)
+    {
+        reduce(nInterface, sumOp<label>());
+        Info<< "Found " << nInterface << " faces out of "
+            << mesh.globalData().nTotalFaces()
+            << " inbetween refinement regions." << endl;
+    }
+
+    // Make sure that points that are coupled to a moving point are marked
+    // as well
+    syncTools::syncPointList(mesh, isMovingPoint, maxEqOp<unsigned int>(), 0);
+
+    // Unmark any point on the boundary. If we're doing zero iterations of
+    // face-cell wave we might have coupled points not being unmarked.
+    forAll(pp.meshPoints(), pointI)
+    {
+        isMovingPoint[pp.meshPoints()[pointI]] = false;
+    }
+
+    // Make sure that points that are coupled to meshPoints but not on a patch
+    // are unmarked as well
+    syncTools::syncPointList(mesh, isMovingPoint, minEqOp<unsigned int>(), 1);
+
+
+    // Calculate average of connected cells
+    labelList nCells(mesh.nPoints(), 0);
+    pointField sumLocation(mesh.nPoints(), vector::zero);
+
+    forAll(isMovingPoint, pointI)
+    {
+        if (isMovingPoint[pointI])
+        {
+            const labelList& pCells = mesh.pointCells(pointI);
+
+            forAll(pCells, i)
+            {
+                sumLocation[pointI] += mesh.cellCentres()[pCells[i]];
+                nCells[pointI]++;
+            }
+        }
+    }
+
+    // Sum
+    syncTools::syncPointList(mesh, nCells, plusEqOp<label>(), label(0));
+    syncTools::syncPointList
+    (
+        mesh,
+        sumLocation,
+        plusEqOp<point>(),
+        vector::zero
+    );
+
+    tmp<pointField> tdisplacement(new pointField(mesh.nPoints(), vector::zero));
+    pointField& displacement = tdisplacement();
+
+    label nAdapted = 0;
+
+    forAll(displacement, pointI)
+    {
+        if (nCells[pointI] > 0)
+        {
+            displacement[pointI] =
+                sumLocation[pointI]/nCells[pointI]-mesh.points()[pointI];
+            nAdapted++;
+        }
+    }
+
+    reduce(nAdapted, sumOp<label>());
+    Info<< "Smoothing " << nAdapted << " points inbetween refinement regions."
+        << endl;
+
+    return tdisplacement;
+}
+
+
 // Calculate displacement as average of patch points.
-Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
+Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothPatchDisplacement
 (
     const motionSmoother& meshMover,
     const List<labelPair>& baffles
@@ -177,7 +358,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
             }
             else
             {
-                FatalErrorIn("autoSnapDriver::smoothPatchDisplacement(..)")
+                FatalErrorInFunction
                     << "Both sides of baffle consisting of faces " << f0
                     << " and " << f1 << " are already slave faces."
                     << abort(FatalError);
@@ -327,7 +508,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     labelList anyCell(mesh.nPoints(), -1);
-    forAll(mesh.faceNeighbour(), faceI)
+    forAll(mesh.faceOwner(), faceI)
     {
         label own = mesh.faceOwner()[faceI];
         const face& f = mesh.faces()[faceI];
@@ -337,21 +518,11 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
             anyCell[f[fp]] = own;
         }
     }
-    for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
-    {
-        label own = mesh.faceOwner()[faceI];
-
-        const face& f = mesh.faces()[faceI];
-
-        forAll(f, fp)
-        {
-            anyCell[f[fp]] = own;
-        }
-    }
 
 
     // Displacement to calculate.
-    pointField patchDisp(meshPoints.size(), vector::zero);
+    tmp<pointField> tpatchDisp(new pointField(meshPoints.size(), vector::zero));
+    pointField& patchDisp = tpatchDisp();
 
     forAll(pointFaces, i)
     {
@@ -414,7 +585,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
         patchDisp[i] = newPos - currentPos;
     }
 
-    return patchDisp;
+    return tpatchDisp;
 }
 //XXXXXXX
 //Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avg
@@ -521,42 +692,6 @@ Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
         edgeDist[edgeI] = Foam::sqrt(allEdgeInfo[edgeI].distSqr());
     }
 
-
-    //{
-    //    // For debugging: dump to file
-    //    pointScalarField pointDist
-    //    (
-    //        IOobject
-    //        (
-    //            "pointDist",
-    //            meshRefiner_.timeName(),
-    //            mesh.DB(),
-    //            IOobject::NO_READ,
-    //            IOobject::AUTO_WRITE
-    //        ),
-    //        pMesh,
-    //        dimensionedScalar("pointDist", dimless, 0.0)
-    //    );
-    //
-    //    forAll(allEdgeInfo, edgeI)
-    //    {
-    //        scalar d = Foam::sqrt(allEdgeInfo[edgeI].distSqr());
-    //
-    //        const edge& e = mesh.edges()[edgeI];
-    //
-    //        pointDist[e[0]] += d;
-    //        pointDist[e[1]] += d;
-    //    }
-    //    forAll(pointDist, pointI)
-    //    {
-    //        pointDist[pointI] /= mesh.pointEdges()[pointI].size();
-    //    }
-    //    Info<< "Writing patch distance to " << pointDist.name()
-    //        << " at time " << meshRefiner_.timeName() << endl;
-    //
-    //    pointDist.write();
-    //}
-
     return tedgeDist;
 }
 
@@ -648,35 +783,6 @@ Foam::autoSnapDriver::autoSnapDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
-(
-    const List<labelPair>& baffles
-)
-{
-    labelList zonedSurfaces =
-        surfaceZonesInfo::getNamedSurfaces(meshRefiner_.surfaces().surfZones());
-
-    autoPtr<mapPolyMesh> map;
-
-    // No need to sync; all processors will have all same zonedSurfaces.
-    label nBaffles = returnReduce(baffles.size(), sumOp<label>());
-    if (zonedSurfaces.size() && nBaffles > 0)
-    {
-        // Merge any baffles
-        Info<< "Converting " << nBaffles << " baffles back into zoned faces ..."
-            << endl;
-
-        map = meshRefiner_.mergeBaffles(baffles);
-
-        Info<< "Converted baffles in = "
-            << meshRefiner_.mesh().time().cpuTimeIncrement()
-            << " s\n" << nl << endl;
-    }
-
-    return map;
-}
-
-
 Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
 (
     const fvMesh& mesh,
@@ -730,7 +836,15 @@ void Foam::autoSnapDriver::preSmoothPatch
 
     labelList checkFaces;
 
-    Info<< "Smoothing patch points ..." << endl;
+    if (snapParams.nSmoothInternal() > 0)
+    {
+        Info<< "Smoothing patch and internal points ..." << endl;
+    }
+    else
+    {
+        Info<< "Smoothing patch points ..." << endl;
+    }
+
     for
     (
         label smoothIter = 0;
@@ -745,15 +859,26 @@ void Foam::autoSnapDriver::preSmoothPatch
             checkFaces[faceI] = faceI;
         }
 
+        // If enabled smooth the internal points
+        if (snapParams.nSmoothInternal() > smoothIter)
+        {
+            // Override values on internal points on refinement interfaces
+            meshMover.pointDisplacement().internalField() =
+                smoothInternalDisplacement(meshRefiner, meshMover);
+        }
+
+        // Smooth the patch points
         pointField patchDisp(smoothPatchDisplacement(meshMover, baffles));
         //pointField patchDisp
         //(
         //  smoothLambdaMuPatchDisplacement(meshMover, baffles)
         //);
 
-        // The current mesh is the starting mesh to smooth from.
+        // Take over patch displacement as boundary condition on
+        // pointDisplacement
         meshMover.setDisplacement(patchDisp);
 
+        // Start off from current mesh.points()
         meshMover.correct();
 
         scalar oldErrorReduction = -1;
@@ -825,11 +950,8 @@ Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
 
     if (zoneI == -1)
     {
-        FatalErrorIn
-        (
-            "autoSnapDriver::getZoneSurfacePoints"
-            "(const fvMesh&, const indirectPrimitivePatch&, const word&)"
-        )   << "Cannot find zone " << zoneName
+        FatalErrorInFunction
+            << "Cannot find zone " << zoneName
             << exit(FatalError);
     }
 
@@ -1566,9 +1688,92 @@ void Foam::autoSnapDriver::detectNearSurfaces
 }
 
 
+void Foam::autoSnapDriver::calcNearestSurface
+(
+    const refinementSurfaces& surfaces,
+
+    const labelList& surfacesToTest,
+    const labelListList& regionsToTest,
+
+    const pointField& localPoints,
+    const labelList& zonePointIndices,
+
+    scalarField& minSnapDist,
+    labelList& snapSurf,
+    vectorField& patchDisp,
+
+    // Optional: nearest point, normal
+    pointField& nearestPoint,
+    vectorField& nearestNormal
+)
+{
+    // Find nearest for points both on faceZone and pp.
+    List<pointIndexHit> hitInfo;
+    labelList hitSurface;
+
+    if (nearestNormal.size() == localPoints.size())
+    {
+        labelList hitRegion;
+        vectorField hitNormal;
+        surfaces.findNearestRegion
+        (
+            surfacesToTest,
+            regionsToTest,
+
+            pointField(localPoints, zonePointIndices),
+            sqr(scalarField(minSnapDist, zonePointIndices)),
+
+            hitSurface,
+            hitInfo,
+            hitRegion,
+            hitNormal
+        );
+
+        forAll(hitInfo, i)
+        {
+            if (hitInfo[i].hit())
+            {
+                label pointI = zonePointIndices[i];
+                nearestPoint[pointI] = hitInfo[i].hitPoint();
+                nearestNormal[pointI] = hitNormal[i];
+            }
+        }
+    }
+    else
+    {
+        surfaces.findNearest
+        (
+            surfacesToTest,
+            regionsToTest,
+
+            pointField(localPoints, zonePointIndices),
+            sqr(scalarField(minSnapDist, zonePointIndices)),
+
+            hitSurface,
+            hitInfo
+        );
+    }
+
+    forAll(hitInfo, i)
+    {
+        if (hitInfo[i].hit())
+        {
+            label pointI = zonePointIndices[i];
+
+            patchDisp[pointI] = hitInfo[i].hitPoint() - localPoints[pointI];
+            minSnapDist[pointI] = mag(patchDisp[pointI]);
+            snapSurf[pointI] = hitSurface[i];
+        }
+    }
+}
+
+
 Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 (
+    const bool strictRegionSnap,
     const meshRefinement& meshRefiner,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
     const scalarField& snapDist,
     const indirectPrimitivePatch& pp,
     pointField& nearestPoint,
@@ -1577,6 +1782,23 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 {
     Info<< "Calculating patchDisplacement as distance to nearest surface"
         << " point ..." << endl;
+    if (strictRegionSnap)
+    {
+        Info<< "    non-zone points : attract to local region on surface only"
+            << nl
+            << "    zone points     : attract to local region on surface only"
+            << nl
+            << endl;
+    }
+    else
+    {
+        Info<< "    non-zone points :"
+            << " attract to nearest of all non-zone surfaces"
+            << nl
+            << "    zone points     : attract to zone surface only" << nl
+            << endl;
+    }
+
 
     const pointField& localPoints = pp.localPoints();
     const refinementSurfaces& surfaces = meshRefiner.surfaces();
@@ -1587,26 +1809,109 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 
     if (returnReduce(localPoints.size(), sumOp<label>()) > 0)
     {
-        // Current surface snapped to
+        // Current surface snapped to. Used to check whether points have been
+        // snapped at all
         labelList snapSurf(localPoints.size(), -1);
 
-        // Divide surfaces into zoned and unzoned
-        const labelList zonedSurfaces =
-            surfaceZonesInfo::getNamedSurfaces
-            (
-                meshRefiner.surfaces().surfZones()
-            );
-        const labelList unzonedSurfaces =
-            surfaceZonesInfo::getUnnamedSurfaces
-            (
-                meshRefiner.surfaces().surfZones()
-            );
+        // Current best snap distance (since point might be on multiple
+        // regions)
+        scalarField minSnapDist(snapDist);
 
 
-        // 1. All points to non-interface surfaces
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+        if (strictRegionSnap)
         {
+            // Attract patch points to same region only
+
+            forAll(surfaces.surfaces(), surfI)
+            {
+                label geomI = surfaces.surfaces()[surfI];
+                label nRegions = surfaces.geometry()[geomI].regions().size();
+
+                const labelList surfacesToTest(1, surfI);
+
+                for (label regionI = 0; regionI < nRegions; regionI++)
+                {
+                    label globalI = surfaces.globalRegion(surfI, regionI);
+                    label masterPatchI = globalToMasterPatch[globalI];
+
+                    // Get indices of points both on patch and on pp
+                    labelList zonePointIndices
+                    (
+                        getFacePoints
+                        (
+                            pp,
+                            mesh.boundaryMesh()[masterPatchI]
+                        )
+                    );
+
+                    calcNearestSurface
+                    (
+                        surfaces,
+
+                        surfacesToTest,
+                        labelListList(1, labelList(1, regionI)), //regionsToTest
+
+                        localPoints,
+                        zonePointIndices,
+
+                        minSnapDist,
+                        snapSurf,
+                        patchDisp,
+
+                        // Optional: nearest point, normal
+                        nearestPoint,
+                        nearestNormal
+                    );
+
+                    if (globalToSlavePatch[globalI] != masterPatchI)
+                    {
+                        label slavePatchI = globalToSlavePatch[globalI];
+
+                        // Get indices of points both on patch and on pp
+                        labelList zonePointIndices
+                        (
+                            getFacePoints
+                            (
+                                pp,
+                                mesh.boundaryMesh()[slavePatchI]
+                            )
+                        );
+
+                        calcNearestSurface
+                        (
+                            surfaces,
+
+                            surfacesToTest,
+                            labelListList(1, labelList(1, regionI)),
+
+                            localPoints,
+                            zonePointIndices,
+
+                            minSnapDist,
+                            snapSurf,
+                            patchDisp,
+
+                            // Optional: nearest point, normal
+                            nearestPoint,
+                            nearestNormal
+                        );
+                    }
+                }
+            }
+        }
+        else
+        {
+            // Divide surfaces into zoned and unzoned
+            const labelList unzonedSurfaces =
+                surfaceZonesInfo::getUnnamedSurfaces
+                (
+                    meshRefiner.surfaces().surfZones()
+                );
+
+
+            // 1. All points to non-interface surfaces
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
             List<pointIndexHit> hitInfo;
             labelList hitSurface;
 
@@ -1657,106 +1962,73 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
                     snapSurf[pointI] = hitSurface[pointI];
                 }
             }
-        }
 
 
-
-        // 2. All points on zones to their respective surface
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        // Surfaces with zone information
-        const PtrList<surfaceZonesInfo>& surfZones = surfaces.surfZones();
-
-        // Current best snap distance
-        scalarField minSnapDist(snapDist);
-
-        forAll(zonedSurfaces, i)
-        {
-            label zoneSurfI = zonedSurfaces[i];
-
-            const word& faceZoneName = surfZones[zoneSurfI].faceZoneName();
-
-            const labelList surfacesToTest(1, zoneSurfI);
-
-            // Get indices of points both on faceZone and on pp.
-            labelList zonePointIndices
-            (
-                getZoneSurfacePoints
+            const labelList zonedSurfaces =
+                surfaceZonesInfo::getNamedSurfaces
                 (
-                    mesh,
-                    pp,
-                    faceZoneName
-                )
-            );
-
-            // Find nearest for points both on faceZone and pp.
-            List<pointIndexHit> hitInfo;
-            labelList hitSurface;
-
-            if (nearestNormal.size() == localPoints.size())
-            {
-                labelList hitRegion;
-                vectorField hitNormal;
-                surfaces.findNearestRegion
-                (
-                    surfacesToTest,
-                    pointField(localPoints, zonePointIndices),
-                    sqr(scalarField(minSnapDist, zonePointIndices)),
-                    hitSurface,
-                    hitInfo,
-                    hitRegion,
-                    hitNormal
+                    meshRefiner.surfaces().surfZones()
                 );
 
-                forAll(hitInfo, i)
-                {
-                    if (hitInfo[i].hit())
-                    {
-                        label pointI = zonePointIndices[i];
-                        nearestPoint[pointI] = hitInfo[i].hitPoint();
-                        nearestNormal[pointI] = hitNormal[i];
-                    }
-                }
-            }
-            else
+
+            // 2. All points on zones to their respective surface
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            // Surfaces with zone information
+            const PtrList<surfaceZonesInfo>& surfZones = surfaces.surfZones();
+
+            forAll(zonedSurfaces, i)
             {
-                surfaces.findNearest
+                label surfI = zonedSurfaces[i];
+
+                const word& faceZoneName = surfZones[surfI].faceZoneName();
+
+                const labelList surfacesToTest(1, surfI);
+
+                label geomI = surfaces.surfaces()[surfI];
+                label nRegions = surfaces.geometry()[geomI].regions().size();
+
+
+                // Get indices of points both on faceZone and on pp.
+                labelList zonePointIndices
                 (
-                    surfacesToTest,
-                    pointField(localPoints, zonePointIndices),
-                    sqr(scalarField(minSnapDist, zonePointIndices)),
-                    hitSurface,
-                    hitInfo
-                );
-            }
-
-            forAll(hitInfo, i)
-            {
-                label pointI = zonePointIndices[i];
-
-                if (hitInfo[i].hit())
-                {
-                    patchDisp[pointI] =
-                        hitInfo[i].hitPoint()
-                      - localPoints[pointI];
-
-                    minSnapDist[pointI] = min
+                    getZoneSurfacePoints
                     (
-                        minSnapDist[pointI],
-                        mag(patchDisp[pointI])
-                    );
+                        mesh,
+                        pp,
+                        faceZoneName
+                    )
+                );
 
-                    snapSurf[pointI] = zoneSurfI;
-                }
+
+                calcNearestSurface
+                (
+                    surfaces,
+
+                    surfacesToTest,
+                    labelListList(1, identity(nRegions)),
+
+                    localPoints,
+                    zonePointIndices,
+
+                    minSnapDist,
+                    snapSurf,
+                    patchDisp,
+
+                    // Optional: nearest point, normal
+                    nearestPoint,
+                    nearestNormal
+                );
             }
         }
 
+
         // Check if all points are being snapped
         forAll(snapSurf, pointI)
         {
             if (snapSurf[pointI] == -1)
             {
-                WarningIn("autoSnapDriver::calcNearestSurface(..)")
+                WarningInFunction
                     << "For point:" << pointI
                     << " coordinate:" << localPoints[pointI]
                     << " did not find any surface within:"
@@ -1788,7 +2060,8 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
         << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
 
 
-    // Limit amount of movement.
+    // Limit amount of movement. Can not happen for triSurfaceMesh but
+    // can happen for some analytical shapes?
     forAll(patchDisp, patchPointI)
     {
         scalar magDisp = mag(patchDisp[patchPointI]);
@@ -1818,254 +2091,6 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 }
 
 
-////XXXXXXXXX
-//// Get (pp-local) indices of points that are on both patches
-//Foam::labelList Foam::autoSnapDriver::getPatchSurfacePoints
-//(
-//    const fvMesh& mesh,
-//    const indirectPrimitivePatch& allPp,
-//    const polyPatch& pp
-//)
-//{
-//    // Could use PrimitivePatch & localFaces to extract points but might just
-//    // as well do it ourselves.
-//
-//    boolList pointOnZone(allPp.nPoints(), false);
-//
-//    forAll(pp, i)
-//    {
-//        const face& f = pp[i];
-//
-//        forAll(f, fp)
-//        {
-//            label meshPointI = f[fp];
-//
-//            Map<label>::const_iterator iter =
-//                allPp.meshPointMap().find(meshPointI);
-//
-//            if (iter != allPp.meshPointMap().end())
-//            {
-//                label pointI = iter();
-//                pointOnZone[pointI] = true;
-//            }
-//        }
-//    }
-//
-//    return findIndices(pointOnZone, true);
-//}
-//Foam::vectorField Foam::autoSnapDriver::calcNearestLocalSurface
-//(
-//    const meshRefinement& meshRefiner,
-//    const scalarField& snapDist,
-//    const indirectPrimitivePatch& pp
-//)
-//{
-//    Info<< "Calculating patchDisplacement as distance to nearest"
-//        << " local surface point ..." << endl;
-//
-//    const pointField& localPoints = pp.localPoints();
-//    const refinementSurfaces& surfaces = meshRefiner.surfaces();
-//    const fvMesh& mesh = meshRefiner.mesh();
-//    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
-//
-//
-////    // Assume that all patch-internal points get attracted to their surface
-////    // only. So we want to know if point is on multiple regions
-////
-////    labelList minPatch(mesh.nPoints(), labelMax);
-////    labelList maxPatch(mesh.nPoints(), labelMin);
-////
-////    forAll(meshMover.adaptPatchIDs(), i)
-////    {
-////        label patchI = meshMover.adaptPatchIDs()[i];
-////        const labelList& meshPoints = pbm[patchI].meshPoints();
-////
-////        forAll(meshPoints, meshPointI)
-////        {
-////            label meshPointI = meshPoints[meshPointI];
-////            minPatch[meshPointI] = min(minPatch[meshPointI], patchI);
-////            maxPatch[meshPointI] = max(maxPatch[meshPointI], patchI);
-////        }
-////    }
-////
-////    syncTools::syncPointList
-////    (
-////        mesh,
-////        minPatch,
-////        minEqOp<label>(),   // combine op
-////        labelMax            // null value
-////    );
-////    syncTools::syncPointList
-////    (
-////        mesh,
-////        maxPatch,
-////        maxEqOp<label>(),   // combine op
-////        labelMin            // null value
-////    );
-//
-//    // Now all points with minPatch != maxPatch will be on the outside of
-//    // the patch.
-//
-//    // Displacement per patch point
-//    vectorField patchDisp(localPoints.size(), vector::zero);
-//    // Current best snap distance
-//    scalarField minSnapDist(snapDist);
-//    // Current surface snapped to
-//    labelList snapSurf(localPoints.size(), -1);
-//
-//    const labelList& surfaceGeometry = surfaces.surfaces();
-//    forAll(surfaceGeometry, surfI)
-//    {
-//        label geomI = surfaceGeometry[surfI];
-//        const wordList& regNames = allGeometry.regionNames()[geomI];
-//        forAll(regNames, regionI)
-//        {
-//            label globalRegionI = surfaces.globalRegion(surfI, regionI);
-//            // Collect master patch points
-//            label masterPatchI = globalToMasterPatch_[globalRegionI];
-//            label slavePatchI = globalToSlavePatch_[globalRegionI];
-//
-//            labelList patchPointIndices
-//            (
-//                getPatchSurfacePoints
-//                (
-//                    mesh,
-//                    pp,
-//                    pbm[masterPatchI]
-//                )
-//            );
-//
-//            // Find nearest for points both on faceZone and pp.
-//            List<pointIndexHit> hitInfo;
-//            surfaces.findNearest
-//            (
-//                surfI,
-//                regionI,
-//                pointField(localPoints, patchPointIndices),
-//                sqr(scalarField(minSnapDist, patchPointIndices)),
-//                hitInfo
-//            );
-//
-//            forAll(hitInfo, i)
-//            {
-//                label pointI = patchPointIndices[i];
-//
-//                if (hitInfo[i].hit())
-//                {
-//                    const point& pt = hitInfo[i].hitPoint();
-//                    patchDisp[pointI] = pt-localPoints[pointI];
-//                    minSnapDist[pointI] = min
-//                    (
-//                        minSnapDist[pointI],
-//                        mag(patchDisp[pointI])
-//                    );
-//                    snapSurf[pointI] = surfI;
-//                }
-//            }
-//
-//            // Slave patch
-//            if (slavePatchI != masterPatchI)
-//            {
-//                labelList patchPointIndices
-//                (
-//                    getPatchSurfacePoints
-//                    (
-//                        mesh,
-//                        pp,
-//                        pbm[slavePatchI]
-//                    )
-//                );
-//
-//                // Find nearest for points both on faceZone and pp.
-//                List<pointIndexHit> hitInfo;
-//                surfaces.findNearest
-//                (
-//                    surfI,
-//                    regionI,
-//                    pointField(localPoints, patchPointIndices),
-//                    sqr(scalarField(minSnapDist, patchPointIndices)),
-//                    hitInfo
-//                );
-//
-//                forAll(hitInfo, i)
-//                {
-//                    label pointI = patchPointIndices[i];
-//
-//                    if (hitInfo[i].hit())
-//                    {
-//                        const point& pt = hitInfo[i].hitPoint();
-//                        patchDisp[pointI] = pt-localPoints[pointI];
-//                        minSnapDist[pointI] = min
-//                        (
-//                            minSnapDist[pointI],
-//                            mag(patchDisp[pointI])
-//                        );
-//                        snapSurf[pointI] = surfI;
-//                    }
-//                }
-//            }
-//        }
-//    }
-//
-//
-//    // Check if all points are being snapped
-//    forAll(snapSurf, pointI)
-//    {
-//        if (snapSurf[pointI] == -1)
-//        {
-//            WarningIn("autoSnapDriver::calcNearestLocalSurface(..)")
-//                << "For point:" << pointI
-//                << " coordinate:" << localPoints[pointI]
-//                << " did not find any surface within:"
-//                << minSnapDist[pointI]
-//                << " metre." << endl;
-//        }
-//    }
-//
-//    {
-//        scalarField magDisp(mag(patchDisp));
-//
-//        Info<< "Wanted displacement : average:"
-//            << gSum(magDisp)/returnReduce(patchDisp.size(), sumOp<label>())
-//            << " min:" << gMin(magDisp)
-//            << " max:" << gMax(magDisp) << endl;
-//    }
-//
-//
-//    Info<< "Calculated surface displacement in = "
-//        << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
-//
-//
-//    // Limit amount of movement.
-//    forAll(patchDisp, patchPointI)
-//    {
-//        scalar magDisp = mag(patchDisp[patchPointI]);
-//
-//        if (magDisp > snapDist[patchPointI])
-//        {
-//            patchDisp[patchPointI] *= snapDist[patchPointI] / magDisp;
-//
-//            Pout<< "Limiting displacement for " << patchPointI
-//                << " from " << magDisp << " to " << snapDist[patchPointI]
-//                << endl;
-//        }
-//    }
-//
-//    // Points on zones in one domain but only present as point on other
-//    // will not do condition 2 on all. Sync explicitly.
-//    syncTools::syncPointList
-//    (
-//        mesh,
-//        pp.meshPoints(),
-//        patchDisp,
-//        minMagSqrEqOp<point>(),    // combine op
-//        vector(GREAT, GREAT, GREAT)// null value (note: cannot use VGREAT)
-//    );
-//
-//    return patchDisp;
-//}
-////XXXXXXXXX
-
 void Foam::autoSnapDriver::smoothDisplacement
 (
     const snapParameters& snapParams,
@@ -2465,10 +2490,45 @@ void Foam::autoSnapDriver::detectWarpedFaces
 }
 
 
+Foam::labelList Foam::autoSnapDriver::getInternalOrBaffleDuplicateFace() const
+{
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    labelList internalOrBaffleFaceZones;
+    {
+        List<surfaceZonesInfo::faceZoneType> fzTypes(2);
+        fzTypes[0] = surfaceZonesInfo::INTERNAL;
+        fzTypes[1] = surfaceZonesInfo::BAFFLE;
+        internalOrBaffleFaceZones = meshRefiner_.getZones(fzTypes);
+    }
+
+    List<labelPair> baffles
+    (
+        meshRefiner_.subsetBaffles
+        (
+            mesh,
+            internalOrBaffleFaceZones,
+            localPointRegion::findDuplicateFacePairs(mesh)
+        )
+    );
+
+    labelList faceToDuplicate(mesh.nFaces(), -1);
+    forAll(baffles, i)
+    {
+        const labelPair& p = baffles[i];
+        faceToDuplicate[p[0]] = p[1];
+        faceToDuplicate[p[1]] = p[0];
+    }
+
+    return faceToDuplicate;
+}
+
+
 void Foam::autoSnapDriver::doSnap
 (
     const dictionary& snapDict,
     const dictionary& motionDict,
+    const bool mergePatchFaces,
     const scalar featureCos,
     const scalar planarAngle,
     const snapParameters& snapParams
@@ -2481,10 +2541,6 @@ void Foam::autoSnapDriver::doSnap
         << "--------------" << nl
         << endl;
 
-    // Get the labels of added patches.
-    labelList adaptPatchIDs(meshRefiner_.meshedPatches());
-
-
     // faceZone handling
     // ~~~~~~~~~~~~~~~~~
     //
@@ -2499,233 +2555,55 @@ void Foam::autoSnapDriver::doSnap
     //
     // internal
     // --------
-    // - baffles: contains all faces on faceZone so
-    //      - mesh checks check across baffles
-    //      - they get back merged into internal faces
+    // - baffles: need to be checked across
     // - duplicateFace: from face to duplicate face. Contains
     //   all faces on faceZone to prevents merging patch faces.
     //
     // baffle
     // ------
-    // - baffles: contains no faces on faceZone since need not be merged/checked
-    //   across
+    // - baffles: no need to be checked across
     // - duplicateFace: contains all faces on faceZone to prevent
     //   merging patch faces.
     //
     // boundary
     // --------
-    // - baffles: contains no faces on faceZone since need not be merged/checked
-    //   across
+    // - baffles: no need to be checked across. Also points get duplicated
+    //            so will no longer be baffles
     // - duplicateFace: contains no faces on faceZone since both sides can
     //   merge faces independently.
 
 
-    // Create baffles (pairs of faces that share the same points)
-    // Baffles stored as owner and neighbour face that have been created.
-    List<labelPair> baffles;
-    meshRefiner_.createZoneBaffles
+
+    // faceZones of type internal
+    const labelList internalFaceZones
     (
-        globalToMasterPatch_,
-        globalToSlavePatch_,
-        baffles
+        meshRefiner_.getZones
+        (
+            List<surfaceZonesInfo::faceZoneType>
+            (
+                1,
+                surfaceZonesInfo::INTERNAL
+            )
+        )
     );
 
-    // Maintain map from face to baffle face (-1 for non-baffle faces). Used
-    // later on to prevent patchface merging if faceType=baffle
-    labelList duplicateFace(mesh.nFaces(), -1);
 
-    forAll(baffles, i)
+    // Create baffles (pairs of faces that share the same points)
+    // Baffles stored as owner and neighbour face that have been created.
     {
-        const labelPair& baffle = baffles[i];
-        duplicateFace[baffle.first()] = baffle.second();
-        duplicateFace[baffle.second()] = baffle.first();
-    }
-
-    // Selectively 'forget' about the baffles, i.e. not check across them
-    // or merge across them.
-    {
-        const faceZoneMesh& fZones = mesh.faceZones();
-        const refinementSurfaces& surfaces = meshRefiner_.surfaces();
-        const PtrList<surfaceZonesInfo>& surfZones = surfaces.surfZones();
-
-        // Determine which
-        //  - faces to remove from list of baffles (so not merge)
-        //  - points to duplicate
-
-        // Per face if is on faceType 'baffle' or 'boundary'
-        labelList filterFace(mesh.nFaces(), -1);
-        label nFilterFaces = 0;
-        // Per point whether it need to be duplicated
-        PackedBoolList duplicatePoint(mesh.nPoints());
-        label nDuplicatePoints = 0;
-        forAll(surfZones, surfI)
-        {
-            const word& faceZoneName = surfZones[surfI].faceZoneName();
-
-            if (faceZoneName.size())
-            {
-                const surfaceZonesInfo::faceZoneType& faceType =
-                    surfZones[surfI].faceType();
-
-                if
-                (
-                    faceType == surfaceZonesInfo::BAFFLE
-                 || faceType == surfaceZonesInfo::BOUNDARY
-                )
-                {
-                    // Filter out all faces for this zone.
-                    label zoneI = fZones.findZoneID(faceZoneName);
-                    const faceZone& fZone = fZones[zoneI];
-                    forAll(fZone, i)
-                    {
-                        label faceI = fZone[i];
-                        filterFace[faceI] = zoneI;
-                        nFilterFaces++;
-                    }
-
-                    if (faceType == surfaceZonesInfo::BOUNDARY)
-                    {
-                        forAll(fZone, i)
-                        {
-                            label faceI = fZone[i];
-
-                            // Allow combining patch faces across this face
-                            duplicateFace[faceI] = -1;
-
-                            const face& f = mesh.faces()[faceI];
-                            forAll(f, fp)
-                            {
-                                if (!duplicatePoint[f[fp]])
-                                {
-                                    duplicatePoint[f[fp]] = 1;
-                                    nDuplicatePoints++;
-                                }
-                            }
-                        }
-                    }
-
-                    Info<< "Surface : " << surfaces.names()[surfI] << nl
-                        << "    faces to become baffle : "
-                        << returnReduce(nFilterFaces, sumOp<label>()) << nl
-                        << "    points to duplicate    : "
-                        << returnReduce(nDuplicatePoints, sumOp<label>())
-                        << endl;
-                }
-            }
-        }
-
-        // Duplicate points only if all points agree
-        syncTools::syncPointList
+        List<labelPair> baffles;
+        labelList originatingFaceZone;
+        meshRefiner_.createZoneBaffles
         (
-            mesh,
-            duplicatePoint,
-            andEqOp<unsigned int>(),    // combine op
-            0u                          // null value
+            identity(mesh.faceZones().size()),
+            baffles,
+            originatingFaceZone
         );
-        // Mark as duplicate (avoids combining patch faces) if one or both
-        syncTools::syncFaceList(mesh, duplicateFace, maxEqOp<label>());
-        // Mark as resulting from baffle/boundary face zone only if both agree
-        syncTools::syncFaceList(mesh, filterFace, minEqOp<label>());
-
-        // Duplicate points
-        if (returnReduce(nDuplicatePoints, sumOp<label>()) > 0)
-        {
-            // Collect all points (recount since syncPointList might have
-            // increased set)
-            nDuplicatePoints = 0;
-            forAll(duplicatePoint, pointI)
-            {
-                if (duplicatePoint[pointI])
-                {
-                    nDuplicatePoints++;
-                }
-            }
-            labelList candidatePoints(nDuplicatePoints);
-            nDuplicatePoints = 0;
-            forAll(duplicatePoint, pointI)
-            {
-                if (duplicatePoint[pointI])
-                {
-                    candidatePoints[nDuplicatePoints++] = pointI;
-                }
-            }
-
-
-            localPointRegion regionSide(mesh, candidatePoints);
-            autoPtr<mapPolyMesh> mapPtr = meshRefiner_.dupNonManifoldPoints
-            (
-                regionSide
-            );
-            meshRefinement::updateList
-            (
-                mapPtr().faceMap(),
-                label(-1),
-                filterFace
-            );
-            meshRefinement::updateList
-            (
-                mapPtr().faceMap(),
-                label(-1),
-                duplicateFace
-            );
-
-            // Update baffles and baffle-to-baffle addressing
-
-            const labelList& reverseFaceMap = mapPtr().reverseFaceMap();
-
-            forAll(baffles, i)
-            {
-                labelPair& baffle = baffles[i];
-                baffle.first() = reverseFaceMap[baffle.first()];
-                baffle.second() = reverseFaceMap[baffle.second()];
-            }
-
-            if (debug&meshRefinement::MESH)
-            {
-                const_cast<Time&>(mesh.time())++;
-                Pout<< "Writing duplicatedPoints mesh to time "
-                    << meshRefiner_.timeName()
-                    << endl;
-                meshRefiner_.write
-                (
-                    meshRefinement::debugType(debug),
-                    meshRefinement::writeType
-                    (
-                        meshRefinement::writeLevel()
-                      | meshRefinement::WRITEMESH
-                    ),
-                    mesh.time().path()/"duplicatedPoints"
-                );
-            }
-        }
-
-
-        // Forget about baffles in a BAFFLE/BOUNDARY type zone
-        DynamicList<labelPair> newBaffles(baffles.size());
-        forAll(baffles, i)
-        {
-            const labelPair& baffle = baffles[i];
-            if
-            (
-                filterFace[baffle.first()] == -1
-             && filterFace[baffles[i].second()] == -1
-            )
-            {
-                newBaffles.append(baffle);
-            }
-        }
-
-        if (newBaffles.size() < baffles.size())
-        {
-            //Info<< "Splitting baffles into" << nl
-            //    << "    internal : " << newBaffles.size() << nl
-            //    << "    baffle   : " << baffles.size()-newBaffles.size()
-            //    << nl << endl;
-            baffles.transfer(newBaffles);
-        }
-        Info<< endl;
     }
 
+    // Duplicate points on faceZones of type boundary
+    meshRefiner_.dupNonManifoldBoundaryPoints();
+
 
     bool doFeatures = false;
     label nFeatIter = 1;
@@ -2741,6 +2619,12 @@ void Foam::autoSnapDriver::doSnap
 
     bool meshOk = false;
 
+
+    // Get the labels of added patches.
+    labelList adaptPatchIDs(meshRefiner_.meshedPatches());
+
+
+
     {
         autoPtr<indirectPrimitivePatch> ppPtr
         (
@@ -2753,7 +2637,7 @@ void Foam::autoSnapDriver::doSnap
 
 
         // Distance to attract to nearest feature on surface
-        const scalarField snapDist(calcSnapDistance(mesh, snapParams, ppPtr()));
+        scalarField snapDist(calcSnapDistance(mesh, snapParams, ppPtr()));
 
 
         // Construct iterative mesh mover.
@@ -2795,13 +2679,27 @@ void Foam::autoSnapDriver::doSnap
         Info<< "Checked initial mesh in = "
             << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
 
+        // Extract baffles across internal faceZones (for checking mesh quality
+        // across
+        labelPairList internalBaffles
+        (
+            meshRefiner_.subsetBaffles
+            (
+                mesh,
+                internalFaceZones,
+                localPointRegion::findDuplicateFacePairs(mesh)
+            )
+        );
+
+
+
         // Pre-smooth patch vertices (so before determining nearest)
         preSmoothPatch
         (
             meshRefiner_,
             snapParams,
             nInitErrors,
-            baffles,
+            internalBaffles,
             meshMoverPtr()
         );
 
@@ -2814,235 +2712,35 @@ void Foam::autoSnapDriver::doSnap
         List<pointConstraint> patchConstraints;
 
 
+        //- Any faces to split
+        DynamicList<label> splitFaces;
+        //- Indices in face to split across
+        DynamicList<labelPair> splits;
+
+
         for (label iter = 0; iter < nFeatIter; iter++)
         {
-            //if (doFeatures && (iter == 0 || iter == nFeatIter/2))
-            //{
-            //    Info<< "Splitting diagonal attractions" << endl;
-            //
-            //    indirectPrimitivePatch& pp = ppPtr();
-            //    motionSmoother& meshMover = meshMoverPtr();
-            //
-            //    // Calculate displacement at every patch point. Insert into
-            //    // meshMover.
-            //    // Calculate displacement at every patch point
-            //    pointField nearestPoint;
-            //    vectorField nearestNormal;
-            //
-            //    if (snapParams.detectNearSurfacesSnap())
-            //    {
-            //        nearestPoint.setSize(pp.nPoints(), vector::max);
-            //        nearestNormal.setSize(pp.nPoints(), vector::zero);
-            //    }
-            //
-            //    vectorField disp = calcNearestSurface
-            //    (
-            //        meshRefiner_,
-            //        snapDist,
-            //        pp,
-            //        nearestPoint,
-            //        nearestNormal
-            //    );
-            //
-            //
-            //    // Override displacement at thin gaps
-            //    if (snapParams.detectNearSurfacesSnap())
-            //    {
-            //        detectNearSurfaces
-            //        (
-            //            Foam::cos(degToRad(planarAngle)),// planar gaps
-            //            pp,
-            //            nearestPoint,   // surfacepoint from nearest test
-            //            nearestNormal,  // surfacenormal from nearest test
-            //
-            //            disp
-            //        );
-            //    }
-            //
-            //    // Override displacement with feature edge attempt
-            //    const label iter = 0;
-            //    calcNearestSurfaceFeature
-            //    (
-            //        snapParams,
-            //        false,   // avoidSnapProblems
-            //        iter,
-            //        featureCos,
-            //        scalar(iter+1)/nFeatIter,
-            //        snapDist,
-            //        disp,
-            //        meshMover,
-            //        patchAttraction,
-            //        patchConstraints
-            //    );
-            //
-            //
-            //    const labelList& bFaces = ppPtr().addressing();
-            //    DynamicList<label> splitFaces(bFaces.size());
-            //    DynamicList<labelPair> splits(bFaces.size());
-            //
-            //    forAll(bFaces, faceI)
-            //    {
-            //        const labelPair split
-            //        (
-            //            findDiagonalAttraction
-            //            (
-            //                ppPtr(),
-            //                patchAttraction,
-            //                patchConstraints,
-            //                faceI
-            //            )
-            //        );
-            //
-            //        if (split != labelPair(-1, -1))
-            //        {
-            //            splitFaces.append(bFaces[faceI]);
-            //            splits.append(split);
-            //        }
-            //    }
-            //
-            //    Info<< "Splitting "
-            //        << returnReduce(splitFaces.size(), sumOp<label>())
-            //        << " faces along diagonal attractions" << endl;
-            //
-            //    autoPtr<mapPolyMesh> mapPtr = meshRefiner_.splitFaces
-            //    (
-            //        splitFaces,
-            //        splits
-            //    );
-            //
-            //    const labelList& faceMap = mapPtr().faceMap();
-            //    meshRefinement::updateList(faceMap, -1, duplicateFace);
-            //    const labelList& reverseFaceMap = mapPtr().reverseFaceMap();
-            //    forAll(baffles, i)
-            //    {
-            //        labelPair& baffle = baffles[i];
-            //        baffle.first() = reverseFaceMap[baffle.first()];
-            //        baffle.second() = reverseFaceMap[baffle.second()];
-            //    }
-            //
-            //    meshMoverPtr.clear();
-            //    ppPtr.clear();
-            //
-            //    ppPtr = meshRefinement::makePatch(mesh, adaptPatchIDs);
-            //    meshMoverPtr.reset
-            //    (
-            //        new motionSmoother
-            //        (
-            //            mesh,
-            //            ppPtr(),
-            //            adaptPatchIDs,
-            //            meshRefinement::makeDisplacementField
-            //            (
-            //                pointMesh::New(mesh),
-            //                adaptPatchIDs
-            //            ),
-            //            motionDict
-            //        )
-            //    );
-            //
-            //    if (debug&meshRefinement::MESH)
-            //    {
-            //        const_cast<Time&>(mesh.time())++;
-            //        Info<< "Writing split diagonal mesh to time "
-            //            << meshRefiner_.timeName() << endl;
-            //        meshRefiner_.write
-            //        (
-            //            meshRefinement::debugType(debug),
-            //            meshRefinement::writeType
-            //            (
-            //                meshRefinement::writeLevel()
-            //              | meshRefinement::WRITEMESH
-            //            ),
-            //            mesh.time().path()/meshRefiner_.timeName()
-            //        );
-            //    }
-            //}
-            //else
-            //if
-            //(
-            //    doFeatures
-            // && (iter == 1 || iter == nFeatIter/2+1 || iter == nFeatIter-1)
-            //)
-            //{
-            //    Info<< "Splitting warped faces" << endl;
-            //
-            //    const labelList& bFaces = ppPtr().addressing();
-            //    DynamicList<label> splitFaces(bFaces.size());
-            //    DynamicList<labelPair> splits(bFaces.size());
-            //
-            //    detectWarpedFaces
-            //    (
-            //        featureCos,
-            //        ppPtr(),
-            //
-            //        splitFaces,
-            //        splits
-            //    );
-            //
-            //    Info<< "Splitting "
-            //        << returnReduce(splitFaces.size(), sumOp<label>())
-            //        << " faces along diagonal to avoid warpage" << endl;
-            //
-            //    autoPtr<mapPolyMesh> mapPtr = meshRefiner_.splitFaces
-            //    (
-            //        splitFaces,
-            //        splits
-            //    );
-            //
-            //    const labelList& faceMap = mapPtr().faceMap();
-            //    meshRefinement::updateList(faceMap, -1, duplicateFace);
-            //    const labelList& reverseFaceMap = mapPtr().reverseFaceMap();
-            //    forAll(baffles, i)
-            //    {
-            //        labelPair& baffle = baffles[i];
-            //        baffle.first() = reverseFaceMap[baffle.first()];
-            //        baffle.second() = reverseFaceMap[baffle.second()];
-            //    }
-            //
-            //    meshMoverPtr.clear();
-            //    ppPtr.clear();
-            //
-            //    ppPtr = meshRefinement::makePatch(mesh, adaptPatchIDs);
-            //    meshMoverPtr.reset
-            //    (
-            //        new motionSmoother
-            //        (
-            //            mesh,
-            //            ppPtr(),
-            //            adaptPatchIDs,
-            //            meshRefinement::makeDisplacementField
-            //            (
-            //                pointMesh::New(mesh),
-            //                adaptPatchIDs
-            //            ),
-            //            motionDict
-            //        )
-            //    );
-            //
-            //    if (debug&meshRefinement::MESH)
-            //    {
-            //        const_cast<Time&>(mesh.time())++;
-            //        Info<< "Writing split warped mesh to time "
-            //            << meshRefiner_.timeName() << endl;
-            //        meshRefiner_.write
-            //        (
-            //            meshRefinement::debugType(debug),
-            //            meshRefinement::writeType
-            //            (
-            //                meshRefinement::writeLevel()
-            //              | meshRefinement::WRITEMESH
-            //            ),
-            //            mesh.time().path()/meshRefiner_.timeName()
-            //        );
-            //    }
-            //}
-
-
-
             Info<< nl
                 << "Morph iteration " << iter << nl
                 << "-----------------" << endl;
 
+            // Splitting iteration?
+            bool doSplit = false;
+            if
+            (
+                doFeatures
+             && snapParams.nFaceSplitInterval() > 0
+             && (
+                    (iter == nFeatIter-1)
+                 || (iter > 0 && (iter%snapParams.nFaceSplitInterval()) == 0)
+                )
+            )
+            {
+                doSplit = true;
+            }
+
+
+
             indirectPrimitivePatch& pp = ppPtr();
             motionSmoother& meshMover = meshMoverPtr();
 
@@ -3061,9 +2759,13 @@ void Foam::autoSnapDriver::doSnap
 
             vectorField disp = calcNearestSurface
             (
+                snapParams.strictRegionSnap(),  // attract points to region only
                 meshRefiner_,
+                globalToMasterPatch_,           // for if strictRegionSnap
+                globalToSlavePatch_,            // for if strictRegionSnap
                 snapDist,
                 pp,
+
                 nearestPoint,
                 nearestNormal
             );
@@ -3086,18 +2788,26 @@ void Foam::autoSnapDriver::doSnap
             // Override displacement with feature edge attempt
             if (doFeatures)
             {
+                splitFaces.clear();
+                splits.clear();
                 disp = calcNearestSurfaceFeature
                 (
                     snapParams,
-                    true,   // avoidSnapProblems
+                    !doSplit,       // alignMeshEdges
                     iter,
                     featureCos,
                     scalar(iter+1)/nFeatIter,
+
                     snapDist,
                     disp,
+                    nearestNormal,
                     meshMover,
+
                     patchAttraction,
-                    patchConstraints
+                    patchConstraints,
+
+                    splitFaces,
+                    splits
                 );
             }
 
@@ -3129,13 +2839,13 @@ void Foam::autoSnapDriver::doSnap
             (
                 snapParams,
                 nInitErrors,
-                baffles,
+                internalBaffles,
                 meshMover
             );
 
             if (!meshOk)
             {
-                WarningIn("autoSnapDriver::doSnap(..)")
+                WarningInFunction
                     << "Did not succesfully snap mesh."
                     << " Continuing to snap to resolve easy" << nl
                     << "    surfaces but the"
@@ -3169,71 +2879,190 @@ void Foam::autoSnapDriver::doSnap
 
             // Use current mesh as base mesh
             meshMover.correct();
+
+
+
+            // See if any faces need splitting
+            label nTotalSplit = returnReduce(splitFaces.size(), sumOp<label>());
+            if (nTotalSplit && doSplit)
+            {
+                // Filter out baffle faces from faceZones of type
+                // internal/baffle
+
+                labelList duplicateFace(getInternalOrBaffleDuplicateFace());
+
+                {
+                    labelList oldSplitFaces(splitFaces.xfer());
+                    List<labelPair> oldSplits(splits.xfer());
+                    forAll(oldSplitFaces, i)
+                    {
+                        if (duplicateFace[oldSplitFaces[i]] == -1)
+                        {
+                            splitFaces.append(oldSplitFaces[i]);
+                            splits.append(oldSplits[i]);
+                        }
+                    }
+                    nTotalSplit = returnReduce
+                    (
+                        splitFaces.size(),
+                        sumOp<label>()
+                    );
+                }
+
+                // Update mesh
+                meshRefiner_.splitFacesUndo
+                (
+                    splitFaces,
+                    splits,
+                    motionDict,
+
+                    duplicateFace,
+                    internalBaffles
+                );
+
+                // Redo meshMover
+                meshMoverPtr.clear();
+                ppPtr.clear();
+
+                // Update mesh mover
+                ppPtr = meshRefinement::makePatch(mesh, adaptPatchIDs);
+                meshMoverPtr.reset
+                (
+                    new motionSmoother
+                    (
+                        mesh,
+                        ppPtr(),
+                        adaptPatchIDs,
+                        meshRefinement::makeDisplacementField
+                        (
+                            pointMesh::New(mesh),
+                            adaptPatchIDs
+                        ),
+                        motionDict
+                    )
+                );
+
+                // Update snapping distance
+                snapDist = calcSnapDistance(mesh, snapParams, ppPtr());
+
+
+                if (debug&meshRefinement::MESH)
+                {
+                    const_cast<Time&>(mesh.time())++;
+                    Info<< "Writing split-faces mesh to time "
+                        << meshRefiner_.timeName() << endl;
+                    meshRefiner_.write
+                    (
+                        meshRefinement::debugType(debug),
+                        meshRefinement::writeType
+                        (
+                            meshRefinement::writeLevel()
+                          | meshRefinement::WRITEMESH
+                        ),
+                        mesh.time().path()/meshRefiner_.timeName()
+                    );
+                }
+            }
+
+
+            if (debug&meshRefinement::MESH)
+            {
+                forAll(internalBaffles, i)
+                {
+                    const labelPair& p = internalBaffles[i];
+                    const point& fc0 = mesh.faceCentres()[p[0]];
+                    const point& fc1 = mesh.faceCentres()[p[1]];
+
+                    if (mag(fc0-fc1) > meshRefiner_.mergeDistance())
+                    {
+                        FatalErrorInFunction
+                            << "Separated baffles : f0:" << p[0]
+                            << " centre:" << fc0
+                            << " f1:" << p[1] << " centre:" << fc1
+                            << " distance:" << mag(fc0-fc1)
+                            << exit(FatalError);
+                    }
+                }
+            }
         }
     }
 
 
     // Merge any introduced baffles (from faceZones of faceType 'internal')
     {
-        autoPtr<mapPolyMesh> mapPtr = mergeZoneBaffles(baffles);
+        autoPtr<mapPolyMesh> mapPtr = meshRefiner_.mergeZoneBaffles
+        (
+            true,   // internal zones
+            false   // baffle zones
+        );
 
         if (mapPtr.valid())
         {
-            forAll(duplicateFace, faceI)
+            if (debug & meshRefinement::MESH)
             {
-                if (duplicateFace[faceI] != -1)
-                {
-                    duplicateFace[faceI] = mapPtr().reverseFaceMap()[faceI];
-                }
+                const_cast<Time&>(mesh.time())++;
+                Info<< "Writing baffle-merged mesh to time "
+                    << meshRefiner_.timeName() << endl;
+                meshRefiner_.write
+                (
+                    meshRefinement::debugType(debug),
+                    meshRefinement::writeType
+                    (
+                        meshRefinement::writeLevel()
+                      | meshRefinement::WRITEMESH
+                    ),
+                    meshRefiner_.timeName()
+                );
             }
         }
     }
 
     // Repatch faces according to nearest. Do not repatch baffle faces.
     {
-        autoPtr<mapPolyMesh> mapPtr = repatchToSurface
-        (
-            snapParams,
-            adaptPatchIDs,
-            duplicateFace
-        );
-        meshRefinement::updateList
-        (
-            mapPtr().faceMap(),
-            label(-1),
-            duplicateFace
-        );
+        labelList duplicateFace(getInternalOrBaffleDuplicateFace());
+
+        repatchToSurface(snapParams, adaptPatchIDs, duplicateFace);
     }
 
-    // Repatching might have caused faces to be on same patch and hence
-    // mergeable so try again to merge coplanar faces. Do not merge baffle
-    // faces to ensure they both stay the same.
-    label nChanged = meshRefiner_.mergePatchFacesUndo
-    (
-        featureCos,     // minCos
-        featureCos,     // concaveCos
-        meshRefiner_.meshedPatches(),
-        motionDict,
-        duplicateFace   // faces not to merge
-    );
+    if (mergePatchFaces)
+    {
+        labelList duplicateFace(getInternalOrBaffleDuplicateFace());
 
-    nChanged += meshRefiner_.mergeEdgesUndo(featureCos, motionDict);
+        // Repatching might have caused faces to be on same patch and hence
+        // mergeable so try again to merge coplanar faces. Do not merge baffle
+        // faces to ensure they both stay the same.
+        label nChanged = meshRefiner_.mergePatchFacesUndo
+        (
+            featureCos,     // minCos
+            featureCos,     // concaveCos
+            meshRefiner_.meshedPatches(),
+            motionDict,
+            duplicateFace   // faces not to merge
+        );
 
-    if (nChanged > 0 && debug & meshRefinement::MESH)
+        nChanged += meshRefiner_.mergeEdgesUndo(featureCos, motionDict);
+
+        if (nChanged > 0 && debug & meshRefinement::MESH)
+        {
+            const_cast<Time&>(mesh.time())++;
+            Info<< "Writing patchFace merged mesh to time "
+                << meshRefiner_.timeName() << endl;
+            meshRefiner_.write
+            (
+                meshRefinement::debugType(debug),
+                meshRefinement::writeType
+                (
+                    meshRefinement::writeLevel()
+                  | meshRefinement::WRITEMESH
+                ),
+                meshRefiner_.timeName()
+            );
+        }
+    }
+
+    if (debug & meshRefinement::MESH)
     {
         const_cast<Time&>(mesh.time())++;
-        Info<< "Writing patchFace merged mesh to time "
-            << meshRefiner_.timeName() << endl;
-        meshRefiner_.write
-        (
-            meshRefinement::debugType(debug),
-            meshRefinement::writeType
-            (
-                meshRefinement::writeLevel()
-              | meshRefinement::WRITEMESH
-            ),
-            meshRefiner_.timeName()
-        );
     }
 }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index b72d147a84..630d24d24e 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,7 @@ SourceFiles
 #define autoSnapDriver_H
 
 #include "meshRefinement.H"
+#include "DynamicField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,7 @@ namespace Foam
 
 // Forward declaration of classes
 class motionSmoother;
+class refinementParameters;
 class snapParameters;
 class pointConstraint;
 
@@ -79,26 +81,34 @@ class autoSnapDriver
                 PackedBoolList&
             );
 
+            //- Calculate displacement (over all mesh points) to move points
+            //  to average of connected cell centres
+            static tmp<pointField> smoothInternalDisplacement
+            (
+                const meshRefinement& meshRefiner,
+                const motionSmoother&
+            );
+
             //- Calculate displacement per patch point to smooth out patch.
             //  Quite complicated in determining which points to move where.
-            static pointField smoothPatchDisplacement
+            static tmp<pointField> smoothPatchDisplacement
             (
                 const motionSmoother&,
                 const List<labelPair>&
             );
 
-            //static tmp<pointField> avg
-            //(
-            //    const indirectPrimitivePatch&,
-            //    const pointField&
-            //);
+            static tmp<pointField> avg
+            (
+                const indirectPrimitivePatch&,
+                const pointField&
+            );
 
             //- Calculate displacement per patch point. Wip.
-            //static tmp<pointField> smoothLambdaMuPatchDisplacement
-            //(
-            //    const motionSmoother& meshMover,
-            //    const List<labelPair>& baffles
-            //);
+            static pointField smoothLambdaMuPatchDisplacement
+            (
+                const motionSmoother& meshMover,
+                const List<labelPair>& baffles
+            );
 
 
             //- Check that face zones are synced
@@ -136,6 +146,48 @@ class autoSnapDriver
                 DynamicList<labelPair>& splits
             ) const;
 
+            //- Get per face -1 or label of opposite face if on internal/baffle
+            //  faceZone
+            labelList getInternalOrBaffleDuplicateFace() const;
+
+            //- Get points both on patch and facezone.
+            static labelList getZoneSurfacePoints
+            (
+                const fvMesh& mesh,
+                const indirectPrimitivePatch&,
+                const word& zoneName
+            );
+
+            //- Get points both on patch and facezone.
+            template<class FaceList>
+            static labelList getFacePoints
+            (
+                const indirectPrimitivePatch& pp,
+                const FaceList& faces
+            );
+
+            //- Per patch point calculate point on nearest surface.
+            //  Return displacement of patch points.
+            static void calcNearestSurface
+            (
+                const refinementSurfaces& surfaces,
+
+                const labelList& surfacesToTest,
+                const labelListList& regionsToTest,
+
+                const pointField& localPoints,
+                const labelList& zonePointIndices,
+
+                scalarField& minSnapDist,
+                labelList& snapSurf,
+                vectorField& patchDisp,
+
+                // Optional: nearest point, normal
+                pointField& nearestPoint,
+                vectorField& nearestNormal
+            );
+
+
             // Feature line snapping
 
                 //- Is point on two feature edges that make a largish angle?
@@ -177,8 +229,8 @@ class autoSnapDriver
                     const scalarField& faceSnapDist,
                     vectorField& faceDisp,
                     vectorField& faceSurfaceNormal,
-                    labelList& faceSurfaceRegion,
-                    vectorField& faceRotation
+                    labelList& faceSurfaceRegion
+                    //vectorField& faceRotation
                 ) const;
                 void calcNearestFacePointProperties
                 (
@@ -253,6 +305,86 @@ class autoSnapDriver
                     const label faceI
                 ) const;
 
+                scalar pyrVol
+                (
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& featureAttraction,
+                    const face& localF,
+                    const point& cc
+                ) const;
+                void facePoints
+                (
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& featureAttraction,
+                    const vectorField& nearestAttraction,
+                    const face& f,
+                    DynamicField<point>& points
+                ) const;
+                scalar pyrVol
+                (
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& featureAttraction,
+                    const vectorField& nearestAttraction,
+                    const face& localF,
+                    const point& cc
+                ) const;
+                Tuple2<point, vector> centreAndNormal
+                (
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& featureAttraction,
+                    const vectorField& nearestAttraction,
+                    const face& localF
+                ) const;
+                bool isSplitAlignedWithFeature
+                (
+                    const scalar featureCos,
+                    const point& newPt0,
+                    const pointConstraint& pc0,
+                    const point& newPt1,
+                    const pointConstraint& pc1
+                ) const;
+                bool isConcave
+                (
+                    const point& c0,
+                    const vector& area0,
+                    const point& c1,
+                    const vector& area1,
+                    const scalar concaveCos
+                ) const;
+                labelPair findDiagonalAttraction
+                (
+                    const scalar featureCos,
+                    const scalar concaveCos,
+                    const scalar minAreaFraction,
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& patchAttraction,
+                    const List<pointConstraint>& patchConstraints,
+                    const vectorField& nearestAttraction,
+                    const vectorField& nearestNormal,
+                    const label faceI,
+
+                    DynamicField<point>& points0,
+                    DynamicField<point>& points1
+                ) const;
+
+                //- Do all logic on whether to add face cut to diagonal
+                //  attraction
+                void splitDiagonals
+                (
+                    const scalar featureCos,
+                    const scalar concaveCos,
+                    const scalar minAreaFraction,
+
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& nearestAttraction,
+                    const vectorField& nearestNormal,
+
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints,
+                    DynamicList<label>& splitFaces,
+                    DynamicList<labelPair>& splits
+                ) const;
+
                 //- Avoid attraction across face diagonal since would
                 //  cause face squeeze
                 void avoidDiagonalAttraction
@@ -264,6 +396,14 @@ class autoSnapDriver
                     List<pointConstraint>& patchConstraints
                 ) const;
 
+                //- Write some stats about constraints
+                void writeStats
+                (
+                    const indirectPrimitivePatch& pp,
+                    const PackedBoolList& isMasterPoint,
+                    const List<pointConstraint>& patchConstraints
+                ) const;
+
                 //- Return hit if on multiple points
                 pointIndexHit findMultiPatchPoint
                 (
@@ -320,7 +460,6 @@ class autoSnapDriver
                 void featureAttractionUsingReconstruction
                 (
                     const label iter,
-                    const bool avoidSnapProblems,
                     const scalar featureCos,
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
@@ -366,6 +505,7 @@ class autoSnapDriver
                 void determineBaffleFeatures
                 (
                     const label iter,
+                    const bool baffleFeaturePoints,
                     const scalar featureCos,
 
                     const indirectPrimitivePatch& pp,
@@ -450,12 +590,20 @@ class autoSnapDriver
                 void featureAttractionUsingFeatureEdges
                 (
                     const label iter,
-                    const bool avoidSnapProblems,
-                    const scalar featureCos,
                     const bool multiRegionFeatureSnap,
+
+                    const bool detectBaffles,
+                    const bool baffleFeaturePoints,
+                    const bool releasePoints,
+                    const bool stringFeatures,
+                    const bool avoidDiagonal,
+
+                    const scalar featureCos,
+
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
                     const vectorField& nearestDisp,
+                    const vectorField& nearestNormal,
 
                     const List<List<point> >& pointFaceSurfNormals,
                     const List<List<point> >& pointFaceDisp,
@@ -465,12 +613,14 @@ class autoSnapDriver
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
                 ) const;
+
                 void preventFaceSqueeze
                 (
                     const label iter,
                     const scalar featureCos,
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
+                    const vectorField& nearestAttraction,
 
                     vectorField& patchAttraction,
                     List<pointConstraint>& patchConstraints
@@ -483,15 +633,19 @@ class autoSnapDriver
                 vectorField calcNearestSurfaceFeature
                 (
                     const snapParameters& snapParams,
-                    const bool avoidSnapProblems,
+                    const bool alignMeshEdges,
                     const label iter,
                     const scalar featureCos,
                     const scalar featureAttract,
                     const scalarField& snapDist,
                     const vectorField& nearestDisp,
+                    const vectorField& nearestNormal,
                     motionSmoother& meshMover,
                     vectorField& patchAttraction,
-                    List<pointConstraint>& patchConstraints
+                    List<pointConstraint>& patchConstraints,
+
+                    DynamicList<label>& splitFaces,
+                    DynamicList<labelPair>& splits
                 ) const;
 
 
@@ -545,14 +699,6 @@ public:
                 motionSmoother&
             );
 
-            //- Get points both on patch and facezone.
-            static labelList getZoneSurfacePoints
-            (
-                const fvMesh& mesh,
-                const indirectPrimitivePatch&,
-                const word& zoneName
-            );
-
             //- Helper: calculate average cell centre per point
             static tmp<pointField> avgCellCentres
             (
@@ -575,7 +721,10 @@ public:
             //  displacement of patch points.
             static vectorField calcNearestSurface
             (
+                const bool strictRegionSnap,
                 const meshRefinement& meshRefiner,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
                 const scalarField& snapDist,
                 const indirectPrimitivePatch&,
                 pointField& nearestPoint,
@@ -622,6 +771,7 @@ public:
             (
                 const dictionary& snapDict,
                 const dictionary& motionDict,
+                const bool mergePatchFaces,
                 const scalar featureCos,
                 const scalar planarAngle,
                 const snapParameters& snapParams
@@ -636,6 +786,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "autoSnapDriverTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 6fc6363bb9..99ca6ed16c 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,6 +38,8 @@ License
 #include "indexedOctree.H"
 #include "snapParameters.H"
 #include "PatchTools.H"
+#include "pyramidPointFaceRef.H"
+#include "localPointRegion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -222,8 +224,8 @@ void Foam::autoSnapDriver::calcNearestFace
     const scalarField& faceSnapDist,
     vectorField& faceDisp,
     vectorField& faceSurfaceNormal,
-    labelList& faceSurfaceGlobalRegion,
-    vectorField& faceRotation
+    labelList& faceSurfaceGlobalRegion
+    //vectorField& faceRotation
 ) const
 {
     const fvMesh& mesh = meshRefiner_.mesh();
@@ -264,10 +266,8 @@ void Foam::autoSnapDriver::calcNearestFace
         label zoneI = mesh.faceZones().findZoneID(faceZoneName);
         if (zoneI == -1)
         {
-            FatalErrorIn
-            (
-                "autoSnapDriver::calcNearestFace(..)"
-            )   << "Problem. Cannot find zone " << faceZoneName
+            FatalErrorInFunction
+                << "Problem. Cannot find zone " << faceZoneName
                 << exit(FatalError);
         }
         const faceZone& fZone = mesh.faceZones()[zoneI];
@@ -332,10 +332,8 @@ void Foam::autoSnapDriver::calcNearestFace
             }
             else
             {
-                WarningIn
-                (
-                    "autoSnapDriver::calcNearestFace(..)"
-                )   << "Did not find surface near face centre " << fc[hitI]
+                WarningInFunction
+                    << "Did not find surface near face centre " << fc[hitI]
                     << endl;
             }
         }
@@ -398,47 +396,45 @@ void Foam::autoSnapDriver::calcNearestFace
         }
         else
         {
-            WarningIn
-            (
-                "autoSnapDriver::calcNearestFace(..)"
-            )   << "Did not find surface near face centre " << fc[hitI]
+            WarningInFunction
+                << "Did not find surface near face centre " << fc[hitI]
                 << endl;
         }
     }
 
 
-    // Determine rotation
-    // ~~~~~~~~~~~~~~~~~~
-
-    // Determine rotation axis
-    faceRotation.setSize(pp.size());
-    faceRotation = vector::zero;
-
-    forAll(faceRotation, faceI)
-    {
-        // Note: extend to >180 degrees checking
-        faceRotation[faceI] =
-            pp.faceNormals()[faceI]
-          ^ faceSurfaceNormal[faceI];
-    }
-
-    if (debug&meshRefinement::ATTRACTION)
-    {
-        dumpMove
-        (
-            mesh.time().path()
-          / "faceDisp_" + name(iter) + ".obj",
-            pp.faceCentres(),
-            pp.faceCentres() + faceDisp
-        );
-        dumpMove
-        (
-            mesh.time().path()
-          / "faceRotation_" + name(iter) + ".obj",
-            pp.faceCentres(),
-            pp.faceCentres() + faceRotation
-        );
-    }
+    //// Determine rotation
+    //// ~~~~~~~~~~~~~~~~~~
+    //
+    //// Determine rotation axis
+    //faceRotation.setSize(pp.size());
+    //faceRotation = vector::zero;
+    //
+    //forAll(faceRotation, faceI)
+    //{
+    //    // Note: extend to >180 degrees checking
+    //    faceRotation[faceI] =
+    //        pp.faceNormals()[faceI]
+    //      ^ faceSurfaceNormal[faceI];
+    //}
+    //
+    //if (debug&meshRefinement::ATTRACTION)
+    //{
+    //    dumpMove
+    //    (
+    //        mesh.time().path()
+    //      / "faceDisp_" + name(iter) + ".obj",
+    //        pp.faceCentres(),
+    //        pp.faceCentres() + faceDisp
+    //    );
+    //    dumpMove
+    //    (
+    //        mesh.time().path()
+    //      / "faceRotation_" + name(iter) + ".obj",
+    //        pp.faceCentres(),
+    //        pp.faceCentres() + faceRotation
+    //    );
+    //}
 }
 
 
@@ -553,34 +549,77 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
             patchID[meshFaceI-mesh.nInternalFaces()] = -1;
         }
 
-        // See if pp point uses any non-meshed boundary faces
 
-        const labelList& boundaryPoints = pp.boundaryPoints();
-        forAll(boundaryPoints, i)
+
+        // See if edge of pp uses any non-meshed boundary faces. If so add the
+        // boundary face as additional constraint. Note that we account for
+        // both 'real' boundary edges and boundary edge of baffles
+
+        const labelList bafflePair
+        (
+            localPointRegion::findDuplicateFaces(mesh, pp.addressing())
+        );
+
+
+        // Mark all points on 'boundary' edges
+        PackedBoolList isBoundaryPoint(pp.nPoints());
+
+        const labelListList& edgeFaces = pp.edgeFaces();
+        const edgeList& edges = pp.edges();
+
+        forAll(edgeFaces, edgeI)
         {
-            label pointI = boundaryPoints[i];
-            label meshPointI = pp.meshPoints()[pointI];
-            const point& pt = mesh.points()[meshPointI];
-            const labelList& pFaces = mesh.pointFaces()[meshPointI];
+            const edge& e = edges[edgeI];
+            const labelList& eFaces = edgeFaces[edgeI];
 
-            List<point>& pNormals = pointFaceSurfNormals[pointI];
-            List<point>& pDisp = pointFaceDisp[pointI];
-            List<point>& pFc = pointFaceCentres[pointI];
-            labelList& pFid = pointFacePatchID[pointI];
-
-            forAll(pFaces, i)
+            if (eFaces.size() == 1)
             {
-                label meshFaceI = pFaces[i];
-                if (!mesh.isInternalFace(meshFaceI))
-                {
-                    label patchI = patchID[meshFaceI-mesh.nInternalFaces()];
+                // 'real' boundary edge
+                isBoundaryPoint[e[0]] = true;
+                isBoundaryPoint[e[1]] = true;
+            }
+            else if (eFaces.size() == 2 && bafflePair[eFaces[0]] == eFaces[1])
+            {
+                // 'baffle' boundary edge
+                isBoundaryPoint[e[0]] = true;
+                isBoundaryPoint[e[1]] = true;
+            }
+        }
 
-                    if (patchI != -1)
+
+        // Construct labelList equivalent of meshPointMap
+        labelList meshToPatchPoint(mesh.nPoints(), -1);
+        forAll(pp.meshPoints(), pointI)
+        {
+            meshToPatchPoint[pp.meshPoints()[pointI]] = pointI;
+        }
+
+        forAll(patchID, bFaceI)
+        {
+            label patchI = patchID[bFaceI];
+
+            if (patchI != -1)
+            {
+                label faceI = mesh.nInternalFaces()+bFaceI;
+                const face& f = mesh.faces()[faceI];
+
+                forAll(f, fp)
+                {
+                    label pointI = meshToPatchPoint[f[fp]];
+
+                    if (pointI != -1 && isBoundaryPoint[pointI])
                     {
-                        vector fn = mesh.faceAreas()[meshFaceI];
+                        List<point>& pNormals = pointFaceSurfNormals[pointI];
+                        List<point>& pDisp = pointFaceDisp[pointI];
+                        List<point>& pFc = pointFaceCentres[pointI];
+                        labelList& pFid = pointFacePatchID[pointI];
+
+                        const point& pt = mesh.points()[f[fp]];
+                        vector fn = mesh.faceAreas()[faceI];
+
                         pNormals.append(fn/mag(fn));
-                        pDisp.append(mesh.faceCentres()[meshFaceI]-pt);
-                        pFc.append(mesh.faceCentres()[meshFaceI]);
+                        pDisp.append(mesh.faceCentres()[faceI]-pt);
+                        pFc.append(mesh.faceCentres()[faceI]);
                         pFid.append(patchI);
                     }
                 }
@@ -823,6 +862,54 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
 }
 
 
+void Foam::autoSnapDriver::writeStats
+(
+    const indirectPrimitivePatch& pp,
+    const PackedBoolList& isPatchMasterPoint,
+    const List<pointConstraint>& patchConstraints
+) const
+{
+    label nMasterPoints = 0;
+    label nPlanar = 0;
+    label nEdge = 0;
+    label nPoint = 0;
+
+    forAll(patchConstraints, pointI)
+    {
+        if (isPatchMasterPoint[pointI])
+        {
+            nMasterPoints++;
+
+            if (patchConstraints[pointI].first() == 1)
+            {
+                nPlanar++;
+            }
+            else if (patchConstraints[pointI].first() == 2)
+            {
+                nEdge++;
+            }
+            else if (patchConstraints[pointI].first() == 3)
+            {
+                nPoint++;
+            }
+        }
+    }
+
+    reduce(nMasterPoints, sumOp<label>());
+    reduce(nPlanar, sumOp<label>());
+    reduce(nEdge, sumOp<label>());
+    reduce(nPoint, sumOp<label>());
+    Info<< "total master points :" << nMasterPoints
+        << " of which attracted to :" << nl
+        << "    feature point   : " << nPoint << nl
+        << "    feature edge    : " << nEdge << nl
+        << "    nearest surface : " << nPlanar << nl
+        << "    rest            : " << nMasterPoints-nPoint-nEdge-nPlanar
+        << nl
+        << endl;
+}
+
+
 void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
@@ -1019,7 +1106,6 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
-    const bool avoidSnapProblems,
     const scalar featureCos,
 
     const indirectPrimitivePatch& pp,
@@ -1443,7 +1529,6 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
 }
 
 
-// If only two attractions and across face return the face indices
 Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 (
     const indirectPrimitivePatch& pp,
@@ -1460,53 +1545,427 @@ Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 
     if (f.size() >= 4)
     {
-        forAll(f, fp)
+        for (label startFp = 0; startFp < f.size()-2; startFp++)
         {
-            label pointI = f[fp];
-            if (patchConstraints[pointI].first() >= 2)
+            label minFp = f.rcIndex(startFp);
+
+            for
+            (
+                label endFp = f.fcIndex(f.fcIndex(startFp));
+                endFp < f.size() && endFp != minFp;
+                endFp++
+            )
             {
-                // Attract to feature edge or point
-                if (attractIndices[0] == -1)
+                if
+                (
+                    patchConstraints[f[startFp]].first() >= 2
+                 && patchConstraints[f[endFp]].first() >= 2
+                )
                 {
-                    // First attraction. Store
-                    attractIndices[0] = fp;
-                }
-                else if (attractIndices[1] == -1)
-                {
-                    // Second attraction. Check if not consecutive to first
-                    // attraction
-                    label fp0 = attractIndices[0];
-                    if (f.fcIndex(fp0) == fp || f.fcIndex(fp) == fp0)
-                    {
-                        // Consecutive. Skip.
-                        attractIndices = labelPair(-1, -1);
-                        break;
-                    }
-                    else
-                    {
-                        attractIndices[1] = fp;
-                    }
-                }
-                else
-                {
-                    // More than two attractions. Skip.
-                    attractIndices = labelPair(-1, -1);
+                    attractIndices = labelPair(startFp, endFp);
                     break;
                 }
             }
         }
+    }
+    return attractIndices;
+}
 
 
-        if (attractIndices[1] == -1)
+bool Foam::autoSnapDriver::isSplitAlignedWithFeature
+(
+    const scalar featureCos,
+    const point& p0,
+    const pointConstraint& pc0,
+    const point& p1,
+    const pointConstraint& pc1
+) const
+{
+    vector d(p1-p0);
+    scalar magD = mag(d);
+    if (magD < VSMALL)
+    {
+        // Two diagonal points already colocated?
+        return false;
+    }
+    else
+    {
+        d /= magD;
+
+        // Is diagonal d aligned with at least one of the feature
+        // edges?
+
+        if (pc0.first() == 2 && mag(d & pc0.second()) > featureCos)
         {
-            // Found only one attraction. Skip.
-            attractIndices = labelPair(-1, -1);
+            return true;
+        }
+        else if (pc1.first() == 2 && mag(d & pc1.second()) > featureCos)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}
+
+
+// Is situation very concave
+bool Foam::autoSnapDriver::isConcave
+(
+    const point& c0,
+    const vector& area0,
+    const point& c1,
+    const vector& area1,
+    const scalar concaveCos
+) const
+{
+    vector n0 = area0;
+    scalar magN0 = mag(n0);
+    if (magN0 < VSMALL)
+    {
+        // Zero area face. What to return? For now disable splitting.
+        return true;
+    }
+    n0 /= magN0;
+
+    // Distance from c1 to plane of face0
+    scalar d = (c1-c0)&n0;
+
+    if (d <= 0)
+    {
+        // Convex (face1 centre on 'inside' of face0)
+        return false;
+    }
+    else
+    {
+        // Is a bit or very concave?
+        vector n1 = area1;
+        scalar magN1 = mag(n1);
+        if (magN1 < VSMALL)
+        {
+            // Zero area face. See above
+            return true;
+        }
+        n1 /= magN1;
+
+        if ((n0&n1) < concaveCos)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}
+
+
+Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
+(
+    const scalar featureCos,
+    const scalar concaveCos,
+    const scalar minAreaRatio,
+    const indirectPrimitivePatch& pp,
+    const vectorField& patchAttr,
+    const List<pointConstraint>& patchConstraints,
+    const vectorField& nearestAttr,
+    const vectorField& nearestNormal,
+    const label faceI,
+
+    DynamicField<point>& points0,
+    DynamicField<point>& points1
+) const
+{
+    const face& localF = pp.localFaces()[faceI];
+
+    labelPair attractIndices(-1, -1);
+
+    if (localF.size() >= 4)
+    {
+        const pointField& localPts = pp.localPoints();
+
+        //// Estimate cell centre taking patchAttraction into account
+        //// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //// (is this necessary?)
+        //const polyMesh& mesh = meshRefiner_.mesh();
+        //label meshFaceI = pp.addressing()[faceI];
+        //const face& meshF = mesh.faces()[meshFaceI];
+        //label cellI = mesh.faceOwner()[meshFaceI];
+        //const labelList& cPoints = mesh.cellPoints(cellI);
+        //
+        //point cc(mesh.points()[meshF[0]]);
+        //for (label i = 1; i < meshF.size(); i++)
+        //{
+        //    cc += mesh.points()[meshF[i]]+patchAttr[localF[i]];
+        //}
+        //forAll(cPoints, i)
+        //{
+        //    label pointI = cPoints[i];
+        //    if (findIndex(meshF, pointI) == -1)
+        //    {
+        //        cc += mesh.points()[pointI];
+        //    }
+        //}
+        //cc /= cPoints.size();
+        ////const point& cc = mesh.cellCentres()[cellI];
+        //
+        //const scalar vol = pyrVol(pp, patchAttr, localF, cc);
+        //const scalar area = localF.mag(localPts);
+
+
+
+        // Try all diagonal cuts
+        // ~~~~~~~~~~~~~~~~~~~~~
+
+        face f0(3);
+        face f1(3);
+
+        for (label startFp = 0; startFp < localF.size()-2; startFp++)
+        {
+            label minFp = localF.rcIndex(startFp);
+
+            for
+            (
+                label endFp = localF.fcIndex(localF.fcIndex(startFp));
+                endFp < localF.size() && endFp != minFp;
+                endFp++
+            )
+            {
+                label startPtI = localF[startFp];
+                label endPtI = localF[endFp];
+
+                const pointConstraint& startPc = patchConstraints[startPtI];
+                const pointConstraint& endPc = patchConstraints[endPtI];
+
+                if (startPc.first() >= 2 && endPc.first() >= 2)
+                {
+                    if (startPc.first() == 2 || endPc.first() == 2)
+                    {
+                        // Check if
+                        // - sameish feature edge normal
+                        // - diagonal aligned with feature edge normal
+                        point start = localPts[startPtI]+patchAttr[startPtI];
+                        point end = localPts[endPtI]+patchAttr[endPtI];
+
+                        if
+                        (
+                           !isSplitAlignedWithFeature
+                            (
+                                featureCos,
+                                start,
+                                startPc,
+                                end,
+                                endPc
+                            )
+                        )
+                        {
+                            // Attract to different features. No need to
+                            // introduce split
+                            continue;
+                        }
+                    }
+
+
+
+                    // Form two faces
+                    // ~~~~~~~~~~~~~~
+                    // Predict position of faces. End points of the faces
+                    // attract to the feature
+                    // and all the other points just attract to the nearest
+
+                    // face0
+
+                    f0.setSize(endFp-startFp+1);
+                    label i0 = 0;
+                    for (label fp = startFp; fp <= endFp; fp++)
+                    {
+                        f0[i0++] = localF[fp];
+                    }
+
+                    // Get compact face and points
+                    const face compact0(identity(f0.size()));
+                    points0.clear();
+                    points0.append(localPts[f0[0]] + patchAttr[f0[0]]);
+                    for (label fp=1; fp < f0.size()-1; fp++)
+                    {
+                        label pI = f0[fp];
+                        points0.append(localPts[pI] + nearestAttr[pI]);
+                    }
+                    points0.append
+                    (
+                        localPts[f0.last()] + patchAttr[f0.last()]
+                    );
+
+
+                    // face1
+
+                    f1.setSize(localF.size()+2-f0.size());
+                    label i1 = 0;
+                    for
+                    (
+                        label fp = endFp;
+                        fp != startFp;
+                        fp = localF.fcIndex(fp)
+                    )
+                    {
+                        f1[i1++] = localF[fp];
+                    }
+                    f1[i1++] = localF[startFp];
+
+
+                    // Get compact face and points
+                    const face compact1(identity(f1.size()));
+                    points1.clear();
+                    points1.append(localPts[f1[0]] + patchAttr[f1[0]]);
+                    for (label fp=1; fp < f1.size()-1; fp++)
+                    {
+                        label pI = f1[fp];
+                        points1.append(localPts[pI] + nearestAttr[pI]);
+                    }
+                    points1.append
+                    (
+                        localPts[f1.last()] + patchAttr[f1.last()]
+                    );
+
+
+
+                    // Avoid splitting concave faces
+                    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                    if
+                    (
+                        isConcave
+                        (
+                            compact0.centre(points0),
+                            compact0.normal(points0),
+                            compact1.centre(points1),
+                            compact1.normal(points1),
+                            concaveCos
+                        )
+                    )
+                    {
+                        //// Dump to obj
+                        //Pout<< "# f0:" << f0 << endl;
+                        //forAll(p, i)
+                        //{
+                        //    meshTools::writeOBJ(Pout, points0[i]);
+                        //}
+                        //Pout<< "# f1:" << f1 << endl;
+                        //forAll(p, i)
+                        //{
+                        //    meshTools::writeOBJ(Pout, points1[i]);
+                        //}
+                    }
+                    else
+                    {
+                        // Existing areas
+                        const scalar area0 = f0.mag(localPts);
+                        const scalar area1 = f1.mag(localPts);
+
+                        if
+                        (
+                            area0/area1 >= minAreaRatio
+                         && area1/area0 >= minAreaRatio
+                        )
+                        {
+                            attractIndices = labelPair(startFp, endFp);
+                        }
+                    }
+                }
+            }
         }
     }
     return attractIndices;
 }
 
 
+void Foam::autoSnapDriver::splitDiagonals
+(
+    const scalar featureCos,
+    const scalar concaveCos,
+    const scalar minAreaRatio,
+
+    const indirectPrimitivePatch& pp,
+    const vectorField& nearestAttraction,
+    const vectorField& nearestNormal,
+
+    vectorField& patchAttraction,
+    List<pointConstraint>& patchConstraints,
+    DynamicList<label>& splitFaces,
+    DynamicList<labelPair>& splits
+) const
+{
+    const labelList& bFaces = pp.addressing();
+
+    splitFaces.clear();
+    splitFaces.setCapacity(bFaces.size());
+    splits.clear();
+    splits.setCapacity(bFaces.size());
+
+
+    // Work arrays for storing points of face
+    DynamicField<point> facePoints0;
+    DynamicField<point> facePoints1;
+
+    forAll(bFaces, faceI)
+    {
+        const labelPair split
+        (
+            findDiagonalAttraction
+            (
+                featureCos,
+                concaveCos,
+                minAreaRatio,
+
+                pp,
+                patchAttraction,
+                patchConstraints,
+
+                nearestAttraction,
+                nearestNormal,
+                faceI,
+
+                facePoints0,
+                facePoints1
+            )
+        );
+
+        if (split != labelPair(-1, -1))
+        {
+            splitFaces.append(bFaces[faceI]);
+            splits.append(split);
+
+            const face& f = pp.localFaces()[faceI];
+
+            // Knock out other attractions on face
+            forAll(f, fp)
+            {
+                // Knock out any other constraints
+                if
+                (
+                    fp != split[0]
+                 && fp != split[1]
+                 && patchConstraints[f[fp]].first() >= 2
+                )
+                {
+                    patchConstraints[f[fp]] = pointConstraint
+                    (
+                        Tuple2<label, vector>
+                        (
+                            1,
+                            nearestNormal[f[fp]]
+                        )
+                    );
+                    patchAttraction[f[fp]] = nearestAttraction[f[fp]];
+                }
+            }
+        }
+    }
+}
+
+
 void Foam::autoSnapDriver::avoidDiagonalAttraction
 (
     const label iter,
@@ -1556,7 +2015,8 @@ void Foam::autoSnapDriver::avoidDiagonalAttraction
 
             if (cosAngle > featureCos)
             {
-                // Add the nearest of the other two points as
+                // The two feature edges are roughly in the same direction.
+                // Add the nearest of the other points in the face as
                 // attractor
                 label minFp = -1;
                 scalar minDistSqr = GREAT;
@@ -1579,8 +2039,7 @@ void Foam::autoSnapDriver::avoidDiagonalAttraction
                     label minPointI = f[minFp];
                     patchAttraction[minPointI] =
                         mid-pp.localPoints()[minPointI];
-                    patchConstraints[minPointI] =
-                        patchConstraints[f[diag[0]]];
+                    patchConstraints[minPointI] = patchConstraints[f[diag[0]]];
                 }
             }
             else
@@ -1665,8 +2124,7 @@ Foam::autoSnapDriver::findNearFeatureEdge
         edgeConstraints[featI][nearInfo.index()].append(c);
 
         // Store for later use
-        patchAttraction[pointI] =
-            nearInfo.hitPoint()-pp.localPoints()[pointI];
+        patchAttraction[pointI] = nearInfo.hitPoint()-pp.localPoints()[pointI];
         patchConstraints[pointI] = c;
     }
     return Tuple2<label, pointIndexHit>(featI, nearInfo);
@@ -1696,6 +2154,8 @@ Foam::autoSnapDriver::findNearFeaturePoint
 {
     const refinementFeatures& features = meshRefiner_.features();
 
+    // Search for for featurePoints only! This ignores any non-feature points.
+
     labelList nearFeat;
     List<pointIndexHit> nearInfo;
     features.findNearestPoint
@@ -1737,8 +2197,7 @@ Foam::autoSnapDriver::findNearFeaturePoint
 
                 // Store for later use
                 patchAttraction[pointI] = featPt-pt;
-                patchConstraints[pointI] =
-                    pointConstraints[featI][featPointI];
+                patchConstraints[pointI] = pointConstraints[featI][featPointI];
 
                 // Reset oldPointI to nearest on feature edge
                 patchAttraction[oldPointI] = vector::zero;
@@ -1808,6 +2267,8 @@ void Foam::autoSnapDriver::determineFeatures
     autoPtr<OBJstream> featureEdgeStr;
     autoPtr<OBJstream> missedEdgeStr;
     autoPtr<OBJstream> featurePointStr;
+    autoPtr<OBJstream> missedMP0Str;
+    autoPtr<OBJstream> missedMP1Str;
 
     if (debug&meshRefinement::ATTRACTION)
     {
@@ -1843,6 +2304,28 @@ void Foam::autoSnapDriver::determineFeatures
         );
         Info<< "Dumping feature-point sampling to "
             << featurePointStr().name() << endl;
+
+        missedMP0Str.reset
+        (
+            new OBJstream
+            (
+                meshRefiner_.mesh().time().path()
+              / "missedFeatureEdgeFromMPEdge_" + name(iter) + ".obj"
+            )
+        );
+        Info<< "Dumping region-edges that are too far away to "
+            << missedMP0Str().name() << endl;
+
+        missedMP1Str.reset
+        (
+            new OBJstream
+            (
+                meshRefiner_.mesh().time().path()
+              / "missedFeatureEdgeFromMPPoint_" + name(iter) + ".obj"
+            )
+        );
+        Info<< "Dumping region-points that are too far away to "
+            << missedMP1Str().name() << endl;
     }
 
 
@@ -1854,6 +2337,15 @@ void Foam::autoSnapDriver::determineFeatures
     {
         const point& pt = pp.localPoints()[pointI];
 
+
+        // Determine the geometric planes the point is (approximately) on.
+        // This is returned as a
+        // - attraction vector
+        // - and a constraint
+        //   (1: attract to surface, constraint is normal of plane
+        //    2: attract to feature line, constraint is feature line direction
+        //    3: attract to feature point, constraint is zero)
+
         vector attraction = vector::zero;
         pointConstraint constraint;
 
@@ -1881,6 +2373,35 @@ void Foam::autoSnapDriver::determineFeatures
             constraint
         );
 
+        // Now combine the reconstruction with the current state of the
+        // point. The logic is quite complicated:
+        // - the new constraint (from reconstruction) will only win if
+        //   - the constraint is higher (feature-point wins from feature-edge
+        //     etc.)
+        //   - or the constraint is the same but the attraction distance is less
+        //
+        // - then this will be combined with explicit searching on the
+        //   features and optionally the analysis of the patches using the
+        //   point. This analysis can do three thing:
+        //      - the point is not on multiple patches
+        //      - the point is on multiple patches but these are also
+        //        different planes (so the region feature is also a geometric
+        //        feature)
+        //      - the point is on multiple patches some of which are on
+        //        the same plane. This is the problem one - do we assume it is
+        //        an additional constraint (feat edge upgraded to region point,
+        //        see below)?
+        //
+        //      Reconstruction  MultiRegionFeatureSnap          Attraction
+        //      -------         ----------------------          -----------
+        //      surface         false                           surface
+        //      surface         true                            region edge
+        //      feat edge       false                           feat edge
+        //      feat edge       true and no planar regions      feat edge
+        //      feat edge       true and yes planar regions     region point
+        //      feat point      false                           feat point
+        //      feat point      true                            region point
+
 
         if
         (
@@ -1920,7 +2441,7 @@ void Foam::autoSnapDriver::determineFeatures
                         Tuple2<label, pointIndexHit> nearInfo =
                         findNearFeatureEdge
                         (
-                            true,                       // isRegionPoint
+                            true,                       // isRegionEdge
                             pp,
                             snapDist,
                             pointI,
@@ -1951,7 +2472,7 @@ void Foam::autoSnapDriver::determineFeatures
                             {
                                 missedEdgeStr().write
                                 (
-                                    linePointRef(pt, info.missPoint())
+                                    linePointRef(pt, multiPatchPt.hitPoint())
                                 );
                             }
                         }
@@ -1985,10 +2506,10 @@ void Foam::autoSnapDriver::determineFeatures
                     {
                         if (multiPatchPt.index() == 0)
                         {
-                            // Geometric feature edge is also region edge
+                            // Region edge is also a geometric feature edge
                             nearInfo = findNearFeatureEdge
                             (
-                                true,               // isRegionPoint
+                                true,               // isRegionEdge
                                 pp,
                                 snapDist,
                                 pointI,
@@ -2001,11 +2522,28 @@ void Foam::autoSnapDriver::determineFeatures
                                 patchConstraints
                             );
                             hasSnapped = true;
+
+                            // Debug: dump missed feature point
+                            if
+                            (
+                                missedMP0Str.valid()
+                            && !nearInfo.second().hit()
+                            )
+                            {
+                                missedMP0Str().write
+                                (
+                                    linePointRef(pt, estimatedPt)
+                                );
+                            }
                         }
                         else
                         {
                             // One of planes of feature contains multiple
-                            // regions
+                            // regions. We assume (contentious!) that the
+                            // separation between
+                            // the regions is not aligned with the geometric
+                            // feature so is an additional constraint on the
+                            // point -> is region-feature-point.
                             nearInfo = findNearFeaturePoint
                             (
                                 true,           // isRegionPoint
@@ -2025,6 +2563,47 @@ void Foam::autoSnapDriver::determineFeatures
                                 patchConstraints
                             );
                             hasSnapped = true;
+
+                            // More contentious: if we don't find
+                            // a near feature point we will never find the
+                            // attraction to a feature edge either since
+                            // the edgeAttractors/edgeConstraints do not get
+                            // filled and we're using reverse attraction
+                            // Note that we're in multiRegionFeatureSnap which
+                            // where findMultiPatchPoint can decide the
+                            // wrong thing. So: if failed finding a near
+                            // feature point try for a feature edge
+                            if (!nearInfo.second().hit())
+                            {
+                                nearInfo = findNearFeatureEdge
+                                (
+                                    true,           // isRegionEdge
+                                    pp,
+                                    snapDist,
+                                    pointI,
+                                    estimatedPt,
+
+                                    // Feature-edge to pp point
+                                    edgeAttractors,
+                                    edgeConstraints,
+                                    // pp point to nearest feature
+                                    patchAttraction,
+                                    patchConstraints
+                                );
+                            }
+
+                            // Debug: dump missed feature point
+                            if
+                            (
+                                missedMP1Str.valid()
+                            && !nearInfo.second().hit()
+                            )
+                            {
+                                missedMP1Str().write
+                                (
+                                    linePointRef(pt, estimatedPt)
+                                );
+                            }
                         }
                     }
                 }
@@ -2085,7 +2664,7 @@ void Foam::autoSnapDriver::determineFeatures
                     {
                         missedEdgeStr().write
                         (
-                            linePointRef(pt, info.missPoint())
+                            linePointRef(pt, estimatedPt)
                         );
                     }
                 }
@@ -2204,6 +2783,7 @@ void Foam::autoSnapDriver::determineFeatures
 void Foam::autoSnapDriver::determineBaffleFeatures
 (
     const label iter,
+    const bool baffleFeaturePoints,
     const scalar featureCos,
 
     const indirectPrimitivePatch& pp,
@@ -2258,8 +2838,8 @@ void Foam::autoSnapDriver::determineBaffleFeatures
 
     // Detect baffle edges. Assume initial mesh will have 0,90 or 180
     // (baffle) degree angles so smoothing should make 0,90
-    // to be less than 90.
-    const scalar baffleFeatureCos = Foam::cos(degToRad(91));
+    // to be less than 90. Choose reasonable value
+    const scalar baffleFeatureCos = Foam::cos(degToRad(110));
 
 
     autoPtr<OBJstream> baffleEdgeStr;
@@ -2308,40 +2888,58 @@ void Foam::autoSnapDriver::determineBaffleFeatures
         }
     }
 
-    Info<< "Detected "
-        << returnReduce(nBaffleEdges, sumOp<label>())
+    reduce(nBaffleEdges, sumOp<label>());
+
+    Info<< "Detected " << nBaffleEdges
         << " baffle edges out of "
         << returnReduce(pp.nEdges(), sumOp<label>())
         << " edges." << endl;
 
 
-    forAll(pp.pointEdges(), pointI)
+    //- Baffle edges will be too ragged to sensibly determine feature points
+    //forAll(pp.pointEdges(), pointI)
+    //{
+    //    if
+    //    (
+    //        isFeaturePoint
+    //        (
+    //            featureCos,
+    //            pp,
+    //            isBaffleEdge,
+    //            pointI
+    //        )
+    //    )
+    //    {
+    //        //Pout<< "Detected feature point:" << pp.localPoints()[pointI]
+    //        //    << endl;
+    //        //-TEMPORARILY DISABLED:
+    //        //pointStatus[pointI] = 1;
+    //    }
+    //}
+
+
+    label nBafflePoints = 0;
+    forAll(pointStatus, pointI)
     {
-        if
-        (
-            isFeaturePoint
-            (
-                featureCos,
-                pp,
-                isBaffleEdge,
-                pointI
-            )
-        )
+        if (pointStatus[pointI] != -1)
         {
-            //Pout<< "Detected feature point:" << pp.localPoints()[pointI]
-            //    << endl;
-            //-TEMPORARILY DISABLED:
-            //pointStatus[pointI] = 1;
+            nBafflePoints++;
         }
     }
+    reduce(nBafflePoints, sumOp<label>());
 
 
+    label nPointAttract = 0;
+    label nEdgeAttract = 0;
+
     forAll(pointStatus, pointI)
     {
         const point& pt = pp.localPoints()[pointI];
 
         if (pointStatus[pointI] == 0)   // baffle edge
         {
+            // 1: attract to near feature edge first
+
             Tuple2<label, pointIndexHit> nearInfo = findNearFeatureEdge
             (
                 false,          // isRegionPoint?
@@ -2356,10 +2954,43 @@ void Foam::autoSnapDriver::determineBaffleFeatures
                 patchConstraints
             );
 
-            if (!nearInfo.second().hit())
+
+            //- MEJ:
+            // 2: optionally override with nearest feature point.
+            //    On baffles we don't have enough normals to construct a feature
+            //    point so assume all feature edges are close to feature points
+            if (nearInfo.second().hit())
             {
-                //Pout<< "*** Failed to find close edge to point " << pt
-                //    << endl;
+                nEdgeAttract++;
+
+                if (baffleFeaturePoints)
+                {
+                    nearInfo = findNearFeaturePoint
+                    (
+                        false,          // isRegionPoint,
+
+                        pp,
+                        snapDist,
+                        pointI,
+                        pt,             // estimatedPt,
+
+                        // Feature-point to pp point
+                        pointAttractor,
+                        pointConstraints,
+                        // Feature-edge to pp point
+                        edgeAttractors,
+                        edgeConstraints,
+                        // pp point to nearest feature
+                        patchAttraction,
+                        patchConstraints
+                    );
+
+                    if (nearInfo.first() != -1)
+                    {
+                        nEdgeAttract--;
+                        nPointAttract++;
+                    }
+                }
             }
         }
         else if (pointStatus[pointI] == 1)   // baffle point
@@ -2378,6 +3009,8 @@ void Foam::autoSnapDriver::determineBaffleFeatures
 
             if (featI != -1)
             {
+                nPointAttract++;
+
                 label featPointI = nearInfo[0].index();
                 const point& featPt = nearInfo[0].hitPoint();
                 scalar distSqr = magSqr(featPt-pt);
@@ -2440,7 +3073,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures
                 //    << " for baffle-feature-point " << pt
                 //    << endl;
 
-                findNearFeatureEdge
+                Tuple2<label, pointIndexHit> nearInfo = findNearFeatureEdge
                 (
                     false,                  // isRegionPoint
                     pp,
@@ -2453,9 +3086,25 @@ void Foam::autoSnapDriver::determineBaffleFeatures
                     patchAttraction,
                     patchConstraints
                 );
+
+                if (nearInfo.first() != -1)
+                {
+                    nEdgeAttract++;
+                }
             }
         }
     }
+
+    reduce(nPointAttract, sumOp<label>());
+    reduce(nEdgeAttract, sumOp<label>());
+
+    Info<< "Baffle points     : " << nBafflePoints
+        << " of which attracted to :" << nl
+        << "    feature point : " << nPointAttract << nl
+        << "    feature edge  : " << nEdgeAttract << nl
+        << "    rest          : " << nBafflePoints-nPointAttract-nEdgeAttract
+        << nl
+        << endl;
 }
 
 
@@ -2518,7 +3167,8 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
         }
 
         Info<< "Initially selected " << returnReduce(nFeats, sumOp<label>())
-            << " points out of " << returnReduce(pp.nPoints(), sumOp<label>())
+            << " mesh points out of "
+            << returnReduce(pp.nPoints(), sumOp<label>())
             << " for reverse attraction." << endl;
 
         // Make sure is synchronised (note: check if constraint is already
@@ -2578,7 +3228,8 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
 
         Info<< "Selected "
             << returnReduce(attractPoints.size(), sumOp<label>())
-            << " points out of " << returnReduce(pp.nPoints(), sumOp<label>())
+            << " mesh points out of "
+            << returnReduce(pp.nPoints(), sumOp<label>())
             << " for reverse attraction." << endl;
     }
 
@@ -2637,11 +3288,8 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
                 }
                 else
                 {
-                    WarningIn
-                    (
-                        "autoSnapDriver::featureAttractionUsingFeatureEdges"
-                        "(..)"
-                    )   << "Did not find pp point near " << featPt
+                    WarningInFunction
+                        << "Did not find pp point near " << featPt
                         << endl;
                 }
             }
@@ -2724,13 +3372,21 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
 void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
 (
     const label iter,
-    const bool avoidSnapProblems,
-    const scalar featureCos,
     const bool multiRegionFeatureSnap,
 
+    const bool detectBaffles,
+    const bool baffleFeaturePoints,
+
+    const bool releasePoints,
+    const bool stringFeatures,
+    const bool avoidDiagonal,
+
+    const scalar featureCos,
+
     const indirectPrimitivePatch& pp,
     const scalarField& snapDist,
     const vectorField& nearestDisp,
+    const vectorField& nearestNormal,
 
     const List<List<point> >& pointFaceSurfNormals,
     const List<List<point> >& pointFaceDisp,
@@ -2742,6 +3398,17 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
 ) const
 {
     const refinementFeatures& features = meshRefiner_.features();
+    const fvMesh& mesh = meshRefiner_.mesh();
+
+    const PackedBoolList isPatchMasterPoint
+    (
+        meshRefinement::getMasterPoints
+        (
+            mesh,
+            pp.meshPoints()
+        )
+    );
+
 
     // Collect ordered attractions on feature edges
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2802,7 +3469,12 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
         rawPatchConstraints
     );
 
-
+    // Print a bit about the attraction from patch point to feature
+    if (debug)
+    {
+        Info<< "Raw geometric feature analysis : ";
+        writeStats(pp, isPatchMasterPoint, rawPatchConstraints);
+    }
 
     // Baffle handling
     // ~~~~~~~~~~~~~~~
@@ -2815,25 +3487,35 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     // detected anything. So explicitly pick up feature edges on the pp
     // (after duplicating points & smoothing so will already have been
     // expanded) and match these to the features.
-    determineBaffleFeatures
-    (
-        iter,
-        featureCos,
+    if (detectBaffles)
+    {
+        determineBaffleFeatures
+        (
+            iter,
+            baffleFeaturePoints,
+            featureCos,
 
-        pp,
-        snapDist,
+            pp,
+            snapDist,
 
-        // Feature-point to pp point
-        pointAttractor,
-        pointConstraints,
-        // Feature-edge to pp point
-        edgeAttractors,
-        edgeConstraints,
-        // pp point to nearest feature
-        rawPatchAttraction,
-        rawPatchConstraints
-    );
+            // Feature-point to pp point
+            pointAttractor,
+            pointConstraints,
+            // Feature-edge to pp point
+            edgeAttractors,
+            edgeConstraints,
+            // pp point to nearest feature
+            rawPatchAttraction,
+            rawPatchConstraints
+        );
+    }
 
+    // Print a bit about the attraction from patch point to feature
+    if (debug)
+    {
+        Info<< "After baffle feature analysis : ";
+        writeStats(pp, isPatchMasterPoint, rawPatchConstraints);
+    }
 
 
     // Reverse lookup: Find nearest mesh point to feature edge
@@ -2863,6 +3545,12 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
         patchConstraints
     );
 
+    // Print a bit about the attraction from patch point to feature
+    if (debug)
+    {
+        Info<< "Reverse attract feature analysis : ";
+        writeStats(pp, isPatchMasterPoint, patchConstraints);
+    }
 
     // Dump
     if (debug&meshRefinement::ATTRACTION)
@@ -2900,38 +3588,38 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     }
 
 
-    if (avoidSnapProblems)
+    //MEJ: any faces that have multi-patch points only keep the
+    //     multi-patch
+    //     points. The other points on the face will be dragged along
+    //     (hopefully)
+    if (releasePoints)
     {
-        //MEJ: any faces that have multi-patch points only keep the multi-patch
-        //     points. The other points on the face will be dragged along
-        //     (hopefully)
-        if (multiRegionFeatureSnap)
-        {
-            releasePointsNextToMultiPatch
-            (
-                iter,
-                featureCos,
+        releasePointsNextToMultiPatch
+        (
+            iter,
+            featureCos,
 
-                pp,
-                snapDist,
+            pp,
+            snapDist,
 
-                pointFaceCentres,
-                pointFacePatchID,
+            pointFaceCentres,
+            pointFacePatchID,
 
-                rawPatchAttraction,
-                rawPatchConstraints,
+            rawPatchAttraction,
+            rawPatchConstraints,
 
-                patchAttraction,
-                patchConstraints
-            );
-        }
+            patchAttraction,
+            patchConstraints
+        );
+    }
 
 
-        // Snap edges to feature edges
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Walk existing edges and snap remaining ones (that are marked as
-        // feature edges in rawPatchConstraints)
-
+    // Snap edges to feature edges
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Walk existing edges and snap remaining ones (that are marked as
+    // feature edges in rawPatchConstraints)
+    if (stringFeatures)
+    {
         stringFeatureEdges
         (
             iter,
@@ -2946,12 +3634,14 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
             patchAttraction,
             patchConstraints
         );
+    }
 
 
-        // Avoid diagonal attraction
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Attract one of the non-diagonal points.
-
+    // Avoid diagonal attraction
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Attract one of the non-diagonal points.
+    if (avoidDiagonal)
+    {
         avoidDiagonalAttraction
         (
             iter,
@@ -2962,6 +3652,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
         );
     }
 
+
     if (debug&meshRefinement::ATTRACTION)
     {
         dumpMove
@@ -2983,11 +3674,27 @@ void Foam::autoSnapDriver::preventFaceSqueeze
 
     const indirectPrimitivePatch& pp,
     const scalarField& snapDist,
+    const vectorField& nearestAttraction,
 
     vectorField& patchAttraction,
     List<pointConstraint>& patchConstraints
 ) const
 {
+    autoPtr<OBJstream> strPtr;
+    if (debug&meshRefinement::ATTRACTION)
+    {
+        strPtr.reset
+        (
+            new OBJstream
+            (
+                meshRefiner_.mesh().time().path()
+              / "faceSqueeze_" + name(iter) + ".obj"
+            )
+        );
+        Info<< "Dumping faceSqueeze corrections to "
+            << strPtr().name() << endl;
+    }
+
     pointField points;
     face singleF;
     forAll(pp.localFaces(), faceI)
@@ -3022,16 +3729,19 @@ void Foam::autoSnapDriver::preventFaceSqueeze
 
         if (nConstraints == f.size())
         {
-            scalar oldArea = f.mag(pp.localPoints());
-            scalar newArea = singleF.mag(points);
-            if (newArea < 0.1*oldArea)
+            if (f.size() == 3)
             {
-                // For now remove the point with largest distance
+                // Triangle: knock out attraction altogether
+
+                // For now keep the points on the longest edge
                 label maxFp = -1;
                 scalar maxS = -1;
                 forAll(f, fp)
                 {
-                    scalar s = magSqr(patchAttraction[f[fp]]);
+                    const point& pt = pp.localPoints()[f[fp]];
+                    const point& nextPt = pp.localPoints()[f.nextLabel(fp)];
+
+                    scalar s = magSqr(pt-nextPt);
                     if (s > maxS)
                     {
                         maxS = s;
@@ -3040,9 +3750,52 @@ void Foam::autoSnapDriver::preventFaceSqueeze
                 }
                 if (maxFp != -1)
                 {
-                    label pointI = f[maxFp];
-                    // Lower attraction on pointI
-                    patchAttraction[pointI] *= 0.5;
+                    label pointI = f.prevLabel(maxFp);
+
+                    // Reset attraction on pointI to nearest
+
+                    const point& pt = pp.localPoints()[pointI];
+
+                    //Pout<< "** on triangle " << pp.faceCentres()[faceI]
+                    //    << " knocking out attraction to " << pointI
+                    //    << " at:" << pt
+                    //    << endl;
+
+                    patchAttraction[pointI] = nearestAttraction[pointI];
+
+                    if (strPtr.valid())
+                    {
+                        strPtr().write
+                        (
+                            linePointRef(pt, pt+patchAttraction[pointI])
+                        );
+                    }
+                }
+            }
+            else
+            {
+                scalar oldArea = f.mag(pp.localPoints());
+                scalar newArea = singleF.mag(points);
+                if (newArea < 0.1*oldArea)
+                {
+                    // For now remove the point with largest distance
+                    label maxFp = -1;
+                    scalar maxS = -1;
+                    forAll(f, fp)
+                    {
+                        scalar s = magSqr(patchAttraction[f[fp]]);
+                        if (s > maxS)
+                        {
+                            maxS = s;
+                            maxFp = fp;
+                        }
+                    }
+                    if (maxFp != -1)
+                    {
+                        label pointI = f[maxFp];
+                        // Lower attraction on pointI
+                        patchAttraction[pointI] *= 0.5;
+                    }
                 }
             }
         }
@@ -3053,15 +3806,20 @@ void Foam::autoSnapDriver::preventFaceSqueeze
 Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
 (
     const snapParameters& snapParams,
-    const bool avoidSnapProblems,
+    const bool alignMeshEdges,
     const label iter,
     const scalar featureCos,
     const scalar featureAttract,
     const scalarField& snapDist,
     const vectorField& nearestDisp,
+    const vectorField& nearestNormal,
     motionSmoother& meshMover,
     vectorField& patchAttraction,
-    List<pointConstraint>& patchConstraints
+    List<pointConstraint>& patchConstraints,
+
+    DynamicList<label>& splitFaces,
+    DynamicList<labelPair>& splits
+
 ) const
 {
     const Switch implicitFeatureAttraction = snapParams.implicitFeatureSnap();
@@ -3080,6 +3838,15 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
     const fvMesh& mesh = meshRefiner_.mesh();
 
 
+    //const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
+    const PackedBoolList isPatchMasterPoint
+    (
+        meshRefinement::getMasterPoints
+        (
+            mesh,
+            pp.meshPoints()
+        )
+    );
 
     // Per point, per surrounding face:
     // - faceSurfaceNormal
@@ -3112,7 +3879,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
         // normal of surface at point on surface
         vectorField faceSurfaceNormal(pp.size(), vector::zero);
         labelList faceSurfaceGlobalRegion(pp.size(), -1);
-        vectorField faceRotation(pp.size(), vector::zero);
+        //vectorField faceRotation(pp.size(), vector::zero);
 
         calcNearestFace
         (
@@ -3121,8 +3888,8 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
             faceSnapDist,
             faceDisp,
             faceSurfaceNormal,
-            faceSurfaceGlobalRegion,
-            faceRotation
+            faceSurfaceGlobalRegion
+            //faceRotation
         );
 
 
@@ -3173,7 +3940,6 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
         featureAttractionUsingReconstruction
         (
             iter,
-            avoidSnapProblems,
             featureCos,
 
             pp,
@@ -3192,6 +3958,18 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
 
     if (explicitFeatureAttraction)
     {
+        // Only do fancy stuff if alignMeshEdges
+        bool releasePoints = false;
+        bool stringFeatures = false;
+        bool avoidDiagonal = false;
+        if (alignMeshEdges)
+        {
+            releasePoints = snapParams.releasePoints();
+            stringFeatures = snapParams.stringFeatures();
+            avoidDiagonal = snapParams.avoidDiagonal();
+        }
+
+
         // Sample faces around each point and see if nearest surface normal
         // differs. For those find the nearest real feature edge/point and
         // store the correspondence. Then loop over feature edge/point
@@ -3201,13 +3979,22 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
         featureAttractionUsingFeatureEdges
         (
             iter,
-            avoidSnapProblems,
-            featureCos,
             multiRegionFeatureSnap,
 
+            snapParams.detectBaffles(),
+            snapParams.baffleFeaturePoints(),   // all points on baffle edges
+                                                // are attracted to feature pts
+
+            releasePoints,
+            stringFeatures,
+            avoidDiagonal,
+
+            featureCos,
+
             pp,
             snapDist,
             nearestDisp,
+            nearestNormal,
 
             pointFaceSurfNormals,
             pointFaceDisp,
@@ -3219,6 +4006,46 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
         );
     }
 
+    if (!alignMeshEdges)
+    {
+        const scalar concaveCos = Foam::cos
+        (
+            degToRad(snapParams.concaveAngle())
+        );
+        const scalar minAreaRatio = snapParams.minAreaRatio();
+
+        Info<< "Experimental: introducing face splits to avoid rotating"
+            << " mesh edges. Splitting faces when" << nl
+            << indent << "- angle not concave by more than "
+            << snapParams.concaveAngle() << " degrees" << nl
+            << indent << "- resulting triangles of similar area "
+            << " (ratio within " << minAreaRatio << ")" << nl
+            << endl;
+
+        splitDiagonals
+        (
+            featureCos,
+            concaveCos,
+            minAreaRatio,
+            pp,
+
+            nearestDisp,
+            nearestNormal,
+
+            patchAttraction,
+            patchConstraints,
+            splitFaces,
+            splits
+        );
+
+        if (debug)
+        {
+            Info<< "Diagonal attraction feature correction : ";
+            writeStats(pp, isPatchMasterPoint, patchConstraints);
+        }
+    }
+
+
     preventFaceSqueeze
     (
         iter,
@@ -3226,20 +4053,12 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
 
         pp,
         snapDist,
+        nearestDisp,
 
         patchAttraction,
         patchConstraints
     );
 
-    //const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
-    const PackedBoolList isPatchMasterPoint
-    (
-        meshRefinement::getMasterPoints
-        (
-            mesh,
-            pp.meshPoints()
-        )
-    );
     {
         vector avgPatchDisp = meshRefinement::gAverage
         (
@@ -3253,9 +4072,9 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
         );
 
         Info<< "Attraction:" << endl
-            << "     linear   : max:" << gMaxMagSqr(patchDisp)
+            << "    linear   : max:" << gMaxMagSqr(patchDisp)
             << " avg:" << avgPatchDisp << endl
-            << "     feature  : max:" << gMaxMagSqr(patchAttraction)
+            << "    feature  : max:" << gMaxMagSqr(patchAttraction)
             << " avg:" << avgPatchAttr << endl;
     }
 
@@ -3284,45 +4103,8 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
 
     // Count
     {
-        label nMasterPoints = 0;
-        label nPlanar = 0;
-        label nEdge = 0;
-        label nPoint = 0;
-
-        forAll(patchConstraints, pointI)
-        {
-            if (isPatchMasterPoint[pointI])
-            {
-                nMasterPoints++;
-
-                if (patchConstraints[pointI].first() == 1)
-                {
-                    nPlanar++;
-                }
-                else if (patchConstraints[pointI].first() == 2)
-                {
-                    nEdge++;
-                }
-                else if (patchConstraints[pointI].first() == 3)
-                {
-                    nPoint++;
-                }
-            }
-        }
-
-        reduce(nMasterPoints, sumOp<label>());
-        reduce(nPlanar, sumOp<label>());
-        reduce(nEdge, sumOp<label>());
-        reduce(nPoint, sumOp<label>());
-        Info<< "Feature analysis : total master points:"
-            << nMasterPoints
-            << " attraction to :" << nl
-            << "    feature point   : " << nPoint << nl
-            << "    feature edge    : " << nEdge << nl
-            << "    nearest surface : " << nPlanar << nl
-            << "    rest            : " << nMasterPoints-nPoint-nEdge-nPlanar
-            << nl
-            << endl;
+        Info<< "Feature analysis : ";
+        writeStats(pp, isPatchMasterPoint, patchConstraints);
     }
 
 
@@ -3362,7 +4144,6 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
             )
         );
 
-
         // 1. Smoothed all displacement
         vectorField smoothedPatchDisp = patchDisp;
         smoothAndConstrain
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverTemplates.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverTemplates.C
new file mode 100644
index 0000000000..f047752b07
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverTemplates.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "autoSnapDriver.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class FaceList>
+Foam::labelList Foam::autoSnapDriver::getFacePoints
+(
+    const indirectPrimitivePatch& pp,
+    const FaceList& faces
+)
+{
+    // Could use PrimitivePatch & localFaces to extract points but might just
+    // as well do it ourselves.
+
+    boolList pointOnZone(pp.nPoints(), false);
+
+    forAll(faces, i)
+    {
+        const face& f = faces[i];
+
+        forAll(f, fp)
+        {
+            label meshPointI = f[fp];
+
+            Map<label>::const_iterator iter =
+                pp.meshPointMap().find(meshPointI);
+
+            if (iter != pp.meshPointMap().end())
+            {
+                label pointI = iter();
+                pointOnZone[pointI] = true;
+            }
+        }
+    }
+
+    return findIndices(pointOnZone, true);
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index be4272e37a..36e5715f49 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,12 +48,9 @@ Foam::scalar Foam::layerParameters::layerExpansionRatio
         return 1.0;
     }
 
-    //scalar totalOverFirst = totalThickness/firstLayerThickess;
-
-    const label maxIters = 10;
+    const label maxIters = 20;
     const scalar tol = 1e-8;
 
-
     if (mag(n-totalOverFirst) < tol)
     {
         return 1.0;
@@ -74,8 +71,6 @@ Foam::scalar Foam::layerParameters::layerExpansionRatio
         maxR = totalOverFirst/(n - 1);
     }
 
-    //Info<< "Solution bounds = (" << minR << ", " << maxR << ")" << nl << endl;
-
     // Starting guess
     scalar r = 0.5*(minR + maxR);
 
@@ -85,14 +80,9 @@ Foam::scalar Foam::layerParameters::layerExpansionRatio
 
         const scalar fx = pow(r, n) - totalOverFirst*r - (1 - totalOverFirst);
         const scalar dfx = n*pow(r, n - 1) - totalOverFirst;
-
         r -= fx/dfx;
 
-        const scalar error = mag(r - prevr);
-
-        //Info<< i << " " << r << " Error = " << error << endl;
-
-        if (error < tol)
+        if (mag(r - prevr) < tol)
         {
             break;
         }
@@ -103,7 +93,6 @@ Foam::scalar Foam::layerParameters::layerExpansionRatio
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from dictionary
 Foam::layerParameters::layerParameters
 (
     const dictionary& dict,
@@ -124,6 +113,14 @@ Foam::layerParameters::layerParameters
         readScalar(dict.lookup("minThickness"))
     ),
     featureAngle_(readScalar(dict.lookup("featureAngle"))),
+    mergePatchFacesAngle_
+    (
+        dict.lookupOrDefault<scalar>
+        (
+            "mergePatchFacesAngle",
+            featureAngle_
+        )
+    ),
     concaveAngle_
     (
         dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
@@ -229,10 +226,8 @@ Foam::layerParameters::layerParameters
 
     if (layerSpec_ == ILLEGAL || nSpec != 2)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "layerParameters::layerParameters"
-            "(const dictionary&, const polyBoundaryMesh&)",
             dict
         )   << "Over- or underspecified layer thickness."
             << " Please specify" << nl
@@ -254,7 +249,7 @@ Foam::layerParameters::layerParameters
 
     if (nLayerIter_ < 0 || nRelaxedIter_ < 0)
     {
-        FatalIOErrorIn("layerParameters::layerParameters(..)", dict)
+        FatalIOErrorInFunction(dict)
             << "Layer iterations should be >= 0." << endl
             << "nLayerIter:" << nLayerIter_
             << " nRelaxedIter:" << nRelaxedIter_
@@ -276,7 +271,7 @@ Foam::layerParameters::layerParameters
 
             if (patchIDs.size() == 0)
             {
-                IOWarningIn("layerParameters::layerParameters(..)", layersDict)
+                IOWarningInFunction(layersDict)
                     << "Layer specification for " << key
                     << " does not match any patch." << endl
                     << "Valid patches are " << boundaryMesh.names() << endl;
@@ -360,9 +355,8 @@ Foam::layerParameters::layerParameters
                         break;
 
                         default:
-                            FatalIOErrorIn
+                            FatalIOErrorInFunction
                             (
-                                "layerParameters::layerParameters(..)",
                                 dict
                             )   << "problem." << exit(FatalIOError);
                         break;
@@ -409,9 +403,9 @@ Foam::scalar Foam::layerParameters::layerThickness
             }
             else
             {
-                return firstLayerThickess *
-                    (1.0 - pow(expansionRatio, nLayers))
-                  / (1.0 - expansionRatio);
+                return firstLayerThickess
+                   *(1.0 - pow(expansionRatio, nLayers))
+                   /(1.0 - expansionRatio);
             }
         }
         break;
@@ -425,17 +419,16 @@ Foam::scalar Foam::layerParameters::layerThickness
             else
             {
                 scalar invExpansion = 1.0 / expansionRatio;
-                return finalLayerThickess *
-                    (1.0 - pow(invExpansion, nLayers))
-                  / (1.0 - invExpansion);
+                return finalLayerThickess
+                   *(1.0 - pow(invExpansion, nLayers))
+                   /(1.0 - invExpansion);
             }
         }
         break;
 
         default:
         {
-            FatalErrorIn("layerParameters::layerThickness(..)")
-                << "Illegal thickness specification " <<    layerSpec_
+            FatalErrorInFunction
                 << exit(FatalError);
             return -VGREAT;
         }
@@ -476,7 +469,7 @@ Foam::scalar Foam::layerParameters::layerExpansionRatio
         {
             return
                 1.0
-              / layerExpansionRatio
+               /layerExpansionRatio
                 (
                     nLayers,
                     totalThickness/finalLayerThickess
@@ -486,7 +479,7 @@ Foam::scalar Foam::layerParameters::layerExpansionRatio
 
         default:
         {
-            FatalErrorIn("layerParameters::layerThickness(..)")
+            FatalErrorInFunction
                 << "Illegal thickness specification" << exit(FatalError);
             return -VGREAT;
         }
@@ -545,7 +538,7 @@ Foam::scalar Foam::layerParameters::firstLayerThickness
 
         default:
         {
-            FatalErrorIn("layerParameters::layerThickness(..)")
+            FatalErrorInFunction
                 << "Illegal thickness specification" << exit(FatalError);
             return -VGREAT;
         }
@@ -569,8 +562,8 @@ Foam::scalar Foam::layerParameters::finalLayerThicknessRatio
         {
             return
                 pow(expansionRatio, nLayers - 1)
-              * (1.0 - expansionRatio)
-              / (1.0 - pow(expansionRatio, nLayers));
+               *(1.0 - expansionRatio)
+               /(1.0 - pow(expansionRatio, nLayers));
         }
     }
     else
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
index 21d52fdd69..f617916f47 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,6 +114,8 @@ private:
 
         scalar featureAngle_;
 
+        scalar mergePatchFacesAngle_;
+
         scalar concaveAngle_;
 
         label nGrow_;
@@ -247,6 +249,11 @@ public:
                 return featureAngle_;
             }
 
+            scalar mergePatchFacesAngle() const
+            {
+                return mergePatchFacesAngle_;
+            }
+
             scalar concaveAngle() const
             {
                 return concaveAngle_;
@@ -326,7 +333,6 @@ public:
                 const label nLayers,
                 const scalar expansionRatio
             ) const;
-
 };
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
index 0ed25cf81c..3afc843a4c 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,8 @@ License
 #include "unitConversion.H"
 #include "polyMesh.H"
 #include "globalIndex.H"
+#include "Tuple2.H"
+#include "wallPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -44,7 +46,15 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
         )
     ),
     nBufferLayers_(readLabel(dict.lookup("nCellsBetweenLevels"))),
-    keepPoints_(pointField(1, dict.lookup("locationInMesh"))),
+    locationsOutsideMesh_
+    (
+        dict.lookupOrDefault
+        (
+            "locationsOutsideMesh",
+            pointField(0)
+        )
+    ),
+    faceZoneControls_(dict.subOrEmptyDict("faceZoneControls")),
     allowFreeStandingZoneFaces_(dict.lookup("allowFreeStandingZoneFaces")),
     useTopologicalSnapDetection_
     (
@@ -54,8 +64,35 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
     handleSnapProblems_
     (
         dict.lookupOrDefault<Switch>("handleSnapProblems", true)
+    ),
+    interfaceRefine_
+    (
+        dict.lookupOrDefault<Switch>("interfaceRefine", true)
     )
 {
+    point locationInMesh;
+    if (dict.readIfPresent("locationInMesh", locationInMesh))
+    {
+        locationsInMesh_.append(locationInMesh);
+        zonesInMesh_.append("noneIfNotSet");// special name for no cellZone
+    }
+
+    List<Tuple2<point, word> > pointsToZone;
+    if (dict.readIfPresent("locationsInMesh", pointsToZone))
+    {
+        label nZones = locationsInMesh_.size();
+        locationsInMesh_.setSize(nZones+pointsToZone.size());
+        zonesInMesh_.setSize(locationsInMesh_.size());
+
+        forAll(pointsToZone, i)
+        {
+            locationsInMesh_[nZones] = pointsToZone[i].first();
+            zonesInMesh_[nZones] = pointsToZone[i].second();
+            nZones++;
+        }
+    }
+
+
     scalar featAngle(readScalar(dict.lookup("resolveFeatureAngle")));
 
     if (featAngle < 0 || featAngle > 180)
@@ -71,8 +108,68 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::labelList Foam::refinementParameters::findCells(const polyMesh& mesh)
-const
+Foam::dictionary Foam::refinementParameters::getZoneInfo
+(
+    const word& fzName,
+    surfaceZonesInfo::faceZoneType& faceType
+) const
+{
+    dictionary patchInfo;
+    patchInfo.add("type", wallPolyPatch::typeName);
+    faceType = surfaceZonesInfo::INTERNAL;
+
+    if (faceZoneControls_.found(fzName))
+    {
+        const dictionary& fzDict = faceZoneControls_.subDict(fzName);
+
+        if (fzDict.found("patchInfo"))
+        {
+            patchInfo = fzDict.subDict("patchInfo");
+        }
+
+        word faceTypeName;
+        if (fzDict.readIfPresent("faceType", faceTypeName))
+        {
+            faceType = surfaceZonesInfo::faceZoneTypeNames[faceTypeName];
+        }
+    }
+    return patchInfo;
+}
+
+
+Foam::labelList Foam::refinementParameters::addCellZonesToMesh
+(
+    polyMesh& mesh
+) const
+{
+    labelList zoneIDs(zonesInMesh_.size(), -1);
+    forAll(zonesInMesh_, i)
+    {
+        if
+        (
+            zonesInMesh_[i] != word::null
+         && zonesInMesh_[i] != "none"
+         && zonesInMesh_[i] != "noneIfNotSet"
+        )
+        {
+            zoneIDs[i] = surfaceZonesInfo::addCellZone
+            (
+                zonesInMesh_[i],    // name
+                labelList(0),       // addressing
+                mesh
+            );
+        }
+    }
+    return zoneIDs;
+}
+
+
+Foam::labelList Foam::refinementParameters::findCells
+(
+    const bool checkInsideMesh,
+    const polyMesh& mesh,
+    const pointField& locations
+)
 {
     // Force calculation of tet-diag decomposition (for use in findCell)
     (void)mesh.tetBasePtIs();
@@ -81,13 +178,13 @@ const
     globalIndex globalCells(mesh.nCells());
 
     // Cell label per point
-    labelList cellLabels(keepPoints_.size());
+    labelList cellLabels(locations.size());
 
-    forAll(keepPoints_, i)
+    forAll(locations, i)
     {
-        const point& keepPoint = keepPoints_[i];
+        const point& location = locations[i];
 
-        label localCellI = mesh.findCell(keepPoint);
+        label localCellI = mesh.findCell(location);
 
         label globalCellI = -1;
 
@@ -98,12 +195,10 @@ const
 
         reduce(globalCellI, maxOp<label>());
 
-        if (globalCellI == -1)
+        if (checkInsideMesh && globalCellI == -1)
         {
-            FatalErrorIn
-            (
-                "refinementParameters::findCells(const polyMesh&) const"
-            )   << "Point " << keepPoint
+            FatalErrorInFunction
+                << "Point " << location
                 << " is not inside the mesh or on a face or edge." << nl
                 << "Bounding box of the mesh:" << mesh.bounds()
                 << exit(FatalError);
@@ -113,10 +208,9 @@ const
         label procI = globalCells.whichProcID(globalCellI);
         label procCellI = globalCells.toLocal(procI, globalCellI);
 
-        Info<< "Found point " << keepPoint << " in cell " << procCellI
+        Info<< "Found point " << location << " in cell " << procCellI
             << " on processor " << procI << endl;
 
-
         if (globalCells.isLocal(globalCellI))
         {
             cellLabels[i] = localCellI;
@@ -130,4 +224,48 @@ const
 }
 
 
+Foam::labelList Foam::refinementParameters::zonedLocations
+(
+    const wordList& zonesInMesh
+)
+{
+    DynamicList<label> indices(zonesInMesh.size());
+
+    forAll(zonesInMesh, i)
+    {
+        if
+        (
+            zonesInMesh[i] == word::null
+        ||  zonesInMesh[i] != "noneIfNotSet"
+        )
+        {
+            indices.append(i);
+        }
+    }
+    return indices;
+}
+
+
+Foam::labelList Foam::refinementParameters::unzonedLocations
+(
+    const wordList& zonesInMesh
+)
+{
+    DynamicList<label> indices(0);
+
+    forAll(zonesInMesh, i)
+    {
+        if
+        (
+            zonesInMesh[i] != word::null
+        &&  zonesInMesh[i] == "noneIfNotSet"
+        )
+        {
+            indices.append(i);
+        }
+    }
+    return indices;
+}
+
+
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
index 06b90b0758..9504efa567 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,6 +38,8 @@ SourceFiles
 #include "dictionary.H"
 #include "pointField.H"
 #include "Switch.H"
+#include "wordPairHashTable.H"
+#include "surfaceZonesInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,8 +75,21 @@ class refinementParameters
         //- Number of layers between different refinement levels
         const label nBufferLayers_;
 
-        //- Areas to keep
-        const pointField keepPoints_;
+
+        // Selection of areas
+
+            //- Areas not to keep
+            const pointField locationsOutsideMesh_;
+
+            //- Areas to keep
+            pointField locationsInMesh_;
+
+            //- Region for location
+            wordList zonesInMesh_;
+
+            //- Information on how to handle faces on faceZones
+            dictionary faceZoneControls_;
+
 
         //- FaceZone faces allowed which have owner and neighbour in same
         //  cellZone?
@@ -89,6 +104,8 @@ class refinementParameters
 
         Switch handleSnapProblems_;
 
+        Switch interfaceRefine_;
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -147,9 +164,21 @@ public:
             }
 
             //- Areas to keep
-            const pointField& keepPoints() const
+            const pointField& locationsInMesh() const
             {
-                return keepPoints_;
+                return locationsInMesh_;
+            }
+
+            //- Per area the zone name
+            const wordList& zonesInMesh() const
+            {
+                return zonesInMesh_;
+            }
+
+            //- Optional points which are checked to be outside the mesh
+            const pointField& locationsOutsideMesh() const
+            {
+                return locationsOutsideMesh_;
             }
 
             //- Are zone faces allowed only inbetween different cell zones
@@ -177,11 +206,39 @@ public:
                 return handleSnapProblems_;
             }
 
+            //- Refine cell with opposite faces with different refinement level
+            bool interfaceRefine() const
+            {
+                return interfaceRefine_;
+            }
+
 
         // Other
 
-            //- Checks that cells are in mesh. Returns cells they are in.
-            labelList findCells(const polyMesh&) const;
+            //- Get patchInfo and faceType for faceZone
+            dictionary getZoneInfo
+            (
+                const word& fzName,
+                surfaceZonesInfo::faceZoneType& faceType
+            ) const;
+
+            //- Add cellZones to mesh. Return indices of cellZones (or -1)
+            labelList addCellZonesToMesh(polyMesh&) const;
+
+            //- Checks that cells are in mesh. Returns cells (or -1) they
+            //  are in.
+            static labelList findCells
+            (
+                const bool checkInsideMesh,
+                const polyMesh&,
+                const pointField& locations
+            );
+
+            //- Extract indices of named locations (so excludes 'keepPoints')
+            static labelList zonedLocations(const wordList& zonesInMesh);
+
+            //- Extract indices of unnamed locations ('keepPoints')
+            static labelList unzonedLocations(const wordList& zonesInMesh);
 
 };
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/wordPairHashTable.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/wordPairHashTable.H
new file mode 100644
index 0000000000..f095f1f4e7
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/wordPairHashTable.H
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::wordPairHashTable
+
+Description
+    HashTable of Pair<word>
+
+Typedef
+    Foam::wordPairHashTable
+
+Description
+    HashTable of Pair<word>
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef wordPairHashTable_H
+#define wordPairHashTable_H
+
+#include "Pair.H"
+#include "HashTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef HashTable<word, Pair<word>, FixedList<word, 2>::Hash<> >
+        wordPairHashTable;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
index 364a6aae49..3f74c035aa 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +31,7 @@ License
 Foam::snapParameters::snapParameters(const dictionary& dict)
 :
     nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
+    nSmoothInternal_(dict.lookupOrDefault("nSmoothInternal", 0)),
     snapTol_(readScalar(dict.lookup("tolerance"))),
     nSmoothDispl_(readLabel(dict.lookup("nSolveIter"))),
     nSnap_(readLabel(dict.lookup("nRelaxIter"))),
@@ -44,7 +45,22 @@ Foam::snapParameters::snapParameters(const dictionary& dict)
     detectNearSurfacesSnap_
     (
         dict.lookupOrDefault("detectNearSurfacesSnap", true)
-    )
+    ),
+    strictRegionSnap_
+    (
+        dict.lookupOrDefault("strictRegionSnap", false)
+    ),
+    detectBaffles_(dict.lookupOrDefault("detectBaffles", true)),
+    baffleFeaturePoints_(dict.lookupOrDefault("baffleFeaturePoints", false)),
+    releasePoints_(dict.lookupOrDefault("releasePoints", false)),
+    stringFeatures_(dict.lookupOrDefault("stringFeatures", true)),
+    avoidDiagonal_(dict.lookupOrDefault("avoidDiagonal", false)),
+    nFaceSplitInterval_
+    (
+        dict.lookupOrDefault("nFaceSplitInterval", labelMin)
+    ),
+    concaveAngle_(dict.lookupOrDefault("concaveAngle", 45)),
+    minAreaRatio_(dict.lookupOrDefault("minAreaRatio", 0.3))
 {}
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
index 5dc4ca34e8..26982ea79d 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,10 +44,8 @@ SourceFiles
 namespace Foam
 {
 
-// Class forward declarations
-
 /*---------------------------------------------------------------------------*\
-                           Class snapParameters Declaration
+                       Class snapParameters Declaration
 \*---------------------------------------------------------------------------*/
 
 class snapParameters
@@ -56,6 +54,8 @@ class snapParameters
 
         const label nSmoothPatch_;
 
+        const label nSmoothInternal_;
+
         const scalar snapTol_;
 
         const label nSmoothDispl_;
@@ -72,6 +72,28 @@ class snapParameters
 
         const Switch detectNearSurfacesSnap_;
 
+        const Switch strictRegionSnap_;
+
+        const Switch detectBaffles_;
+
+        const Switch baffleFeaturePoints_;
+
+        const Switch releasePoints_;
+
+        const Switch stringFeatures_;
+
+        const Switch avoidDiagonal_;
+
+
+        //- How often needs face splitting be run
+        label nFaceSplitInterval_;
+
+        //- When is angle too concave too split
+        scalar concaveAngle_;
+
+        //- When is face-split not sufficiently diagonal
+        scalar minAreaRatio_;
+
 
     // Private Member Functions
 
@@ -101,6 +123,13 @@ public:
                 return nSmoothPatch_;
             }
 
+            //- Number of internal point smoothing iterations (combined with
+            //  nSmoothPatch
+            label nSmoothInternal() const
+            {
+                return nSmoothInternal_;
+            }
+
             //- Relative distance for points to be attracted by surface
             //  feature point
             //  or edge. True distance is this factor times local
@@ -123,30 +152,90 @@ public:
                 return nSnap_;
             }
 
-            label nFeatureSnap() const
-            {
-                return nFeatureSnap_;
-            }
 
-            Switch explicitFeatureSnap() const
-            {
-                return explicitFeatureSnap_;
-            }
+            // Surface snapping specific
+
+                //- Override attraction to nearest with intersection location
+                //  at near surfaces
+                Switch detectNearSurfacesSnap() const
+                {
+                    return detectNearSurfacesSnap_;
+                }
+
+                //- Attract point to corresponding surface region only
+                Switch strictRegionSnap() const
+                {
+                    return strictRegionSnap_;
+                }
+
+
+            // Feature edge snapping specific
+
+                label nFeatureSnap() const
+                {
+                    return nFeatureSnap_;
+                }
+
+                Switch explicitFeatureSnap() const
+                {
+                    return explicitFeatureSnap_;
+                }
+
+                Switch implicitFeatureSnap() const
+                {
+                    return implicitFeatureSnap_;
+                }
+
+                Switch multiRegionFeatureSnap() const
+                {
+                    return multiRegionFeatureSnap_;
+                }
+
+                Switch detectBaffles() const
+                {
+                    return detectBaffles_;
+                }
+
+                Switch baffleFeaturePoints() const
+                {
+                    return baffleFeaturePoints_;
+                }
+
+                Switch releasePoints() const
+                {
+                    return releasePoints_;
+                }
+
+                Switch stringFeatures() const
+                {
+                    return stringFeatures_;
+                }
+
+                Switch avoidDiagonal() const
+                {
+                    return avoidDiagonal_;
+                }
+
+
+                // Face splitting
+
+                    label nFaceSplitInterval() const
+                    {
+                        return nFaceSplitInterval_;
+                    }
+
+                    scalar concaveAngle() const
+                    {
+                        return concaveAngle_;
+                    }
+
+                    scalar minAreaRatio() const
+                    {
+                        return minAreaRatio_;
+                    }
 
-            Switch implicitFeatureSnap() const
-            {
-                return implicitFeatureSnap_;
-            }
 
-            Switch multiRegionFeatureSnap() const
-            {
-                return multiRegionFeatureSnap_;
-            }
 
-            Switch detectNearSurfacesSnap() const
-            {
-                return detectNearSurfacesSnap_;
-            }
 
 };
 
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
index 84d212e425..d44bc26597 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,9 +42,6 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::displacementMeshMoverMotionSolver::displacementMeshMoverMotionSolver
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
index 273f5fc301..26a5be3aa8 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,8 +25,8 @@ Class
     Foam::displacementMeshMoverMotionSolver
 
 Description
-    Mesh motion solver for an fvMesh.  Based on solving the cell-centre
-    Laplacian for the motion displacement.
+    Mesh motion solver for an fvMesh. Uses externalDisplacementMeshMover
+    to do the mesh motion.
 
 SourceFiles
     displacementMeshMoverMotionSolver.C
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
new file mode 100644
index 0000000000..f58ea3306f
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
@@ -0,0 +1,313 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "displacementMotionSolverMeshMover.H"
+#include "addToRunTimeSelectionTable.H"
+#include "pointConstraints.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(displacementMotionSolverMeshMover, 1);
+
+    addToRunTimeSelectionTable
+    (
+        externalDisplacementMeshMover,
+        displacementMotionSolverMeshMover,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::displacementMotionSolverMeshMover::moveMesh
+(
+    const dictionary& moveDict,
+    const label nAllowableErrors,
+    labelList& checkFaces
+)
+{
+    const label nRelaxIter = readLabel(moveDict.lookup("nRelaxIter"));
+
+    meshMover_.setDisplacementPatchFields();
+
+    Info<< typeName << " : Moving mesh ..." << endl;
+
+    scalar oldErrorReduction = -1;
+
+    bool meshOk = false;
+
+    for (label iter = 0; iter < 2*nRelaxIter; ++ iter)
+    {
+        Info<< typeName << " : Iteration " << iter << endl;
+
+        if (iter == nRelaxIter)
+        {
+            Info<< typeName
+                << " : Displacement scaling for error reduction set to 0."
+                << endl;
+            oldErrorReduction = meshMover_.setErrorReduction(0.0);
+        }
+
+        if
+        (
+            meshMover_.scaleMesh
+            (
+                checkFaces,
+                baffles_,
+                meshMover_.paramDict(),
+                moveDict,
+                true,
+                nAllowableErrors
+            )
+        )
+        {
+            Info<< typeName << " : Successfully moved mesh" << endl;
+            meshOk = true;
+            break;
+        }
+    }
+
+    if (oldErrorReduction >= 0)
+    {
+        meshMover_.setErrorReduction(oldErrorReduction);
+    }
+
+    Info<< typeName << " : Finished moving mesh ..." << endl;
+
+    return meshOk;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::displacementMotionSolverMeshMover::displacementMotionSolverMeshMover
+(
+    const dictionary& dict,
+    const List<labelPair>& baffles,
+    pointVectorField& pointDisplacement
+)
+:
+    externalDisplacementMeshMover(dict, baffles, pointDisplacement),
+
+    solverPtr_
+    (
+        displacementMotionSolver::New
+        (
+            dict.lookup("solver"),
+            pointDisplacement.mesh()(),
+            IOdictionary
+            (
+                IOobject
+                (
+                    "motionSolverDict",
+                    pointDisplacement.mesh().time().constant(),
+                    pointDisplacement.db(),
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                dict
+            ),
+            pointDisplacement,
+            pointIOField
+            (
+                IOobject
+                (
+                    "points0",
+                    pointDisplacement.mesh().time().constant(),
+                    pointDisplacement.db(),
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                pointDisplacement.mesh()().points()
+            )
+        )
+    ),
+
+    adaptPatchIDs_(getFixedValueBCs(pointDisplacement)),
+    adaptPatchPtr_(getPatch(mesh(), adaptPatchIDs_)),
+
+    scale_
+    (
+        IOobject
+        (
+            "scale",
+            pointDisplacement.time().timeName(),
+            pointDisplacement.db(),
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        pMesh(),
+        dimensionedScalar("scale", dimless, 1.0)
+    ),
+
+    oldPoints_(mesh().points()),
+
+    meshMover_
+    (
+        const_cast<polyMesh&>(mesh()),
+        const_cast<pointMesh&>(pMesh()),
+        adaptPatchPtr_(),
+        pointDisplacement,
+        scale_,
+        oldPoints_,
+        adaptPatchIDs_,
+        dict
+    ),
+
+    fieldSmoother_(mesh())
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::displacementMotionSolverMeshMover::~displacementMotionSolverMeshMover()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+bool Foam::displacementMotionSolverMeshMover::move
+(
+    const dictionary& moveDict,
+    const label nAllowableErrors,
+    labelList& checkFaces
+)
+{
+    // Correct and smooth the patch displacements so points next to
+    // points where the extrusion was disabled also use less extrusion.
+    // Note that this has to update the pointDisplacement boundary conditions
+    // as well, not just the internal field.
+    {
+        const label nSmoothPatchThickness = readLabel
+        (
+            moveDict.lookup("nSmoothThickness")
+        );
+
+        const word minThicknessName = word(moveDict.lookup("minThicknessName"));
+
+        scalarField zeroMinThickness;
+
+        if (minThicknessName == "none")
+        {
+            zeroMinThickness = scalarField(adaptPatchPtr_().nPoints(), 0.0);
+        }
+
+        const scalarField& minThickness =
+        (
+            (minThicknessName == "none")
+          ? zeroMinThickness
+          : mesh().lookupObject<scalarField>(minThicknessName)
+        );
+
+        const PackedBoolList isPatchMasterPoint
+        (
+            meshRefinement::getMasterPoints
+            (
+                mesh(),
+                adaptPatchPtr_().meshPoints()
+            )
+        );
+
+        const PackedBoolList isPatchMasterEdge
+        (
+            meshRefinement::getMasterEdges
+            (
+                mesh(),
+                adaptPatchPtr_().meshEdges
+                (
+                    mesh().edges(),
+                    mesh().pointEdges()
+                )
+            )
+        );
+
+        // Smooth patch displacement
+
+        vectorField displacement
+        (
+            pointDisplacement().internalField(),
+            adaptPatchPtr_().meshPoints()
+        );
+
+        fieldSmoother_.minSmoothField
+        (
+            nSmoothPatchThickness,
+            isPatchMasterPoint,
+            isPatchMasterEdge,
+            adaptPatchPtr_(),
+            minThickness,
+            displacement
+        );
+
+
+        scalar resid = 0;
+
+        forAll(displacement, patchPointI)
+        {
+            const label pointI(adaptPatchPtr_().meshPoints()[patchPointI]);
+
+            resid += mag(pointDisplacement()[pointI]-displacement[patchPointI]);
+
+            pointDisplacement()[pointI] = displacement[patchPointI];
+        }
+
+        // Take over smoothed displacements on bcs
+        meshMover_.setDisplacementPatchFields();
+    }
+
+    // Use motionSolver to calculate internal displacement
+    {
+        solverPtr_->pointDisplacement() == pointDisplacement();
+        // Force solving and constraining - just so its pointDisplacement gets
+        // the correct value
+        (void)solverPtr_->newPoints();
+        pointDisplacement() == solverPtr_->pointDisplacement();
+    }
+
+    return moveMesh(moveDict, nAllowableErrors, checkFaces);
+}
+
+
+void Foam::displacementMotionSolverMeshMover::movePoints(const pointField& p)
+{
+    externalDisplacementMeshMover::movePoints(p);
+
+    // Update motion solver for new geometry
+    solverPtr_->movePoints(p);
+
+    // Update motionSmoother for new geometry (moves adaptPatchPtr_)
+    meshMover_.movePoints();
+
+    // Assume current mesh location is correct (reset oldPoints, scale)
+    meshMover_.correct();
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H
new file mode 100644
index 0000000000..e7449d16cd
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify i
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::displacementMotionSolverMeshMover
+
+Description
+    Quality-based under-relaxation wrapped around generic
+    displacementMotionSolver.
+
+    Example of use in layer settings in snappyHexMeshDict:
+    \verbatim
+    meshShrinker displacementMotionSolver;
+    solver displacementLaplacian;
+    displacementLaplacianCoeffs
+    {
+        diffusivity quadratic inverseDistance 1(wall);
+    }
+    \endverbatim
+
+SourceFiles
+    displacementMotionSolverMeshMover.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef displacementMotionSolverMeshMover_H
+#define displacementMotionSolverMeshMover_H
+
+#include "externalDisplacementMeshMover.H"
+#include "displacementMotionSolver.H"
+#include "motionSmootherAlgo.H"
+#include "fieldSmoother.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+              Class displacementMotionSolverMeshMover Declaration
+\*---------------------------------------------------------------------------*/
+
+class displacementMotionSolverMeshMover
+:
+    public externalDisplacementMeshMover
+{
+    // Private Data
+
+        //- Mesh motion solver
+        autoPtr<displacementMotionSolver> solverPtr_;
+
+        //- IDs of fixedValue patches that we can modify
+        const labelList adaptPatchIDs_;
+
+        //- Combined indirect fixedValue patches that we can modify
+        autoPtr<indirectPrimitivePatch> adaptPatchPtr_;
+
+        //- Scale factor for displacemen
+        pointScalarField scale_;
+
+        //- Old point field
+        pointField oldPoints_;
+
+        //- Mesh mover algorithm
+        motionSmootherAlgo meshMover_;
+
+        //- Field smoothing
+        fieldSmoother fieldSmoother_;
+
+
+    // Private Member Functions
+
+        //- Apply the mesh mover algorithm
+        bool moveMesh
+        (
+            const dictionary& moveDict,
+            const label nAllowableErrors,
+            labelList& checkFaces
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("displacementMotionSolver");
+
+
+    // Constructors
+
+        //- Construct from a polyMesh and an IOdictionary
+        displacementMotionSolverMeshMover
+        (
+            const dictionary& dict,
+            const List<labelPair>& baffles,
+            pointVectorField& pointDisplacemen
+        );
+
+
+    //- Destructor
+    virtual ~displacementMotionSolverMeshMover();
+
+
+    // Member Functions
+
+        //- Move mesh using current pointDisplacement boundary values.
+        //  Return true if succesful (errors on checkFaces less than
+        //  allowable). Updates pointDisplacement.
+        virtual bool move
+        (
+            const dictionary&,
+            const label nAllowableErrors,
+            labelList& checkFaces
+        );
+
+        //- Update local data for geometry changes
+        virtual void movePoints(const pointField&);
+
+        //-  Update local data for topology changes
+        virtual void updateMesh(const mapPolyMesh&)
+        {
+            NotImplemented;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
index 2067b24cac..dbd827bdfe 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
 
 #include "externalDisplacementMeshMover.H"
 #include "mapPolyMesh.H"
+#include "zeroFixedValuePointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -35,6 +36,84 @@ namespace Foam
 }
 
 
+// * * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * //
+
+Foam::labelList Foam::externalDisplacementMeshMover::getFixedValueBCs
+(
+    const pointVectorField& field
+)
+{
+    DynamicList<label> adaptPatchIDs;
+
+    forAll(field.boundaryField(), patchI)
+    {
+        const pointPatchField<vector>& patchField =
+            field.boundaryField()[patchI];
+
+        if (isA<valuePointPatchField<vector> >(patchField))
+        {
+            if (isA<zeroFixedValuePointPatchField<vector> >(patchField))
+            {
+                // Special condition of fixed boundary condition. Does not
+                // get adapted
+            }
+            else
+            {
+                adaptPatchIDs.append(patchI);
+            }
+        }
+    }
+
+    return adaptPatchIDs;
+}
+
+
+Foam::autoPtr<Foam::indirectPrimitivePatch>
+Foam::externalDisplacementMeshMover::getPatch
+(
+    const polyMesh& mesh,
+    const labelList& patchIDs
+)
+{
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    // Count faces.
+    label nFaces = 0;
+
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = patches[patchIDs[i]];
+
+        nFaces += pp.size();
+    }
+
+    // Collect faces.
+    labelList addressing(nFaces);
+    nFaces = 0;
+
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = patches[patchIDs[i]];
+
+        label meshFaceI = pp.start();
+
+        forAll(pp, i)
+        {
+            addressing[nFaces++] = meshFaceI++;
+        }
+    }
+
+    return autoPtr<indirectPrimitivePatch>
+    (
+        new indirectPrimitivePatch
+        (
+            IndirectList<face>(mesh.faces(), addressing),
+            mesh.points()
+        )
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::externalDisplacementMeshMover::externalDisplacementMeshMover
@@ -67,12 +146,8 @@ Foam::externalDisplacementMeshMover::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "externalDisplacementMeshMover::New(const word&"
-            ", pointVectorField&, const List<labelPair>&"
-            ", const dictionary&)"
-        )   << "Unknown externalDisplacementMeshMover type "
+        FatalErrorInFunction
+            << "Unknown externalDisplacementMeshMover type "
             << type << nl << nl
             << "Valid externalDisplacementMeshMover types:" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
index 9d98b435b8..d37a2bb9f2 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,6 +67,19 @@ protected:
         pointVectorField& pointDisplacement_;
 
 
+    // Protected Member functions
+
+        //- Extract fixed-value patchfields
+        static labelList getFixedValueBCs(const pointVectorField&);
+
+        //- Construct patch on selected patches
+        static autoPtr<indirectPrimitivePatch> getPatch
+        (
+            const polyMesh&,
+            const labelList&
+        );
+
+
 private:
 
     // Private Member Functions
@@ -80,6 +93,7 @@ private:
         //- Disallow default bitwise assignment
         void operator=(const externalDisplacementMeshMover&);
 
+
 public:
 
     //- Runtime type information
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.C
new file mode 100644
index 0000000000..d80a7865ac
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.C
@@ -0,0 +1,299 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fieldSmoother.H"
+#include "pointFields.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(fieldSmoother, 0);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fieldSmoother::fieldSmoother(const polyMesh& mesh)
+:
+    mesh_(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fieldSmoother::~fieldSmoother()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::fieldSmoother::smoothNormals
+(
+    const label nIter,
+    const PackedBoolList& isMeshMasterPoint,
+    const PackedBoolList& isMeshMasterEdge,
+    const labelList& fixedPoints,
+    pointVectorField& normals
+) const
+{
+    // Get smoothly varying internal normals field.
+    Info<< typeName
+        << " : Smoothing normals in interior ..." << endl;
+
+    const edgeList& edges = mesh_.edges();
+
+    // Points that do not change.
+    PackedBoolList isFixedPoint(mesh_.nPoints());
+
+    // Internal points that are fixed
+    forAll(fixedPoints, i)
+    {
+        label meshPointI = fixedPoints[i];
+        isFixedPoint.set(meshPointI, 1);
+    }
+
+    // Make sure that points that are coupled to meshPoints but not on a patch
+    // are fixed as well
+    syncTools::syncPointList(mesh_, isFixedPoint, maxEqOp<unsigned int>(), 0);
+
+
+    // Correspondence between local edges/points and mesh edges/points
+    const labelList meshPoints(identity(mesh_.nPoints()));
+
+    // Calculate inverse sum of weights
+
+    scalarField edgeWeights(mesh_.nEdges());
+    scalarField invSumWeight(meshPoints.size());
+    meshRefinement::calculateEdgeWeights
+    (
+        mesh_,
+        isMeshMasterEdge,
+        meshPoints,
+        edges,
+        edgeWeights,
+        invSumWeight
+    );
+
+    vectorField average;
+    for (label iter = 0; iter < nIter; iter++)
+    {
+        meshRefinement::weightedSum
+        (
+            mesh_,
+            isMeshMasterEdge,
+            meshPoints,
+            edges,
+            edgeWeights,
+            normals,
+            average
+        );
+        average *= invSumWeight;
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            scalar resid = meshRefinement::gAverage
+            (
+                isMeshMasterPoint,
+                mag(normals-average)()
+            );
+            Info<< "    Iteration " << iter << "   residual " << resid << endl;
+        }
+
+        // Transfer to normals vector field
+        forAll(average, pointI)
+        {
+            if (isFixedPoint.get(pointI) == 0)
+            {
+                //full smoothing neighbours + point value
+                average[pointI] = 0.5*(normals[pointI]+average[pointI]);
+                normals[pointI] = average[pointI];
+                normals[pointI] /= mag(normals[pointI]) + VSMALL;
+            }
+        }
+    }
+}
+
+
+void Foam::fieldSmoother::smoothPatchNormals
+(
+    const label nIter,
+    const PackedBoolList& isPatchMasterPoint,
+    const PackedBoolList& isPatchMasterEdge,
+    const indirectPrimitivePatch& adaptPatch,
+    pointField& normals
+) const
+{
+    const edgeList& edges = adaptPatch.edges();
+    const labelList& meshPoints = adaptPatch.meshPoints();
+
+    // Get smoothly varying internal normals field.
+    Info<< typeName << " : Smoothing normals ..." << endl;
+
+    scalarField edgeWeights(edges.size());
+    scalarField invSumWeight(meshPoints.size());
+    meshRefinement::calculateEdgeWeights
+    (
+        mesh_,
+        isPatchMasterEdge,
+        meshPoints,
+        edges,
+        edgeWeights,
+        invSumWeight
+    );
+
+
+    vectorField average;
+    for (label iter = 0; iter < nIter; iter++)
+    {
+        meshRefinement::weightedSum
+        (
+            mesh_,
+            isPatchMasterEdge,
+            meshPoints,
+            edges,
+            edgeWeights,
+            normals,
+            average
+        );
+        average *= invSumWeight;
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            scalar resid = meshRefinement::gAverage
+            (
+                isPatchMasterPoint,
+                mag(normals-average)()
+            );
+            Info<< "    Iteration " << iter << "   residual " << resid << endl;
+        }
+
+        // Transfer to normals vector field
+        forAll(average, pointI)
+        {
+            // full smoothing neighbours + point value
+            average[pointI] = 0.5*(normals[pointI]+average[pointI]);
+            normals[pointI] = average[pointI];
+            normals[pointI] /= mag(normals[pointI]) + VSMALL;
+        }
+    }
+}
+
+
+void Foam::fieldSmoother::smoothLambdaMuDisplacement
+(
+    const label nIter,
+    const PackedBoolList& isMeshMasterPoint,
+    const PackedBoolList& isMeshMasterEdge,
+    const PackedBoolList& isToBeSmoothed,
+    vectorField& displacement
+) const
+{
+    const edgeList& edges = mesh_.edges();
+
+    // Correspondence between local edges/points and mesh edges/points
+    const labelList meshPoints(identity(mesh_.nPoints()));
+
+    // Calculate inverse sum of weights
+    scalarField edgeWeights(mesh_.nEdges());
+    scalarField invSumWeight(meshPoints.size());
+    meshRefinement::calculateEdgeWeights
+    (
+        mesh_,
+        isMeshMasterEdge,
+        meshPoints,
+        edges,
+        edgeWeights,
+        invSumWeight
+    );
+
+    // Get smoothly varying patch field.
+    Info<< typeName << " : Smoothing displacement ..." << endl;
+
+    const scalar lambda = 0.33;
+    const scalar mu = -0.34;
+
+    vectorField average;
+
+    for (label iter = 0; iter < nIter; iter++)
+    {
+        meshRefinement::weightedSum
+        (
+            mesh_,
+            isMeshMasterEdge,
+            meshPoints,
+            edges,
+            edgeWeights,
+            displacement,
+            average
+        );
+        average *= invSumWeight;
+
+        forAll(displacement, i)
+        {
+            if (isToBeSmoothed[i])
+            {
+                displacement[i] = (1-lambda)*displacement[i]+lambda*average[i];
+            }
+        }
+
+        meshRefinement::weightedSum
+        (
+            mesh_,
+            isMeshMasterEdge,
+            meshPoints,
+            edges,
+            edgeWeights,
+            displacement,
+            average
+        );
+        average *= invSumWeight;
+
+
+        forAll(displacement, i)
+        {
+            if (isToBeSmoothed[i])
+            {
+                displacement[i] = (1-mu)*displacement[i]+mu*average[i];
+            }
+        }
+
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            scalar resid = meshRefinement::gAverage
+            (
+                isMeshMasterPoint,
+                mag(displacement-average)()
+            );
+            Info<< "    Iteration " << iter << "   residual " << resid << endl;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H
new file mode 100644
index 0000000000..bb379f76a3
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmoother.H
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fieldSmoother
+
+Description
+    Utility functions for mesh motion solvers
+
+SourceFiles
+    fieldSmoother.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fieldSmoother_H
+#define fieldSmoother_H
+
+#include "meshRefinement.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class fieldSmoother Declaration
+\*---------------------------------------------------------------------------*/
+
+class fieldSmoother
+{
+    // Private data
+
+        //- Reference to the poly mesh
+        const polyMesh& mesh_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        fieldSmoother(const fieldSmoother&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const fieldSmoother&);
+
+
+public:
+
+    // Run-time type information
+    TypeName("fieldSmoother");
+
+
+    // Constructors
+
+        //- Construct from a polyMesh
+        fieldSmoother(const polyMesh&);
+
+
+    //- Destructor
+    virtual ~fieldSmoother();
+
+
+    // Member Functions
+
+        //- Smooth interior normals
+        void smoothNormals
+        (
+            const label nIter,
+            const PackedBoolList& isMeshMasterPoint,
+            const PackedBoolList& isMeshMasterEdge,
+            const labelList& fixedPoints,
+            pointVectorField& normals
+        ) const;
+
+        //- Smooth patch normals
+        void smoothPatchNormals
+        (
+            const label nIter,
+            const PackedBoolList& isPatchMasterPoint,
+            const PackedBoolList& isPatchMasterEdge,
+            const indirectPrimitivePatch& adaptPatch,
+            pointField& normals
+        ) const;
+
+        //- Smooth a scalar field towards, but not beyond, a minimum value
+        template <class Type>
+        void minSmoothField
+        (
+            const label nIter,
+            const PackedBoolList& isPatchMasterPoint,
+            const PackedBoolList& isPatchMasterEdge,
+            const indirectPrimitivePatch& adaptPatch,
+            const scalarField& fieldMin,
+            Field<Type>& field
+        ) const;
+
+        //- Smooth and then un-smooth a displacement
+        void smoothLambdaMuDisplacement
+        (
+            const label nIter,
+            const PackedBoolList& isMeshMasterPoint,
+            const PackedBoolList& isMeshMasterEdge,
+            const PackedBoolList& isSmoothable,
+            vectorField& displacement
+        ) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "fieldSmootherTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmootherTemplates.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmootherTemplates.C
new file mode 100644
index 0000000000..be2f2cfd0b
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/fieldSmoother/fieldSmootherTemplates.C
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template <class Type>
+void Foam::fieldSmoother::minSmoothField
+(
+    const label nIter,
+    const PackedBoolList& isPatchMasterPoint,
+    const PackedBoolList& isPatchMasterEdge,
+    const indirectPrimitivePatch& adaptPatch,
+    const scalarField& fieldMinMag,
+    Field<Type>& field
+) const
+{
+    const edgeList& edges = adaptPatch.edges();
+    const labelList& meshPoints = adaptPatch.meshPoints();
+
+    scalarField edgeWeights(edges.size());
+    scalarField invSumWeight(meshPoints.size());
+    meshRefinement::calculateEdgeWeights
+    (
+        mesh_,
+        isPatchMasterEdge,
+        meshPoints,
+        edges,
+        edgeWeights,
+        invSumWeight
+    );
+
+    // Get smoothly varying patch field.
+    Info<< typeName << " : Smoothing field ..." << endl;
+
+    for (label iter = 0; iter < nIter; iter++)
+    {
+        Field<Type> average(adaptPatch.nPoints());
+        meshRefinement::weightedSum
+        (
+            mesh_,
+            isPatchMasterEdge,
+            meshPoints,
+            edges,
+            edgeWeights,
+            field,
+            average
+        );
+        average *= invSumWeight;
+
+        // Transfer to field
+        forAll(field, pointI)
+        {
+            //full smoothing neighbours + point value
+            average[pointI] = 0.5*(field[pointI]+average[pointI]);
+
+            // perform monotonic smoothing
+            if
+            (
+                mag(average[pointI]) < mag(field[pointI])
+             && mag(average[pointI]) >= mag(fieldMinMag[pointI])
+            )
+            {
+                field[pointI] = average[pointI];
+            }
+        }
+
+        // Do residual calculation every so often.
+        if ((iter % 10) == 0)
+        {
+            scalar resid = meshRefinement::gAverage
+            (
+                isPatchMasterPoint,
+                mag(field-average)()
+            );
+            Info<< "    Iteration " << iter << "   residual " << resid << endl;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index df17b0ece4..8c47360d37 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 #include "unitConversion.H"
 #include "PatchTools.H"
 #include "OBJstream.H"
-#include "pointData.H"
+#include "PointData.H"
 #include "zeroFixedValuePointPatchFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -52,241 +52,11 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::labelList Foam::medialAxisMeshMover::getFixedValueBCs
-(
-    const pointVectorField& fld
-)
-{
-    DynamicList<label> adaptPatchIDs;
-    forAll(fld.boundaryField(), patchI)
-    {
-        const pointPatchField<vector>& patchFld =
-            fld.boundaryField()[patchI];
-
-        if (isA<valuePointPatchField<vector> >(patchFld))
-        {
-            if (isA<zeroFixedValuePointPatchField<vector> >(patchFld))
-            {
-                // Special condition of fixed boundary condition. Does not
-                // get adapted
-            }
-            else
-            {
-                adaptPatchIDs.append(patchI);
-            }
-        }
-    }
-    return adaptPatchIDs;
-}
-
-
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::medialAxisMeshMover::getPatch
-(
-    const polyMesh& mesh,
-    const labelList& patchIDs
-)
-{
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    // Count faces.
-    label nFaces = 0;
-
-    forAll(patchIDs, i)
-    {
-        const polyPatch& pp = patches[patchIDs[i]];
-
-        nFaces += pp.size();
-    }
-
-    // Collect faces.
-    labelList addressing(nFaces);
-    nFaces = 0;
-
-    forAll(patchIDs, i)
-    {
-        const polyPatch& pp = patches[patchIDs[i]];
-
-        label meshFaceI = pp.start();
-
-        forAll(pp, i)
-        {
-            addressing[nFaces++] = meshFaceI++;
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>
-    (
-        new indirectPrimitivePatch
-        (
-            IndirectList<face>(mesh.faces(), addressing),
-            mesh.points()
-        )
-    );
-}
-
-
-void Foam::medialAxisMeshMover::smoothPatchNormals
-(
-    const label nSmoothDisp,
-    const PackedBoolList& isPatchMasterPoint,
-    const PackedBoolList& isPatchMasterEdge,
-    pointField& normals
-) const
-{
-    const indirectPrimitivePatch& pp = adaptPatchPtr_();
-    const edgeList& edges = pp.edges();
-    const labelList& meshPoints = pp.meshPoints();
-
-    // Get smoothly varying internal normals field.
-    Info<< typeName << " : Smoothing normals ..." << endl;
-
-    scalarField edgeWeights(edges.size());
-    scalarField invSumWeight(meshPoints.size());
-    meshRefinement::calculateEdgeWeights
-    (
-        mesh(),
-        isPatchMasterEdge,
-        meshPoints,
-        edges,
-        edgeWeights,
-        invSumWeight
-    );
-
-
-    vectorField average;
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        meshRefinement::weightedSum
-        (
-            mesh(),
-            isPatchMasterEdge,
-            meshPoints,
-            edges,
-            edgeWeights,
-            normals,
-            average
-        );
-        average *= invSumWeight;
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                isPatchMasterPoint,
-                mag(normals-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-
-        // Transfer to normals vector field
-        forAll(average, pointI)
-        {
-            // full smoothing neighbours + point value
-            average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-            normals[pointI] = average[pointI];
-            normals[pointI] /= mag(normals[pointI]) + VSMALL;
-        }
-    }
-}
-
-
-// Smooth normals in interior.
-void Foam::medialAxisMeshMover::smoothNormals
-(
-    const label nSmoothDisp,
-    const PackedBoolList& isMeshMasterPoint,
-    const PackedBoolList& isMeshMasterEdge,
-    const labelList& fixedPoints,
-    pointVectorField& normals
-) const
-{
-    // Get smoothly varying internal normals field.
-    Info<< typeName
-        << " : Smoothing normals in interior ..." << endl;
-
-    const edgeList& edges = mesh().edges();
-
-    // Points that do not change.
-    PackedBoolList isFixedPoint(mesh().nPoints());
-
-    // Internal points that are fixed
-    forAll(fixedPoints, i)
-    {
-        label meshPointI = fixedPoints[i];
-        isFixedPoint.set(meshPointI, 1);
-    }
-
-    // Make sure that points that are coupled to meshPoints but not on a patch
-    // are fixed as well
-    syncTools::syncPointList(mesh(), isFixedPoint, maxEqOp<unsigned int>(), 0);
-
-
-    // Correspondence between local edges/points and mesh edges/points
-    const labelList meshPoints(identity(mesh().nPoints()));
-
-    // Calculate inverse sum of weights
-
-    scalarField edgeWeights(mesh().nEdges());
-    scalarField invSumWeight(meshPoints.size());
-    meshRefinement::calculateEdgeWeights
-    (
-        mesh(),
-        isMeshMasterEdge,
-        meshPoints,
-        edges,
-        edgeWeights,
-        invSumWeight
-    );
-
-    vectorField average;
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        meshRefinement::weightedSum
-        (
-            mesh(),
-            isMeshMasterEdge,
-            meshPoints,
-            edges,
-            edgeWeights,
-            normals,
-            average
-        );
-        average *= invSumWeight;
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                isMeshMasterPoint,
-                mag(normals-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-
-
-        // Transfer to normals vector field
-        forAll(average, pointI)
-        {
-            if (isFixedPoint.get(pointI) == 0)
-            {
-                //full smoothing neighbours + point value
-                average[pointI] = 0.5*(normals[pointI]+average[pointI]);
-                normals[pointI] = average[pointI];
-                normals[pointI] /= mag(normals[pointI]) + VSMALL;
-            }
-        }
-    }
-}
-
-
 // Tries and find a medial axis point. Done by comparing vectors to nearest
 // wall point for both vertices of edge.
 bool Foam::medialAxisMeshMover::isMaxEdge
 (
-    const List<pointData>& pointWallDist,
+    const List<PointData<vector> >& pointWallDist,
     const label edgeI,
     const scalar minCos
 ) const
@@ -331,7 +101,7 @@ bool Foam::medialAxisMeshMover::isMaxEdge
     //- Detect based on extrusion vector differing for both endpoints
     //  the idea is that e.g. a sawtooth wall can still be extruded
     //  successfully as long as it is done all to the same direction.
-    if ((pointWallDist[e[0]].v() & pointWallDist[e[1]].v()) < minCos)
+    if ((pointWallDist[e[0]].data() & pointWallDist[e[1]].data()) < minCos)
     {
         return true;
     }
@@ -439,11 +209,12 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     pointField pointNormals(PatchTools::pointNormals(mesh(), pp));
 
     // Smooth patch normal vectors
-    smoothPatchNormals
+    fieldSmoother_.smoothPatchNormals
     (
         nSmoothSurfaceNormals,
         isPatchMasterPoint,
         isPatchMasterEdge,
+        pp,
         pointNormals
     );
 
@@ -452,7 +223,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Distance to wall
-    List<pointData> pointWallDist(mesh().nPoints());
+    List<PointData<vector> > pointWallDist(mesh().nPoints());
 
     // Dummy additional info for PointEdgeWave
     int dummyTrackData = 0;
@@ -461,23 +232,22 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     // 1. Calculate distance to points where displacement is specified.
     {
         // Seed data.
-        List<pointData> wallInfo(meshPoints.size());
+        List<PointData<vector> > wallInfo(meshPoints.size());
 
         forAll(meshPoints, patchPointI)
         {
             label pointI = meshPoints[patchPointI];
-            wallInfo[patchPointI] = pointData
+            wallInfo[patchPointI] = PointData<vector>
             (
                 points[pointI],
                 0.0,
-                pointI,                       // passive scalar
                 pointNormals[patchPointI]     // surface normals
             );
         }
 
         // Do all calculations
-        List<pointData> edgeWallDist(mesh().nEdges());
-        PointEdgeWave<pointData> wallDistCalc
+        List<PointData<vector> > edgeWallDist(mesh().nEdges());
+        PointEdgeWave<PointData<vector> > wallDistCalc
         (
             mesh(),
             meshPoints,
@@ -507,11 +277,8 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
             }
             else
             {
-                WarningIn
-                (
-                    "medialAxisMeshMover::"
-                    "medialAxisSmoothingInfo(..)"
-                )   << "Walking did not visit all points." << nl
+                WarningInFunction
+                    << "Walking did not visit all points." << nl
                     << "    Did not visit " << nUnvisit
                     << " out of " << mesh().globalData().nTotalPoints()
                     << " points. This is not necessarily a problem" << nl
@@ -525,11 +292,11 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     // 2. Find points with max distance and transport information back to
     //    wall.
     {
-        List<pointData> pointMedialDist(mesh().nPoints());
-        List<pointData> edgeMedialDist(mesh().nEdges());
+        List<pointEdgePoint> pointMedialDist(mesh().nPoints());
+        List<pointEdgePoint> edgeMedialDist(mesh().nEdges());
 
         // Seed point data.
-        DynamicList<pointData> maxInfo(meshPoints.size());
+        DynamicList<pointEdgePoint> maxInfo(meshPoints.size());
         DynamicList<label> maxPoints(meshPoints.size());
 
         // 1. Medial axis points
@@ -556,12 +323,10 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                         maxPoints.append(pointI);
                         maxInfo.append
                         (
-                            pointData
+                            pointEdgePoint
                             (
                                 points[pointI],
-                                0.0,
-                                pointI,         // passive data
-                                vector::zero    // passive data
+                                0.0
                             )
                         );
                         pointMedialDist[pointI] = maxInfo.last();
@@ -612,12 +377,10 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                             maxPoints.append(pointI);
                             maxInfo.append
                             (
-                                pointData
+                                pointEdgePoint
                                 (
                                     medialAxisPt,   //points[pointI],
-                                    magSqr(points[pointI]-medialAxisPt),//0.0,
-                                    pointI,         // passive data
-                                    vector::zero    // passive data
+                                    magSqr(points[pointI]-medialAxisPt)//0.0
                                 )
                             );
                             pointMedialDist[pointI] = maxInfo.last();
@@ -669,12 +432,10 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                             maxPoints.append(pointI);
                             maxInfo.append
                             (
-                                pointData
+                                pointEdgePoint
                                 (
                                     points[pointI],
-                                    0.0,
-                                    pointI,         // passive data
-                                    vector::zero    // passive data
+                                    0.0
                                 )
                             );
                             pointMedialDist[pointI] = maxInfo.last();
@@ -715,7 +476,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                             // Check if angle not too large.
                             scalar cosAngle =
                             (
-                               -pointWallDist[pointI].v()
+                               -pointWallDist[pointI].data()
                               & pointNormals[i]
                             );
                             if (cosAngle > slipFeatureAngleCos)
@@ -726,12 +487,10 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
                                 maxPoints.append(pointI);
                                 maxInfo.append
                                 (
-                                    pointData
+                                    pointEdgePoint
                                     (
                                         points[pointI],
-                                        0.0,
-                                        pointI,         // passive data
-                                        vector::zero    // passive data
+                                        0.0
                                     )
                                 );
                                 pointMedialDist[pointI] = maxInfo.last();
@@ -751,7 +510,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
         maxPoints.shrink();
 
         // Do all calculations
-        PointEdgeWave<pointData> medialDistCalc
+        PointEdgeWave<pointEdgePoint> medialDistCalc
         (
             mesh(),
             maxPoints,
@@ -794,12 +553,12 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
         }
         else
         {
-            dispVec_[i] = pointWallDist[i].v();
+            dispVec_[i] = pointWallDist[i].data();
         }
     }
 
     // Smooth normal vectors. Do not change normals on pp.meshPoints
-    smoothNormals
+    fieldSmoother_.smoothNormals
     (
         nSmoothNormals,
         isMeshMasterPoint,
@@ -1003,79 +762,6 @@ void Foam::medialAxisMeshMover::syncPatchDisplacement
 }
 
 
-void Foam::medialAxisMeshMover::minSmoothField
-(
-    const label nSmoothDisp,
-    const PackedBoolList& isPatchMasterPoint,
-    const PackedBoolList& isPatchMasterEdge,
-    const scalarField& fieldMin,
-    scalarField& field
-) const
-{
-    const indirectPrimitivePatch& pp = adaptPatchPtr_();
-    const edgeList& edges = pp.edges();
-    const labelList& meshPoints = pp.meshPoints();
-
-    scalarField edgeWeights(edges.size());
-    scalarField invSumWeight(meshPoints.size());
-    meshRefinement::calculateEdgeWeights
-    (
-        mesh(),
-        isPatchMasterEdge,
-        meshPoints,
-        edges,
-        edgeWeights,
-        invSumWeight
-    );
-
-    // Get smoothly varying patch field.
-    Info<< typeName << " : Smoothing field ..." << endl;
-
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        scalarField average(pp.nPoints());
-        meshRefinement::weightedSum
-        (
-            mesh(),
-            isPatchMasterEdge,
-            meshPoints,
-            edges,
-            edgeWeights,
-            field,
-            average
-        );
-        average *= invSumWeight;
-
-        // Transfer to field
-        forAll(field, pointI)
-        {
-            //full smoothing neighbours + point value
-            average[pointI] = 0.5*(field[pointI]+average[pointI]);
-
-            // perform monotonic smoothing
-            if
-            (
-                average[pointI] < field[pointI]
-             && average[pointI] >= fieldMin[pointI]
-            )
-            {
-                field[pointI] = average[pointI];
-            }
-        }
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                isPatchMasterPoint,
-                mag(field-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-    }
-}
-
 // Stop layer growth where mesh wraps around edge with a
 // large feature angle
 void Foam::medialAxisMeshMover::
@@ -1204,7 +890,8 @@ handleFeatureAngleLayerTerminations
 
     //Info<< "Added "
     //    << returnReduce(nPointCounter-nOldPointCounter, sumOp<label>())
-    //    << " point not to extrude." << endl;
+    //    << " point not to extrude due to minCos "
+    //    << minCos << endl;
 }
 
 
@@ -1226,47 +913,43 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
     const labelListList& pointFaces = pp.pointFaces();
     const labelList& meshPoints = pp.meshPoints();
 
-    Info<< typeName << " : Removing isolated regions ..." << endl;
+
+    Info<< typeName << " : Removing isolated regions ..." << nl
+        << indent << "- if partially extruded faces make angle < "
+        << Foam::radToDeg(Foam::acos(minCosLayerTermination)) <<  nl;
+    if (detectExtrusionIsland)
+    {
+        Info<< indent << "- if exclusively surrounded by non-extruded points"
+            << nl;
+    }
+    else
+    {
+        Info<< indent << "- if exclusively surrounded by non-extruded faces"
+            << nl;
+    }
 
     // Keep count of number of points unextruded
     label nPointCounter = 0;
 
-
-    autoPtr<OBJstream> str;
-    if (debug)
-    {
-        str.reset
-        (
-            new OBJstream
-            (
-                mesh().time().path()
-              / "islandExcludePoints_"
-              + mesh().time().timeName()
-              + ".obj"
-            )
-        );
-        Info<< typeName
-            << " : Writing points surrounded by non-extruded points to "
-            << str().name() << endl;
-    }
-
     while (true)
     {
         // Stop layer growth where mesh wraps around edge with a
         // large feature angle
-        handleFeatureAngleLayerTerminations
-        (
-            minCosLayerTermination,
-            isPatchMasterPoint,
-            meshEdges,
+        if (minCosLayerTermination > -1)
+        {
+            handleFeatureAngleLayerTerminations
+            (
+                minCosLayerTermination,
+                isPatchMasterPoint,
+                meshEdges,
 
-            extrudeStatus,
-            patchDisp,
-            nPointCounter
-        );
-
-        syncPatchDisplacement(minThickness, patchDisp, extrudeStatus);
+                extrudeStatus,
+                patchDisp,
+                nPointCounter
+            );
 
+            syncPatchDisplacement(minThickness, patchDisp, extrudeStatus);
+        }
 
 
         // Detect either:
@@ -1389,11 +1072,6 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
                 {
                     nPointCounter++;
                     nChanged++;
-
-                    if (str.valid())
-                    {
-                        str().write(pp.points()[meshPoints[patchPointI]]);
-                    }
                 }
             }
         }
@@ -1483,11 +1161,6 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
                     )
                     {
                         nPointCounter++;
-
-                        if (str.valid())
-                        {
-                            str().write(pp.points()[meshPoints[f[fp]]]);
-                        }
                     }
                 }
             }
@@ -1501,98 +1174,6 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
 }
 
 
-void Foam::medialAxisMeshMover::smoothLambdaMuDisplacement
-(
-    const label nSmoothDisp,
-    const PackedBoolList& isMeshMasterPoint,
-    const PackedBoolList& isMeshMasterEdge,
-    vectorField& displacement
-) const
-{
-    const edgeList& edges = mesh().edges();
-
-    // Correspondence between local edges/points and mesh edges/points
-    const labelList meshPoints(identity(mesh().nPoints()));
-
-    // Calculate inverse sum of weights
-    scalarField edgeWeights(mesh().nEdges());
-    scalarField invSumWeight(meshPoints.size());
-    meshRefinement::calculateEdgeWeights
-    (
-        mesh(),
-        isMeshMasterEdge,
-        meshPoints,
-        edges,
-        edgeWeights,
-        invSumWeight
-    );
-
-    // Get smoothly varying patch field.
-    Info<< typeName << " : Smoothing displacement ..." << endl;
-
-    const scalar lambda = 0.33;
-    const scalar mu = -0.34;
-
-    vectorField average;
-
-    for (label iter = 0; iter < nSmoothDisp; iter++)
-    {
-        meshRefinement::weightedSum
-        (
-            mesh(),
-            isMeshMasterEdge,
-            meshPoints,
-            edges,
-            edgeWeights,
-            displacement,
-            average
-        );
-        average *= invSumWeight;
-
-        forAll(displacement, i)
-        {
-            if (medialRatio_[i] > SMALL && medialRatio_[i] < 1-SMALL)
-            {
-                displacement[i] = (1-lambda)*displacement[i]+lambda*average[i];
-            }
-        }
-
-        meshRefinement::weightedSum
-        (
-            mesh(),
-            isMeshMasterEdge,
-            meshPoints,
-            edges,
-            edgeWeights,
-            displacement,
-            average
-        );
-        average *= invSumWeight;
-
-
-        forAll(displacement, i)
-        {
-            if (medialRatio_[i] > SMALL && medialRatio_[i] < 1-SMALL)
-            {
-                displacement[i] = (1-mu)*displacement[i]+mu*average[i];
-            }
-        }
-
-
-        // Do residual calculation every so often.
-        if ((iter % 10) == 0)
-        {
-            scalar resid = meshRefinement::gAverage
-            (
-                isMeshMasterPoint,
-                mag(displacement-average)()
-            );
-            Info<< "    Iteration " << iter << "   residual " << resid << endl;
-        }
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::medialAxisMeshMover::medialAxisMeshMover
@@ -1630,6 +1211,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
         adaptPatchIDs_,
         dict
     ),
+    fieldSmoother_(mesh()),
     dispVec_
     (
         IOobject
@@ -1733,10 +1315,12 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     const scalar featureAngle = readScalar(coeffDict.lookup("featureAngle"));
 
     //- Stop layer growth where mesh wraps around sharp edge
-    const scalar minCosLayerTermination = Foam::cos
+    scalar layerTerminationAngle = coeffDict.lookupOrDefault<scalar>
     (
-        degToRad(0.5*featureAngle)
+        "layerTerminationAngle",
+        0.5*featureAngle
     );
+    scalar minCosLayerTermination = Foam::cos(degToRad(layerTerminationAngle));
 
     //- Smoothing wanted patch thickness
     const label nSmoothPatchThickness = readLabel
@@ -1791,9 +1375,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     );
 
 
-    scalarField thickness(patchDisp.size());
-
-    thickness = mag(patchDisp);
+    scalarField thickness(mag(patchDisp));
 
     forAll(thickness, patchPointI)
     {
@@ -1860,7 +1442,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
             vector n =
                 patchDisp[patchPointI]
               / (mag(patchDisp[patchPointI]) + VSMALL);
-            vector mVec = mesh().points()[pointI]-medialVec_[pointI];
+            vector mVec = medialVec_[pointI]-mesh().points()[pointI];
             mVec /= mag(mVec)+VSMALL;
             thicknessRatio *= (n&mVec);
 
@@ -1947,14 +1529,17 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     }
 
 
-    // smooth layer thickness on moving patch
-    minSmoothField
+    // Smooth layer thickness on moving patch. Since some locations will have
+    // disabled the extrusion this might cause big jumps in wanted displacement
+    // for neighbouring patch points. So smooth the wanted displacement
+    // before actually trying to move the mesh.
+    fieldSmoother_.minSmoothField
     (
         nSmoothPatchThickness,
         isPatchMasterPoint,
         isPatchMasterEdge,
+        pp,
         minThickness,
-
         thickness
     );
 
@@ -1962,34 +1547,33 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     // Dummy additional info for PointEdgeWave
     int dummyTrackData = 0;
 
-    List<pointData> pointWallDist(mesh().nPoints());
+    List<PointData<scalar> > pointWallDist(mesh().nPoints());
 
     const pointField& points = mesh().points();
     // 1. Calculate distance to points where displacement is specified.
     // This wave is used to transport layer thickness
     {
         // Distance to wall and medial axis on edges.
-        List<pointData> edgeWallDist(mesh().nEdges());
+        List<PointData<scalar> > edgeWallDist(mesh().nEdges());
         labelList wallPoints(meshPoints.size());
 
         // Seed data.
-        List<pointData> wallInfo(meshPoints.size());
+        List<PointData<scalar> > wallInfo(meshPoints.size());
 
         forAll(meshPoints, patchPointI)
         {
             label pointI = meshPoints[patchPointI];
             wallPoints[patchPointI] = pointI;
-            wallInfo[patchPointI] = pointData
+            wallInfo[patchPointI] = PointData<scalar>
             (
                 points[pointI],
                 0.0,
-                thickness[patchPointI],       // transport layer thickness
-                vector::zero                  // passive vector
+                thickness[patchPointI]        // transport layer thickness
             );
         }
 
         // Do all calculations
-        PointEdgeWave<pointData> wallDistCalc
+        PointEdgeWave<PointData<scalar> > wallDistCalc
         (
             mesh(),
             wallPoints,
@@ -2016,12 +1600,12 @@ void Foam::medialAxisMeshMover::calculateDisplacement
         {
             // 1) displacement on nearest wall point, scaled by medialRatio
             //    (wall distance / medial distance)
-            // 2) pointWallDist[pointI].s() is layer thickness transported
+            // 2) pointWallDist[pointI].data() is layer thickness transported
             //    from closest wall point.
             // 3) shrink in opposite direction of addedPoints
             displacement[pointI] =
                 -medialRatio_[pointI]
-                *pointWallDist[pointI].s()
+                *pointWallDist[pointI].data()
                 *dispVec_[pointI];
         }
     }
@@ -2030,11 +1614,20 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     // Smear displacement away from fixed values (medialRatio=0 or 1)
     if (nSmoothDisplacement > 0)
     {
-        smoothLambdaMuDisplacement
+        PackedBoolList isToBeSmoothed(displacement.size(), false);
+
+        forAll(displacement, i)
+        {
+            isToBeSmoothed[i] =
+                medialRatio_[i] > SMALL && medialRatio_[i] < 1-SMALL;
+        }
+
+        fieldSmoother_.smoothLambdaMuDisplacement
         (
             nSmoothDisplacement,
             isMeshMasterPoint,
             isMeshMasterEdge,
+            isToBeSmoothed,
             displacement
         );
     }
@@ -2052,8 +1645,6 @@ bool Foam::medialAxisMeshMover::shrinkMesh
     const label nSnap  = readLabel(meshQualityDict.lookup("nRelaxIter"));
 
 
-
-
     // Make sure displacement boundary conditions is uptodate with
     // internal field
     meshMover_.setDisplacementPatchFields();
@@ -2119,14 +1710,6 @@ bool Foam::medialAxisMeshMover::move
     const word minThicknessName = word(moveDict.lookup("minThicknessName"));
 
 
-    // The points have moved so before calculation update
-    // the mesh and motionSolver accordingly
-    movePoints(mesh().points());
-    //
-    //// Update any point motion bcs (e.g. timevarying)
-    //pointDisplacement_.boundaryField().updateCoeffs();
-
-
     // Extract out patch-wise displacement
     const indirectPrimitivePatch& pp = adaptPatchPtr_();
 
@@ -2180,13 +1763,10 @@ void Foam::medialAxisMeshMover::movePoints(const pointField& p)
 {
     externalDisplacementMeshMover::movePoints(p);
 
-    // Update local data for new geometry
-    adaptPatchPtr_().movePoints(p);
-
-    // Update motionSmoother for new geometry
+    // Update motionSmoother for new geometry (moves adaptPatchPtr_)
     meshMover_.movePoints();
 
-    // Assume corrent mesh location is correct
+    // Assume corrent mesh location is correct (reset oldPoints, scale)
     meshMover_.correct();
 }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
index a060a04fe6..e958c3e911 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,10 +28,13 @@ Description
     Mesh motion solver that uses a medial axis algorithm to work
     out a fraction between the (nearest point on a) moving surface
     and the (nearest point on a) fixed surface.
+
     This fraction is then used to scale the motion. Use
     - fixedValue on all moving patches
     - zeroFixedValue on stationary patches
     - slip on all slipping patches
+    Note that the fixedValue boundary conditions might be changed by this
+    solver to enforce consistency and a valid resulting mesh.
 
 SourceFiles
     medialAxisMeshMover.C
@@ -44,13 +47,15 @@ SourceFiles
 #include "externalDisplacementMeshMover.H"
 #include "motionSmootherAlgo.H"
 #include "autoLayerDriver.H"
+#include "fieldSmoother.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class pointData;
+template <class DataType>
+class PointData;
 
 /*---------------------------------------------------------------------------*\
              Class medialAxisMeshMover Declaration
@@ -75,6 +80,9 @@ class medialAxisMeshMover
         //- Mesh mover algorithm
         motionSmootherAlgo meshMover_;
 
+        //- Field smoothing
+        fieldSmoother fieldSmoother_;
+
 
     // Pre-calculated medial axis information
 
@@ -95,45 +103,16 @@ class medialAxisMeshMover
 
     // Private Member Functions
 
-        //- Extract fixed-value patchfields
-        static labelList getFixedValueBCs(const pointVectorField&);
-
         //- Extract bc types. Replace fixedValue derivatives with fixedValue
         wordList getPatchFieldTypes(const pointVectorField& fld);
 
-        //- Construct patch on selected patches
-        static autoPtr<indirectPrimitivePatch> getPatch
-        (
-            const polyMesh&,
-            const labelList&
-        );
-
 
         // Calculation of medial axis information
 
-            //- Smooth normals on patch
-            void smoothPatchNormals
-            (
-                const label nSmoothDisp,
-                const PackedBoolList& isMasterPoint,
-                const PackedBoolList& isMasterEdge,
-                pointField& normals
-            ) const;
-
-            //- Smooth normals on interior
-            void smoothNormals
-            (
-                const label nSmoothDisp,
-                const PackedBoolList& isMasterPoint,
-                const PackedBoolList& isMasterEdge,
-                const labelList& fixedPoints,
-                pointVectorField& normals
-            ) const;
-
             //- Is mesh edge on a cusp of displacement
             bool isMaxEdge
             (
-                const List<pointData>& pointWallDist,
+                const List<PointData<vector> >& pointWallDist,
                 const label edgeI,
                 const scalar minCos
             ) const;
@@ -161,23 +140,6 @@ class medialAxisMeshMover
                 List<autoLayerDriver::extrudeMode>& extrudeStatus
             ) const;
 
-            void smoothLambdaMuDisplacement
-            (
-                const label nSmoothDisp,
-                const PackedBoolList& isMasterPoint,
-                const PackedBoolList& isMasterEdge,
-                vectorField& displacement
-            ) const;
-
-            void minSmoothField
-            (
-                const label nSmoothDisp,
-                const PackedBoolList& isMasterPoint,
-                const PackedBoolList& isMasterEdge,
-                const scalarField& fieldMin,
-                scalarField& field
-            ) const;
-
             //- Stop layer growth at feature edges
             void handleFeatureAngleLayerTerminations
             (
@@ -271,11 +233,7 @@ public:
         //-  Update local data for topology changes
         virtual void updateMesh(const mapPolyMesh&)
         {
-            notImplemented
-            (
-                "medialAxisMeshMover::updateMesh"
-                "(const mapPolyMesh&)"
-            );
+            NotImplemented;
         }
 
 };
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 2fc70109dd..f71860f4dd 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,7 +29,6 @@ License
 #include "surfaceMesh.H"
 #include "syncTools.H"
 #include "Time.H"
-#include "refinementHistory.H"
 #include "refinementSurfaces.H"
 #include "refinementFeatures.H"
 #include "decompositionMethod.H"
@@ -56,6 +55,8 @@ License
 #include "treeBoundBox.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fvMeshTools.H"
+#include "motionSmoother.H"
+#include "faceSet.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -133,7 +134,7 @@ void Foam::meshRefinement::calcNeighbourData
 
     if (neiLevel.size() != nBoundaryFaces || neiCc.size() != nBoundaryFaces)
     {
-        FatalErrorIn("meshRefinement::calcNeighbour(..)") << "nBoundaries:"
+        FatalErrorInFunction
             << nBoundaryFaces << " neiLevel:" << neiLevel.size()
             << abort(FatalError);
     }
@@ -176,7 +177,13 @@ void Foam::meshRefinement::calcNeighbourData
 
                 label own = faceCells[i];
                 label ownLevel = cellLevel[own];
-                label faceLevel = meshCutter_.getAnchorLevel(pp.start()+i);
+                label faceLevel = meshCutter_.faceLevel(pp.start()+i);
+                if (faceLevel < 0)
+                {
+                    // Due to e.g. face merging no longer a consistent
+                    // refinementlevel of face. Assume same as cell
+                    faceLevel = ownLevel;
+                }
 
                 // Normal distance from face centre to cell centre
                 scalar d = ((faceCentres[i] - cellCentres[own]) & fn);
@@ -208,6 +215,55 @@ void Foam::meshRefinement::calcNeighbourData
 }
 
 
+void Foam::meshRefinement::calcCellCellRays
+(
+    const pointField& neiCc,
+    const labelList& neiLevel,
+    const labelList& testFaces,
+    pointField& start,
+    pointField& end,
+    labelList& minLevel
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    start.setSize(testFaces.size());
+    end.setSize(testFaces.size());
+    minLevel.setSize(testFaces.size());
+
+    forAll(testFaces, i)
+    {
+        label faceI = testFaces[i];
+        label own = mesh_.faceOwner()[faceI];
+
+        if (mesh_.isInternalFace(faceI))
+        {
+            label nei = mesh_.faceNeighbour()[faceI];
+
+            start[i] = cellCentres[own];
+            end[i] = cellCentres[nei];
+            minLevel[i] = min(cellLevel[own], cellLevel[nei]);
+        }
+        else
+        {
+            label bFaceI = faceI - mesh_.nInternalFaces();
+
+            start[i] = cellCentres[own];
+            end[i] = neiCc[bFaceI];
+            minLevel[i] = min(cellLevel[own], neiLevel[bFaceI]);
+        }
+    }
+
+    // Extend segments a bit
+    {
+        const vectorField smallVec(ROOTSMALL*(end-start));
+        start -= smallVec;
+        end += smallVec;
+    }
+}
+
+
 // Find intersections of edges (given by their two endpoints) with surfaces.
 // Returns first intersection if there are more than one.
 void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
@@ -284,6 +340,7 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
         labelList surfaceLevel;
         surfaces_.findHigherIntersection
         (
+            shells_,
             start,
             end,
             labelList(start.size(), -1),    // accept any intersection
@@ -321,11 +378,8 @@ void Foam::meshRefinement::testSyncPointList
 {
     if (fld.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "meshRefinement::testSyncPointList(const polyMesh&"
-            ", const List<scalar>&)"
-        )   << msg << endl
+        FatalErrorInFunction
+            << msg << endl
             << "fld size:" << fld.size() << " mesh points:" << mesh.nPoints()
             << abort(FatalError);
     }
@@ -371,11 +425,8 @@ void Foam::meshRefinement::testSyncPointList
 {
     if (fld.size() != mesh.nPoints())
     {
-        FatalErrorIn
-        (
-            "meshRefinement::testSyncPointList(const polyMesh&"
-            ", const List<point>&)"
-        )   << msg << endl
+        FatalErrorInFunction
+            << msg << endl
             << "fld size:" << fld.size() << " mesh points:" << mesh.nPoints()
             << abort(FatalError);
     }
@@ -495,6 +546,7 @@ void Foam::meshRefinement::checkData()
             labelList surfaceLevel;
             surfaces_.findHigherIntersection
             (
+                shells_,
                 start,
                 end,
                 labelList(start.size(), -1),    // accept any intersection
@@ -521,7 +573,7 @@ void Foam::meshRefinement::checkData()
             {
                 if (mesh_.isInternalFace(faceI))
                 {
-                    WarningIn("meshRefinement::checkData()")
+                    WarningInFunction
                         << "Internal face:" << faceI
                         << " fc:" << mesh_.faceCentres()[faceI]
                         << " cached surfaceIndex_:" << surfaceIndex_[faceI]
@@ -538,14 +590,20 @@ void Foam::meshRefinement::checkData()
                  != neiHit[faceI-mesh_.nInternalFaces()]
                 )
                 {
-                    WarningIn("meshRefinement::checkData()")
+                    WarningInFunction
                         << "Boundary face:" << faceI
                         << " fc:" << mesh_.faceCentres()[faceI]
                         << " cached surfaceIndex_:" << surfaceIndex_[faceI]
                         << " current:" << surfaceHit[faceI]
                         << " ownCc:"
                         << mesh_.cellCentres()[mesh_.faceOwner()[faceI]]
+                        << " neiCc:"
+                        << neiCc[faceI-mesh_.nInternalFaces()]
                         << " end:" << end[faceI]
+                        << " ownLevel:"
+                        << meshCutter_.cellLevel()[mesh_.faceOwner()[faceI]]
+                        << " faceLevel:"
+                        << meshCutter_.faceLevel(faceI)
                         << endl;
                 }
             }
@@ -678,20 +736,19 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
 
 
 // Split faces
-Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitFaces
+void Foam::meshRefinement::doSplitFaces
 (
     const labelList& splitFaces,
-    const labelPairList& splits
-)
+    const labelPairList& splits,
+    //const List<Pair<point> >& splitPoints,
+    polyTopoChange& meshMod
+) const
 {
-    polyTopoChange meshMod(mesh_);
-
     forAll(splitFaces, i)
     {
         label faceI = splitFaces[i];
         const face& f = mesh_.faces()[faceI];
 
-
         // Split as start and end index in face
         const labelPair& split = splits[i];
 
@@ -744,9 +801,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitFaces
         }
 
 
-Pout<< "face:" << faceI << " verts:" << f
-    << " split into f0:" << f0
-    << " f1:" << f1 << endl;
+        //Pout<< "face:" << faceI << " verts:" << f
+        //    << " split into f0:" << f0
+        //    << " f1:" << f1 << endl;
 
         // Change/add faces
         meshMod.modifyFace
@@ -773,396 +830,394 @@ Pout<< "face:" << faceI << " verts:" << f
             zoneI,                      // zone for face
             zoneFlip                    // face flip in zone
         );
+
+
+        //// Move points
+        //meshMod.modifyPoint
+        //(
+        //    f[split[0]],
+        //    splitPoints[i][0],
+        //    -1,
+        //    true
+        //);
+        //meshMod.modifyPoint
+        //(
+        //    f[split[1]],
+        //    splitPoints[i][1],
+        //    -1,
+        //    true
+        //);
     }
-
-
-
-    // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
-
-    // Update fields
-    mesh_.updateMesh(map);
-
-    // Move mesh (since morphing might not do this)
-    if (map().hasMotionPoints())
-    {
-        mesh_.movePoints(map().preMotionPoints());
-    }
-    else
-    {
-        // Delete mesh volumes. No other way to do this?
-        mesh_.clearOut();
-    }
-
-    // Reset the instance for if in overwrite mode
-    mesh_.setInstance(timeName());
-    setInstance(mesh_.facesInstance());
-
-    // Update local mesh data
-    const labelList& oldToNew = map().reverseFaceMap();
-    labelList newSplitFaces(renumber(oldToNew, splitFaces));
-    // Add added faces (every splitFaces becomes two faces)
-    label sz = newSplitFaces.size();
-    newSplitFaces.setSize(2*sz);
-    forAll(map().faceMap(), faceI)
-    {
-        label oldFaceI = map().faceMap()[faceI];
-        if (oldToNew[oldFaceI] != faceI)
-        {
-            // Added face
-            newSplitFaces[sz++] = faceI;
-        }
-    }
-
-    updateMesh(map, newSplitFaces);
-
-    return map;
 }
 
 
-//// Determine for multi-processor regions the lowest numbered cell on the
-//// lowest numbered processor.
-//void Foam::meshRefinement::getCoupledRegionMaster
-//(
-//    const globalIndex& globalCells,
-//    const boolList& blockedFace,
-//    const regionSplit& globalRegion,
-//    Map<label>& regionToMaster
-//) const
-//{
-//    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-//
-//    forAll(patches, patchI)
-//    {
-//        const polyPatch& pp = patches[patchI];
-//
-//        if (isA<processorPolyPatch>(pp))
-//        {
-//            forAll(pp, i)
-//            {
-//                label faceI = pp.start()+i;
-//
-//                if (!blockedFace[faceI])
-//                {
-//                    // Only if there is a connection to the neighbour
-//                    // will there be a multi-domain region; if not through
-//                    // this face then through another.
-//
-//                    label cellI = mesh_.faceOwner()[faceI];
-//                    label globalCellI = globalCells.toGlobal(cellI);
-//
-//                    Map<label>::iterator iter =
-//                        regionToMaster.find(globalRegion[cellI]);
-//
-//                    if (iter != regionToMaster.end())
-//                    {
-//                        label master = iter();
-//                        iter() = min(master, globalCellI);
-//                    }
-//                    else
-//                    {
-//                        regionToMaster.insert
-//                        (
-//                            globalRegion[cellI],
-//                            globalCellI
-//                        );
-//                    }
-//                }
-//            }
-//        }
-//    }
-//
-//    // Do reduction
-//    Pstream::mapCombineGather(regionToMaster, minEqOp<label>());
-//    Pstream::mapCombineScatter(regionToMaster);
-//}
-//
-//
-//void Foam::meshRefinement::calcLocalRegions
-//(
-//    const globalIndex& globalCells,
-//    const labelList& globalRegion,
-//    const Map<label>& coupledRegionToMaster,
-//    const scalarField& cellWeights,
-//
-//    Map<label>& globalToLocalRegion,
-//    pointField& localPoints,
-//    scalarField& localWeights
-//) const
-//{
-//    globalToLocalRegion.resize(globalRegion.size());
-//    DynamicList<point> localCc(globalRegion.size()/2);
-//    DynamicList<scalar> localWts(globalRegion.size()/2);
-//
-//    forAll(globalRegion, cellI)
-//    {
-//        Map<label>::const_iterator fndMaster =
-//            coupledRegionToMaster.find(globalRegion[cellI]);
-//
-//        if (fndMaster != coupledRegionToMaster.end())
-//        {
-//            // Multi-processor region.
-//            if (globalCells.toGlobal(cellI) == fndMaster())
-//            {
-//                // I am master. Allocate region for me.
-//                globalToLocalRegion.insert
-//                (
-//                    globalRegion[cellI],
-//                    localCc.size()
-//                );
-//                localCc.append(mesh_.cellCentres()[cellI]);
-//                localWts.append(cellWeights[cellI]);
-//            }
-//        }
-//        else
-//        {
-//            // Single processor region.
-//            if
-//            (
-//                globalToLocalRegion.insert
-//                (
-//                    globalRegion[cellI],
-//                    localCc.size()
-//                )
-//            )
-//            {
-//                localCc.append(mesh_.cellCentres()[cellI]);
-//                localWts.append(cellWeights[cellI]);
-//            }
-//        }
-//    }
-//
-//    localPoints.transfer(localCc);
-//    localWeights.transfer(localWts);
-//
-//    if (localPoints.size() != globalToLocalRegion.size())
-//    {
-//        FatalErrorIn("calcLocalRegions(..)")
-//            << "localPoints:" << localPoints.size()
-//            << " globalToLocalRegion:" << globalToLocalRegion.size()
-//            << exit(FatalError);
-//    }
-//}
-//
-//
-//Foam::label Foam::meshRefinement::getShiftedRegion
-//(
-//    const globalIndex& indexer,
-//    const Map<label>& globalToLocalRegion,
-//    const Map<label>& coupledRegionToShifted,
-//    const label globalRegion
-//)
-//{
-//    Map<label>::const_iterator iter =
-//        globalToLocalRegion.find(globalRegion);
-//
-//    if (iter != globalToLocalRegion.end())
-//    {
-//        // Region is 'owned' locally. Convert local region index into global.
-//        return indexer.toGlobal(iter());
-//    }
-//    else
-//    {
-//        return coupledRegionToShifted[globalRegion];
-//    }
-//}
-//
-//
-//// Add if not yet present
-//void Foam::meshRefinement::addUnique(const label elem, labelList& lst)
-//{
-//    if (findIndex(lst, elem) == -1)
-//    {
-//        label sz = lst.size();
-//        lst.setSize(sz+1);
-//        lst[sz] = elem;
-//    }
-//}
-//
-//
-//void Foam::meshRefinement::calcRegionRegions
-//(
-//    const labelList& globalRegion,
-//    const Map<label>& globalToLocalRegion,
-//    const Map<label>& coupledRegionToMaster,
-//    labelListList& regionRegions
-//) const
-//{
-//    // Global region indexing since we now know the shifted regions.
-//    globalIndex shiftIndexer(globalToLocalRegion.size());
-//
-//    // Redo the coupledRegionToMaster to be in shifted region indexing.
-//    Map<label> coupledRegionToShifted(coupledRegionToMaster.size());
-//    forAllConstIter(Map<label>, coupledRegionToMaster, iter)
-//    {
-//        label region = iter.key();
-//
-//        Map<label>::const_iterator fndRegion = globalToLocalRegion.find
-//        (region);
-//
-//        if (fndRegion != globalToLocalRegion.end())
-//        {
-//            // A local cell is master of this region. Get its shifted region.
-//            coupledRegionToShifted.insert
-//            (
-//                region,
-//                shiftIndexer.toGlobal(fndRegion())
-//            );
-//        }
-//        Pstream::mapCombineGather(coupledRegionToShifted, minEqOp<label>());
-//        Pstream::mapCombineScatter(coupledRegionToShifted);
-//    }
-//
-//
-//    // Determine region-region connectivity.
-//    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    // This is for all my regions (so my local ones or the ones I am master
-//    // of) the neighbouring region indices.
-//
-//
-//    // Transfer lists.
-//    PtrList<HashSet<edge, Hash<edge> > > regionConnectivity
-//    (Pstream::nProcs());
-//    forAll(regionConnectivity, procI)
-//    {
-//        if (procI != Pstream::myProcNo())
-//        {
-//            regionConnectivity.set
-//            (
-//                procI,
-//                new HashSet<edge, Hash<edge> >
-//                (
-//                    coupledRegionToShifted.size()
-//                  / Pstream::nProcs()
-//                )
-//            );
-//        }
-//    }
-//
-//
-//    // Connectivity. For all my local regions the connected regions.
-//    regionRegions.setSize(globalToLocalRegion.size());
-//
-//    // Add all local connectivity to regionRegions; add all non-local
-//    // to the transferlists.
-//    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-//    {
-//        label ownRegion = globalRegion[mesh_.faceOwner()[faceI]];
-//        label neiRegion = globalRegion[mesh_.faceNeighbour()[faceI]];
-//
-//        if (ownRegion != neiRegion)
-//        {
-//            label shiftOwnRegion = getShiftedRegion
-//            (
-//                shiftIndexer,
-//                globalToLocalRegion,
-//                coupledRegionToShifted,
-//                ownRegion
-//            );
-//            label shiftNeiRegion = getShiftedRegion
-//            (
-//                shiftIndexer,
-//                globalToLocalRegion,
-//                coupledRegionToShifted,
-//                neiRegion
-//            );
-//
-//
-//            // Connection between two regions. Send to owner of region.
-//            // - is ownRegion 'owned' by me
-//            // - is neiRegion 'owned' by me
-//
-//            if (shiftIndexer.isLocal(shiftOwnRegion))
-//            {
-//                label localI = shiftIndexer.toLocal(shiftOwnRegion);
-//                addUnique(shiftNeiRegion, regionRegions[localI]);
-//            }
-//            else
-//            {
-//                label masterProc = shiftIndexer.whichProcID(shiftOwnRegion);
-//                regionConnectivity[masterProc].insert
-//                (
-//                    edge(shiftOwnRegion, shiftNeiRegion)
-//                );
-//            }
-//
-//            if (shiftIndexer.isLocal(shiftNeiRegion))
-//            {
-//                label localI = shiftIndexer.toLocal(shiftNeiRegion);
-//                addUnique(shiftOwnRegion, regionRegions[localI]);
-//            }
-//            else
-//            {
-//                label masterProc = shiftIndexer.whichProcID(shiftNeiRegion);
-//                regionConnectivity[masterProc].insert
-//                (
-//                    edge(shiftOwnRegion, shiftNeiRegion)
-//                );
-//            }
-//        }
-//    }
-//
-//
-//    // Send
-//    forAll(regionConnectivity, procI)
-//    {
-//        if (procI != Pstream::myProcNo())
-//        {
-//            OPstream str(Pstream::blocking, procI);
-//            str << regionConnectivity[procI];
-//        }
-//    }
-//    // Receive
-//    forAll(regionConnectivity, procI)
-//    {
-//        if (procI != Pstream::myProcNo())
-//        {
-//            IPstream str(Pstream::blocking, procI);
-//            str >> regionConnectivity[procI];
-//        }
-//    }
-//
-//    // Add to addressing.
-//    forAll(regionConnectivity, procI)
-//    {
-//        if (procI != Pstream::myProcNo())
-//        {
-//            for
-//            (
-//                HashSet<edge, Hash<edge> >::const_iterator iter =
-//                    regionConnectivity[procI].begin();
-//                iter != regionConnectivity[procI].end();
-//                ++iter
-//            )
-//            {
-//                const edge& e = iter.key();
-//
-//                bool someLocal = false;
-//                if (shiftIndexer.isLocal(e[0]))
-//                {
-//                    label localI = shiftIndexer.toLocal(e[0]);
-//                    addUnique(e[1], regionRegions[localI]);
-//                    someLocal = true;
-//                }
-//                if (shiftIndexer.isLocal(e[1]))
-//                {
-//                    label localI = shiftIndexer.toLocal(e[1]);
-//                    addUnique(e[0], regionRegions[localI]);
-//                    someLocal = true;
-//                }
-//
-//                if (!someLocal)
-//                {
-//                    FatalErrorIn("calcRegionRegions(..)")
-//                        << "Received from processor " << procI
-//                        << " connection " << e
-//                        << " where none of the elements is local to me."
-//                        << abort(FatalError);
-//                }
-//            }
-//        }
-//    }
-//}
+Foam::label Foam::meshRefinement::splitFacesUndo
+(
+    const labelList& splitFaces,
+    const labelPairList& splits,
+    const dictionary& motionDict,
+
+    labelList& duplicateFace,
+    List<labelPair>& baffles
+)
+{
+    label nSplit = returnReduce(splitFaces.size(), sumOp<label>());
+    Info<< nl
+        << "Splitting " << nSplit
+        << " faces across diagonals" << "." << nl << endl;
+
+    // To undo: store original faces
+    faceList originalFaces(UIndirectList<face>(mesh_.faces(), splitFaces));
+    labelPairList facePairs(splitFaces.size(), labelPair(-1, -1));
+
+
+    {
+        polyTopoChange meshMod(mesh_);
+        meshMod.setCapacity
+        (
+            meshMod.points().size(),
+            meshMod.faces().size()+splitFaces.size(),
+            mesh_.nCells()
+        );
+
+        // Insert the mesh changes
+        doSplitFaces(splitFaces, splits, meshMod);
+
+        // Change the mesh (no inflation)
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh (since morphing might not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+        setInstance(mesh_.facesInstance());
+
+
+        // Update local mesh data
+        // ~~~~~~~~~~~~~~~~~~~~~~
+
+        forAll(originalFaces, i)
+        {
+            inplaceRenumber(map().reversePointMap(), originalFaces[i]);
+        }
+
+        {
+            Map<label> splitFaceToIndex(2*splitFaces.size());
+            forAll(splitFaces, i)
+            {
+                splitFaceToIndex.insert(splitFaces[i], i);
+            }
+
+            forAll(map().faceMap(), faceI)
+            {
+                label oldFaceI = map().faceMap()[faceI];
+                Map<label>::iterator oldFaceFnd = splitFaceToIndex.find
+                (
+                    oldFaceI
+                );
+                if (oldFaceFnd != splitFaceToIndex.end())
+                {
+                    labelPair& twoFaces = facePairs[oldFaceFnd()];
+                    if (twoFaces[0] == -1)
+                    {
+                        twoFaces[0] = faceI;
+                    }
+                    else if (twoFaces[1] == -1)
+                    {
+                        twoFaces[1] = faceI;
+                    }
+                    else
+                    {
+                        FatalErrorInFunction
+                            << "problem: twoFaces:" << twoFaces
+                            << exit(FatalError);
+                    }
+                }
+            }
+        }
+
+
+        // Update baffle data
+        // ~~~~~~~~~~~~~~~~~~
+
+        if (duplicateFace.size())
+        {
+            meshRefinement::updateList
+            (
+                map().faceMap(),
+                label(-1),
+                duplicateFace
+            );
+        }
+
+        const labelList& oldToNewFaces = map().reverseFaceMap();
+        forAll(baffles, i)
+        {
+            labelPair& baffle = baffles[i];
+            baffle.first() = oldToNewFaces[baffle.first()];
+            baffle.second() = oldToNewFaces[baffle.second()];
+
+            if (baffle.first() == -1 || baffle.second() == -1)
+            {
+                FatalErrorInFunction
+                    << "Removed baffle : faces:" << baffle
+                    << exit(FatalError);
+            }
+        }
+
+
+        // Update insersections
+        // ~~~~~~~~~~~~~~~~~~~~
+
+        {
+            DynamicList<label> changedFaces(facePairs.size());
+            forAll(facePairs, i)
+            {
+                changedFaces.append(facePairs[i].first());
+                changedFaces.append(facePairs[i].second());
+            }
+
+            // Update intersections on changed faces
+            updateMesh(map, growFaceCellFace(changedFaces));
+        }
+    }
+
+
+
+    // Undo loop
+    // ~~~~~~~~~
+    // Maintains two bits of information:
+    // facePairs     : two faces originating from the same face
+    // originalFaces : original face in current vertices
+
+
+    for (label iteration = 0; iteration < 100; iteration++)
+    {
+        Info<< nl
+            << "Undo iteration " << iteration << nl
+            << "----------------" << endl;
+
+
+        // Check mesh for errors
+        // ~~~~~~~~~~~~~~~~~~~~~
+
+        faceSet errorFaces
+        (
+            mesh_,
+            "errorFaces",
+            mesh_.nFaces()-mesh_.nInternalFaces()
+        );
+        bool hasErrors = motionSmoother::checkMesh
+        (
+            false,  // report
+            mesh_,
+            motionDict,
+            errorFaces
+        );
+        if (!hasErrors)
+        {
+            break;
+        }
+
+        // Extend faces
+        {
+            const labelList grownFaces(growFaceCellFace(errorFaces));
+            errorFaces.clear();
+            errorFaces.insert(grownFaces);
+        }
+
+
+        // Merge face pairs
+        // ~~~~~~~~~~~~~~~~
+        // (if one of the faces is in the errorFaces set)
+
+        polyTopoChange meshMod(mesh_);
+
+        // Indices (in facePairs) of merged faces
+        labelHashSet mergedIndices(facePairs.size());
+        forAll(facePairs, index)
+        {
+            const labelPair& twoFaces = facePairs[index];
+
+            if
+            (
+                errorFaces.found(twoFaces.first())
+             || errorFaces.found(twoFaces.second())
+            )
+            {
+                const face& originalFace = originalFaces[index];
+
+
+                // Determine face properties
+                label own = mesh_.faceOwner()[twoFaces[0]];
+                label nei = -1;
+                label patchI = -1;
+                if (twoFaces[0] >= mesh_.nInternalFaces())
+                {
+                    patchI = mesh_.boundaryMesh().whichPatch(twoFaces[0]);
+                }
+                else
+                {
+                    nei = mesh_.faceNeighbour()[twoFaces[0]];
+                }
+
+                label zoneI = mesh_.faceZones().whichZone(twoFaces[0]);
+                bool zoneFlip = false;
+                if (zoneI != -1)
+                {
+                    const faceZone& fz = mesh_.faceZones()[zoneI];
+                    zoneFlip = fz.flipMap()[fz.whichFace(twoFaces[0])];
+                }
+
+                // Modify first face
+                meshMod.modifyFace
+                (
+                    originalFace,               // modified face
+                    twoFaces[0],                // label of face
+                    own,                        // owner
+                    nei,                        // neighbour
+                    false,                      // face flip
+                    patchI,                     // patch for face
+                    zoneI,                      // zone for face
+                    zoneFlip                    // face flip in zone
+                );
+                // Merge second face into first
+                meshMod.removeFace(twoFaces[1], twoFaces[0]);
+
+                mergedIndices.insert(index);
+            }
+        }
+
+        label n = returnReduce(mergedIndices.size(), sumOp<label>());
+
+        Info<< "Detected " << n
+            << " split faces that will be restored to their original faces."
+            << nl << endl;
+
+        if (n == 0)
+        {
+            // Nothing to be restored
+            break;
+        }
+
+        nSplit -= n;
+
+
+        // Change the mesh (no inflation)
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh (since morphing might not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+        setInstance(mesh_.facesInstance());
+
+
+        // Update local mesh data
+        // ~~~~~~~~~~~~~~~~~~~~~~
+
+        {
+            const labelList& oldToNewFaces = map().reverseFaceMap();
+            const labelList& oldToNewPoints = map().reversePointMap();
+
+            // Compact out merged faces
+            DynamicList<label> changedFaces(mergedIndices.size());
+
+            label newIndex = 0;
+            forAll(facePairs, index)
+            {
+                const labelPair& oldSplit = facePairs[index];
+                label new0 = oldToNewFaces[oldSplit[0]];
+                label new1 = oldToNewFaces[oldSplit[1]];
+
+                if (!mergedIndices.found(index))
+                {
+                    // Faces still split
+                    if (new0 < 0 || new1 < 0)
+                    {
+                        FatalErrorInFunction
+                            << "Problem: oldFaces:" << oldSplit
+                            << " newFaces:" << labelPair(new0, new1)
+                            << exit(FatalError);
+                    }
+
+                    facePairs[newIndex] = labelPair(new0, new1);
+                    originalFaces[newIndex] = renumber
+                    (
+                        oldToNewPoints,
+                        originalFaces[index]
+                    );
+                    newIndex++;
+                }
+                else
+                {
+                    // Merged face. Only new0 kept.
+                    if (new0 < 0 || new1 == -1)
+                    {
+                        FatalErrorInFunction
+                            << "Problem: oldFaces:" << oldSplit
+                            << " newFace:" << labelPair(new0, new1)
+                            << exit(FatalError);
+                    }
+                    changedFaces.append(new0);
+                }
+            }
+
+            facePairs.setSize(newIndex);
+            originalFaces.setSize(newIndex);
+
+
+            // Update intersections
+            updateMesh(map, growFaceCellFace(changedFaces));
+        }
+
+        // Update baffle data
+        // ~~~~~~~~~~~~~~~~~~
+        {
+            if (duplicateFace.size())
+            {
+                meshRefinement::updateList
+                (
+                    map().faceMap(),
+                    label(-1),
+                    duplicateFace
+                );
+            }
+
+            const labelList& reverseFaceMap = map().reverseFaceMap();
+            forAll(baffles, i)
+            {
+                labelPair& baffle = baffles[i];
+                baffle.first() = reverseFaceMap[baffle.first()];
+                baffle.second() = reverseFaceMap[baffle.second()];
+
+                if (baffle.first() == -1 || baffle.second() == -1)
+                {
+                    FatalErrorInFunction
+                        << "Removed baffle : faces:" << baffle
+                        << exit(FatalError);
+                }
+            }
+        }
+
+    }
+
+    return nSplit;
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -1175,7 +1230,8 @@ Foam::meshRefinement::meshRefinement
     const bool overwrite,
     const refinementSurfaces& surfaces,
     const refinementFeatures& features,
-    const shellSurfaces& shells
+    const shellSurfaces& shells,
+    const shellSurfaces& limitShells
 )
 :
     mesh_(mesh),
@@ -1185,6 +1241,7 @@ Foam::meshRefinement::meshRefinement
     surfaces_(surfaces),
     features_(features),
     shells_(shells),
+    limitShells_(limitShells),
     meshCutter_
     (
         mesh,
@@ -1231,150 +1288,6 @@ Foam::label Foam::meshRefinement::countHits() const
 }
 
 
-//// Determine distribution to move connected regions onto one processor.
-//Foam::labelList Foam::meshRefinement::decomposeCombineRegions
-//(
-//    const scalarField& cellWeights,
-//    const boolList& blockedFace,
-//    const List<labelPair>& explicitConnections,
-//    decompositionMethod& decomposer
-//) const
-//{
-//    // Determine global regions, separated by blockedFaces
-//    regionSplit globalRegion(mesh_, blockedFace, explicitConnections);
-//
-//    // Now globalRegion has global region per cell. Problem is that
-//    // the region might span multiple domains so we want to get
-//    // a "region master" per domain. Note that multi-processor
-//    // regions can only occur on cells on coupled patches.
-//    // Note: since the number of regions does not change by this the
-//    // process can be seen as just a shift of a region onto a single
-//    // processor.
-//
-//
-//    // Global cell numbering engine
-//    globalIndex globalCells(mesh_.nCells());
-//
-//
-//    // Determine per coupled region the master cell (lowest numbered cell
-//    // on lowest numbered processor)
-//    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    // (does not determine master for non-coupled=fully-local regions)
-//
-//    Map<label> coupledRegionToMaster(mesh_.nFaces()-mesh_.nInternalFaces());
-//    getCoupledRegionMaster
-//    (
-//        globalCells,
-//        blockedFace,
-//        globalRegion,
-//        coupledRegionToMaster
-//    );
-//
-//    // Determine my regions
-//    // ~~~~~~~~~~~~~~~~~~~~
-//    // These are the fully local ones or the coupled ones of which I am master
-//
-//    Map<label> globalToLocalRegion;
-//    pointField localPoints;
-//    scalarField localWeights;
-//    calcLocalRegions
-//    (
-//        globalCells,
-//        globalRegion,
-//        coupledRegionToMaster,
-//        cellWeights,
-//
-//        globalToLocalRegion,
-//        localPoints,
-//        localWeights
-//    );
-//
-//
-//
-//    // Find distribution for regions
-//    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-//    labelList regionDistribution;
-//
-//    if (isA<geomDecomp>(decomposer))
-//    {
-//        regionDistribution = decomposer.decompose(localPoints, localWeights);
-//    }
-//    else
-//    {
-//        labelListList regionRegions;
-//        calcRegionRegions
-//        (
-//            globalRegion,
-//            globalToLocalRegion,
-//            coupledRegionToMaster,
-//
-//            regionRegions
-//        );
-//
-//        regionDistribution = decomposer.decompose
-//        (
-//            regionRegions,
-//            localPoints,
-//            localWeights
-//        );
-//    }
-//
-//
-//
-//    // Convert region-based decomposition back to cell-based one
-//    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-//    // Transfer destination processor back to all. Use global reduce for now.
-//    Map<label> regionToDist(coupledRegionToMaster.size());
-//    forAllConstIter(Map<label>, coupledRegionToMaster, iter)
-//    {
-//        label region = iter.key();
-//
-//        Map<label>::const_iterator regionFnd = globalToLocalRegion.find
-//        (region);
-//
-//        if (regionFnd != globalToLocalRegion.end())
-//        {
-//            // Master cell is local. Store my distribution.
-//            regionToDist.insert(iter.key(), regionDistribution[regionFnd()]);
-//        }
-//        else
-//        {
-//            // Master cell is not on this processor. Make sure it is
-//            // overridden.
-//            regionToDist.insert(iter.key(), labelMax);
-//        }
-//    }
-//    Pstream::mapCombineGather(regionToDist, minEqOp<label>());
-//    Pstream::mapCombineScatter(regionToDist);
-//
-//
-//    // Determine destination for all cells
-//    labelList distribution(mesh_.nCells());
-//
-//    forAll(globalRegion, cellI)
-//    {
-//        Map<label>::const_iterator fndRegion =
-//            regionToDist.find(globalRegion[cellI]);
-//
-//        if (fndRegion != regionToDist.end())
-//        {
-//            distribution[cellI] = fndRegion();
-//        }
-//        else
-//        {
-//            // region is local to the processor.
-//            label localRegionI = globalToLocalRegion[globalRegion[cellI]];
-//
-//            distribution[cellI] = regionDistribution[localRegionI];
-//        }
-//    }
-//
-//    return distribution;
-//}
-
-
 Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
 (
     const bool keepZoneFaces,
@@ -1432,37 +1345,29 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
                 // keep owner&neighbour of such a surface zone on the same
                 // processor.
 
-                const PtrList<surfaceZonesInfo>& surfZones =
-                    surfaces().surfZones();
                 const faceZoneMesh& fZones = mesh_.faceZones();
                 const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
                 // Get faces whose owner and neighbour should stay together,
                 // i.e. they are not 'blocked'.
 
-                forAll(surfZones, surfI)
+                forAll(fZones, zoneI)
                 {
-                    const word& fzName = surfZones[surfI].faceZoneName();
+                    const faceZone& fZone = fZones[zoneI];
 
-                    if (fzName.size())
+                    forAll(fZone, i)
                     {
-                        // Get zone
-                        const faceZone& fZone = fZones[fzName];
-
-                        forAll(fZone, i)
+                        label faceI = fZone[i];
+                        if (blockedFace[faceI])
                         {
-                            label faceI = fZone[i];
-                            if (blockedFace[faceI])
+                            if
+                            (
+                                mesh_.isInternalFace(faceI)
+                             || pbm[pbm.whichPatch(faceI)].coupled()
+                            )
                             {
-                                if
-                                (
-                                    mesh_.isInternalFace(faceI)
-                                 || pbm[pbm.whichPatch(faceI)].coupled()
-                                )
-                                {
-                                    blockedFace[faceI] = false;
-                                    nUnblocked++;
-                                }
+                                blockedFace[faceI] = false;
+                                nUnblocked++;
                             }
                         }
                     }
@@ -1559,52 +1464,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
                 Info<< "Found " << nCouples << " baffles to keep together."
                     << endl;
             }
-
-            //if (nUnblocked > 0 || nCouples > 0)
-            //{
-            //    Info<< "Applying special decomposition to keep baffles"
-            //        << " and zoned faces together." << endl;
-            //
-            //    distribution = decomposeCombineRegions
-            //    (
-            //        cellWeights,
-            //        blockedFace,
-            //        couples,
-            //        decomposer
-            //    );
-            //
-            //    labelList nProcCells(distributor.countCells(distribution));
-            //    Pstream::listCombineGather(nProcCells, plusEqOp<label>());
-            //    Pstream::listCombineScatter(nProcCells);
-            //
-            //    Info<< "Calculated decomposition:" << endl;
-            //    forAll(nProcCells, procI)
-            //    {
-            //        Info<< "    " << procI << '\t' << nProcCells[procI]
-            //            << endl;
-            //    }
-            //    Info<< endl;
-            //}
-            //else
-            //{
-            //    // Normal decomposition
-            //    distribution = decomposer.decompose
-            //    (
-            //        mesh_,
-            //        mesh_.cellCentres(),
-            //        cellWeights
-            //    );
-            //}
         }
-        //else
-        //{
-        //    // Normal decomposition
-        //    distribution = decomposer.decompose
-        //    (
-        //        mesh_,
-        //        cellWeights
-        //    );
-        //}
 
 
         // Make sure blockedFace not set on couples
@@ -1639,7 +1499,36 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
                 Pout<< "    " << procI << '\t' << nProcCells[procI] << endl;
             }
             Pout<< endl;
+
+
+            if (keepZoneFaces)
+            {
+                const faceZoneMesh& fZones = mesh_.faceZones();
+                const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+
+                // Check that faceZone faces are indeed internal
+                forAll(fZones, zoneI)
+                {
+                    const faceZone& fZone = fZones[zoneI];
+
+                    forAll(fZone, i)
+                    {
+                        label faceI = fZone[i];
+                        label patchI = pbm.whichPatch(faceI);
+
+                        if (patchI >= 0 && pbm[patchI].coupled())
+                        {
+                            WarningInFunction
+                                << "Face at " << mesh_.faceCentres()[faceI]
+                                << " on zone " << fZone.name()
+                                << " is on coupled patch " << pbm[patchI].name()
+                                << endl;
+                        }
+                    }
+                }
+            }
         }
+
         // Do actual sending/receiving of mesh
         map = distributor.distribute(distribution);
 
@@ -1873,10 +1762,8 @@ void Foam::meshRefinement::checkCoupledFaceZones(const polyMesh& mesh)
             {
                 if (zoneNames[procI] != zoneNames[Pstream::myProcNo()])
                 {
-                    FatalErrorIn
-                    (
-                        "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
-                    )   << "faceZones are not synchronised on processors." << nl
+                    FatalErrorInFunction
+                        << "faceZones are not synchronised on processors." << nl
                         << "Processor " << procI << " has faceZones "
                         << zoneNames[procI] << nl
                         << "Processor " << Pstream::myProcNo()
@@ -1908,20 +1795,16 @@ void Foam::meshRefinement::checkCoupledFaceZones(const polyMesh& mesh)
                 }
                 else if (faceToZone[bFaceI] == zoneI)
                 {
-                    FatalErrorIn
-                    (
-                        "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
-                    )   << "Face " << fZone[i] << " in zone "
+                    FatalErrorInFunction
+                        << "Face " << fZone[i] << " in zone "
                         << fZone.name()
                         << " is twice in zone!"
                         << abort(FatalError);
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
-                    )   << "Face " << fZone[i] << " in zone "
+                    FatalErrorInFunction
+                        << "Face " << fZone[i] << " in zone "
                         << fZone.name()
                         << " is also in zone "
                         << fZones[faceToZone[bFaceI]].name()
@@ -1938,10 +1821,8 @@ void Foam::meshRefinement::checkCoupledFaceZones(const polyMesh& mesh)
     {
         if (faceToZone[i] != neiFaceToZone[i])
         {
-            FatalErrorIn
-            (
-                "meshRefinement::checkCoupledFaceZones(const polyMesh&)"
-            )   << "Face " << mesh.nInternalFaces()+i
+            FatalErrorInFunction
+                << "Face " << mesh.nInternalFaces()+i
                 << " is in zone " << faceToZone[i]
                 << ", its coupled face is in zone " << neiFaceToZone[i]
                 << abort(FatalError);
@@ -2226,6 +2107,9 @@ Foam::label Foam::meshRefinement::addMeshedPatch
         // Store
         meshedPatches_.append(name);
 
+        // Clear patch based addressing
+        faceToCoupledPatch_.clear();
+
         return patchI;
     }
 }
@@ -2242,7 +2126,7 @@ Foam::labelList Foam::meshRefinement::meshedPatches() const
 
         if (patchI == -1)
         {
-            FatalErrorIn("meshRefinement::meshedPatches() const")
+            FatalErrorInFunction
                 << "Problem : did not find patch " << meshedPatches_[i]
                 << endl << "Valid patches are " << patches.names()
                 << abort(FatalError);
@@ -2257,6 +2141,59 @@ Foam::labelList Foam::meshRefinement::meshedPatches() const
 }
 
 
+Foam::label Foam::meshRefinement::addFaceZone
+(
+    const word& fzName,
+    const word& masterPatch,
+    const word& slavePatch,
+    const surfaceZonesInfo::faceZoneType& fzType
+)
+{
+    label zoneI = surfaceZonesInfo::addFaceZone
+    (
+        fzName,   //name
+        labelList(0),   //addressing
+        boolList(0),    //flipmap
+        mesh_
+    );
+
+    faceZoneToMasterPatch_.insert(fzName, masterPatch);
+    faceZoneToSlavePatch_.insert(fzName, slavePatch);
+    faceZoneToType_.insert(fzName, fzType);
+
+    return zoneI;
+}
+
+
+bool Foam::meshRefinement::getFaceZoneInfo
+(
+    const word& fzName,
+    label& masterPatchID,
+    label& slavePatchID,
+    surfaceZonesInfo::faceZoneType& fzType
+) const
+{
+    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+
+    if (!faceZoneToMasterPatch_.found(fzName))
+    {
+        return false;
+    }
+    else
+    {
+        const word& masterName = faceZoneToMasterPatch_[fzName];
+        masterPatchID = pbm.findPatchID(masterName);
+
+        const word& slaveName = faceZoneToSlavePatch_[fzName];
+        slavePatchID = pbm.findPatchID(slaveName);
+
+        fzType = faceZoneToType_[fzName];
+
+        return true;
+    }
+}
+
+
 void Foam::meshRefinement::selectSeparatedCoupledFaces(boolList& selected) const
 {
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
@@ -2292,7 +2229,22 @@ Foam::label Foam::meshRefinement::findRegion
 )
 {
     label regionI = -1;
+
+    // Force calculation of base points (needs to be synchronised)
+    (void)mesh.tetBasePtIs();
+
     label cellI = mesh.findCell(p);
+    //if (cellI != -1)
+    //{
+    //    Pout<< "findRegion : Found point:" << p << " in cell " << cellI
+    //        << " at:" << mesh.cellCentres()[cellI] << endl;
+    //}
+    //else
+    //{
+    //    Pout<< "findRegion : Found point:" << p << " in cell " << cellI
+    //        << endl;
+    //}
+
     if (cellI != -1)
     {
         regionI = cellToRegion[cellI];
@@ -2311,13 +2263,148 @@ Foam::label Foam::meshRefinement::findRegion
     }
     return regionI;
 }
+//XXXXXXXX
+//Foam::labelList Foam::meshRefinement::findRegion
+//(
+//    const polyMesh& mesh,
+//    const labelList& cellToRegion,
+//    const vector& perturbVec,
+//    const pointField& pts
+//)
+//{
+//    labelList regions(pts.size(), -1);
+//
+//    forAll(pts, i)
+//    {
+//        label cellI = mesh.findCell(pts[i]);
+//        if (cellI != -1)
+//        {
+//            regions[i] = cellToRegion[cellI];
+//        }
+//        reduce(regions[i], maxOp<label>());
+//
+//        if (regions[i] == -1)
+//        {
+//            // See if we can perturb a bit
+//            cellI = mesh.findCell(pts[i]+perturbVec);
+//            if (cellI != -1)
+//            {
+//                regions[i] = cellToRegion[cellI];
+//            }
+//            reduce(regions[i], maxOp<label>());
+//        }
+//    }
+//
+//    forAll(regions, i)
+//    {
+//        if (regions[i] == -1)
+//        {
+//            FatalErrorInFunction
+//                << "Point " << pts[i]
+//                << " is not inside the mesh." << nl
+//                << "Bounding box of the mesh:" << mesh.bounds()
+//                //<< "All points " << pts
+//                //<< " with corresponding regions " << regions
+//                << exit(FatalError);
+//        }
+//    }
+//
+//    return regions;
+//}
+//XXXXXXXX
+
+
+// Modify cellRegion to be consistent with locationsInMesh.
+// - all regions not in locationsInMesh are set to -1
+// - check that all regions inside locationsOutsideMesh are set to -1
+void Foam::meshRefinement::findRegions
+(
+    const polyMesh& mesh,
+    const vector& perturbVec,
+    const pointField& locationsInMesh,
+    const pointField& locationsOutsideMesh,
+    const label nRegions,
+    labelList& cellRegion
+)
+{
+    PackedBoolList insideCell(mesh.nCells());
+
+
+    // Mark all cells reachable from locationsInMesh
+    labelList insideRegions(locationsInMesh.size());
+    forAll(insideRegions, i)
+    {
+        // Find the region containing the point
+        label regionI = findRegion
+        (
+            mesh,
+            cellRegion,
+            perturbVec,
+            locationsInMesh[i]
+        );
+
+        insideRegions[i] = regionI;
+
+        // Mark all cells in the region as being inside
+        forAll(cellRegion, cellI)
+        {
+            if (cellRegion[cellI] == regionI)
+            {
+                insideCell[cellI] = true;
+            }
+        }
+    }
+
+
+
+    // Check that all the locations outside the
+    // mesh do not conflict with those inside
+    forAll(locationsOutsideMesh, i)
+    {
+        // Find the region containing the point
+        label regionI = findRegion
+        (
+            mesh,
+            cellRegion,
+            perturbVec,
+            locationsOutsideMesh[i]
+        );
+
+        if (regionI != -1)
+        {
+            // Do a quick check for locationsOutsideMesh overlapping with
+            // inside ones.
+            label index = findIndex(insideRegions, regionI);
+            if (index != -1)
+            {
+                FatalErrorInFunction
+                    << "Location in mesh " << locationsInMesh[index]
+                    << " is inside same mesh region " << regionI
+                    << " as location outside mesh "
+                    << locationsOutsideMesh[i]
+                    << exit(FatalError);
+            }
+        }
+    }
+
+
+    // Now update cellRegion to -1 for unreachable cells
+    forAll(insideCell, cellI)
+    {
+        if (!insideCell[cellI])
+        {
+            cellRegion[cellI] = -1;
+        }
+    }
+}
 
 
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
 (
     const labelList& globalToMasterPatch,
     const labelList& globalToSlavePatch,
-    const point& keepPoint
+    const pointField& locationsInMesh,
+    const pointField& locationsOutsideMesh
 )
 {
     // Force calculation of face decomposition (used in findCell)
@@ -2331,25 +2418,16 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
 
     regionSplit cellRegion(mesh_, blockedFace);
 
-    label regionI = findRegion
+    findRegions
     (
         mesh_,
-        cellRegion,
-        mergeDistance_*vector(1,1,1), // note:1,1,1 should really be normalised
-        keepPoint
+        mergeDistance_*vector(1,1,1),   // perturbVec
+        locationsInMesh,
+        locationsOutsideMesh,
+        cellRegion.nRegions(),
+        cellRegion
     );
 
-    if (regionI == -1)
-    {
-        FatalErrorIn
-        (
-            "meshRefinement::splitMeshRegions(const point&)"
-        )   << "Point " << keepPoint
-            << " is not inside the mesh." << nl
-            << "Bounding box of the mesh:" << mesh_.bounds()
-            << exit(FatalError);
-    }
-
     // Subset
     // ~~~~~~
 
@@ -2357,62 +2435,70 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
     DynamicList<label> cellsToRemove(mesh_.nCells());
     forAll(cellRegion, cellI)
     {
-        if (cellRegion[cellI] != regionI)
+        if (cellRegion[cellI] == -1)
         {
             cellsToRemove.append(cellI);
         }
     }
     cellsToRemove.shrink();
 
-    label nCellsToKeep = mesh_.nCells() - cellsToRemove.size();
-    reduce(nCellsToKeep, sumOp<label>());
-
-    Info<< "Keeping all cells in region " << regionI
-        << " containing point " << keepPoint << endl
-        << "Selected for keeping : "
-        << nCellsToKeep
-        << " cells." << endl;
+    label nTotCellsToRemove = returnReduce
+    (
+        cellsToRemove.size(),
+        sumOp<label>()
+    );
 
 
-    // Remove cells
-    removeCells cellRemover(mesh_);
-
-    labelList exposedFaces(cellRemover.getExposedFaces(cellsToRemove));
-    labelList exposedPatch;
-
-    label nExposedFaces = returnReduce(exposedFaces.size(), sumOp<label>());
-    if (nExposedFaces)
+    autoPtr<mapPolyMesh> mapPtr;
+    if (nTotCellsToRemove > 0)
     {
-        //FatalErrorIn
-        //(
-        //    "meshRefinement::splitMeshRegions(const point&)"
-        //)   << "Removing non-reachable cells should only expose"
-        //    << " boundary faces" << nl
-        //    << "ExposedFaces:" << exposedFaces << abort(FatalError);
+        label nCellsToKeep =
+            mesh_.globalData().nTotalCells()
+          - nTotCellsToRemove;
 
-        // Patch for exposed faces for lack of anything sensible.
-        label defaultPatch = 0;
-        if (globalToMasterPatch.size())
+        Info<< "Keeping all cells containing points " << locationsInMesh << endl
+            << "Selected for keeping : "
+            << nCellsToKeep
+            << " cells." << endl;
+
+
+        // Remove cells
+        removeCells cellRemover(mesh_);
+
+        labelList exposedFaces(cellRemover.getExposedFaces(cellsToRemove));
+        labelList exposedPatch;
+
+        label nExposedFaces = returnReduce(exposedFaces.size(), sumOp<label>());
+        if (nExposedFaces)
         {
-            defaultPatch = globalToMasterPatch[0];
+            // FatalErrorInFunction
+            //    << "Removing non-reachable cells should only expose"
+            //    << " boundary faces" << nl
+            //    << "ExposedFaces:" << exposedFaces << abort(FatalError);
+
+            // Patch for exposed faces for lack of anything sensible.
+            label defaultPatch = 0;
+            if (globalToMasterPatch.size())
+            {
+                defaultPatch = globalToMasterPatch[0];
+            }
+
+            WarningInFunction
+                << "Removing non-reachable cells exposes "
+                << nExposedFaces << " internal or coupled faces." << endl
+                << "    These get put into patch " << defaultPatch << endl;
+            exposedPatch.setSize(exposedFaces.size(), defaultPatch);
         }
 
-        WarningIn
+        mapPtr = doRemoveCells
         (
-            "meshRefinement::splitMeshRegions(const point&)"
-        )   << "Removing non-reachable cells exposes "
-            << nExposedFaces << " internal or coupled faces." << endl
-            << "    These get put into patch " << defaultPatch << endl;
-        exposedPatch.setSize(exposedFaces.size(), defaultPatch);
+            cellsToRemove,
+            exposedFaces,
+            exposedPatch,
+            cellRemover
+        );
     }
-
-    return doRemoveCells
-    (
-        cellsToRemove,
-        exposedFaces,
-        exposedPatch,
-        cellRemover
-    );
+    return mapPtr;
 }
 
 
@@ -2428,6 +2514,10 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
     // surfaceIndex is face data.
     map.distributeFaceData(surfaceIndex_);
 
+    // faceToPatch (baffles that were on coupled faces) is not maintained
+    // (since baffling also disconnects points)
+    faceToCoupledPatch_.clear();
+
     // maintainedFaces are indices of faces.
     forAll(userFaceData_, i)
     {
@@ -2526,6 +2616,22 @@ void Foam::meshRefinement::updateMesh
     // Update surfaceIndex
     updateList(map.faceMap(), label(-1), surfaceIndex_);
 
+    // Update faceToCoupledPatch_
+    {
+        Map<label> newFaceToPatch(faceToCoupledPatch_.size());
+        forAllConstIter(Map<label>, faceToCoupledPatch_, iter)
+        {
+            label newFaceI = map.reverseFaceMap()[iter.key()];
+
+            if (newFaceI >= 0)
+            {
+                newFaceToPatch.insert(newFaceI, iter());
+            }
+        }
+        faceToCoupledPatch_.transfer(newFaceToPatch);
+    }
+
+
     // Update cached intersection information
     updateIntersections(changedFaces);
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index 7281a3d520..706a130b15 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,7 @@ Description
 SourceFiles
     meshRefinement.C
     meshRefinementBaffles.C
+    meshRefinementGapRefine.C
     meshRefinementMerge.C
     meshRefinementProblemCells.C
     meshRefinementRefine.C
@@ -51,6 +52,10 @@ SourceFiles
 #include "pointFieldsFwd.H"
 #include "Tuple2.H"
 #include "pointIndexHit.H"
+#include "wordPairHashTable.H"
+#include "surfaceZonesInfo.H"
+#include "volumeType.H"
+#include "DynamicField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,14 +71,11 @@ class refinementFeatures;
 class shellSurfaces;
 class removeCells;
 class fvMeshDistribute;
-class searchableSurface;
-class regionSplit;
-class globalIndex;
 class removePoints;
 class localPointRegion;
-
 class snapParameters;
 
+
 /*---------------------------------------------------------------------------*\
                            Class meshRefinement Declaration
 \*---------------------------------------------------------------------------*/
@@ -177,12 +179,23 @@ private:
         //- All shell-refinement interaction
         const shellSurfaces& shells_;
 
+        //- All limit-refinement interaction
+        const shellSurfaces& limitShells_;
+
         //- Refinement engine
         hexRef8 meshCutter_;
 
         //- Per cc-cc vector the index of the surface hit
         labelIOList surfaceIndex_;
 
+
+        // For baffle merging
+
+            //- Original patch for baffle faces that used to be on
+            //  coupled patches
+            Map<label> faceToCoupledPatch_;
+
+
         //- User supplied face based data.
         List<Tuple2<mapType, labelList> > userFaceData_;
 
@@ -190,6 +203,15 @@ private:
         //  order changes.
         wordList meshedPatches_;
 
+        //- FaceZone to master patch name
+        HashTable<word, word> faceZoneToMasterPatch_;
+
+        //- FaceZone to slave patch name
+        HashTable<word, word> faceZoneToSlavePatch_;
+
+        //- FaceZone to method to handle faces
+        HashTable<surfaceZonesInfo::faceZoneType, word> faceZoneToType_;
+
 
     // Private Member Functions
 
@@ -210,14 +232,19 @@ private:
         );
 
         //- Calculate coupled boundary end vector and refinement level
-        void calcNeighbourData
-        (
-            labelList& neiLevel,
-            pointField& neiCc
-        ) const;
+        void calcNeighbourData(labelList& neiLevel, pointField& neiCc) const;
 
-        //- Find any intersection of surface. Store in surfaceIndex_.
-        void updateIntersections(const labelList& changedFaces);
+        //- Calculate rays from cell-centre to cell-centre and corresponding
+        //  min cell refinement level
+        void calcCellCellRays
+        (
+            const pointField& neiCc,
+            const labelList& neiLevel,
+            const labelList& testFaces,
+            pointField& start,
+            pointField& end,
+            labelList& minLevel
+        ) const;
 
         //- Remove cells. Put exposedFaces into exposedPatchIDs.
         autoPtr<mapPolyMesh> doRemoveCells
@@ -228,12 +255,12 @@ private:
             removeCells& cellRemover
         );
 
-        // Get cells which are inside any closed surface. Note that
-        // all closed surfaces
-        // will have already been oriented to have keepPoint outside.
+        //- Get cells which are inside any closed surface. Note that
+        //  all closed surfaces
+        //  will have already been oriented to have keepPoint outside.
         labelList getInsideCells(const word&) const;
 
-        // Do all to remove inside cells
+        //- Do all to remove inside cells
         autoPtr<mapPolyMesh> removeInsideCells
         (
             const string& msg,
@@ -289,6 +316,14 @@ private:
                 label& nRefine
             ) const;
 
+            //- Unmark cells for refinement based on limit-shells. Return number
+            //  of limited cells.
+            label unmarkInternalRefinement
+            (
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
             //- Collect faces that are intersected and whose neighbours aren't
             //  yet marked  for refinement.
             labelList getRefineCandidateFaces
@@ -306,6 +341,104 @@ private:
                 label& nRefine
             ) const;
 
+            //- Mark cells intersected by the surface if they are inside
+            //  close gaps
+            label markSurfaceGapRefinement
+            (
+                const scalar planarCos,
+                const label nAllowRefine,
+                const labelList& neiLevel,
+                const pointField& neiCc,
+
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
+            //- Generate single ray from nearPoint in direction of nearNormal
+            label generateRays
+            (
+                const point& nearPoint,
+                const vector& nearNormal,
+                const FixedList<label, 3>& gapInfo,
+                const volumeType& mode,
+
+                const label cLevel,
+
+                DynamicField<point>& start,
+                DynamicField<point>& end
+            ) const;
+
+            //- Generate pairs of rays through cell centre
+            //  Each ray pair has start, end, and expected gap size
+            label generateRays
+            (
+                const bool useSurfaceNormal,
+
+                const point& nearPoint,
+                const vector& nearNormal,
+                const FixedList<label, 3>& gapInfo,
+                const volumeType& mode,
+
+                const point& cc,
+                const label cLevel,
+
+                DynamicField<point>& start,
+                DynamicField<point>& end,
+                DynamicField<scalar>& gapSize,
+
+                DynamicField<point>& start2,
+                DynamicField<point>& end2,
+                DynamicField<scalar>& gapSize2
+            ) const;
+
+            //- Select candidate cells (cells inside a shell with gapLevel
+            //  specified)
+            void selectGapCandidates
+            (
+                const labelList& refineCell,
+                const label nRefine,
+
+                labelList& cellMap,
+                List<FixedList<label, 3> >& shellGapInfo,
+                List<volumeType>& shellGapMode
+            ) const;
+
+            //- Merge gap information coming from shell and from surface
+            //  (surface wins)
+            void mergeGapInfo
+            (
+                const FixedList<label, 3>& shellGapInfo,
+                const volumeType shellGapMode,
+                const FixedList<label, 3>& surfGapInfo,
+                const volumeType surfGapMode,
+                FixedList<label, 3>& gapInfo,
+                volumeType& gapMode
+            ) const;
+
+            //- Mark cells for non-surface intersection based gap refinement
+            label markInternalGapRefinement
+            (
+                const scalar planarCos,
+                const bool spreadGapSize,
+                const label nAllowRefine,
+                labelList& refineCell,
+                label& nRefine,
+                labelList& numGapCells,
+                scalarField& gapSize
+            ) const;
+
+            //- Refine cells containing small gaps
+            label markSmallFeatureRefinement
+            (
+                const scalar planarCos,
+                const label nAllowRefine,
+                const labelList& neiLevel,
+                const pointField& neiCc,
+
+                labelList& refineCell,
+                label& nRefine
+            ) const;
+
             //- Helper: count number of normals1 that are in normals2
             label countMatches
             (
@@ -369,10 +502,26 @@ private:
                 const labelList& globalToSlavePatch
             ) const;
 
-            //- Determine patches for baffles
+            //- Calculate intersections. Return per face -1 or the global
+            //  surface region
+            void getIntersections
+            (
+                const labelList& surfacesToTest,
+                const labelList& neiLevel,
+                const pointField& neiCc,
+                const labelList& testFaces,
+
+                labelList& globalRegion1,
+                labelList& globalRegion2
+            ) const;
+
+            //- Determine patches for baffles on all intersected unnamed faces
             void getBafflePatches
             (
                 const labelList& globalToMasterPatch,
+                const pointField& locationsInMesh,
+                const wordList& regionsInMesh,
+
                 const labelList& neiLevel,
                 const pointField& neiCc,
                 labelList& ownPatch,
@@ -454,7 +603,9 @@ private:
             labelList markFacesOnProblemCellsGeometric
             (
                 const snapParameters& snapParams,
-                const dictionary& motionDict
+                const dictionary& motionDict,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch
             ) const;
 
 
@@ -494,6 +645,16 @@ private:
                 labelList& cellToZone
             ) const;
 
+            //- Finds zone per cell for cells inside region for which name
+            //  is specified.
+            void findCellZoneInsideWalk
+            (
+                const pointField& locationsInMesh,
+                const wordList& regionsInMesh,
+                const labelList& blockedFace, // per face -1 or some index >= 0
+                labelList& cellToZone
+            ) const;
+
             //- Determines cell zone from cell region information.
             bool calcRegionToZone
             (
@@ -508,18 +669,40 @@ private:
             //  marked in namedSurfaceIndex regarded as blocked.
             void findCellZoneTopo
             (
-                const point& keepPoint,
+                const pointField& locationsInMesh,
                 const labelList& namedSurfaceIndex,
                 const labelList& surfaceToCellZone,
                 labelList& cellToZone
             ) const;
 
+            //- Make namedSurfaceIndex consistent with cellToZone
+            //  - clear out any blocked faces inbetween same cell zone.
             void makeConsistentFaceIndex
             (
                 const labelList& cellToZone,
                 labelList& namedSurfaceIndex
             ) const;
 
+            //- Put cells into cellZone, faces into faceZone
+            void zonify
+            (
+                const PackedBoolList& isMasterFace,
+                const labelList& cellToZone,
+                const labelList& neiCellZone,
+                const labelList& faceToZone,
+                const PackedBoolList& meshFlipMap,
+                polyTopoChange& meshMod
+            ) const;
+
+            //- Allocate faceZoneName
+            void allocateInterRegionFaceZone
+            (
+                const label ownZone,
+                const label neiZone,
+                wordPairHashTable& zonesToFaceZone,
+                HashTable<word, labelPair, labelPair::Hash<> >&
+            ) const;
+
             //- Remove any loose standing cells
             void handleSnapProblems
             (
@@ -536,11 +719,11 @@ private:
 
             // Some patch utilities
 
-            //- Get all faces in namedSurfaceIndex that have no cellZone on
+            //- Get all faces in faceToZone that have no cellZone on
             //  either side.
             labelList freeStandingBaffleFaces
             (
-                const labelList& namedSurfaceIndex,
+                const labelList& faceToZone,
                 const labelList& cellToZone,
                 const labelList& neiCellZone
             ) const;
@@ -571,7 +754,7 @@ private:
                 const labelList& nMasterFaces,
                 const labelList& faceToZone,
                 const Map<label>& zoneToOrientation,
-                boolList& meshFlipMap
+                PackedBoolList& meshFlipMap
             ) const;
 
 
@@ -597,6 +780,7 @@ public:
             const bool overwrite,
             const refinementSurfaces&,
             const refinementFeatures&,
+            const shellSurfaces&,
             const shellSurfaces&
         );
 
@@ -667,6 +851,13 @@ public:
                 return surfaceIndex_;
             }
 
+            //- For faces originating from processor faces store the original
+            //  patch
+            const Map<label>& faceToCoupledPatch() const
+            {
+                return faceToCoupledPatch_;
+            }
+
             //- Additional face data that is maintained across
             //  topo changes. Every entry is a list over all faces.
             //  Bit of a hack. Additional flag to say whether to maintain master
@@ -788,7 +979,10 @@ public:
                 const bool internalRefinement,
                 const bool surfaceRefinement,
                 const bool curvatureRefinement,
+                const bool smallFeatureRefinement,
                 const bool gapRefinement,
+                const bool bigGapRefinement,
+                const bool spreadGapSize,
                 const label maxGlobalCells,
                 const label maxLocalCells
             ) const;
@@ -829,16 +1023,29 @@ public:
                 const bool useTopologicalSnapDetection,
                 const bool removeEdgeConnectedCells,
                 const scalarField& perpendicularAngle,
-
-                // How to handle free-standing baffles
-                const bool mergeFreeStanding,
-                const scalar freeStandingAngle,
-
                 const dictionary& motionDict,
                 Time& runTime,
                 const labelList& globalToMasterPatch,
                 const labelList& globalToSlavePatch,
-                const point& keepPoint
+                const pointField& locationsInMesh,
+                const wordList& regionsInMesh,
+                const pointField& locationsOutsideMesh
+            );
+
+            //- Merge free-standing baffles
+            void mergeFreeStandingBaffles
+            (
+                const snapParameters& snapParams,
+                const bool useTopologicalSnapDetection,
+                const bool removeEdgeConnectedCells,
+                const scalarField& perpendicularAngle,
+                const scalar planarAngle,
+                const dictionary& motionDict,
+                Time& runTime,
+                const labelList& globalToMasterPatch,
+                const labelList& globalToSlavePatch,
+                const pointField& locationsInMesh,
+                const pointField& locationsOutsideMesh
             );
 
             //- Split off (with optional buffer layers) unreachable areas
@@ -848,7 +1055,10 @@ public:
                 const label nBufferLayers,
                 const labelList& globalToMasterPatch,
                 const labelList& globalToSlavePatch,
-                const point& keepPoint
+
+                const pointField& locationsInMesh,
+                const wordList& regionsInMesh,
+                const pointField& locationsOutsideMesh
             );
 
             //- Find boundary points that connect to more than one cell
@@ -859,6 +1069,16 @@ public:
             //  region and split them.
             autoPtr<mapPolyMesh> dupNonManifoldPoints();
 
+            //- Find boundary points that are on faceZones of type boundary
+            //  and duplicate them
+            autoPtr<mapPolyMesh> dupNonManifoldBoundaryPoints();
+
+            //- Merge duplicate points
+            autoPtr<mapPolyMesh> mergePoints
+            (
+                const labelList& pointToDuplicate
+            );
+
             //- Create baffle for every internal face where ownPatch != -1.
             //  External faces get repatched according to ownPatch (neiPatch
             //  should be -1 for these)
@@ -868,28 +1088,55 @@ public:
                 const labelList& neiPatch
             );
 
-            //- Debug helper: check faceZones are not on processor patches
-            void checkZoneFaces() const;
-
-            //- Create baffles for faces straddling zoned surfaces. Return
-            //  baffles.
-            autoPtr<mapPolyMesh> createZoneBaffles
+            //- Get zones of given type
+            labelList getZones
             (
-                const labelList& globalToMasterPatch,
-                const labelList& globalToSlavePatch,
-                List<labelPair>&
+                const List<surfaceZonesInfo::faceZoneType>& fzTypes
+            ) const;
+
+            //- Subset baffles according to zones
+            static List<labelPair> subsetBaffles
+            (
+                const polyMesh& mesh,
+                const labelList& zoneIDs,
+                const List<labelPair>& baffles
             );
 
-            //- Merge baffles. Gets pairs of faces.
-            autoPtr<mapPolyMesh> mergeBaffles(const List<labelPair>&);
+            //- Create baffles for faces on faceZones. Return created baffles
+            //  (= pairs of faces) and corresponding faceZone
+            autoPtr<mapPolyMesh> createZoneBaffles
+            (
+                const labelList& zoneIDs,
+                List<labelPair>& baffles,
+                labelList& originatingFaceZone
+            );
+
+            //- Merge baffles. Gets pairs of faces and boundary faces to move
+            //  onto (coupled) patches
+            autoPtr<mapPolyMesh> mergeBaffles
+            (
+                const List<labelPair>&,
+                const Map<label>& faceToPatch
+            );
+
+            //- Merge all baffles on faceZones
+            autoPtr<mapPolyMesh> mergeZoneBaffles
+            (
+                const bool doInternalZones,
+                const bool doBaffleZones
+            );
 
             //- Put faces/cells into zones according to surface specification.
-            //  Returns null if no zone surfaces present. Region containing
-            //  the keepPoint will not be put into a cellZone.
+            //  Returns null if no zone surfaces present. Regions containing
+            //  locationsInMesh/regionsInMesh will be put in corresponding
+            //  cellZone. keepPoints is for backwards compatibility and sets
+            //  all yet unassigned cells to be non-zoned (zone = -1)
             autoPtr<mapPolyMesh> zonify
             (
-                const point& keepPoint,
-                const bool allowFreeStandingZoneFaces
+                const bool allowFreeStandingZoneFaces,
+                const pointField& locationsInMesh,
+                const wordList& regionsInMesh,
+                wordPairHashTable& zonesToFaceZone
             );
 
 
@@ -914,9 +1161,32 @@ public:
             //- Get patchIDs for patches added in addMeshedPatch.
             labelList meshedPatches() const;
 
+            //- Add/lookup faceZone and update information. Return index of
+            //  faceZone
+            label addFaceZone
+            (
+                const word& fzName,
+                const word& masterPatch,
+                const word& slavePatch,
+                const surfaceZonesInfo::faceZoneType& fzType
+            );
+
+            //- Lookup faceZone information. Return false if no information
+            //  for faceZone
+            bool getFaceZoneInfo
+            (
+                const word& fzName,
+                label& masterPatchID,
+                label& slavePatchID,
+                surfaceZonesInfo::faceZoneType& fzType
+            ) const;
+
             //- Select coupled faces that are not collocated
             void selectSeparatedCoupledFaces(boolList&) const;
 
+            //- Find any intersection of surface. Store in surfaceIndex_.
+            void updateIntersections(const labelList& changedFaces);
+
             //- Find region point is in. Uses optional perturbation to re-test.
             static label findRegion
             (
@@ -926,19 +1196,44 @@ public:
                 const point& p
             );
 
-            //- Split mesh. Keep part containing point.
+            static void findRegions
+            (
+                const polyMesh&,
+                const vector& perturbVec,
+                const pointField& locationsInMesh,
+                const pointField& locationsOutsideMesh,
+                const label nRegions,
+                labelList& cellRegion
+            );
+
+            //- Split mesh. Keep part containing point. Return empty map if
+            //  no cells removed.
             autoPtr<mapPolyMesh> splitMeshRegions
             (
                 const labelList& globalToMasterPatch,
                 const labelList& globalToSlavePatch,
-                const point& keepPoint
+                const pointField& locationsInMesh,
+                const pointField& locationsOutsideMesh
             );
 
             //- Split faces into two
-            autoPtr<mapPolyMesh> splitFaces
+            void doSplitFaces
             (
                 const labelList& splitFaces,
-                const labelPairList& splits
+                const labelPairList& splits,
+                polyTopoChange& meshMod
+            ) const;
+
+            //- Split faces along diagonal. Maintain mesh quality. Return
+            //  total number of faces split.
+            label splitFacesUndo
+            (
+                const labelList& splitFaces,
+                const labelPairList& splits,
+                const dictionary& motionDict,
+
+                labelList& duplicateFace,
+                List<labelPair>& baffles
             );
 
             //- Update local numbering for mesh redistribution
@@ -986,6 +1281,16 @@ public:
 
             // Merging coplanar faces and edges
 
+                //- Merge coplanar faces if sets are of size mergeSize
+                //  (usually 4)
+                label mergePatchFaces
+                (
+                    const scalar minCos,
+                    const scalar concaveCos,
+                    const label mergeSize,
+                    const labelList& patchIDs
+                );
+
                 //- Merge coplanar faces. preserveFaces is != -1 for faces
                 //  to be preserved
                 label mergePatchFacesUndo
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index d9ec65959c..6fe484ac27 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,6 @@ License
 #include "polyAddPoint.H"
 #include "localPointRegion.H"
 #include "duplicatePoints.H"
-#include "OFstream.H"
 #include "regionSplit.H"
 #include "removeCells.H"
 #include "unitConversion.H"
@@ -48,12 +47,12 @@ License
 #include "patchFaceOrientation.H"
 #include "PatchEdgeFaceWave.H"
 #include "patchEdgeFaceRegion.H"
+#include "polyMeshAdder.H"
+#include "IOmanip.H"
+#include "refinementParameters.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Repatches external face or creates baffle for internal face
-// with user specified patches (might be different for both sides).
-// Returns label of added face.
 Foam::label Foam::meshRefinement::createBaffle
 (
     const label faceI,
@@ -95,11 +94,8 @@ Foam::label Foam::meshRefinement::createBaffle
     {
         if (neiPatch == -1)
         {
-            FatalErrorIn
-            (
-                "meshRefinement::createBaffle"
-                "(const label, const label, const label, polyTopoChange&)"
-            )   << "No neighbour patch for internal face " << faceI
+            FatalErrorInFunction
+                << "No neighbour patch for internal face " << faceI
                 << " fc:" << mesh_.faceCentres()[faceI]
                 << " ownPatch:" << ownPatch << abort(FatalError);
         }
@@ -170,52 +166,39 @@ Foam::label Foam::meshRefinement::createBaffle
 //}
 
 
-// Determine patches for baffles on all intersected unnamed faces
-void Foam::meshRefinement::getBafflePatches
+void Foam::meshRefinement::getIntersections
 (
-    const labelList& globalToMasterPatch,
+    const labelList& surfacesToTest,
     const labelList& neiLevel,
     const pointField& neiCc,
+    const labelList& testFaces,
 
-    labelList& ownPatch,
-    labelList& neiPatch
+    labelList& globalRegion1,
+    labelList& globalRegion2
 ) const
 {
-    autoPtr<OFstream> str;
-    label vertI = 0;
+    autoPtr<OBJstream> str;
     if (debug&OBJINTERSECTIONS)
     {
         mkDir(mesh_.time().path()/timeName());
         str.reset
         (
-            new OFstream
+            new OBJstream
             (
                 mesh_.time().path()/timeName()/"intersections.obj"
             )
         );
 
-        Pout<< "getBafflePatches : Writing surface intersections to file "
+        Pout<< "getIntersections : Writing surface intersections to file "
             << str().name() << nl << endl;
     }
 
-    const pointField& cellCentres = mesh_.cellCentres();
 
-    // Surfaces that need to be baffled
-    const labelList surfacesToBaffle
-    (
-        surfaceZonesInfo::getUnnamedSurfaces(surfaces_.surfZones())
-    );
+    globalRegion1.setSize(mesh_.nFaces());
+    globalRegion1 = -1;
+    globalRegion2.setSize(mesh_.nFaces());
+    globalRegion2 = -1;
 
-    ownPatch.setSize(mesh_.nFaces());
-    ownPatch = -1;
-    neiPatch.setSize(mesh_.nFaces());
-    neiPatch = -1;
-
-
-    // Collect candidate faces
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelList testFaces(intersectedFaces());
 
     // Collect segments
     // ~~~~~~~~~~~~~~~~
@@ -223,29 +206,17 @@ void Foam::meshRefinement::getBafflePatches
     pointField start(testFaces.size());
     pointField end(testFaces.size());
 
-    forAll(testFaces, i)
     {
-        label faceI = testFaces[i];
-
-        label own = mesh_.faceOwner()[faceI];
-
-        if (mesh_.isInternalFace(faceI))
-        {
-            start[i] = cellCentres[own];
-            end[i] = cellCentres[mesh_.faceNeighbour()[faceI]];
-        }
-        else
-        {
-            start[i] = cellCentres[own];
-            end[i] = neiCc[faceI-mesh_.nInternalFaces()];
-        }
-    }
-
-    // Extend segments a bit
-    {
-        const vectorField smallVec(ROOTSMALL*(end-start));
-        start -= smallVec;
-        end += smallVec;
+        labelList minLevel;
+        calcCellCellRays
+        (
+            neiCc,
+            neiLevel,
+            testFaces,
+            start,
+            end,
+            minLevel
+        );
     }
 
 
@@ -259,7 +230,7 @@ void Foam::meshRefinement::getBafflePatches
     labelList region2;
     surfaces_.findNearestIntersection
     (
-        surfacesToBaffle,
+        surfacesToTest,
         start,
         end,
 
@@ -272,6 +243,7 @@ void Foam::meshRefinement::getBafflePatches
         region2
     );
 
+
     forAll(testFaces, i)
     {
         label faceI = testFaces[i];
@@ -280,36 +252,173 @@ void Foam::meshRefinement::getBafflePatches
         {
             if (str.valid())
             {
-                meshTools::writeOBJ(str(), start[i]);
-                vertI++;
-                meshTools::writeOBJ(str(), hit1[i].rawPoint());
-                vertI++;
-                meshTools::writeOBJ(str(), hit2[i].rawPoint());
-                vertI++;
-                meshTools::writeOBJ(str(), end[i]);
-                vertI++;
-                str()<< "l " << vertI-3 << ' ' << vertI-2 << nl;
-                str()<< "l " << vertI-2 << ' ' << vertI-1 << nl;
-                str()<< "l " << vertI-1 << ' ' << vertI << nl;
+                str().write(linePointRef(start[i], hit1[i].rawPoint()));
+                str().write
+                (
+                    linePointRef(hit1[i].rawPoint(), hit2[i].rawPoint())
+                );
+                str().write(linePointRef(hit2[i].rawPoint(), end[i]));
             }
 
             // Pick up the patches
-            ownPatch[faceI] = globalToMasterPatch
-            [
-                surfaces_.globalRegion(surface1[i], region1[i])
-            ];
-            neiPatch[faceI] = globalToMasterPatch
-            [
-                surfaces_.globalRegion(surface2[i], region2[i])
-            ];
+            globalRegion1[faceI] =
+                surfaces_.globalRegion(surface1[i], region1[i]);
+            globalRegion2[faceI] =
+                surfaces_.globalRegion(surface2[i], region2[i]);
 
-            if (ownPatch[faceI] == -1 || neiPatch[faceI] == -1)
+            if (globalRegion1[faceI] == -1 || globalRegion2[faceI] == -1)
             {
-                FatalErrorIn("getBafflePatches(..)")
+                FatalErrorInFunction
                     << "problem." << abort(FatalError);
             }
         }
     }
+}
+
+
+// Determine patches for baffles on all intersected unnamed faces
+void Foam::meshRefinement::getBafflePatches
+(
+    const labelList& globalToMasterPatch,
+    const pointField& locationsInMesh,
+    const wordList& zonesInMesh,
+
+    const labelList& neiLevel,
+    const pointField& neiCc,
+
+    labelList& ownPatch,
+    labelList& neiPatch
+) const
+{
+    // Check all unnamed surfaces
+
+    {
+        const labelList testFaces(intersectedFaces());
+
+        labelList globalRegion1;
+        labelList globalRegion2;
+        getIntersections
+        (
+            surfaceZonesInfo::getUnnamedSurfaces(surfaces_.surfZones()),
+            neiLevel,
+            neiCc,
+            testFaces,
+            globalRegion1,
+            globalRegion2
+        );
+
+        ownPatch.setSize(mesh_.nFaces());
+        ownPatch = -1;
+        neiPatch.setSize(mesh_.nFaces());
+        neiPatch = -1;
+        forAll(testFaces, i)
+        {
+            label faceI = testFaces[i];
+            if (globalRegion1[faceI] != -1)
+            {
+                ownPatch[faceI] = globalToMasterPatch[globalRegion1[faceI]];
+            }
+            if (globalRegion2[faceI] != -1)
+            {
+                neiPatch[faceI] = globalToMasterPatch[globalRegion2[faceI]];
+            }
+        }
+    }
+
+
+    if (locationsInMesh.size() > 1)
+    {
+        // Now we need to filter out any possible intersections between
+        // multiple regions. Only the faces on the outside of all
+        // regions are candidates for baffling.
+        // For this we need to go to per-cell information
+
+        labelList cellToZone(mesh_.nCells(), -2);
+
+
+        // Closed surfaces with cellZone specified.
+        const labelList closedNamedSurfaces
+        (
+            surfaceZonesInfo::getClosedNamedSurfaces
+            (
+                surfaces_.surfZones(),
+                surfaces_.geometry(),
+                surfaces_.surfaces()
+            )
+        );
+
+        if (closedNamedSurfaces.size())
+        {
+            Info<< "Found " << closedNamedSurfaces.size()
+                << " closed, named surfaces. Assigning cells in/outside"
+                << " these surfaces to the corresponding cellZone."
+                << nl << endl;
+
+            findCellZoneGeometric
+            (
+                neiCc,
+                closedNamedSurfaces,    // indices of closed surfaces
+                ownPatch,               // per face patch
+                labelList(mesh_.boundaryMesh().size(), 0),// cellZone per patch
+
+                cellToZone
+            );
+        }
+
+        // Locations in mesh - walk
+        findCellZoneInsideWalk
+        (
+            locationsInMesh,
+            zonesInMesh,
+            ownPatch,   // per face -1 or some index >= 0
+            cellToZone
+        );
+
+
+        // Now we will still have some -2 in cellToZone on parts that
+        // are unreachable from the locationsInMesh or named surfaces. We only
+        // want to keep the interfaces to these cellZones.
+
+
+        labelList neiCellZone;
+        syncTools::swapBoundaryCellList(mesh_, cellToZone, neiCellZone);
+
+        // Only keep baffles where one of the sides has an unset cellToZone (-2)
+        for (label faceI=0; faceI < mesh_.nInternalFaces(); faceI++)
+        {
+            if (ownPatch[faceI] != -1 || neiPatch[faceI] != -1)
+            {
+                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+                label neiZone = cellToZone[mesh_.faceNeighbour()[faceI]];
+
+                if (ownZone != -2 && neiZone != -2)
+                {
+                    ownPatch[faceI] = -1;
+                    neiPatch[faceI] = -1;
+                }
+            }
+        }
+        for
+        (
+            label faceI = mesh_.nInternalFaces();
+            faceI < mesh_.nFaces();
+            faceI++
+        )
+        {
+            if (ownPatch[faceI] != -1 || neiPatch[faceI] != -1)
+            {
+                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+                label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
+
+                if (ownZone != -2 && neiZone != -2)
+                {
+                    ownPatch[faceI] = -1;
+                    neiPatch[faceI] = -1;
+                }
+            }
+        }
+    }
+
 
     // No need to parallel sync since intersection data (surfaceIndex_ etc.)
     // already guaranteed to be synced...
@@ -374,7 +483,7 @@ Foam::Map<Foam::labelPair> Foam::meshRefinement::getZoneBafflePatches
 
                     if (!bafflePatch.insert(faceI, patches))
                     {
-                        FatalErrorIn("getZoneBafflePatches(..)")
+                        FatalErrorInFunction
                             << "Face " << faceI
                             << " fc:" << mesh_.faceCentres()[faceI]
                             << " in zone " << fZone.name()
@@ -389,7 +498,6 @@ Foam::Map<Foam::labelPair> Foam::meshRefinement::getZoneBafflePatches
 }
 
 
-// Create baffle for every face where ownPatch != -1
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
 (
     const labelList& ownPatch,
@@ -402,11 +510,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
      || neiPatch.size() != mesh_.nFaces()
     )
     {
-        FatalErrorIn
-        (
-            "meshRefinement::createBaffles"
-            "(const labelList&, const labelList&)"
-        )   << "Illegal size :"
+        FatalErrorInFunction
+            << "Illegal size :"
             << " ownPatch:" << ownPatch.size()
             << " neiPatch:" << neiPatch.size()
             << ". Should be number of faces:" << mesh_.nFaces()
@@ -428,11 +533,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
              || (neiPatch[faceI] == -1 && syncedNeiPatch[faceI] != -1)
             )
             {
-                FatalErrorIn
-                (
-                    "meshRefinement::createBaffles"
-                    "(const labelList&, const labelList&)"
-                )   << "Non synchronised at face:" << faceI
+                FatalErrorInFunction
+                    << "Non synchronised at face:" << faceI
                     << " on patch:" << mesh_.boundaryMesh().whichPatch(faceI)
                     << " fc:" << mesh_.faceCentres()[faceI] << endl
                     << "ownPatch:" << ownPatch[faceI]
@@ -449,7 +551,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
 
     label nBaffles = 0;
 
-    forAll(ownPatch, faceI)
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
     {
         if (ownPatch[faceI] != -1)
         {
@@ -465,184 +567,318 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
             nBaffles++;
         }
     }
-
-    // Change the mesh (no inflation, parallel sync)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
-
-    // Update fields
-    mesh_.updateMesh(map);
-
-    // Move mesh if in inflation mode
-    if (map().hasMotionPoints())
-    {
-        mesh_.movePoints(map().preMotionPoints());
-    }
-    else
-    {
-        // Delete mesh volumes.
-        mesh_.clearOut();
-    }
-
-
-    // Reset the instance for if in overwrite mode
-    mesh_.setInstance(timeName());
-
-    //- Redo the intersections on the newly create baffle faces. Note that
-    //  this changes also the cell centre positions.
-    faceSet baffledFacesSet(mesh_, "baffledFacesSet", 2*nBaffles);
-
-    const labelList& reverseFaceMap = map().reverseFaceMap();
-    const labelList& faceMap = map().faceMap();
-
-    // Pick up owner side of baffle
-    forAll(ownPatch, oldFaceI)
-    {
-        label faceI = reverseFaceMap[oldFaceI];
-
-        if (ownPatch[oldFaceI] != -1 && faceI >= 0)
-        {
-            const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
-
-            forAll(ownFaces, i)
-            {
-                baffledFacesSet.insert(ownFaces[i]);
-            }
-        }
-    }
-    // Pick up neighbour side of baffle (added faces)
-    forAll(faceMap, faceI)
-    {
-        label oldFaceI = faceMap[faceI];
-
-        if (oldFaceI >= 0 && reverseFaceMap[oldFaceI] != faceI)
-        {
-            const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
-
-            forAll(ownFaces, i)
-            {
-                baffledFacesSet.insert(ownFaces[i]);
-            }
-        }
-    }
-    baffledFacesSet.sync(mesh_);
-
-    updateMesh(map, baffledFacesSet.toc());
-
-    return map;
-}
-
-
-void Foam::meshRefinement::checkZoneFaces() const
-{
-    const faceZoneMesh& fZones = mesh_.faceZones();
-
     const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
 
     forAll(pbm, patchI)
     {
         const polyPatch& pp = pbm[patchI];
 
-        if (isA<processorPolyPatch>(pp))
+        label coupledPatchI = -1;
+        if
+        (
+            pp.coupled()
+        && !refCast<const coupledPolyPatch>(pp).separated()
+        )
         {
-            forAll(pp, i)
-            {
-                label faceI = pp.start()+i;
-                label zoneI = fZones.whichZone(faceI);
+            coupledPatchI = patchI;
+        }
 
-                if (zoneI != -1)
+        forAll(pp, i)
+        {
+            label faceI = pp.start()+i;
+
+            if (ownPatch[faceI] != -1)
+            {
+                createBaffle
+                (
+                    faceI,
+                    ownPatch[faceI],    // owner side patch
+                    neiPatch[faceI],    // neighbour side patch
+                    meshMod
+                );
+
+                if (coupledPatchI != -1)
                 {
-                    FatalErrorIn("meshRefinement::checkZoneFaces")
-                        << "face:" << faceI << " on patch " << pp.name()
-                        << " is in zone " << fZones[zoneI].name()
-                        << exit(FatalError);
+                    faceToCoupledPatch_.insert(faceI, coupledPatchI);
                 }
+
+                nBaffles++;
             }
         }
     }
+
+
+    autoPtr<mapPolyMesh> map;
+    if (returnReduce(nBaffles, sumOp<label>()))
+    {
+        // Change the mesh (no inflation, parallel sync)
+        map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh if in inflation mode
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes.
+            mesh_.clearOut();
+        }
+
+
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+
+        //- Redo the intersections on the newly create baffle faces. Note that
+        //  this changes also the cell centre positions.
+        faceSet baffledFacesSet(mesh_, "baffledFacesSet", 2*nBaffles);
+
+        const labelList& reverseFaceMap = map().reverseFaceMap();
+        const labelList& faceMap = map().faceMap();
+
+        // Pick up owner side of baffle
+        forAll(ownPatch, oldFaceI)
+        {
+            label faceI = reverseFaceMap[oldFaceI];
+
+            if (ownPatch[oldFaceI] != -1 && faceI >= 0)
+            {
+                const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+
+                forAll(ownFaces, i)
+                {
+                    baffledFacesSet.insert(ownFaces[i]);
+                }
+            }
+        }
+        // Pick up neighbour side of baffle (added faces)
+        forAll(faceMap, faceI)
+        {
+            label oldFaceI = faceMap[faceI];
+
+            if (oldFaceI >= 0 && reverseFaceMap[oldFaceI] != faceI)
+            {
+                const cell& ownFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+
+                forAll(ownFaces, i)
+                {
+                    baffledFacesSet.insert(ownFaces[i]);
+                }
+            }
+        }
+        baffledFacesSet.sync(mesh_);
+
+        updateMesh(map, baffledFacesSet.toc());
+    }
+
+    return map;
+}
+
+
+Foam::labelList Foam::meshRefinement::getZones
+(
+    const List<surfaceZonesInfo::faceZoneType>& fzTypes
+) const
+{
+    const faceZoneMesh& faceZones = mesh_.faceZones();
+
+    DynamicList<label> zoneIDs(faceZones.size());
+
+    forAll(faceZones, zoneI)
+    {
+        const faceZone& fZone = faceZones[zoneI];
+
+        label mpI, spI;
+        surfaceZonesInfo::faceZoneType fzType;
+        bool hasInfo = getFaceZoneInfo(fZone.name(), mpI, spI, fzType);
+
+        if (hasInfo && findIndex(fzTypes, fzType) != -1)
+        {
+            zoneIDs.append(zoneI);
+        }
+    }
+    return zoneIDs;
+}
+
+
+// Subset those baffles where both faces are on the same zone
+Foam::List<Foam::labelPair> Foam::meshRefinement::subsetBaffles
+(
+    const polyMesh& mesh,
+    const labelList& zoneIDs,
+    const List<labelPair>& baffles
+)
+{
+    const faceZoneMesh& faceZones = mesh.faceZones();
+
+    // Mark zone per face
+    labelList faceToZone(mesh.nFaces(), -1);
+
+    forAll(zoneIDs, i)
+    {
+        label zoneID = zoneIDs[i];
+        UIndirectList<label>(faceToZone, faceZones[zoneID]) = zoneID;
+    }
+
+
+    // Subset baffles
+    DynamicList<labelPair> newBaffles(baffles.size());
+    forAll(baffles, i)
+    {
+        const labelPair& p = baffles[i];
+        if (faceToZone[p[0]] != -1 && (faceToZone[p[0]] == faceToZone[p[1]]))
+        {
+            newBaffles.append(p);
+        }
+    }
+
+    return newBaffles;
 }
 
 
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
 (
-    const labelList& globalToMasterPatch,
-    const labelList& globalToSlavePatch,
-    List<labelPair>& baffles
+    const labelList& zoneIDs,
+    List<labelPair>& baffles,
+    labelList& originatingFaceZone
 )
 {
-    const labelList zonedSurfaces
-    (
-        surfaceZonesInfo::getNamedSurfaces(surfaces_.surfZones())
-    );
-
     autoPtr<mapPolyMesh> map;
 
-    // No need to sync; all processors will have all same zonedSurfaces.
-    if (zonedSurfaces.size())
+    if (zoneIDs.size() > 0)
     {
+        const faceZoneMesh& faceZones = mesh_.faceZones();
+
         // Split internal faces on interface surfaces
         Info<< "Converting zoned faces into baffles ..." << endl;
 
-        // Get faces (internal only) to be baffled. Map from face to patch
-        // label.
-        Map<labelPair> faceToPatch
-        (
-            getZoneBafflePatches
-            (
-                false,
-                globalToMasterPatch,
-                globalToSlavePatch
-            )
-        );
+        // Per (internal) face the patch it should go into
+        labelList ownPatch(mesh_.nFaces(), -1);
+        labelList neiPatch(mesh_.nFaces(), -1);
+        labelList faceZoneID(mesh_.nFaces(), -1);
 
-        label nZoneFaces = returnReduce(faceToPatch.size(), sumOp<label>());
-        if (nZoneFaces > 0)
+        labelList nBaffles(zoneIDs.size(), 0);
+
+        forAll(zoneIDs, j)
         {
-            // Convert into labelLists
-            labelList ownPatch(mesh_.nFaces(), -1);
-            labelList neiPatch(mesh_.nFaces(), -1);
-            forAllConstIter(Map<labelPair>, faceToPatch, iter)
+            label zoneI = zoneIDs[j];
+
+            const faceZone& fz = faceZones[zoneI];
+
+            const word& masterName = faceZoneToMasterPatch_[fz.name()];
+            label masterPatchI = mesh_.boundaryMesh().findPatchID(masterName);
+            const word& slaveName = faceZoneToSlavePatch_[fz.name()];
+            label slavePatchI = mesh_.boundaryMesh().findPatchID(slaveName);
+
+            if (masterPatchI == -1 || slavePatchI == -1)
             {
-                ownPatch[iter.key()] = iter().first();
-                neiPatch[iter.key()] = iter().second();
+                FatalErrorInFunction
+                    << "Problem: masterPatchI:" << masterPatchI
+                    << " slavePatchI:" << slavePatchI << exit(FatalError);
             }
 
-            // Create baffles. both sides same patch.
+            forAll(fz, i)
+            {
+                label faceI = fz[i];
+                if (mesh_.isInternalFace(faceI))
+                {
+                    if (fz.flipMap()[i])
+                    {
+                        ownPatch[faceI] = slavePatchI;
+                        neiPatch[faceI] = masterPatchI;
+                    }
+                    else
+                    {
+                        ownPatch[faceI] = masterPatchI;
+                        neiPatch[faceI] = slavePatchI;
+                    }
+                    faceZoneID[faceI] = zoneI;
+
+                    nBaffles[j]++;
+                }
+            }
+        }
+
+        label nLocalBaffles = sum(nBaffles);
+
+
+        label nTotalBaffles = returnReduce(nLocalBaffles, sumOp<label>());
+
+        if (nTotalBaffles > 0)
+        {
+            Pstream::listCombineGather(nBaffles, plusEqOp<label>());
+            Pstream::listCombineScatter(nBaffles);
+
+            Info<< nl
+                << setf(ios_base::left)
+                << setw(30) << "FaceZone"
+                << setw(10) << "FaceType"
+                << setw(10) << "nBaffles"
+                << nl
+                << setw(30) << "--------"
+                << setw(10) << "--------"
+                << setw(10) << "--------"
+                << endl;
+
+            forAll(zoneIDs, j)
+            {
+                label zoneI = zoneIDs[j];
+                const faceZone& fz = faceZones[zoneI];
+
+                label mpI, spI;
+                surfaceZonesInfo::faceZoneType fzType;
+                bool hasInfo = getFaceZoneInfo(fz.name(), mpI, spI, fzType);
+
+                if (hasInfo)
+                {
+                    Info<< setf(ios_base::left)
+                        << setw(30) << fz.name()
+                        << setw(10)
+                        << surfaceZonesInfo::faceZoneTypeNames[fzType]
+                        << setw(10) << nBaffles[j]
+                        << nl;
+                }
+            }
+            Info<< endl;
+
+            // Create baffles.
             map = createBaffles(ownPatch, neiPatch);
 
             // Get pairs of faces created.
             // Just loop over faceMap and store baffle if we encounter a slave
             // face.
 
-            baffles.setSize(faceToPatch.size());
+            baffles.setSize(nLocalBaffles);
+            originatingFaceZone.setSize(nLocalBaffles);
             label baffleI = 0;
 
             const labelList& faceMap = map().faceMap();
             const labelList& reverseFaceMap = map().reverseFaceMap();
 
-            forAll(faceMap, faceI)
+            for
+            (
+                label faceI = mesh_.nInternalFaces();
+                faceI < mesh_.nFaces();
+                faceI++
+            )
             {
                 label oldFaceI = faceMap[faceI];
-
-                // Does face originate from face-to-patch
-                Map<labelPair>::const_iterator iter = faceToPatch.find
-                (
-                    oldFaceI
-                );
-
-                if (iter != faceToPatch.end())
+                label masterFaceI = reverseFaceMap[oldFaceI];
+                if (masterFaceI != faceI && ownPatch[oldFaceI] != -1)
                 {
-                    label masterFaceI = reverseFaceMap[oldFaceI];
-                    if (faceI != masterFaceI)
-                    {
-                        baffles[baffleI++] = labelPair(masterFaceI, faceI);
-                    }
+                    baffles[baffleI] = labelPair(masterFaceI, faceI);
+                    originatingFaceZone[baffleI] = faceZoneID[oldFaceI];
+                    baffleI++;
                 }
             }
 
-            if (baffleI != faceToPatch.size())
+            if (baffleI != baffles.size())
             {
-                FatalErrorIn("meshRefinement::createZoneBaffles(..)")
-                    << "Had " << faceToPatch.size() << " patches to create "
+                FatalErrorInFunction
+                    << "Had " << baffles.size() << " baffles to create "
                     << " but encountered " << baffleI
                     << " slave faces originating from patcheable faces."
                     << abort(FatalError);
@@ -661,24 +897,29 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
                 );
             }
         }
-        Info<< "Created " << nZoneFaces << " baffles in = "
+        Info<< "Created " << nTotalBaffles << " baffles in = "
             << mesh_.time().cpuTimeIncrement() << " s\n" << nl << endl;
     }
+    else
+    {
+        baffles.clear();
+        originatingFaceZone.clear();
+    }
+
     return map;
 }
 
 
-// Extract those baffles (duplicate) faces that are on the edge of a baffle
-// region. These are candidates for merging.
-// Done by counting the number of baffles faces per mesh edge. If edge
-// has 2 boundary faces and both are baffle faces it is the edge of a baffle
-// region.
 Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
 (
     const List<labelPair>& couples,
     const scalar planarAngle
 ) const
 {
+    // Done by counting the number of baffles faces per mesh edge. If edge
+    // has 2 boundary faces and both are baffle faces it is the edge of a baffle
+    // region.
+
     // All duplicate faces on edge of the patch are to be merged.
     // So we count for all edges of duplicate faces how many duplicate
     // faces use them.
@@ -878,14 +1119,19 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
         {
             const labelPair& couple = filteredCouples[i];
 
+            // Note: for a baffle-surface we do not want to merge the baffle.
+            // We could either check for hitting the same triangle (but you
+            // might hit same point on neighbouring triangles due to tolerance
+            // issues) or better just to compare the hit point.
+            // This might still go wrong for a ray in the plane of the triangle
+            // which might hit two different points on the same triangle due
+            // to tolerances...
+
             if
             (
                 hit1[i].hit()
              && hit2[i].hit()
-             && (
-                    surface1[i] != surface2[i]
-                 || hit1[i].index() != hit2[i].index()
-                )
+             && mag(hit1[i].hitPoint()-hit2[i].hitPoint()) > mergeDistance_
             )
             {
                 // Two different hits. Check angle.
@@ -927,138 +1173,224 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
 }
 
 
-// Merge baffles. Gets pairs of faces.
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
 (
-    const List<labelPair>& couples
+    const List<labelPair>& couples,
+    const Map<label>& faceToPatch
 )
 {
-    // Mesh change engine
-    polyTopoChange meshMod(mesh_);
+    autoPtr<mapPolyMesh> map;
 
-    const faceList& faces = mesh_.faces();
-    const labelList& faceOwner = mesh_.faceOwner();
-    const faceZoneMesh& faceZones = mesh_.faceZones();
-
-    forAll(couples, i)
+    if (returnReduce(couples.size()+faceToPatch.size(), sumOp<label>()))
     {
-        label face0 = couples[i].first();
-        label face1 = couples[i].second();
+        // Mesh change engine
+        polyTopoChange meshMod(mesh_);
 
-        // face1 < 0 signals a coupled face that has been converted to baffle.
+        const faceList& faces = mesh_.faces();
+        const labelList& faceOwner = mesh_.faceOwner();
+        const faceZoneMesh& faceZones = mesh_.faceZones();
 
-        label own0 = faceOwner[face0];
-        label own1 = faceOwner[face1];
-
-        if (face1 < 0 || own0 < own1)
+        forAll(couples, i)
         {
-            // Use face0 as the new internal face.
-            label zoneID = faceZones.whichZone(face0);
+            label face0 = couples[i].first();
+            label face1 = couples[i].second();
+
+            // face1 < 0 signals a coupled face that has been converted to
+            // baffle
+
+            label own0 = faceOwner[face0];
+            label own1 = faceOwner[face1];
+
+            if (face1 < 0 || own0 < own1)
+            {
+                // Use face0 as the new internal face.
+                label zoneID = faceZones.whichZone(face0);
+                bool zoneFlip = false;
+
+                if (zoneID >= 0)
+                {
+                    const faceZone& fZone = faceZones[zoneID];
+                    zoneFlip = fZone.flipMap()[fZone.whichFace(face0)];
+                }
+
+                label nei = (face1 < 0 ? -1 : own1);
+
+                meshMod.setAction(polyRemoveFace(face1));
+                meshMod.setAction
+                (
+                    polyModifyFace
+                    (
+                        faces[face0],           // modified face
+                        face0,                  // label of face being modified
+                        own0,                   // owner
+                        nei,                    // neighbour
+                        false,                  // face flip
+                        -1,                     // patch for face
+                        false,                  // remove from zone
+                        zoneID,                 // zone for face
+                        zoneFlip                // face flip in zone
+                    )
+                );
+            }
+            else
+            {
+                // Use face1 as the new internal face.
+                label zoneID = faceZones.whichZone(face1);
+                bool zoneFlip = false;
+
+                if (zoneID >= 0)
+                {
+                    const faceZone& fZone = faceZones[zoneID];
+                    zoneFlip = fZone.flipMap()[fZone.whichFace(face1)];
+                }
+
+                meshMod.setAction(polyRemoveFace(face0));
+                meshMod.setAction
+                (
+                    polyModifyFace
+                    (
+                        faces[face1],           // modified face
+                        face1,                  // label of face being modified
+                        own1,                   // owner
+                        own0,                   // neighbour
+                        false,                  // face flip
+                        -1,                     // patch for face
+                        false,                  // remove from zone
+                        zoneID,                 // zone for face
+                        zoneFlip                // face flip in zone
+                    )
+                );
+            }
+        }
+
+        forAllConstIter(Map<label>, faceToPatch, iter)
+        {
+            label faceI = iter.key();
+            label patchI = iter();
+
+            if (!mesh_.isInternalFace(faceI))
+            {
+                FatalErrorInFunction
+                    << "problem: face:" << faceI
+                    << " at:" << mesh_.faceCentres()[faceI]
+                    << "(wanted patch:" << patchI
+                    << ") is an internal face" << exit(FatalError);
+            }
+
+            label zoneID = faceZones.whichZone(faceI);
             bool zoneFlip = false;
 
             if (zoneID >= 0)
             {
                 const faceZone& fZone = faceZones[zoneID];
-                zoneFlip = fZone.flipMap()[fZone.whichFace(face0)];
+                zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
             }
 
-            label nei = (face1 < 0 ? -1 : own1);
-
-            meshMod.setAction(polyRemoveFace(face1));
             meshMod.setAction
             (
                 polyModifyFace
                 (
-                    faces[face0],           // modified face
-                    face0,                  // label of face being modified
-                    own0,                   // owner
-                    nei,                    // neighbour
+                    faces[faceI],           // modified face
+                    faceI,                  // label of face being modified
+                    faceOwner[faceI],       // owner
+                    -1,                     // neighbour
                     false,                  // face flip
-                    -1,                     // patch for face
+                    patchI,                 // patch for face
                     false,                  // remove from zone
                     zoneID,                 // zone for face
                     zoneFlip                // face flip in zone
                 )
             );
         }
+
+
+        // Change the mesh (no inflation)
+        map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh (since morphing does not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
         else
         {
-            // Use face1 as the new internal face.
-            label zoneID = faceZones.whichZone(face1);
-            bool zoneFlip = false;
+            // Delete mesh volumes.
+            mesh_.clearOut();
+        }
 
-            if (zoneID >= 0)
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+
+        // Update intersections. Recalculate intersections on merged faces since
+        // this seems to give problems? Note: should not be necessary since
+        // baffles preserve intersections from when they were created.
+        labelList newExposedFaces(2*couples.size());
+        label newI = 0;
+
+        forAll(couples, i)
+        {
+            label newFace0 = map().reverseFaceMap()[couples[i].first()];
+            if (newFace0 != -1)
             {
-                const faceZone& fZone = faceZones[zoneID];
-                zoneFlip = fZone.flipMap()[fZone.whichFace(face1)];
+                newExposedFaces[newI++] = newFace0;
             }
 
-            meshMod.setAction(polyRemoveFace(face0));
-            meshMod.setAction
-            (
-                polyModifyFace
-                (
-                    faces[face1],           // modified face
-                    face1,                  // label of face being modified
-                    own1,                   // owner
-                    own0,                   // neighbour
-                    false,                  // face flip
-                    -1,                     // patch for face
-                    false,                  // remove from zone
-                    zoneID,                 // zone for face
-                    zoneFlip                // face flip in zone
-                )
-            );
+            label newFace1 = map().reverseFaceMap()[couples[i].second()];
+            if (newFace1 != -1)
+            {
+                newExposedFaces[newI++] = newFace1;
+            }
         }
+        newExposedFaces.setSize(newI);
+        updateMesh(map, newExposedFaces);
     }
 
-    // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
-
-    // Update fields
-    mesh_.updateMesh(map);
-
-    // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
-    {
-        mesh_.movePoints(map().preMotionPoints());
-    }
-    else
-    {
-        // Delete mesh volumes.
-        mesh_.clearOut();
-    }
-
-    // Reset the instance for if in overwrite mode
-    mesh_.setInstance(timeName());
-
-    // Update intersections. Recalculate intersections on merged faces since
-    // this seems to give problems? Note: should not be necessary since
-    // baffles preserve intersections from when they were created.
-    labelList newExposedFaces(2*couples.size());
-    label newI = 0;
-
-    forAll(couples, i)
-    {
-        label newFace0 = map().reverseFaceMap()[couples[i].first()];
-        if (newFace0 != -1)
-        {
-            newExposedFaces[newI++] = newFace0;
-        }
-
-        label newFace1 = map().reverseFaceMap()[couples[i].second()];
-        if (newFace1 != -1)
-        {
-            newExposedFaces[newI++] = newFace1;
-        }
-    }
-    newExposedFaces.setSize(newI);
-    updateMesh(map, newExposedFaces);
-
     return map;
 }
 
 
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeZoneBaffles
+(
+    const bool doInternalZones,
+    const bool doBaffleZones
+)
+{
+    labelList zoneIDs;
+    {
+        DynamicList<surfaceZonesInfo::faceZoneType> fzTypes;
+        if (doInternalZones)
+        {
+            fzTypes.append(surfaceZonesInfo::INTERNAL);
+        }
+        if (doBaffleZones)
+        {
+            fzTypes.append(surfaceZonesInfo::BAFFLE);
+        }
+        zoneIDs = getZones(fzTypes);
+    }
+
+    List<labelPair> zoneBaffles
+    (
+        subsetBaffles
+        (
+            mesh_,
+            zoneIDs,
+            localPointRegion::findDuplicateFacePairs(mesh_)
+        )
+    );
+
+    autoPtr<mapPolyMesh> mapPtr;
+    if (returnReduce(zoneBaffles.size(), sumOp<label>()))
+    {
+        mapPtr = mergeBaffles(zoneBaffles, Map<label>(0));
+    }
+    return mapPtr;
+}
+
+
 // Finds region per cell for cells inside closed named surfaces
 void Foam::meshRefinement::findCellZoneGeometric
 (
@@ -1216,33 +1548,29 @@ void Foam::meshRefinement::findCellZoneGeometric
 
         if (namedSurfaceIndex[faceI] == -1 && (ownZone != neiZone))
         {
-            // Give face the zone of max cell zone
-            namedSurfaceIndex[faceI] = findIndex
-            (
-                surfaceToCellZone,
-                max(ownZone, neiZone)
-            );
-        }
-    }
-
-    labelList neiCellZone(mesh_.nFaces()-mesh_.nInternalFaces());
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
-
-        if (pp.coupled())
-        {
-            forAll(pp, i)
+            // Give face the zone of min cell zone
+            label minZone;
+            if (ownZone == -1)
             {
-                label faceI = pp.start()+i;
-                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
-                neiCellZone[faceI-mesh_.nInternalFaces()] = ownZone;
+                minZone = neiZone;
             }
+            else if (neiZone == -1)
+            {
+                minZone = ownZone;
+            }
+            else
+            {
+                minZone = min(ownZone, neiZone);
+            }
+
+            namedSurfaceIndex[faceI] = findIndex(surfaceToCellZone, minZone);
         }
     }
-    syncTools::swapBoundaryFaceList(mesh_, neiCellZone);
+
+    labelList neiCellZone;
+    syncTools::swapBoundaryCellList(mesh_, cellToZone, neiCellZone);
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
     forAll(patches, patchI)
     {
@@ -1258,11 +1586,25 @@ void Foam::meshRefinement::findCellZoneGeometric
 
                 if (namedSurfaceIndex[faceI] == -1 && (ownZone != neiZone))
                 {
-                    // Give face the max cell zone
+                    // Give face the min cell zone
+                    label minZone;
+                    if (ownZone == -1)
+                    {
+                        minZone = neiZone;
+                    }
+                    else if (neiZone == -1)
+                    {
+                        minZone = ownZone;
+                    }
+                    else
+                    {
+                        minZone = min(ownZone, neiZone);
+                    }
+
                     namedSurfaceIndex[faceI] = findIndex
                     (
                         surfaceToCellZone,
-                        max(ownZone, neiZone)
+                        minZone
                     );
                 }
             }
@@ -1317,10 +1659,6 @@ void Foam::meshRefinement::findCellZoneInsideWalk
 
         const point& insidePoint = surfZones[surfI].zoneInsidePoint();
 
-        Info<< "For surface " << surfaces_.names()[surfI]
-            << " finding inside point " << insidePoint
-            << endl;
-
         // Find the region containing the insidePoint
         label keepRegionI = findRegion
         (
@@ -1337,12 +1675,8 @@ void Foam::meshRefinement::findCellZoneInsideWalk
 
         if (keepRegionI == -1)
         {
-            FatalErrorIn
-            (
-                "meshRefinement::findCellZoneInsideWalk"
-                "(const labelList&, const labelList&"
-                ", const labelList&, const labelList&)"
-            )   << "Point " << insidePoint
+            FatalErrorInFunction
+                << "Point " << insidePoint
                 << " is not inside the mesh." << nl
                 << "Bounding box of the mesh:" << mesh_.bounds()
                 << exit(FatalError);
@@ -1359,12 +1693,8 @@ void Foam::meshRefinement::findCellZoneInsideWalk
                 }
                 else if (cellToZone[cellI] != surfaceToCellZone[surfI])
                 {
-                    WarningIn
-                    (
-                        "meshRefinement::findCellZoneInsideWalk"
-                        "(const labelList&, const labelList&"
-                        ", const labelList&, const labelList&)"
-                    )   << "Cell " << cellI
+                    WarningInFunction
+                        << "Cell " << cellI
                         << " at " << mesh_.cellCentres()[cellI]
                         << " is inside surface " << surfaces_.names()[surfI]
                         << " but already marked as being in zone "
@@ -1379,6 +1709,165 @@ void Foam::meshRefinement::findCellZoneInsideWalk
 }
 
 
+void Foam::meshRefinement::findCellZoneInsideWalk
+(
+    const pointField& locationsInMesh,
+    const wordList& zonesInMesh,
+    const labelList& faceToZone, // per face -1 or some index >= 0
+
+    labelList& cellToZone
+) const
+{
+    // Analyse regions. Reuse regionsplit
+    boolList blockedFace(mesh_.nFaces());
+    //selectSeparatedCoupledFaces(blockedFace);
+
+    forAll(blockedFace, faceI)
+    {
+        if (faceToZone[faceI] == -1)
+        {
+            blockedFace[faceI] = false;
+        }
+        else
+        {
+            blockedFace[faceI] = true;
+        }
+    }
+    // No need to sync since blockedFace already is synced
+
+    // Set region per cell based on walking
+    regionSplit cellRegion(mesh_, blockedFace);
+    blockedFace.clear();
+
+    // Mark off which regions correspond to a zone
+    // (note zone is -1 for the non-zoned bit so initialise to -2)
+    labelList regionToZone(cellRegion.nRegions(), -2);
+
+
+    // Force calculation of face decomposition (used in findCell)
+    (void)mesh_.tetBasePtIs();
+
+    // For all locationsInMesh find the cell
+    forAll(locationsInMesh, i)
+    {
+        // Get location and index of zone ("none" for cellZone -1)
+        const point& insidePoint = locationsInMesh[i];
+        label zoneID = mesh_.cellZones().findZoneID(zonesInMesh[i]);
+
+        // Find the region containing the insidePoint
+        label keepRegionI = findRegion
+        (
+            mesh_,
+            cellRegion,
+            mergeDistance_*vector(1,1,1),
+            insidePoint
+        );
+
+        Info<< "For cellZone " << zonesInMesh[i]
+            << " found point " << insidePoint
+            << " in global region " << keepRegionI
+            << " out of " << cellRegion.nRegions() << " regions." << endl;
+
+        if (keepRegionI == -1)
+        {
+            FatalErrorInFunction
+                << "Point " << insidePoint
+                << " is not inside the mesh." << nl
+                << "Bounding box of the mesh:" << mesh_.bounds()
+                << exit(FatalError);
+        }
+
+
+        // Mark correspondence to zone
+        regionToZone[keepRegionI] = zoneID;
+
+
+        // Set all cells with this region to the zoneID
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        label nWarnings = 0;
+
+        forAll(cellRegion, cellI)
+        {
+            if (cellRegion[cellI] == keepRegionI)
+            {
+                if (cellToZone[cellI] == -2)
+                {
+                    // First visit of cell
+                    cellToZone[cellI] = zoneID;
+                }
+                else if (cellToZone[cellI] != zoneID)
+                {
+                    if (nWarnings < 10)
+                    {
+                        WarningInFunction
+                            << "Cell " << cellI
+                            << " at " << mesh_.cellCentres()[cellI]
+                            << " is inside cellZone " << zonesInMesh[i]
+                            << " from locationInMesh " << insidePoint
+                            << " but already marked as being in zone "
+                            << mesh_.cellZones()[cellToZone[cellI]].name()
+                            << endl
+                            << "This can happen if your surfaces are not"
+                            << " (sufficiently) closed."
+                            << endl;
+                        nWarnings++;
+                    }
+                }
+            }
+        }
+    }
+
+
+    // Check if any unassigned regions
+    label nUnzoned = 0;
+    forAll(regionToZone, regionI)
+    {
+        if (regionToZone[regionI] == -2)
+        {
+            // region that has not been assigned a cellZone
+            nUnzoned++;
+        }
+    }
+
+    if (nUnzoned > 0)
+    {
+        Info<< "Detected " << nUnzoned << " regions in the mesh that do"
+            << " not have a locationInMesh." << nl
+            << "Per unzoned region displaying a single cell centre:" << endl;
+
+        // Determine single location per unzoned region
+        pointField regionToLocation
+        (
+            regionToZone.size(),
+            point(GREAT, GREAT, GREAT)
+        );
+        forAll(cellRegion, cellI)
+        {
+            label regionI = cellRegion[cellI];
+            if (regionToZone[regionI] == -2)
+            {
+                const point& cc = mesh_.cellCentres()[cellI];
+                minMagSqrEqOp<point>()(regionToLocation[regionI], cc);
+            }
+        }
+
+        Pstream::listCombineGather(regionToLocation, minMagSqrEqOp<point>());
+        Pstream::listCombineScatter(regionToLocation);
+
+        forAll(regionToZone, regionI)
+        {
+            if (regionToZone[regionI] == -2)
+            {
+                Info<< '\t' << regionI
+                    << '\t' << regionToLocation[regionI] << endl;
+            }
+        }
+        Info<< endl;
+    }
+}
+
+
 bool Foam::meshRefinement::calcRegionToZone
 (
     const label surfZoneI,
@@ -1437,18 +1926,19 @@ bool Foam::meshRefinement::calcRegionToZone
 }
 
 
-// Finds region per cell. Assumes:
-// - region containing keepPoint does not go into a cellZone
-// - all other regions can be found by crossing faces marked in
-//   namedSurfaceIndex.
 void Foam::meshRefinement::findCellZoneTopo
 (
-    const point& keepPoint,
+    const pointField& locationsInMesh,
     const labelList& namedSurfaceIndex,
     const labelList& surfaceToCellZone,
     labelList& cellToZone
 ) const
 {
+    // Assumes:
+    // - region containing keepPoint does not go into a cellZone
+    // - all other regions can be found by crossing faces marked in
+    //   namedSurfaceIndex.
+
     // Analyse regions. Reuse regionsplit
     boolList blockedFace(mesh_.nFaces());
 
@@ -1488,34 +1978,35 @@ void Foam::meshRefinement::findCellZoneTopo
 
 
     // Find the region containing the keepPoint
-    label keepRegionI = findRegion
-    (
-        mesh_,
-        cellRegion,
-        mergeDistance_*vector(1,1,1),
-        keepPoint
-    );
-
-    Info<< "Found point " << keepPoint
-        << " in global region " << keepRegionI
-        << " out of " << cellRegion.nRegions() << " regions." << endl;
-
-    if (keepRegionI == -1)
+    forAll(locationsInMesh, i)
     {
-        FatalErrorIn
+        const point& keepPoint = locationsInMesh[i];
+        label keepRegionI = findRegion
         (
-            "meshRefinement::findCellZoneTopo"
-            "(const point&, const labelList&, const labelList&, labelList&)"
-        )   << "Point " << keepPoint
-            << " is not inside the mesh." << nl
-            << "Bounding box of the mesh:" << mesh_.bounds()
-            << exit(FatalError);
-    }
+            mesh_,
+            cellRegion,
+            mergeDistance_*vector(1,1,1),
+            keepPoint
+        );
 
-    // Mark default region with zone -1.
-    if (regionToCellZone[keepRegionI] == -2)
-    {
-        regionToCellZone[keepRegionI] = -1;
+        Info<< "Found point " << keepPoint
+            << " in global region " << keepRegionI
+            << " out of " << cellRegion.nRegions() << " regions." << endl;
+
+        if (keepRegionI == -1)
+        {
+            FatalErrorInFunction
+                << "Point " << keepPoint
+                << " is not inside the mesh." << nl
+                << "Bounding box of the mesh:" << mesh_.bounds()
+                << exit(FatalError);
+        }
+
+        // Mark default region with zone -1.
+        if (regionToCellZone[keepRegionI] == -2)
+        {
+            regionToCellZone[keepRegionI] = -1;
+        }
     }
 
 
@@ -1564,22 +2055,8 @@ void Foam::meshRefinement::findCellZoneTopo
         const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
         // Get coupled neighbour cellRegion
-        labelList neiCellRegion(mesh_.nFaces()-mesh_.nInternalFaces());
-        forAll(patches, patchI)
-        {
-            const polyPatch& pp = patches[patchI];
-
-            if (pp.coupled())
-            {
-                forAll(pp, i)
-                {
-                    label faceI = pp.start()+i;
-                    neiCellRegion[faceI-mesh_.nInternalFaces()] =
-                        cellRegion[mesh_.faceOwner()[faceI]];
-                }
-            }
-        }
-        syncTools::swapBoundaryFaceList(mesh_, neiCellRegion);
+        labelList neiCellRegion;
+        syncTools::swapBoundaryCellList(mesh_, cellRegion, neiCellRegion);
 
         // Calculate region to zone from cellRegions on either side of coupled
         // face.
@@ -1625,11 +2102,8 @@ void Foam::meshRefinement::findCellZoneTopo
 
         if (zoneI ==  -2)
         {
-            FatalErrorIn
-            (
-                "meshRefinement::findCellZoneTopo"
-                "(const point&, const labelList&, const labelList&, labelList&)"
-            )   << "For region " << regionI << " haven't set cell zone."
+            FatalErrorInFunction
+                << "For region " << regionI << " haven't set cell zone."
                 << exit(FatalError);
         }
     }
@@ -1652,12 +2126,10 @@ void Foam::meshRefinement::findCellZoneTopo
 }
 
 
-// Make namedSurfaceIndex consistent with cellToZone - clear out any blocked
-// faces inbetween same cell zone.
 void Foam::meshRefinement::makeConsistentFaceIndex
 (
     const labelList& cellToZone,
-    labelList& namedSurfaceIndex
+    labelList& faceToZone
 ) const
 {
     const labelList& faceOwner = mesh_.faceOwner();
@@ -1668,13 +2140,13 @@ void Foam::meshRefinement::makeConsistentFaceIndex
         label ownZone = cellToZone[faceOwner[faceI]];
         label neiZone = cellToZone[faceNeighbour[faceI]];
 
-        if (ownZone == neiZone && namedSurfaceIndex[faceI] != -1)
+        if (ownZone == neiZone && faceToZone[faceI] != -1)
         {
-            namedSurfaceIndex[faceI] = -1;
+            faceToZone[faceI] = -1;
         }
-        else if (ownZone != neiZone && namedSurfaceIndex[faceI] == -1)
+        else if (ownZone != neiZone && faceToZone[faceI] == -1)
         {
-            FatalErrorIn("meshRefinement::zonify()")
+            FatalErrorInFunction
                 << "Different cell zones on either side of face " << faceI
                 << " at " << mesh_.faceCentres()[faceI]
                 << " but face not marked with a surface."
@@ -1685,22 +2157,8 @@ void Foam::meshRefinement::makeConsistentFaceIndex
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
     // Get coupled neighbour cellZone
-    labelList neiCellZone(mesh_.nFaces()-mesh_.nInternalFaces());
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
-
-        if (pp.coupled())
-        {
-            forAll(pp, i)
-            {
-                label faceI = pp.start()+i;
-                neiCellZone[faceI-mesh_.nInternalFaces()] =
-                    cellToZone[mesh_.faceOwner()[faceI]];
-            }
-        }
-    }
-    syncTools::swapBoundaryFaceList(mesh_, neiCellZone);
+    labelList neiCellZone;
+    syncTools::swapBoundaryCellList(mesh_, cellToZone, neiCellZone);
 
     // Use coupled cellZone to do check
     forAll(patches, patchI)
@@ -1716,13 +2174,13 @@ void Foam::meshRefinement::makeConsistentFaceIndex
                 label ownZone = cellToZone[faceOwner[faceI]];
                 label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
 
-                if (ownZone == neiZone && namedSurfaceIndex[faceI] != -1)
+                if (ownZone == neiZone && faceToZone[faceI] != -1)
                 {
-                    namedSurfaceIndex[faceI] = -1;
+                    faceToZone[faceI] = -1;
                 }
-                else if (ownZone != neiZone && namedSurfaceIndex[faceI] == -1)
+                else if (ownZone != neiZone && faceToZone[faceI] == -1)
                 {
-                    FatalErrorIn("meshRefinement::zonify()")
+                    FatalErrorInFunction
                         << "Different cell zones on either side of face "
                         << faceI << " at " << mesh_.faceCentres()[faceI]
                         << " but face not marked with a surface."
@@ -1736,7 +2194,7 @@ void Foam::meshRefinement::makeConsistentFaceIndex
             forAll(pp, i)
             {
                 label faceI = pp.start()+i;
-                namedSurfaceIndex[faceI] = -1;
+                faceToZone[faceI] = -1;
             }
         }
     }
@@ -1773,7 +2231,13 @@ void Foam::meshRefinement::handleSnapProblems
     }
     else
     {
-        facePatch = markFacesOnProblemCellsGeometric(snapParams, motionDict);
+        facePatch = markFacesOnProblemCellsGeometric
+        (
+            snapParams,
+            motionDict,
+            globalToMasterPatch,
+            globalToSlavePatch
+        );
     }
     Info<< "Analyzed problem cells in = "
         << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
@@ -1833,7 +2297,7 @@ void Foam::meshRefinement::handleSnapProblems
 
 Foam::labelList Foam::meshRefinement::freeStandingBaffleFaces
 (
-    const labelList& namedSurfaceIndex,
+    const labelList& faceToZone,
     const labelList& cellToZone,
     const labelList& neiCellZone
 ) const
@@ -1843,17 +2307,30 @@ Foam::labelList Foam::meshRefinement::freeStandingBaffleFaces
     const labelList& faceNeighbour = mesh_.faceNeighbour();
 
 
-    DynamicList<label> faceLabels(mesh_.nFaces()/20);
+    // We want to pick up the faces to orient. These faces come in
+    // two variants:
+    // - faces originating from stand-alone faceZones
+    //   (these will most likely have no cellZone on either side so
+    //    ownZone and neiZone both -1)
+    // - sticky-up faces originating from a 'bulge' in a outside of
+    //   a cellZone. These will have the same cellZone on either side.
+    //   How to orient these is not really clearly defined so do them
+    //   same as stand-alone faceZone faces for now. (Normally these will
+    //   already have been removed by the 'allowFreeStandingZoneFaces=false'
+    //   default setting)
+
+    // Note that argument neiCellZone will have -1 on uncoupled boundaries.
+
+    DynamicList<label> faceLabels(mesh_.nFaces()/100);
 
     for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
     {
-        label surfI = namedSurfaceIndex[faceI];
-        if (surfI != -1)
+        if (faceToZone[faceI] != -1)
         {
             // Free standing baffle?
             label ownZone = cellToZone[faceOwner[faceI]];
             label neiZone = cellToZone[faceNeighbour[faceI]];
-            if (max(ownZone, neiZone) == -1)
+            if (ownZone == neiZone)
             {
                 faceLabels.append(faceI);
             }
@@ -1866,13 +2343,12 @@ Foam::labelList Foam::meshRefinement::freeStandingBaffleFaces
         forAll(pp, i)
         {
             label faceI = pp.start()+i;
-            label surfI = namedSurfaceIndex[faceI];
-            if (surfI != -1)
+            if (faceToZone[faceI] != -1)
             {
                 // Free standing baffle?
                 label ownZone = cellToZone[faceOwner[faceI]];
                 label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
-                if (max(ownZone, neiZone) == -1)
+                if (ownZone == neiZone)
                 {
                     faceLabels.append(faceI);
                 }
@@ -2062,7 +2538,7 @@ Foam::label Foam::meshRefinement::markPatchZones
     {
         if (!allFaceInfo[faceI].valid(dummyTrackData))
         {
-            FatalErrorIn("meshRefinement::markPatchZones(..)")
+            FatalErrorInFunction
                 << "Problem: unvisited face " << faceI
                 << " at " << patch.faceCentres()[faceI]
                 << exit(FatalError);
@@ -2081,7 +2557,7 @@ void Foam::meshRefinement::consistentOrientation
     const labelList& nMasterFacesPerEdge,
     const labelList& faceToZone,
     const Map<label>& zoneToOrientation,
-    boolList& meshFlipMap
+    PackedBoolList& meshFlipMap
 ) const
 {
     const polyBoundaryMesh& bm = mesh_.boundaryMesh();
@@ -2287,7 +2763,7 @@ void Foam::meshRefinement::consistentOrientation
                 }
                 else
                 {
-                    FatalErrorIn("meshRefinement::consistentOrientation(..)")
+                    FatalErrorInFunction
                         << "Incorrect status for face " << meshFaceI
                         << abort(FatalError);
                 }
@@ -2315,7 +2791,7 @@ void Foam::meshRefinement::consistentOrientation
         }
         else
         {
-            FatalErrorIn("meshRefinement::consistentOrientation(..)")
+            FatalErrorInFunction
                 << "Problem : unvisited face " << faceI
                 << " centre:" << mesh_.faceCentres()[meshFaceI]
                 << abort(FatalError);
@@ -2324,9 +2800,213 @@ void Foam::meshRefinement::consistentOrientation
 }
 
 
+void Foam::meshRefinement::zonify
+(
+    // Get per face whether is it master (of a coupled set of faces)
+    const PackedBoolList& isMasterFace,
+    const labelList& cellToZone,
+    const labelList& neiCellZone,
+    const labelList& faceToZone,
+    const PackedBoolList& meshFlipMap,
+    polyTopoChange& meshMod
+) const
+{
+    const labelList& faceOwner = mesh_.faceOwner();
+    const labelList& faceNeighbour = mesh_.faceNeighbour();
+
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        label faceZoneI = faceToZone[faceI];
+
+        if (faceZoneI != -1)
+        {
+            // Orient face zone to have slave cells in min cell zone.
+            // Note: logic to use flipMap should be consistent with logic
+            //       to pick up the freeStandingBaffleFaces!
+
+            label ownZone = cellToZone[faceOwner[faceI]];
+            label neiZone = cellToZone[faceNeighbour[faceI]];
+
+            bool flip;
+
+            if (ownZone == neiZone)
+            {
+                // free-standing face. Use geometrically derived orientation
+                flip = meshFlipMap[faceI];
+            }
+            else
+            {
+                flip =
+                (
+                    ownZone == -1
+                 || (neiZone != -1 && ownZone > neiZone)
+                );
+            }
+
+            meshMod.setAction
+            (
+                polyModifyFace
+                (
+                    mesh_.faces()[faceI],           // modified face
+                    faceI,                          // label of face
+                    faceOwner[faceI],               // owner
+                    faceNeighbour[faceI],           // neighbour
+                    false,                          // face flip
+                    -1,                             // patch for face
+                    false,                          // remove from zone
+                    faceZoneI,                      // zone for face
+                    flip                            // face flip in zone
+                )
+            );
+        }
+    }
+
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Set owner as no-flip
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        label faceI = pp.start();
+
+        forAll(pp, i)
+        {
+            label faceZoneI = faceToZone[faceI];
+
+            if (faceZoneI != -1)
+            {
+                label ownZone = cellToZone[faceOwner[faceI]];
+                label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
+
+                bool flip;
+
+                if (ownZone == neiZone)
+                {
+                    // free-standing face. Use geometrically derived orientation
+                    flip = meshFlipMap[faceI];
+                }
+                else
+                {
+                    flip =
+                    (
+                        ownZone == -1
+                     || (neiZone != -1 && ownZone > neiZone)
+                    );
+                }
+
+                meshMod.setAction
+                (
+                    polyModifyFace
+                    (
+                        mesh_.faces()[faceI],           // modified face
+                        faceI,                          // label of face
+                        faceOwner[faceI],               // owner
+                        -1,                             // neighbour
+                        false,                          // face flip
+                        patchI,                         // patch for face
+                        false,                          // remove from zone
+                        faceZoneI,                      // zone for face
+                        flip                            // face flip in zone
+                    )
+                );
+            }
+            faceI++;
+        }
+    }
+
+
+    // Put the cells into the correct zone
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    forAll(cellToZone, cellI)
+    {
+        label zoneI = cellToZone[cellI];
+
+        if (zoneI >= 0)
+        {
+            meshMod.setAction
+            (
+                polyModifyCell
+                (
+                    cellI,
+                    false,          // removeFromZone
+                    zoneI
+                )
+            );
+        }
+    }
+}
+
+
+void Foam::meshRefinement::allocateInterRegionFaceZone
+(
+    const label ownZone,
+    const label neiZone,
+    wordPairHashTable& zonesToFaceZone,
+    HashTable<word, labelPair, labelPair::Hash<> >& zoneIDsToFaceZone
+) const
+{
+    const cellZoneMesh& cellZones = mesh_.cellZones();
+
+    if (ownZone != neiZone)
+    {
+        // Make sure lowest number cellZone is master. Non-cellZone
+        // areas are slave
+        bool swap =
+        (
+            ownZone == -1
+         || (neiZone != -1 && ownZone > neiZone)
+        );
+
+        // Quick check whether we already have pair of zones
+        labelPair key(ownZone, neiZone);
+        if (swap)
+        {
+            Swap(key.first(), key.second());
+        }
+
+        HashTable<word, labelPair, labelPair::Hash<> >::
+        const_iterator zoneFnd = zoneIDsToFaceZone.find
+        (
+            key
+        );
+
+        if (zoneFnd == zoneIDsToFaceZone.end())
+        {
+            // Not found. Allocate.
+            const word ownZoneName =
+            (
+                ownZone != -1
+              ? cellZones[ownZone].name()
+              : "none"
+            );
+            const word neiZoneName =
+            (
+                neiZone != -1
+              ? cellZones[neiZone].name()
+              : "none"
+            );
+
+            // Get lowest zone first
+            Pair<word> wordKey(ownZoneName, neiZoneName);
+            if (swap)
+            {
+                Swap(wordKey.first(), wordKey.second());
+            }
+
+            word fzName = wordKey.first() + "_to_" + wordKey.second();
+
+            zoneIDsToFaceZone.insert(key, fzName);
+            zonesToFaceZone.insert(wordKey, fzName);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Split off unreachable areas of mesh.
 void Foam::meshRefinement::baffleAndSplitMesh
 (
     const bool doHandleSnapProblems,
@@ -2334,13 +3014,14 @@ void Foam::meshRefinement::baffleAndSplitMesh
     const bool useTopologicalSnapDetection,
     const bool removeEdgeConnectedCells,
     const scalarField& perpendicularAngle,
-    const bool mergeFreeStanding,
-    const scalar planarAngle,
     const dictionary& motionDict,
     Time& runTime,
     const labelList& globalToMasterPatch,
     const labelList& globalToSlavePatch,
-    const point& keepPoint
+
+    const pointField& locationsInMesh,
+    const wordList& zonesInMesh,
+    const pointField& locationsOutsideMesh
 )
 {
     // Introduce baffles
@@ -2362,6 +3043,10 @@ void Foam::meshRefinement::baffleAndSplitMesh
     getBafflePatches
     (
         globalToMasterPatch,
+
+        locationsInMesh,
+        zonesInMesh,
+
         neiLevel,
         neiCc,
 
@@ -2415,6 +3100,38 @@ void Foam::meshRefinement::baffleAndSplitMesh
             globalToMasterPatch,
             globalToSlavePatch
         );
+
+        // Removing additional cells might have created disconnected bits
+        // so re-do the surface intersections
+        {
+            // Swap neighbouring cell centres and cell level
+            neiLevel.setSize(mesh_.nFaces()-mesh_.nInternalFaces());
+            neiCc.setSize(mesh_.nFaces()-mesh_.nInternalFaces());
+            calcNeighbourData(neiLevel, neiCc);
+
+            labelList ownPatch, neiPatch;
+            getBafflePatches
+            (
+                globalToMasterPatch,
+
+                locationsInMesh,
+                zonesInMesh,
+
+                neiLevel,
+                neiCc,
+
+                ownPatch,
+                neiPatch
+            );
+
+            createBaffles(ownPatch, neiPatch);
+        }
+
+        if (debug)
+        {
+            // Debug:test all is still synced across proc patches
+            checkData();
+        }
     }
 
 
@@ -2431,7 +3148,13 @@ void Foam::meshRefinement::baffleAndSplitMesh
         runTime++;
     }
 
-    splitMeshRegions(globalToMasterPatch, globalToSlavePatch, keepPoint);
+    splitMeshRegions
+    (
+        globalToMasterPatch,
+        globalToSlavePatch,
+        locationsInMesh,
+        locationsOutsideMesh
+    );
 
     if (debug)
     {
@@ -2456,74 +3179,111 @@ void Foam::meshRefinement::baffleAndSplitMesh
         Pout<< "Dumped debug data in = "
             << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
     }
-
-
-    // Merge baffles
-    // ~~~~~~~~~~~~~
-
-    if (mergeFreeStanding)
-    {
-        Info<< nl
-            << "Merge free-standing baffles" << nl
-            << "---------------------------" << nl
-            << endl;
-
-
-        // List of pairs of freestanding baffle faces.
-        List<labelPair> couples
-        (
-            freeStandingBaffles    // filter out freestanding baffles
-            (
-                localPointRegion::findDuplicateFacePairs(mesh_),
-                planarAngle
-            )
-        );
-
-        label nCouples = couples.size();
-        reduce(nCouples, sumOp<label>());
-
-        Info<< "Detected free-standing baffles : " << nCouples << endl;
-
-        if (nCouples > 0)
-        {
-            // Actually merge baffles. Note: not exactly parallellized. Should
-            // convert baffle faces into processor faces if they resulted
-            // from them.
-            mergeBaffles(couples);
-
-            // Detect any problem cells resulting from merging of baffles
-            // and delete them
-            handleSnapProblems
-            (
-                snapParams,
-                useTopologicalSnapDetection,
-                removeEdgeConnectedCells,
-                perpendicularAngle,
-                motionDict,
-                runTime,
-                globalToMasterPatch,
-                globalToSlavePatch
-            );
-
-            if (debug)
-            {
-                // Debug:test all is still synced across proc patches
-                checkData();
-            }
-        }
-        Info<< "Merged free-standing baffles in = "
-            << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
-    }
 }
 
 
-// Split off (with optional buffer layers) unreachable areas of mesh.
+void Foam::meshRefinement::mergeFreeStandingBaffles
+(
+    const snapParameters& snapParams,
+    const bool useTopologicalSnapDetection,
+    const bool removeEdgeConnectedCells,
+    const scalarField& perpendicularAngle,
+    const scalar planarAngle,
+    const dictionary& motionDict,
+    Time& runTime,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch,
+    const pointField& locationsInMesh,
+    const pointField& locationsOutsideMesh
+)
+{
+    // Merge baffles
+    // ~~~~~~~~~~~~~
+
+    Info<< nl
+        << "Merge free-standing baffles" << nl
+        << "---------------------------" << nl
+        << endl;
+
+
+    // List of pairs of freestanding baffle faces.
+    List<labelPair> couples
+    (
+        freeStandingBaffles    // filter out freestanding baffles
+        (
+            localPointRegion::findDuplicateFacePairs(mesh_),
+            planarAngle
+        )
+    );
+
+    label nCouples = couples.size();
+    reduce(nCouples, sumOp<label>());
+
+    Info<< "Detected free-standing baffles : " << nCouples << endl;
+
+    if (nCouples > 0)
+    {
+        // Actually merge baffles. Note: not exactly parallellized. Should
+        // convert baffle faces into processor faces if they resulted
+        // from them.
+        mergeBaffles(couples, Map<label>(0));
+
+        // Detect any problem cells resulting from merging of baffles
+        // and delete them
+        handleSnapProblems
+        (
+            snapParams,
+            useTopologicalSnapDetection,
+            removeEdgeConnectedCells,
+            perpendicularAngle,
+            motionDict,
+            runTime,
+            globalToMasterPatch,
+            globalToSlavePatch
+        );
+
+        // Very occasionally removing a problem cell might create a disconnected
+        // region so re-check
+
+        Info<< nl
+            << "Remove unreachable sections of mesh" << nl
+            << "-----------------------------------" << nl
+            << endl;
+
+        if (debug)
+        {
+            runTime++;
+        }
+
+        splitMeshRegions
+        (
+            globalToMasterPatch,
+            globalToSlavePatch,
+            locationsInMesh,
+            locationsOutsideMesh
+        );
+
+
+        if (debug)
+        {
+            // Debug:test all is still synced across proc patches
+            checkData();
+        }
+    }
+    Info<< "Merged free-standing baffles in = "
+        << runTime.cpuTimeIncrement() << " s\n" << nl << endl;
+}
+
+
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 (
     const label nBufferLayers,
     const labelList& globalToMasterPatch,
     const labelList& globalToSlavePatch,
-    const point& keepPoint
+
+    const pointField& locationsInMesh,
+    const wordList& zonesInMesh,
+    const pointField& locationsOutsideMesh
 )
 {
     // Determine patches to put intersections into
@@ -2534,10 +3294,15 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
     pointField neiCc(mesh_.nFaces()-mesh_.nInternalFaces());
     calcNeighbourData(neiLevel, neiCc);
 
+    // Find intersections with all unnamed(!) surfaces
     labelList ownPatch, neiPatch;
     getBafflePatches
     (
         globalToMasterPatch,
+
+        locationsInMesh,
+        zonesInMesh,
+
         neiLevel,
         neiCc,
 
@@ -2557,39 +3322,25 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
     }
     syncTools::syncFaceList(mesh_, blockedFace, orEqOp<bool>());
 
-    // Set region per cell based on walking
+
     regionSplit cellRegion(mesh_, blockedFace);
     blockedFace.clear();
 
-    // Find the region containing the keepPoint
-    const label keepRegionI = findRegion
+    // Set unreachable cells to -1
+    findRegions
     (
         mesh_,
-        cellRegion,
-        mergeDistance_*vector(1,1,1),
-        keepPoint
+        mergeDistance_*vector(1,1,1),   // perturbVec
+        locationsInMesh,
+        locationsOutsideMesh,
+        cellRegion.nRegions(),
+        cellRegion
     );
 
-    Info<< "Found point " << keepPoint
-        << " in global region " << keepRegionI
-        << " out of " << cellRegion.nRegions() << " regions." << endl;
 
-    if (keepRegionI == -1)
-    {
-        FatalErrorIn
-        (
-            "meshRefinement::splitMesh"
-            "(const label, const labelList&, const point&)"
-        )   << "Point " << keepPoint
-            << " is not inside the mesh." << nl
-            << "Bounding box of the mesh:" << mesh_.bounds()
-            << exit(FatalError);
-    }
-
-
-    // Walk out nBufferlayers from region split
+    // Walk out nBufferlayers from region boundary
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // (modifies cellRegion, ownPatch)
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Takes over face patch onto points and then back to faces and cells
     // (so cell-face-point walk)
 
@@ -2616,7 +3367,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
             label ownRegion = cellRegion[faceOwner[faceI]];
             label neiRegion = cellRegion[faceNeighbour[faceI]];
 
-            if (ownRegion == keepRegionI && neiRegion != keepRegionI)
+            if (ownRegion == -1 && neiRegion != -1)
             {
                 // Note max(..) since possibly regionSplit might have split
                 // off extra unreachable parts of mesh. Note: or can this only
@@ -2626,7 +3377,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
                     pointBaffle[f[fp]] = max(defaultPatch, ownPatch[faceI]);
                 }
             }
-            else if (ownRegion != keepRegionI && neiRegion == keepRegionI)
+            else if (ownRegion != -1 && neiRegion == -1)
             {
                 label newPatchI = neiPatch[faceI];
                 if (newPatchI == -1)
@@ -2650,7 +3401,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 
             label ownRegion = cellRegion[faceOwner[faceI]];
 
-            if (ownRegion == keepRegionI)
+            if (ownRegion == -1)
             {
                 forAll(f, fp)
                 {
@@ -2703,9 +3454,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
             {
                 label own = faceOwner[faceI];
 
-                if (cellRegion[own] != keepRegionI)
+                if (cellRegion[own] == -1)
                 {
-                    cellRegion[own] = keepRegionI;
+                    cellRegion[own] = labelMax;
 
                     const cell& ownFaces = mesh_.cells()[own];
                     forAll(ownFaces, j)
@@ -2720,9 +3471,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
                 {
                     label nei = faceNeighbour[faceI];
 
-                    if (cellRegion[nei] != keepRegionI)
+                    if (cellRegion[nei] == -1)
                     {
-                        cellRegion[nei] = keepRegionI;
+                        cellRegion[nei] = labelMax;
 
                         const cell& neiFaces = mesh_.cells()[nei];
                         forAll(neiFaces, j)
@@ -2751,7 +3502,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
     DynamicList<label> cellsToRemove(mesh_.nCells());
     forAll(cellRegion, cellI)
     {
-        if (cellRegion[cellI] != keepRegionI)
+        if (cellRegion[cellI] == -1)
         {
             cellsToRemove.append(cellI);
         }
@@ -2761,10 +3512,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
     label nCellsToKeep = mesh_.nCells() - cellsToRemove.size();
     reduce(nCellsToKeep, sumOp<label>());
 
-    Info<< "Keeping all cells in region " << keepRegionI
-        << " containing point " << keepPoint << endl
-        << "Selected for keeping : " << nCellsToKeep
-        << " cells." << endl;
+    Info<< "Keeping all cells containing points " << locationsInMesh << endl
+        << "Selected for keeping : " << nCellsToKeep << " cells." << endl;
 
 
     // Remove cells
@@ -2784,7 +3533,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
         }
         else
         {
-            WarningIn("meshRefinement::splitMesh(..)")
+            WarningInFunction
                 << "For exposed face " << faceI
                 << " fc:" << mesh_.faceCentres()[faceI]
                 << " found no patch." << endl
@@ -2804,8 +3553,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 }
 
 
-// Find boundary points that connect to more than one cell region and
-// split them.
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
 (
     const localPointRegion& regionSide
@@ -2825,42 +3572,46 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
         << mesh_.globalData().nTotalPoints()
         << ')' << endl;
 
-    // Topo change engine
-    duplicatePoints pointDuplicator(mesh_);
 
-    // Insert changes into meshMod
-    pointDuplicator.setRefinement(regionSide, meshMod);
+    autoPtr<mapPolyMesh> map;
 
-    // Change the mesh (no inflation, parallel sync)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
-
-    // Update fields
-    mesh_.updateMesh(map);
-
-    // Move mesh if in inflation mode
-    if (map().hasMotionPoints())
+    if (nNonManifPoints)
     {
-        mesh_.movePoints(map().preMotionPoints());
-    }
-    else
-    {
-        // Delete mesh volumes.
-        mesh_.clearOut();
-    }
+        // Topo change engine
+        duplicatePoints pointDuplicator(mesh_);
 
-    // Reset the instance for if in overwrite mode
-    mesh_.setInstance(timeName());
+        // Insert changes into meshMod
+        pointDuplicator.setRefinement(regionSide, meshMod);
 
-    // Update intersections. Is mapping only (no faces created, positions stay
-    // same) so no need to recalculate intersections.
-    updateMesh(map, labelList(0));
+        // Change the mesh (no inflation, parallel sync)
+        map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh if in inflation mode
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes.
+            mesh_.clearOut();
+        }
+
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+
+        // Update intersections. Is mapping only (no faces created, positions
+        // stay same) so no need to recalculate intersections.
+        updateMesh(map, labelList(0));
+    }
 
     return map;
 }
 
 
-// Find boundary points that connect to more than one cell region and
-// split them.
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
 {
     // Analyse which points need to be duplicated
@@ -2870,45 +3621,181 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
 }
 
 
-// Zoning
-Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergePoints
 (
-    const point& keepPoint,
-    const bool allowFreeStandingZoneFaces
+    const labelList& pointToDuplicate
 )
 {
-    const PtrList<surfaceZonesInfo>& surfZones = surfaces_.surfZones();
-
-    labelList namedSurfaces(surfaceZonesInfo::getNamedSurfaces(surfZones));
-
-    forAll(namedSurfaces, i)
+    label nPointPairs = 0;
+    forAll(pointToDuplicate, pointI)
     {
-        label surfI = namedSurfaces[i];
+        label otherPointI = pointToDuplicate[pointI];
+        if (otherPointI != -1)
+        {
+            nPointPairs++;
+        }
+    }
 
-        Info<< "Surface : " << surfaces_.names()[surfI] << nl
-            << "    faceZone : " << surfZones[surfI].faceZoneName() << nl
-            << "    cellZone : " << surfZones[surfI].cellZoneName() << endl;
+    autoPtr<mapPolyMesh> map;
+
+    if (returnReduce(nPointPairs, sumOp<label>()))
+    {
+        Map<label> pointToMaster(2*nPointPairs);
+        forAll(pointToDuplicate, pointI)
+        {
+            label otherPointI = pointToDuplicate[pointI];
+            if (otherPointI != -1)
+            {
+                // Slave point
+                pointToMaster.insert(pointI, otherPointI);
+            }
+        }
+
+        // Topochange container
+        polyTopoChange meshMod(mesh_);
+
+        // Insert changes
+        polyMeshAdder::mergePoints(mesh_, pointToMaster, meshMod);
+
+        // Change the mesh (no inflation, parallel sync)
+        map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh if in inflation mode
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes.
+            mesh_.clearOut();
+        }
+
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+
+        // Update intersections. Is mapping only (no faces created, positions
+        // stay same) so no need to recalculate intersections.
+        updateMesh(map, labelList(0));
+    }
+
+    return map;
+}
+
+
+// Duplicate points on 'boundary' zones. Do not duplicate points on
+// 'internal' or 'baffle' zone. Whether points are on normal patches does
+// not matter
+Foam::autoPtr<Foam::mapPolyMesh>
+Foam::meshRefinement::dupNonManifoldBoundaryPoints()
+{
+    const labelList boundaryFaceZones
+    (
+        getZones
+        (
+            List<surfaceZonesInfo::faceZoneType>
+            (
+                1,
+                surfaceZonesInfo::BOUNDARY
+            )
+        )
+    );
+    labelList internalOrBaffleFaceZones;
+    {
+        List<surfaceZonesInfo::faceZoneType> fzTypes(2);
+        fzTypes[0] = surfaceZonesInfo::INTERNAL;
+        fzTypes[1] = surfaceZonesInfo::BAFFLE;
+        internalOrBaffleFaceZones = getZones(fzTypes);
     }
 
 
-    // Add zones to mesh
-    labelList surfaceToFaceZone =
-        surfaceZonesInfo::addFaceZonesToMesh
-        (
-            surfZones,
-            namedSurfaces,
-            mesh_
-        );
 
-    labelList surfaceToCellZone =
-        surfaceZonesInfo::addCellZonesToMesh
-        (
-            surfZones,
-            namedSurfaces,
-            mesh_
-        );
+    // 0 : point used by normal, unzoned boundary faces
+    // 1 : point used by 'boundary' zone
+    // 2 : point used by internal/baffle zone
+    PackedList<2> pointStatus(mesh_.nPoints(), 0u);
+
+    forAll(boundaryFaceZones, j)
+    {
+        const faceZone& fZone = mesh_.faceZones()[boundaryFaceZones[j]];
+        forAll(fZone, i)
+        {
+            const face& f = mesh_.faces()[fZone[i]];
+            forAll(f, fp)
+            {
+                pointStatus[f[fp]] = max(pointStatus[f[fp]], 1u);
+            }
+        }
+    }
+    forAll(internalOrBaffleFaceZones, j)
+    {
+        const faceZone& fZone = mesh_.faceZones()[internalOrBaffleFaceZones[j]];
+        forAll(fZone, i)
+        {
+            const face& f = mesh_.faces()[fZone[i]];
+            forAll(f, fp)
+            {
+                pointStatus[f[fp]] = max(pointStatus[f[fp]], 2u);
+            }
+        }
+    }
+
+    syncTools::syncPointList
+    (
+        mesh_,
+        pointStatus,
+        maxEqOp<unsigned int>(),    // combine op
+        0u                          // null value
+    );
+
+    // Pick up points on boundary zones that are not on internal/baffle zones
+    label n = 0;
+    forAll(pointStatus, pointI)
+    {
+        if (pointStatus[pointI] == 1u)
+        {
+            n++;
+        }
+    }
+
+    label globalNPoints = returnReduce(n, sumOp<label>());
+    Info<< "Duplicating " << globalNPoints << " points on"
+        << " faceZones of type "
+        << surfaceZonesInfo::faceZoneTypeNames[surfaceZonesInfo::BOUNDARY]
+        << endl;
+
+    autoPtr<mapPolyMesh> map;
+
+    if (globalNPoints)
+    {
+        labelList candidatePoints(n);
+        n = 0;
+        forAll(pointStatus, pointI)
+        {
+            if (pointStatus[pointI] == 1u)
+            {
+                candidatePoints[n++] = pointI;
+            }
+        }
+        localPointRegion regionSide(mesh_, candidatePoints);
+        map = dupNonManifoldPoints(regionSide);
+    }
+    return map;
+}
 
 
+// Zoning
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
+(
+    const bool allowFreeStandingZoneFaces,
+    const pointField& locationsInMesh,
+    const wordList& zonesInMesh,
+    wordPairHashTable& zonesToFaceZone
+)
+{
     const pointField& cellCentres = mesh_.cellCentres();
     const labelList& faceOwner = mesh_.faceOwner();
     const labelList& faceNeighbour = mesh_.faceNeighbour();
@@ -2921,279 +3808,571 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     calcNeighbourData(neiLevel, neiCc);
 
 
-    // Mark faces intersecting zoned surfaces
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-    // Like surfaceIndex_ but only for named surfaces.
-    labelList namedSurfaceIndex(mesh_.nFaces(), -1);
-    PackedBoolList posOrientation(mesh_.nFaces());
-
-    {
-        // Statistics: number of faces per faceZone
-        labelList nSurfFaces(surfZones.size(), 0);
-
-        // Note: for all internal faces? internal + coupled?
-        // Since zonify is run after baffling the surfaceIndex_ on baffles is
-        // not synchronised across both baffle faces. Fortunately we don't
-        // do zonify baffle faces anyway (they are normal boundary faces).
-
-        // Collect candidate faces
-        // ~~~~~~~~~~~~~~~~~~~~~~~
-
-        labelList testFaces(intersectedFaces());
-
-        // Collect segments
-        // ~~~~~~~~~~~~~~~~
-
-        pointField start(testFaces.size());
-        pointField end(testFaces.size());
-
-        forAll(testFaces, i)
-        {
-            label faceI = testFaces[i];
-
-            if (mesh_.isInternalFace(faceI))
-            {
-                start[i] = cellCentres[faceOwner[faceI]];
-                end[i] = cellCentres[faceNeighbour[faceI]];
-            }
-            else
-            {
-                start[i] = cellCentres[faceOwner[faceI]];
-                end[i] = neiCc[faceI-mesh_.nInternalFaces()];
-            }
-        }
-
-        // Extend segments a bit
-        {
-            const vectorField smallVec(ROOTSMALL*(end-start));
-            start -= smallVec;
-            end += smallVec;
-        }
-
-
-        // Do test for intersections
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Note that we intersect all intersected faces again. Could reuse
-        // the information already in surfaceIndex_.
-
-        labelList surface1;
-        List<pointIndexHit> hit1;
-        vectorField normal1;
-        labelList surface2;
-        List<pointIndexHit> hit2;
-        vectorField normal2;
-        {
-            labelList region1;
-            labelList region2;
-            surfaces_.findNearestIntersection
-            (
-                namedSurfaces,
-                start,
-                end,
-
-                surface1,
-                hit1,
-                region1,
-                normal1,
-
-                surface2,
-                hit2,
-                region2,
-                normal2
-            );
-        }
-
-        forAll(testFaces, i)
-        {
-            label faceI = testFaces[i];
-            const vector& area = mesh_.faceAreas()[faceI];
-
-            if (surface1[i] != -1)
-            {
-                // If both hit should probably choose 'nearest'
-                if
-                (
-                    surface2[i] != -1
-                 && (
-                        magSqr(hit2[i].hitPoint())
-                      < magSqr(hit1[i].hitPoint())
-                    )
-                )
-                {
-                    namedSurfaceIndex[faceI] = surface2[i];
-                    posOrientation[faceI] = ((area&normal2[i]) > 0);
-                    nSurfFaces[surface2[i]]++;
-                }
-                else
-                {
-                    namedSurfaceIndex[faceI] = surface1[i];
-                    posOrientation[faceI] = ((area&normal1[i]) > 0);
-                    nSurfFaces[surface1[i]]++;
-                }
-            }
-            else if (surface2[i] != -1)
-            {
-                namedSurfaceIndex[faceI] = surface2[i];
-                posOrientation[faceI] = ((area&normal2[i]) > 0);
-                nSurfFaces[surface2[i]]++;
-            }
-        }
-
-
-        // surfaceIndex might have different surfaces on both sides if
-        // there happen to be a (obviously thin) surface with different
-        // regions between the cell centres. If one is on a named surface
-        // and the other is not this might give problems so sync.
-        syncTools::syncFaceList
-        (
-            mesh_,
-            namedSurfaceIndex,
-            maxEqOp<label>()
-        );
-
-        // Print a bit
-        if (debug)
-        {
-            forAll(nSurfFaces, surfI)
-            {
-                Pout<< "Surface:"
-                    << surfaces_.names()[surfI]
-                    << "  nZoneFaces:" << nSurfFaces[surfI] << nl;
-            }
-            Pout<< endl;
-        }
-    }
-
 
     // Put the cells into the correct zone
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Zone per cell:
     // -2 : unset
-    // -1 : not in any zone
+    // -1 : not in any zone (zone 'none')
     // >=0: zoneID
     labelList cellToZone(mesh_.nCells(), -2);
 
 
-    // Set using geometric test
+    // Add from locationsInMesh
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Closed surfaces with cellZone specified.
-    labelList closedNamedSurfaces
-    (
-        surfaceZonesInfo::getClosedNamedSurfaces
-        (
-            surfZones,
-            surfaces_.geometry(),
-            surfaces_.surfaces()
-        )
-    );
+    // Filter out keepPoints
+    labelList zonedIndices(refinementParameters::zonedLocations(zonesInMesh));
 
-    if (closedNamedSurfaces.size())
+    if (zonedIndices.size())
     {
-        Info<< "Found " << closedNamedSurfaces.size()
-            << " closed, named surfaces. Assigning cells in/outside"
-            << " these surfaces to the corresponding cellZone."
-            << nl << endl;
+        // Explicitly provided locations and their cellZone. Determine all
+        // blocked faces and do walking. Updates cellToZone.
 
-        findCellZoneGeometric
+        Info<< "Setting cellZones according to locationsInMesh:" << endl;
+        //forAll(locationsInMesh, regionI)
+        forAll(zonedIndices, j)
+        {
+            label regionI = zonedIndices[j];
+            Info<< "Location : " << locationsInMesh[regionI] << nl
+                << "    cellZone : " << zonesInMesh[regionI] << endl;
+        }
+        Info<< endl;
+
+        // Test all (unnamed & named) surfaces
+        labelList globalRegion1;
+        labelList globalRegion2;
+        getIntersections
         (
+            identity(surfaces_.surfaces().size()),  // surfacesToTest,
+            neiLevel,
             neiCc,
-            closedNamedSurfaces,    // indices of closed surfaces
-            namedSurfaceIndex,      // per face index of named surface
-            surfaceToCellZone,      // cell zone index per surface
-
-            cellToZone
+            intersectedFaces(),     // testFaces
+            globalRegion1,
+            globalRegion2
         );
-    }
-
-
-    // Set using provided locations
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelList locationSurfaces
-    (
-        surfaceZonesInfo::getInsidePointNamedSurfaces(surfZones)
-    );
-
-    if (locationSurfaces.size())
-    {
-        Info<< "Found " << locationSurfaces.size()
-            << " named surfaces with a provided inside point."
-            << " Assigning cells inside these surfaces"
-            << " to the corresponding cellZone."
-            << nl << endl;
 
+        // Assign cellZone according to seed points
         findCellZoneInsideWalk
         (
-            locationSurfaces,       // indices of closed surfaces
-            namedSurfaceIndex,      // per face index of named surface
-            surfaceToCellZone,      // cell zone index per surface
-
+            pointField(locationsInMesh, zonedIndices),       // locations
+            UIndirectList<word>(zonesInMesh, zonedIndices)(),// name of region
+            globalRegion1,          // per face -1 (unblocked) or >= 0 (blocked)
             cellToZone
         );
     }
 
 
-    // Set using walking
-    // ~~~~~~~~~~~~~~~~~
 
+    // Mark faces intersecting zoned surfaces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    const PtrList<surfaceZonesInfo>& surfZones = surfaces_.surfZones();
+
+    labelList namedSurfaces(surfaceZonesInfo::getNamedSurfaces(surfZones));
+
+
+    //- Face face orientation of zone (only from those intersecting named
+    //  surfaces)
+    PackedBoolList posOrientation(mesh_.nFaces());
+    //- Per face index of faceZone or -1
+    labelList faceToZone(mesh_.nFaces(), -1);
+
+    if (namedSurfaces.size())
     {
-        Info<< "Walking from location-in-mesh " << keepPoint
+        Info<< "Setting cellZones according to named surfaces:" << endl;
+        forAll(namedSurfaces, i)
+        {
+            label surfI = namedSurfaces[i];
+
+            Info<< "Surface : " << surfaces_.names()[surfI] << nl
+                << "    faceZone : " << surfZones[surfI].faceZoneName() << nl
+                << "    cellZone : " << surfZones[surfI].cellZoneName() << endl;
+        }
+        Info<< endl;
+
+
+        // Add zones to mesh
+        labelList surfaceToFaceZone =
+            surfaceZonesInfo::addFaceZonesToMesh
+            (
+                surfZones,
+                namedSurfaces,
+                mesh_
+            );
+
+        labelList surfaceToCellZone =
+            surfaceZonesInfo::addCellZonesToMesh
+            (
+                surfZones,
+                namedSurfaces,
+                mesh_
+            );
+
+
+
+
+        // Like surfaceIndex_ but only for named surfaces.
+        labelList namedSurfaceIndex(mesh_.nFaces(), -1);
+
+        {
+            // Statistics: number of faces per faceZone
+            labelList nSurfFaces(surfZones.size(), 0);
+
+            // Note: for all internal faces? internal + coupled?
+            // Since zonify is run after baffling the surfaceIndex_ on baffles
+            // is
+            // not synchronised across both baffle faces. Fortunately we don't
+            // do zonify baffle faces anyway (they are normal boundary faces).
+
+            // Collect candidate faces
+            // ~~~~~~~~~~~~~~~~~~~~~~~
+
+            labelList testFaces(intersectedFaces());
+
+            // Collect segments
+            // ~~~~~~~~~~~~~~~~
+
+            pointField start(testFaces.size());
+            pointField end(testFaces.size());
+
+            forAll(testFaces, i)
+            {
+                label faceI = testFaces[i];
+
+                if (mesh_.isInternalFace(faceI))
+                {
+                    start[i] = cellCentres[faceOwner[faceI]];
+                    end[i] = cellCentres[faceNeighbour[faceI]];
+                }
+                else
+                {
+                    start[i] = cellCentres[faceOwner[faceI]];
+                    end[i] = neiCc[faceI-mesh_.nInternalFaces()];
+                }
+            }
+
+            // Extend segments a bit
+            {
+                const vectorField smallVec(ROOTSMALL*(end-start));
+                start -= smallVec;
+                end += smallVec;
+            }
+
+
+            // Do test for intersections
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~
+            // Note that we intersect all intersected faces again. Could reuse
+            // the information already in surfaceIndex_.
+
+            labelList surface1;
+            List<pointIndexHit> hit1;
+            vectorField normal1;
+            labelList surface2;
+            List<pointIndexHit> hit2;
+            vectorField normal2;
+            {
+                labelList region1;
+                labelList region2;
+                surfaces_.findNearestIntersection
+                (
+                    namedSurfaces,
+                    start,
+                    end,
+
+                    surface1,
+                    hit1,
+                    region1,
+                    normal1,
+
+                    surface2,
+                    hit2,
+                    region2,
+                    normal2
+                );
+            }
+
+            forAll(testFaces, i)
+            {
+                label faceI = testFaces[i];
+                const vector& area = mesh_.faceAreas()[faceI];
+
+                if (surface1[i] != -1)
+                {
+                    // If both hit should probably choose 'nearest'
+                    if
+                    (
+                        surface2[i] != -1
+                     && (
+                            magSqr(hit2[i].hitPoint())
+                          < magSqr(hit1[i].hitPoint())
+                        )
+                    )
+                    {
+                        namedSurfaceIndex[faceI] = surface2[i];
+                        posOrientation[faceI] = ((area&normal2[i]) > 0);
+                        nSurfFaces[surface2[i]]++;
+                    }
+                    else
+                    {
+                        namedSurfaceIndex[faceI] = surface1[i];
+                        posOrientation[faceI] = ((area&normal1[i]) > 0);
+                        nSurfFaces[surface1[i]]++;
+                    }
+                }
+                else if (surface2[i] != -1)
+                {
+                    namedSurfaceIndex[faceI] = surface2[i];
+                    posOrientation[faceI] = ((area&normal2[i]) > 0);
+                    nSurfFaces[surface2[i]]++;
+                }
+            }
+
+
+            // surfaceIndex might have different surfaces on both sides if
+            // there happen to be a (obviously thin) surface with different
+            // regions between the cell centres. If one is on a named surface
+            // and the other is not this might give problems so sync.
+            syncTools::syncFaceList
+            (
+                mesh_,
+                namedSurfaceIndex,
+                maxEqOp<label>()
+            );
+
+            // Print a bit
+            if (debug)
+            {
+                forAll(nSurfFaces, surfI)
+                {
+                    Pout<< "Surface:"
+                        << surfaces_.names()[surfI]
+                        << "  nZoneFaces:" << nSurfFaces[surfI] << nl;
+                }
+                Pout<< endl;
+            }
+        }
+
+
+        // Now we have for all faces the intersection with a named surfaces (or
+        // -1). Use this information to set zone of cells
+
+        // Set using geometric test
+        // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+        // Closed surfaces with cellZone specified.
+        labelList closedNamedSurfaces
+        (
+            surfaceZonesInfo::getClosedNamedSurfaces
+            (
+                surfZones,
+                surfaces_.geometry(),
+                surfaces_.surfaces()
+            )
+        );
+
+        if (closedNamedSurfaces.size())
+        {
+            Info<< "Found " << closedNamedSurfaces.size()
+                << " closed, named surfaces. Assigning cells in/outside"
+                << " these surfaces to the corresponding cellZone."
+                << nl << endl;
+
+            findCellZoneGeometric
+            (
+                neiCc,
+                closedNamedSurfaces,    // indices of closed surfaces
+                namedSurfaceIndex,      // per face index of named surface
+                surfaceToCellZone,      // cell zone index per surface
+
+                cellToZone
+            );
+        }
+
+
+        // Set using provided locations
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        labelList locationSurfaces
+        (
+            surfaceZonesInfo::getInsidePointNamedSurfaces(surfZones)
+        );
+
+        if (locationSurfaces.size())
+        {
+            Info<< "Found " << locationSurfaces.size()
+                << " named surfaces with a provided inside point."
+                << " Assigning cells inside these surfaces"
+                << " to the corresponding cellZone."
+                << nl << endl;
+
+            findCellZoneInsideWalk
+            (
+                locationSurfaces,       // indices of closed surfaces
+                namedSurfaceIndex,      // per face index of named surface
+                surfaceToCellZone,      // cell zone index per surface
+
+                cellToZone
+            );
+        }
+
+
+        // Set using walking
+        // ~~~~~~~~~~~~~~~~~
+
+        Info<< "Walking from " << locationsInMesh.size()
+            << " locations-in-mesh "
             << " to assign cellZones "
             << "- crossing a faceZone face changes cellZone" << nl << endl;
 
-        // Topological walk
+        labelList zoneIDs(refinementParameters::unzonedLocations(zonesInMesh));
+
         findCellZoneTopo
         (
-            keepPoint,
+            pointField(locationsInMesh, zoneIDs),
             namedSurfaceIndex,
             surfaceToCellZone,
 
             cellToZone
         );
+
+
+        // Make sure namedSurfaceIndex is unset inbetween same cell zones.
+        if (!allowFreeStandingZoneFaces)
+        {
+            Info<< "Only keeping zone faces inbetween different cellZones."
+                << nl << endl;
+
+            makeConsistentFaceIndex(cellToZone, namedSurfaceIndex);
+        }
+
+
+        // Convert namedSurfaceIndex (index of named surfaces) to
+        // actual faceZone index
+
+        forAll(namedSurfaceIndex, faceI)
+        {
+            label surfI = namedSurfaceIndex[faceI];
+            if (surfI != -1)
+            {
+                faceToZone[faceI] = surfaceToFaceZone[surfI];
+            }
+        }
     }
 
 
-    // Make sure namedSurfaceIndex is unset inbetween same cell cell zones.
-    if (!allowFreeStandingZoneFaces)
+
+    //if (debug&MESH)
+    //{
+    //    const_cast<Time&>(mesh_.time())++;
+    //    Pout<< "Writing mesh to time " << timeName() << endl;
+    //    write
+    //    (
+    //        debugType(debug),
+    //        writeType(writeLevel() | WRITEMESH),
+    //        mesh_.time().path()/"cellToZone"
+    //    );
+    //    volScalarField volCellToZone
+    //    (
+    //        IOobject
+    //        (
+    //            "cellToZone",
+    //            mesh_.time().timeName(),
+    //            mesh_,
+    //            IOobject::NO_READ,
+    //            IOobject::AUTO_WRITE,
+    //            false
+    //        ),
+    //        mesh_,
+    //        dimensionedScalar("zero", dimless, 0),
+    //        zeroGradientFvPatchScalarField::typeName
+    //    );
+    //
+    //    forAll(cellToZone, cellI)
+    //    {
+    //        volCellToZone[cellI] = cellToZone[cellI];
+    //    }
+    //    volCellToZone.write();
+    //}
+
+
+
+    // Allocate and assign faceZones from cellZones
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     {
-        Info<< "Only keeping zone faces inbetween different cellZones."
-            << nl << endl;
+        // 1. Detect inter-region face and allocate names
 
-        makeConsistentFaceIndex(cellToZone, namedSurfaceIndex);
+        HashTable<word, labelPair, labelPair::Hash<> > zoneIDsToFaceZone;
+
+        for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+        {
+            if (faceToZone[faceI] == -1)
+            {
+                // Face not yet in a faceZone. (it might already have been
+                // done so by a 'named' surface). Check if inbetween different
+                // cellZones
+                allocateInterRegionFaceZone
+                (
+                    cellToZone[mesh_.faceOwner()[faceI]],
+                    cellToZone[mesh_.faceNeighbour()[faceI]],
+                    zonesToFaceZone,
+                    zoneIDsToFaceZone
+                );
+            }
+        }
+
+        labelList neiCellZone;
+        syncTools::swapBoundaryCellList(mesh_, cellToZone, neiCellZone);
+
+        forAll(neiCellZone, bFaceI)
+        {
+            label faceI = bFaceI + mesh_.nInternalFaces();
+            if (faceToZone[faceI] == -1)
+            {
+                allocateInterRegionFaceZone
+                (
+                    cellToZone[mesh_.faceOwner()[faceI]],
+                    neiCellZone[bFaceI],
+                    zonesToFaceZone,
+                    zoneIDsToFaceZone
+                );
+            }
+        }
+
+
+        // 2.Combine faceZoneNames allocated on different processors
+
+        Pstream::mapCombineGather(zonesToFaceZone, eqOp<word>());
+        Pstream::mapCombineScatter(zonesToFaceZone);
+
+
+        // 3. Allocate faceZones from (now synchronised) faceZoneNames
+        //    Note: the faceZoneNames contain the same data but in different
+        //          order. We could sort the contents but instead just loop
+        //          in sortedToc order.
+
+        Info<< "Setting faceZones according to neighbouring cellZones:"
+            << endl;
+
+        // From cellZone indices to faceZone index
+        HashTable<label, labelPair, labelPair::Hash<> > fZoneLookup
+        (
+            zonesToFaceZone.size()
+        );
+
+        const cellZoneMesh& cellZones = mesh_.cellZones();
+
+        {
+            List<Pair<word> > czs(zonesToFaceZone.sortedToc());
+
+            forAll(czs, i)
+            {
+                const Pair<word>& cz = czs[i];
+                const word& fzName = zonesToFaceZone[cz];
+
+                Info<< indent<< "cellZones : "
+                    << cz[0] << ' ' << cz[1] << nl
+                    << "    faceZone : " << fzName << endl;
+
+                label faceZoneI = surfaceZonesInfo::addFaceZone
+                (
+                    fzName,                 // name
+                    labelList(0),           // addressing
+                    boolList(0),            // flipMap
+                    mesh_
+                );
+
+                label cz0 = cellZones.findZoneID(cz[0]);
+                label cz1 = cellZones.findZoneID(cz[1]);
+
+                fZoneLookup.insert(labelPair(cz0, cz1), faceZoneI);
+            }
+        }
+
+
+        // 4. Set faceToZone with new faceZones
+
+
+        for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+        {
+            if (faceToZone[faceI] == -1)
+            {
+                // Face not yet in a faceZone. (it might already have been
+                // done so by a 'named' surface). Check if inbetween different
+                // cellZones
+
+                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+                label neiZone = cellToZone[mesh_.faceNeighbour()[faceI]];
+                if (ownZone != neiZone)
+                {
+                    bool swap =
+                    (
+                        ownZone == -1
+                     || (neiZone != -1 && ownZone > neiZone)
+                    );
+                    labelPair key(ownZone, neiZone);
+                    if (swap)
+                    {
+                        Swap(key.first(), key.second());
+                    }
+                    faceToZone[faceI] = fZoneLookup[key];
+                }
+            }
+        }
+        forAll(neiCellZone, bFaceI)
+        {
+            label faceI = bFaceI + mesh_.nInternalFaces();
+            if (faceToZone[faceI] == -1)
+            {
+                label ownZone = cellToZone[mesh_.faceOwner()[faceI]];
+                label neiZone = neiCellZone[bFaceI];
+                if (ownZone != neiZone)
+                {
+                    bool swap =
+                    (
+                        ownZone == -1
+                     || (neiZone != -1 && ownZone > neiZone)
+                    );
+                    labelPair key(ownZone, neiZone);
+                    if (swap)
+                    {
+                        Swap(key.first(), key.second());
+                    }
+                    faceToZone[faceI] = fZoneLookup[key];
+                }
+            }
+        }
+        Info<< endl;
     }
 
-    // Topochange container
-    polyTopoChange meshMod(mesh_);
 
 
 
     // Get coupled neighbour cellZone. Set to -1 on non-coupled patches.
-    labelList neiCellZone(mesh_.nFaces()-mesh_.nInternalFaces(), -1);
+    labelList neiCellZone;
+    syncTools::swapBoundaryCellList(mesh_, cellToZone, neiCellZone);
     forAll(patches, patchI)
     {
         const polyPatch& pp = patches[patchI];
 
-        if (pp.coupled())
+        if (!pp.coupled())
         {
+            label bFaceI = pp.start()-mesh_.nInternalFaces();
             forAll(pp, i)
             {
-                label faceI = pp.start()+i;
-                neiCellZone[faceI-mesh_.nInternalFaces()] =
-                    cellToZone[mesh_.faceOwner()[faceI]];
+                neiCellZone[bFaceI++] = -1;
             }
         }
     }
-    syncTools::swapBoundaryFaceList(mesh_, neiCellZone);
+
+
 
     // Get per face whether is it master (of a coupled set of faces)
     const PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
 
 
-
     // faceZones
     // ~~~~~~~~~
     // Faces on faceZones come in two variants:
@@ -3204,7 +4383,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     //      - do a consistent orientation
     //      - check number of faces with consistent orientation
     //      - if <0 flip the whole patch
-    boolList meshFlipMap(mesh_.nFaces(), false);
+    PackedBoolList meshFlipMap(mesh_.nFaces(), false);
     {
         // Collect all data on zone faces without cellZones on either side.
         const indirectPrimitivePatch patch
@@ -3214,7 +4393,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
                 mesh_.faces(),
                 freeStandingBaffleFaces
                 (
-                    namedSurfaceIndex,
+                    faceToZone,
                     cellToZone,
                     neiCellZone
                 )
@@ -3228,18 +4407,25 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
             Info<< "Detected " << nFreeStanding << " free-standing zone faces"
                 << endl;
 
+            if (debug)
+            {
+                OBJstream str(mesh_.time().path()/"freeStanding.obj");
+                str.write(patch.localFaces(), patch.localPoints(), false);
+            }
+
+
             // Detect non-manifold edges
             labelList nMasterFacesPerEdge;
             calcPatchNumMasterFaces(isMasterFace, patch, nMasterFacesPerEdge);
 
             // Mark zones. Even a single original surface might create multiple
             // disconnected/non-manifold-connected zones
-            labelList faceToZone;
+            labelList faceToConnectedZone;
             const label nZones = markPatchZones
             (
                 patch,
                 nMasterFacesPerEdge,
-                faceToZone
+                faceToConnectedZone
             );
 
             Map<label> nPosOrientation(2*nZones);
@@ -3256,7 +4442,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
                 isMasterFace,
                 patch,
                 nMasterFacesPerEdge,
-                faceToZone,
+                faceToConnectedZone,
                 nPosOrientation,
 
                 meshFlipMap
@@ -3280,7 +4466,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
                         n = -1;
                     }
 
-                    nPosOrientation.find(faceToZone[faceI])() += n;
+                    nPosOrientation.find(faceToConnectedZone[faceI])() += n;
                 }
             }
             Pstream::mapCombineGather(nPosOrientation, plusEqOp<label>());
@@ -3300,14 +4486,14 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
             Info<< endl;
 
 
-            // Reapply with new counts (in nPosOrientation). This will cause
+            // Re-apply with new counts (in nPosOrientation). This will cause
             // zones with a negative count to be flipped.
             consistentOrientation
             (
                 isMasterFace,
                 patch,
                 nMasterFacesPerEdge,
-                faceToZone,
+                faceToConnectedZone,
                 nPosOrientation,
 
                 meshFlipMap
@@ -3316,137 +4502,21 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     }
 
 
-    // Put the faces into the correct zone
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-    {
-        label surfI = namedSurfaceIndex[faceI];
-
-        if (surfI != -1)
-        {
-            // Orient face zone to have slave cells in max cell zone.
-            label ownZone = cellToZone[faceOwner[faceI]];
-            label neiZone = cellToZone[faceNeighbour[faceI]];
-
-            bool flip;
-
-            label maxZone = max(ownZone, neiZone);
-
-            if (maxZone == -1)
-            {
-                // free-standing face. Use geometrically derived orientation
-                flip = meshFlipMap[faceI];
-            }
-            else if (ownZone == maxZone)
-            {
-                flip = false;
-            }
-            else
-            {
-                flip = true;
-            }
-
-            meshMod.setAction
-            (
-                polyModifyFace
-                (
-                    mesh_.faces()[faceI],           // modified face
-                    faceI,                          // label of face
-                    faceOwner[faceI],               // owner
-                    faceNeighbour[faceI],           // neighbour
-                    false,                          // face flip
-                    -1,                             // patch for face
-                    false,                          // remove from zone
-                    surfaceToFaceZone[surfI],       // zone for face
-                    flip                            // face flip in zone
-                )
-            );
-        }
-    }
 
 
-    // Set owner as no-flip
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
+    // Topochange container
+    polyTopoChange meshMod(mesh_);
 
-        label faceI = pp.start();
-
-        forAll(pp, i)
-        {
-            label surfI = namedSurfaceIndex[faceI];
-
-            if (surfI != -1)
-            {
-                label ownZone = cellToZone[faceOwner[faceI]];
-                label neiZone = neiCellZone[faceI-mesh_.nInternalFaces()];
-
-                bool flip;
-
-                label maxZone = max(ownZone, neiZone);
-
-                if (maxZone == -1)
-                {
-                    // free-standing face. Use geometrically derived orientation
-                    flip = meshFlipMap[faceI];
-                }
-                else if (ownZone == neiZone)
-                {
-                    // Free-standing zone face or coupled boundary. Keep master
-                    // face unflipped.
-                    flip = !isMasterFace[faceI];
-                }
-                else if (neiZone == maxZone)
-                {
-                    flip = true;
-                }
-                else
-                {
-                    flip = false;
-                }
-
-                meshMod.setAction
-                (
-                    polyModifyFace
-                    (
-                        mesh_.faces()[faceI],           // modified face
-                        faceI,                          // label of face
-                        faceOwner[faceI],               // owner
-                        -1,                             // neighbour
-                        false,                          // face flip
-                        patchI,                         // patch for face
-                        false,                          // remove from zone
-                        surfaceToFaceZone[surfI],       // zone for face
-                        flip                            // face flip in zone
-                    )
-                );
-            }
-            faceI++;
-        }
-    }
-
-
-    // Put the cells into the correct zone
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    forAll(cellToZone, cellI)
-    {
-        label zoneI = cellToZone[cellI];
-
-        if (zoneI >= 0)
-        {
-            meshMod.setAction
-            (
-                polyModifyCell
-                (
-                    cellI,
-                    false,          // removeFromZone
-                    zoneI
-                )
-            );
-        }
-    }
+    // Insert changes to put cells and faces into zone
+    zonify
+    (
+        isMasterFace,
+        cellToZone,
+        neiCellZone,
+        faceToZone,
+        meshFlipMap,
+        meshMod
+    );
 
     // Change the mesh (no inflation, parallel sync)
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementGapRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementGapRefine.C
new file mode 100644
index 0000000000..68121ff02d
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementGapRefine.C
@@ -0,0 +1,1677 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "meshRefinement.H"
+#include "Time.H"
+#include "refinementSurfaces.H"
+#include "refinementFeatures.H"
+#include "shellSurfaces.H"
+#include "triSurfaceMesh.H"
+#include "treeDataCell.H"
+#include "searchableSurfaces.H"
+#include "DynamicField.H"
+#include "transportData.H"
+#include "FaceCellWave.H"
+#include "volFields.H"
+#include "zeroGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::label Foam::meshRefinement::markSurfaceGapRefinement
+(
+    const scalar planarCos,
+
+    const label nAllowRefine,
+    const labelList& neiLevel,
+    const pointField& neiCc,
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    // Get the gap level for the shells
+    const labelList maxLevel(shells_.maxGapLevel());
+
+    label oldNRefine = nRefine;
+
+    if (max(maxLevel) > 0)
+    {
+        // Use cached surfaceIndex_ to detect if any intersection. If so
+        // re-intersect to determine level wanted.
+
+        // Collect candidate faces
+        // ~~~~~~~~~~~~~~~~~~~~~~~
+
+        labelList testFaces(getRefineCandidateFaces(refineCell));
+
+        // Collect segments
+        // ~~~~~~~~~~~~~~~~
+
+        pointField start(testFaces.size());
+        pointField end(testFaces.size());
+        {
+            labelList minLevel(testFaces.size());
+            calcCellCellRays
+            (
+                neiCc,
+                neiLevel,
+                testFaces,
+                start,
+                end,
+                minLevel
+            );
+        }
+
+
+        // Collect cells to test for inside/outside in shell
+        labelList cellToCompact(mesh_.nCells(), -1);
+        labelList bFaceToCompact(mesh_.nFaces()-mesh_.nInternalFaces(), -1);
+        List<FixedList<label, 3> > shellGapInfo;
+        List<volumeType> shellGapMode;
+        {
+            DynamicField<point> compactToCc(mesh_.nCells()/10);
+            DynamicList<label> compactToLevel(compactToCc.capacity());
+            forAll(testFaces, i)
+            {
+                label faceI = testFaces[i];
+                label own = mesh_.faceOwner()[faceI];
+                if (cellToCompact[own] == -1)
+                {
+                    cellToCompact[own] = compactToCc.size();
+                    compactToCc.append(cellCentres[own]);
+                    compactToLevel.append(cellLevel[own]);
+                }
+                if (mesh_.isInternalFace(faceI))
+                {
+                    label nei = mesh_.faceNeighbour()[faceI];
+                    if (cellToCompact[nei] == -1)
+                    {
+                        cellToCompact[nei] = compactToCc.size();
+                        compactToCc.append(cellCentres[nei]);
+                        compactToLevel.append(cellLevel[nei]);
+                    }
+                }
+                else
+                {
+                    label bFaceI = faceI - mesh_.nInternalFaces();
+                    if (bFaceToCompact[bFaceI] == -1)
+                    {
+                        bFaceToCompact[bFaceI] = compactToCc.size();
+                        compactToCc.append(neiCc[bFaceI]);
+                        compactToLevel.append(neiLevel[bFaceI]);
+                    }
+                }
+            }
+
+            shells_.findHigherGapLevel
+            (
+                compactToCc,
+                compactToLevel,
+                shellGapInfo,
+                shellGapMode
+            );
+        }
+
+
+        const List<FixedList<label, 3> >& extendedGapLevel =
+            surfaces_.extendedGapLevel();
+        const List<volumeType>& extendedGapMode =
+            surfaces_.extendedGapMode();
+
+        labelList ccSurface1;
+        List<pointIndexHit> ccHit1;
+        labelList ccRegion1;
+        vectorField ccNormal1;
+
+        {
+            labelList ccSurface2;
+            List<pointIndexHit> ccHit2;
+            labelList ccRegion2;
+            vectorField ccNormal2;
+
+            surfaces_.findNearestIntersection
+            (
+                identity(surfaces_.surfaces().size()),
+                start,
+                end,
+
+                ccSurface1,
+                ccHit1,
+                ccRegion1,
+                ccNormal1,
+
+                ccSurface2,
+                ccHit2,
+                ccRegion2,
+                ccNormal2
+            );
+        }
+
+        start.clear();
+        end.clear();
+
+        DynamicField<point> rayStart(2*ccSurface1.size());
+        DynamicField<point> rayEnd(2*ccSurface1.size());
+        DynamicField<scalar> gapSize(2*ccSurface1.size());
+
+        DynamicField<point> rayStart2(2*ccSurface1.size());
+        DynamicField<point> rayEnd2(2*ccSurface1.size());
+        DynamicField<scalar> gapSize2(2*ccSurface1.size());
+
+        DynamicList<label> cellMap(2*ccSurface1.size());
+        DynamicList<label> compactMap(2*ccSurface1.size());
+
+        forAll(ccSurface1, i)
+        {
+            label surfI = ccSurface1[i];
+
+            if (surfI != -1)
+            {
+                label globalRegionI =
+                    surfaces_.globalRegion(surfI, ccRegion1[i]);
+
+                label faceI = testFaces[i];
+                const point& surfPt = ccHit1[i].hitPoint();
+
+                label own = mesh_.faceOwner()[faceI];
+                if (cellToCompact[own] != -1)
+                {
+                    // Combine info from shell and surface
+                    label compactI = cellToCompact[own];
+                    FixedList<label, 3> gapInfo;
+                    volumeType gapMode;
+                    mergeGapInfo
+                    (
+                        shellGapInfo[compactI],
+                        shellGapMode[compactI],
+                        extendedGapLevel[globalRegionI],
+                        extendedGapMode[globalRegionI],
+                        gapInfo,
+                        gapMode
+                    );
+
+                    const point& cc = cellCentres[own];
+                    label nRays = generateRays
+                    (
+                        false,
+                        surfPt,
+                        ccNormal1[i],
+                        gapInfo,
+                        gapMode,
+                        surfPt+((cc-surfPt)&ccNormal1[i])*ccNormal1[i],
+                        cellLevel[own],
+
+                        rayStart,
+                        rayEnd,
+                        gapSize,
+
+                        rayStart2,
+                        rayEnd2,
+                        gapSize2
+                    );
+                    for (label j = 0; j < nRays; j++)
+                    {
+                        cellMap.append(own);
+                        compactMap.append(i);
+                    }
+                }
+                if (mesh_.isInternalFace(faceI))
+                {
+                    label nei = mesh_.faceNeighbour()[faceI];
+                    if (cellToCompact[nei] != -1)
+                    {
+                        // Combine info from shell and surface
+                        label compactI = cellToCompact[nei];
+                        FixedList<label, 3> gapInfo;
+                        volumeType gapMode;
+                        mergeGapInfo
+                        (
+                            shellGapInfo[compactI],
+                            shellGapMode[compactI],
+                            extendedGapLevel[globalRegionI],
+                            extendedGapMode[globalRegionI],
+                            gapInfo,
+                            gapMode
+                        );
+
+                        const point& cc = cellCentres[nei];
+                        label nRays = generateRays
+                        (
+                            false,
+                            surfPt,
+                            ccNormal1[i],
+                            gapInfo,
+                            gapMode,
+                            surfPt+((cc-surfPt)&ccNormal1[i])*ccNormal1[i],
+                            cellLevel[nei],
+
+                            rayStart,
+                            rayEnd,
+                            gapSize,
+
+                            rayStart2,
+                            rayEnd2,
+                            gapSize2
+                        );
+                        for (label j = 0; j < nRays; j++)
+                        {
+                            cellMap.append(nei);
+                            compactMap.append(i);
+                        }
+                    }
+                }
+                else
+                {
+                    // Note: on coupled face. What cell are we going to
+                    // refine? We've got the neighbouring cell centre
+                    // and level but we cannot mark it for refinement on
+                    // this side...
+                    label bFaceI = faceI - mesh_.nInternalFaces();
+
+                    if (bFaceToCompact[bFaceI] != -1)
+                    {
+                        // Combine info from shell and surface
+                        label compactI = bFaceToCompact[bFaceI];
+                        FixedList<label, 3> gapInfo;
+                        volumeType gapMode;
+                        mergeGapInfo
+                        (
+                            shellGapInfo[compactI],
+                            shellGapMode[compactI],
+                            extendedGapLevel[globalRegionI],
+                            extendedGapMode[globalRegionI],
+                            gapInfo,
+                            gapMode
+                        );
+
+                        const point& cc = neiCc[bFaceI];
+                        label nRays = generateRays
+                        (
+                            false,
+                            surfPt,
+                            ccNormal1[i],
+                            gapInfo,
+                            gapMode,
+                            surfPt+((cc-surfPt)&ccNormal1[i])*ccNormal1[i],
+                            neiLevel[bFaceI],
+
+                            rayStart,
+                            rayEnd,
+                            gapSize,
+
+                            rayStart2,
+                            rayEnd2,
+                            gapSize2
+                        );
+                        for (label j = 0; j < nRays; j++)
+                        {
+                            cellMap.append(-1); // See above.
+                            compactMap.append(i);
+                        }
+                    }
+                }
+            }
+        }
+
+        Info<< "Shooting " << returnReduce(rayStart.size(), sumOp<label>())
+            << " rays from " << returnReduce(testFaces.size(), sumOp<label>())
+            << " intersected faces" << endl;
+
+        rayStart.shrink();
+        rayEnd.shrink();
+        gapSize.shrink();
+
+        rayStart2.shrink();
+        rayEnd2.shrink();
+        gapSize2.shrink();
+
+        cellMap.shrink();
+        compactMap.shrink();
+
+        testFaces.clear();
+        ccSurface1.clear();
+        ccHit1.clear();
+        ccRegion1.clear();
+        ccNormal1 = UIndirectList<vector>(ccNormal1, compactMap)();
+
+
+        // Do intersections in pairs
+        labelList surf1;
+        List<pointIndexHit> hit1;
+        vectorField normal1;
+        surfaces_.findNearestIntersection
+        (
+            rayStart,
+            rayEnd,
+            surf1,
+            hit1,
+            normal1
+        );
+
+        labelList surf2;
+        List<pointIndexHit> hit2;
+        vectorField normal2;
+        surfaces_.findNearestIntersection
+        (
+            rayStart2,
+            rayEnd2,
+            surf2,
+            hit2,
+            normal2
+        );
+
+        forAll(surf1, i)
+        {
+            if (surf1[i] != -1 && surf2[i] != -1)
+            {
+                // Found intersection with surface. Check opposite normal.
+                label cellI = cellMap[i];
+
+                if
+                (
+                    cellI != -1
+                 && (mag(normal1[i]&normal2[i]) > planarCos)
+                 && (
+                        magSqr(hit1[i].hitPoint()-hit2[i].hitPoint())
+                      < Foam::sqr(gapSize[i])
+                    )
+                )
+                {
+                    if
+                    (
+                       !markForRefine
+                        (
+                            surf1[i],
+                            nAllowRefine,
+                            refineCell[cellI],
+                            nRefine
+                        )
+                    )
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        if
+        (
+            returnReduce(nRefine, sumOp<label>())
+          > returnReduce(nAllowRefine, sumOp<label>())
+        )
+        {
+            Info<< "Reached refinement limit." << endl;
+        }
+    }
+
+    return returnReduce(nRefine-oldNRefine, sumOp<label>());
+}
+
+
+//Foam::meshRefinement::findNearestOppositeOp::findNearestOppositeOp
+//(
+//    const indexedOctree<treeDataTriSurface>& tree,
+//    const point& oppositePoint,
+//    const vector& oppositeNormal,
+//    const scalar minCos
+//)
+//:
+//    tree_(tree),
+//    oppositePoint_(oppositePoint),
+//    oppositeNormal_(oppositeNormal),
+//    minCos_(minCos)
+//{}
+//
+//
+//void Foam::meshRefinement::findNearestOppositeOp::operator()
+//(
+//    const labelUList& indices,
+//    const point& sample,
+//    scalar& nearestDistSqr,
+//    label& minIndex,
+//    point& nearestPoint
+//) const
+//{
+//    const treeDataTriSurface& shape = tree_.shapes();
+//    const triSurface& patch = shape.patch();
+//    const pointField& points = patch.points();
+//
+//    forAll(indices, i)
+//    {
+//        const label index = indices[i];
+//        const labelledTri& f = patch[index];
+//
+//        pointHit nearHit = f.nearestPoint(sample, points);
+//        scalar distSqr = sqr(nearHit.distance());
+//
+//        if (distSqr < nearestDistSqr)
+//        {
+//            // Nearer. Check if
+//            // - a bit way from other hit
+//            // - in correct search cone
+//            vector d(nearHit.rawPoint()-oppositePoint_);
+//            scalar normalDist(d&oppositeNormal_);
+//
+//            if (normalDist > Foam::sqr(SMALL) && normalDist/mag(d) > minCos_)
+//            {
+//                nearestDistSqr = distSqr;
+//                minIndex = index;
+//                nearestPoint = nearHit.rawPoint();
+//            }
+//        }
+//    }
+//}
+//
+//
+//void Foam::meshRefinement::searchCone
+//(
+//    const label surfI,
+//    labelList& nearMap,                 // cells
+//    scalarField& nearGap,               // gap size
+//    List<pointIndexHit>& nearInfo,      // nearest point on surface
+//    List<pointIndexHit>& oppositeInfo   // detected point on gap (or miss)
+//) const
+//{
+//    const labelList& cellLevel = meshCutter_.cellLevel();
+//    const pointField& cellCentres = mesh_.cellCentres();
+//    const scalar edge0Len = meshCutter_.level0EdgeLength();
+//
+//    const labelList& surfaceIndices = surfaces_.surfaces();
+//    const List<FixedList<label, 3> >& extendedGapLevel =
+//        surfaces_.extendedGapLevel();
+//    const List<volumeType>& extendedGapMode = surfaces_.extendedGapMode();
+//
+//
+//    label geomI = surfaceIndices[surfI];
+//    const searchableSurface& geom = surfaces_.geometry()[geomI];
+//
+//    const triSurfaceMesh& s = refCast<const triSurfaceMesh>(geom);
+//    const indexedOctree<treeDataTriSurface>& tree = s.tree();
+//
+//
+//    const scalar searchCos(Foam::cos(degToRad(30)));
+//
+//    // Normals for ray shooting and inside/outside detection
+//    vectorField nearNormal;
+//    geom.getNormal(nearInfo, nearNormal);
+//    // Regions
+//    labelList nearRegion;
+//    geom.getRegion(nearInfo, nearRegion);
+//
+//
+//    // Now loop over all near points and search in the half cone
+//    labelList map(nearInfo.size());
+//    label compactI = 0;
+//
+//    oppositeInfo.setSize(nearInfo.size());
+//
+//    forAll(nearInfo, i)
+//    {
+//        label globalRegionI =
+//            surfaces_.globalRegion(surfI, nearRegion[i]);
+//
+//        // Get updated gap information now we have the region
+//        label nGapCells = extendedGapLevel[globalRegionI][0];
+//        label minLevel = extendedGapLevel[globalRegionI][1];
+//        label maxLevel = extendedGapLevel[globalRegionI][2];
+//        volumeType mode = extendedGapMode[globalRegionI];
+//
+//        label cellI = nearMap[i];
+//        label cLevel = cellLevel[cellI];
+//
+//        if (cLevel >= minLevel && cLevel < maxLevel)
+//        {
+//            scalar cellSize = edge0Len/pow(2.0, cLevel);
+//
+//            // Update gap size
+//            nearGap[i] = nGapCells*cellSize;
+//
+//            const point& nearPt = nearInfo[i].hitPoint();
+//            vector v(cellCentres[cellI]-nearPt);
+//            scalar magV = mag(v);
+//
+//            // Like with ray shooting we want to
+//            // - find triangles up to nearGap away on the wanted side of the
+//            //   surface
+//            // - find triangles up to 0.5*cellSize away on the unwanted side
+//            //   of the surface. This is for cells straddling the surface
+//            //   where
+//            //   the cell centre might be on the wrong side of the surface
+//
+//            // Tbd: check that cell centre is inbetween the gap hits
+//            // (only if the cell is far enough away)
+//
+//            scalar posNormalSize = 0.0;
+//            scalar negNormalSize = 0.0;
+//
+//            if (mode == volumeType::OUTSIDE)
+//            {
+//                posNormalSize = nearGap[i];
+//                if (magV < 0.5*cellSize)
+//                {
+//                    negNormalSize = 0.5*cellSize;
+//                }
+//            }
+//            else if (mode == volumeType::INSIDE)
+//            {
+//                if (magV < 0.5*cellSize)
+//                {
+//                    posNormalSize = 0.5*cellSize;
+//                }
+//                negNormalSize = nearGap[i];
+//            }
+//            else
+//            {
+//                posNormalSize = nearGap[i];
+//                negNormalSize = nearGap[i];
+//            }
+//
+//            // Test with positive normal
+//            oppositeInfo[compactI] = tree.findNearest
+//            (
+//                nearPt,
+//                sqr(posNormalSize),
+//                findNearestOppositeOp
+//                (
+//                    tree,
+//                    nearPt,
+//                    nearNormal[i],
+//                    searchCos
+//                )
+//            );
+//
+//            if (oppositeInfo[compactI].hit())
+//            {
+//                map[compactI++] = i;
+//            }
+//            else
+//            {
+//                // Test with negative normal
+//                oppositeInfo[compactI] = tree.findNearest
+//                (
+//                    nearPt,
+//                    sqr(negNormalSize),
+//                    findNearestOppositeOp
+//                    (
+//                        tree,
+//                        nearPt,
+//                        -nearNormal[i],
+//                        searchCos
+//                    )
+//                );
+//
+//                if (oppositeInfo[compactI].hit())
+//                {
+//                    map[compactI++] = i;
+//                }
+//            }
+//        }
+//    }
+//
+//    Info<< "Selected " << returnReduce(compactI, sumOp<label>())
+//        << " hits on the correct side out of "
+//        << returnReduce(map.size(), sumOp<label>()) << endl;
+//    map.setSize(compactI);
+//    oppositeInfo.setSize(compactI);
+//
+//    nearMap = UIndirectList<label>(nearMap, map)();
+//    nearGap = UIndirectList<scalar>(nearGap, map)();
+//    nearInfo = UIndirectList<pointIndexHit>(nearInfo, map)();
+//    nearNormal = UIndirectList<vector>(nearNormal, map)();
+//
+//    // Exclude hits which aren't opposite enough. E.g. you might find
+//    // a point on a perpendicular wall - but this does not consistute a gap.
+//    vectorField oppositeNormal;
+//    geom.getNormal(oppositeInfo, oppositeNormal);
+//
+//    compactI = 0;
+//    forAll(oppositeInfo, i)
+//    {
+//        if ((nearNormal[i] & oppositeNormal[i]) < -0.707)
+//        {
+//            map[compactI++] = i;
+//        }
+//    }
+//
+//    Info<< "Selected " << returnReduce(compactI, sumOp<label>())
+//        << " hits opposite the nearest out of "
+//        << returnReduce(map.size(), sumOp<label>()) << endl;
+//    map.setSize(compactI);
+//
+//    nearMap = UIndirectList<label>(nearMap, map)();
+//    nearGap = UIndirectList<scalar>(nearGap, map)();
+//    nearInfo = UIndirectList<pointIndexHit>(nearInfo, map)();
+//    oppositeInfo = UIndirectList<pointIndexHit>(oppositeInfo, map)();
+//}
+
+
+Foam::label Foam::meshRefinement::generateRays
+(
+    const point& nearPoint,
+    const vector& nearNormal,
+    const FixedList<label, 3>& gapInfo,
+    const volumeType& mode,
+
+    const label cLevel,
+
+    DynamicField<point>& start,
+    DynamicField<point>& end
+) const
+{
+    label nOldRays = start.size();
+
+    if (cLevel >= gapInfo[1] && cLevel < gapInfo[2])
+    {
+        scalar cellSize = meshCutter_.level0EdgeLength()/pow(2.0, cLevel);
+
+        // Calculate gap size
+        scalar nearGap = gapInfo[0]*cellSize;
+
+        const vector& n = nearNormal;
+
+        // Situation 'C' above: cell too close. Use surface
+        // -normal and -point to shoot rays
+
+        if (mode == volumeType::OUTSIDE)
+        {
+            start.append(nearPoint+1e-6*n);
+            end.append(nearPoint+nearGap*n);
+        }
+        else if (mode == volumeType::INSIDE)
+        {
+            start.append(nearPoint-1e-6*n);
+            end.append(nearPoint-nearGap*n);
+        }
+        else if (mode == volumeType::MIXED)
+        {
+            start.append(nearPoint+1e-6*n);
+            end.append(nearPoint+nearGap*n);
+
+            start.append(nearPoint-1e-6*n);
+            end.append(nearPoint-nearGap*n);
+        }
+    }
+
+    return start.size()-nOldRays;
+}
+
+
+Foam::label Foam::meshRefinement::generateRays
+(
+    const bool useSurfaceNormal,
+
+    const point& nearPoint,
+    const vector& nearNormal,
+    const FixedList<label, 3>& gapInfo,
+    const volumeType& mode,
+
+    const point& cc,
+    const label cLevel,
+
+    DynamicField<point>& start,
+    DynamicField<point>& end,
+    DynamicField<scalar>& gapSize,
+
+    DynamicField<point>& start2,
+    DynamicField<point>& end2,
+    DynamicField<scalar>& gapSize2
+) const
+{
+    // We want to handle the following cases:
+    // - surface: small gap (marked with 'surface'). gap might be
+    //            on inside or outside of surface.
+    // - A: cell well inside the gap.
+    // - B: cell well outside the gap.
+    // - C: cell straddling the gap. cell centre might be inside
+    //      or outside
+    //
+    //       +---+
+    //       | B |
+    //       +---+
+    //
+    //            +------+
+    //            |      |
+    //            |   C  |
+    //    --------|------|----surface
+    //            +------+
+    //
+    //        +---+
+    //        | A |
+    //        +---+
+    //
+    //
+    //    --------------------surface
+    //
+    // So:
+    // - find nearest point on surface
+    // - in situation A,B decide if on wanted side of surface
+    // - detect if locally a gap (and the cell inside the gap) by
+    //   shooting a ray from the point on the surface in the direction
+    //   of
+    //   - A,B: the cell centre
+    //   - C: the surface normal and/or negative surface normal
+    //   and see we hit anything
+    //
+    // Variations of this scheme:
+    // - always shoot in the direction of the surface normal. This needs
+    //   then an additional check to make sure the cell centre is
+    //   somewhere inside the gap
+    // - instead of ray shooting use a 'constrained' nearest search
+    //   by e.g. looking inside a search cone (implemented in searchCone).
+    //   The problem with this constrained nearest is that it still uses
+    //   the absolute nearest point on each triangle and only afterwards
+    //   checks if it is inside the search cone.
+
+
+    // Decide which near points are good:
+    // - with updated minLevel and maxLevel and nearGap make sure
+    //   the cell is still a candidate
+    //   NOTE: inside the gap the nearest point on the surface will
+    //         be HALF the gap size - otherwise we would have found
+    //         a point on the opposite side
+    // - if the mode is both sides
+    // - or if the hit is inside the current cell (situation 'C',
+    //   magV < 0.5cellSize)
+    // - or otherwise if on the correct side
+
+    label nOldRays = start.size();
+
+    if (cLevel >= gapInfo[1] && cLevel < gapInfo[2])
+    {
+        scalar cellSize = meshCutter_.level0EdgeLength()/pow(2.0, cLevel);
+
+        // Calculate gap size
+        scalar nearGap = gapInfo[0]*cellSize;
+
+        // Distance to nearest
+        vector v(cc-nearPoint);
+        scalar magV = mag(v);
+
+        if (useSurfaceNormal || magV < 0.5*cellSize)
+        {
+            const vector& n = nearNormal;
+
+            // Situation 'C' above: cell too close. Use surface
+            // -normal and -point to shoot rays
+
+            if (mode == volumeType::OUTSIDE)
+            {
+                start.append(nearPoint+1e-6*n);
+                end.append(nearPoint+nearGap*n);
+                gapSize.append(nearGap);
+                // Second vector so we get pairs of intersections
+                start2.append(nearPoint+1e-6*n);
+                end2.append(nearPoint-1e-6*n);
+                gapSize2.append(gapSize.last());
+            }
+            else if (mode == volumeType::INSIDE)
+            {
+                start.append(nearPoint-1e-6*n);
+                end.append(nearPoint-nearGap*n);
+                gapSize.append(nearGap);
+                // Second vector so we get pairs of intersections
+                start2.append(nearPoint-1e-6*n);
+                end2.append(nearPoint+1e-6*n);
+                gapSize2.append(gapSize.last());
+            }
+            else if (mode == volumeType::MIXED)
+            {
+                // Do both rays:
+                // Outside
+                {
+                    start.append(nearPoint+1e-6*n);
+                    end.append(nearPoint+nearGap*n);
+                    gapSize.append(nearGap);
+                    // Second vector so we get pairs of intersections
+                    start2.append(nearPoint+1e-6*n);
+                    end2.append(nearPoint-1e-6*n);
+                    gapSize2.append(gapSize.last());
+                }
+                // Inside
+                {
+                    start.append(nearPoint-1e-6*n);
+                    end.append(nearPoint-nearGap*n);
+                    gapSize.append(nearGap);
+                    // Second vector so we get pairs of intersections
+                    start2.append(nearPoint-1e-6*n);
+                    end2.append(nearPoint+1e-6*n);
+                    gapSize2.append(gapSize.last());
+                }
+            }
+        }
+        else
+        {
+            // Situation 'A' or 'B' above: cell well away. Test if
+            // cell on correct side of surface and shoot ray through
+            // cell centre. Note: no need to shoot ray in other
+            // direction since we're trying to detect cell inside
+            // the gap.
+
+            scalar s = (v&nearNormal);
+
+            if
+            (
+                (mode == volumeType::MIXED)
+             || (mode == volumeType::OUTSIDE && s > SMALL)
+             || (mode == volumeType::INSIDE && s < -SMALL)
+            )
+            {
+                //// Use single vector through cell centre
+                //vector n(v/(magV+ROOTVSMALL));
+                //
+                //start.append(cc);
+                //end.append(cc+nearGap*n);
+                //gapSize.append(nearGap);
+                //
+                //start2.append(cc);
+                //end2.append(cc-nearGap*n);
+                //gapSize2.append(nearGap);
+
+
+                //// Shoot some rays through the cell centre
+                //// X-direction:
+                //start.append(cc);
+                //end.append(cc+nearGap*vector(1, 0, 0));
+                //gapSize.append(nearGap);
+                //
+                //start2.append(cc);
+                //end2.append(cc-nearGap*vector(1, 0, 0));
+                //gapSize2.append(nearGap);
+                //
+                //// Y-direction:
+                //start.append(cc);
+                //end.append(cc+nearGap*vector(0, 1, 0));
+                //gapSize.append(nearGap);
+                //
+                //start2.append(cc);
+                //end2.append(cc-nearGap*vector(0, 1, 0));
+                //gapSize2.append(nearGap);
+                //
+                //// Z-direction:
+                //start.append(cc);
+                //end.append(cc+nearGap*vector(0, 0, 1));
+                //gapSize.append(nearGap);
+                //
+                //start2.append(cc);
+                //end2.append(cc-nearGap*vector(0, 0, 1));
+                //gapSize2.append(nearGap);
+
+
+                // 3 axes aligned with normal
+
+                // Use vector through cell centre
+                vector n(v/(magV+ROOTVSMALL));
+
+                // Get second vector. Make sure it is sufficiently perpendicular
+                vector e2(1, 0, 0);
+                scalar s = (e2 & n);
+                if (mag(s) < 0.9)
+                {
+                    e2 -= s*n;
+                }
+                else
+                {
+                    e2 = vector(0, 1, 0);
+                    e2 -= (e2 & n)*n;
+                }
+                e2 /= mag(e2);
+
+                // Third vector
+                vector e3 = n ^ e2;
+
+
+                // Rays in first direction
+                start.append(cc);
+                end.append(cc+nearGap*n);
+                gapSize.append(nearGap);
+
+                start2.append(cc);
+                end2.append(cc-nearGap*n);
+                gapSize2.append(nearGap);
+
+                // Rays in second direction
+                start.append(cc);
+                end.append(cc+nearGap*e2);
+                gapSize.append(nearGap);
+
+                start2.append(cc);
+                end2.append(cc-nearGap*e2);
+                gapSize2.append(nearGap);
+
+                // Rays in third direction
+                start.append(cc);
+                end.append(cc+nearGap*e3);
+                gapSize.append(nearGap);
+
+                start2.append(cc);
+                end2.append(cc-nearGap*e3);
+                gapSize2.append(nearGap);
+            }
+        }
+    }
+
+    return start.size()-nOldRays;
+}
+
+
+void Foam::meshRefinement::selectGapCandidates
+(
+    const labelList& refineCell,
+    const label nRefine,
+
+    labelList& cellMap,
+    List<FixedList<label, 3> >& shellGapInfo,
+    List<volumeType>& shellGapMode
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    // Collect cells to test
+    cellMap.setSize(cellLevel.size()-nRefine);
+    label compactI = 0;
+
+    forAll(cellLevel, cellI)
+    {
+        if (refineCell[cellI] == -1)
+        {
+            cellMap[compactI++] = cellI;
+        }
+    }
+    Info<< "Selected " << returnReduce(compactI, sumOp<label>())
+        << " unmarked cells out of "
+        << mesh_.globalData().nTotalCells() << endl;
+    cellMap.setSize(compactI);
+
+    // Do test to see whether cells are inside/outside shell with
+    // applicable specification (minLevel <= celllevel < maxLevel)
+    shells_.findHigherGapLevel
+    (
+        pointField(cellCentres, cellMap),
+        UIndirectList<label>(cellLevel, cellMap)(),
+        shellGapInfo,
+        shellGapMode
+    );
+
+    // Compact out hits
+
+    labelList map(shellGapInfo.size());
+    compactI = 0;
+    forAll(shellGapInfo, i)
+    {
+        if (shellGapInfo[i][2] > 0)
+        {
+            map[compactI++] = i;
+        }
+    }
+
+    Info<< "Selected " << returnReduce(compactI, sumOp<label>())
+        << " cells inside gap shells out of "
+        << mesh_.globalData().nTotalCells() << endl;
+
+    map.setSize(compactI);
+    cellMap = UIndirectList<label>(cellMap, map)();
+    shellGapInfo = UIndirectList<FixedList<label, 3> >(shellGapInfo, map)();
+    shellGapMode = UIndirectList<volumeType>(shellGapMode, map)();
+}
+
+
+void Foam::meshRefinement::mergeGapInfo
+(
+    const FixedList<label, 3>& shellGapInfo,
+    const volumeType shellGapMode,
+    const FixedList<label, 3>& surfGapInfo,
+    const volumeType surfGapMode,
+    FixedList<label, 3>& gapInfo,
+    volumeType& gapMode
+) const
+{
+    if (surfGapInfo[0] == 0)
+    {
+        gapInfo = shellGapInfo;
+        gapMode = shellGapMode;
+    }
+    else if (shellGapInfo[0] == 0)
+    {
+        gapInfo = surfGapInfo;
+        gapMode = surfGapMode;
+    }
+    else
+    {
+        // Both specify a level. Does surface level win? Or does information
+        // need to be merged?
+
+        //gapInfo[0] = max(surfGapInfo[0], shellGapInfo[0]);
+        //gapInfo[1] = min(surfGapInfo[1], shellGapInfo[1]);
+        //gapInfo[2] = max(surfGapInfo[2], shellGapInfo[2]);
+        gapInfo = surfGapInfo;
+        gapMode = surfGapMode;
+    }
+}
+
+
+Foam::label Foam::meshRefinement::markInternalGapRefinement
+(
+    const scalar planarCos,
+    const bool spreadGapSize,
+    const label nAllowRefine,
+
+    labelList& refineCell,
+    label& nRefine,
+    labelList& numGapCells,
+    scalarField& detectedGapSize
+) const
+{
+    detectedGapSize.setSize(mesh_.nCells());
+    detectedGapSize = GREAT;
+    numGapCells.setSize(mesh_.nCells());
+    numGapCells = -1;
+
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+    const scalar edge0Len = meshCutter_.level0EdgeLength();
+
+    const List<FixedList<label, 3> >& extendedGapLevel =
+        surfaces_.extendedGapLevel();
+    const List<volumeType>& extendedGapMode = surfaces_.extendedGapMode();
+
+    // Get the gap level for the shells
+    const labelList maxLevel(shells_.maxGapLevel());
+
+    label oldNRefine = nRefine;
+
+    if (max(maxLevel) > 0)
+    {
+        // Collect cells to test
+        labelList cellMap;
+        List<FixedList<label, 3> > shellGapInfo;
+        List<volumeType> shellGapMode;
+        selectGapCandidates
+        (
+            refineCell,
+            nRefine,
+
+            cellMap,
+            shellGapInfo,
+            shellGapMode
+        );
+
+        // Find nearest point and normal on the surfaces
+        List<pointIndexHit> nearInfo;
+        vectorField nearNormal;
+        labelList nearSurface;
+        labelList nearRegion;
+        {
+            // Now we have both the cell-level and the gap size information. Use
+            // this to calculate the gap size
+            scalarField gapSize(cellMap.size());
+            forAll(cellMap, i)
+            {
+                label cellI = cellMap[i];
+                scalar cellSize = edge0Len/pow(2.0, cellLevel[cellI]);
+                gapSize[i] = shellGapInfo[i][0]*cellSize;
+            }
+
+            surfaces_.findNearestRegion
+            (
+                identity(surfaces_.surfaces().size()),
+                pointField(cellCentres, cellMap),
+                sqr(gapSize),
+                nearSurface,
+                nearInfo,
+                nearRegion,
+                nearNormal
+            );
+        }
+
+
+
+        DynamicList<label> map(nearInfo.size());
+        DynamicField<point> rayStart(nearInfo.size());
+        DynamicField<point> rayEnd(nearInfo.size());
+        DynamicField<scalar> gapSize(nearInfo.size());
+
+        DynamicField<point> rayStart2(nearInfo.size());
+        DynamicField<point> rayEnd2(nearInfo.size());
+        DynamicField<scalar> gapSize2(nearInfo.size());
+
+        label nTestCells = 0;
+
+        forAll(nearInfo, i)
+        {
+            if (nearInfo[i].hit())
+            {
+                label globalRegionI = surfaces_.globalRegion
+                (
+                    nearSurface[i],
+                    nearRegion[i]
+                );
+
+                // Combine info from shell and surface
+                FixedList<label, 3> gapInfo;
+                volumeType gapMode;
+                mergeGapInfo
+                (
+                    shellGapInfo[i],
+                    shellGapMode[i],
+                    extendedGapLevel[globalRegionI],
+                    extendedGapMode[globalRegionI],
+                    gapInfo,
+                    gapMode
+                );
+
+                // Store wanted number of cells in gap
+                label cellI = cellMap[i];
+                label cLevel = cellLevel[cellI];
+                if (cLevel >= gapInfo[1] && cLevel < gapInfo[2])
+                {
+                    numGapCells[cellI] = max(numGapCells[cellI], gapInfo[0]);
+                }
+
+                // Construct one or more rays to test for oppositeness
+                label nRays = generateRays
+                (
+                    false,
+                    nearInfo[i].hitPoint(),
+                    nearNormal[i],
+                    gapInfo,
+                    gapMode,
+
+                    cellCentres[cellI],
+                    cLevel,
+
+                    rayStart,
+                    rayEnd,
+                    gapSize,
+
+                    rayStart2,
+                    rayEnd2,
+                    gapSize2
+                );
+                if (nRays > 0)
+                {
+                    nTestCells++;
+                    for (label j = 0; j < nRays; j++)
+                    {
+                        map.append(i);
+                    }
+                }
+            }
+        }
+
+        Info<< "Selected " << returnReduce(nTestCells, sumOp<label>())
+            << " cells for testing out of "
+            << mesh_.globalData().nTotalCells() << endl;
+        map.shrink();
+        rayStart.shrink();
+        rayEnd.shrink();
+        gapSize.shrink();
+
+        rayStart2.shrink();
+        rayEnd2.shrink();
+        gapSize2.shrink();
+
+        cellMap = UIndirectList<label>(cellMap, map)();
+        nearNormal = UIndirectList<vector>(nearNormal, map)();
+        shellGapInfo.clear();
+        shellGapMode.clear();
+        nearInfo.clear();
+        nearSurface.clear();
+        nearRegion.clear();
+
+
+        // Do intersections in pairs
+        labelList surf1;
+        List<pointIndexHit> hit1;
+        vectorField normal1;
+        surfaces_.findNearestIntersection
+        (
+            rayStart,
+            rayEnd,
+            surf1,
+            hit1,
+            normal1
+        );
+
+        labelList surf2;
+        List<pointIndexHit> hit2;
+        vectorField normal2;
+        surfaces_.findNearestIntersection
+        (
+            rayStart2,
+            rayEnd2,
+            surf2,
+            hit2,
+            normal2
+        );
+
+        // Extract cell based gap size
+        forAll(surf1, i)
+        {
+            if (surf1[i] != -1 && surf2[i] != -1)
+            {
+                // Found intersections with surface. Check for
+                // - small gap
+                // - coplanar normals
+
+                label cellI = cellMap[i];
+
+                scalar d2 = magSqr(hit1[i].hitPoint()-hit2[i].hitPoint());
+
+                if
+                (
+                    cellI != -1
+                 && (mag(normal1[i]&normal2[i]) > planarCos)
+                 && (d2 < Foam::sqr(gapSize[i]))
+                )
+                {
+                    detectedGapSize[cellI] = min
+                    (
+                        detectedGapSize[cellI],
+                        Foam::sqrt(d2)
+                    );
+                }
+            }
+        }
+
+        // Spread it
+        if (spreadGapSize)
+        {
+            // Field on cells and faces
+            List<transportData> cellData(mesh_.nCells());
+            List<transportData> faceData(mesh_.nFaces());
+
+            // Start of walk
+            const pointField& faceCentres = mesh_.faceCentres();
+
+            DynamicList<label> frontFaces(mesh_.nFaces());
+            DynamicList<transportData> frontData(mesh_.nFaces());
+            for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+            {
+                label own = mesh_.faceOwner()[faceI];
+                label nei = mesh_.faceNeighbour()[faceI];
+
+                scalar minSize = min
+                (
+                    detectedGapSize[own],
+                    detectedGapSize[nei]
+                );
+
+                if (minSize < GREAT)
+                {
+                    frontFaces.append(faceI);
+                    frontData.append
+                    (
+                        transportData
+                        (
+                            faceCentres[faceI],
+                            minSize,
+                            0.0
+                        )
+                    );
+                }
+            }
+            for
+            (
+                label faceI = mesh_.nInternalFaces();
+                faceI < mesh_.nFaces();
+                faceI++
+            )
+            {
+                label own = mesh_.faceOwner()[faceI];
+
+                if (detectedGapSize[own] < GREAT)
+                {
+                    frontFaces.append(faceI);
+                    frontData.append
+                    (
+                        transportData
+                        (
+                            faceCentres[faceI],
+                            detectedGapSize[own],
+                            0.0
+                        )
+                    );
+                }
+            }
+
+            Info<< "Selected "
+                << returnReduce(frontFaces.size(), sumOp<label>())
+                << " faces for spreading gap size out of "
+                << mesh_.globalData().nTotalFaces() << endl;
+
+
+            transportData::trackData td(surfaceIndex_);
+
+            FaceCellWave<transportData, transportData::trackData> deltaCalc
+            (
+                mesh_,
+                frontFaces,
+                frontData,
+                faceData,
+                cellData,
+                mesh_.globalData().nTotalCells()+1,
+                td
+            );
+
+
+            forAll(cellMap, i)
+            {
+                label cellI = cellMap[i];
+                if
+                (
+                    cellI != -1
+                 && cellData[cellI].valid(deltaCalc.data())
+                 && numGapCells[cellI] != -1
+                )
+                {
+                    // Update transported gap size
+                    detectedGapSize[cellI] = min
+                    (
+                        detectedGapSize[cellI],
+                        cellData[cellI].data()
+                    );
+                }
+            }
+        }
+
+
+        // Use it
+        forAll(cellMap, i)
+        {
+            label cellI = cellMap[i];
+
+            if (cellI != -1 && numGapCells[cellI] != -1)
+            {
+                // Needed gap size
+                label cLevel = cellLevel[cellI];
+                scalar cellSize =
+                    meshCutter_.level0EdgeLength()/pow(2.0, cLevel);
+                scalar neededGapSize = numGapCells[cellI]*cellSize;
+
+                if (neededGapSize > detectedGapSize[cellI])
+                {
+                    if
+                    (
+                       !markForRefine
+                        (
+                            123,
+                            nAllowRefine,
+                            refineCell[cellI],
+                            nRefine
+                        )
+                    )
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+
+        if
+        (
+            returnReduce(nRefine, sumOp<label>())
+          > returnReduce(nAllowRefine, sumOp<label>())
+        )
+        {
+            Info<< "Reached refinement limit." << endl;
+        }
+    }
+
+    return returnReduce(nRefine-oldNRefine, sumOp<label>());
+}
+
+
+Foam::label Foam::meshRefinement::markSmallFeatureRefinement
+(
+    const scalar planarCos,
+    const label nAllowRefine,
+    const labelList& neiLevel,
+    const pointField& neiCc,
+
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const labelList& surfaceIndices = surfaces_.surfaces();
+    const List<FixedList<label, 3> >& extendedGapLevel =
+        surfaces_.extendedGapLevel();
+    const List<volumeType>& extendedGapMode = surfaces_.extendedGapMode();
+
+    label oldNRefine = nRefine;
+
+    // Check that we're using any gap refinement
+    labelList shellMaxLevel(shells_.maxGapLevel());
+
+    if (max(shellMaxLevel) == 0)
+    {
+        return 0;
+    }
+
+    //- Force calculation of tetBasePt
+    (void)mesh_.tetBasePtIs();
+    (void)mesh_.cellTree();
+
+
+    forAll(surfaceIndices, surfI)
+    {
+        label geomI = surfaceIndices[surfI];
+        const searchableSurface& geom = surfaces_.geometry()[geomI];
+
+
+        // Get the element index in a roundabout way. Problem is e.g.
+        // distributed surface where local indices differ from global
+        // ones (needed for getRegion call)
+
+        pointField ctrs;
+        labelList region;
+        vectorField normal;
+        {
+            // Representative local coordinates and bounding sphere
+            scalarField radiusSqr;
+            geom.boundingSpheres(ctrs, radiusSqr);
+
+            List<pointIndexHit> info;
+            geom.findNearest(ctrs, radiusSqr, info);
+
+            forAll(info, i)
+            {
+                if (!info[i].hit())
+                {
+                    FatalErrorInFunction
+                        << "fc:" << ctrs[i]
+                        << " radius:" << radiusSqr[i]
+                        << exit(FatalError);
+                }
+            }
+
+            geom.getRegion(info, region);
+            geom.getNormal(info, normal);
+        }
+
+        // Do test to see whether triangles are inside/outside shell with
+        // applicable specification (minLevel <= celllevel < maxLevel)
+        List<FixedList<label, 3> > shellGapInfo;
+        List<volumeType> shellGapMode;
+        shells_.findHigherGapLevel
+        (
+            ctrs,
+            labelList(ctrs.size(), 0),
+            shellGapInfo,
+            shellGapMode
+        );
+
+
+        DynamicList<label> map(ctrs.size());
+        DynamicList<label> cellMap(ctrs.size());
+
+        DynamicField<point> rayStart(ctrs.size());
+        DynamicField<point> rayEnd(ctrs.size());
+        DynamicField<scalar> gapSize(ctrs.size());
+
+        label nTestCells = 0;
+
+        forAll(ctrs, i)
+        {
+            if (shellGapInfo[i][2] > 0)
+            {
+                label globalRegionI = surfaces_.globalRegion(surfI, region[i]);
+
+                // Combine info from shell and surface
+                FixedList<label, 3> gapInfo;
+                volumeType gapMode;
+                mergeGapInfo
+                (
+                    shellGapInfo[i],
+                    shellGapMode[i],
+                    extendedGapLevel[globalRegionI],
+                    extendedGapMode[globalRegionI],
+                    gapInfo,
+                    gapMode
+                );
+
+                //- Option 1: use octree nearest searching inside polyMesh
+                //label cellI = mesh_.findCell(pt);
+
+                //- Option 2: use octree 'inside' searching inside polyMesh. Is
+                //            much faster.
+                label cellI = -1;
+                const indexedOctree<treeDataCell>& tree = mesh_.cellTree();
+                if (tree.nodes().size() && tree.bb().contains(ctrs[i]))
+                {
+                    cellI = tree.findInside(ctrs[i]);
+                }
+
+                if (cellI != -1 && refineCell[cellI] == -1)
+                {
+                    // Construct one or two rays to test for oppositeness
+                    // Note that we always want to use the surface normal
+                    // and not the vector from cell centre to surface point
+
+                    label nRays = generateRays
+                    (
+                        ctrs[i],
+                        normal[i],
+                        gapInfo,
+                        gapMode,
+
+                        cellLevel[cellI],
+
+                        rayStart,
+                        rayEnd
+                    );
+
+                    if (nRays > 0)
+                    {
+                        nTestCells++;
+                        for (label j = 0; j < nRays; j++)
+                        {
+                            cellMap.append(cellI);
+                            map.append(i);
+                        }
+                    }
+                }
+            }
+        }
+
+        Info<< "Selected " << returnReduce(nTestCells, sumOp<label>())
+            << " cells containing triangle centres out of "
+            << mesh_.globalData().nTotalCells() << endl;
+        map.shrink();
+        cellMap.shrink();
+        rayStart.shrink();
+        rayEnd.shrink();
+
+        ctrs.clear();
+        region.clear();
+        shellGapInfo.clear();
+        shellGapMode.clear();
+        normal = UIndirectList<vector>(normal, map)();
+
+        // Do intersections.
+        labelList surfaceHit;
+        vectorField surfaceNormal;
+        surfaces_.findNearestIntersection
+        (
+            rayStart,
+            rayEnd,
+            surfaceHit,
+            surfaceNormal
+        );
+
+
+        label nOldRefine = 0;
+
+
+        forAll(surfaceHit, i)
+        {
+            if (surfaceHit[i] != -1) // && surf2[i] != -1)
+            {
+                // Found intersection with surface. Check coplanar normals.
+                label cellI = cellMap[i];
+
+                if (mag(normal[i]&surfaceNormal[i]) > planarCos)
+                {
+                    if
+                    (
+                       !markForRefine
+                        (
+                            surfaceHit[i],
+                            nAllowRefine,
+                            refineCell[cellI],
+                            nRefine
+                        )
+                    )
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        Info<< "For surface " << geom.name() << " found "
+            << returnReduce(nRefine-nOldRefine, sumOp<label>())
+            << " cells in small gaps" << endl;
+
+        if
+        (
+            returnReduce(nRefine, sumOp<label>())
+          > returnReduce(nAllowRefine, sumOp<label>())
+        )
+        {
+            Info<< "Reached refinement limit." << endl;
+        }
+    }
+
+    return returnReduce(nRefine-oldNRefine, sumOp<label>());
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
index 4fc1b40077..5e4864d23d 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,110 +34,115 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//// Merge faces that are in-line.
-//Foam::label Foam::meshRefinement::mergePatchFaces
-//(
-//    const scalar minCos,
-//    const scalar concaveCos,
-//    const labelList& patchIDs
-//)
-//{
-//    // Patch face merging engine
-//    combineFaces faceCombiner(mesh_);
-//
-//    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-//
-//    // Pick up all candidate cells on boundary
-//    labelHashSet boundaryCells(mesh_.nFaces()-mesh_.nInternalFaces());
-//
-//    forAll(patchIDs, i)
-//    {
-//        label patchI = patchIDs[i];
-//
-//        const polyPatch& patch = patches[patchI];
-//
-//        if (!patch.coupled())
-//        {
-//            forAll(patch, i)
-//            {
-//                boundaryCells.insert(mesh_.faceOwner()[patch.start()+i]);
-//            }
-//        }
-//    }
-//
-//    // Get all sets of faces that can be merged
-//    labelListList mergeSets
-//    (
-//        faceCombiner.getMergeSets
-//        (
-//            minCos,
-//            concaveCos,
-//            boundaryCells
-//        )
-//    );
-//
-//    label nFaceSets = returnReduce(mergeSets.size(), sumOp<label>());
-//
-//    Info<< "mergePatchFaces : Merging " << nFaceSets
-//        << " sets of faces." << endl;
-//
-//    if (nFaceSets > 0)
-//    {
-//        // Topology changes container
-//        polyTopoChange meshMod(mesh_);
-//
-//        // Merge all faces of a set into the first face of the set. Remove
-//        // unused points.
-//        faceCombiner.setRefinement(mergeSets, meshMod);
-//
-//        // Change the mesh (no inflation)
-//        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
-//
-//        // Update fields
-//        mesh_.updateMesh(map);
-//
-//        // Move mesh (since morphing does not do this)
-//        if (map().hasMotionPoints())
-//        {
-//            mesh_.movePoints(map().preMotionPoints());
-//        }
-//        else
-//        {
-//            // Delete mesh volumes. No other way to do this?
-//            mesh_.clearOut();
-//        }
-//
-//
-//        // Reset the instance for if in overwrite mode
-//        mesh_.setInstance(timeName());
-//
-//        faceCombiner.updateMesh(map);
-//
-//        // Get the kept faces that need to be recalculated.
-//        // Merging two boundary faces might shift the cell centre
-//        // (unless the faces are absolutely planar)
-//        labelHashSet retestFaces(6*mergeSets.size());
-//
-//        forAll(mergeSets, setI)
-//        {
-//            label oldMasterI = mergeSets[setI][0];
-//
-//            label faceI = map().reverseFaceMap()[oldMasterI];
-//
-//            // faceI is always uncoupled boundary face
-//            const cell& cFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
-//
-//            forAll(cFaces, i)
-//            {
-//                retestFaces.insert(cFaces[i]);
-//            }
-//        }
-//        updateMesh(map, retestFaces.toc());
-//    }
-//
-//
-//    return nFaceSets;
-//}
+// Merge faces that are in-line.
+Foam::label Foam::meshRefinement::mergePatchFaces
+(
+    const scalar minCos,
+    const scalar concaveCos,
+    const label mergeSize,
+    const labelList& patchIDs
+)
+{
+    // Patch face merging engine
+    combineFaces faceCombiner(mesh_, false);
+
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Pick up all candidate cells on boundary
+    labelHashSet boundaryCells(mesh_.nFaces()-mesh_.nInternalFaces());
+
+    forAll(patchIDs, i)
+    {
+        label patchI = patchIDs[i];
+
+        const polyPatch& patch = patches[patchI];
+
+        if (!patch.coupled())
+        {
+            forAll(patch, i)
+            {
+                boundaryCells.insert(mesh_.faceOwner()[patch.start()+i]);
+            }
+        }
+    }
+
+    // Get all sets of faces that can be merged
+    labelListList mergeSets
+    (
+        faceCombiner.getMergeSets
+        (
+            minCos,
+            concaveCos,
+            boundaryCells
+        )
+    );
+
+    if (mergeSize != -1)
+    {
+        // Keep only those that are mergeSize faces
+        label compactI = 0;
+        forAll(mergeSets, setI)
+        {
+            if (mergeSets[setI].size() == mergeSize)
+            {
+                mergeSets[compactI++] = mergeSets[setI];
+            }
+        }
+        mergeSets.setSize(compactI);
+    }
+
+
+    label nFaceSets = returnReduce(mergeSets.size(), sumOp<label>());
+
+    Info<< "Merging " << nFaceSets << " sets of faces." << nl << endl;
+
+    if (nFaceSets > 0)
+    {
+        // Topology changes container
+        polyTopoChange meshMod(mesh_);
+
+        // Merge all faces of a set into the first face of the set. Remove
+        // unused points.
+        faceCombiner.setRefinement(mergeSets, meshMod);
+
+        // Change the mesh (no inflation)
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+        // Update fields
+        mesh_.updateMesh(map);
+
+        // Move mesh (since morphing does not do this)
+        if (map().hasMotionPoints())
+        {
+            mesh_.movePoints(map().preMotionPoints());
+        }
+        else
+        {
+            // Delete mesh volumes. No other way to do this?
+            mesh_.clearOut();
+        }
+
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+
+        faceCombiner.updateMesh(map);
+
+        // Get the kept faces that need to be recalculated.
+        // Merging two boundary faces might shift the cell centre
+        // (unless the faces are absolutely planar)
+        labelHashSet retestFaces(2*mergeSets.size());
+
+        forAll(mergeSets, setI)
+        {
+            label oldMasterI = mergeSets[setI][0];
+            retestFaces.insert(map().reverseFaceMap()[oldMasterI]);
+        }
+        updateMesh(map, growFaceCellFace(retestFaces));
+    }
+
+    return nFaceSets;
+}
+
 //
 //
 //// Remove points not used by any face or points used by only two faces where
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
index 871c7f8a6c..ca785a3e5b 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -437,7 +437,7 @@ Foam::labelList Foam::meshRefinement::nearestPatch
             {
                 if (!haveWarned)
                 {
-                    WarningIn("meshRefinement::nearestPatch(..)")
+                    WarningInFunction
                         << "Did not visit some faces, e.g. face " << faceI
                         << " at " << mesh_.faceCentres()[faceI] << endl
                         << "Assigning  these cells to patch "
@@ -1085,7 +1085,9 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
 Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
 (
     const snapParameters& snapParams,
-    const dictionary& motionDict
+    const dictionary& motionDict,
+    const labelList& globalToMasterPatch,
+    const labelList& globalToSlavePatch
 ) const
 {
     pointField oldPoints(mesh_.points());
@@ -1162,7 +1164,10 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
         (
             autoSnapDriver::calcNearestSurface
             (
+                snapParams.strictRegionSnap(),
                 *this,
+                globalToMasterPatch,
+                globalToSlavePatch,
                 snapDist,   // attraction
                 pp,
                 nearestPoint,
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index e2224f7cd4..4ffa1248f8 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -742,7 +742,7 @@ Foam::label Foam::meshRefinement::markInternalDistanceToFeatureRefinement
         }
     }
 
-    // Do test to see whether cells is inside/outside shell with higher level
+    // Do test to see whether cells are inside/outside shell with higher level
     labelList maxLevel;
     features_.findHigherLevel(testCc, testLevels, maxLevel);
 
@@ -820,7 +820,7 @@ Foam::label Foam::meshRefinement::markInternalRefinement
         }
     }
 
-    // Do test to see whether cells is inside/outside shell with higher level
+    // Do test to see whether cells are inside/outside shell with higher level
     labelList maxLevel;
     shells_.findHigherLevel(testCc, testLevels, maxLevel);
 
@@ -869,6 +869,56 @@ Foam::label Foam::meshRefinement::markInternalRefinement
 }
 
 
+Foam::label Foam::meshRefinement::unmarkInternalRefinement
+(
+    labelList& refineCell,
+    label& nRefine
+) const
+{
+    const labelList& cellLevel = meshCutter_.cellLevel();
+    const pointField& cellCentres = mesh_.cellCentres();
+
+    label oldNRefine = nRefine;
+
+    // Collect cells to test
+    pointField testCc(nRefine);
+    labelList testLevels(nRefine);
+    label testI = 0;
+
+    forAll(cellLevel, cellI)
+    {
+        if (refineCell[cellI] >= 0)
+        {
+            testCc[testI] = cellCentres[cellI];
+            testLevels[testI] = cellLevel[cellI];
+            testI++;
+        }
+    }
+
+    // Do test to see whether cells are inside/outside shell with higher level
+    labelList levelShell;
+    limitShells_.findLevel(testCc, testLevels, levelShell);
+
+    // Mark for refinement. Note that we didn't store the original cellID so
+    // now just reloop in same order.
+    testI = 0;
+    forAll(cellLevel, cellI)
+    {
+        if (refineCell[cellI] >= 0)
+        {
+            if (levelShell[testI] != -1)
+            {
+                refineCell[cellI] = -1;
+                nRefine--;
+            }
+            testI++;
+        }
+    }
+
+    return returnReduce(oldNRefine-nRefine, sumOp<label>());
+}
+
+
 // Collect faces that are intersected and whose neighbours aren't yet marked
 // for refinement.
 Foam::labelList Foam::meshRefinement::getRefineCandidateFaces
@@ -922,7 +972,6 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
 ) const
 {
     const labelList& cellLevel = meshCutter_.cellLevel();
-    const pointField& cellCentres = mesh_.cellCentres();
 
     label oldNRefine = nRefine;
 
@@ -941,36 +990,15 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
     pointField end(testFaces.size());
     labelList minLevel(testFaces.size());
 
-    forAll(testFaces, i)
-    {
-        label faceI = testFaces[i];
-
-        label own = mesh_.faceOwner()[faceI];
-
-        if (mesh_.isInternalFace(faceI))
-        {
-            label nei = mesh_.faceNeighbour()[faceI];
-
-            start[i] = cellCentres[own];
-            end[i] = cellCentres[nei];
-            minLevel[i] = min(cellLevel[own], cellLevel[nei]);
-        }
-        else
-        {
-            label bFaceI = faceI - mesh_.nInternalFaces();
-
-            start[i] = cellCentres[own];
-            end[i] = neiCc[bFaceI];
-            minLevel[i] = min(cellLevel[own], neiLevel[bFaceI]);
-        }
-    }
-
-    // Extend segments a bit
-    {
-        const vectorField smallVec(ROOTSMALL*(end-start));
-        start -= smallVec;
-        end += smallVec;
-    }
+    calcCellCellRays
+    (
+        neiCc,
+        neiLevel,
+        testFaces,
+        start,
+        end,
+        minLevel
+    );
 
 
     // Do test for higher intersections
@@ -980,6 +1008,7 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
     labelList surfaceMinLevel;
     surfaces_.findHigherIntersection
     (
+        shells_,
         start,
         end,
         minLevel,
@@ -1129,6 +1158,7 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
     pointField end(testFaces.size());
     labelList minLevel(testFaces.size());
 
+    // Note: uses isMasterFace otherwise could be call to calcCellCellRays
     forAll(testFaces, i)
     {
         label faceI = testFaces[i];
@@ -1718,7 +1748,6 @@ Foam::label Foam::meshRefinement::markProximityRefinement
 ) const
 {
     const labelList& cellLevel = meshCutter_.cellLevel();
-    const pointField& cellCentres = mesh_.cellCentres();
 
     label oldNRefine = nRefine;
 
@@ -1738,36 +1767,15 @@ Foam::label Foam::meshRefinement::markProximityRefinement
     pointField end(testFaces.size());
     labelList minLevel(testFaces.size());
 
-    forAll(testFaces, i)
-    {
-        label faceI = testFaces[i];
-
-        label own = mesh_.faceOwner()[faceI];
-
-        if (mesh_.isInternalFace(faceI))
-        {
-            label nei = mesh_.faceNeighbour()[faceI];
-
-            start[i] = cellCentres[own];
-            end[i] = cellCentres[nei];
-            minLevel[i] = min(cellLevel[own], cellLevel[nei]);
-        }
-        else
-        {
-            label bFaceI = faceI - mesh_.nInternalFaces();
-
-            start[i] = cellCentres[own];
-            end[i] = neiCc[bFaceI];
-            minLevel[i] = min(cellLevel[own], neiLevel[bFaceI]);
-        }
-    }
-
-    // Extend segments a bit
-    {
-        const vectorField smallVec(ROOTSMALL*(end-start));
-        start -= smallVec;
-        end += smallVec;
-    }
+    calcCellCellRays
+    (
+        neiCc,
+        neiLevel,
+        testFaces,
+        start,
+        end,
+        minLevel
+    );
 
 
     // Test for all intersections (with surfaces of higher gap level than
@@ -2044,7 +2052,10 @@ Foam::labelList Foam::meshRefinement::refineCandidates
     const bool internalRefinement,
     const bool surfaceRefinement,
     const bool curvatureRefinement,
+    const bool smallFeatureRefinement,
     const bool gapRefinement,
+    const bool bigGapRefinement,
+    const bool spreadGapSize,
     const label maxGlobalCells,
     const label maxLocalCells
 ) const
@@ -2095,6 +2106,8 @@ Foam::labelList Foam::meshRefinement::refineCandidates
         calcNeighbourData(neiLevel, neiCc);
 
 
+        const scalar planarCos = Foam::cos(degToRad(planarAngle));
+
 
         // Cells pierced by feature lines
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2162,6 +2175,30 @@ Foam::labelList Foam::meshRefinement::refineCandidates
             );
             Info<< "Marked for refinement due to surface intersection          "
                 << ": " << nSurf << " cells."  << endl;
+
+            // Refine intersected-cells only inside gaps. See
+            // markInternalGapRefinement to refine all cells inside gaps.
+            if
+            (
+                planarCos >= -1
+             && planarCos <= 1
+             && max(shells_.maxGapLevel()) > 0
+            )
+            {
+                label nGapSurf = markSurfaceGapRefinement
+                (
+                    planarCos,
+                    nAllowRefine,
+                    neiLevel,
+                    neiCc,
+
+                    refineCell,
+                    nRefine
+                );
+                Info<< "Marked for refinement due to surface intersection"
+                    << " (at gaps)"
+                    << ": " << nGapSurf << " cells."  << endl;
+            }
         }
 
         // Refinement based on curvature of surface
@@ -2189,7 +2226,33 @@ Foam::labelList Foam::meshRefinement::refineCandidates
         }
 
 
-        const scalar planarCos = Foam::cos(degToRad(planarAngle));
+        // Refinement based on features smaller than cell size
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if
+        (
+            smallFeatureRefinement
+         && (planarCos >= -1 && planarCos <= 1)
+         && max(shells_.maxGapLevel()) > 0
+        )
+        {
+            label nGap = markSmallFeatureRefinement
+            (
+                planarCos,
+                nAllowRefine,
+                neiLevel,
+                neiCc,
+
+                refineCell,
+                nRefine
+            );
+            Info<< "Marked for refinement due to close opposite surfaces       "
+                << ": " << nGap << " cells."  << endl;
+        }
+
+
+        // Refinement based on gap (only neighbouring cells)
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         if
         (
@@ -2216,6 +2279,50 @@ Foam::labelList Foam::meshRefinement::refineCandidates
         }
 
 
+        // Refinement based on gaps larger than cell size
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        if
+        (
+            bigGapRefinement
+         && (planarCos >= -1 && planarCos <= 1)
+         && max(shells_.maxGapLevel()) > 0
+        )
+        {
+            // Refine based on gap information provided by shell and nearest
+            // surface
+            labelList numGapCells;
+            scalarField gapSize;
+            label nGap = markInternalGapRefinement
+            (
+                planarCos,
+                spreadGapSize,
+                nAllowRefine,
+
+                refineCell,
+                nRefine,
+                numGapCells,
+                gapSize
+            );
+            Info<< "Marked for refinement due to opposite surfaces"
+                << "             "
+                << ": " << nGap << " cells."  << endl;
+        }
+
+
+        // Limit refinement
+        // ~~~~~~~~~~~~~~~~
+
+        {
+            label nUnmarked = unmarkInternalRefinement(refineCell, nRefine);
+            if (nUnmarked > 0)
+            {
+                Info<< "Unmarked for refinement due to limit shells"
+                    << "                : " << nUnmarked << " cells."  << endl;
+            }
+        }
+
+
 
         // Pack cells-to-refine
         // ~~~~~~~~~~~~~~~~~~~~
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
index 2cbc1f697c..1bdb191299 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,14 +63,8 @@ T Foam::meshRefinement::gAverage
 {
     if (values.size() != isMasterElem.size())
     {
-        FatalErrorIn
-        (
-            "meshRefinement::gAverage\n"
-            "(\n"
-            "    const PackedBoolList& isMasterElem,\n"
-            "    const UList<T>& values\n"
-            ")\n"
-        )   << "Number of elements in list " << values.size()
+        FatalErrorInFunction
+            << "Number of elements in list " << values.size()
             << " does not correspond to number of elements in isMasterElem "
             << isMasterElem.size()
             << exit(FatalError);
@@ -116,11 +110,8 @@ void Foam::meshRefinement::testSyncBoundaryFaceList
 
     if (faceData.size() != nBFaces || syncedFaceData.size() != nBFaces)
     {
-        FatalErrorIn
-        (
-            "meshRefinement::testSyncBoundaryFaceList"
-            "(const scalar, const string&, const List<T>&, const List<T>&)"
-        )   << "Boundary faces:" << nBFaces
+        FatalErrorInFunction
+            << "Boundary faces:" << nBFaces
             << " faceData:" << faceData.size()
             << " syncedFaceData:" << syncedFaceData.size()
             << abort(FatalError);
@@ -143,7 +134,7 @@ void Foam::meshRefinement::testSyncBoundaryFaceList
             {
                 label faceI = pp.start()+i;
 
-                FatalErrorIn("testSyncFaces")
+                FatalErrorInFunction
                     << msg
                     << "patchFace:" << i
                     << " face:" << faceI
@@ -303,7 +294,7 @@ void Foam::meshRefinement::weightedSum
      || meshPoints.size() != pointData.size()
     )
     {
-        FatalErrorIn("medialAxisMeshMover::weightedSum(..)")
+        FatalErrorInFunction
             << "Inconsistent sizes for edge or point data:"
             << " isMasterEdge:" << isMasterEdge.size()
             << " edgeWeights:" << edgeWeights.size()
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/transportData.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/transportData.H
new file mode 100644
index 0000000000..eec088e6d2
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/transportData.H
@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::transportData
+
+Description
+    Holds information (coordinate and distance). Walks out 0.5*distance.
+
+SourceFiles
+    transportDataI.H
+    transportData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef transportData_H
+#define transportData_H
+
+#include "wallPointData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class transportData Declaration
+\*---------------------------------------------------------------------------*/
+
+class transportData
+:
+    public wallPointData<scalar>
+{
+public:
+
+    //- Class used to pass additional data in
+    class trackData
+    {
+    public:
+
+        //- Per face the index of the surface hit
+        const labelList& surfaceIndex_;
+
+        trackData(const labelList& surfaceIndex)
+        :
+            surfaceIndex_(surfaceIndex)
+        {}
+    };
+
+
+private:
+
+    // 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.
+        template<class TrackingData>
+        inline bool update
+        (
+            const point&,
+            const transportData& w2,
+            const scalar tol,
+            TrackingData& td
+        );
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline transportData();
+
+        //- Construct from origin, gapSize, distance
+        inline transportData
+        (
+            const point& origin,
+            const scalar gapSize,
+            const scalar distSqr
+        );
+
+
+    // Member Functions
+
+        // Needed by FaceCellWave
+
+            //- Influence of neighbouring face.
+            //  Calls update(...) with cellCentre of cellI
+            template<class TrackingData>
+            inline bool updateCell
+            (
+                const polyMesh& mesh,
+                const label thisCellI,
+                const label neighbourFaceI,
+                const transportData& neighbourWallInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of neighbouring cell.
+            //  Calls update(...) with faceCentre of faceI
+            template<class TrackingData>
+            inline bool updateFace
+            (
+                const polyMesh& mesh,
+                const label thisFaceI,
+                const label neighbourCellI,
+                const transportData& neighbourWallInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of different value on same face.
+            //  Merge new and old info.
+            //  Calls update(...) with faceCentre of faceI
+            template<class TrackingData>
+            inline bool updateFace
+            (
+                const polyMesh& mesh,
+                const label thisFaceI,
+                const transportData& neighbourWallInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+};
+
+
+//- Data associated with transportData type is same as underlying
+template<>
+inline bool contiguous<transportData>()
+{
+    return contiguous<wallPointData<scalar> >();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "transportDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/transportDataI.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/transportDataI.H
new file mode 100644
index 0000000000..e0bbeaeaf3
--- /dev/null
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/transportDataI.H
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMesh.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Update this with w2 if w2 nearer to pt.
+template<class TrackingData>
+inline bool Foam::transportData::update
+(
+    const point& pt,
+    const transportData& w2,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    scalar dist2 = magSqr(pt - w2.origin());
+
+    if (valid(td))
+    {
+        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;
+        }
+    }
+
+    // Either *this is not yet valid or w2 is closer
+    {
+        // current not yet set so use any value
+        distSqr() = dist2;
+        origin() = w2.origin();
+        data() = w2.data();
+
+        if (distSqr() > sqr(0.25*data()))
+        {
+            // No need to transport gap data since too far away
+            return false;
+        }
+
+        return true;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::transportData::transportData()
+:
+    wallPointData<scalar>()
+{}
+
+
+inline Foam::transportData::transportData
+(
+    const point& origin,
+    const scalar gapSize,
+    const scalar distSqr
+)
+:
+    wallPointData<scalar>(origin, gapSize, distSqr)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class TrackingData>
+inline bool Foam::transportData::updateCell
+(
+    const polyMesh& mesh,
+    const label cellI,
+    const label faceI,
+    const transportData& neighbourWallInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if (td.surfaceIndex_[faceI] != -1)
+    {
+        return false;
+    }
+
+    const vectorField& cellCentres = mesh.primitiveMesh::cellCentres();
+
+    bool updated = update
+    (
+        cellCentres[cellI],
+        neighbourWallInfo,
+        tol,
+        td
+    );
+
+    return updated;
+}
+
+
+template<class TrackingData>
+inline bool Foam::transportData::updateFace
+(
+    const polyMesh& mesh,
+    const label thisFaceI,
+    const label neighbourCellI,
+    const transportData& neighbourWallInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if (td.surfaceIndex_[thisFaceI] != -1)
+    {
+        return false;
+    }
+
+    return update
+    (
+        mesh.faceCentres()[thisFaceI],
+        neighbourWallInfo,
+        tol,
+        td
+    );
+}
+
+
+template<class TrackingData>
+inline bool Foam::transportData::updateFace
+(
+    const polyMesh& mesh,
+    const label thisFaceI,
+    const transportData& neighbourWallInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if (td.surfaceIndex_[thisFaceI] != -1)
+    {
+        return false;
+    }
+
+    return update
+    (
+        mesh.faceCentres()[thisFaceI],
+        neighbourWallInfo,
+        tol,
+        td
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
index 823c4fe17f..1f4a43e28c 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,11 +91,8 @@ void Foam::refinementFeatures::read
 
             if (fName.empty())
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "refinementFeatures::read"
-                    "(const objectRegistry&"
-                    ", const PtrList<dictionary>&)",
                     dict
                 )   << "Could not open " << featObj.objectPath()
                     << exit(FatalIOError);
@@ -192,12 +189,8 @@ void Foam::refinementFeatures::read
 
             if (dict.size() < 1)
             {
-                FatalErrorIn
-                (
-                    "refinementFeatures::read"
-                    "(const objectRegistry&"
-                    ", const PtrList<dictionary>&)"
-                )   << " : levels should be at least size 1" << endl
+                FatalErrorInFunction
+                    << " : levels should be at least size 1" << endl
                     << "levels : "  << dict["levels"]
                     << exit(FatalError);
             }
@@ -219,12 +212,8 @@ void Foam::refinementFeatures::read
                      || (levels_[featI][j] > levels_[featI][j-1])
                     )
                     {
-                        FatalErrorIn
-                        (
-                            "refinementFeatures::read"
-                            "(const objectRegistry&"
-                            ", const PtrList<dictionary>&)"
-                        )   << " : Refinement should be specified in order"
+                        FatalErrorInFunction
+                            << " : Refinement should be specified in order"
                             << " of increasing distance"
                             << " (and decreasing refinement level)." << endl
                             << "Distance:" << distances_[featI][j]
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index ea43fb6f88..60975cf177 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,6 +33,91 @@ License
 #include "UPtrList.H"
 #include "volumeType.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::labelList Foam::refinementSurfaces::findHigherLevel
+(
+    const searchableSurface& geom,
+    const shellSurfaces& shells,
+    const List<pointIndexHit>& intersectionInfo,
+    const labelList& surfaceLevel       // current level
+) const
+{
+    // See if a cached level field available
+    labelList minLevelField;
+    geom.getField(intersectionInfo, minLevelField);
+
+
+    // Detect any uncached values and do proper search
+    labelList localLevel(surfaceLevel);
+    {
+        // Check hits:
+        // 1. cached value == -1 : store for re-testing
+        // 2. cached value != -1 : use
+        // 3. uncached : use region 0 value
+
+        DynamicList<label> retestSet;
+        label nHits = 0;
+
+        forAll(intersectionInfo, i)
+        {
+            if (intersectionInfo[i].hit())
+            {
+                nHits++;
+
+                // Check if minLevelField for this surface.
+                if (minLevelField.size())
+                {
+                    if (minLevelField[i] == -1)
+                    {
+                        retestSet.append(i);
+                    }
+                    else
+                    {
+                        localLevel[i] = max(localLevel[i], minLevelField[i]);
+                    }
+                }
+                else
+                {
+                    retestSet.append(i);
+                }
+            }
+        }
+
+        label nRetest = returnReduce(retestSet.size(), sumOp<label>());
+        if (nRetest > 0)
+        {
+            reduce(nHits, sumOp<label>());
+
+            //Info<< "Retesting " << nRetest
+            //    << " out of " << nHits
+            //    << " intersections on uncached elements on geometry "
+            //    << geom.name() << endl;
+
+            pointField samples(retestSet.size());
+            forAll(retestSet, i)
+            {
+                samples[i] = intersectionInfo[retestSet[i]].hitPoint();
+            }
+            labelList shellLevel;
+            shells.findHigherLevel
+            (
+                samples,
+                UIndirectList<label>(surfaceLevel, retestSet)(),
+                shellLevel
+            );
+            forAll(retestSet, i)
+            {
+                label sampleI = retestSet[i];
+                localLevel[sampleI] = max(localLevel[sampleI], shellLevel[i]);
+            }
+        }
+    }
+
+    return localLevel;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::refinementSurfaces::refinementSurfaces
@@ -72,11 +157,22 @@ Foam::refinementSurfaces::refinementSurfaces
     labelList globalMinLevel(surfI, 0);
     labelList globalMaxLevel(surfI, 0);
     labelList globalLevelIncr(surfI, 0);
+
+    FixedList<label, 3> nullGapLevel;
+    nullGapLevel[0] = 0;
+    nullGapLevel[1] = 0;
+    nullGapLevel[2] = 0;
+
+    List<FixedList<label, 3> > globalGapLevel(surfI);
+    List<volumeType> globalGapMode(surfI);
+
     scalarField globalAngle(surfI, -GREAT);
     PtrList<dictionary> globalPatchInfo(surfI);
     List<Map<label> > regionMinLevel(surfI);
     List<Map<label> > regionMaxLevel(surfI);
     List<Map<label> > regionLevelIncr(surfI);
+    List<Map<FixedList<label, 3> > > regionGapLevel(surfI);
+    List<Map<volumeType> > regionGapMode(surfI);
     List<Map<scalar> > regionAngle(surfI);
     List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
 
@@ -114,12 +210,8 @@ Foam::refinementSurfaces::refinementSurfaces
              || globalLevelIncr[surfI] < 0
             )
             {
-                FatalIOErrorIn
-                (
-                    "refinementSurfaces::refinementSurfaces"
-                    "(const searchableSurfaces&, const dictionary>&",
-                    dict
-                )   << "Illegal level specification for surface "
+                FatalIOErrorInFunction(dict)
+                    << "Illegal level specification for surface "
                     << names_[surfI]
                     << " : minLevel:" << globalMinLevel[surfI]
                     << " maxLevel:" << globalMaxLevel[surfI]
@@ -127,6 +219,40 @@ Foam::refinementSurfaces::refinementSurfaces
                     << exit(FatalIOError);
             }
 
+
+            // Optional gapLevel specification
+
+            globalGapLevel[surfI] = dict.lookupOrDefault
+            (
+                "gapLevel",
+                nullGapLevel
+            );
+            globalGapMode[surfI] = volumeType::names
+            [
+                dict.lookupOrDefault<word>
+                (
+                    "gapMode",
+                    volumeType::names[volumeType::MIXED]
+                )
+            ];
+            if
+            (
+                globalGapMode[surfI] == volumeType::UNKNOWN
+             || globalGapLevel[surfI][0] < 0
+             || globalGapLevel[surfI][1] < 0
+             || globalGapLevel[surfI][2] < 0
+             || globalGapLevel[surfI][1] > globalGapLevel[surfI][2]
+            )
+            {
+                FatalIOErrorInFunction(dict)
+                    << "Illegal gapLevel specification for surface "
+                    << names_[surfI]
+                    << " : gapLevel:" << globalGapLevel[surfI]
+                    << " gapMode:" << volumeType::names[globalGapMode[surfI]]
+                    << exit(FatalIOError);
+            }
+
+
             const searchableSurface& surface = allGeometry_[surfaces_[surfI]];
 
             // Surface zones
@@ -176,12 +302,8 @@ Foam::refinementSurfaces::refinementSurfaces
                          || levelIncr < 0
                         )
                         {
-                            FatalIOErrorIn
-                            (
-                                "refinementSurfaces::refinementSurfaces"
-                                "(const searchableSurfaces&, const dictionary&",
-                                dict
-                            )   << "Illegal level specification for surface "
+                            FatalIOErrorInFunction(dict)
+                                << "Illegal level specification for surface "
                                 << names_[surfI] << " region "
                                 << regionNames[regionI]
                                 << " : minLevel:" << refLevel[0]
@@ -190,6 +312,49 @@ Foam::refinementSurfaces::refinementSurfaces
                                 << exit(FatalIOError);
                         }
 
+
+
+                        // Optional gapLevel specification
+
+                        FixedList<label, 3> gapSpec
+                        (
+                            regionDict.lookupOrDefault
+                            (
+                                "gapLevel",
+                                nullGapLevel
+                            )
+                        );
+                        regionGapLevel[surfI].insert(regionI, gapSpec);
+                        volumeType gapModeSpec
+                        (
+                            volumeType::names
+                            [
+                                regionDict.lookupOrDefault<word>
+                                (
+                                    "gapMode",
+                                    volumeType::names[volumeType::MIXED]
+                                )
+                            ]
+                        );
+                        regionGapMode[surfI].insert(regionI, gapModeSpec);
+                        if
+                        (
+                            gapModeSpec == volumeType::UNKNOWN
+                         || gapSpec[0] < 0
+                         || gapSpec[1] < 0
+                         || gapSpec[2] < 0
+                         || gapSpec[1] > gapSpec[2]
+                        )
+                        {
+                            FatalIOErrorInFunction(dict)
+                                << "Illegal gapLevel specification for surface "
+                                << names_[surfI]
+                                << " : gapLevel:" << gapSpec
+                                << " gapMode:" << volumeType::names[gapModeSpec]
+                                << exit(FatalIOError);
+                        }
+
+
                         if (regionDict.found("perpendicularAngle"))
                         {
                             regionAngle[surfI].insert
@@ -219,9 +384,8 @@ Foam::refinementSurfaces::refinementSurfaces
 
     if (unmatchedKeys.size() > 0)
     {
-        IOWarningIn
+        IOWarningInFunction
         (
-            "refinementSurfaces::refinementSurfaces(..)",
             surfacesDict
         )   << "Not all entries in refinementSurfaces dictionary were used."
             << " The following entries were not used : "
@@ -246,6 +410,10 @@ Foam::refinementSurfaces::refinementSurfaces
     maxLevel_ = 0;
     gapLevel_.setSize(nRegions);
     gapLevel_ = -1;
+    extendedGapLevel_.setSize(nRegions);
+    extendedGapLevel_ = nullGapLevel;
+    extendedGapMode_.setSize(nRegions);
+    extendedGapMode_ = volumeType::UNKNOWN;
     perpendicularAngle_.setSize(nRegions);
     perpendicularAngle_ = -GREAT;
     patchInfo_.setSize(nRegions);
@@ -264,7 +432,8 @@ Foam::refinementSurfaces::refinementSurfaces
             gapLevel_[globalRegionI] =
                 maxLevel_[globalRegionI]
               + globalLevelIncr[surfI];
-
+            extendedGapLevel_[globalRegionI] = globalGapLevel[surfI];
+            extendedGapMode_[globalRegionI] = globalGapMode[surfI];
             perpendicularAngle_[globalRegionI] = globalAngle[surfI];
             if (globalPatchInfo.set(surfI))
             {
@@ -286,6 +455,10 @@ Foam::refinementSurfaces::refinementSurfaces
             gapLevel_[globalRegionI] =
                 maxLevel_[globalRegionI]
               + regionLevelIncr[surfI][iter.key()];
+            extendedGapLevel_[globalRegionI] =
+                regionGapLevel[surfI][iter.key()];
+            extendedGapMode_[globalRegionI] =
+                regionGapMode[surfI][iter.key()];
         }
         forAllConstIter(Map<scalar>, regionAngle[surfI], iter)
         {
@@ -397,30 +570,46 @@ Foam::refinementSurfaces::refinementSurfaces
 // }
 
 
+Foam::labelList Foam::refinementSurfaces::maxGapLevel() const
+{
+    labelList surfaceMax(surfaces_.size(), 0);
+
+    forAll(surfaces_, surfI)
+    {
+        const wordList& regionNames = allGeometry_[surfaces_[surfI]].regions();
+
+        forAll(regionNames, regionI)
+        {
+            label globalI = globalRegion(surfI, regionI);
+            const FixedList<label, 3>& gapInfo = extendedGapLevel_[globalI];
+            surfaceMax[surfI] = max(surfaceMax[surfI], gapInfo[2]);
+        }
+    }
+    return surfaceMax;
+}
+
+
 // Precalculate the refinement level for every element of the searchable
 // surface.
-void Foam::refinementSurfaces::setMinLevelFields
-(
-    const shellSurfaces& shells
-)
+void Foam::refinementSurfaces::setMinLevelFields(const shellSurfaces& shells)
 {
     forAll(surfaces_, surfI)
     {
         const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
 
-        // Precalculation only makes sense if there are different regions
-        // (so different refinement levels possible) and there are some
+        // Cache the refinement level (max of surface level and shell level)
+        // on a per-element basis. Only makes sense if there are lots of
         // elements. Possibly should have 'enough' elements to have fine
         // enough resolution but for now just make sure we don't catch e.g.
         // searchableBox (size=6)
-        if (geom.regions().size() > 1 && geom.globalSize() > 10)
+        if (geom.globalSize() > 10)
         {
             // Representative local coordinates and bounding sphere
             pointField ctrs;
             scalarField radiusSqr;
             geom.boundingSpheres(ctrs, radiusSqr);
 
-            labelList minLevelField(ctrs.size(), -1);
+            labelList minLevelField(ctrs.size(), 0);
             {
                 // Get the element index in a roundabout way. Problem is e.g.
                 // distributed surface where local indices differ from global
@@ -447,9 +636,78 @@ void Foam::refinementSurfaces::setMinLevelFields
             labelList shellLevel;
             shells.findHigherLevel(ctrs, minLevelField, shellLevel);
 
+
+            // In case of triangulated surfaces only cache value if triangle
+            // centre and vertices are in same shell
+            if (isA<triSurface>(geom))
+            {
+                label nUncached = 0;
+
+                // Check if points differing from ctr level
+
+                const triSurface& ts = refCast<const triSurface>(geom);
+                const pointField& points = ts.points();
+
+                // Determine minimum expected level to avoid having to
+                // test lots of points
+                labelList minPointLevel(points.size(), labelMax);
+                forAll(shellLevel, triI)
+                {
+                    const labelledTri& t = ts[triI];
+                    label level = shellLevel[triI];
+                    forAll(t, tI)
+                    {
+                        minPointLevel[t[tI]] = min(minPointLevel[t[tI]], level);
+                    }
+                }
+
+
+                // See if inside any shells with higher refinement level
+                labelList pointLevel;
+                shells.findHigherLevel(points, minPointLevel, pointLevel);
+
+
+                // See if triangle centre values differ from triangle points
+                forAll(shellLevel, triI)
+                {
+                    const labelledTri& t = ts[triI];
+                    label fLevel = shellLevel[triI];
+                    if
+                    (
+                        (pointLevel[t[0]] != fLevel)
+                     || (pointLevel[t[1]] != fLevel)
+                     || (pointLevel[t[2]] != fLevel)
+                    )
+                    {
+                        //Pout<< "Detected triangle " << t.tri(ts.points())
+                        //    << " partially inside/partially outside" << endl;
+
+                        // Mark as uncached
+                        shellLevel[triI] = -1;
+                        nUncached++;
+                    }
+                }
+
+                Info<< "For geometry " << geom.name()
+                    << " detected " << returnReduce(nUncached, sumOp<label>())
+                    << " uncached triangles out of " << geom.globalSize()
+                    << endl;
+            }
+
+
+            // Combine overall level field with current shell level. Make sure
+            // to preserve -1 (from triSurfaceMeshes with triangles partly
+            // inside/outside
             forAll(minLevelField, i)
             {
-                minLevelField[i] = max(minLevelField[i], shellLevel[i]);
+                if (min(minLevelField[i], shellLevel[i]) < 0)
+                {
+                    minLevelField[i] = -1;
+                }
+                else
+                {
+                    minLevelField[i] = max(minLevelField[i], shellLevel[i]);
+                }
             }
 
             // Store minLevelField on surface
@@ -463,6 +721,8 @@ void Foam::refinementSurfaces::setMinLevelFields
 // number.
 void Foam::refinementSurfaces::findHigherIntersection
 (
+    const shellSurfaces& shells,
+
     const pointField& start,
     const pointField& end,
     const labelList& currentLevel,   // current cell refinement level
@@ -494,41 +754,48 @@ void Foam::refinementSurfaces::findHigherIntersection
         List<pointIndexHit> intersectionInfo(start.size());
         geom.findLineAny(start, end, intersectionInfo);
 
-        // See if a cached level field available
-        labelList minLevelField;
-        geom.getField(intersectionInfo, minLevelField);
-        bool haveLevelField =
-        (
-            returnReduce(minLevelField.size(), sumOp<label>())
-          > 0
-        );
 
-        if (!haveLevelField && geom.regions().size() == 1)
+        // Surface-based refinement level
+        labelList surfaceOnlyLevel(start.size(), -1);
         {
-            minLevelField = labelList
-            (
-                intersectionInfo.size(),
-                minLevel(surfI, 0)
-            );
-            haveLevelField = true;
-        }
+            // Get per intersection the region
+            labelList region;
+            geom.getRegion(intersectionInfo, region);
 
-        if (haveLevelField)
-        {
             forAll(intersectionInfo, i)
             {
-                if
-                (
-                    intersectionInfo[i].hit()
-                 && minLevelField[i] > currentLevel[i]
-                )
+                if (intersectionInfo[i].hit())
                 {
-                    surfaces[i] = surfI;    // index of surface
-                    surfaceLevel[i] = minLevelField[i];
+                    surfaceOnlyLevel[i] = minLevel(surfI, region[i]);
                 }
             }
-            return;
         }
+
+
+        // Get shell refinement level if higher
+        const labelList localLevel
+        (
+            findHigherLevel
+            (
+                geom,
+                shells,
+                intersectionInfo,
+                surfaceOnlyLevel // starting level
+            )
+        );
+
+
+        // Combine localLevel with current level
+        forAll(localLevel, i)
+        {
+            if (localLevel[i] > currentLevel[i])
+            {
+                surfaces[i] = surfI;    // index of surface
+                surfaceLevel[i] = localLevel[i];
+            }
+        }
+
+        return;
     }
 
 
@@ -546,40 +813,48 @@ void Foam::refinementSurfaces::findHigherIntersection
         // Do intersection test
         geom.findLineAny(p0, p1, intersectionInfo);
 
-        // See if a cached level field available
-        labelList minLevelField;
-        geom.getField(intersectionInfo, minLevelField);
 
-        // Copy all hits into arguments, In-place compact misses.
-        label missI = 0;
-        forAll(intersectionInfo, i)
+        // Surface-based refinement level
+        labelList surfaceOnlyLevel(intersectionInfo.size(), -1);
         {
-            // Get the minLevel for the point
-            label minLocalLevel = -1;
+            // Get per intersection the region
+            labelList region;
+            geom.getRegion(intersectionInfo, region);
 
-            if (intersectionInfo[i].hit())
+            forAll(intersectionInfo, i)
             {
-                // Check if minLevelField for this surface.
-                if (minLevelField.size())
+                if (intersectionInfo[i].hit())
                 {
-                    minLocalLevel = minLevelField[i];
-                }
-                else
-                {
-                    // Use the min level for the surface instead. Assume
-                    // single region 0.
-                    minLocalLevel = minLevel(surfI, 0);
+                    surfaceOnlyLevel[i] = minLevel(surfI, region[i]);
                 }
             }
+        }
 
 
+        // Get shell refinement level if higher
+        const labelList localLevel
+        (
+            findHigherLevel
+            (
+                geom,
+                shells,
+                intersectionInfo,
+                surfaceOnlyLevel
+            )
+        );
+
+
+        // Combine localLevel with current level
+        label missI = 0;
+        forAll(localLevel, i)
+        {
             label pointI = intersectionToPoint[i];
 
-            if (minLocalLevel > currentLevel[pointI])
+            if (localLevel[i] > currentLevel[pointI])
             {
                 // Mark point for refinement
                 surfaces[pointI] = surfI;
-                surfaceLevel[pointI] = minLocalLevel;
+                surfaceLevel[pointI] = localLevel[i];
             }
             else
             {
@@ -590,6 +865,7 @@ void Foam::refinementSurfaces::findHigherIntersection
             }
         }
 
+
         // All done? Note that this decision should be synchronised
         if (returnReduce(missI, sumOp<label>()) == 0)
         {
@@ -1036,6 +1312,99 @@ void Foam::refinementSurfaces::findNearestIntersection
 }
 
 
+void Foam::refinementSurfaces::findNearestIntersection
+(
+    const pointField& start,
+    const pointField& end,
+
+    labelList& surface1,
+    vectorField& normal1
+) const
+{
+    // Initialize arguments
+    surface1.setSize(start.size());
+    surface1 = -1;
+    normal1.setSize(start.size());
+    normal1 = vector::zero;
+
+    // Current end of segment to test.
+    pointField nearest(end);
+    // Work array
+    List<pointIndexHit> nearestInfo(start.size());
+    labelList region;
+    vectorField normal;
+
+    forAll(surfaces_, surfI)
+    {
+        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+
+        // See if any intersection between start and current nearest
+        geom.findLine(start, nearest, nearestInfo);
+        geom.getNormal(nearestInfo, normal);
+
+        forAll(nearestInfo, pointI)
+        {
+            if (nearestInfo[pointI].hit())
+            {
+                surface1[pointI] = surfI;
+                normal1[pointI] = normal[pointI];
+                nearest[pointI] = nearestInfo[pointI].hitPoint();
+            }
+        }
+    }
+}
+
+
+void Foam::refinementSurfaces::findNearestIntersection
+(
+    const pointField& start,
+    const pointField& end,
+
+    labelList& surface1,
+    List<pointIndexHit>& hitInfo1,
+    vectorField& normal1
+) const
+{
+    // 1. intersection from start to end
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Initialize arguments
+    surface1.setSize(start.size());
+    surface1 = -1;
+    hitInfo1.setSize(start.size());
+    hitInfo1 = pointIndexHit();
+    normal1.setSize(start.size());
+    normal1 = vector::zero;
+
+    // Current end of segment to test.
+    pointField nearest(end);
+    // Work array
+    List<pointIndexHit> nearestInfo(start.size());
+    labelList region;
+    vectorField normal;
+
+    forAll(surfaces_, surfI)
+    {
+        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+
+        // See if any intersection between start and current nearest
+        geom.findLine(start, nearest, nearestInfo);
+        geom.getNormal(nearestInfo, normal);
+
+        forAll(nearestInfo, pointI)
+        {
+            if (nearestInfo[pointI].hit())
+            {
+                surface1[pointI] = surfI;
+                hitInfo1[pointI] = nearestInfo[pointI];
+                normal1[pointI] = normal[pointI];
+                nearest[pointI] = nearestInfo[pointI].hitPoint();
+            }
+        }
+    }
+}
+
+
 void Foam::refinementSurfaces::findAnyIntersection
 (
     const pointField& start,
@@ -1061,7 +1430,7 @@ void Foam::refinementSurfaces::findNearest
 (
     const labelList& surfacesToTest,
     const pointField& samples,
-    const  scalarField& nearestDistSqr,
+    const scalarField& nearestDistSqr,
     labelList& hitSurface,
     List<pointIndexHit>& hitInfo
 ) const
@@ -1299,7 +1668,7 @@ void Foam::refinementSurfaces::findInside
          && selectionMethod != surfaceZonesInfo::OUTSIDE
         )
         {
-            FatalErrorIn("refinementSurfaces::findInside(..)")
+            FatalErrorInFunction
                 << "Trying to use surface "
                 << surface.name()
                 << " which has non-geometric inside selection method "
@@ -1337,4 +1706,121 @@ void Foam::refinementSurfaces::findInside
 }
 
 
+void Foam::refinementSurfaces::findNearest
+(
+    const labelList& surfacesToTest,
+    const labelListList& regions,
+
+    const pointField& samples,
+    const scalarField& nearestDistSqr,
+
+    labelList& hitSurface,
+    List<pointIndexHit>& hitInfo
+) const
+{
+    labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+
+    // Do the tests. Note that findNearest returns index in geometries.
+    searchableSurfacesQueries::findNearest
+    (
+        allGeometry_,
+        geometries,
+        regions,
+        samples,
+        nearestDistSqr,
+        hitSurface,
+        hitInfo
+    );
+
+    // Rework the hitSurface to be surface (i.e. index into surfaces_)
+    forAll(hitSurface, pointI)
+    {
+        if (hitSurface[pointI] != -1)
+        {
+            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+        }
+    }
+}
+
+
+void Foam::refinementSurfaces::findNearestRegion
+(
+    const labelList& surfacesToTest,
+    const labelListList& regions,
+
+    const pointField& samples,
+    const scalarField& nearestDistSqr,
+
+    labelList& hitSurface,
+    List<pointIndexHit>& hitInfo,
+    labelList& hitRegion,
+    vectorField& hitNormal
+) const
+{
+    labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+
+    // Do the tests. Note that findNearest returns index in geometries.
+    searchableSurfacesQueries::findNearest
+    (
+        allGeometry_,
+        geometries,
+        regions,
+        samples,
+        nearestDistSqr,
+        hitSurface,
+        hitInfo
+    );
+
+    // Rework the hitSurface to be surface (i.e. index into surfaces_)
+    forAll(hitSurface, pointI)
+    {
+        if (hitSurface[pointI] != -1)
+        {
+            hitSurface[pointI] = surfacesToTest[hitSurface[pointI]];
+        }
+    }
+
+    // Collect the region
+    hitRegion.setSize(hitSurface.size());
+    hitRegion = -1;
+    hitNormal.setSize(hitSurface.size());
+    hitNormal = vector::zero;
+
+    forAll(surfacesToTest, i)
+    {
+        label surfI = surfacesToTest[i];
+
+        // Collect hits for surfI
+        const labelList localIndices(findIndices(hitSurface, surfI));
+
+        List<pointIndexHit> localHits
+        (
+            UIndirectList<pointIndexHit>
+            (
+                hitInfo,
+                localIndices
+            )
+        );
+
+        // Region
+        labelList localRegion;
+        allGeometry_[surfaces_[surfI]].getRegion(localHits, localRegion);
+
+        forAll(localIndices, i)
+        {
+            hitRegion[localIndices[i]] = localRegion[i];
+        }
+
+        // Normal
+        vectorField localNormal;
+        allGeometry_[surfaces_[surfI]].getNormal(localHits, localNormal);
+
+        forAll(localIndices, i)
+        {
+            hitNormal[localIndices[i]] = localNormal[i];
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
index 7f777daf33..7e2bcdf946 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,6 +42,8 @@ SourceFiles
 #include "vectorList.H"
 #include "pointIndexHit.H"
 #include "surfaceZonesInfo.H"
+#include "volumeType.H"
+#include "pointList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,8 +54,6 @@ class searchableSurfaces;
 class shellSurfaces;
 class triSurfaceMesh;
 
-typedef List<point> pointList;
-
 /*---------------------------------------------------------------------------*\
                            Class refinementSurfaces Declaration
 \*---------------------------------------------------------------------------*/
@@ -86,6 +86,12 @@ class refinementSurfaces
         //- From global region number to small-gap level
         labelList gapLevel_;
 
+        //- From global region number to small-gap level specification
+        List<FixedList<label, 3> > extendedGapLevel_;
+
+        //- From global region number to side of surface to detect
+        List<volumeType> extendedGapMode_;
+
         //- From global region number to perpendicular angle
         scalarField perpendicularAngle_;
 
@@ -95,6 +101,16 @@ class refinementSurfaces
 
     // Private Member Functions
 
+        //- Given intersection results with geom detect local shell refinement
+        //  level (possibly cached on triangles of geom)
+        labelList findHigherLevel
+        (
+            const searchableSurface& geom,
+            const shellSurfaces& shells,
+            const List<pointIndexHit>& intersectionInfo,
+            const labelList& surfaceLevel
+        ) const;
+
         //- Disallow default bitwise copy construct
         refinementSurfaces(const refinementSurfaces&);
 
@@ -179,6 +195,23 @@ public:
                 return gapLevel_;
             }
 
+            //- From global region number to specification of gap and its
+            //  refinement: 3 labels specifying
+            //  - minimum wanted number of cells in the gap
+            //  - minimum cell level when to start trying to detect gaps
+            //  - maximum cell level to refine to (so do not detect gaps if
+            //    cell >= maximum level)
+            const List<FixedList<label, 3> >& extendedGapLevel() const
+            {
+                return extendedGapLevel_;
+            }
+
+            //- From global region number to side of surface to detect
+            const List<volumeType>& extendedGapMode() const
+            {
+                return extendedGapMode_;
+            }
+
             //- From global region number to perpendicular angle
             const scalarField& perpendicularAngle() const
             {
@@ -217,6 +250,9 @@ public:
                 return minLevel_.size();
             }
 
+            //- Per surface the maximum extendedGapLevel over all its regions
+            labelList maxGapLevel() const;
+
             //- Calculate minLevelFields
             void setMinLevelFields
             (
@@ -234,6 +270,8 @@ public:
             //  Return surface number and level.
             void findHigherIntersection
             (
+                const shellSurfaces& shells,
+
                 const pointField& start,
                 const pointField& end,
                 const labelList& currentLevel,  // current cell refinement level
@@ -303,6 +341,25 @@ public:
                 vectorField& normal2
             ) const;
 
+            //- Find nearest (to start only) intersection of edge
+            void findNearestIntersection
+            (
+                const pointField& start,
+                const pointField& end,
+                labelList& surfaces,
+                vectorField& normal
+            ) const;
+
+            //- Find nearest (to start only) intersection of edge
+            void findNearestIntersection
+            (
+                const pointField& start,
+                const pointField& end,
+                labelList& surfaces,
+                List<pointIndexHit>&,
+                vectorField& normal
+            ) const;
+
             //- Used for debugging only: find intersection of edge.
             void findAnyIntersection
             (
@@ -354,6 +411,37 @@ public:
                 const pointField& pt,
                 labelList& insideSurfaces
             ) const;
+
+            // Region wise searching
+
+                //- Find nearest point on selected regions of surfaces.
+                void findNearest
+                (
+                    const labelList& surfacesToTest,
+                    const labelListList& regions,
+
+                    const pointField& samples,
+                    const scalarField& nearestDistSqr,
+
+                    labelList& hitSurface,
+                    List<pointIndexHit>& hitInfo
+                ) const;
+
+                //- Find nearest point on selected regions of surfaces.
+                void findNearestRegion
+                (
+                    const labelList& surfacesToTest,
+                    const labelListList& regions,
+
+                    const pointField& samples,
+                    const scalarField& nearestDistSqr,
+
+                    labelList& hitSurface,
+                    List<pointIndexHit>& hitInfo,
+                    labelList& hitRegion,
+                    vectorField& hitNormal
+                ) const;
+
 };
 
 
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
index 69c3f7777b..1962ced8b3 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,9 +122,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo
             && !surface.hasVolumeType()
             )
             {
-                IOWarningIn
+                IOWarningInFunction
                 (
-                    "surfaceZonesInfo::surfaceZonesInfo(..)",
                     surfacesDict
                 )   << "Illegal entry zoneInside "
                     << areaSelectionAlgoNames[zoneInside_]
@@ -135,9 +134,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo
         }
         else if (hasSide)
         {
-            IOWarningIn
+            IOWarningInFunction
             (
-                "surfaceZonesInfo::surfaceZonesInfo(..)",
                 surfacesDict
             )   << "Unused entry zoneInside for faceZone "
                 << faceZoneName_
@@ -341,6 +339,37 @@ Foam::labelList Foam::surfaceZonesInfo::getInsidePointNamedSurfaces
 }
 
 
+Foam::label Foam::surfaceZonesInfo::addCellZone
+(
+    const word& name,
+    const labelList& addressing,
+    polyMesh& mesh
+)
+{
+    cellZoneMesh& cellZones = mesh.cellZones();
+
+    label zoneI = cellZones.findZoneID(name);
+
+    if (zoneI == -1)
+    {
+        zoneI = cellZones.size();
+        cellZones.setSize(zoneI+1);
+        cellZones.set
+        (
+            zoneI,
+            new cellZone
+            (
+                name,           // name
+                addressing,     // addressing
+                zoneI,          // index
+                cellZones       // cellZoneMesh
+            )
+        );
+    }
+    return zoneI;
+}
+
+
 Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
 (
     const PtrList<surfaceZonesInfo>& surfList,
@@ -350,8 +379,6 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
 {
     labelList surfaceToCellZone(surfList.size(), -1);
 
-    cellZoneMesh& cellZones = mesh.cellZones();
-
     forAll(namedSurfaces, i)
     {
         label surfI = namedSurfaces[i];
@@ -360,24 +387,12 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
 
         if (cellZoneName != word::null)
         {
-            label zoneI = cellZones.findZoneID(cellZoneName);
-
-            if (zoneI == -1)
-            {
-                zoneI = cellZones.size();
-                cellZones.setSize(zoneI+1);
-                cellZones.set
-                (
-                    zoneI,
-                    new cellZone
-                    (
-                        cellZoneName,   //name
-                        labelList(0),   //addressing
-                        zoneI,          //index
-                        cellZones       //cellZoneMesh
-                    )
-                );
-            }
+            label zoneI = addCellZone
+            (
+                cellZoneName,
+                labelList(0),   // addressing
+                mesh
+            );
 
             surfaceToCellZone[surfI] = zoneI;
         }
@@ -385,7 +400,7 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
 
     // Check they are synced
     List<wordList> allCellZones(Pstream::nProcs());
-    allCellZones[Pstream::myProcNo()] = cellZones.names();
+    allCellZones[Pstream::myProcNo()] = mesh.cellZones().names();
     Pstream::gatherList(allCellZones);
     Pstream::scatterList(allCellZones);
 
@@ -393,11 +408,8 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
     {
         if (allCellZones[procI] != allCellZones[0])
         {
-            FatalErrorIn
-            (
-                "meshRefinement::zonify"
-                "(const label, const point&)"
-            )   << "Zones not synchronised among processors." << nl
+            FatalErrorInFunction
+                << "Zones not synchronised among processors." << nl
                 << " Processor0 has cellZones:" << allCellZones[0]
                 << " , processor" << procI
                 << " has cellZones:" << allCellZones[procI]
@@ -409,6 +421,40 @@ Foam::labelList Foam::surfaceZonesInfo::addCellZonesToMesh
 }
 
 
+
+Foam::label Foam::surfaceZonesInfo::addFaceZone
+(
+    const word& name,
+    const labelList& addressing,
+    const boolList& flipMap,
+    polyMesh& mesh
+)
+{
+    faceZoneMesh& faceZones = mesh.faceZones();
+
+    label zoneI = faceZones.findZoneID(name);
+
+    if (zoneI == -1)
+    {
+        zoneI = faceZones.size();
+        faceZones.setSize(zoneI+1);
+        faceZones.set
+        (
+            zoneI,
+            new faceZone
+            (
+                name,           // name
+                addressing,     // addressing
+                flipMap,        // flipMap
+                zoneI,          // index
+                faceZones       // faceZoneMesh
+            )
+        );
+    }
+    return zoneI;
+}
+
+
 Foam::labelList Foam::surfaceZonesInfo::addFaceZonesToMesh
 (
     const PtrList<surfaceZonesInfo>& surfList,
@@ -426,25 +472,13 @@ Foam::labelList Foam::surfaceZonesInfo::addFaceZonesToMesh
 
         const word& faceZoneName = surfList[surfI].faceZoneName();
 
-        label zoneI = faceZones.findZoneID(faceZoneName);
-
-        if (zoneI == -1)
-        {
-            zoneI = faceZones.size();
-            faceZones.setSize(zoneI+1);
-            faceZones.set
-            (
-                zoneI,
-                new faceZone
-                (
-                    faceZoneName,   //name
-                    labelList(0),   //addressing
-                    boolList(0),    //flipmap
-                    zoneI,          //index
-                    faceZones       //faceZoneMesh
-                )
-            );
-        }
+        label zoneI = addFaceZone
+        (
+            faceZoneName,   //name
+            labelList(0),   //addressing
+            boolList(0),    //flipmap
+            mesh
+        );
 
         surfaceToFaceZone[surfI] = zoneI;
     }
@@ -459,11 +493,8 @@ Foam::labelList Foam::surfaceZonesInfo::addFaceZonesToMesh
     {
         if (allFaceZones[procI] != allFaceZones[0])
         {
-            FatalErrorIn
-            (
-                "meshRefinement::zonify"
-                "(const label, const point&)"
-            )   << "Zones not synchronised among processors." << nl
+            FatalErrorInFunction
+                << "Zones not synchronised among processors." << nl
                 << " Processor0 has faceZones:" << allFaceZones[0]
                 << " , processor" << procI
                 << " has faceZones:" << allFaceZones[procI]
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
index eb59aad34f..3b5a73c3f5 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/surfaceZonesInfo.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,7 @@ SourceFiles
 #include "word.H"
 #include "PtrList.H"
 #include "labelList.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -222,6 +223,13 @@ public:
                 const PtrList<surfaceZonesInfo>& surfList
             );
 
+            static label addCellZone
+            (
+                const word& name,
+                const labelList& addressing,
+                polyMesh& mesh
+            );
+
             static labelList addCellZonesToMesh
             (
                 const PtrList<surfaceZonesInfo>& surfList,
@@ -229,6 +237,14 @@ public:
                 polyMesh& mesh
             );
 
+            static label addFaceZone
+            (
+                const word& name,
+                const labelList& addressing,
+                const boolList& flipMap,
+                polyMesh& mesh
+            );
+
             static labelList addFaceZonesToMesh
             (
                 const PtrList<surfaceZonesInfo>& surfList,
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
index cd39802553..05ca28a1bf 100644
--- a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,11 +65,8 @@ void Foam::shellSurfaces::setAndCheckLevels
 {
     if (modes_[shellI] != DISTANCE && distLevels.size() != 1)
     {
-        FatalErrorIn
-        (
-            "shellSurfaces::shellSurfaces"
-            "(const searchableSurfaces&, const dictionary&)"
-        )   << "For refinement mode "
+        FatalErrorInFunction
+            << "For refinement mode "
             << refineModeNames_[modes_[shellI]]
             << " specify only one distance+level."
             << " (its distance gets discarded)"
@@ -93,11 +90,8 @@ void Foam::shellSurfaces::setAndCheckLevels
              || (levels_[shellI][j] > levels_[shellI][j-1])
             )
             {
-                FatalErrorIn
-                (
-                    "shellSurfaces::shellSurfaces"
-                    "(const searchableSurfaces&, const dictionary&)"
-                )   << "For refinement mode "
+                FatalErrorInFunction
+                    << "For refinement mode "
                     << refineModeNames_[modes_[shellI]]
                     << " : Refinement should be specified in order"
                     << " of increasing distance"
@@ -124,14 +118,10 @@ void Foam::shellSurfaces::setAndCheckLevels
     }
     else
     {
-        if (!allGeometry_[shells_[shellI]].hasVolumeType())
+        if (!shell.hasVolumeType())
         {
-            FatalErrorIn
-            (
-                "shellSurfaces::shellSurfaces"
-                "(const searchableSurfaces&"
-                ", const PtrList<dictionary>&)"
-            )   << "Shell " << shell.name()
+            FatalErrorInFunction
+                << "Shell " << shell.name()
                 << " does not support testing for "
                 << refineModeNames_[modes_[shellI]] << endl
                 << "Probably it is not closed."
@@ -152,6 +142,43 @@ void Foam::shellSurfaces::setAndCheckLevels
 }
 
 
+void Foam::shellSurfaces::checkGapLevels
+(
+    const dictionary& shellDict,
+    const label shellI,
+    const List<FixedList<label, 3> >& levels
+)
+{
+    const searchableSurface& shell = allGeometry_[shells_[shellI]];
+
+    forAll(levels, regionI)
+    {
+        const FixedList<label, 3>& info = levels[regionI];
+
+        if (info[2] > 0)
+        {
+            if (modes_[shellI] == DISTANCE)
+            {
+                FatalIOErrorInFunction(shellDict)
+                    << "'gapLevel' specification cannot be used with mode "
+                    << refineModeNames_[DISTANCE]
+                    << " for shell " << shell.name()
+                    << exit(FatalIOError);
+            }
+        }
+    }
+
+    // Hardcode for region 0
+    if (levels[0][0] > 0)
+    {
+        Info<< "Refinement level up to " << levels[0][2]
+            << " for all cells in gaps for shell "
+            << shell.name() << endl;
+    }
+}
+
+
+
 // Specifically orient triSurfaces using a calculated point outside.
 // Done since quite often triSurfaces not of consistent orientation which
 // is (currently) necessary for sideness calculation
@@ -288,18 +315,18 @@ void Foam::shellSurfaces::findHigherLevel
         );
 
         // Update maxLevel
-        forAll(nearInfo, candidateI)
+        forAll(nearInfo, i)
         {
-            if (nearInfo[candidateI].hit())
+            if (nearInfo[i].hit())
             {
                 // Check which level it actually is in.
                 label minDistI = findLower
                 (
                     distances,
-                    mag(nearInfo[candidateI].hitPoint()-candidates[candidateI])
+                    mag(nearInfo[i].hitPoint()-candidates[i])
                 );
 
-                label pointI = candidateMap[candidateI];
+                label pointI = candidateMap[i];
 
                 // pt is inbetween shell[minDistI] and shell[minDistI+1]
                 maxLevel[pointI] = levels[minDistI+1];
@@ -356,6 +383,197 @@ void Foam::shellSurfaces::findHigherLevel
 }
 
 
+void Foam::shellSurfaces::findHigherGapLevel
+(
+    const pointField& pt,
+    const labelList& ptLevel,
+    const label shellI,
+    labelList& gapShell,
+    List<FixedList<label, 3> >& gapInfo,
+    List<volumeType>& gapMode
+) const
+{
+    //TBD: hardcoded for region 0 information
+    const FixedList<label, 3>& info = extendedGapLevel_[shellI][0];
+    volumeType mode = extendedGapMode_[shellI][0];
+
+    if (info[2] == 0)
+    {
+        return;
+    }
+
+
+    // Collect all those points that have a current maxLevel less than the
+    // shell.
+
+    labelList candidateMap(pt.size());
+    label candidateI = 0;
+
+    forAll(ptLevel, pointI)
+    {
+        if (ptLevel[pointI] >= info[1] && ptLevel[pointI] < info[2])
+        {
+            candidateMap[candidateI++] = pointI;
+        }
+    }
+    candidateMap.setSize(candidateI);
+
+    // Do the expensive nearest test only for the candidate points.
+    List<volumeType> volType;
+    allGeometry_[shells_[shellI]].getVolumeType
+    (
+        pointField(pt, candidateMap),
+        volType
+    );
+
+    forAll(volType, i)
+    {
+        label pointI = candidateMap[i];
+
+        bool isInside = (volType[i] == volumeType::INSIDE);
+
+        if
+        (
+            (
+                (modes_[shellI] == INSIDE && isInside)
+             || (modes_[shellI] == OUTSIDE && !isInside)
+            )
+         && info[2] > gapInfo[pointI][2]
+        )
+        {
+            gapShell[pointI] = shellI;
+            gapInfo[pointI] = info;
+            gapMode[pointI] = mode;
+        }
+    }
+}
+
+
+void Foam::shellSurfaces::findLevel
+(
+    const pointField& pt,
+    const label shellI,
+    labelList& minLevel,
+    labelList& shell
+) const
+{
+    const labelList& levels = levels_[shellI];
+
+    if (modes_[shellI] == DISTANCE)
+    {
+        // Distance mode.
+
+        const scalarField& distances = distances_[shellI];
+
+        // Collect all those points that have a current level equal/greater
+        // (any of) the shell. Also collect the furthest distance allowable
+        // to any shell with a higher level.
+
+        pointField candidates(pt.size());
+        labelList candidateMap(pt.size());
+        scalarField candidateDistSqr(pt.size());
+        label candidateI = 0;
+
+        forAll(shell, pointI)
+        {
+            if (shell[pointI] == -1)
+            {
+                forAllReverse(levels, levelI)
+                {
+                    if (levels[levelI] <= minLevel[pointI])
+                    {
+                        candidates[candidateI] = pt[pointI];
+                        candidateMap[candidateI] = pointI;
+                        candidateDistSqr[candidateI] = sqr(distances[levelI]);
+                        candidateI++;
+                        break;
+                    }
+                }
+            }
+        }
+        candidates.setSize(candidateI);
+        candidateMap.setSize(candidateI);
+        candidateDistSqr.setSize(candidateI);
+
+        // Do the expensive nearest test only for the candidate points.
+        List<pointIndexHit> nearInfo;
+        allGeometry_[shells_[shellI]].findNearest
+        (
+            candidates,
+            candidateDistSqr,
+            nearInfo
+        );
+
+        // Update maxLevel
+        forAll(nearInfo, i)
+        {
+            if (nearInfo[i].hit())
+            {
+                // Check which level it actually is in.
+                label minDistI = findLower
+                (
+                    distances,
+                    mag(nearInfo[i].hitPoint()-candidates[i])
+                );
+
+                label pointI = candidateMap[i];
+
+                // pt is inbetween shell[minDistI] and shell[minDistI+1]
+                shell[pointI] = shellI;
+                minLevel[pointI] = levels[minDistI+1];
+            }
+        }
+    }
+    else
+    {
+        // Inside/outside mode
+
+        // Collect all those points that have a current maxLevel less than the
+        // shell.
+
+        pointField candidates(pt.size());
+        labelList candidateMap(pt.size());
+        label candidateI = 0;
+
+        forAll(shell, pointI)
+        {
+            if (shell[pointI] == -1 && levels[0] <= minLevel[pointI])
+            {
+                candidates[candidateI] = pt[pointI];
+                candidateMap[candidateI] = pointI;
+                candidateI++;
+            }
+        }
+        candidates.setSize(candidateI);
+        candidateMap.setSize(candidateI);
+
+        // Do the expensive nearest test only for the candidate points.
+        List<volumeType> volType;
+        allGeometry_[shells_[shellI]].getVolumeType(candidates, volType);
+
+        forAll(volType, i)
+        {
+            if
+            (
+                (
+                    modes_[shellI] == INSIDE
+                 && volType[i] == volumeType::INSIDE
+                )
+             || (
+                    modes_[shellI] == OUTSIDE
+                 && volType[i] == volumeType::OUTSIDE
+                )
+            )
+            {
+                label pointI = candidateMap[i];
+                shell[pointI] = shellI;
+                minLevel[pointI] = levels[0];
+            }
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::shellSurfaces::shellSurfaces
@@ -387,6 +605,15 @@ Foam::shellSurfaces::shellSurfaces
     distances_.setSize(shellI);
     levels_.setSize(shellI);
 
+    extendedGapLevel_.setSize(shellI);
+    extendedGapMode_.setSize(shellI);
+
+    FixedList<label, 3> nullGapLevel;
+    nullGapLevel[0] = 0;
+    nullGapLevel[1] = 0;
+    nullGapLevel[2] = 0;
+
+
     HashSet<word> unmatchedKeys(shellsDict.toc());
     shellI = 0;
 
@@ -407,15 +634,93 @@ Foam::shellSurfaces::shellSurfaces
             // Read pairs of distance+level
             setAndCheckLevels(shellI, dict.lookup("levels"));
 
+
+
+            // Gap specification
+            // ~~~~~~~~~~~~~~~~~
+
+
+            // Shell-wide gap level specification
+            const searchableSurface& surface = allGeometry_[geomI];
+            const wordList& regionNames = surface.regions();
+
+            FixedList<label, 3> gapSpec
+            (
+                dict.lookupOrDefault
+                (
+                    "gapLevel",
+                    nullGapLevel
+                )
+            );
+            extendedGapLevel_[shellI].setSize(regionNames.size());
+            extendedGapLevel_[shellI] = gapSpec;
+
+            volumeType gapModeSpec
+            (
+                volumeType::names
+                [
+                    dict.lookupOrDefault<word>
+                    (
+                        "gapMode",
+                        volumeType::names[volumeType::MIXED]
+                    )
+                ]
+            );
+            extendedGapMode_[shellI].setSize(regionNames.size());
+            extendedGapMode_[shellI] = gapModeSpec;
+
+
+            // Override on a per-region basis?
+
+            if (dict.found("regions"))
+            {
+                const dictionary& regionsDict = dict.subDict("regions");
+                forAll(regionNames, regionI)
+                {
+                    if (regionsDict.found(regionNames[regionI]))
+                    {
+                        // Get the dictionary for region
+                        const dictionary& regionDict = regionsDict.subDict
+                        (
+                            regionNames[regionI]
+                        );
+                        FixedList<label, 3> gapSpec
+                        (
+                            regionDict.lookupOrDefault
+                            (
+                                "gapLevel",
+                                nullGapLevel
+                            )
+                        );
+                        extendedGapLevel_[shellI][regionI] = gapSpec;
+
+                        volumeType gapModeSpec
+                        (
+                            volumeType::names
+                            [
+                                regionDict.lookupOrDefault<word>
+                                (
+                                    "gapMode",
+                                    volumeType::names[volumeType::MIXED]
+                                )
+                            ]
+                        );
+                        extendedGapMode_[shellI][regionI] = gapModeSpec;
+                    }
+                }
+            }
+
+
+            checkGapLevels(dict, shellI, extendedGapLevel_[shellI]);
+
             shellI++;
         }
     }
 
     if (unmatchedKeys.size() > 0)
     {
-        IOWarningIn
+        IOWarningInFunction
         (
-            "shellSurfaces::shellSurfaces(..)",
             shellsDict
         )   << "Not all entries in refinementRegions dictionary were used."
             << " The following entries were not used : "
@@ -444,6 +749,22 @@ Foam::label Foam::shellSurfaces::maxLevel() const
 }
 
 
+Foam::labelList Foam::shellSurfaces::maxGapLevel() const
+{
+    labelList surfaceMax(extendedGapLevel_.size(), 0);
+
+    forAll(extendedGapLevel_, shellI)
+    {
+        const List<FixedList<label, 3> >& levels = extendedGapLevel_[shellI];
+        forAll(levels, i)
+        {
+            surfaceMax[shellI] = max(surfaceMax[shellI], levels[i][2]);
+        }
+    }
+    return surfaceMax;
+}
+
+
 void Foam::shellSurfaces::findHigherLevel
 (
     const pointField& pt,
@@ -461,4 +782,66 @@ void Foam::shellSurfaces::findHigherLevel
 }
 
 
+void Foam::shellSurfaces::findHigherGapLevel
+(
+    const pointField& pt,
+    const labelList& ptLevel,
+    labelList& gapShell,
+    List<FixedList<label, 3> >& gapInfo,
+    List<volumeType>& gapMode
+) const
+{
+    gapShell.setSize(pt.size());
+    gapShell = -1;
+
+    FixedList<label, 3> nullGapLevel;
+    nullGapLevel[0] = 0;
+    nullGapLevel[1] = 0;
+    nullGapLevel[2] = 0;
+
+    gapInfo.setSize(pt.size());
+    gapInfo = nullGapLevel;
+
+    gapMode.setSize(pt.size());
+    gapMode = volumeType::MIXED;
+
+    forAll(shells_, shellI)
+    {
+        findHigherGapLevel(pt, ptLevel, shellI, gapShell, gapInfo, gapMode);
+    }
+}
+
+
+void Foam::shellSurfaces::findHigherGapLevel
+(
+    const pointField& pt,
+    const labelList& ptLevel,
+    List<FixedList<label, 3> >& gapInfo,
+    List<volumeType>& gapMode
+) const
+{
+    labelList gapShell;
+    findHigherGapLevel(pt, ptLevel, gapShell, gapInfo, gapMode);
+}
+
+
+void Foam::shellSurfaces::findLevel
+(
+    const pointField& pt,
+    const labelList& ptLevel,
+    labelList& shell
+) const
+{
+    shell.setSize(pt.size());
+    shell = -1;
+
+    labelList minLevel(ptLevel);
+
+    forAll(shells_, shellI)
+    {
+        findLevel(pt, shellI, minLevel, shell);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
index 9b0e4c9e05..13817de16f 100644
--- a/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
+++ b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,6 +85,15 @@ private:
         labelListList levels_;
 
 
+        // Gap level refinement
+
+            //- Per shell, per region the small-gap level specification
+            List<List<FixedList<label, 3> > > extendedGapLevel_;
+
+            //- Per shell, per region the small-gap level specification
+            List<List<volumeType> > extendedGapMode_;
+
+
     // Private data
 
         //- refineMode names
@@ -93,15 +102,24 @@ private:
 
     // Private Member Functions
 
-        //- Helper function for initialisation.
+        //- Helper function for initialisation of levels
         void setAndCheckLevels
         (
             const label shellI,
             const List<Tuple2<scalar, label> >&
         );
 
+        //- Helper function for checking of gap information
+        void checkGapLevels
+        (
+            const dictionary&,
+            const label shellI,
+            const List<FixedList<label, 3> >& levels
+        );
+
         void orient();
 
+        //- Find first shell with a level higher than maxLevel
         void findHigherLevel
         (
             const pointField& pt,
@@ -109,6 +127,27 @@ private:
             labelList& maxLevel
         ) const;
 
+        //- Update highest min gap level
+        void findHigherGapLevel
+        (
+            const pointField& pt,
+            const labelList& ptLevel,
+            const label shellI,
+            labelList& gapShell,
+            List<FixedList<label, 3> >& gapInfo,
+            List<volumeType>& gapMode
+        ) const;
+
+        //- Find first shell with a level lower or equal to minLevel. Update
+        //  minLevel and shell.
+        void findLevel
+        (
+            const pointField& pt,
+            const label shellI,
+            labelList& minLevel,
+            labelList& shell
+        ) const;
+
 public:
 
     // Constructors
@@ -125,16 +164,11 @@ public:
 
         // Access
 
-            //const List<scalarField>& distances() const
-            //{
-            //    return distances_;
-            //}
-            //
-            ////- Per shell per distance the refinement level
-            //const labelListList& levels() const
-            //{
-            //    return levels_;
-            //}
+            //- Indices of surfaces that are shells
+            const labelList& shells() const
+            {
+                return shells_;
+            }
 
 
         // Query
@@ -142,6 +176,9 @@ public:
             //- Highest shell level
             label maxLevel() const;
 
+            //- Highest shell gap level
+            labelList maxGapLevel() const;
+
             //- Find shell level higher than ptLevel
             void findHigherLevel
             (
@@ -150,6 +187,33 @@ public:
                 labelList& maxLevel
             ) const;
 
+            //- Find a shell whose minimum gap level is >= ptLevel
+            void findHigherGapLevel
+            (
+                const pointField& pt,
+                const labelList& ptLevel,
+                labelList& gapShell,
+                List<FixedList<label, 3> >& gapInfo,
+                List<volumeType>& gapMode
+            ) const;
+
+            //- Find a shell whose minimum gap level is >= ptLevel. gapInfo
+            //  is (0 0 0) if no shell found
+            void findHigherGapLevel
+            (
+                const pointField& pt,
+                const labelList& ptLevel,
+                List<FixedList<label, 3> >& gapInfo,
+                List<volumeType>& gapMode
+            ) const;
+
+            //- Find first shell (or -1) with level equal or lower than ptLevel.
+            void findLevel
+            (
+                const pointField& pt,
+                const labelList& ptLevel,
+                labelList& shell
+            ) const;
 };
 
 
diff --git a/src/mesh/blockMesh/Make/files b/src/mesh/blockMesh/Make/files
index 37bbe7ba17..584db6cf61 100644
--- a/src/mesh/blockMesh/Make/files
+++ b/src/mesh/blockMesh/Make/files
@@ -3,6 +3,7 @@ curvedEdges/CatmullRomSpline.C
 curvedEdges/polyLine.C
 
 curvedEdges/arcEdge.C
+curvedEdges/bezier.C
 curvedEdges/curvedEdge.C
 curvedEdges/lineEdge.C
 curvedEdges/polyLineEdge.C
diff --git a/src/mesh/blockMesh/block/block.H b/src/mesh/blockMesh/block/block.H
index fba8517c03..ee88f8c9a3 100644
--- a/src/mesh/blockMesh/block/block.H
+++ b/src/mesh/blockMesh/block/block.H
@@ -112,7 +112,7 @@ public:
         //- Clone
         autoPtr<block> clone() const
         {
-            notImplemented("block::clone()");
+            NotImplemented;
             return autoPtr<block>(NULL);
         }
 
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
index fad60ea2fd..1357a9e566 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -49,13 +49,8 @@ Foam::blockDescriptor::blockDescriptor
 {
     if (expand_.size() != 12)
     {
-        FatalErrorIn
-        (
-            "blockDescriptor::blockDescriptor"
-            "(const cellShape&, const pointField& blockPointField, "
-            "const curvedEdgeList&, const Vector<label>& meshDensity, "
-            "const scalarList& expand, const word& zoneName)"
-        )   << "Unknown definition of expansion ratios"
+        FatalErrorInFunction
+            << "Unknown definition of expansion ratios"
             << exit(FatalError);
     }
 
@@ -106,10 +101,8 @@ Foam::blockDescriptor::blockDescriptor
         }
         else
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "blockDescriptor::blockDescriptor"
-                "(const pointField&, const curvedEdgeList&, Istream&)",
                 is
             )   << "incorrect token while reading n, expected '(', found "
                 << t.info()
@@ -163,11 +156,8 @@ Foam::blockDescriptor::blockDescriptor
     }
     else
     {
-        FatalErrorIn
-        (
-            "blockDescriptor::blockDescriptor"
-            "(const pointField&, const curvedEdgeList&, Istream&)"
-        )   << "Unknown definition of expansion ratios: " << expRatios
+        FatalErrorInFunction
+            << "Unknown definition of expansion ratios: " << expRatios
             << exit(FatalError);
     }
 
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index ac5964ecc5..df3bfa8a39 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -129,7 +129,7 @@ public:
         //- Clone
         autoPtr<blockDescriptor> clone() const
         {
-            notImplemented("blockDescriptor::clone()");
+            NotImplemented;
             return autoPtr<blockDescriptor>(NULL);
         }
 
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.C b/src/mesh/blockMesh/blockMesh/blockMesh.C
index a7d46b0401..615a8d7c55 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.C
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.C
@@ -83,7 +83,7 @@ const Foam::polyMesh& Foam::blockMesh::topology() const
 {
     if (!topologyPtr_)
     {
-        FatalErrorIn("blockMesh::topology() const")
+        FatalErrorInFunction
             << "topologyPtr_ not allocated"
             << exit(FatalError);
     }
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
index 39c7ed6c10..e153f9d7b7 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
@@ -139,7 +139,7 @@ void Foam::blockMesh::checkBlockMesh(const polyMesh& bm) const
 
     if (!ok)
     {
-        FatalErrorIn("blockMesh::checkBlockMesh(const polyMesh& bm)")
+        FatalErrorInFunction
             << "Block mesh topology incorrect, stopping mesh generation!"
             << exit(FatalError);
     }
@@ -161,10 +161,8 @@ bool Foam::blockMesh::blockLabelsOK
         {
             ok = false;
 
-            WarningIn
-            (
-                "bool Foam::blockMesh::blockLabelsOK(...)"
-            )   << "out-of-range point label " << blockShape[blockI]
+            WarningInFunction
+                << "out-of-range point label " << blockShape[blockI]
                 << " (min = 0"
                 << ") in block " << blockLabel << endl;
         }
@@ -172,10 +170,8 @@ bool Foam::blockMesh::blockLabelsOK
         {
             ok = false;
 
-            WarningIn
-            (
-                "bool Foam::blockMesh::blockLabelsOK(...)"
-            )   << "out-of-range point label " << blockShape[blockI]
+            WarningInFunction
+                << "out-of-range point label " << blockShape[blockI]
                 << " (max = " << points.size() - 1
                 << ") in block " << blockLabel << endl;
         }
@@ -204,10 +200,8 @@ bool Foam::blockMesh::patchLabelsOK
             {
                 ok = false;
 
-                WarningIn
-                (
-                    "bool Foam::blockMesh::patchLabelsOK(...)"
-                )   << "out-of-range point label " << f[fp]
+                WarningInFunction
+                    << "out-of-range point label " << f[fp]
                     << " (min = 0"
                     << ") on patch " << patchLabel
                     << ", face " << faceI << endl;
@@ -216,10 +210,8 @@ bool Foam::blockMesh::patchLabelsOK
             {
                 ok = false;
 
-                WarningIn
-                (
-                    "bool Foam::blockMesh::patchLabelsOK(...)"
-                )   << "out-of-range point label " << f[fp]
+                WarningInFunction
+                    << "out-of-range point label " << f[fp]
                     << " (max = " << points.size() - 1
                     << ") on patch " << patchLabel
                     << ", face " << faceI << endl;
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshMerge.C b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
index f8d05d0f2d..edac5b9e49 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshMerge.C
@@ -95,7 +95,7 @@ void Foam::blockMesh::calcMergeInfo()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Cannot find merge face for block " << blockPlabel
                 << exit(FatalError);
         }
@@ -204,7 +204,7 @@ void Foam::blockMesh::calcMergeInfo()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Cannot find merge face for block " << blockNlabel
                 << exit(FatalError);
         }
@@ -214,7 +214,7 @@ void Foam::blockMesh::calcMergeInfo()
 
         if (blockPfaceFaces.size() != blockNfaceFaces.size())
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Inconsistent number of faces between block pair "
                 << blockPlabel << " and " << blockNlabel
                 << exit(FatalError);
@@ -287,7 +287,7 @@ void Foam::blockMesh::calcMergeInfo()
             {
                 if (cp[blockPfaceFacePointLabel] == -1)
                 {
-                    FatalErrorIn("blockMesh::calcMergeInfo()")
+                    FatalErrorInFunction
                         << "Inconsistent point locations between block pair "
                         << blockPlabel << " and " << blockNlabel << nl
                         << "    probably due to inconsistent grading."
@@ -407,7 +407,7 @@ void Foam::blockMesh::calcMergeInfo()
 
         if (nPasses > 100)
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Point merging failed after max number of passes."
                 << exit(FatalError);
         }
@@ -452,7 +452,7 @@ void Foam::blockMesh::calcMergeInfo()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Cannot find merge face for block " << blockPlabel
                 << exit(FatalError);
         }
@@ -479,7 +479,7 @@ void Foam::blockMesh::calcMergeInfo()
 
         if (!foundFace)
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Cannot find merge face for block " << blockNlabel
                 << exit(FatalError);
         }
@@ -503,7 +503,7 @@ void Foam::blockMesh::calcMergeInfo()
 
                 if (mergeList_[PpointLabel] == -1)
                 {
-                    FatalErrorIn("blockMesh::calcMergeInfo()")
+                    FatalErrorInFunction
                         << "Unable to merge point "
                         << blockPfaceFacePointLabel
                         << ' ' << blockPpoints[blockPfaceFacePointLabel]
@@ -529,7 +529,7 @@ void Foam::blockMesh::calcMergeInfo()
 
                 if (mergeList_[NpointLabel] == -1)
                 {
-                    FatalErrorIn("blockMesh::calcMergeInfo()")
+                    FatalErrorInFunction
                         << "unable to merge point "
                         << blockNfaceFacePointLabel
                         << ' ' << blockNpoints[blockNfaceFacePointLabel]
@@ -552,7 +552,7 @@ void Foam::blockMesh::calcMergeInfo()
     {
         if (mergeList_[pointLabel] > pointLabel)
         {
-            FatalErrorIn("blockMesh::calcMergeInfo()")
+            FatalErrorInFunction
                 << "Merge list contains point index out of range"
                 << exit(FatalError);
         }
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C b/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
index 077db0b8fd..2936da2643 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
@@ -103,11 +103,8 @@ Pair<int> faceMap
         }
     }
 
-    FatalErrorIn
-    (
-        "faceMap(const label facePi, const face& faceP, "
-        "const label faceNi, const face& faceN)"
-    )   << "Cannot find point correspondance for faces "
+    FatalErrorInFunction
+        << "Cannot find point correspondance for faces "
         << faceP << " and " << faceN
         << exit(FatalError);
 
@@ -146,7 +143,7 @@ void setBlockFaceCorrespondence
 
         if (!foundFace)
         {
-            FatalErrorIn("setBlockFaceCorrespondence()")
+            FatalErrorInFunction
                 << "Cannot find merge face for block " << topoPi
                 << exit(FatalError);
         }
@@ -410,7 +407,7 @@ void Foam::blockMesh::calcMergeInfoFast()
 
             if (Pnij != NPnij)
             {
-                FatalErrorIn("blockMesh::calcMergeInfoFast()")
+                FatalErrorInFunction
                     << "Sub-division mismatch between face "
                     << blockPfacei << " of block " << blockPi << Pnij
                     << " and face "
@@ -449,7 +446,7 @@ void Foam::blockMesh::calcMergeInfoFast()
 
                 if (sqrDist > testSqrDist)
                 {
-                    FatalErrorIn("blockMesh::calcMergeInfoFast()")
+                    FatalErrorInFunction
                         << "Point merge failure between face "
                         << blockPfacei << " of block " << blockPi
                         << " and face "
@@ -555,7 +552,7 @@ void Foam::blockMesh::calcMergeInfoFast()
 
         if (nPasses > 100)
         {
-            FatalErrorIn("blockMesh::calcMergeInfoFast()")
+            FatalErrorInFunction
                 << "Point merging failed after 100 passes."
                 << exit(FatalError);
         }
@@ -570,7 +567,7 @@ void Foam::blockMesh::calcMergeInfoFast()
     {
         if (mergeList_[pointi] > pointi)
         {
-            FatalErrorIn("blockMesh::calcMergeInfoFast()")
+            FatalErrorInFunction
                 << "Merge list contains point index out of range"
                 << exit(FatalError);
         }
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index a4b9b548cb..2d476ef2a9 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,10 +99,8 @@ bool Foam::blockMesh::readPatches
         {
             if (patchNames[nPatches] == patchNames[i])
             {
-                FatalErrorIn
-                (
-                    "blockMesh::createTopology(IOdictionary&)"
-                )   << "Duplicate patch " << patchNames[nPatches]
+                FatalErrorInFunction
+                    << "Duplicate patch " << patchNames[nPatches]
                     << " at line " << patchStream.lineNumber()
                     << ". Exiting !" << nl
                     << exit(FatalError);
@@ -126,7 +124,7 @@ bool Foam::blockMesh::readPatches
             word halfA = patchNames[nPatches-1] + "_half0";
             word halfB = patchNames[nPatches-1] + "_half1";
 
-            WarningIn("blockMesh::createTopology(IOdictionary&)")
+            WarningInFunction
                 << "Old-style cyclic definition."
                 << " Splitting patch "
                 << patchNames[nPatches-1] << " into two halves "
@@ -154,10 +152,8 @@ bool Foam::blockMesh::readPatches
             // Split faces
             if ((tmpBlocksPatches[nPatches-1].size() % 2) != 0)
             {
-                FatalErrorIn
-                (
-                    "blockMesh::createTopology(IOdictionary&)"
-                )   << "Size of cyclic faces is not a multiple of 2 :"
+                FatalErrorInFunction
+                    << "Size of cyclic faces is not a multiple of 2 :"
                     << tmpBlocksPatches[nPatches-1]
                     << exit(FatalError);
             }
@@ -212,7 +208,7 @@ bool Foam::blockMesh::readBoundary
 
         if (!patchInfo.isDict())
         {
-            FatalIOErrorIn("blockMesh::readBoundary(..)", meshDescription)
+            FatalIOErrorInFunction(meshDescription)
                 << "Entry " << patchInfo << " in boundary section is not a"
                 << " valid dictionary." << exit(FatalIOError);
         }
@@ -249,10 +245,8 @@ void Foam::blockMesh::createCellShapes
 
         if (tmpBlockCells[blockI].mag(blockPointField_) < 0.0)
         {
-            WarningIn
-            (
-                "blockMesh::createTopology(IOdictionary&)"
-            )   << "negative volume block : " << blockI
+            WarningInFunction
+                << "negative volume block : " << blockI
                 << ", probably defined inside-out" << endl;
         }
     }
@@ -465,7 +459,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
 
         if (!topologyOK)
         {
-            FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
+            FatalErrorInFunction
                 << "Cannot create mesh due to errors in topology, exiting !"
                 << nl << exit(FatalError);
         }
@@ -510,9 +504,8 @@ Foam::polyMesh* Foam::blockMesh::createTopology
             }
             else if (word(dict.lookup("type")) != patchTypes[patchI])
             {
-                IOWarningIn
+                IOWarningInFunction
                 (
-                    "blockMesh::createTopology(IOdictionary&)",
                     meshDescription
                 )   << "For patch " << patchNames[patchI]
                     << " overriding type '" << patchTypes[patchI]
@@ -565,7 +558,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology
 
         if (!topologyOK)
         {
-            FatalErrorIn("blockMesh::createTopology(IOdictionary&)")
+            FatalErrorInFunction
                 << "Cannot create mesh due to errors in topology, exiting !"
                 << nl << exit(FatalError);
         }
diff --git a/src/mesh/blockMesh/curvedEdges/BSpline.C b/src/mesh/blockMesh/curvedEdges/BSpline.C
index e101bf22e5..14d734f414 100644
--- a/src/mesh/blockMesh/curvedEdges/BSpline.C
+++ b/src/mesh/blockMesh/curvedEdges/BSpline.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ Foam::point Foam::BSpline::position
 
 Foam::scalar Foam::BSpline::length() const
 {
-    notImplemented("BSpline::length() const");
+    NotImplemented;
     return 1.0;
 }
 
diff --git a/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C b/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C
index 22d3ed25b5..323f37eaa8 100644
--- a/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C
+++ b/src/mesh/blockMesh/curvedEdges/CatmullRomSpline.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ Foam::point Foam::CatmullRomSpline::position
 
 Foam::scalar Foam::CatmullRomSpline::length() const
 {
-    notImplemented("CatmullRomSpline::length() const");
+    NotImplemented;
     return 1.0;
 }
 
diff --git a/src/mesh/blockMesh/curvedEdges/arcEdge.C b/src/mesh/blockMesh/curvedEdges/arcEdge.C
index 512eab4a20..6f967cefb0 100644
--- a/src/mesh/blockMesh/curvedEdges/arcEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/arcEdge.C
@@ -52,8 +52,7 @@ Foam::cylindricalCS Foam::arcEdge::calcAngle()
 
     if (mag(denom) < VSMALL)
     {
-        FatalErrorIn("cylindricalCS arcEdge::calcAngle()")
-            << "Invalid arc definition - are the points co-linear?  Denom ="
+        FatalErrorInFunction
             << denom
             << abort(FatalError);
     }
@@ -135,7 +134,7 @@ Foam::point Foam::arcEdge::position(const scalar lambda) const
 {
     if (lambda < -SMALL || lambda > 1 + SMALL)
     {
-        FatalErrorIn("arcEdge::position(const scalar lambda) const")
+        FatalErrorInFunction
             << "Parameter out of range, lambda = " << lambda
             << abort(FatalError);
     }
diff --git a/src/mesh/blockMesh/curvedEdges/bezier.C b/src/mesh/blockMesh/curvedEdges/bezier.C
new file mode 100644
index 0000000000..28363be461
--- /dev/null
+++ b/src/mesh/blockMesh/curvedEdges/bezier.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "bezier.H"
+#include "SubList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(bezier, 0);
+    addToRunTimeSelectionTable(curvedEdge, bezier, Istream);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::bezier::bezier
+(
+    const pointField& ps,
+    const label start,
+    const label end,
+    const pointField& control
+)
+:
+    curvedEdge(ps, start, end),
+    control_(control)
+{}
+
+
+Foam::bezier::bezier(const pointField& ps, Istream& is)
+:
+    curvedEdge(ps, is),
+    control_(appendEndPoints(ps, start_, end_, pointField(is)))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::bezier::~bezier()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::point Foam::bezier::position(const scalar lambda) const
+{
+    pointField working(control_);
+
+    label nWorking(working.size());
+
+    forAll(working, workingI)
+    {
+        -- nWorking;
+
+        SubList<point>(working, nWorking).assign
+        (
+            (1 - lambda)*SubList<point>(working, nWorking)
+          + lambda*SubList<point>(working, nWorking, 1)
+        );
+    }
+
+    return working[0];
+}
+
+
+Foam::scalar Foam::bezier::length() const
+{
+    NotImplemented;
+    return 1.0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/curvedEdges/bezier.H b/src/mesh/blockMesh/curvedEdges/bezier.H
new file mode 100644
index 0000000000..2f231c754f
--- /dev/null
+++ b/src/mesh/blockMesh/curvedEdges/bezier.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::bezier
+
+Description
+    Nth order bezier curve edge. Only interior control points should be
+    specified. The outer points are taken as start and end. Note that the
+    calculation of each point takes 0(N^2) time, where N is the number of
+    control points. This edge type shouldn't therefore be used for finely
+    discretised line data; polyLine or similar will be more appropriate for
+    such cases. Beziers are useful for simple curved shapes such as aerofoils,
+    or when you want an edge to match a specific direction at one, or both, or
+    its endpoints. In comparison with BSplines, the grading of bezier edges
+    should be smoother, and the code is much simpler. The algorithmic order is
+    worse, however, and the edge will not follow the control points as closely.
+
+SourceFiles
+    bezier.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef bezier_H
+#define bezier_H
+
+#include "curvedEdge.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class bezier Declaration
+\*---------------------------------------------------------------------------*/
+
+class bezier
+:
+    public curvedEdge
+{
+private:
+
+        //- Control points
+        pointField control_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        bezier(const bezier&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const bezier&);
+
+
+public:
+
+    // Static data members
+    TypeName("bezier");
+
+
+    // Constructors
+
+        //- Construct from components
+        bezier
+        (
+            const pointField&,
+            const label start,
+            const label end,
+            const pointField& control
+        );
+
+        //- Construct from Istream
+        bezier(const pointField&, Istream&);
+
+
+        //- Destructor
+        virtual ~bezier();
+
+
+    // Member Functions
+
+        //- Return the point position corresponding to the curve parameter
+        //  0 <= lambda <= 1
+        point position(const scalar lambda) const;
+
+        //- Return the length of the curve
+        scalar length() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.C b/src/mesh/blockMesh/curvedEdges/curvedEdge.C
index 38a6637bde..895c472947 100644
--- a/src/mesh/blockMesh/curvedEdges/curvedEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.C
@@ -68,7 +68,7 @@ Foam::curvedEdge::curvedEdge(const curvedEdge& c)
 
 Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::clone() const
 {
-    notImplemented("curvedEdge::clone() const");
+    NotImplemented;
     return autoPtr<curvedEdge>(NULL);
 }
 
@@ -93,7 +93,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalErrorIn("curvedEdge::New(const pointField&, Istream&)")
+        FatalErrorInFunction
             << "Unknown curvedEdge type "
             << edgeType << nl << nl
             << "Valid curvedEdge types are" << endl
@@ -135,7 +135,7 @@ Foam::pointField Foam::curvedEdge::appendEndPoints
 
 void Foam::curvedEdge::operator=(const curvedEdge&)
 {
-    notImplemented("void curvedEdge::operator=(const curvedEdge&)");
+    NotImplemented;
 }
 
 
diff --git a/src/mesh/blockMesh/curvedEdges/lineEdge.C b/src/mesh/blockMesh/curvedEdges/lineEdge.C
index a00243e584..260ede1961 100644
--- a/src/mesh/blockMesh/curvedEdges/lineEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/lineEdge.C
@@ -67,7 +67,7 @@ Foam::point Foam::lineEdge::position(const scalar lambda) const
 {
     if (lambda < -SMALL || lambda > 1+SMALL)
     {
-        FatalErrorIn("lineEdge::position(const scalar)")
+        FatalErrorInFunction
             << "Parameter out of range, lambda = " << lambda
             << abort(FatalError);
     }
diff --git a/src/mesh/extrudeModel/Make/files b/src/mesh/extrudeModel/Make/files
index f6c2f50b04..e18ad638e1 100644
--- a/src/mesh/extrudeModel/Make/files
+++ b/src/mesh/extrudeModel/Make/files
@@ -4,6 +4,7 @@ linearNormal/linearNormal.C
 planeExtrusion/planeExtrusion.C
 linearDirection/linearDirection.C
 linearRadial/linearRadial.C
+offsetSurface/offsetSurface.C
 radial/radial.C
 sigmaRadial/sigmaRadial.C
 sector/sector.C
diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
index eabd0b53a8..2dd02e7d86 100644
--- a/src/mesh/extrudeModel/Make/options
+++ b/src/mesh/extrudeModel/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 LIB_LIBS = \
diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
index 18e18d3b4f..010ddc4de4 100644
--- a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
+++ b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,8 @@ Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "extrudeModel::New(const dictionary&)"
-        )   << "Unknown extrudeModel type "
+        FatalErrorInFunction
+            << "Unknown extrudeModel type "
             << modelType << nl << nl
             << "Valid extrudeModel types are :" << nl
             << dictionaryConstructorTablePtr_->sortedToc() << nl
diff --git a/src/mesh/extrudeModel/linearDirection/linearDirection.C b/src/mesh/extrudeModel/linearDirection/linearDirection.C
index d7db3a45b5..36a0094d2e 100644
--- a/src/mesh/extrudeModel/linearDirection/linearDirection.C
+++ b/src/mesh/extrudeModel/linearDirection/linearDirection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ linearDirection::linearDirection(const dictionary& dict)
 
     if (thickness_ <= 0)
     {
-        FatalErrorIn("linearDirection(const dictionary&)")
+        FatalErrorInFunction
             << "thickness should be positive : " << thickness_
             << exit(FatalError);
     }
diff --git a/src/mesh/extrudeModel/linearNormal/linearNormal.C b/src/mesh/extrudeModel/linearNormal/linearNormal.C
index 06e0aafc2c..d3a25216ae 100644
--- a/src/mesh/extrudeModel/linearNormal/linearNormal.C
+++ b/src/mesh/extrudeModel/linearNormal/linearNormal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ linearNormal::linearNormal(const dictionary& dict)
 {
     if (thickness_ <= 0)
     {
-        FatalErrorIn("linearNormal(const dictionary&)")
+        FatalErrorInFunction
             << "thickness should be positive : " << thickness_
             << exit(FatalError);
     }
@@ -60,7 +60,7 @@ linearNormal::linearNormal(const dictionary& dict)
 
     if (firstCellThickness_ >= thickness_)
     {
-        FatalErrorIn("linearNormal(const dictionary&)")
+        FatalErrorInFunction
             << "firstCellThickness is larger than thickness"
             << exit(FatalError);
     }
diff --git a/src/mesh/extrudeModel/offsetSurface/offsetSurface.C b/src/mesh/extrudeModel/offsetSurface/offsetSurface.C
new file mode 100644
index 0000000000..987f376bfa
--- /dev/null
+++ b/src/mesh/extrudeModel/offsetSurface/offsetSurface.C
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "offsetSurface.H"
+#include "addToRunTimeSelectionTable.H"
+#include "triSurface.H"
+#include "triSurfaceSearch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace extrudeModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(offsetSurface, 0);
+
+addToRunTimeSelectionTable(extrudeModel, offsetSurface, dictionary);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+offsetSurface::offsetSurface(const dictionary& dict)
+:
+    extrudeModel(typeName, dict),
+    project_(coeffDict_.lookupOrDefault("project", false))
+{
+    // Read surface
+    fileName baseName(coeffDict_.lookup("baseSurface"));
+    baseName.expand();
+    baseSurfPtr_.reset(new triSurface(baseName));
+
+    // Construct search engine
+    baseSearchPtr_.reset(new triSurfaceSearch(baseSurfPtr_()));
+
+    // Read offsetted surface
+    fileName offsetName(coeffDict_.lookup("offsetSurface"));
+    offsetName.expand();
+    offsetSurfPtr_.reset(new triSurface(offsetName));
+
+    // Construct search engine
+    offsetSearchPtr_.reset(new triSurfaceSearch(offsetSurfPtr_()));
+
+
+    const triSurface& b = baseSurfPtr_();
+    const triSurface& o = offsetSurfPtr_();
+
+    if
+    (
+        b.size() != o.size()
+     || b.nPoints() != o.nPoints()
+     || b.nEdges() != o.nEdges()
+    )
+    {
+        FatalIOErrorInFunction(dict)
+            << "offsetSurface " << offsetName
+            << " should have exactly the same topology as the baseSurface "
+            << baseName << exit(FatalIOError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+offsetSurface::~offsetSurface()
+{}
+
+
+// * * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * * //
+
+point offsetSurface::operator()
+(
+    const point& surfacePoint,
+    const vector& surfaceNormal,
+    const label layer
+) const
+{
+    if (layer == 0)
+    {
+        return surfacePoint;
+    }
+    else
+    {
+        pointField samples(1, surfacePoint);
+        scalarField nearestDistSqr(1, GREAT);
+        List<pointIndexHit> info;
+        baseSearchPtr_().findNearest(samples, nearestDistSqr, info);
+
+        label triI = info[0].index();
+
+
+        const triSurface& base = baseSurfPtr_();
+        const triPointRef baseTri(base[triI].tri(base.points()));
+
+        List<scalar> bary;
+        baseTri.barycentric(surfacePoint, bary);
+
+        const triSurface& offset = offsetSurfPtr_();
+        const triPointRef offsetTri(offset[triI].tri(offset.points()));
+
+        const point offsetPoint
+        (
+            bary[0]*offsetTri.a()
+           +bary[1]*offsetTri.b()
+           +bary[2]*offsetTri.c()
+        );
+
+        point interpolatedPoint
+        (
+            surfacePoint + sumThickness(layer)*(offsetPoint-surfacePoint)
+        );
+
+
+        //- Either return interpolatedPoint or re-project onto surface (since
+        //  snapping might not have do so exactly)
+
+        if (project_)
+        {
+            // Re-project onto surface
+            offsetSearchPtr_().findNearest
+            (
+                pointField(1, interpolatedPoint),
+                scalarField(1, GREAT),
+                info
+            );
+            return info[0].hitPoint();
+        }
+        else
+        {
+            return interpolatedPoint;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/mesh/extrudeModel/offsetSurface/offsetSurface.H b/src/mesh/extrudeModel/offsetSurface/offsetSurface.H
new file mode 100644
index 0000000000..f5df55cfd8
--- /dev/null
+++ b/src/mesh/extrudeModel/offsetSurface/offsetSurface.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::extrudeModels::offsetSurface
+
+Description
+    Extrudes by interpolating points from one surface to the other. Surfaces
+    have to be topologically identical i.e. one has to be an offsetted version
+    of the other.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef offsetSurface_H
+#define offsetSurface_H
+
+#include "point.H"
+#include "extrudeModel.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class triSurface;
+class triSurfaceSearch;
+
+
+namespace extrudeModels
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class offsetSurface Declaration
+\*---------------------------------------------------------------------------*/
+
+class offsetSurface
+:
+    public extrudeModel
+{
+    // Private data
+
+        //- surface
+        autoPtr<triSurface> baseSurfPtr_;
+
+        //- search engine
+        autoPtr<triSurfaceSearch> baseSearchPtr_;
+
+        //- offsets
+        autoPtr<triSurface> offsetSurfPtr_;
+
+        //- search engine
+        autoPtr<triSurfaceSearch> offsetSearchPtr_;
+
+        // Whether to re-project onto offsetted surface
+        const Switch project_;
+
+public:
+
+    //- Runtime type information
+    TypeName("offsetSurface");
+
+    // Constructors
+
+        //- Construct from dictionary
+        offsetSurface(const dictionary& dict);
+
+
+    //- Destructor
+    virtual ~offsetSurface();
+
+
+    // Member Operators
+
+        //- Return point
+        point operator()
+        (
+            const point& surfacePoint,
+            const vector& surfaceNormal,
+            const label layer
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace extrudeModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.C b/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.C
index 53efd1c100..dfcb24d10e 100644
--- a/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.C
+++ b/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.C
@@ -48,7 +48,7 @@ plane::plane(const dictionary& dict)
 {
     if (nLayers_ != 1)
     {
-        IOWarningIn("plane::plane(const dictionary& dict)", dict)
+        IOWarningInFunction(dict)
             << "Expected nLayers (if specified) to be 1"
             << endl;
         nLayers_ = 1;
diff --git a/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.H b/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.H
index 9fea06cf2c..b832f7e2be 100644
--- a/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.H
+++ b/src/mesh/extrudeModel/planeExtrusion/planeExtrusion.H
@@ -33,8 +33,8 @@ SeeAlso
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef plane_H
-#define plane_H
+#ifndef planeExtrusion_H
+#define planeExtrusion_H
 
 #include "linearNormal.H"
 
diff --git a/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
index bb447806cf..c97caf8250 100644
--- a/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
+++ b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ sigmaRadial::sigmaRadial(const dictionary& dict)
 {
     if (mag(expansionRatio() - 1.0) > SMALL)
     {
-        WarningIn("sigmaRadial::sigmaRadial(const dictionary&)")
+        WarningInFunction
             << "Ignoring expansionRatio setting." << endl;
     }
 }
diff --git a/src/mesh/extrudeModel/wedge/wedge.C b/src/mesh/extrudeModel/wedge/wedge.C
index f29d8145db..a5d139c1b3 100644
--- a/src/mesh/extrudeModel/wedge/wedge.C
+++ b/src/mesh/extrudeModel/wedge/wedge.C
@@ -48,7 +48,7 @@ wedge::wedge(const dictionary& dict)
 {
     if (nLayers_ != 1)
     {
-        IOWarningIn("wedge::wedge(const dictionary& dict)", dict)
+        IOWarningInFunction(dict)
             << "Expected nLayers (if specified) to be 1"
             << endl;
         nLayers_ = 1;
diff --git a/src/meshTools/AABBTree/AABBTree.C b/src/meshTools/AABBTree/AABBTree.C
new file mode 100644
index 0000000000..2a2f4eb43e
--- /dev/null
+++ b/src/meshTools/AABBTree/AABBTree.C
@@ -0,0 +1,531 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "AABBTree.H"
+#include "meshTools.H"
+#include "PackedBoolList.H"
+//#include "OFstream.H"
+
+template<class Type>
+Foam::scalar Foam::AABBTree<Type>::tolerance_ = 1e-4;
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class Type>
+void Foam::AABBTree<Type>::writeOBJ
+(
+    const bool writeLinesOnly,
+    const treeBoundBox& bb,
+    label& vertI,
+    Ostream& os
+) const
+{
+    const pointField pts(bb.points());
+    forAll(pts, i)
+    {
+        meshTools::writeOBJ(os, pts[i]);
+    }
+
+    if (writeLinesOnly)
+    {
+        forAll(bb.edges, i)
+        {
+            const edge& e = bb.edges[i];
+            os  << "l " << e[0] + vertI + 1 << ' ' << e[1] + vertI + 1 << nl;
+        }
+    }
+    else
+    {
+        forAll(bb.faces, i)
+        {
+            const face& f = bb.faces[i];
+
+            os  << 'f';
+            forAll(f, fp)
+            {
+                os  << ' ' << f[fp] + vertI + 1;
+            }
+            os  << nl;
+        }
+    }
+
+    vertI += pts.size();
+}
+
+
+template<class Type>
+void Foam::AABBTree<Type>::writeOBJ
+(
+    const bool leavesOnly,
+    const bool writeLinesOnly,
+    const treeBoundBox& bb,
+    const label nodeI,
+    const List<Pair<treeBoundBox> >& bbs,
+    const List<Pair<label> >& nodes,
+    label& vertI,
+    Ostream& os
+) const
+{
+    if (!leavesOnly || nodeI < 0)
+    {
+        writeOBJ(writeLinesOnly, bb, vertI, os);
+    }
+
+    // recurse to find leaves
+    if (nodeI >= 0)
+    {
+        writeOBJ
+        (
+            leavesOnly,
+            writeLinesOnly,
+            bbs[nodeI].first(),
+            nodes[nodeI].first(),
+            bbs,
+            nodes,
+            vertI,
+            os
+        );
+        writeOBJ
+        (
+            leavesOnly,
+            writeLinesOnly,
+            bbs[nodeI].second(),
+            nodes[nodeI].second(),
+            bbs,
+            nodes,
+            vertI,
+            os
+        );
+    }
+}
+
+
+template<class Type>
+void Foam::AABBTree<Type>::createBoxes
+(
+    const bool equalBinSize,
+    const label level,
+    const List<Type>& objects,
+    const pointField& points,
+    const DynamicList<label>& objectIDs,
+    const treeBoundBox& bb,
+    const label nodeI,
+
+    DynamicList<Pair<treeBoundBox> >& bbs,
+    DynamicList<labelPair>& nodes,
+    DynamicList<labelList>& addressing
+) const
+{
+    const vector span = bb.span();
+
+    // Determine which direction to divide the box
+
+    direction maxDir = 0;
+    scalar maxSpan = span[maxDir];
+    for (label dirI = 1; dirI < 3; dirI++)
+    {
+        if (span[dirI] > maxSpan)
+        {
+            maxSpan = span[dirI];
+            maxDir = dirI;
+        }
+    }
+
+
+    scalar divide;
+
+    if (equalBinSize)
+    {
+        // Pick up points used by this set of objects
+
+        PackedBoolList isUsedPoint(points.size());
+        DynamicList<scalar> component(points.size());
+
+        forAll(objectIDs, i)
+        {
+            const label objI = objectIDs[i];
+            const Type& obj = objects[objI];
+
+            forAll(obj, pI)
+            {
+                const label pointI = obj[pI];
+                if (isUsedPoint.set(pointI))
+                {
+                    component.append(points[pointI][maxDir]);
+                }
+            }
+        }
+
+        // Determine the median
+
+        Foam::sort(component);
+
+        divide = component[component.size()/2];
+    }
+    else
+    {
+        // Geometric middle
+        divide = bb.min()[maxDir] + 0.5*maxSpan;
+    }
+
+
+    scalar divMin = divide + tolerance_*maxSpan;
+    scalar divMax = divide - tolerance_*maxSpan;
+
+
+    // Assign the objects to min or max bin
+
+    DynamicList<label> minBinObjectIDs(objectIDs.size());
+    treeBoundBox minBb(point::max, point::min);
+
+    DynamicList<label> maxBinObjectIDs(objectIDs.size());
+    treeBoundBox maxBb(point::max, point::min);
+
+    forAll(objectIDs, i)
+    {
+        const label objI = objectIDs[i];
+        const Type& obj = objects[objI];
+
+        bool intoMin = false;
+        bool intoMax = false;
+
+        forAll(obj, pI)
+        {
+            const label pointI = obj[pI];
+            const point& pt = points[pointI];
+            if (pt[maxDir] < divMin)
+            {
+                intoMin = true;
+            }
+            if (pt[maxDir] > divMax)
+            {
+                intoMax = true;
+            }
+        }
+
+
+        if (intoMin)
+        {
+            minBinObjectIDs.append(objI);
+            const boundBox objBb(points, obj, false);
+            minBb.min() = min(minBb.min(), objBb.min());
+            minBb.max() = max(minBb.max(), objBb.max());
+        }
+        if (intoMax)
+        {
+            maxBinObjectIDs.append(objI);
+            const boundBox objBb(points, obj, false);
+            maxBb.min() = min(maxBb.min(), objBb.min());
+            maxBb.max() = max(maxBb.max(), objBb.max());
+        }
+    }
+
+    // inflate box in case geometry reduces to 2-D
+    if (minBinObjectIDs.size())
+    {
+        minBb.inflate(0.01);
+    }
+    if (maxBinObjectIDs.size())
+    {
+        maxBb.inflate(0.01);
+    }
+
+    minBinObjectIDs.shrink();
+    maxBinObjectIDs.shrink();
+
+
+    label minI;
+    if (minBinObjectIDs.size() > minLeafSize_ && level < maxLevel_)
+    {
+        // new leaf
+        minI = nodes.size();
+        nodes.append(labelPair(-1, -1));
+    }
+    else
+    {
+        // update existing leaf
+        minI = -addressing.size() - 1;
+        addressing.append(minBinObjectIDs);
+    }
+
+    label maxI;
+    if (maxBinObjectIDs.size() > minLeafSize_ && level < maxLevel_)
+    {
+        // new leaf
+        maxI = nodes.size();
+        nodes.append(labelPair(-1, -1));
+    }
+    else
+    {
+        // update existing leaf
+        maxI = -addressing.size() - 1;
+        addressing.append(maxBinObjectIDs);
+    }
+
+    nodes(nodeI) = labelPair(minI, maxI);
+    bbs(nodeI) = Pair<treeBoundBox>(minBb, maxBb);
+
+    // recurse
+    if (minI >= 0)
+    {
+        createBoxes
+        (
+            equalBinSize,
+            level + 1,
+            objects,
+            points,
+            minBinObjectIDs,
+            minBb,
+            minI,
+            bbs,
+            nodes,
+            addressing
+        );
+    }
+    if (maxI >= 0)
+    {
+        createBoxes
+        (
+            equalBinSize,
+            level + 1,
+            objects,
+            points,
+            maxBinObjectIDs,
+            maxBb,
+            maxI,
+            bbs,
+            nodes,
+            addressing
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::AABBTree<Type>::AABBTree()
+:
+    maxLevel_(0),
+    minLeafSize_(0),
+    boundBoxes_(),
+    addressing_()
+{}
+
+
+template<class Type>
+Foam::AABBTree<Type>::AABBTree
+(
+    const UList<Type>& objects,
+    const pointField& points,
+    const bool equalBinSize,
+    const label maxLevel,
+    const label minLeafSize
+)
+:
+    maxLevel_(maxLevel),
+    minLeafSize_(minLeafSize),
+    boundBoxes_(),
+    addressing_()
+{
+    if (objects.empty())
+    {
+        return;
+    }
+
+
+    DynamicList<Pair<treeBoundBox> > bbs(maxLevel);
+    DynamicList<labelPair> nodes(maxLevel);
+    DynamicList<labelList> addr(maxLevel);
+
+    nodes.append(labelPair(-1, -1));
+    treeBoundBox topBb(points);
+    topBb.inflate(0.01);
+
+    DynamicList<label> objectIDs(identity(objects.size()));
+
+    createBoxes
+    (
+        equalBinSize,
+        0,          // starting at top level
+        objects,
+        points,
+        objectIDs,
+        topBb,
+        0,          // starting node
+
+        bbs,
+        nodes,
+        addr
+    );
+
+
+    //{
+    //    OFstream os("tree.obj");
+    //    label vertI = 0;
+    //    writeOBJ
+    //    (
+    //        true,       // leavesOnly
+    //        false,      // writeLinesOnly
+    //
+    //        topBb,
+    //        0,
+    //        bbs,
+    //        nodes,
+    //        vertI,
+    //        os
+    //    );
+    //}
+
+
+    // transfer flattened tree to persistent storage
+    DynamicList<treeBoundBox> boundBoxes(2*bbs.size());
+    DynamicList<labelList> addressing(2*addr.size());
+    forAll(nodes, nodeI)
+    {
+        if (nodes[nodeI].first() < 0)
+        {
+            boundBoxes.append(bbs[nodeI].first());
+            addressing.append(addr[nodeI + 1]);
+        }
+        if (nodes[nodeI].second() < 0)
+        {
+            boundBoxes.append(bbs[nodeI].second());
+            addressing.append(addr[nodeI + 1]);
+        }
+    }
+
+    boundBoxes_.transfer(boundBoxes);
+    addressing_.transfer(addressing);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+const Foam::List<Foam::treeBoundBox>& Foam::AABBTree<Type>::boundBoxes() const
+{
+    return boundBoxes_;
+}
+
+
+template<class Type>
+const Foam::List<Foam::labelList>& Foam::AABBTree<Type>::addressing() const
+{
+    return addressing_;
+}
+
+
+template<class Type>
+bool Foam::AABBTree<Type>::pointInside(const point& pt) const
+{
+    forAll(boundBoxes_, i)
+    {
+        const treeBoundBox& bb = boundBoxes_[i];
+
+        if (bb.contains(pt))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+template<class Type>
+bool Foam::AABBTree<Type>::overlaps(const boundBox& bbIn) const
+{
+    forAll(boundBoxes_, i)
+    {
+        const treeBoundBox& bb = boundBoxes_[i];
+
+        if (bb.overlaps(bbIn))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+// * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<(Ostream& os, const AABBTree<Type>& tree)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << tree.maxLevel_ << token::SPACE
+            << tree.minLeafSize_ << token::SPACE
+            << tree.boundBoxes_ << token::SPACE
+            << tree.addressing_ << token::SPACE;
+    }
+    else
+    {
+        os.write
+        (
+            reinterpret_cast<const char*>(&tree.maxLevel_),
+            sizeof(tree.maxLevel_)
+          + sizeof(tree.minLeafSize_)
+        );
+        os  << tree.boundBoxes_
+            << tree.addressing_;
+    }
+
+    os.check("Ostream& operator<<(Ostream&, const AABBTree<Type>&)");
+    return os;
+}
+
+
+template<class Type>
+Foam::Istream& Foam::operator>>(Istream& is, AABBTree<Type>& tree)
+{
+    if (is.format() == IOstream::ASCII)
+    {
+        is  >> tree.maxLevel_
+            >> tree.minLeafSize_
+            >> tree.boundBoxes_
+            >> tree.addressing_;
+    }
+    else
+    {
+        is.read
+        (
+            reinterpret_cast<char*>(&tree.maxLevel_),
+            sizeof(tree.maxLevel_)
+          + sizeof(tree.minLeafSize_)
+        );
+        is  >> tree.boundBoxes_
+            >> tree.addressing_;
+    }
+
+    is.check("Istream& operator>>(Istream&, AABBTree<Type>&)");
+    return is;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/AABBTree/AABBTree.H b/src/meshTools/AABBTree/AABBTree.H
new file mode 100644
index 0000000000..b06c63af7f
--- /dev/null
+++ b/src/meshTools/AABBTree/AABBTree.H
@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::AABBTree
+
+Description
+    Templated tree of axis-aligned bounding boxes (AABB)
+
+    Designed to be templated on either faces or cells, the AABBTree will
+    decompose the input into a tree of AABB's.  The maximum number of tree
+    levels and minimum number of objects per leaf are provided on construction,
+    and the contents (addressing) is stored.
+
+SourceFiles
+    AABBTree.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef AABBTree_H
+#define AABBTree_H
+
+#include "labelList.H"
+#include "labelPair.H"
+#include "DynamicList.H"
+#include "pointField.H"
+#include "treeBoundBox.H"
+#include "Ostream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class Type>
+class AABBTree;
+
+template<class Type>
+Istream& operator>>(Istream&, AABBTree<Type>&);
+
+template<class Type>
+Ostream& operator<<(Ostream&, const AABBTree<Type>&);
+
+/*---------------------------------------------------------------------------*\
+                          Class AABBTree Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class AABBTree
+{
+
+protected:
+
+    // Protected Data
+
+        //- Tolerance
+        static scalar tolerance_;
+
+        //- Maximum tree level
+        label maxLevel_;
+
+        //- Minimum points per leaf
+        label minLeafSize_;
+
+        //- Bounding boxes making up the tree
+        List<treeBoundBox> boundBoxes_;
+
+        //- Leaf adressing
+        List<labelList> addressing_;
+
+
+    // Protected Member Functions
+
+        //- Write OBJ file of bounding box
+        void writeOBJ
+        (
+            const bool writeLinesOnly,
+            const treeBoundBox& bb,
+            label& vertI,
+            Ostream& os
+        ) const;
+
+        //- Write OBJ for all bounding boxes
+        void writeOBJ
+        (
+            const bool leavesOnly,
+            const bool writeLinesOnly,
+            const treeBoundBox& bb,
+            const label nodeI,
+            const List<Pair<treeBoundBox> >& bbs,
+            const List<Pair<label> >& nodes,
+            label& vertI,
+            Ostream& os
+        ) const;
+
+        //- Create the bounding boxes by interrogating points
+        void createBoxes
+        (
+            const bool equalBinSize,
+            const label level,
+            const List<Type>& objects,
+            const pointField& points,
+            const DynamicList<label>& objectIDs,
+            const treeBoundBox& bb,
+            const label nodeI,
+
+            DynamicList<Pair<treeBoundBox> >& bbs,
+            DynamicList<labelPair>& nodes,
+            DynamicList<labelList>& addressing
+        ) const;
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        AABBTree();
+
+        //- Construct from components
+        //  equalBinSize: divide into equal number of elements or
+        //                equal span
+        AABBTree
+        (
+            const UList<Type>& objects,
+            const pointField& points,
+            const bool equalBinSize = true,
+            const label maxLevel = 3,
+            const label minBinSize = 100
+        );
+
+
+    // Public Member Functions
+
+        // Access
+
+            //- Return the bounding boxes making up the tree
+            const List<treeBoundBox>& boundBoxes() const;
+
+            //- Return the contents addressing
+            const List<labelList>& addressing() const;
+
+
+        // Evaluation
+
+            //- Determine whether a point is inside the bounding boxes
+            bool pointInside(const point& pt) const;
+
+            //- Determine whether a bounding box overlaps the tree bounding
+            //  boxes
+            bool overlaps(const boundBox& bbIn) const;
+
+
+    // IOstream operators
+
+        friend Istream& operator>> <Type>(Istream&, AABBTree&);
+        friend Ostream& operator<< <Type>(Ostream&, const AABBTree&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "AABBTree.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 70372fc724..1fa157adf4 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,7 @@ License
 #include "AMIMethod.H"
 #include "meshTools.H"
 #include "mapDistribute.H"
+#include "flipOp.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -63,15 +64,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolationMethodToWord
         }
         default:
         {
-            FatalErrorIn
-            (
-                "const Foam::word"
-                "Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
-                "interpolationMethodToWord"
-                "("
-                    "const interpolationMethod&"
-                ")"
-            )
+            FatalErrorInFunction
                 << "Unhandled interpolationMethod enumeration " << method
                 << abort(FatalError);
         }
@@ -121,16 +114,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::wordTointerpolationMethod
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
-            "interpolationMethod"
-            "Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
-            "wordTointerpolationMethod"
-            "("
-                "const word&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Invalid interpolationMethod " << im
             << ".  Valid methods are:" << methods
             << exit(FatalError);
@@ -176,15 +160,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::projectPointsToSurface
 
     if (nMiss > 0)
     {
-        FatalErrorIn
-        (
-            "void Foam::AMIInterpolation<SourcePatch, TargetPatch>::"
-            "projectPointsToSurface"
-            "("
-                "const searchableSurface&, "
-                "pointField&"
-            ") const"
-        )
+        FatalErrorInFunction
             << "Error projecting points to surface: "
             << nMiss << " faces could not be determined"
             << abort(FatalError);
@@ -326,9 +302,30 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
 
         // So now we have agglomeration of the target side in
         // allRestrict:
-        //  0..size-1 : local agglomeration (= targetRestrictAddressing)
+        //  0..size-1 : local agglomeration (= targetRestrictAddressing
+        //              (but potentially permutated))
         //  size..    : agglomeration data from other processors
 
+
+        // The trickiness in this algorithm is finding out the compaction
+        // of the remote data (i.e. allocation of the coarse 'slots'). We could
+        // either send across the slot compaction maps or just make sure
+        // that we allocate the slots in exactly the same order on both sending
+        // and receiving side (e.g. if the submap is set up to send 4 items,
+        // the constructMap is also set up to receive 4 items.
+
+
+        // Short note about the various types of indices:
+        // - face indices : indices into the geometry.
+        // - coarse face indices : how the faces get agglomerated
+        // - transferred data : how mapDistribute sends/receives data,
+        // - slots : indices into data after distribution (e.g. stencil,
+        //           srcAddress/tgtAddress). Note: for fully local addressing
+        //           the slots are equal to face indices.
+        // A mapDistribute has:
+        // - a subMap : these are face indices
+        // - a constructMap : these are from 'transferred-date' to slots
+
         labelListList tgtSubMap(Pstream::nProcs());
 
         // Local subMap is just identity
@@ -340,11 +337,17 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
         {
             if (procI != Pstream::myProcNo())
             {
-                // Combine entries that point to the same coarse element. All
-                // the elements refer to local data so index into
-                // targetRestrictAddressing or allRestrict (since the same
-                // for local data).
+                // Combine entries that point to the same coarse element.
+                // The important bit is to loop over the data (and hand out
+                // compact indices ) in 'transferred data' order. This
+                // guarantees that we're doing exactly the
+                // same on sending and receiving side - e.g. the fourth element
+                // in the subMap is the fourth element received in the
+                // constructMap
+
                 const labelList& elems = map.subMap()[procI];
+                const labelList& elemsMap =
+                    map.constructMap()[Pstream::myProcNo()];
                 labelList& newSubMap = tgtSubMap[procI];
                 newSubMap.setSize(elems.size());
 
@@ -353,7 +356,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
 
                 forAll(elems, i)
                 {
-                    label fineElem = elems[i];
+                    label fineElem = elemsMap[elems[i]];
                     label coarseElem = allRestrict[fineElem];
                     if (oldToNew[coarseElem] == -1)
                     {
@@ -371,16 +374,31 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
         // the sending map
 
         labelListList tgtConstructMap(Pstream::nProcs());
-        labelList tgtCompactMap;
 
         // Local constructMap is just identity
         {
             tgtConstructMap[Pstream::myProcNo()] =
                 identity(targetCoarseSize);
-
-            tgtCompactMap = targetRestrictAddressing;
         }
-        tgtCompactMap.setSize(map.constructSize());
+
+        labelList tgtCompactMap(map.constructSize());
+
+        {
+            // Note that in special cases (e.g. 'appending' two AMIs) the
+            // local size after distributing can be longer than the number
+            // of faces. I.e. it duplicates elements.
+            // Since we don't know this size instead we loop over all
+            // reachable elements (using the local constructMap)
+
+            const labelList& elemsMap = map.constructMap()[Pstream::myProcNo()];
+            forAll(elemsMap, i)
+            {
+                label fineElem = elemsMap[i];
+                label coarseElem = allRestrict[fineElem];
+                tgtCompactMap[fineElem] = coarseElem;
+            }
+        }
+
         label compactI = targetCoarseSize;
 
         // Compact data from other processors
@@ -439,7 +457,6 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
             }
         }
 
-
         srcAddress.setSize(sourceCoarseSize);
         srcWeights.setSize(sourceCoarseSize);
 
@@ -492,7 +509,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::agglomerate
         forAll(fineSrcAddress, faceI)
         {
             // All the elements contributing to faceI. Are slots in
-            // mapDistribute'd data.
+            // target data.
             const labelList& elems = fineSrcAddress[faceI];
             const scalarList& weights = fineSrcWeights[faceI];
             const scalar fineArea = fineSrcMagSf[faceI];
@@ -604,7 +621,6 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::constructFromSurface
     }
 }
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class SourcePatch, class TargetPatch>
@@ -786,15 +802,8 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
      || fineAMI.tgtAddress().size() != targetRestrictAddressing.size()
     )
     {
-        FatalErrorIn
-        (
-            "AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation"
-            "("
-                "const AMIInterpolation<SourcePatch, TargetPatch>&, "
-                "const labelList&, "
-                "const labelList&"
-            ")"
-        )   << "Size mismatch." << nl
+        FatalErrorInFunction
+            << "Size mismatch." << nl
             << "Source patch size:" << fineAMI.srcAddress().size() << nl
             << "Source agglomeration size:"
             << sourceRestrictAddressing.size() << nl
@@ -965,7 +974,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
                 tgtMagSf_,
                 triMode_,
                 reverseTarget_,
-                requireMatch_
+                requireMatch_ && (lowWeightCorrection_ < 0)
             )
         );
 
@@ -1010,53 +1019,38 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
         // send data back to originating procs. Note that contributions
         // from different processors get added (ListAppendEqOp)
 
-        mapDistribute::distribute
+        mapDistributeBase::distribute
         (
             Pstream::nonBlocking,
             List<labelPair>(),
             tgtPatch.size(),
             map.constructMap(),
+            false,                      // has flip
             map.subMap(),
+            false,                      // has flip
             tgtAddress_,
             ListAppendEqOp<label>(),
+            flipOp(),                   // flip operation
             labelList()
         );
 
-        mapDistribute::distribute
+        mapDistributeBase::distribute
         (
             Pstream::nonBlocking,
             List<labelPair>(),
             tgtPatch.size(),
             map.constructMap(),
+            false,
             map.subMap(),
+            false,
             tgtWeights_,
             ListAppendEqOp<scalar>(),
+            flipOp(),
             scalarList()
         );
 
         // weights normalisation
-        normaliseWeights
-        (
-            srcMagSf_,
-            "source",
-            srcAddress_,
-            srcWeights_,
-            srcWeightsSum_,
-            AMIPtr->conformal(),
-            true,
-            lowWeightCorrection_
-        );
-        normaliseWeights
-        (
-            tgtMagSf_,
-            "target",
-            tgtAddress_,
-            tgtWeights_,
-            tgtWeightsSum_,
-            AMIPtr->conformal(),
-            true,
-            lowWeightCorrection_
-        );
+        normaliseWeights(AMIPtr->conformal(), true);
 
         // cache maps and reset addresses
         List<Map<label> > cMap;
@@ -1082,7 +1076,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
                 tgtMagSf_,
                 triMode_,
                 reverseTarget_,
-                requireMatch_
+                requireMatch_ && (lowWeightCorrection_ < 0)
             )
         );
 
@@ -1094,28 +1088,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
             tgtWeights_
         );
 
-        normaliseWeights
-        (
-            srcMagSf_,
-            "source",
-            srcAddress_,
-            srcWeights_,
-            srcWeightsSum_,
-            AMIPtr->conformal(),
-            true,
-            lowWeightCorrection_
-        );
-        normaliseWeights
-        (
-            tgtMagSf_,
-            "target",
-            tgtAddress_,
-            tgtWeights_,
-            tgtWeightsSum_,
-            AMIPtr->conformal(),
-            true,
-            lowWeightCorrection_
-        );
+        normaliseWeights(AMIPtr->conformal(), true);
     }
 
     if (debug)
@@ -1131,6 +1104,217 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
 }
 
 
+template<class SourcePatch, class TargetPatch>
+void Foam::AMIInterpolation<SourcePatch, TargetPatch>::append
+(
+    const SourcePatch& srcPatch,
+    const TargetPatch& tgtPatch
+)
+{
+    // Create a new interpolation
+    autoPtr<AMIInterpolation<SourcePatch, TargetPatch> > newPtr
+    (
+        new AMIInterpolation<SourcePatch, TargetPatch>
+        (
+            srcPatch,
+            tgtPatch,
+            triMode_,
+            requireMatch_,
+            methodName_,
+            lowWeightCorrection_,
+            reverseTarget_
+        )
+    );
+
+    // If parallel then combine the mapDistribution and re-index
+    if (singlePatchProc_ == -1)
+    {
+        labelListList& srcSubMap = srcMapPtr_->subMap();
+        labelListList& srcConstructMap = srcMapPtr_->constructMap();
+
+        labelListList& tgtSubMap = tgtMapPtr_->subMap();
+        labelListList& tgtConstructMap = tgtMapPtr_->constructMap();
+
+        labelListList& newSrcSubMap = newPtr->srcMapPtr_->subMap();
+        labelListList& newSrcConstructMap = newPtr->srcMapPtr_->constructMap();
+
+        labelListList& newTgtSubMap = newPtr->tgtMapPtr_->subMap();
+        labelListList& newTgtConstructMap = newPtr->tgtMapPtr_->constructMap();
+
+        // Re-calculate the source indices
+        {
+            labelList mapMap(0), newMapMap(0);
+            forAll(srcSubMap, procI)
+            {
+                mapMap.append
+                (
+                    identity(srcConstructMap[procI].size())
+                  + mapMap.size() + newMapMap.size()
+                );
+                newMapMap.append
+                (
+                    identity(newSrcConstructMap[procI].size())
+                  + mapMap.size() + newMapMap.size()
+                );
+            }
+
+            forAll(srcSubMap, procI)
+            {
+                forAll(srcConstructMap[procI], srcI)
+                {
+                    srcConstructMap[procI][srcI] =
+                        mapMap[srcConstructMap[procI][srcI]];
+                }
+            }
+
+            forAll(srcSubMap, procI)
+            {
+                forAll(newSrcConstructMap[procI], srcI)
+                {
+                    newSrcConstructMap[procI][srcI] =
+                        newMapMap[newSrcConstructMap[procI][srcI]];
+                }
+            }
+
+            forAll(tgtAddress_, tgtI)
+            {
+                forAll(tgtAddress_[tgtI], tgtJ)
+                {
+                    tgtAddress_[tgtI][tgtJ] =
+                        mapMap[tgtAddress_[tgtI][tgtJ]];
+                }
+            }
+
+            forAll(newPtr->tgtAddress_, tgtI)
+            {
+                forAll(newPtr->tgtAddress_[tgtI], tgtJ)
+                {
+                    newPtr->tgtAddress_[tgtI][tgtJ] =
+                        newMapMap[newPtr->tgtAddress_[tgtI][tgtJ]];
+                }
+            }
+        }
+
+        // Re-calculate the target indices
+        {
+            labelList mapMap(0), newMapMap(0);
+            forAll(srcSubMap, procI)
+            {
+                mapMap.append
+                (
+                    identity(tgtConstructMap[procI].size())
+                  + mapMap.size() + newMapMap.size()
+                );
+                newMapMap.append
+                (
+                    identity(newTgtConstructMap[procI].size())
+                  + mapMap.size() + newMapMap.size()
+                );
+            }
+
+            forAll(srcSubMap, procI)
+            {
+                forAll(tgtConstructMap[procI], tgtI)
+                {
+                    tgtConstructMap[procI][tgtI] =
+                        mapMap[tgtConstructMap[procI][tgtI]];
+                }
+            }
+
+            forAll(srcSubMap, procI)
+            {
+                forAll(newTgtConstructMap[procI], tgtI)
+                {
+                    newTgtConstructMap[procI][tgtI] =
+                        newMapMap[newTgtConstructMap[procI][tgtI]];
+                }
+            }
+
+            forAll(srcAddress_, srcI)
+            {
+                forAll(srcAddress_[srcI], srcJ)
+                {
+                    srcAddress_[srcI][srcJ] =
+                        mapMap[srcAddress_[srcI][srcJ]];
+                }
+            }
+
+            forAll(newPtr->srcAddress_, srcI)
+            {
+                forAll(newPtr->srcAddress_[srcI], srcJ)
+                {
+                    newPtr->srcAddress_[srcI][srcJ] =
+                        newMapMap[newPtr->srcAddress_[srcI][srcJ]];
+                }
+            }
+        }
+
+        // Sum the construction sizes
+        srcMapPtr_->constructSize() += newPtr->srcMapPtr_->constructSize();
+        tgtMapPtr_->constructSize() += newPtr->tgtMapPtr_->constructSize();
+
+        // Combine the maps
+        forAll(srcSubMap, procI)
+        {
+            srcSubMap[procI].append(newSrcSubMap[procI]);
+            srcConstructMap[procI].append(newSrcConstructMap[procI]);
+
+            tgtSubMap[procI].append(newTgtSubMap[procI]);
+            tgtConstructMap[procI].append(newTgtConstructMap[procI]);
+        }
+    }
+
+    // Combine new and current source data
+    forAll(srcMagSf_, srcFaceI)
+    {
+        srcAddress_[srcFaceI].append(newPtr->srcAddress()[srcFaceI]);
+        srcWeights_[srcFaceI].append(newPtr->srcWeights()[srcFaceI]);
+        srcWeightsSum_[srcFaceI] += newPtr->srcWeightsSum()[srcFaceI];
+    }
+
+    // Combine new and current target data
+    forAll(tgtMagSf_, tgtFaceI)
+    {
+        tgtAddress_[tgtFaceI].append(newPtr->tgtAddress()[tgtFaceI]);
+        tgtWeights_[tgtFaceI].append(newPtr->tgtWeights()[tgtFaceI]);
+        tgtWeightsSum_[tgtFaceI] += newPtr->tgtWeightsSum()[tgtFaceI];
+    }
+}
+
+
+template<class SourcePatch, class TargetPatch>
+void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
+(
+    const bool conformal,
+    const bool output
+)
+{
+    normaliseWeights
+    (
+        srcMagSf_,
+        "source",
+        srcAddress_,
+        srcWeights_,
+        srcWeightsSum_,
+        conformal,
+        output,
+        lowWeightCorrection_
+    );
+
+    normaliseWeights
+    (
+        tgtMagSf_,
+        "target",
+        tgtAddress_,
+        tgtWeights_,
+        tgtWeightsSum_,
+        conformal,
+        output,
+        lowWeightCorrection_
+    );
+}
+
+
 template<class SourcePatch, class TargetPatch>
 template<class Type, class CombineOp>
 void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
@@ -1143,16 +1327,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
 {
     if (fld.size() != srcAddress_.size())
     {
-        FatalErrorIn
-        (
-            "AMIInterpolation::interpolateToTarget"
-            "("
-                "const UList<Type>&, "
-                "const CombineOp&, "
-                "List<Type>&, "
-                "const UList<Type>&"
-            ") const"
-        )   << "Supplied field size is not equal to source patch size" << nl
+        FatalErrorInFunction
+            << "Supplied field size is not equal to source patch size" << nl
             << "    source patch   = " << srcAddress_.size() << nl
             << "    target patch   = " << tgtAddress_.size() << nl
             << "    supplied field = " << fld.size()
@@ -1163,16 +1339,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
     {
         if (defaultValues.size() != tgtAddress_.size())
         {
-            FatalErrorIn
-            (
-                "AMIInterpolation::interpolateToTarget"
-                "("
-                    "const UList<Type>&, "
-                    "const CombineOp&, "
-                    "List<Type>&, "
-                    "const UList<Type>&"
-                ") const"
-            )   << "Employing default values when sum of weights falls below "
+            FatalErrorInFunction
+                << "Employing default values when sum of weights falls below "
                 << lowWeightCorrection_
                 << " but supplied default field size is not equal to target "
                 << "patch size" << nl
@@ -1244,16 +1412,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
 {
     if (fld.size() != tgtAddress_.size())
     {
-        FatalErrorIn
-        (
-            "AMIInterpolation::interpolateToSource"
-            "("
-                "const UList<Type>&, "
-                "const CombineOp&, "
-                "List<Type>&, "
-                "const UList<Type>&"
-            ") const"
-        )   << "Supplied field size is not equal to target patch size" << nl
+        FatalErrorInFunction
+            << "Supplied field size is not equal to target patch size" << nl
             << "    source patch   = " << srcAddress_.size() << nl
             << "    target patch   = " << tgtAddress_.size() << nl
             << "    supplied field = " << fld.size()
@@ -1264,16 +1424,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
     {
         if (defaultValues.size() != srcAddress_.size())
         {
-            FatalErrorIn
-            (
-                "AMIInterpolation::interpolateToSource"
-                "("
-                    "const UList<Type>&, "
-                    "const CombineOp&, "
-                    "List<Type>&, "
-                    "const UList<Type>&"
-                ") const"
-            )   << "Employing default values when sum of weights falls below "
+            FatalErrorInFunction
+                << "Employing default values when sum of weights falls below "
                 << lowWeightCorrection_
                 << " but supplied default field size is not equal to target "
                 << "patch size" << nl
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index 27d077f126..67205b69a7 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -418,6 +418,16 @@ public:
                 const TargetPatch& tgtPatch
             );
 
+            //- Append additional addressing and weights
+            void append
+            (
+                const SourcePatch& srcPatch,
+                const TargetPatch& tgtPatch
+            );
+
+            //- Normalise the weights
+            void normaliseWeights(const bool conformal, const bool output);
+
 
         // Evaluation
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
index 5abe0778eb..b5db99c36f 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 #include "AMIInterpolation.H"
 #include "mergePoints.H"
 #include "mapDistribute.H"
+#include "AABBTree.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -97,11 +98,11 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcOverlappingProcs
 
     forAll(procBb, procI)
     {
-        const List<treeBoundBox>& bbs = procBb[procI];
+        const treeBoundBoxList& bbp = procBb[procI];
 
-        forAll(bbs, bbI)
+        forAll(bbp, bbI)
         {
-            if (bbs[bbI].overlaps(bb))
+            if (bbp[bbI].overlaps(bb))
             {
                 overlaps[procI] = true;
                 nOverlaps++;
@@ -109,6 +110,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcOverlappingProcs
             }
         }
     }
+
     return nOverlaps;
 }
 
@@ -338,33 +340,22 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcProcMap
 
     if (srcPatch.size())
     {
-        procBb[Pstream::myProcNo()] = treeBoundBoxList
-        (
-            1,  // For now single bounding box per proc
-            treeBoundBox
+        procBb[Pstream::myProcNo()] =
+            AABBTree<face>
             (
-                srcPatch.points(),
-                srcPatch.meshPoints()
-            )
-        );
+                srcPatch.localFaces(),
+                srcPatch.localPoints(),
+                false
+            ).boundBoxes();
     }
     else
     {
         procBb[Pstream::myProcNo()] = treeBoundBoxList();
     }
 
-    // slightly increase size of bounding boxes to allow for cases where
-    // bounding boxes are perfectly alligned
-    forAll(procBb[Pstream::myProcNo()], bbI)
-    {
-        treeBoundBox& bb = procBb[Pstream::myProcNo()][bbI];
-        bb.inflate(0.01);
-    }
-
     Pstream::gatherList(procBb);
     Pstream::scatterList(procBb);
 
-
     if (debug)
     {
         Info<< "Determining extent of srcPatch per processor:" << nl
@@ -375,7 +366,6 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcProcMap
         }
     }
 
-
     // Determine which faces of tgtPatch overlaps srcPatch per proc
     const faceList& faces = tgtPatch.localFaces();
     const pointField& points = tgtPatch.localPoints();
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
index 292d816732..fc8ecfb146 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ void Foam::AMIMethod<SourcePatch, TargetPatch>::checkPatches() const
 
         if (!bbTgtInf.contains(bbSrc))
         {
-            WarningIn("AMIMethod<SourcePatch, TargetPatch>::checkPatches()")
+            WarningInFunction
                 << "Source and target patch bounding boxes are not similar"
                 << nl
                 << "    source box span     : " << bbSrc.span() << nl
@@ -94,18 +94,7 @@ bool Foam::AMIMethod<SourcePatch, TargetPatch>::initialise
     }
     else if (!tgtPatch_.size())
     {
-        WarningIn
-        (
-            "void Foam::AMIMethod<SourcePatch, TargetPatch>::initialise"
-            "("
-                "labelListList&, "
-                "scalarListList&, "
-                "labelListList&, "
-                "scalarListList&, "
-                "label&, "
-                "label&"
-            ")"
-        )
+        WarningInFunction
             << srcPatch_.size() << " source faces but no target faces" << endl;
 
         return false;
@@ -135,18 +124,8 @@ bool Foam::AMIMethod<SourcePatch, TargetPatch>::initialise
         {
             if (requireMatch_)
             {
-                FatalErrorIn
-                (
-                    "void Foam::AMIMethod<SourcePatch, TargetPatch>::initialise"
-                    "("
-                        "labelListList&, "
-                        "scalarListList&, "
-                        "labelListList&, "
-                        "scalarListList&, "
-                        "label&, "
-                        "label&"
-                    ")"
-                )   << "Unable to find initial target face"
+                FatalErrorInFunction
+                    << "Unable to find initial target face"
                     << abort(FatalError);
             }
 
@@ -221,7 +200,7 @@ void Foam::AMIMethod<SourcePatch, TargetPatch>::resetTree()
     // Clear the old octree
     treePtr_.clear();
 
-    treeBoundBox bb(tgtPatch_.points());
+    treeBoundBox bb(tgtPatch_.points(), tgtPatch_.meshPoints());
     bb.inflate(0.01);
 
     if (!treePtr_.valid())
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
index d06294d583..3d1463305c 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,20 +49,8 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
 
     if (cstrIter == componentsConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "AMIMethod<SourcePatch, TargetPatch>::New"
-            "("
-                "const word&, "
-                "const SourcePatch&, "
-                "const TargetPatch&, "
-                "const scalarField&, "
-                "const scalarField&, "
-                "const faceAreaIntersect::triangulationMode&, "
-                "const bool, "
-                "const bool"
-            ")"
-        )   << "Unknown AMIMethod type "
+        FatalErrorInFunction
+            << "Unknown AMIMethod type "
             << methodName << nl << nl
             << "Valid AMIMethod types are:" << nl
             << componentsConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
index b63e0f7ae0..9bf160f181 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -310,16 +310,14 @@ void Foam::directAMI<SourcePatch, TargetPatch>::calculate
     forAll(srcAddr, i)
     {
         scalar magSf = this->srcMagSf_[i];
-//        srcWeights[i] = scalarList(srcAddr[i].size(), magSf);
-        srcWeights[i] = scalarList(1, magSf);
         srcAddress[i].transfer(srcAddr[i]);
+        srcWeights[i] = scalarList(1, magSf);
     }
     forAll(tgtAddr, i)
     {
         scalar magSf = this->tgtMagSf_[i];
-//        tgtWeights[i] = scalarList(tgtAddr[i].size(), magSf);
-        tgtWeights[i] = scalarList(1, magSf);
         tgtAddress[i].transfer(tgtAddr[i]);
+        tgtWeights[i] = scalarList(1, magSf);
     }
 }
 
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
index d9cfb8402a..da5c84ac97 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -284,20 +284,8 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::setNextFaces
 
         if (errorOnNotFound)
         {
-            FatalErrorIn
-            (
-                "void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::"
-                "setNextFaces"
-                "("
-                    "label&, "
-                    "label&, "
-                    "label&, "
-                    "const boolList&, "
-                    "labelList&, "
-                    "const DynamicList<label>&, "
-                    "bool"
-                ") const"
-            )  << "Unable to set source and target faces" << abort(FatalError);
+            FatalErrorInFunction
+               << "Unable to set source and target faces" << abort(FatalError);
         }
     }
 }
@@ -348,15 +336,8 @@ Foam::scalar Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::interArea
     }
     else
     {
-        WarningIn
-        (
-            "void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::"
-            "interArea"
-            "("
-                "const label, "
-                "const label"
-            ") const"
-        )   << "Invalid normal for source face " << srcFaceI
+        WarningInFunction
+            << "Invalid normal for source face " << srcFaceI
             << " points " << UIndirectList<point>(srcPoints, src)
             << " target face " << tgtFaceI
             << " points " << UIndirectList<point>(tgtPoints, tgt)
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
index 4f4f8e5a99..0efaf241f4 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,17 +108,7 @@ void Foam::mapNearestAMI<SourcePatch, TargetPatch>::setNextNearestFaces
             {
                 const vectorField& srcCf = this->srcPatch_.faceCentres();
 
-                FatalErrorIn
-                (
-                    "void Foam::mapNearestAMI<SourcePatch, TargetPatch>::"
-                    "setNextNearestFaces"
-                    "("
-                        "boolList&, "
-                        "label&, "
-                        "label&, "
-                        "label&"
-                    ") const"
-                )
+                FatalErrorInFunction
                     << "Unable to find target face for source face "
                     << srcFaceI << " with face centre " << srcCf[srcFaceI]
                     << abort(FatalError);
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
index 3bf7bb3410..08d9b114c1 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,10 +155,7 @@ public:
             {
                 //TBD. How to serialise the AMI such that we can stream
                 // cyclicACMIGAMGInterface.
-                notImplemented
-                (
-                    "cyclicACMIGAMGInterface::write(Ostream&) const"
-                );
+                NotImplemented;
             }
 };
 
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
index c05773af1c..6cc7600cac 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ public:
             {
                 //TBD. How to serialise the AMI such that we can stream
                 // cyclicAMIGAMGInterface.
-                notImplemented("cyclicAMIGAMGInterface::write(Ostream&) const");
+                NotImplemented;
             }
 };
 
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
index 45d1eb515b..617a85a0a0 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -355,16 +355,8 @@ Foam::scalar Foam::faceAreaIntersect::calc
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Foam::scalar Foam::faceAreaIntersect::calc"
-                "("
-                    "const face&, "
-                    "const face&, "
-                    "const vector&, "
-                    "const triangulationMode&"
-                ")"
-            )   << "Unknown triangulation mode enumeration"
+            FatalErrorInFunction
+                << "Unknown triangulation mode enumeration"
                 << abort(FatalError);
         }
     }
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
index a8dd739151..91e6b759a3 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,6 +41,7 @@ SourceFiles
 #include "FixedList.H"
 #include "plane.H"
 #include "face.H"
+#include "triPoints.H"
 #include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,8 +57,6 @@ class faceAreaIntersect
 {
 public:
 
-    typedef FixedList<point, 3> triPoints;
-
     enum triangulationMode
     {
         tmFan,
diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H
index 87fab781e0..76bf413833 100644
--- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H
+++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ inline void Foam::faceAreaIntersect::setTriPoints
 }
 
 
-inline Foam::faceAreaIntersect::triPoints Foam::faceAreaIntersect::getTriPoints
+inline Foam::triPoints Foam::faceAreaIntersect::getTriPoints
 (
     const pointField& points,
     const face& f,
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
index cc15eaf02f..038f403fff 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,14 +59,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
 {
     if (!isType<cyclicACMIPointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField\n"
-            "(\n"
-            "    const pointPatch&,\n"
-            "    const DimensionedField<Type, pointMesh>&,\n"
-            "    const dictionary&\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not cyclicACMI type. "
             << "Patch type = " << p.type()
@@ -91,16 +85,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
 {
     if (!isType<cyclicACMIPointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField\n"
-            "(\n"
-            "    const cyclicACMIPointPatchField<Type>&,\n"
-            "    const pointPatch&,\n"
-            "    const DimensionedField<Type, pointMesh>&,\n"
-            "    const pointPatchFieldMapper&\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
index 7a862ee9da..a461a91cab 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
@@ -44,7 +44,11 @@ const Foam::scalar Foam::cyclicACMIPolyPatch::tolerance_ = 1e-6;
 
 void Foam::cyclicACMIPolyPatch::initPatchFaceAreas() const
 {
-    if (!empty() && faceAreas0_.empty())
+    if
+    (
+        !empty()
+     && (faceAreas0_.empty() || boundaryMesh().mesh().moving())
+    )
     {
         faceAreas0_ = faceAreas();
     }
@@ -52,9 +56,13 @@ void Foam::cyclicACMIPolyPatch::initPatchFaceAreas() const
     const cyclicACMIPolyPatch& nbrACMI =
         refCast<const cyclicACMIPolyPatch>(this->neighbPatch());
 
-    if (!nbrACMI.empty() && nbrACMI.faceAreas0().empty())
+    if
+    (
+        !nbrACMI.empty()
+     && (nbrACMI.faceAreas0().empty() || boundaryMesh().mesh().moving())
+    )
     {
-        nbrACMI.initPatchFaceAreas();
+        nbrACMI.faceAreas0_ = nbrACMI.faceAreas();
     }
 }
 
@@ -127,7 +135,7 @@ void Foam::cyclicACMIPolyPatch::setNeighbourFaceAreas() const
     }
     else
     {
-        WarningIn("cyclicACMIPolyPatch::setNeighbourFaceAreas() const")
+        WarningInFunction
             << "Target mask size differs to that of the neighbour patch\n"
             << "    May occur when decomposing." << endl;
     }
@@ -136,11 +144,13 @@ void Foam::cyclicACMIPolyPatch::setNeighbourFaceAreas() const
 
 void Foam::cyclicACMIPolyPatch::initGeometry(PstreamBuffers& pBufs)
 {
-    // Initialise the AMI so that base geometry (e.g. cell volumes) are
-    // correctly evaluated
-    resetAMI();
-
+    // Note: cyclicAMIPolyPatch clears AMI so do first
     cyclicAMIPolyPatch::initGeometry(pBufs);
+
+    // Initialise the AMI so that base geometry (e.g. cell volumes) are
+    // correctly evaluated before e.g. any of the processor patches gets
+    // hit (since uses cell volumes in its initGeometry)
+    resetAMI();
 }
 
 
@@ -156,7 +166,13 @@ void Foam::cyclicACMIPolyPatch::initMovePoints
     const pointField& p
 )
 {
+    // Note: cyclicAMIPolyPatch clears AMI so do first
     cyclicAMIPolyPatch::initMovePoints(pBufs, p);
+
+    // Initialise the AMI so that base geometry (e.g. cell volumes) are
+    // correctly evaluated before e.g. any of the processor patches gets
+    // hit (since uses cell volumes in its initGeometry)
+    resetAMI();
 }
 
 
@@ -249,16 +265,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
 
     if (nonOverlapPatchName_ == name)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicACMIPolyPatch::cyclicACMIPolyPatch"
-            "("
-                "const word&, "
-                "const dictionary&, "
-                "const label, "
-                "const polyBoundaryMesh&, "
-                "const word&"
-            ")",
             dict
         )   << "Non-overlapping patch name " << nonOverlapPatchName_
             << " cannot be the same as this patch " << name
@@ -314,16 +322,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch
 
     if (nonOverlapPatchName_ == name())
     {
-        FatalErrorIn
-        (
-            "const cyclicACMIPolyPatch& "
-            "const polyBoundaryMesh&, "
-            "const label, "
-            "const label, "
-            "const label, "
-            "const word&, "
-            "const word&"
-        )   << "Non-overlapping patch name " << nonOverlapPatchName_
+        FatalErrorInFunction
+            << "Non-overlapping patch name " << nonOverlapPatchName_
             << " cannot be the same as this patch " << name()
             << exit(FatalError);
     }
@@ -378,7 +378,7 @@ Foam::label Foam::cyclicACMIPolyPatch::nonOverlapPatchID() const
 
         if (nonOverlapPatchID_ == -1)
         {
-            FatalErrorIn("cyclicPolyAMIPatch::neighbPatchID() const")
+            FatalErrorInFunction
                 << "Illegal non-overlapping patch name " << nonOverlapPatchName_
                 << nl << "Valid patch names are "
                 << this->boundaryMesh().names()
@@ -387,7 +387,7 @@ Foam::label Foam::cyclicACMIPolyPatch::nonOverlapPatchID() const
 
         if (nonOverlapPatchID_ < index())
         {
-            FatalErrorIn("cyclicPolyAMIPatch::neighbPatchID() const")
+            FatalErrorInFunction
                 << "Boundary ordering error: " << type()
                 << " patch must be defined prior to its non-overlapping patch"
                 << nl
@@ -424,11 +424,8 @@ Foam::label Foam::cyclicACMIPolyPatch::nonOverlapPatchID() const
 
         if (!ok)
         {
-            FatalErrorIn
-            (
-                "Foam::label "
-                "Foam::cyclicACMIPolyPatch::nonOverlapPatchID() const"
-            )   << "Inconsistent ACMI patches " << name() << " and "
+            FatalErrorInFunction
+                << "Inconsistent ACMI patches " << name() << " and "
                 << noPp.name() << ".  Patches should have identical topology"
                 << exit(FatalError);
         }
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
index 231a2e0ba7..ce712a4e7a 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,12 +32,12 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
     const Field<Type>& fldNonOverlap
 ) const
 {
-    // note: do not scale AMI field as face areas have already been taken
+    // Note: do not scale AMI field as face areas have already been taken
     // into account
 
     if (owner())
     {
-        const scalarField& w = srcMask_;
+        const scalarField& w = AMI().srcWeightsSum();
 
         tmp<Field<Type> > interpField(AMI().interpolateToSource(fldCouple));
 
@@ -45,7 +45,7 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
     }
     else
     {
-        const scalarField& w = neighbPatch().tgtMask();
+        const scalarField& w = neighbPatch().AMI().tgtWeightsSum();
 
         tmp<Field<Type> > interpField
         (
@@ -77,21 +77,23 @@ void Foam::cyclicACMIPolyPatch::interpolate
     List<Type>& result
 ) const
 {
-    // note: do not scale AMI field as face areas have already been taken
+    // Note: do not scale AMI field as face areas have already been taken
     // into account
 
     if (owner())
     {
-        const scalarField& w = srcMask_;
+        const scalarField& w = AMI().srcWeightsSum();
 
         AMI().interpolateToSource(fldCouple, cop, result);
+
         result = result + (1.0 - w)*fldNonOverlap;
     }
     else
     {
-        const scalarField& w = neighbPatch().tgtMask();
+        const scalarField& w = neighbPatch().AMI().tgtWeightsSum();
 
         neighbPatch().AMI().interpolateToTarget(fldCouple, cop, result);
+
         result = result + (1.0 - w)*fldNonOverlap;
     }
 }
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C
index 2b4e6b8ad3..98fe75a0b7 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,13 @@ namespace Foam
         cyclicAMIPointPatch,
         polyPatch
     );
+    addNamedToRunTimeSelectionTable
+    (
+        facePointPatch,
+        cyclicAMIPointPatch,
+        polyPatch,
+        cyclicPeriodicAMI
+    );
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
index a959b9b3af..7bfdf7de80 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,14 +59,8 @@ Foam::cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField
 {
     if (!isType<cyclicAMIPointPatch>(p))
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField\n"
-            "(\n"
-            "    const pointPatch&,\n"
-            "    const DimensionedField<Type, pointMesh>&,\n"
-            "    const dictionary&\n"
-            ")\n",
             dict
         )   << "patch " << this->patch().index() << " not cyclicAMI type. "
             << "Patch type = " << p.type()
@@ -91,16 +85,8 @@ Foam::cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField
 {
     if (!isType<cyclicAMIPointPatch>(this->patch()))
     {
-        FatalErrorIn
-        (
-            "cyclicAMIPointPatchField<Type>::cyclicAMIPointPatchField\n"
-            "(\n"
-            "    const cyclicAMIPointPatchField<Type>&,\n"
-            "    const pointPatch&,\n"
-            "    const DimensionedField<Type, pointMesh>&,\n"
-            "    const pointPatchFieldMapper&\n"
-            ")\n"
-        )   << "Field type does not correspond to patch type for patch "
+        FatalErrorInFunction
+            << "Field type does not correspond to patch type for patch "
             << this->patch().index() << "." << endl
             << "Field type: " << typeName << endl
             << "Patch type: " << this->patch().type()
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index f58e99ce0e..fb69047afe 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -24,9 +24,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cyclicAMIPolyPatch.H"
+#include "transformField.H"
 #include "SubField.H"
+#include "polyMesh.H"
 #include "Time.H"
 #include "addToRunTimeSelectionTable.H"
+#include "faceAreaIntersect.H"
+#include "ops.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -71,7 +75,6 @@ Foam::vector Foam::cyclicAMIPolyPatch::findFaceNormalMaxRadius
 
 void Foam::cyclicAMIPolyPatch::calcTransforms()
 {
-    // Half0
     const cyclicAMIPolyPatch& half0 = *this;
     vectorField half0Areas(half0.size());
     forAll(half0, facei)
@@ -79,7 +82,6 @@ void Foam::cyclicAMIPolyPatch::calcTransforms()
         half0Areas[facei] = half0[facei].normal(half0.points());
     }
 
-    // Half1
     const cyclicAMIPolyPatch& half1 = neighbPatch();
     vectorField half1Areas(half1.size());
     forAll(half1, facei)
@@ -118,7 +120,7 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
 {
     if (transform() != neighbPatch().transform())
     {
-        FatalErrorIn("cyclicAMIPolyPatch::calcTransforms()")
+        FatalErrorInFunction
             << "Patch " << name()
             << " has transform type " << transformTypeNames[transform()]
             << ", neighbour patch " << neighbPatchName()
@@ -138,23 +140,23 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
 
             if (rotationAngleDefined_)
             {
-                tensor T(rotationAxis_*rotationAxis_);
+                const tensor T(rotationAxis_*rotationAxis_);
 
-                tensor S
+                const tensor S
                 (
                     0, -rotationAxis_.z(), rotationAxis_.y(),
                     rotationAxis_.z(), 0, -rotationAxis_.x(),
                     -rotationAxis_.y(), rotationAxis_.x(), 0
                 );
 
-                tensor revTPos
+                const tensor revTPos
                 (
                     T
                   + cos(rotationAngle_)*(tensor::I - T)
                   + sin(rotationAngle_)*S
                 );
 
-                tensor revTNeg
+                const tensor revTNeg
                 (
                     T
                   + cos(-rotationAngle_)*(tensor::I - T)
@@ -163,41 +165,34 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
 
                 // Check - assume correct angle when difference in face areas
                 // is the smallest
-                vector transformedAreaPos = gSum(half1Areas & revTPos);
-                vector transformedAreaNeg = gSum(half1Areas & revTNeg);
-                vector area0 = gSum(half0Areas);
+                const vector transformedAreaPos = gSum(half1Areas & revTPos);
+                const vector transformedAreaNeg = gSum(half1Areas & revTNeg);
+                const vector area0 = gSum(half0Areas);
+                const scalar magArea0 = mag(area0) + ROOTVSMALL;
 
-                // Areas have opposite sign, so sum should be zero when
-                // correct rotation applied
-                scalar errorPos = mag(transformedAreaPos + area0);
-                scalar errorNeg = mag(transformedAreaNeg + area0);
+                // Areas have opposite sign, so sum should be zero when correct
+                // rotation applied
+                const scalar errorPos = mag(transformedAreaPos + area0);
+                const scalar errorNeg = mag(transformedAreaNeg + area0);
 
-                if (errorPos < errorNeg)
-                {
-                    revT = revTPos;
-                }
-                else
+                const scalar normErrorPos = errorPos/magArea0;
+                const scalar normErrorNeg = errorNeg/magArea0;
+
+                if (errorPos > errorNeg && normErrorNeg < matchTolerance())
                 {
                     revT = revTNeg;
                     rotationAngle_ *= -1;
                 }
+                else
+                {
+                    revT = revTPos;
+                }
 
-                scalar areaError =
-                    min(errorPos, errorNeg)/(mag(area0) + ROOTVSMALL);
+                const scalar areaError = min(normErrorPos, normErrorNeg);
 
                 if (areaError > matchTolerance())
                 {
-                    WarningIn
-                    (
-                        "void Foam::cyclicAMIPolyPatch::calcTransforms"
-                        "("
-                            "const primitivePatch&, "
-                            "const pointField&, "
-                            "const vectorField&, "
-                            "const pointField&, "
-                            "const vectorField&"
-                        ")"
-                    )
+                    WarningInFunction
                         << "Patch areas are not consistent within "
                         << 100*matchTolerance()
                         << " % indicating a possible error in the specified "
@@ -406,6 +401,9 @@ void Foam::cyclicAMIPolyPatch::resetAMI
 
 void Foam::cyclicAMIPolyPatch::initGeometry(PstreamBuffers& pBufs)
 {
+    // The AMI is no longer valid. Leave it up to demand-driven calculation
+    AMIPtr_.clear();
+
     polyPatch::initGeometry(pBufs);
 }
 
@@ -431,6 +429,9 @@ void Foam::cyclicAMIPolyPatch::initMovePoints
     const pointField& p
 )
 {
+    // The AMI is no longer valid. Leave it up to demand-driven calculation
+    AMIPtr_.clear();
+
     polyPatch::initMovePoints(pBufs, p);
 
     // See below. Clear out any local geometry
@@ -447,19 +448,15 @@ void Foam::cyclicAMIPolyPatch::movePoints
     polyPatch::movePoints(pBufs, p);
 
     calcTransforms();
-
-    // Note: resetAMI is called whilst in geometry update. So the slave
-    // side might not have reached 'movePoints'. Is explicitly handled by
-    // - clearing geometry of neighbour inside initMovePoints
-    // - not using localPoints() inside resetAMI
-    resetAMI();
 }
 
 
 void Foam::cyclicAMIPolyPatch::initUpdateMesh(PstreamBuffers& pBufs)
 {
-    polyPatch::initUpdateMesh(pBufs);
+    // The AMI is no longer valid. Leave it up to demand-driven calculation
     AMIPtr_.clear();
+
+    polyPatch::initUpdateMesh(pBufs);
 }
 
 
@@ -536,15 +533,8 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
 {
     if (nbrPatchName_ == word::null && !coupleGroup_.valid())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicAMIPolyPatch::cyclicAMIPolyPatch"
-            "("
-                "const word&, "
-                "const dictionary&, "
-                "const label, "
-                "const polyBoundaryMesh&"
-            ")",
             dict
         )   << "No \"neighbourPatch\" or \"coupleGroup\" provided."
             << exit(FatalIOError);
@@ -552,15 +542,8 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
 
     if (nbrPatchName_ == name)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "cyclicAMIPolyPatch::cyclicAMIPolyPatch"
-            "("
-                "const word&, "
-                "const dictionary&, "
-                "const label, "
-                "const polyBoundaryMesh&"
-            ")",
             dict
         )   << "Neighbour patch name " << nbrPatchName_
             << " cannot be the same as this patch " << name
@@ -588,15 +571,8 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
             scalar magRot = mag(rotationAxis_);
             if (magRot < SMALL)
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "cyclicAMIPolyPatch::cyclicAMIPolyPatch"
-                    "("
-                        "const word&, "
-                        "const dictionary&, "
-                        "const label, "
-                        "const polyBoundaryMesh&"
-                    ")",
                     dict
                 )   << "Illegal rotationAxis " << rotationAxis_ << endl
                     << "Please supply a non-zero vector."
@@ -677,15 +653,8 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
 {
     if (nbrPatchName_ == name())
     {
-        FatalErrorIn
-        (
-            "const cyclicAMIPolyPatch& "
-            "const polyBoundaryMesh&, "
-            "const label, "
-            "const label, "
-            "const label, "
-            "const word&"
-        )   << "Neighbour patch name " << nbrPatchName_
+        FatalErrorInFunction
+            << "Neighbour patch name " << nbrPatchName_
             << " cannot be the same as this patch " << name()
             << exit(FatalError);
     }
@@ -738,7 +707,7 @@ Foam::label Foam::cyclicAMIPolyPatch::neighbPatchID() const
 
         if (nbrPatchID_ == -1)
         {
-            FatalErrorIn("cyclicPolyAMIPatch::neighbPatchID() const")
+            FatalErrorInFunction
                 << "Illegal neighbourPatch name " << neighbPatchName()
                 << nl << "Valid patch names are "
                 << this->boundaryMesh().names()
@@ -754,7 +723,7 @@ Foam::label Foam::cyclicAMIPolyPatch::neighbPatchID() const
 
         if (nbrPatch.neighbPatchName() != name())
         {
-            WarningIn("cyclicAMIPolyPatch::neighbPatchID() const")
+            WarningInFunction
                 << "Patch " << name()
                 << " specifies neighbour patch " << neighbPatchName()
                 << nl << " but that in return specifies "
@@ -815,10 +784,7 @@ const Foam::AMIPatchToPatchInterpolation& Foam::cyclicAMIPolyPatch::AMI() const
 {
     if (!owner())
     {
-        FatalErrorIn
-        (
-            "const AMIPatchToPatchInterpolation& cyclicAMIPolyPatch::AMI()"
-        )
+        FatalErrorInFunction
             << "AMI interpolator only available to owner patch"
             << abort(FatalError);
     }
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
new file mode 100644
index 0000000000..8e683b1169
--- /dev/null
+++ b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
@@ -0,0 +1,703 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cyclicPeriodicAMIPolyPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// For debugging
+#include "OBJstream.H"
+#include "PatchTools.H"
+#include "Time.H"
+//Note: cannot use vtkSurfaceWriter here - circular linkage
+//#include "vtkSurfaceWriter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(cyclicPeriodicAMIPolyPatch, 0);
+
+    addToRunTimeSelectionTable(polyPatch, cyclicPeriodicAMIPolyPatch, word);
+    addToRunTimeSelectionTable
+    (
+        polyPatch,
+        cyclicPeriodicAMIPolyPatch,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+void Foam::cyclicPeriodicAMIPolyPatch::syncTransforms() const
+{
+    if (owner())
+    {
+        // At this point we guarantee that the transformations have been
+        // updated. There is one particular case, where if the periodic patch
+        // locally has zero faces then its transformation will not be set. We
+        // need to synchronise the transforms over the zero-sized patches as
+        // well.
+        //
+        // We can't put the logic into cyclicPolyPatch as
+        // processorCyclicPolyPatch uses cyclicPolyPatch functionality.
+        // Synchronisation will fail because processor-type patches do not exist
+        // on all processors.
+        //
+        // The use in cyclicPeriodicAMI is special; we use the patch even
+        // though we have no faces in it. Ideally, in future, the transformation
+        // logic will be abstracted out, and we won't need a periodic patch
+        // here. Until then, we can just fix the behaviour of the zero-sized
+        // coupled patches here
+
+        // Get the periodic patch
+        const coupledPolyPatch& periodicPatch
+        (
+            refCast<const coupledPolyPatch>
+            (
+                boundaryMesh()[periodicPatchID()]
+            )
+        );
+
+        // If there are any zero-sized periodic patches
+        if (returnReduce((size() && !periodicPatch.size()), orOp<bool>()))
+        {
+            if (periodicPatch.separation().size() > 1)
+            {
+                FatalErrorInFunction
+                    << "Periodic patch " << periodicPatchName_
+                    << " has non-uniform separation vector "
+                    << periodicPatch.separation()
+                    << "This is not allowed inside " << type()
+                    << " patch " << name()
+                    << exit(FatalError);
+            }
+
+            if (periodicPatch.forwardT().size() > 1)
+            {
+                FatalErrorInFunction
+                    << "Periodic patch " << periodicPatchName_
+                    << " has non-uniform transformation tensor "
+                    << periodicPatch.forwardT()
+                    << "This is not allowed inside " << type()
+                    << " patch " << name()
+                    << exit(FatalError);
+            }
+
+            // Note that zero-sized patches will have zero-sized fields for the
+            // separation vector, forward and reverse transforms. These need
+            // replacing with the transformations from other processors.
+
+            // Parallel in this context refers to a parallel transformation,
+            // rather than a rotational transformation.
+
+            // Note that a cyclic with zero faces is considered parallel so
+            // explicitly check for that.
+            bool isParallel =
+            (
+                periodicPatch.size()
+             && periodicPatch.parallel()
+            );
+            reduce(isParallel, orOp<bool>());
+
+            if (isParallel)
+            {
+                // Sync a list of separation vectors
+                List<vectorField> sep(Pstream::nProcs());
+                sep[Pstream::myProcNo()] = periodicPatch.separation();
+                Pstream::gatherList(sep);
+                Pstream::scatterList(sep);
+
+                List<boolList> coll(Pstream::nProcs());
+                coll[Pstream::myProcNo()] = periodicPatch.collocated();
+                Pstream::gatherList(coll);
+                Pstream::scatterList(coll);
+
+                // If locally we have zero faces pick the first one that has a
+                // separation vector
+                if (!periodicPatch.size())
+                {
+                    forAll(sep, procI)
+                    {
+                        if (sep[procI].size())
+                        {
+                            const_cast<vectorField&>
+                            (
+                                periodicPatch.separation()
+                            ) = sep[procI];
+                            const_cast<boolList&>
+                            (
+                                periodicPatch.collocated()
+                            ) = coll[procI];
+
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Sync a list of forward and reverse transforms
+                List<tensorField> forwardT(Pstream::nProcs());
+                forwardT[Pstream::myProcNo()] = periodicPatch.forwardT();
+                Pstream::gatherList(forwardT);
+                Pstream::scatterList(forwardT);
+
+                List<tensorField> reverseT(Pstream::nProcs());
+                reverseT[Pstream::myProcNo()] = periodicPatch.reverseT();
+                Pstream::gatherList(reverseT);
+                Pstream::scatterList(reverseT);
+
+                // If locally we have zero faces pick the first one that has a
+                // transformation vector
+                if (!periodicPatch.size())
+                {
+                    forAll(forwardT, procI)
+                    {
+                        if (forwardT[procI].size())
+                        {
+                            const_cast<tensorField&>
+                            (
+                                periodicPatch.forwardT()
+                            ) = forwardT[procI];
+                            const_cast<tensorField&>
+                            (
+                                periodicPatch.reverseT()
+                            ) = reverseT[procI];
+
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::cyclicPeriodicAMIPolyPatch::writeOBJ
+(
+    const primitivePatch& p,
+    OBJstream& str
+) const
+{
+    // Collect faces and points
+    pointField allPoints;
+    faceList allFaces;
+    labelList pointMergeMap;
+    PatchTools::gatherAndMerge
+    (
+        -1.0,           // do not merge points
+        p,
+        allPoints,
+        allFaces,
+        pointMergeMap
+    );
+
+    if (Pstream::master())
+    {
+        // Write base geometry
+        str.write(allFaces, allPoints);
+    }
+}
+
+
+void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
+(
+    const AMIPatchToPatchInterpolation::interpolationMethod& AMIMethod
+) const
+{
+    if (owner())
+    {
+        // Get the periodic patch
+        const coupledPolyPatch& periodicPatch
+        (
+            refCast<const coupledPolyPatch>
+            (
+                boundaryMesh()[periodicPatchID()]
+            )
+        );
+
+        // Synchronise the transforms
+        syncTransforms();
+
+        // Create copies of both patches' points, transformed to the owner
+        pointField thisPoints0(localPoints());
+        pointField nbrPoints0(neighbPatch().localPoints());
+        transformPosition(nbrPoints0);
+
+        // Reset the stored number of periodic transformations to a lower
+        // absolute value if possible
+        if (nSectors_ > 0)
+        {
+            if (nTransforms_ > nSectors_/2)
+            {
+                nTransforms_ -= nSectors_;
+            }
+            else if (nTransforms_ < - nSectors_/2)
+            {
+                nTransforms_ += nSectors_;
+            }
+        }
+
+        // Apply the stored number of periodic transforms
+        for (label i = 0; i < nTransforms_; ++ i)
+        {
+            periodicPatch.transformPosition(thisPoints0);
+        }
+        for (label i = 0; i > nTransforms_; -- i)
+        {
+            periodicPatch.transformPosition(nbrPoints0);
+        }
+
+        autoPtr<OBJstream> ownStr;
+        autoPtr<OBJstream> neiStr;
+        if (debug)
+        {
+            const Time& runTime = boundaryMesh().mesh().time();
+
+            fileName dir(runTime.rootPath()/runTime.globalCaseName());
+            fileName postfix("_" + runTime.timeName()+"_expanded.obj");
+
+            ownStr.reset(new OBJstream(dir/name() + postfix));
+            neiStr.reset(new OBJstream(dir/neighbPatch().name() + postfix));
+
+            Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:" << name()
+                << " writing accumulated AMI to " << ownStr().name()
+                << " and " << neiStr().name() << endl;
+        }
+
+        // Create another copy
+        pointField thisPoints(thisPoints0);
+        pointField nbrPoints(nbrPoints0);
+
+        // Create patches for all the points
+
+        // Source patch at initial location
+        const primitivePatch thisPatch0
+        (
+            SubList<face>(localFaces(), size()),
+            thisPoints0
+        );
+        // Source patch that gets moved
+        primitivePatch thisPatch
+        (
+            SubList<face>(localFaces(), size()),
+            thisPoints
+        );
+        // Target patch at initial location
+        const primitivePatch nbrPatch0
+        (
+            SubList<face>(neighbPatch().localFaces(), neighbPatch().size()),
+            nbrPoints0
+        );
+        // Target patch that gets moved
+        primitivePatch nbrPatch
+        (
+            SubList<face>(neighbPatch().localFaces(), neighbPatch().size()),
+            nbrPoints
+        );
+
+        // Construct a new AMI interpolation between the initial patch locations
+        AMIPtr_.reset
+        (
+            new AMIPatchToPatchInterpolation
+            (
+                thisPatch0,
+                nbrPatch0,
+                surfPtr(),
+                faceAreaIntersect::tmMesh,
+                false,
+                AMIPatchToPatchInterpolation::imPartialFaceAreaWeight,
+                AMILowWeightCorrection_,
+                AMIReverse_
+            )
+        );
+
+        // Number of geometry replications
+        label iter(0);
+        label nTransformsOld(nTransforms_);
+
+        if (ownStr.valid())
+        {
+            writeOBJ(thisPatch0, ownStr());
+        }
+        if (neiStr.valid())
+        {
+            writeOBJ(nbrPatch0, neiStr());
+        }
+
+
+        // Weight sum averages
+        scalar srcSum(gAverage(AMIPtr_->srcWeightsSum()));
+        scalar tgtSum(gAverage(AMIPtr_->tgtWeightsSum()));
+
+        // Direction (or rather side of AMI : this or nbr patch) of
+        // geometry replication
+        bool direction = nTransforms_ >= 0;
+
+        // Increase in the source weight sum for the last iteration in the
+        // opposite direction. If the current increase is less than this, the
+        // direction (= side of AMI to transform) is reversed.
+        // We switch the side to replicate instead of reversing the transform
+        // since at the coupledPolyPatch level there is no
+        // 'reverseTransformPosition' functionality.
+        scalar srcSumDiff = 0;
+
+        if (debug)
+        {
+            Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:" << name()
+                << " srcSum:" << srcSum
+                << " tgtSum:" << tgtSum
+                << " direction:" << direction
+                << endl;
+        }
+
+        // Loop, replicating the geometry
+        while
+        (
+            (iter < maxIter_)
+         && (
+                (1 - srcSum > matchTolerance())
+             || (1 - tgtSum > matchTolerance())
+            )
+        )
+        {
+            if (direction)
+            {
+                periodicPatch.transformPosition(thisPoints);
+
+                if (debug)
+                {
+                    Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:"
+                        << name()
+                        << " moving this side from:"
+                        << gAverage(thisPatch.points())
+                        << " to:" << gAverage(thisPoints) << endl;
+                }
+
+                thisPatch.movePoints(thisPoints);
+
+                if (debug)
+                {
+                    Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:"
+                        << name()
+                        << " appending weights with untransformed slave side"
+                        << endl;
+                }
+
+                AMIPtr_->append(thisPatch, nbrPatch0);
+
+                if (ownStr.valid())
+                {
+                    writeOBJ(thisPatch, ownStr());
+                }
+            }
+            else
+            {
+                periodicPatch.transformPosition(nbrPoints);
+
+                if (debug)
+                {
+                    Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:"
+                        << name()
+                        << " moving neighbour side from:"
+                        << gAverage(nbrPatch.points())
+                        << " to:" << gAverage(nbrPoints) << endl;
+                }
+
+                nbrPatch.movePoints(nbrPoints);
+
+                AMIPtr_->append(thisPatch0, nbrPatch);
+
+                if (neiStr.valid())
+                {
+                    writeOBJ(nbrPatch, neiStr());
+                }
+            }
+
+            const scalar srcSumNew = gAverage(AMIPtr_->srcWeightsSum());
+            const scalar srcSumDiffNew = srcSumNew - srcSum;
+
+            if (srcSumDiffNew < srcSumDiff || srcSumDiffNew < SMALL)
+            {
+                direction = !direction;
+
+                srcSumDiff = srcSumDiffNew;
+            }
+
+            srcSum = srcSumNew;
+            tgtSum = gAverage(AMIPtr_->tgtWeightsSum());
+
+            nTransforms_ += direction ? +1 : -1;
+
+            ++ iter;
+
+            if (debug)
+            {
+                Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:" << name()
+                    << " iteration:" << iter
+                    << " srcSum:" << srcSum
+                    << " tgtSum:" << tgtSum
+                    << " direction:" << direction
+                    << endl;
+            }
+        }
+
+
+        // Close debug streams
+        if (ownStr.valid())
+        {
+            ownStr.clear();
+        }
+        if (neiStr.valid())
+        {
+            neiStr.clear();
+        }
+
+
+
+        // Average the number of transformstions
+        nTransforms_ = (nTransforms_ + nTransformsOld)/2;
+
+        // Check that the match is complete
+        if (iter == maxIter_)
+        {
+            // The matching algorithm has exited without getting the
+            // srcSum and tgtSum above 1. This can happen because
+            // - of an incorrect setup
+            // - or because of non-exact meshes and truncation errors
+            //   (transformation, accumulation of cutting errors)
+            // so for now this situation is flagged as a SeriousError instead of
+            // a FatalError since the default matchTolerance is quite strict
+            // (0.001) and can get triggered far into the simulation.
+            SeriousErrorInFunction
+                << "Patches " << name() << " and " << neighbPatch().name()
+                << " do not couple to within a tolerance of "
+                << matchTolerance()
+                << " when transformed according to the periodic patch "
+                << periodicPatch.name() << "." << nl
+                << "The current sum of weights are for owner " << name()
+                << " : " << srcSum << " and for neighbour "
+                << neighbPatch().name() << " : " << tgtSum << nl
+                << "This is only acceptable during post-processing"
+                << "; not during running. Improve your mesh or increase"
+                << " the 'matchTolerance' setting in the patch specification."
+                << endl;
+        }
+
+        // Check that both patches have replicated an integer number of times
+        if
+        (
+            mag(srcSum - floor(srcSum + 0.5)) > srcSum*matchTolerance()
+         || mag(tgtSum - floor(tgtSum + 0.5)) > tgtSum*matchTolerance()
+        )
+        {
+            // This condition is currently enforced until there is more
+            // experience with the matching algorithm and numerics.
+            // This check means that e.g. different numbers of stator and
+            // rotor partitions are not allowed.
+            // Again see the section above about tolerances.
+            SeriousErrorInFunction
+                << "Patches " << name() << " and " << neighbPatch().name()
+                << " do not overlap an integer number of times when transformed"
+                << " according to the periodic patch "
+                << periodicPatch.name() << "." << nl
+                << "The current matchTolerance : " << matchTolerance()
+                << ", sum of owner weights : " << srcSum
+                << ", sum of neighbour weights : " << tgtSum
+                 << "." << nl
+                << "This is only acceptable during post-processing"
+                << "; not during running. Improve your mesh or increase"
+                << " the 'matchTolerance' setting in the patch specification."
+                << endl;
+        }
+
+        // Normalise the weights
+        AMIPtr_->normaliseWeights(true, false);
+    }
+}
+
+
+// * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * * //
+
+Foam::cyclicPeriodicAMIPolyPatch::cyclicPeriodicAMIPolyPatch
+(
+    const word& name,
+    const label size,
+    const label start,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType,
+    const transformType transform
+)
+:
+    cyclicAMIPolyPatch(name, size, start, index, bm, patchType, transform),
+    periodicPatchName_(word::null),
+    periodicPatchID_(-1),
+    nTransforms_(0),
+    nSectors_(0),
+    maxIter_(36)
+{}
+
+
+Foam::cyclicPeriodicAMIPolyPatch::cyclicPeriodicAMIPolyPatch
+(
+    const word& name,
+    const dictionary& dict,
+    const label index,
+    const polyBoundaryMesh& bm,
+    const word& patchType
+)
+:
+    cyclicAMIPolyPatch(name, dict, index, bm, patchType),
+    periodicPatchName_(dict.lookup("periodicPatch")),
+    periodicPatchID_(-1),
+    nTransforms_(dict.lookupOrDefault<label>("nTransforms", 0)),
+    nSectors_(dict.lookupOrDefault<label>("nSectors", 0)),
+    maxIter_(dict.lookupOrDefault<label>("maxIter", 36))
+{}
+
+
+Foam::cyclicPeriodicAMIPolyPatch::cyclicPeriodicAMIPolyPatch
+(
+    const cyclicPeriodicAMIPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    cyclicAMIPolyPatch(pp, bm),
+    periodicPatchName_(pp.periodicPatchName_),
+    periodicPatchID_(-1),
+    nTransforms_(pp.nTransforms_),
+    nSectors_(pp.nSectors_),
+    maxIter_(pp.maxIter_)
+{}
+
+
+Foam::cyclicPeriodicAMIPolyPatch::cyclicPeriodicAMIPolyPatch
+(
+    const cyclicPeriodicAMIPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart,
+    const word& nbrPatchName
+)
+:
+    cyclicAMIPolyPatch(pp, bm, index, newSize, newStart, nbrPatchName),
+    periodicPatchName_(pp.periodicPatchName_),
+    periodicPatchID_(-1),
+    nTransforms_(pp.nTransforms_),
+    nSectors_(pp.nSectors_),
+    maxIter_(pp.maxIter_)
+{}
+
+
+Foam::cyclicPeriodicAMIPolyPatch::cyclicPeriodicAMIPolyPatch
+(
+    const cyclicPeriodicAMIPolyPatch& pp,
+    const polyBoundaryMesh& bm,
+    const label index,
+    const labelUList& mapAddressing,
+    const label newStart
+)
+:
+    cyclicAMIPolyPatch(pp, bm, index, mapAddressing, newStart),
+    periodicPatchName_(pp.periodicPatchName_),
+    periodicPatchID_(-1),
+    nTransforms_(pp.nTransforms_),
+    nSectors_(pp.nSectors_),
+    maxIter_(pp.maxIter_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::cyclicPeriodicAMIPolyPatch::~cyclicPeriodicAMIPolyPatch()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::cyclicPeriodicAMIPolyPatch::periodicPatchID() const
+{
+    if (periodicPatchName_ == word::null)
+    {
+        periodicPatchID_ = -1;
+
+        return periodicPatchID_;
+    }
+
+    if (periodicPatchID_ == -1)
+    {
+        periodicPatchID_ = this->boundaryMesh().findPatchID(periodicPatchName_);
+
+        if (periodicPatchID_ == -1)
+        {
+            FatalErrorInFunction
+                << "Illegal periodicPatch name " << periodicPatchName_
+                << nl << "Valid patch names are "
+                << this->boundaryMesh().names()
+                << exit(FatalError);
+        }
+
+        // Check that it is a coupled patch
+        refCast<const coupledPolyPatch>
+        (
+            this->boundaryMesh()[periodicPatchID_]
+        );
+    }
+
+    return periodicPatchID_;
+}
+
+
+void Foam::cyclicPeriodicAMIPolyPatch::write(Ostream& os) const
+{
+    cyclicAMIPolyPatch::write(os);
+
+    os.writeKeyword("periodicPatch") << periodicPatchName_
+        << token::END_STATEMENT << nl;
+
+    if (nTransforms_ != 0)
+    {
+        os.writeKeyword("nTransforms") << nTransforms_ <<
+            token::END_STATEMENT << nl;
+    }
+
+    if (nSectors_ != 0)
+    {
+        os.writeKeyword("nSectors") << nSectors_ <<
+            token::END_STATEMENT << nl;
+    }
+
+    if (maxIter_ != 36)
+    {
+        os.writeKeyword("maxIter") << maxIter_ << token::END_STATEMENT << nl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.H
new file mode 100644
index 0000000000..055429c59f
--- /dev/null
+++ b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.H
@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::cyclicPeriodicAMIPolyPatch
+
+Description
+    Cyclic patch for periodic Arbitrary Mesh Interface (AMI)
+
+SourceFiles
+    cyclicPeriodicAMIPolyPatch.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cyclicPeriodicAMIPolyPatch_H
+#define cyclicPeriodicAMIPolyPatch_H
+
+#include "cyclicAMIPolyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class OBJstream;
+
+/*---------------------------------------------------------------------------*\
+                    Class cyclicPeriodicAMIPolyPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class cyclicPeriodicAMIPolyPatch
+:
+    public cyclicAMIPolyPatch
+{
+private:
+
+    // Private data
+
+        //- Periodic patch name
+        mutable word periodicPatchName_;
+
+        //- Periodic patch ID
+        mutable label periodicPatchID_;
+
+        //- Current number of transformations (+ve forward, -ve backward)
+        mutable label nTransforms_;
+
+        //- Number of sectors in a rotationally periodic geometry (optional)
+        const label nSectors_;
+
+        //- Maximum number of attempts to match the AMI geometry
+        const label maxIter_;
+
+
+    // Private Member Functions
+
+        //- Synchronise the periodic transformations
+        void syncTransforms() const;
+
+        //- Debug: write obj files of patch (collected on master)
+        void writeOBJ(const primitivePatch& p, OBJstream& str) const;
+
+        //- Reset the AMI interpolator
+        virtual void resetAMI
+        (
+            const AMIPatchToPatchInterpolation::interpolationMethod& AMIMethod =
+                AMIPatchToPatchInterpolation::imFaceAreaWeight
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cyclicPeriodicAMI");
+
+
+    // Constructors
+
+        //- Construct from (base couped patch) components
+        cyclicPeriodicAMIPolyPatch
+        (
+            const word& name,
+            const label size,
+            const label start,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType,
+            const transformType transform = UNKNOWN
+        );
+
+        //- Construct from dictionary
+        cyclicPeriodicAMIPolyPatch
+        (
+            const word& name,
+            const dictionary& dict,
+            const label index,
+            const polyBoundaryMesh& bm,
+            const word& patchType
+        );
+
+        //- Construct as copy, resetting the boundary mesh
+        cyclicPeriodicAMIPolyPatch
+        (
+            const cyclicPeriodicAMIPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
+        //- Construct given the original patch and resetting the
+        //  face list and boundary mesh information
+        cyclicPeriodicAMIPolyPatch
+        (
+            const cyclicPeriodicAMIPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart,
+            const word& nbrPatchName
+        );
+
+        //- Construct given the original patch and a map
+        cyclicPeriodicAMIPolyPatch
+        (
+            const cyclicPeriodicAMIPolyPatch& pp,
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        );
+
+
+        //- Construct and return a clone, resetting the boundary mesh
+        virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new cyclicPeriodicAMIPolyPatch(*this, bm)
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const label newSize,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new cyclicPeriodicAMIPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    newSize,
+                    newStart,
+                    nbrPatchName_
+                )
+            );
+        }
+
+        //- Construct and return a clone, resetting the face list
+        //  and boundary mesh
+        virtual autoPtr<polyPatch> clone
+        (
+            const polyBoundaryMesh& bm,
+            const label index,
+            const labelUList& mapAddressing,
+            const label newStart
+        ) const
+        {
+            return autoPtr<polyPatch>
+            (
+                new cyclicPeriodicAMIPolyPatch
+                (
+                    *this,
+                    bm,
+                    index,
+                    mapAddressing,
+                    newStart
+                )
+            );
+        }
+
+
+    //- Destructor
+    virtual ~cyclicPeriodicAMIPolyPatch();
+
+
+    // Member Functions
+
+        //- Periodic patch ID
+        virtual label periodicPatchID() const;
+
+        //- Write the polyPatch data as a dictionary
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 0c1b794f7c..c187a63d80 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -63,7 +63,9 @@ indexedOctree/treeDataTriSurface.C
 
 searchableSurface = searchableSurface
 $(searchableSurface)/searchableBox.C
+$(searchableSurface)/searchableRotatedBox.C
 $(searchableSurface)/searchableCylinder.C
+$(searchableSurface)/searchableCone.C
 $(searchableSurface)/searchableDisk.C
 $(searchableSurface)/searchablePlane.C
 $(searchableSurface)/searchablePlate.C
@@ -75,6 +77,7 @@ $(searchableSurface)/searchableSurfacesQueries.C
 $(searchableSurface)/searchableSurfaceWithGaps.C
 $(searchableSurface)/triSurfaceMesh.C
 $(searchableSurface)/closedTriSurfaceMesh.C
+$(searchableSurface)/subTriSurfaceMesh.C
 
 topoSets = sets/topoSets
 $(topoSets)/cellSet.C
@@ -196,6 +199,9 @@ $(ACMICycPatches)/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
 $(ACMICycPatches)/cyclicACMIPointPatch/cyclicACMIPointPatch.C
 $(ACMICycPatches)/cyclicACMIPointPatchField/cyclicACMIPointPatchFields.C
 
+PeriodicAMICycPatches=$(AMI)/patches/cyclicPeriodicAMI
+$(PeriodicAMICycPatches)/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
+
 mappedPatches/mappedPolyPatch/mappedPatchBase.C
 mappedPatches/mappedPolyPatch/mappedPolyPatch.C
 mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index f254302a7f..f51b33af80 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -274,11 +274,7 @@ void Foam::FaceCellWave<Type, TrackingData>::checkCyclic
             )
         )
         {
-            FatalErrorIn
-            (
-                "FaceCellWave<Type, TrackingData>"
-                "::checkCyclic(const polyPatch&)"
-            )   << "problem: i:" << i1 << "  otheri:" << i2
+            FatalErrorInFunction
                 << "   faceInfo:" << allFaceInfo_[i1]
                 << "   otherfaceInfo:" << allFaceInfo_[i2]
                 << abort(FatalError);
@@ -286,11 +282,7 @@ void Foam::FaceCellWave<Type, TrackingData>::checkCyclic
 
         if (changedFace_[i1] != changedFace_[i2])
         {
-            FatalErrorIn
-            (
-                "FaceCellWave<Type, TrackingData>"
-                "::checkCyclic(const polyPatch&)"
-            )   << " problem: i:" << i1 << "  otheri:" << i2
+            FatalErrorInFunction
                 << "   faceInfo:" << allFaceInfo_[i1]
                 << "   otherfaceInfo:" << allFaceInfo_[i2]
                 << "   changedFace:" << changedFace_[i1]
@@ -810,6 +802,79 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
 }
 
 
+template<class Type, class TrackingData>
+void Foam::FaceCellWave<Type, TrackingData>::handleExplicitConnections()
+{
+    // Collect changed information
+
+    DynamicList<label> f0Baffle(explicitConnections_.size());
+    DynamicList<Type> f0Info(explicitConnections_.size());
+
+    DynamicList<label> f1Baffle(explicitConnections_.size());
+    DynamicList<Type> f1Info(explicitConnections_.size());
+
+    forAll(explicitConnections_, connI)
+    {
+        const labelPair& baffle = explicitConnections_[connI];
+
+        label f0 = baffle[0];
+        if (changedFace_[f0])
+        {
+            f0Baffle.append(connI);
+            f0Info.append(allFaceInfo_[f0]);
+        }
+
+        label f1 = baffle[1];
+        if (changedFace_[f1])
+        {
+            f1Baffle.append(connI);
+            f1Info.append(allFaceInfo_[f1]);
+        }
+    }
+
+
+    // Update other side with changed information
+
+    forAll(f1Info, index)
+    {
+        const labelPair& baffle = explicitConnections_[f1Baffle[index]];
+
+        label f0 = baffle[0];
+        Type& currentWallInfo = allFaceInfo_[f0];
+
+        if (!currentWallInfo.equal(f1Info[index], td_))
+        {
+            updateFace
+            (
+                f0,
+                f1Info[index],
+                propagationTol_,
+                currentWallInfo
+            );
+        }
+    }
+
+    forAll(f0Info, index)
+    {
+        const labelPair& baffle = explicitConnections_[f0Baffle[index]];
+
+        label f1 = baffle[1];
+        Type& currentWallInfo = allFaceInfo_[f1];
+
+        if (!currentWallInfo.equal(f0Info[index], td_))
+        {
+            updateFace
+            (
+                f1,
+                f0Info[index],
+                propagationTol_,
+                currentWallInfo
+            );
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Set up only. Use setFaceInfo and iterate() to do actual calculation.
@@ -823,6 +888,7 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
 )
 :
     mesh_(mesh),
+    explicitConnections_(0),
     allFaceInfo_(allFaceInfo),
     allCellInfo_(allCellInfo),
     td_(td),
@@ -847,12 +913,8 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
      || allCellInfo.size() != mesh_.nCells()
     )
     {
-        FatalErrorIn
-        (
-            "FaceCellWave<Type, TrackingData>::FaceCellWave"
-            "(const polyMesh&, const labelList&, const List<Type>,"
-            " UList<Type>&, UList<Type>&, const label maxIter)"
-        )   << "face and cell storage not the size of mesh faces, cells:"
+        FatalErrorInFunction
+            << "face and cell storage not the size of mesh faces, cells:"
             << endl
             << "    allFaceInfo   :" << allFaceInfo.size() << endl
             << "    mesh_.nFaces():" << mesh_.nFaces() << endl
@@ -878,6 +940,7 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
 )
 :
     mesh_(mesh),
+    explicitConnections_(0),
     allFaceInfo_(allFaceInfo),
     allCellInfo_(allCellInfo),
     td_(td),
@@ -902,12 +965,8 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
      || allCellInfo.size() != mesh_.nCells()
     )
     {
-        FatalErrorIn
-        (
-            "FaceCellWave<Type, TrackingData>::FaceCellWave"
-            "(const polyMesh&, const labelList&, const List<Type>,"
-            " UList<Type>&, UList<Type>&, const label maxIter)"
-        )   << "face and cell storage not the size of mesh faces, cells:"
+        FatalErrorInFunction
+            << "face and cell storage not the size of mesh faces, cells:"
             << endl
             << "    allFaceInfo   :" << allFaceInfo.size() << endl
             << "    mesh_.nFaces():" << mesh_.nFaces() << endl
@@ -924,12 +983,78 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
 
     if ((maxIter > 0) && (iter >= maxIter))
     {
-        FatalErrorIn
-        (
-            "FaceCellWave<Type, TrackingData>::FaceCellWave"
-            "(const polyMesh&, const labelList&, const List<Type>,"
-            " UList<Type>&, UList<Type>&, const label maxIter)"
-        )
+        FatalErrorInFunction
+            << "Maximum number of iterations reached. Increase maxIter." << endl
+            << "    maxIter:" << maxIter << endl
+            << "    nChangedCells:" << nChangedCells_ << endl
+            << "    nChangedFaces:" << nChangedFaces_ << endl
+            << exit(FatalError);
+    }
+}
+
+
+// Iterate, propagating changedFacesInfo across mesh, until no change (or
+// maxIter reached). Initial cell values specified.
+template<class Type, class TrackingData>
+Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
+(
+    const polyMesh& mesh,
+    const List<labelPair>& explicitConnections,
+    const bool handleCyclicAMI,
+    const labelList& changedFaces,
+    const List<Type>& changedFacesInfo,
+    UList<Type>& allFaceInfo,
+    UList<Type>& allCellInfo,
+    const label maxIter,
+    TrackingData& td
+)
+:
+    mesh_(mesh),
+    explicitConnections_(explicitConnections),
+    allFaceInfo_(allFaceInfo),
+    allCellInfo_(allCellInfo),
+    td_(td),
+    changedFace_(mesh_.nFaces(), false),
+    changedFaces_(mesh_.nFaces()),
+    nChangedFaces_(0),
+    changedCell_(mesh_.nCells(), false),
+    changedCells_(mesh_.nCells()),
+    nChangedCells_(0),
+    hasCyclicPatches_(hasPatch<cyclicPolyPatch>()),
+    hasCyclicAMIPatches_
+    (
+        handleCyclicAMI
+     && returnReduce(hasPatch<cyclicAMIPolyPatch>(), orOp<bool>())
+    ),
+    nEvals_(0),
+    nUnvisitedCells_(mesh_.nCells()),
+    nUnvisitedFaces_(mesh_.nFaces())
+{
+    if
+    (
+        allFaceInfo.size() != mesh_.nFaces()
+     || allCellInfo.size() != mesh_.nCells()
+    )
+    {
+        FatalErrorInFunction
+            << "face and cell storage not the size of mesh faces, cells:"
+            << endl
+            << "    allFaceInfo   :" << allFaceInfo.size() << endl
+            << "    mesh_.nFaces():" << mesh_.nFaces() << endl
+            << "    allCellInfo   :" << allCellInfo.size() << endl
+            << "    mesh_.nCells():" << mesh_.nCells()
+            << exit(FatalError);
+    }
+
+    // Copy initial changed faces data
+    setFaceInfo(changedFaces, changedFacesInfo);
+
+    // Iterate until nothing changes
+    label iter = iterate(maxIter);
+
+    if ((maxIter > 0) && (iter >= maxIter))
+    {
+        FatalErrorInFunction
             << "Maximum number of iterations reached. Increase maxIter." << endl
             << "    maxIter:" << maxIter << endl
             << "    nChangedCells:" << nChangedCells_ << endl
@@ -975,7 +1100,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
         label faceI = changedFaces_[changedFaceI];
         if (!changedFace_[faceI])
         {
-            FatalErrorIn("FaceCellWave<Type, TrackingData>::faceToCell()")
+            FatalErrorInFunction
                 << "Face " << faceI
                 << " not marked as having been changed"
                 << abort(FatalError);
@@ -1058,7 +1183,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::cellToFace()
         label cellI = changedCells_[changedCellI];
         if (!changedCell_[cellI])
         {
-            FatalErrorIn("FaceCellWave<Type, TrackingData>::cellToFace()")
+            FatalErrorInFunction
                 << "Cell " << cellI << " not marked as having been changed"
                 << abort(FatalError);
         }
@@ -1093,6 +1218,10 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::cellToFace()
     // Handled all changed cells by now
     nChangedCells_ = 0;
 
+
+    // Transfer across any explicitly provided internal connections
+    handleExplicitConnections();
+
     if (hasCyclicPatches_)
     {
         // Transfer changed faces across cyclic halves
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.H b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
index 93e2277daa..f8d43e6865 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.H
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,6 +50,7 @@ SourceFiles
 #include "boolList.H"
 #include "labelList.H"
 #include "primitiveFieldsFwd.H"
+#include "labelPair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,6 +82,9 @@ class FaceCellWave
         //- Reference to mesh
         const polyMesh& mesh_;
 
+        //- Optional boundary faces that information should travel through
+        const List<labelPair> explicitConnections_;
+
         //- Information for all faces
         UList<Type>& allFaceInfo_;
 
@@ -232,6 +236,10 @@ class FaceCellWave
             //- Merge data from across AMI cyclics
             void handleAMICyclicPatches();
 
+            //- Merge data across explicitly provided local connections (usually
+            //  baffles)
+            void handleExplicitConnections();
+
 
       // Private static data
 
@@ -286,6 +294,23 @@ public:
             TrackingData& td = dummyTrackData_
         );
 
+        //- Construct from mesh and explicitly connected boundary faces
+        //  and list of changed faces with the Type
+        //  for these faces. Iterates until nothing changes or maxIter reached.
+        //  (maxIter can be 0)
+        FaceCellWave
+        (
+            const polyMesh&,
+            const List<labelPair>& explicitConnections,
+            const bool handleCyclicAMI,
+            const labelList& initialChangedFaces,
+            const List<Type>& changedFacesInfo,
+            UList<Type>& allFaceInfo,
+            UList<Type>& allCellInfo,
+            const label maxIter,
+            TrackingData& td = dummyTrackData_
+        );
+
 
     // Member Functions
 
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C
index 0ac91b03c8..4435571b91 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -328,12 +328,8 @@ PatchEdgeFaceWave
 
     if (allEdgeInfo_.size() != patch_.nEdges())
     {
-        FatalErrorIn
-        (
-            "PatchEdgeFaceWave<Type, TrackingData>::PatchEdgeFaceWave"
-            "(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"
+        FatalErrorInFunction
+            << "size of edgeInfo work array is not equal to the number"
             << " of edges in the patch" << endl
             << "    edgeInfo   :" << allEdgeInfo_.size() << endl
             << "    patch.nEdges:" << patch_.nEdges()
@@ -341,12 +337,8 @@ PatchEdgeFaceWave
     }
     if (allFaceInfo_.size() != patch_.size())
     {
-        FatalErrorIn
-        (
-            "PatchEdgeFaceWave<Type, TrackingData>::PatchEdgeFaceWave"
-            "(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"
+        FatalErrorInFunction
+            << "size of edgeInfo work array is not equal to the number"
             << " of faces in the patch" << endl
             << "    faceInfo   :" << allFaceInfo_.size() << endl
             << "    patch.size:" << patch_.size()
@@ -367,12 +359,8 @@ PatchEdgeFaceWave
 
     if ((maxIter > 0) && (iter >= maxIter))
     {
-        FatalErrorIn
-        (
-            "PatchEdgeFaceWave<Type, TrackingData>::PatchEdgeFaceWave"
-            "(const polyMesh&, const labelList&, const List<Type>,"
-            " List<Type>&, List<Type>&, const label maxIter)"
-        )   << "Maximum number of iterations reached. Increase maxIter." << endl
+        FatalErrorInFunction
+            << "Maximum number of iterations reached. Increase maxIter." << endl
             << "    maxIter:" << maxIter << endl
             << "    changedEdges:" << changedEdges_.size() << endl
             << "    changedFaces:" << changedFaces_.size() << endl
@@ -511,7 +499,7 @@ faceToEdge()
 
         if (!changedFace_[faceI])
         {
-            FatalErrorIn("PatchEdgeFaceWave<Type, TrackingData>::faceToEdge()")
+            FatalErrorInFunction
                 << "face " << faceI
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
@@ -576,7 +564,7 @@ edgeToFace()
 
         if (!changedEdge_[edgeI])
         {
-            FatalErrorIn("PatchEdgeFaceWave<Type, TrackingData>::edgeToFace()")
+            FatalErrorInFunction
                 << "edge " << edgeI
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionI.H b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionI.H
index 07e6935b25..e66ed64813 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionI.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ inline bool Foam::patchEdgeFaceRegion::update
 {
     if (!w2.valid(td))
     {
-        FatalErrorIn("patchEdgeFaceRegion::update(..)")
+        FatalErrorInFunction
             << "problem." << abort(FatalError);
     }
 
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionsI.H b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionsI.H
index f39488a018..a3c373bbb9 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionsI.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceRegionsI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ inline bool Foam::patchEdgeFaceRegions::updateEdge
 
     if (!faceInfo.valid(td))
     {
-        FatalErrorIn("patchEdgeFaceRegions::updateEdge(..)")
+        FatalErrorInFunction
             << "problem." << abort(FatalError);
     }
 
@@ -157,7 +157,7 @@ inline bool Foam::patchEdgeFaceRegions::updateEdge
 
     if (!edgeInfo.valid(td))
     {
-        FatalErrorIn("patchEdgeFaceRegions::updateEdge(..)")
+        FatalErrorInFunction
             << "problem." << abort(FatalError);
     }
 
@@ -217,7 +217,7 @@ inline bool Foam::patchEdgeFaceRegions::updateFace
 
     if (!edgeInfo.valid(td))
     {
-        FatalErrorIn("patchEdgeFaceRegions::updateFace(..)")
+        FatalErrorInFunction
             << "problem." << abort(FatalError);
     }
 
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointData.C b/src/meshTools/algorithms/PointEdgeWave/PointData.C
new file mode 100644
index 0000000000..f480f0a990
--- /dev/null
+++ b/src/meshTools/algorithms/PointEdgeWave/PointData.C
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PointData.H"
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+template<class DataType>
+Foam::Ostream& Foam::operator<<(Ostream& os, const PointData<DataType>& pd)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        return os
+            << static_cast<const pointEdgePoint&>(pd)
+            << token::SPACE << pd.data();
+    }
+    else
+    {
+        return os
+            << static_cast<const pointEdgePoint&>(pd)
+            << pd.data();
+    }
+}
+
+
+template<class DataType>
+Foam::Istream& Foam::operator>>(Istream& is, PointData<DataType>& pd)
+{
+    return is >> static_cast<pointEdgePoint&>(pd) >> pd.data_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointData.H b/src/meshTools/algorithms/PointEdgeWave/PointData.H
new file mode 100644
index 0000000000..02a97092bf
--- /dev/null
+++ b/src/meshTools/algorithms/PointEdgeWave/PointData.H
@@ -0,0 +1,211 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::PointData
+
+Description
+    Variant of pointEdgePoint with some transported additional data. Templated
+    on the transported data type.
+
+SourceFiles
+    PointDataI.H
+    PointData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PointData_H
+#define PointData_H
+
+#include "pointEdgePoint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class Istream;
+class Ostream;
+template<class DataType>
+class PointData;
+
+// Forward declaration of friend functions and operators
+template<class DataType>
+Ostream& operator<<(Ostream&, const PointData<DataType>&);
+template<class DataType>
+Istream& operator>>(Istream&, PointData<DataType>&);
+
+/*---------------------------------------------------------------------------*\
+                           Class PointData Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class DataType>
+class PointData
+:
+    public pointEdgePoint
+{
+private:
+
+    // Private data
+
+        //- Additional transported data
+        DataType data_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline PointData();
+
+        //- Construct from origin, distance and data
+        inline PointData
+        (
+            const point& origin,
+            const scalar distSqr,
+            const DataType& data
+        );
+
+        //- Construct as copy
+        inline PointData(const PointData&);
+
+
+    // Member Functions
+
+        // Access
+
+            //- Const access the data
+            inline const DataType& data() const;
+
+
+        // Needed by meshWave
+
+            //- Apply rotation matrix to the data
+            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<DataType>& edgeInfo,
+                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<DataType>& newPointInfo,
+                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<DataType>& newPointInfo,
+                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<DataType>& pointInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+    // Member Operators
+
+        inline bool operator==(const PointData<DataType>&) const;
+        inline bool operator!=(const PointData<DataType>&) const;
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<< <DataType>
+        (
+            Ostream&,
+            const PointData<DataType>&
+        );
+        friend Istream& operator>> <DataType>
+        (
+            Istream&,
+            PointData<DataType>&
+        );
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Data associated with PointData types is contiguous
+
+template<>
+inline bool contiguous<PointData<scalar> >()
+{
+    return true;
+}
+
+template<>
+inline bool contiguous<PointData<vector> >()
+{
+    return true;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "PointDataI.H"
+
+#ifdef NoRepository
+#   include "PointData.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointDataI.H b/src/meshTools/algorithms/PointEdgeWave/PointDataI.H
new file mode 100644
index 0000000000..6ecc1c49fe
--- /dev/null
+++ b/src/meshTools/algorithms/PointEdgeWave/PointDataI.H
@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMesh.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class DataType>
+inline Foam::PointData<DataType>::PointData()
+:
+    pointEdgePoint()
+{}
+
+
+template<class DataType>
+inline Foam::PointData<DataType>::PointData
+(
+    const point& origin,
+    const scalar distSqr,
+    const DataType& data
+)
+:
+    pointEdgePoint(origin, distSqr),
+    data_(data)
+{}
+
+
+template<class DataType>
+inline Foam::PointData<DataType>::PointData(const PointData<DataType>& wpt)
+:
+    pointEdgePoint(wpt),
+    data_(wpt.data())
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class DataType>
+inline const DataType& Foam::PointData<DataType>::data() const
+{
+    return data_;
+}
+
+
+template<class DataType>
+template<class TrackingData>
+inline void Foam::PointData<DataType>::transform
+(
+    const tensor& rotTensor,
+    TrackingData& td
+)
+{
+    pointEdgePoint::transform(rotTensor, td);
+    data_ = Foam::transform(rotTensor, data_);
+}
+
+
+template<class DataType>
+template<class TrackingData>
+inline bool Foam::PointData<DataType>::updatePoint
+(
+    const polyMesh& mesh,
+    const label pointI,
+    const label edgeI,
+    const PointData<DataType>& edgeInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if
+    (
+        pointEdgePoint::updatePoint
+        (
+            mesh,
+            pointI,
+            edgeI,
+            edgeInfo,
+            tol,
+            td
+        )
+    )
+    {
+        data_ = edgeInfo.data_;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class DataType>
+template<class TrackingData>
+inline bool Foam::PointData<DataType>::updatePoint
+(
+    const polyMesh& mesh,
+    const label pointI,
+    const PointData<DataType>& newPointInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if
+    (
+        pointEdgePoint::updatePoint
+        (
+            mesh,
+            pointI,
+            newPointInfo,
+            tol,
+            td
+        )
+    )
+    {
+        data_ = newPointInfo.data_;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class DataType>
+template<class TrackingData>
+inline bool Foam::PointData<DataType>::updatePoint
+(
+    const PointData<DataType>& newPointInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if (pointEdgePoint::updatePoint(newPointInfo, tol, td))
+    {
+        data_ = newPointInfo.data_;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+template<class DataType>
+template<class TrackingData>
+inline bool Foam::PointData<DataType>::updateEdge
+(
+    const polyMesh& mesh,
+    const label edgeI,
+    const label pointI,
+    const PointData<DataType>& pointInfo,
+    const scalar tol,
+    TrackingData& td
+
+)
+{
+    if
+    (
+        pointEdgePoint::updateEdge
+        (
+            mesh,
+            edgeI,
+            pointI,
+            pointInfo,
+            tol,
+            td
+        )
+    )
+    {
+        data_ = pointInfo.data_;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class DataType>
+inline bool Foam::PointData<DataType>::operator==
+(
+    const Foam::PointData<DataType>& rhs
+)
+const
+{
+    return pointEdgePoint::operator==(rhs) && (data() == rhs.data());
+}
+
+
+template<class DataType>
+inline bool Foam::PointData<DataType>::operator!=
+(
+    const Foam::PointData<DataType>& rhs
+)
+const
+{
+    return !(*this == rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index a4535d1553..3bd86cdfe3 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,11 +134,8 @@ void Foam::PointEdgeWave<Type, TrackingData>::transform
     }
     else
     {
-        FatalErrorIn
-        (
-            "PointEdgeWave<Type, TrackingData>::transform"
-            "(const tensorField&, List<Type>&)"
-        )   << "Non-uniform transformation on patch " << patch.name()
+        FatalErrorInFunction
+            << "Non-uniform transformation on patch " << patch.name()
             << " of type " << patch.type()
             << " not supported for point fields"
             << abort(FatalError);
@@ -638,12 +635,8 @@ Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
 {
     if (allPointInfo_.size() != mesh_.nPoints())
     {
-        FatalErrorIn
-        (
-            "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"
+        FatalErrorInFunction
+            << "size of pointInfo work array is not equal to the number"
             << " of points in the mesh" << endl
             << "    pointInfo   :" << allPointInfo_.size() << endl
             << "    mesh.nPoints:" << mesh_.nPoints()
@@ -651,12 +644,8 @@ Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
     }
     if (allEdgeInfo_.size() != mesh_.nEdges())
     {
-        FatalErrorIn
-        (
-            "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"
+        FatalErrorInFunction
+            << "size of edgeInfo work array is not equal to the number"
             << " of edges in the mesh" << endl
             << "    edgeInfo   :" << allEdgeInfo_.size() << endl
             << "    mesh.nEdges:" << mesh_.nEdges()
@@ -678,12 +667,8 @@ Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
 
     if ((maxIter > 0) && (iter >= maxIter))
     {
-        FatalErrorIn
-        (
-            "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
+        FatalErrorInFunction
+            << "Maximum number of iterations reached. Increase maxIter." << endl
             << "    maxIter:" << maxIter << endl
             << "    nChangedPoints:" << nChangedPoints_ << endl
             << "    nChangedEdges:" << nChangedEdges_ << endl
@@ -794,7 +779,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::edgeToPoint()
 
         if (!changedEdge_[edgeI])
         {
-            FatalErrorIn("PointEdgeWave<Type, TrackingData>::edgeToPoint()")
+            FatalErrorInFunction
                 << "edge " << edgeI
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
@@ -872,7 +857,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
 
         if (!changedPoint_[pointI])
         {
-            FatalErrorIn("PointEdgeWave<Type, TrackingData>::pointToEdge()")
+            FatalErrorInFunction
                 << "Point " << pointI
                 << " not marked as having been changed" << nl
                 << "This might be caused by multiple occurences of the same"
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index 800d007f6f..066062c24f 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -287,11 +287,8 @@ void Foam::cellClassification::markCells
 
         if (returnReduce(cellI, maxOp<label>()) == -1)
         {
-            FatalErrorIn
-            (
-                "List<cellClassification::cType> markCells"
-                "(const meshSearch&, const boolList&, const pointField&)"
-            )   << "outsidePoint " << outsidePts[outsidePtI]
+            FatalErrorInFunction
+                << "outsidePoint " << outsidePts[outsidePtI]
                 << " is not inside any cell"
                 << nl << "It might be on a face or outside the geometry"
                 << exit(FatalError);
@@ -513,11 +510,8 @@ Foam::cellClassification::cellClassification
 {
     if (mesh_.nCells() != size())
     {
-        FatalErrorIn
-        (
-            "cellClassification::cellClassification"
-            "(const polyMesh&, const labelList&)"
-        )   << "Number of elements of cellType argument is not equal to the"
+        FatalErrorInFunction
+            << "Number of elements of cellType argument is not equal to the"
             << " number of cells" << abort(FatalError);
     }
 }
diff --git a/src/meshTools/cellClassification/cellInfoI.H b/src/meshTools/cellClassification/cellInfoI.H
index 300f920036..11902e02b1 100644
--- a/src/meshTools/cellClassification/cellInfoI.H
+++ b/src/meshTools/cellClassification/cellInfoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ inline bool Foam::cellInfo::update
      || (w2.type() == cellClassification::CUT)
     )
     {
-        FatalErrorIn("cellInfo::update(const cellInfo&)")
+        FatalErrorInFunction
             << "Problem: trying to propagate NOTSET or CUT type:" << w2.type()
             << " into cell/face with type:" << type() << endl
             << "thisFaceI:" << thisFaceI
@@ -77,7 +77,7 @@ inline bool Foam::cellInfo::update
     }
 
     // Two conflicting types
-    FatalErrorIn("cellInfo::update(const cellInfo&)")
+    FatalErrorInFunction
         << "Problem: trying to propagate conflicting types:" << w2.type()
         << " into cell/face with type:" << type() << endl
         << "thisFaceI:" << thisFaceI
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 103f4ef992..fb8300842a 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,25 +186,25 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
 
             if (!nbs.found(nb))
             {
-                SeriousErrorIn("Foam::cellDistFuncs::getPointNeighbours")
+                SeriousErrorInFunction
                     << "getPointNeighbours : patchFaceI:" << patchFaceI
                     << " verts:" << f << endl;
 
                 forAll(f, fp)
                 {
-                    SeriousErrorIn("Foam::cellDistFuncs::getPointNeighbours")
+                    SeriousErrorInFunction
                         << "point:" << f[fp] << " pointFaces:"
                         << patch.pointFaces()[f[fp]] << endl;
                 }
 
                 for (label i = 0; i < nNeighbours; i++)
                 {
-                    SeriousErrorIn("Foam::cellDistFuncs::getPointNeighbours")
+                    SeriousErrorInFunction
                         << "fast nbr:" << neighbours[i]
                         << endl;
                 }
 
-                FatalErrorIn("getPointNeighbours")
+                FatalErrorInFunction
                     << "Problem: fast pointNeighbours routine included " << nb
                     << " which is not in proper neigbour list " << nbs.toc()
                     << abort(FatalError);
@@ -214,7 +214,7 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
 
         if (nbs.size())
         {
-            FatalErrorIn("getPointNeighbours")
+            FatalErrorInFunction
                 << "Problem: fast pointNeighbours routine did not find "
                 << nbs.toc() << abort(FatalError);
         }
diff --git a/src/meshTools/cellFeatures/cellFeatures.C b/src/meshTools/cellFeatures/cellFeatures.C
index 1282b16aaf..660ba7d3fb 100644
--- a/src/meshTools/cellFeatures/cellFeatures.C
+++ b/src/meshTools/cellFeatures/cellFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,8 @@ bool Foam::cellFeatures::faceAlignedEdge(const label faceI, const label edgeI)
         }
     }
 
-    FatalErrorIn
-    (
-        "cellFeatures::faceAlignedEdge(const label, const label)"
-    )   << "Can not find edge " << mesh_.edges()[edgeI]
+    FatalErrorInFunction
+        << "Can not find edge " << mesh_.edges()[edgeI]
         << " on face " << faceI << abort(FatalError);
 
     return false;
@@ -101,11 +99,8 @@ Foam::label Foam::cellFeatures::nextEdge
         }
     }
 
-    FatalErrorIn
-    (
-        "cellFeatures::nextEdge(const label, const Map<label>"
-        ", const labelHashSet&, const label, const label, const label)"
-    )   << "Can not find edge in " << featureEdge_ << " connected to edge "
+    FatalErrorInFunction
+        << "Can not find edge in " << featureEdge_ << " connected to edge "
         << thisEdgeI << " at vertex " << thisVertI << endl
         << "This might mean that the externalEdges do not form a closed loop"
         << abort(FatalError);
@@ -359,7 +354,7 @@ void Foam::cellFeatures::calcSuperFaces() const
 
                 if (superFace.size() <= 2)
                 {
-                    WarningIn("cellFeatures::calcSuperFaces")
+                    WarningInFunction
                         << " Can not collapse faces " << faceMap_[superFaceI]
                         << " into one big face on cell " << cellI_ << endl
                         << "Try decreasing minCos:" << minCos_ << endl;
@@ -427,10 +422,8 @@ bool Foam::cellFeatures::isFeaturePoint(const label edge0, const label edge1)
      || (edge1 >= mesh_.nEdges())
     )
     {
-        FatalErrorIn
-        (
-            "cellFeatures::isFeatureVertex(const label, const label)"
-        )   << "Illegal edge labels : edge0:" << edge0 << " edge1:" << edge1
+        FatalErrorInFunction
+            << "Illegal edge labels : edge0:" << edge0 << " edge1:" << edge1
             << abort(FatalError);
     }
 
@@ -468,11 +461,8 @@ bool Foam::cellFeatures::isFeaturePoint(const label edge0, const label edge1)
     {
         cosAngle = GREAT;   // satisfy compiler
 
-        FatalErrorIn
-        (
-            "cellFeatures::isFeaturePoint(const label, const label"
-            ", const label)"
-        )   << "Edges do not share common vertex. e0:" << e0
+        FatalErrorInFunction
+            << "Edges do not share common vertex. e0:" << e0
             << " e1:" << e1 << abort(FatalError);
     }
 
@@ -499,10 +489,8 @@ bool Foam::cellFeatures::isFeatureVertex(const label faceI, const label vertI)
      || (vertI >= mesh_.nPoints())
     )
     {
-        FatalErrorIn
-        (
-            "cellFeatures::isFeatureVertex(const label, const label)"
-        )   << "Illegal face " << faceI << " or vertex " << vertI
+        FatalErrorInFunction
+            << "Illegal face " << faceI << " or vertex " << vertI
             << abort(FatalError);
     }
 
@@ -533,10 +521,8 @@ bool Foam::cellFeatures::isFeatureVertex(const label faceI, const label vertI)
 
     if (edge1 == -1)
     {
-        FatalErrorIn
-        (
-            "cellFeatures::isFeatureVertex(const label, const label)"
-        )   << "Did not find two edges sharing vertex " << vertI
+        FatalErrorInFunction
+            << "Did not find two edges sharing vertex " << vertI
             << " on face " << faceI << " vertices:" << mesh_.faces()[faceI]
             << abort(FatalError);
     }
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
index ff36b3e866..0ffe75d2e6 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,11 +69,7 @@ Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::transform
     const vectorField& st
 ) const
 {
-    notImplemented
-    (
-        "tmp<vectorField> Foam::EulerCoordinateRotation:: "
-        "transform(const vectorField& st) const"
-    );
+    NotImplemented;
     return tmp<vectorField>(NULL);
 }
 
@@ -83,21 +79,14 @@ Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::invTransform
     const vectorField& st
 ) const
 {
-    notImplemented
-    (
-        "tmp<vectorField>  Foam::EulerCoordinateRotation::"
-        "invTransform(const vectorField& st) const"
-    );
+    NotImplemented;
     return tmp<vectorField>(NULL);
 }
 
 
 const Foam::tensorField& Foam::EulerCoordinateRotation::Tr() const
 {
-    notImplemented
-    (
-        "const tensorField& EulerCoordinateRotation::Tr() const"
-    );
+    NotImplemented;
     return NullObjectRef<tensorField>();
 }
 
@@ -107,10 +96,7 @@ Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
     const tensorField& st
 ) const
 {
-     notImplemented
-    (
-        "const tensorField& EulerCoordinateRotation::transformTensor() const"
-    );
+     NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
@@ -130,13 +116,7 @@ Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
     const labelList& cellMap
 ) const
 {
-    notImplemented
-    (
-        "tmp<Foam::tensorField> EulerCoordinateRotation::transformTensor "
-        " const tensorField& st,"
-        " const labelList& cellMap "
-        ") const"
-    );
+    NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
index 2515ebadae..fde7eb39cc 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,11 +70,7 @@ Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::transform
     const vectorField& st
 ) const
 {
-    notImplemented
-    (
-        "tmp<vectorField> Foam::STARCDCoordinateRotation:: "
-        "transform(const vectorField& st) const"
-    );
+    NotImplemented;
     return tmp<vectorField>(NULL);
 }
 
@@ -84,21 +80,14 @@ Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::invTransform
     const vectorField& st
 ) const
 {
-    notImplemented
-    (
-        "tmp<vectorField>  Foam::STARCDCoordinateRotation::"
-        "invTransform(const vectorField& st) const"
-    );
+    NotImplemented;
     return tmp<vectorField>(NULL);
 }
 
 
 const Foam::tensorField& Foam::STARCDCoordinateRotation::Tr() const
 {
-    notImplemented
-    (
-        "const tensorField& STARCDCoordinateRotatio::Tr() const"
-    );
+    NotImplemented;
     return NullObjectRef<tensorField>();
 }
 
@@ -108,10 +97,7 @@ Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
     const tensorField& st
 ) const
 {
-     notImplemented
-    (
-        "tmp<Foam::tensorField> STARCDCoordinateRotation::transformTensor()"
-    );
+     NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
@@ -131,13 +117,7 @@ Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
     const labelList& cellMap
 ) const
 {
-    notImplemented
-    (
-        "tmp<Foam::tensorField> STARCDCoordinateRotation::transformTensor "
-        " const tensorField& st,"
-        " const labelList& cellMap "
-        ") const"
-    );
+    NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
index 03479be542..c28a6fd3b4 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ void Foam::axesRotation::calcTransform
 
     if (mag(b) < SMALL)
     {
-        FatalErrorIn("axesRotation::calcTransform()")
+        FatalErrorInFunction
             << "axis1, axis2 appear co-linear: "
             << axis1 << ", " << axis2 << endl
             << abort(FatalError);
@@ -86,15 +86,7 @@ void Foam::axesRotation::calcTransform
         }
         default:
         {
-            FatalErrorIn
-            (
-                "axesRotation::calcTransform"
-                "("
-                    "const vector&,"
-                    "const vector&,"
-                    "const axisOrder&"
-                ")"
-            )
+            FatalErrorInFunction
                 << "Unhandled axes specifictation" << endl
                 << abort(FatalError);
 
@@ -169,10 +161,7 @@ Foam::axesRotation::axesRotation(const tensor& R)
 
 const Foam::tensorField& Foam::axesRotation::Tr() const
 {
-    notImplemented
-    (
-        "const Foam::tensorField& axesRotation::Tr() const"
-    );
+    NotImplemented;
     return NullObjectRef<tensorField>();
 }
 
@@ -212,10 +201,7 @@ Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
     const tensorField& st
 ) const
 {
-    notImplemented
-    (
-        "const tensorField& axesRotation::transformTensor() const"
-    );
+    NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
@@ -235,14 +221,7 @@ Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
     const labelList& cellMap
 ) const
 {
-    notImplemented
-    (
-        "tmp<Foam::tensorField> axesRotation::transformTensor "
-        "("
-            "const tensorField&,"
-            "const labelList&"
-        ") const"
-    );
+    NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
@@ -307,10 +286,8 @@ void Foam::axesRotation::operator=(const dictionary& dict)
     }
     else
     {
-        FatalErrorIn
-        (
-            "axesRotation::operator=(const dictionary&) "
-        )   << "not entry of the type (e1, e2) or (e2, e3) or (e3, e1) "
+        FatalErrorInFunction
+            << "not entry of the type (e1, e2) or (e2, e3) or (e3, e1) "
             << "found "
             << exit(FatalError);
     }
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
index fe1a0ba00b..02b111038b 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,13 +47,8 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "coordinateRotation::New"
-            "("
-            "   const dictionary&, "
-            "   const objectRegistry& "
-            ")",
             dict
         )   << "Unknown coordinateRotation type "
             << rotType << nl << nl
@@ -86,12 +81,8 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "coordinateRotation::New"
-            "("
-            "   const dictionary&, "
-            ")",
             dict
         )   << "Unknown coordinateRotation type "
             << rotType << nl << nl
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index 8d0c85568c..a5427b5fa1 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -152,7 +152,7 @@ Foam::cylindrical::cylindrical(const dictionary& dict)
     origin_(),
     e3_()
 {
-    FatalErrorIn("cylindrical(const dictionary&)")
+    FatalErrorInFunction
         << " cylindrical can not be constructed from dictionary "
         << " use the construtctor : "
            "("
@@ -210,10 +210,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
 {
     if (Rptr_->size() != vf.size())
     {
-        FatalErrorIn
-        (
-            "tmp<vectorField> cylindrical::transform(const vectorField&)"
-        )
+        FatalErrorInFunction
             << "vectorField st has different size to tensorField "
             << abort(FatalError);
     }
@@ -224,10 +221,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
 
 Foam::vector Foam::cylindrical::transform(const vector& v) const
 {
-    notImplemented
-    (
-        "vector cylindrical::transform(const vector&) const"
-    );
+    NotImplemented;
     return vector::zero;
 }
 
@@ -253,10 +247,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::invTransform
 
 Foam::vector Foam::cylindrical::invTransform(const vector& v) const
 {
-    notImplemented
-    (
-        "vector cylindrical::invTransform(const vector&) const"
-    );
+    NotImplemented;
     return vector::zero;
 }
 
@@ -278,13 +269,7 @@ Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
 {
     if (Rptr_->size() != tf.size())
     {
-        FatalErrorIn
-        (
-            "tmp<tensorField> cylindrical::transformTensor"
-            "("
-                "const tensorField&"
-            ")"
-        )
+        FatalErrorInFunction
             << "tensorField st has different size to tensorField Tr"
             << abort(FatalError);
     }
@@ -297,10 +282,7 @@ Foam::tensor Foam::cylindrical::transformTensor
     const tensor& t
 ) const
 {
-    notImplemented
-    (
-        "tensor cylindrical::transformTensor(const tensor&) const"
-    );
+    NotImplemented;
 
     return tensor::zero;
 }
@@ -314,14 +296,7 @@ Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
 {
     if (cellMap.size() != tf.size())
     {
-        FatalErrorIn
-        (
-            "tmp<tensorField> cylindrical::transformTensor"
-            "("
-                "const tensorField&, "
-                "const labelList&"
-            ")"
-        )
+        FatalErrorInFunction
             << "tensorField tf has different size to tensorField Tr"
             << abort(FatalError);
     }
@@ -347,7 +322,7 @@ Foam::tmp<Foam::symmTensorField> Foam::cylindrical::transformVector
 {
     if (Rptr_->size() != vf.size())
     {
-        FatalErrorIn("cylindrical::transformVector(const vectorField&)")
+        FatalErrorInFunction
             << "tensorField vf has different size to tensorField Tr"
             << abort(FatalError);
     }
@@ -369,10 +344,7 @@ Foam::symmTensor Foam::cylindrical::transformVector
     const vector& v
 ) const
 {
-    notImplemented
-    (
-        "tensor cylindrical::transformVector(const vector&) const"
-    );
+    NotImplemented;
     return symmTensor::zero;
 }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index f166f95e71..50e0450b27 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -143,28 +143,28 @@ public:
         //- Return local-to-global transformation tensor
         virtual const tensor& R() const
         {
-            notImplemented("const tensor& cylindrical::R() const");
+            NotImplemented;
             return tensor::zero;
         }
 
         //- Return global-to-local transformation tensor
         virtual const tensor& Rtr() const
         {
-             notImplemented("const tensor& cylindrical::Rtr() const");
+             NotImplemented;
              return tensor::zero;
         }
 
         //- Return local Cartesian x-axis
         virtual const vector e1() const
         {
-            notImplemented("const tensor& cylindrical::e1() const");
+            NotImplemented;
             return vector::zero;
         }
 
         //- Return local Cartesian y-axis
         virtual const vector e2() const
         {
-            notImplemented("const tensor& cylindrical::e2() const");
+            NotImplemented;
             return vector::zero;
         }
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index a63423aab2..68aa5e06f9 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,11 +147,8 @@ Foam::coordinateSystem::coordinateSystem
 
         if (index < 0)
         {
-            FatalErrorIn
-            (
-                "coordinateSystem::coordinateSystem"
-                "(const objectRegistry&, const dictionary&):"
-            )   << "could not find coordinate system: " << key << nl
+            FatalErrorInFunction
+                << "could not find coordinate system: " << key << nl
                 << "available coordinate systems: " << lst.toc() << nl << nl
                 << exit(FatalError);
         }
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index 98c7ebbc57..59f3e520cb 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,9 +42,8 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "coordinateSystem::New(const objectRegistry&, const dictionary&)",
             dict
         )   << "Unknown coordinateSystem type "
             << coordType << nl << nl
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H b/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
index 6eac8946f6..a5c8a99c7d 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,8 @@ void Foam::edgeFaceCirculator::setFace
 
     if (!isBoundaryEdge_ && !mesh_.isInternalFace(faceI))
     {
-        FatalErrorIn
-        (
-            "edgeFaceCirculator::setFace(const label, const label)"
-        )   << "Edge is not defined as boundary edge but still walked to"
+        FatalErrorInFunction
+            << "Edge is not defined as boundary edge but still walked to"
             << " boundary face:" << faceI << " on cell:" << cellI
             << abort(FatalError);
     }
@@ -79,7 +77,7 @@ void Foam::edgeFaceCirculator::otherFace(const label cellI)
         }
     }
 
-    FatalErrorIn("edgeFaceCirculator::otherFace(const label)")
+    FatalErrorInFunction
         << "Could not find next face stepping"
         << " through cell along edge." << endl
         << "face:" << faceLabel_ << " index in face:" << index_
@@ -197,10 +195,8 @@ bool Foam::edgeFaceCirculator::sameOrder(const label v0, const label v1) const
 
     if (fp != index_)
     {
-        FatalErrorIn
-        (
-            "edgeFaceCirculator::sameOrder(const label, const label) const"
-        )   << "v0:" << v1 << " and v1:" << v1
+        FatalErrorInFunction
+            << "v0:" << v1 << " and v1:" << v1
             << " not on position:" << index_ << " on face:" << faceLabel_
             << " verts:" << f << " or not consecutive." << abort(FatalError);
     }
@@ -255,7 +251,7 @@ void Foam::edgeFaceCirculator::setCanonical()
             {
                 const face& f = mesh_.faces()[faceLabel_];
 
-                FatalErrorIn("Foam::edgeFaceCirculator::setCanonical()")
+                FatalErrorInFunction
                     << "Walked " << i << " cells around edge "
                     << mesh_.points()[f[index_]]
                     << mesh_.points()[f.nextLabel(index_)]
@@ -289,7 +285,7 @@ void Foam::edgeFaceCirculator::setCanonical()
             {
                 const face& f = mesh_.faces()[faceLabel_];
 
-                FatalErrorIn("Foam::edgeFaceCirculator::setCanonical()")
+                FatalErrorInFunction
                     << "Reached boundary face " << faceLabel_
                     << " when walking around internal edge "
                     << mesh_.points()[f[index_]]
@@ -357,7 +353,7 @@ Foam::edgeFaceCirculator::operator++()
 {
     if (faceLabel_ == -1)
     {
-        FatalErrorIn("edgeFaceCirculator::operator++()")
+        FatalErrorInFunction
             << "Already reached end(). Cannot walk any further."
             << abort(FatalError);
     }
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 2499380b32..dc84c4d7ea 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -276,11 +276,7 @@ bool Foam::treeDataEdge::findIntersectOp::operator()
     point& result
 ) const
 {
-    notImplemented
-    (
-        "treeDataEdge::intersects(const label, const point&,"
-        "const point&, point&)"
-    );
+    NotImplemented;
     return false;
 }
 
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 578a0de2ae..e80b563586 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,11 +202,8 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
 
     if (info.index() == -1)
     {
-        FatalErrorIn
-        (
-            "treeDataFace::getSampleType"
-            "(indexedOctree<treeDataFace>&, const point&)"
-        )   << "Could not find " << sample << " in octree."
+        FatalErrorInFunction
+            << "Could not find " << sample << " in octree."
             << abort(FatalError);
     }
 
@@ -537,18 +534,7 @@ void Foam::treeDataFace::findNearestOp::operator()
     point& nearestPoint
 ) const
 {
-    notImplemented
-    (
-        "treeDataFace::findNearestOp::operator()"
-        "("
-        "    const labelUList&,"
-        "    const linePointRef&,"
-        "    treeBoundBox&,"
-        "    label&,"
-        "    point&,"
-        "    point&"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 82a9bd257b..999ad1856d 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -240,11 +240,7 @@ bool Foam::treeDataPoint::findIntersectOp::operator()
     point& result
 ) const
 {
-    notImplemented
-    (
-        "treeDataPoint::intersects(const label, const point&,"
-        "const point&, point&)"
-    );
+    NotImplemented;
     return false;
 }
 
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 51e5252121..6185c9943f 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -171,11 +171,8 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
 
     if (info.index() == -1)
     {
-        FatalErrorIn
-        (
-            "treeDataPrimitivePatch::getSampleType"
-            "(indexedOctree<treeDataPrimitivePatch>&, const point&)"
-        )   << "Could not find " << sample << " in octree."
+        FatalErrorInFunction
+            << "Could not find " << sample << " in octree."
             << abort(FatalError);
     }
 
@@ -188,8 +185,10 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
             << " nearest face:" << faceI;
     }
 
-    const pointField& points = patch_.localPoints();
-    const typename PatchType::FaceType& f = patch_.localFaces()[faceI];
+    const typename PatchType::FaceType& localF = patch_.localFaces()[faceI];
+    const typename PatchType::FaceType& f = patch_[faceI];
+    const pointField& points = patch_.points();
+    const labelList& mp = patch_.meshPoints();
 
     // Retest to classify where on face info is. Note: could be improved. We
     // already have point.
@@ -242,7 +241,7 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
 
             return indexedOctree<treeDataPrimitivePatch>::getSide
             (
-                patch_.pointNormals()[f[fp]],
+                patch_.pointNormals()[localF[fp]],
                 sample - curPt
             );
         }
@@ -280,8 +279,8 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
     {
         label edgeI = fEdges[fEdgeI];
         const edge& e = patch_.edges()[edgeI];
-
-        pointHit edgeHit = e.line(points).nearestDist(sample);
+        const linePointRef ln(points[mp[e.start()]], points[mp[e.end()]]);
+        pointHit edgeHit = ln.nearestDist(sample);
 
         if ((magSqr(edgeHit.rawPoint() - curPt)/typDimSqr) < planarTol_)
         {
@@ -322,11 +321,7 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
 
     forAll(f, fp)
     {
-        pointHit edgeHit = linePointRef
-        (
-            points[f[fp]],
-            fc
-        ).nearestDist(sample);
+        pointHit edgeHit = linePointRef(points[f[fp]], fc).nearestDist(sample);
 
         if ((magSqr(edgeHit.rawPoint() - curPt)/typDimSqr) < planarTol_)
         {
@@ -369,7 +364,8 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
 
         forAll(f, fp)
         {
-            Pout<< "    vertex:" << f[fp] << "  coord:" << points[f[fp]]
+            Pout<< "    vertex:" << f[fp]
+                << "  coord:" << points[f[fp]]
                 << endl;
         }
     }
@@ -542,18 +538,7 @@ void Foam::treeDataPrimitivePatch<PatchType>::findNearestOp::operator()
     point& nearestPoint
 ) const
 {
-    notImplemented
-    (
-        "treeDataPrimitivePatch<PatchType>::findNearestOp::operator()"
-        "("
-        "    const labelUList&,"
-        "    const linePointRef&,"
-        "    treeBoundBox&,"
-        "    label&,"
-        "    point&,"
-        "    point&"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
@@ -599,16 +584,8 @@ bool Foam::treeDataPrimitivePatch<PatchType>::findSelfIntersectOp::operator()
 {
     if (edgeID_ == -1)
     {
-        FatalErrorIn
-        (
-            "findSelfIntersectOp::operator()\n"
-            "(\n"
-            "    const label index,\n"
-            "    const point& start,\n"
-            "    const point& end,\n"
-            "    point& intersectionPoint\n"
-            ") const"
-        )   << "EdgeID not set. Please set edgeID to the index of"
+        FatalErrorInFunction
+            << "EdgeID not set. Please set edgeID to the index of"
             << " the edge you are testing"
             << exit(FatalError);
     }
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C
index ef00434eb2..c8c69d7f85 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.C
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,8 @@ Foam::volumeType Foam::treeDataPrimitivePatch<Foam::triSurface>::getVolumeType
 
     if (info.index() == -1)
     {
-        FatalErrorIn
-        (
-            "treeDataPrimitivePatch::getSampleType"
-            "(indexedOctree<treeDataPrimitivePatch>&, const point&)"
-        )   << "Could not find " << sample << " in octree."
+        FatalErrorInFunction
+            << "Could not find " << sample << " in octree."
             << abort(FatalError);
     }
 
@@ -72,7 +69,7 @@ Foam::volumeType Foam::treeDataPrimitivePatch<Foam::triSurface>::getVolumeType
     }
     else
     {
-        FatalErrorIn("treeDataPrimitivePatch<PatchType>::getVolumeType(..)")
+        FatalErrorInFunction
             << "problem" << abort(FatalError);
         return volumeType::UNKNOWN;
     }
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index aa8fda17bd..dfefb55824 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -208,11 +208,8 @@ void Foam::mappedPatchBase::findSamples
         {
             if (samplePatch_.size() && samplePatch_ != "none")
             {
-                FatalErrorIn
-                (
-                    "mappedPatchBase::findSamples(const pointField&,"
-                    " labelList&, labelList&, pointField&) const"
-                )   << "No need to supply a patch name when in "
+                FatalErrorInFunction
+                    << "No need to supply a patch name when in "
                     << sampleModeNames_[mode] << " mode." << exit(FatalError);
             }
 
@@ -251,11 +248,8 @@ void Foam::mappedPatchBase::findSamples
         {
             if (samplePatch_.size() && samplePatch_ != "none")
             {
-                FatalErrorIn
-                (
-                    "mappedPatchBase::findSamples(const pointField&,"
-                    " labelList&, labelList&, pointField&) const"
-                )   << "No need to supply a patch name when in "
+                FatalErrorInFunction
+                    << "No need to supply a patch name when in "
                     << sampleModeNames_[mode] << " mode." << exit(FatalError);
             }
 
@@ -426,11 +420,8 @@ void Foam::mappedPatchBase::findSamples
         {
             if (samplePatch().size() && samplePatch() != "none")
             {
-                FatalErrorIn
-                (
-                    "mappedPatchBase::findSamples(const pointField&,"
-                    " labelList&, labelList&, pointField&) const"
-                )   << "No need to supply a patch name when in "
+                FatalErrorInFunction
+                    << "No need to supply a patch name when in "
                     << sampleModeNames_[mode] << " mode." << exit(FatalError);
             }
 
@@ -474,7 +465,7 @@ void Foam::mappedPatchBase::findSamples
 
         default:
         {
-            FatalErrorIn("mappedPatchBase::findSamples(..)")
+            FatalErrorInFunction
                 << "problem." << abort(FatalError);
         }
     }
@@ -530,7 +521,7 @@ void Foam::mappedPatchBase::calcMapping() const
     static bool hasWarned = false;
     if (mapPtr_.valid())
     {
-        FatalErrorIn("mappedPatchBase::calcMapping() const")
+        FatalErrorInFunction
             << "Mapping already calculated" << exit(FatalError);
     }
 
@@ -556,17 +547,8 @@ void Foam::mappedPatchBase::calcMapping() const
 
     if (sampleMyself && coincident)
     {
-        WarningIn
-        (
-            "mappedPatchBase::mappedPatchBase\n"
-            "(\n"
-            "    const polyPatch& pp,\n"
-            "    const word& sampleRegion,\n"
-            "    const sampleMode mode,\n"
-            "    const word& samplePatch,\n"
-            "    const vector& offset\n"
-            ")\n"
-        )   << "Invalid offset " << d << endl
+        WarningInFunction
+            << "Invalid offset " << d << endl
             << "Offset is the vector added to the patch face centres to"
             << " find the patch face supplying the data." << endl
             << "Setting it to " << d
@@ -618,17 +600,8 @@ void Foam::mappedPatchBase::calcMapping() const
         {
             if (!hasWarned)
             {
-                WarningIn
-                (
-                    "mappedPatchBase::mappedPatchBase\n"
-                    "(\n"
-                    "    const polyPatch& pp,\n"
-                    "    const word& sampleRegion,\n"
-                    "    const sampleMode mode,\n"
-                    "    const word& samplePatch,\n"
-                    "    const vector& offset\n"
-                    ")\n"
-                )   << "Did not find " << nNotFound
+                WarningInFunction
+                    << "Did not find " << nNotFound
                     << " out of " << sampleProcs.size() << " total samples."
                     << " Sampling these on owner cell centre instead." << endl
                     << "On patch " << patch_.name()
@@ -772,7 +745,7 @@ void Foam::mappedPatchBase::calcMapping() const
                 }
                 else
                 {
-                    FatalErrorIn("mappedPatchBase::calcMapping() const")
+                    FatalErrorInFunction
                         << "On patch " << patch_.name()
                         << " patchface " << faceI
                         << " is assigned to more than once."
@@ -784,7 +757,7 @@ void Foam::mappedPatchBase::calcMapping() const
         {
             if (used[faceI] == 0)
             {
-                FatalErrorIn("mappedPatchBase::calcMapping() const")
+                FatalErrorInFunction
                     << "On patch " << patch_.name()
                     << " patchface " << faceI
                     << " is never assigned to."
@@ -831,32 +804,34 @@ void Foam::mappedPatchBase::calcAMI() const
 {
     if (AMIPtr_.valid())
     {
-        FatalErrorIn("mappedPatchBase::calcAMI() const")
+        FatalErrorInFunction
             << "AMI already calculated" << exit(FatalError);
     }
 
     AMIPtr_.clear();
 
+
+    const polyPatch& nbr = samplePolyPatch();
+
+    // Transform neighbour patch to local system
+    pointField nbrPoints(samplePoints(nbr.localPoints()));
+
+    primitivePatch nbrPatch0
+    (
+        SubList<face>
+        (
+            nbr.localFaces(),
+            nbr.size()
+        ),
+        nbrPoints
+    );
+
+
     if (debug)
     {
-        const polyPatch& nbr = samplePolyPatch();
-
-        pointField nbrPoints(nbr.localPoints());
-
         OFstream os(patch_.name() + "_neighbourPatch-org.obj");
         meshTools::writeOBJ(os, samplePolyPatch().localFaces(), nbrPoints);
 
-        // transform neighbour patch to local system
-        primitivePatch nbrPatch0
-        (
-            SubList<face>
-            (
-                nbr.localFaces(),
-                nbr.size()
-            ),
-            nbrPoints
-        );
-
         OFstream osN(patch_.name() + "_neighbourPatch-trans.obj");
         meshTools::writeOBJ(osN, nbrPatch0, nbrPoints);
 
@@ -870,7 +845,7 @@ void Foam::mappedPatchBase::calcAMI() const
         new AMIPatchToPatchInterpolation
         (
             patch_,
-            samplePolyPatch(), // nbrPatch0,
+            nbrPatch0,
             surfPtr(),
             faceAreaIntersect::tmMesh,
             true,
@@ -914,10 +889,8 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::readListOrField
                 is >> static_cast<List<vector>&>(fld);
                 if (fld.size() != size)
                 {
-                    FatalIOErrorIn
+                    FatalIOErrorInFunction
                     (
-                        "mappedPatchBase::readListOrField"
-                        "(const word& keyword, const dictionary&, const label)",
                         dict
                     )   << "size " << fld.size()
                         << " is not equal to the given value of " << size
@@ -926,10 +899,8 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::readListOrField
             }
             else
             {
-                FatalIOErrorIn
+                FatalIOErrorInFunction
                 (
-                    "mappedPatchBase::readListOrField"
-                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.wordToken()
@@ -940,10 +911,8 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::readListOrField
         {
             if (is.version() == 2.0)
             {
-                IOWarningIn
+                IOWarningInFunction
                 (
-                    "mappedPatchBase::readListOrField"
-                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', "
                        "assuming List format for backwards compatibility."
@@ -1135,13 +1104,8 @@ Foam::mappedPatchBase::mappedPatchBase
     }
     else if (mode_ != NEARESTPATCHFACE && mode_ != NEARESTPATCHFACEAMI)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "mappedPatchBase::mappedPatchBase\n"
-            "(\n"
-            "    const polyPatch&,\n"
-            "    const dictionary&\n"
-            ")\n",
             dict
         )   << "Please supply the offsetMode as one of "
             << NamedEnum<offsetMode, 3>::words()
@@ -1175,14 +1139,8 @@ Foam::mappedPatchBase::mappedPatchBase
 {
     if (mode != NEARESTPATCHFACE && mode != NEARESTPATCHFACEAMI)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "mappedPatchBase::mappedPatchBase\n"
-            "(\n"
-            "    const polyPatch&,\n"
-            "    const sampleMode,\n"
-            "    const dictionary&\n"
-            ")\n",
             dict
         )   << "Construct from sampleMode and dictionary only applicable for "
             << " collocated patches in modes "
@@ -1293,7 +1251,7 @@ const Foam::polyPatch& Foam::mappedPatchBase::samplePolyPatch() const
 
     if (patchI == -1)
     {
-        FatalErrorIn("mappedPatchBase::samplePolyPatch()")
+        FatalErrorInFunction
             << "Cannot find patch " << samplePatch()
             << " in region " << sampleRegion_ << endl
             << "Valid patches are " << nbrMesh.boundaryMesh().names()
@@ -1418,7 +1376,7 @@ Foam::pointIndexHit Foam::mappedPatchBase::facePoint
 
         default:
         {
-            FatalErrorIn("mappedPatchBase::facePoint()")
+            FatalErrorInFunction
                 << "problem" << abort(FatalError);
             return pointIndexHit();
         }
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
index 8133a9d692..fc392dfaaf 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ inline const Foam::word& Foam::mappedPatchBase::sampleRegion() const
     {
         if (!coupleGroup_.valid())
         {
-            FatalErrorIn("mappedPatchBase::sampleRegion()")
+            FatalErrorInFunction
                 << "Supply either a regionName or a coupleGroup"
                 << " for patch " << patch_.name()
                 << " in region " << patch_.boundaryMesh().mesh().name()
@@ -62,7 +62,7 @@ inline const Foam::word& Foam::mappedPatchBase::samplePatch() const
     {
         if (!coupleGroup_.valid())
         {
-            FatalErrorIn("mappedPatchBase::samplePolyPatch()")
+            FatalErrorInFunction
                 << "Supply either a patchName or a coupleGroup"
                 << " for patch " << patch_.name()
                 << " in region " << patch_.boundaryMesh().mesh().name()
@@ -115,7 +115,7 @@ inline Foam::label Foam::mappedPatchBase::sampleSize() const
         }
         default:
         {
-            FatalErrorIn("mappedPatchBase::sampleSize()")
+            FatalErrorInFunction
                 << "problem." << abort(FatalError);
             return -1;
         }
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
index 8b5a50e394..8960699bbc 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,15 +61,18 @@ void Foam::mappedPatchBase::distribute
         }
         default:
         {
-            map().distribute
+            mapDistributeBase::distribute
             (
                 Pstream::defaultCommsType,
                 map().schedule(),
                 map().constructSize(),
                 map().subMap(),
+                false,
                 map().constructMap(),
+                false,
                 lst,
                 cop,
+                flipOp(),
                 pTraits<Type>::zero
             );
         }
@@ -117,15 +120,18 @@ void Foam::mappedPatchBase::reverseDistribute
         default:
         {
             label cSize = sampleSize();
-            map().distribute
+            mapDistributeBase::distribute
             (
                 Pstream::defaultCommsType,
                 map().schedule(),
                 cSize,
                 map().constructMap(),
+                false,
                 map().subMap(),
+                false,
                 lst,
                 cop,
+                flipOp(),
                 pTraits<Type>::zero
             );
             break;
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 2d9e1c2ea1..ac56d0474d 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -146,10 +146,8 @@ Foam::label Foam::meshSearch::findNearestCellWalk
 {
     if (seedCellI < 0)
     {
-        FatalErrorIn
-        (
-            "meshSearch::findNearestCellWalk(const point&, const label)"
-        )   << "illegal seedCell:" << seedCellI << exit(FatalError);
+        FatalErrorInFunction
+            << "illegal seedCell:" << seedCellI << exit(FatalError);
     }
 
     // Walk in direction of face that decreases distance
@@ -245,10 +243,8 @@ Foam::label Foam::meshSearch::findNearestFaceWalk
 {
     if (seedFaceI < 0)
     {
-        FatalErrorIn
-        (
-            "meshSearch::findNearestFaceWalk(const point&, const label)"
-        )   << "illegal seedFace:" << seedFaceI << exit(FatalError);
+        FatalErrorInFunction
+            << "illegal seedFace:" << seedFaceI << exit(FatalError);
     }
 
     const vectorField& centres = mesh_.faceCentres();
@@ -335,10 +331,8 @@ Foam::label Foam::meshSearch::findCellWalk
 {
     if (seedCellI < 0)
     {
-        FatalErrorIn
-        (
-            "meshSearch::findCellWalk(const point&, const label)"
-        )   << "illegal seedCell:" << seedCellI << exit(FatalError);
+        FatalErrorInFunction
+            << "illegal seedCell:" << seedCellI << exit(FatalError);
     }
 
     if (mesh_.pointInCell(location, seedCellI, cellDecompMode_))
@@ -408,11 +402,8 @@ Foam::label Foam::meshSearch::findNearestBoundaryFaceWalk
 {
     if (seedFaceI < 0)
     {
-        FatalErrorIn
-        (
-            "meshSearch::findNearestBoundaryFaceWalk"
-            "(const point&, const label)"
-        )   << "illegal seedFace:" << seedFaceI << exit(FatalError);
+        FatalErrorInFunction
+            << "illegal seedFace:" << seedFaceI << exit(FatalError);
     }
 
     // Start off from seedFaceI
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 5c98fe087b..a1a2b6f4f1 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,7 +29,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Check if n is in same direction as normals of all faceLabels
 bool Foam::meshTools::visNormal
 (
     const vector& n,
@@ -82,10 +81,8 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
         }
         else
         {
-            WarningIn
-            (
-                "Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)"
-            )   << "Average point normal not visible for point:"
+            WarningInFunction
+                << "Average point normal not visible for point:"
                 << pp.meshPoints()[pointI] << endl;
 
             label visOctant =
@@ -176,11 +173,8 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
             {
                 pn[pointI] = vector::zero;
 
-                WarningIn
-                (
-                    "Foam::meshTools::calcBoxPointNormals"
-                    "(const primitivePatch& pp)"
-                )   << "No visible octant for point:" << pp.meshPoints()[pointI]
+                WarningInFunction
+                    << "No visible octant for point:" << pp.meshPoints()[pointI]
                     << " cooord:" << pp.points()[pp.meshPoints()[pointI]] << nl
                     << "Normal set to " << pn[pointI] << endl;
             }
@@ -309,7 +303,6 @@ bool Foam::meshTools::edgeOnFace
 }
 
 
-// Return true if faceI part of cellI
 bool Foam::meshTools::faceOnCell
 (
     const primitiveMesh& mesh,
@@ -412,11 +405,8 @@ Foam::label Foam::meshTools::getSharedEdge
             }
         }
     }
-    FatalErrorIn
-    (
-        "meshTools::getSharedEdge(const primitiveMesh&, const label"
-        ", const label)"
-    )   << "Faces " << f0 << " and " << f1 << " do not share an edge"
+    FatalErrorInFunction
+        << "Faces " << f0 << " and " << f1 << " do not share an edge"
         << abort(FatalError);
 
     return -1;
@@ -451,11 +441,8 @@ Foam::label Foam::meshTools::getSharedFace
     }
 
 
-    FatalErrorIn
-    (
-        "meshTools::getSharedFace(const primitiveMesh&, const label"
-        ", const label)"
-    )   << "No common face for"
+    FatalErrorInFunction
+        << "No common face for"
         << "  cell0I:" << cell0I << "  faces:" << cFaces
         << "  cell1I:" << cell1I << "  faces:"
         << mesh.cells()[cell1I]
@@ -465,7 +452,6 @@ Foam::label Foam::meshTools::getSharedFace
 }
 
 
-// Get the two faces on cellI using edgeI.
 void Foam::meshTools::getEdgeFaces
 (
     const primitiveMesh& mesh,
@@ -501,17 +487,13 @@ void Foam::meshTools::getEdgeFaces
 
     if ((face0 == -1) || (face1 == -1))
     {
-        FatalErrorIn
-        (
-            "meshTools::getEdgeFaces(const primitiveMesh&, const label"
-            ", const label, label&, label&"
-        )   << "Can not find faces using edge " << mesh.edges()[edgeI]
+        FatalErrorInFunction
+            << "Can not find faces using edge " << mesh.edges()[edgeI]
             << " on cell " << cellI << abort(FatalError);
     }
 }
 
 
-// Return label of other edge connected to vertex
 Foam::label Foam::meshTools::otherEdge
 (
     const primitiveMesh& mesh,
@@ -535,11 +517,8 @@ Foam::label Foam::meshTools::otherEdge
         }
     }
 
-    FatalErrorIn
-    (
-        "meshTools::otherEdge(const primitiveMesh&, const labelList&"
-        ", const label, const label)"
-    )   << "Can not find edge in "
+    FatalErrorInFunction
+        << "Can not find edge in "
         << UIndirectList<edge>(mesh.edges(), edgeLabels)()
         << " connected to edge "
         << thisEdgeI << " with vertices " << mesh.edges()[thisEdgeI]
@@ -549,7 +528,6 @@ Foam::label Foam::meshTools::otherEdge
 }
 
 
-// Return face on other side of edgeI
 Foam::label Foam::meshTools::otherFace
 (
     const primitiveMesh& mesh,
@@ -574,7 +552,6 @@ Foam::label Foam::meshTools::otherFace
 }
 
 
-// Return face on other side of edgeI
 Foam::label Foam::meshTools::otherCell
 (
     const primitiveMesh& mesh,
@@ -584,11 +561,8 @@ Foam::label Foam::meshTools::otherCell
 {
     if (!mesh.isInternalFace(faceI))
     {
-        FatalErrorIn
-        (
-            "meshTools::otherCell(const primitiveMesh&, const label"
-            ", const label)"
-        )   << "Face " << faceI << " is not internal"
+        FatalErrorInFunction
+            << "Face " << faceI << " is not internal"
             << abort(FatalError);
     }
 
@@ -602,8 +576,6 @@ Foam::label Foam::meshTools::otherCell
 }
 
 
-// Returns label of edge nEdges away from startEdge (in the direction of
-// startVertI)
 Foam::label Foam::meshTools::walkFace
 (
     const primitiveMesh& mesh,
@@ -688,7 +660,6 @@ void Foam::meshTools::constrainToMeshCentre
 }
 
 
-//- Set the constrained components of directions/velocity to zero
 void Foam::meshTools::constrainDirection
 (
     const polyMesh& mesh,
@@ -774,10 +745,8 @@ Foam::vector Foam::meshTools::edgeToCutDir
 {
     if (!hexMatcher().isA(mesh, cellI))
     {
-        FatalErrorIn
-        (
-            "Foam::meshTools::getCutDir(const label, const label)"
-        )   << "Not a hex : cell:" << cellI << abort(FatalError);
+        FatalErrorInFunction
+            << "Not a hex : cell:" << cellI << abort(FatalError);
     }
 
 
@@ -814,7 +783,6 @@ Foam::vector Foam::meshTools::edgeToCutDir
 }
 
 
-// Find edges most aligned with cutDir
 Foam::label Foam::meshTools::cutDirToEdge
 (
     const primitiveMesh& mesh,
@@ -824,10 +792,8 @@ Foam::label Foam::meshTools::cutDirToEdge
 {
     if (!hexMatcher().isA(mesh, cellI))
     {
-        FatalErrorIn
-        (
-            "Foam::meshTools::getCutDir(const label, const vector&)"
-        )   << "Not a hex : cell:" << cellI << abort(FatalError);
+        FatalErrorInFunction
+            << "Not a hex : cell:" << cellI << abort(FatalError);
     }
 
     const labelList& cEdges = mesh.cellEdges()[cellI];
@@ -871,10 +837,8 @@ Foam::label Foam::meshTools::cutDirToEdge
     {
         if (!doneEdges.found(cEdges[cEdgeI]))
         {
-            FatalErrorIn
-            (
-                "meshTools::cutDirToEdge(const label, const vector&)"
-            )   << "Cell:" << cellI << " edges:" << cEdges << endl
+            FatalErrorInFunction
+                << "Cell:" << cellI << " edges:" << cEdges << endl
                 << "Edge:" << cEdges[cEdgeI] << " not yet handled"
                 << abort(FatalError);
         }
@@ -882,10 +846,8 @@ Foam::label Foam::meshTools::cutDirToEdge
 
     if (maxEdgeI == -1)
     {
-        FatalErrorIn
-        (
-            "meshTools::cutDirToEdge(const label, const vector&)"
-        )   << "Problem : did not find edge aligned with " << cutDir
+        FatalErrorInFunction
+            << "Problem : did not find edge aligned with " << cutDir
             << " on cell " << cellI << abort(FatalError);
     }
 
diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H
index 08d36f3208..74bf2fbfc3 100644
--- a/src/meshTools/meshTools/meshTools.H
+++ b/src/meshTools/meshTools/meshTools.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -200,7 +200,7 @@ namespace meshTools
             const label v1
         );
 
-        //- Return edge between two vertices. Returns -1 if no edge.
+        //- Return edge between two mesh vertices. Returns -1 if no edge.
         label findEdge
         (
             const primitiveMesh&,
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.C b/src/meshTools/momentOfInertia/momentOfInertia.C
index bb17f5833c..93d6b82b3c 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.C
+++ b/src/meshTools/momentOfInertia/momentOfInertia.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -192,7 +192,8 @@ void Foam::momentOfInertia::massPropertiesShell
     scalar density,
     scalar& mass,
     vector& cM,
-    tensor& J
+    tensor& J,
+    bool doReduce
 )
 {
     // Reset properties for accumulation
@@ -221,6 +222,12 @@ void Foam::momentOfInertia::massPropertiesShell
         mass += triMag;
     }
 
+    if (doReduce)
+    {
+        reduce(cM, sumOp<vector>());
+        reduce(mass, sumOp<scalar>());
+    }
+
     cM /= mass;
 
     mass *= density;
@@ -238,6 +245,11 @@ void Foam::momentOfInertia::massPropertiesShell
             pts[tri[2]]
         ).inertia(cM, density);
     }
+
+    if (doReduce)
+    {
+        reduce(J, sumOp<tensor>());
+    }
 }
 
 
@@ -267,7 +279,8 @@ void Foam::momentOfInertia::massPropertiesShell
     scalar density,
     scalar& mass,
     vector& cM,
-    tensor& J
+    tensor& J,
+    bool doReduce
 )
 {
     triFaceList faces(surf.size());
@@ -277,7 +290,41 @@ void Foam::momentOfInertia::massPropertiesShell
         faces[i] = triFace(surf[i]);
     }
 
-    massPropertiesShell(surf.points(), faces, density, mass, cM, J);
+    massPropertiesShell(surf.points(), faces, density, mass, cM, J, doReduce);
+}
+
+
+void Foam::momentOfInertia::massPropertiesPatch
+(
+    const polyPatch& pp,
+    scalar density,
+    scalar& mass,
+    vector& cM,
+    tensor& J,
+    bool doReduce
+)
+{
+    DynamicList<triFace> faces(3*pp.size());
+
+    // decompose patch faces using triangle fan
+    forAll(pp, faceI)
+    {
+        const face& f = pp[faceI];
+
+        if (f.size() > 2)
+        {
+            const label v0 = 0;
+
+            for (label i = 1; i < f.size() - 1; i++)
+            {
+                faces.append(triFace(f[v0], f[i],f[i + 1]));
+            }
+        }
+    }
+
+    triFaceList triFaces;
+    triFaces.transfer(faces);
+    massPropertiesShell(pp.points(), triFaces, density, mass, cM, J, doReduce);
 }
 
 
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.H b/src/meshTools/momentOfInertia/momentOfInertia.H
index 0f56e8b00b..eef751385c 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.H
+++ b/src/meshTools/momentOfInertia/momentOfInertia.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,7 +72,8 @@ public:
         scalar density,
         scalar& mass,
         vector& cM,
-        tensor& J
+        tensor& J,
+        bool doReduce = false
     );
 
     static void massPropertiesSolid
@@ -90,7 +91,18 @@ public:
         scalar density,
         scalar& mass,
         vector& cM,
-        tensor& J
+        tensor& J,
+        bool doReduce = false
+    );
+
+    static void massPropertiesPatch
+    (
+        const polyPatch& pp,
+        scalar density,
+        scalar& mass,
+        vector& cM,
+        tensor& J,
+        bool doReduce = false
     );
 
     static tensor applyParallelAxisTheorem
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index a1256b0d6f..d1edb53ad4 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 }
                 else if (edgeUsage[edgeI] != 2)
                 {
-                    WarningIn("void polyMeshZipUpCells(polyMesh& mesh)")
+                    WarningInFunction
                         << "edge " << cellEdges[edgeI] << " in cell " << cellI
                         << " used " << edgeUsage[edgeI] << " times. " << nl
                         << "Should be 1 or 2 - serious error "
@@ -494,7 +494,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     {
                         if (orderedEdge[checkI] == orderedEdge[checkJ])
                         {
-                            WarningIn("void polyMeshZipUpCells(polyMesh& mesh)")
+                            WarningInFunction
                                 << "Duplicate point found in edge to insert. "
                                 << nl << "Point: " << orderedEdge[checkI]
                                 << " edge: " << orderedEdge << endl;
@@ -688,13 +688,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                 {
                                     if (newFace[checkI] == newFace[checkJ])
                                     {
-                                        WarningIn
-                                        (
-                                            "void polyMeshZipUpCells"
-                                            "("
-                                                "polyMesh& mesh"
-                                            ")"
-                                        )
+                                        WarningInFunction
                                             << "Duplicate point found "
                                             << "in the new face. " << nl
                                             << "Point: "
@@ -729,7 +723,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             labelList toc(problemCells.toc());
             sort(toc);
 
-            FatalErrorIn("void polyMeshZipUpCells(polyMesh& mesh)")
+            FatalErrorInFunction
                 << "Found " << problemCells.size() << " problem cells." << nl
                 << "Cells: " << toc
                 << abort(FatalError);
@@ -781,8 +775,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
     if (nChangedFacesInMesh > 0)
     {
-        FatalErrorIn("void polyMeshZipUpCells(polyMesh& mesh)")
-            << "cell zip-up failed after 100 cycles.  Probable problem "
+        FatalErrorInFunction
             << "with the original mesh"
             << abort(FatalError);
     }
diff --git a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
index de6cd25d3a..6f6f23b75c 100644
--- a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
+++ b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -318,12 +318,8 @@ bool Foam::primitiveMeshGeometry::checkFaceDotProduct
                     // Non-orthogonality greater than 90 deg
                     if (report)
                     {
-                        WarningIn
-                        (
-                            "primitiveMeshGeometry::checkFaceDotProduct"
-                            "(const bool, const scalar, const labelList&"
-                            ", labelHashSet*)"
-                        )   << "Severe non-orthogonality detected for face "
+                        WarningInFunction
+                            << "Severe non-orthogonality detected for face "
                             << faceI
                             << " between cells " << own[faceI] << " and "
                             << nei[faceI]
@@ -383,11 +379,8 @@ bool Foam::primitiveMeshGeometry::checkFaceDotProduct
     {
         if (report)
         {
-            SeriousErrorIn
-            (
-                "primitiveMeshGeometry::checkFaceDotProduct"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Error in non-orthogonality detected" << endl;
+            SeriousErrorInFunction
+                << "Error in non-orthogonality detected" << endl;
         }
 
         return true;
@@ -497,12 +490,8 @@ bool Foam::primitiveMeshGeometry::checkFacePyramids
     {
         if (report)
         {
-            SeriousErrorIn
-            (
-                "primitiveMeshGeometry::checkFacePyramids("
-                "const bool, const scalar, const pointField&"
-                ", const labelList&, labelHashSet*)"
-            )   << "Error in face pyramids: faces pointing the wrong way!"
+            SeriousErrorInFunction
+                << "Error in face pyramids: faces pointing the wrong way!"
                 << endl;
         }
 
@@ -638,11 +627,7 @@ bool Foam::primitiveMeshGeometry::checkFaceSkewness
     {
         if (report)
         {
-            WarningIn
-            (
-                "primitiveMeshGeometry::checkFaceSkewness"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Large face skewness detected.  Max skewness = "
+            WarningInFunction
                 << 100*maxSkew
                 << " percent.\nThis may impair the quality of the result." << nl
                 << nWarnSkew << " highly skew faces detected."
@@ -725,11 +710,7 @@ bool Foam::primitiveMeshGeometry::checkFaceWeights
     {
         if (report)
         {
-            WarningIn
-            (
-                "primitiveMeshGeometry::checkFaceWeights"
-                "(const bool, const scalar, const labelList&, labelHashSet*)"
-            )   << "Small interpolation weight detected.  Min weight = "
+            WarningInFunction
                 << minWeight << '.' << nl
                 << nWarnWeight << " faces with small weights detected."
                 << endl;
@@ -767,12 +748,8 @@ bool Foam::primitiveMeshGeometry::checkFaceAngles
 {
     if (maxDeg < -SMALL || maxDeg > 180+SMALL)
     {
-        FatalErrorIn
-        (
-            "primitiveMeshGeometry::checkFaceAngles"
-            "(const bool, const scalar, const pointField&, const labelList&"
-            ", labelHashSet*)"
-        )   << "maxDeg should be [0..180] but is now " << maxDeg
+        FatalErrorInFunction
+            << "maxDeg should be [0..180] but is now " << maxDeg
             << abort(FatalError);
     }
 
@@ -874,12 +851,8 @@ bool Foam::primitiveMeshGeometry::checkFaceAngles
     {
         if (report)
         {
-            WarningIn
-            (
-                "primitiveMeshGeometry::checkFaceAngles"
-                "(const bool, const scalar,  const pointField&"
-                ", const labelList&, labelHashSet*)"
-            )   << nConcave  << " face points with severe concave angle (> "
+            WarningInFunction
+                << nConcave  << " face points with severe concave angle (> "
                 << maxDeg << " deg) found.\n"
                 << endl;
         }
@@ -910,12 +883,8 @@ bool Foam::primitiveMeshGeometry::checkFaceAngles
 //{
 //    if (warnFlatness < 0 || warnFlatness > 1)
 //    {
-//        FatalErrorIn
-//        (
-//            "primitiveMeshGeometry::checkFaceFlatness"
-//            "(const bool, const scalar, const pointField&"
-//            ", const labelList&, labelHashSet*)"
-//        )   << "warnFlatness should be [0..1] but is now " << warnFlatness
+//        FatalErrorInFunction
+//            << "warnFlatness should be [0..1] but is now " << warnFlatness
 //            << abort(FatalError);
 //    }
 //
@@ -1011,12 +980,8 @@ bool Foam::primitiveMeshGeometry::checkFaceAngles
 //    {
 //        if (report)
 //        {
-//            WarningIn
-//            (
-//                "primitiveMeshGeometry::checkFaceFlatness"
-//                "(const bool, const scalar, const pointField&"
-//                ", const labelList&, labelHashSet*)"
-//            )   << nWarped  << " faces with severe warpage (flatness < "
+//            WarningInFunction
+//                << nWarped  << " faces with severe warpage (flatness < "
 //                << warnFlatness << ") found.\n"
 //                << endl;
 //        }
@@ -1047,12 +1012,8 @@ bool Foam::primitiveMeshGeometry::checkFaceTwist
 {
     if (minTwist < -1-SMALL || minTwist > 1+SMALL)
     {
-        FatalErrorIn
-        (
-            "primitiveMeshGeometry::checkFaceTwist"
-            "(const bool, const scalar, const primitiveMesh&, const pointField&"
-            ", const labelList&, labelHashSet*)"
-        )   << "minTwist should be [-1..1] but is now " << minTwist
+        FatalErrorInFunction
+            << "minTwist should be [-1..1] but is now " << minTwist
             << abort(FatalError);
     }
 
@@ -1129,12 +1090,8 @@ bool Foam::primitiveMeshGeometry::checkFaceTwist
     {
         if (report)
         {
-            WarningIn
-            (
-                "primitiveMeshGeometry::checkFaceTwist"
-                "(const bool, const scalar, const primitiveMesh&"
-                ", const pointField&, const labelList&, labelHashSet*)"
-            )   << nWarped  << " faces with severe warpage "
+            WarningInFunction
+                << nWarped  << " faces with severe warpage "
                 << "(cosine of the angle between triangle normal and "
                 << "face normal < " << minTwist << ") found.\n"
                 << endl;
@@ -1195,12 +1152,8 @@ bool Foam::primitiveMeshGeometry::checkFaceArea
     {
         if (report)
         {
-            WarningIn
-            (
-                "primitiveMeshGeometry::checkFaceArea"
-                "(const bool, const scalar, const primitiveMesh&"
-                ", const pointField&, const labelList&, labelHashSet*)"
-            )   << nZeroArea  << " faces with area < " << minArea
+            WarningInFunction
+                << nZeroArea  << " faces with area < " << minArea
                 << " found.\n"
                 << endl;
         }
@@ -1300,13 +1253,8 @@ bool Foam::primitiveMeshGeometry::checkCellDeterminant
     {
         if (report)
         {
-            WarningIn
-            (
-                "primitiveMeshGeometry::checkCellDeterminant"
-                "(const bool, const scalar, const primitiveMesh&"
-                ", const pointField&, const labelList&, const labelList&"
-                ", labelHashSet*)"
-            )   << nWarnDet << " cells with determinant < " << warnDet
+            WarningInFunction
+                << nWarnDet << " cells with determinant < " << warnDet
                 << " found.\n"
                 << endl;
         }
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
index 9066f4dfc7..9663074005 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -191,19 +191,8 @@ Foam::regionCoupledBaseGAMGInterface::regionCoupledBaseGAMGInterface
         }
         else
         {
-            FatalErrorIn
-            (
-                "regionCoupledBaseGAMGInterface::"
-                "regionCoupledBaseGAMGInterface"
-                "("
-                "const label index,"
-                "const lduInterfacePtrsList& coarseInterfaces,"
-                "const lduInterface& fineInterface,"
-                "const labelField& localRestrictAddressing,"
-                "const labelField& neighbourRestrictAddressing,"
-                "const label fineLevelIndex"
-                ")"
-            )   << " GAMGAgglomeration was not found in the nbr mesh. "
+            FatalErrorInFunction
+                << " GAMGAgglomeration was not found in the nbr mesh. "
                 << " Check on the cacheAgglomeration flag in fvSolution"
                 << exit(FatalError);
         }
@@ -228,13 +217,6 @@ internalFieldTransfer
     const labelUList& iF
 ) const
 {
-//     WarningIn
-//     (
-//         "regionCoupledBaseGAMGInterface::internalFieldTransfer"
-//         "( const Pstream::commsTypes, const labelUList&)"
-//         " the internal field can not be transfered "
-//         " as the neighbFvPatch are in different meshes "
-//     );
     /*
     //const labelUList& nbrFaceCells = neighbPatch().faceCells();
 
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
index 700b93d9b8..88fb90db28 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,10 +92,7 @@ public:
             {
                 //TBD. How to serialise the AMI such that we can stream
                 // regionCoupledGAMGInterface.
-                notImplemented
-                (
-                    "regionCoupledGAMGInterface::write(Ostream&) const"
-                );
+                NotImplemented;
             }
 };
 
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
index 0695c1e64c..fe283c6152 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,10 +94,7 @@ public:
             {
                 //TBD. How to serialise the AMI such that we can stream
                 // regionCoupledWallGAMGInterface.
-                notImplemented
-                (
-                    "regionCoupledWallGAMGInterface::write(Ostream&) const"
-                );
+                NotImplemented;
             }
 
 };
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
index a9cb60355d..482c7e6557 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@@ -205,7 +205,7 @@ Foam::label Foam::regionCoupledBase::neighbPatchID() const
 
             if (nbrPatchID_ == -1)
             {
-                FatalErrorIn("cyclicPolyAMIPatch::neighbPatchID() const")
+                FatalErrorInFunction
                     << "Illegal neighbourPatch name " << nbrPatchName_
                     << nl << "Valid patch names are "
                     << mesh.boundaryMesh().names()
@@ -221,7 +221,7 @@ Foam::label Foam::regionCoupledBase::neighbPatchID() const
 
             if (nbrPatch.nbrPatchName() != patch_.name())
             {
-                WarningIn("regionCoupledBase::neighbPatchID() const")
+                WarningInFunction
                     << "Patch " << patch_.name()
                     << " specifies neighbour patch " << nbrPatchName()
                     << nl << " but that in return specifies "
@@ -283,10 +283,7 @@ const Foam::AMIPatchToPatchInterpolation& Foam::regionCoupledBase::AMI() const
 {
     if (!owner())
     {
-        FatalErrorIn
-        (
-            "const AMIPatchToPatchInterpolation& regionCoupledBase::AMI()"
-        )
+        FatalErrorInFunction
             << "AMI interpolator only available to owner patch"
             << abort(FatalError);
     }
diff --git a/src/meshTools/regionSplit/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C
index bad9ca8d57..55f7b6a8c1 100644
--- a/src/meshTools/regionSplit/localPointRegion.C
+++ b/src/meshTools/regionSplit/localPointRegion.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,6 +70,11 @@ bool Foam::localPointRegion::isDuplicate
     const bool forward
 )
 {
+    if (f0.size() != f1.size())
+    {
+        return false;
+    }
+
     label fp1 = findIndex(f1, f0[0]);
 
     if (fp1 == -1)
@@ -127,7 +132,7 @@ void Foam::localPointRegion::countPointRegions
 
             if (minRegion[faceI].empty())
             {
-                FatalErrorIn("localPointRegion::countPointRegions(..)")
+                FatalErrorInFunction
                     << "Face from candidateFace without minRegion set." << endl
                     << "Face:" << faceI << " fc:" << mesh.faceCentres()[faceI]
                     << " verts:" << f << abort(FatalError);
@@ -242,6 +247,7 @@ void Foam::localPointRegion::countPointRegions
 void Foam::localPointRegion::calcPointRegions
 (
     const polyMesh& mesh,
+    const labelPairList& baffles,
     boolList& candidatePoint
 )
 {
@@ -423,6 +429,13 @@ void Foam::localPointRegion::calcPointRegions
             minEqOpFace(),
             Foam::dummyTransform()  // dummy transformation
         );
+        forAll(baffles, i)
+        {
+            label f0 = baffles[i].first();
+            label f1 = baffles[i].second();
+            minEqOpFace()(minRegion[f0], minRegion[f1]);
+            minRegion[f1] = minRegion[f0];
+        }
     }
 
 
@@ -469,7 +482,7 @@ Foam::localPointRegion::localPointRegion(const polyMesh& mesh)
         }
     }
 
-    calcPointRegions(mesh, candidatePoint);
+    calcPointRegions(mesh, labelPairList(0), candidatePoint);
 }
 
 
@@ -492,7 +505,31 @@ Foam::localPointRegion::localPointRegion
         candidatePoint[candidatePoints[i]] = true;
     }
 
-    calcPointRegions(mesh, candidatePoint);
+    calcPointRegions(mesh, labelPairList(0), candidatePoint);
+}
+
+
+Foam::localPointRegion::localPointRegion
+(
+    const polyMesh& mesh,
+    const labelPairList& baffles,
+    const labelList& candidatePoints
+)
+:
+    //nRegions_(0),
+    meshPointMap_(0),
+    pointRegions_(0),
+    meshFaceMap_(0),
+    faceRegions_(0)
+{
+    boolList candidatePoint(mesh.nPoints(), false);
+
+    forAll(candidatePoints, i)
+    {
+        candidatePoint[candidatePoints[i]] = true;
+    }
+
+    calcPointRegions(mesh, baffles, candidatePoint);
 }
 
 
@@ -535,11 +572,8 @@ Foam::labelList Foam::localPointRegion::findDuplicateFaces
 
                 if (isDuplicate(f, otherF, true))
                 {
-                    FatalErrorIn
-                    (
-                        "findDuplicateFaces(const primitiveMesh&"
-                        ", const labelList&)"
-                    )   << "Face:" << bFaceI + mesh.nInternalFaces()
+                    FatalErrorInFunction
+                        << "Face:" << bFaceI + mesh.nInternalFaces()
                         << " has local points:" << f
                         << " which are in same order as face:"
                         << otherFaceI + mesh.nInternalFaces()
@@ -557,11 +591,8 @@ Foam::labelList Foam::localPointRegion::findDuplicateFaces
                      || duplicateFace[otherFaceI] != -1
                     )
                     {
-                        FatalErrorIn
-                        (
-                            "findDuplicateFaces(const primitiveMesh&"
-                            ", const labelList&)"
-                        )   << "One of two duplicate faces already marked"
+                        FatalErrorInFunction
+                            << "One of two duplicate faces already marked"
                             << " as duplicate." << nl
                             << "This means that three or more faces share"
                             << " the same points and this is illegal." << nl
@@ -623,21 +654,23 @@ Foam::List<Foam::labelPair> Foam::localPointRegion::findDuplicateFacePairs
              || (patch1 != -1 && isA<processorPolyPatch>(patches[patch1]))
             )
             {
-                FatalErrorIn
-                (
-                    "localPointRegion::findDuplicateFacePairs(const polyMesh&)"
-                )   << "One of two duplicate faces is on"
+                FatalErrorInFunction
+                    << "One of two duplicate faces is on"
                     << " processorPolyPatch."
                     << "This is not allowed." << nl
                     << "Face:" << meshFace0
+                    << " fc:" << mesh.faceCentres()[meshFace0]
                     << " is on patch:" << patches[patch0].name()
                     << nl
                     << "Face:" << meshFace1
+                    << " fc:" << mesh.faceCentres()[meshFace1]
                     << " is on patch:" << patches[patch1].name()
                     << abort(FatalError);
             }
-
-            baffles.append(labelPair(meshFace0, meshFace1));
+            else
+            {
+                baffles.append(labelPair(meshFace0, meshFace1));
+            }
         }
     }
     return baffles.shrink();
diff --git a/src/meshTools/regionSplit/localPointRegion.H b/src/meshTools/regionSplit/localPointRegion.H
index 83bbce1e51..aadb28d904 100644
--- a/src/meshTools/regionSplit/localPointRegion.H
+++ b/src/meshTools/regionSplit/localPointRegion.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,10 +101,10 @@ class localPointRegion
         void calcPointRegions
         (
             const polyMesh& mesh,
+            const labelPairList& baffles,
             boolList& candidatePoint
         );
 
-
         //- Check if two faces are equal. If forward = false checks f1 in
         //  reverse order.
         static bool isDuplicate
@@ -133,6 +133,14 @@ public:
             const labelList& candidatePoints
         );
 
+        //- Construct from mesh and candidate points for duplication
+        localPointRegion
+        (
+            const polyMesh& mesh,
+            const labelPairList& baffles,
+            const labelList& candidatePoints
+        );
+
 
     // Member Functions
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/minData.H b/src/meshTools/regionSplit/minData.H
similarity index 96%
rename from src/parallel/decompose/decompositionMethods/decompositionMethod/minData.H
rename to src/meshTools/regionSplit/minData.H
index ad3fb947e1..a9f6e6dbb6 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/minData.H
+++ b/src/meshTools/regionSplit/minData.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -177,8 +177,8 @@ public:
 
     // IOstream Operators
 
-        friend Ostream& operator<<(Ostream&, const minData&);
-        friend Istream& operator>>(Istream&, minData&);
+        friend inline Ostream& operator<<(Ostream&, const minData&);
+        friend inline Istream& operator>>(Istream&, minData&);
 };
 
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/minDataI.H b/src/meshTools/regionSplit/minDataI.H
similarity index 96%
rename from src/parallel/decompose/decompositionMethods/decompositionMethod/minDataI.H
rename to src/meshTools/regionSplit/minDataI.H
index a079524cb8..727da38dc2 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/minDataI.H
+++ b/src/meshTools/regionSplit/minDataI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -199,7 +199,7 @@ inline bool Foam::minData::operator!=
 
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<
+inline Foam::Ostream& Foam::operator<<
 (
     Foam::Ostream& os,
     const Foam::minData& wDist
@@ -209,7 +209,7 @@ Foam::Ostream& Foam::operator<<
 }
 
 
-Foam::Istream& Foam::operator>>
+inline Foam::Istream& Foam::operator>>
 (
     Foam::Istream& is,
     Foam::minData& wDist
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index 2583c2ddfe..ea4a86551a 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,8 @@ License
 #include "processorPolyPatch.H"
 #include "globalIndex.H"
 #include "syncTools.H"
+#include "FaceCellWave.H"
+#include "minData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -40,340 +42,93 @@ defineTypeNameAndDebug(regionSplit, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Handle (non-processor) coupled faces.
-void Foam::regionSplit::transferCoupledFaceRegion
-(
-    const label faceI,
-    const label otherFaceI,
-
-    labelList& faceRegion,
-    DynamicList<label>& newChangedFaces
-) const
-{
-    if (faceRegion[faceI] >= 0)
-    {
-        if (faceRegion[otherFaceI] == -1)
-        {
-            faceRegion[otherFaceI] = faceRegion[faceI];
-            newChangedFaces.append(otherFaceI);
-        }
-        else if (faceRegion[otherFaceI] == -2)
-        {
-            // otherFaceI blocked but faceI is not. Is illegal for coupled
-            // faces, not for explicit connections.
-        }
-        else if (faceRegion[otherFaceI] != faceRegion[faceI])
-        {
-            FatalErrorIn
-            (
-                  "regionSplit::transferCoupledFaceRegion"
-                  "(const label, const label, labelList&, labelList&) const"
-              )   << "Problem : coupled face " << faceI
-                  << " on patch " << mesh().boundaryMesh().whichPatch(faceI)
-                  << " has region " << faceRegion[faceI]
-                  << " but coupled face " << otherFaceI
-                  << " has region " << faceRegion[otherFaceI]
-                  << endl
-                  << "Is your blocked faces specification"
-                  << " synchronized across coupled boundaries?"
-                  << abort(FatalError);
-        }
-    }
-    else if (faceRegion[faceI] == -1)
-    {
-        if (faceRegion[otherFaceI] >= 0)
-        {
-            faceRegion[faceI] = faceRegion[otherFaceI];
-            newChangedFaces.append(faceI);
-        }
-        else if (faceRegion[otherFaceI] == -2)
-        {
-            // otherFaceI blocked but faceI is not. Is illegal for coupled
-            // faces, not for explicit connections.
-        }
-    }
-}
-
-
-void Foam::regionSplit::fillSeedMask
-(
-    const List<labelPair>& explicitConnections,
-    labelList& cellRegion,
-    labelList& faceRegion,
-    const label seedCellID,
-    const label markValue
-) const
-{
-    // Do seed cell
-    cellRegion[seedCellID] = markValue;
-
-
-    // Collect faces on seed cell
-    const cell& cFaces = mesh().cells()[seedCellID];
-
-    label nFaces = 0;
-
-    labelList changedFaces(cFaces.size());
-
-    forAll(cFaces, i)
-    {
-        label faceI = cFaces[i];
-
-        if (faceRegion[faceI] == -1)
-        {
-            faceRegion[faceI] = markValue;
-            changedFaces[nFaces++] = faceI;
-        }
-    }
-    changedFaces.setSize(nFaces);
-
-
-    // Loop over changed faces. FaceCellWave in small.
-
-    while (changedFaces.size())
-    {
-        //if (debug)
-        //{
-        //    Pout<< "regionSplit::fillSeedMask : changedFaces:"
-        //        << changedFaces.size() << endl;
-        //}
-
-        DynamicList<label> changedCells(changedFaces.size());
-
-        forAll(changedFaces, i)
-        {
-            label faceI = changedFaces[i];
-
-            label own = mesh().faceOwner()[faceI];
-
-            if (cellRegion[own] == -1)
-            {
-                cellRegion[own] = markValue;
-                changedCells.append(own);
-            }
-
-            if (mesh().isInternalFace(faceI))
-            {
-                label nei = mesh().faceNeighbour()[faceI];
-
-                if (cellRegion[nei] == -1)
-                {
-                    cellRegion[nei] = markValue;
-                    changedCells.append(nei);
-                }
-            }
-        }
-
-
-        //if (debug)
-        //{
-        //    Pout<< "regionSplit::fillSeedMask : changedCells:"
-        //        << changedCells.size() << endl;
-        //}
-
-        // Loop over changedCells and collect faces
-        DynamicList<label> newChangedFaces(changedCells.size());
-
-        forAll(changedCells, i)
-        {
-            label cellI = changedCells[i];
-
-            const cell& cFaces = mesh().cells()[cellI];
-
-            forAll(cFaces, cFaceI)
-            {
-                label faceI = cFaces[cFaceI];
-
-                if (faceRegion[faceI] == -1)
-                {
-                    faceRegion[faceI] = markValue;
-                    newChangedFaces.append(faceI);
-                }
-            }
-        }
-
-
-        //if (debug)
-        //{
-        //    Pout<< "regionSplit::fillSeedMask : changedFaces before sync:"
-        //        << changedFaces.size() << endl;
-        //}
-
-
-        // Check for changes to any locally coupled face.
-        // Global connections are done later.
-
-        const polyBoundaryMesh& patches = mesh().boundaryMesh();
-
-        forAll(patches, patchI)
-        {
-            const polyPatch& pp = patches[patchI];
-
-            if
-            (
-                isA<cyclicPolyPatch>(pp)
-             && refCast<const cyclicPolyPatch>(pp).owner()
-            )
-            {
-                // Transfer from neighbourPatch to here or vice versa.
-
-                const cyclicPolyPatch& cycPatch =
-                    refCast<const cyclicPolyPatch>(pp);
-
-                label faceI = cycPatch.start();
-
-                forAll(cycPatch, i)
-                {
-                    label otherFaceI = cycPatch.transformGlobalFace(faceI);
-
-                    transferCoupledFaceRegion
-                    (
-                        faceI,
-                        otherFaceI,
-                        faceRegion,
-                        newChangedFaces
-                    );
-
-                    faceI++;
-                }
-            }
-        }
-        forAll(explicitConnections, i)
-        {
-            transferCoupledFaceRegion
-            (
-                explicitConnections[i][0],
-                explicitConnections[i][1],
-                faceRegion,
-                newChangedFaces
-            );
-        }
-
-        //if (debug)
-        //{
-        //    Pout<< "regionSplit::fillSeedMask : changedFaces after sync:"
-        //        << newChangedFaces.size() << endl;
-        //}
-
-        changedFaces.transfer(newChangedFaces);
-    }
-}
-
-
-Foam::label Foam::regionSplit::calcLocalRegionSplit
+void Foam::regionSplit::calcNonCompactRegionSplit
 (
+    const globalIndex& globalFaces,
     const boolList& blockedFace,
     const List<labelPair>& explicitConnections,
 
     labelList& cellRegion
 ) const
 {
-    if (debug)
-    {
-        if (blockedFace.size())
-        {
-            // Check that blockedFace is synced.
-            boolList syncBlockedFace(blockedFace);
-            syncTools::swapFaceList(mesh(), syncBlockedFace);
+    // Field on cells and faces.
+    List<minData> cellData(mesh().nCells());
+    List<minData> faceData(mesh().nFaces());
 
-            forAll(syncBlockedFace, faceI)
-            {
-                if (syncBlockedFace[faceI] != blockedFace[faceI])
-                {
-                    FatalErrorIn
-                    (
-                        "regionSplit::calcLocalRegionSplit(..)"
-                    )   << "Face " << faceI << " not synchronised. My value:"
-                        << blockedFace[faceI] << "  coupled value:"
-                        << syncBlockedFace[faceI]
-                        << abort(FatalError);
-                }
-            }
+    // Take over blockedFaces by seeding a negative number
+    // (so is always less than the decomposition)
+    label nUnblocked = 0;
+    forAll(faceData, faceI)
+    {
+        if (blockedFace.size() && blockedFace[faceI])
+        {
+            faceData[faceI] = minData(-2);
+        }
+        else
+        {
+            nUnblocked++;
         }
     }
 
-    // Region per face.
-    // -1 unassigned
-    // -2 blocked
-    labelList faceRegion(mesh().nFaces(), -1);
+    // Seed unblocked faces
+    labelList seedFaces(nUnblocked);
+    List<minData> seedData(nUnblocked);
+    nUnblocked = 0;
 
-    if (blockedFace.size())
+
+    forAll(faceData, faceI)
     {
-        forAll(blockedFace, faceI)
+        if (blockedFace.empty() || !blockedFace[faceI])
         {
-            if (blockedFace[faceI])
-            {
-                faceRegion[faceI] = -2;
-            }
+            seedFaces[nUnblocked] = faceI;
+            // Seed face with globally unique number
+            seedData[nUnblocked] = minData(globalFaces.toGlobal(faceI));
+            nUnblocked++;
         }
     }
 
 
-    // Assign local regions
-    // ~~~~~~~~~~~~~~~~~~~~
+    // Propagate information inwards
+    FaceCellWave<minData> deltaCalc
+    (
+        mesh(),
+        explicitConnections,
+        false,  // disable walking through cyclicAMI for backwards compatibility
+        seedFaces,
+        seedData,
+        faceData,
+        cellData,
+        mesh().globalData().nTotalCells()+1
+    );
 
-    // Start with region 0
-    label nLocalRegions = 0;
 
-    label unsetCellI = 0;
-
-    do
+    // And extract
+    cellRegion.setSize(mesh().nCells());
+    forAll(cellRegion, cellI)
     {
-        // Find first unset cell
-
-        for (; unsetCellI < mesh().nCells(); unsetCellI++)
+        if (cellData[cellI].valid(deltaCalc.data()))
         {
-            if (cellRegion[unsetCellI] == -1)
-            {
-                break;
-            }
+            cellRegion[cellI] = cellData[cellI].data();
         }
-
-        if (unsetCellI >= mesh().nCells())
+        else
         {
-            break;
-        }
+            // Unvisited cell -> only possible if surrounded by blocked faces.
+            // If so make up region from any of the faces
+            const cell& cFaces = mesh().cells()[cellI];
+            label faceI = cFaces[0];
 
-        fillSeedMask
-        (
-            explicitConnections,
-            cellRegion,
-            faceRegion,
-            unsetCellI,
-            nLocalRegions
-        );
-
-        // Current unsetCell has now been handled. Go to next region.
-        nLocalRegions++;
-        unsetCellI++;
-    }
-    while (true);
-
-
-    if (debug)
-    {
-        forAll(cellRegion, cellI)
-        {
-            if (cellRegion[cellI] < 0)
+            if (blockedFace.size() && !blockedFace[faceI])
             {
-                FatalErrorIn("regionSplit::calcLocalRegionSplit(..)")
-                    << "cell:" << cellI << " region:" << cellRegion[cellI]
-                    << abort(FatalError);
-            }
-        }
-
-        forAll(faceRegion, faceI)
-        {
-            if (faceRegion[faceI] == -1)
-            {
-                FatalErrorIn("regionSplit::calcLocalRegionSplit(..)")
-                    << "face:" << faceI << " region:" << faceRegion[faceI]
-                    << abort(FatalError);
+                FatalErrorInFunction
+                    << "Problem: unblocked face " << faceI
+                    << " at " << mesh().faceCentres()[faceI]
+                    << " on unassigned cell " << cellI
+                    << mesh().cellCentres()[faceI]
+                    << exit(FatalError);
             }
+            cellRegion[cellI] = globalFaces.toGlobal(faceI);
         }
     }
-
-    return nLocalRegions;
 }
 
 
@@ -388,176 +143,142 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 {
     // See header in regionSplit.H
 
-    // 1. Do local analysis
-    label nLocalRegions = calcLocalRegionSplit
+
+    if (!doGlobalRegions)
+    {
+        // Block all parallel faces to avoid comms across
+        boolList coupledOrBlockedFace(blockedFace);
+        const polyBoundaryMesh& pbm = mesh().boundaryMesh();
+
+        if (coupledOrBlockedFace.size())
+        {
+            forAll(pbm, patchI)
+            {
+                const polyPatch& pp = pbm[patchI];
+                if (isA<processorPolyPatch>(pp))
+                {
+                    label faceI = pp.start();
+                    forAll(pp, i)
+                    {
+                        coupledOrBlockedFace[faceI++] = true;
+                    }
+                }
+            }
+        }
+
+        // Create dummy (local only) globalIndex
+        labelList offsets(Pstream::nProcs()+1, 0);
+        for (label i = Pstream::myProcNo()+1; i < offsets.size(); i++)
+        {
+            offsets[i] = mesh().nFaces();
+        }
+        const globalIndex globalRegions(offsets.xfer());
+
+        // Minimise regions across connected cells
+        // Note: still uses global decisions so all processors are running
+        //       in lock-step, i.e. slowest determines overall time.
+        //       To avoid this we could switch off Pstream::parRun.
+        calcNonCompactRegionSplit
+        (
+            globalRegions,
+            coupledOrBlockedFace,
+            explicitConnections,
+            cellRegion
+        );
+
+        // Compact
+        Map<label> globalToCompact(mesh().nCells()/8);
+        forAll(cellRegion, cellI)
+        {
+            label region = cellRegion[cellI];
+
+            label globalRegion;
+
+            Map<label>::const_iterator fnd = globalToCompact.find(region);
+            if (fnd == globalToCompact.end())
+            {
+                globalRegion = globalRegions.toGlobal(globalToCompact.size());
+                globalToCompact.insert(region, globalRegion);
+            }
+            else
+            {
+                globalRegion = fnd();
+            }
+            cellRegion[cellI] = globalRegion;
+        }
+
+
+        // Return globalIndex with size = localSize and all regions local
+        labelList compactOffsets(Pstream::nProcs()+1, 0);
+        for (label i = Pstream::myProcNo()+1; i < compactOffsets.size(); i++)
+        {
+            compactOffsets[i] = globalToCompact.size();
+        }
+
+        return autoPtr<globalIndex>(new globalIndex(compactOffsets.xfer()));
+    }
+
+
+
+    // Initial global region numbers
+    const globalIndex globalRegions(mesh().nFaces());
+
+    // Minimise regions across connected cells (including parallel)
+    calcNonCompactRegionSplit
     (
+        globalRegions,
         blockedFace,
         explicitConnections,
         cellRegion
     );
 
-    if (!doGlobalRegions)
+
+    // Now our cellRegion will have
+    // - non-local regions (i.e. originating from other processors)
+    // - non-compact locally originating regions
+    // so we'll need to compact
+
+    // 4a: count per originating processor the number of regions
+    labelList nOriginating(Pstream::nProcs(), 0);
     {
-        return autoPtr<globalIndex>(new globalIndex(nLocalRegions));
-    }
+        labelHashSet haveRegion(mesh().nCells()/8);
 
-
-    // 2. Assign global regions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~
-    // Offset local regions to create unique global regions.
-
-    globalIndex globalRegions(nLocalRegions);
-
-
-    // Convert regions to global ones
-    forAll(cellRegion, cellI)
-    {
-        cellRegion[cellI] = globalRegions.toGlobal(cellRegion[cellI]);
-    }
-
-
-    // 3. Merge global regions
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Regions across non-blocked proc patches get merged.
-    // This will set merged global regions to be the min of both.
-    // (this will create gaps in the global region list so they will get
-    // merged later on)
-
-    while (true)
-    {
-        if (debug)
-        {
-            Pout<< nl << "-- Starting Iteration --" << endl;
-        }
-
-
-        const polyBoundaryMesh& patches = mesh().boundaryMesh();
-
-        labelList nbrRegion(mesh().nFaces()-mesh().nInternalFaces(), -1);
-        forAll(patches, patchI)
-        {
-            const polyPatch& pp = patches[patchI];
-
-            if (pp.coupled())
-            {
-                const labelList& patchCells = pp.faceCells();
-                SubList<label> patchNbrRegion
-                (
-                    nbrRegion,
-                    pp.size(),
-                    pp.start()-mesh().nInternalFaces()
-                );
-
-                forAll(patchCells, i)
-                {
-                    label faceI = pp.start()+i;
-                    if (!blockedFace.size() || !blockedFace[faceI])
-                    {
-                        patchNbrRegion[i] = cellRegion[patchCells[i]];
-                    }
-                }
-            }
-        }
-        syncTools::swapBoundaryFaceList(mesh(), nbrRegion);
-
-        Map<label> globalToMerged(mesh().nFaces()-mesh().nInternalFaces());
-
-        forAll(patches, patchI)
-        {
-            const polyPatch& pp = patches[patchI];
-
-            if (pp.coupled())
-            {
-                const labelList& patchCells = pp.faceCells();
-                SubList<label> patchNbrRegion
-                (
-                    nbrRegion,
-                    pp.size(),
-                    pp.start()-mesh().nInternalFaces()
-                );
-
-                forAll(patchCells, i)
-                {
-                    label faceI = pp.start()+i;
-
-                    if (!blockedFace.size() || !blockedFace[faceI])
-                    {
-                        if (patchNbrRegion[i] < cellRegion[patchCells[i]])
-                        {
-                            //Pout<< "on patch:" << pp.name()
-                            //    << " cell:" << patchCells[i]
-                            //    << " at:"
-                            // << mesh().cellCentres()[patchCells[i]]
-                            //    << " was:" << cellRegion[patchCells[i]]
-                            //    << " nbr:" << patchNbrRegion[i]
-                            //    << endl;
-
-                            globalToMerged.insert
-                            (
-                                cellRegion[patchCells[i]],
-                                patchNbrRegion[i]
-                            );
-                        }
-                    }
-                }
-            }
-        }
-
-
-        label nMerged = returnReduce(globalToMerged.size(), sumOp<label>());
-
-        if (debug)
-        {
-            Pout<< "nMerged:" << nMerged << endl;
-        }
-
-        if (nMerged == 0)
-        {
-            break;
-        }
-
-        // Renumber the regions according to the globalToMerged
         forAll(cellRegion, cellI)
         {
-            label regionI = cellRegion[cellI];
-            Map<label>::const_iterator iter = globalToMerged.find(regionI);
-            if (iter != globalToMerged.end())
+            label region = cellRegion[cellI];
+
+            // Count originating processor. Use isLocal as efficiency since
+            // most cells are locally originating.
+            if (globalRegions.isLocal(region))
             {
-                 cellRegion[cellI] = iter();
+                if (haveRegion.insert(region))
+                {
+                    nOriginating[Pstream::myProcNo()]++;
+                }
             }
-        }
-    }
-
-
-    // Now our cellRegion will have non-local elements in it. So compact
-    // it.
-
-    // 4a: count. Use a labelHashSet to count regions only once.
-    label nCompact = 0;
-    {
-        labelHashSet localRegion(mesh().nFaces()-mesh().nInternalFaces());
-        forAll(cellRegion, cellI)
-        {
-            if
-            (
-                globalRegions.isLocal(cellRegion[cellI])
-             && localRegion.insert(cellRegion[cellI])
-            )
+            else
             {
-                nCompact++;
+                label procI = globalRegions.whichProcID(region);
+                if (haveRegion.insert(region))
+                {
+                    nOriginating[procI]++;
+                }
             }
         }
     }
 
     if (debug)
     {
-        Pout<< "Compacted from " << nLocalRegions
-            << " down to " << nCompact << " local regions." << endl;
+        Pout<< "Counted " << nOriginating[Pstream::myProcNo()]
+            << " local regions." << endl;
     }
 
 
     // Global numbering for compacted local regions
-    autoPtr<globalIndex> globalCompactPtr(new globalIndex(nCompact));
+    autoPtr<globalIndex> globalCompactPtr
+    (
+        new globalIndex(nOriginating[Pstream::myProcNo()])
+    );
     const globalIndex& globalCompact = globalCompactPtr();
 
 
@@ -568,12 +289,15 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
     // labelList.
 
     // Local compaction map
-    Map<label> globalToCompact(2*nCompact);
+    Map<label> globalToCompact(2*nOriginating[Pstream::myProcNo()]);
     // Remote regions we want the compact number for
     List<labelHashSet> nonLocal(Pstream::nProcs());
     forAll(nonLocal, procI)
     {
-        nonLocal[procI].resize((nLocalRegions-nCompact)/Pstream::nProcs());
+        if (procI != Pstream::myProcNo())
+        {
+            nonLocal[procI].resize(2*nOriginating[procI]);
+        }
     }
 
     forAll(cellRegion, cellI)
@@ -581,15 +305,12 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
         label region = cellRegion[cellI];
         if (globalRegions.isLocal(region))
         {
-            Map<label>::const_iterator iter = globalToCompact.find(region);
-            if (iter == globalToCompact.end())
-            {
-                label compactRegion = globalCompact.toGlobal
-                (
-                    globalToCompact.size()
-                );
-                globalToCompact.insert(region, compactRegion);
-            }
+            // Insert new compact region (if not yet present)
+            globalToCompact.insert
+            (
+                region,
+                globalCompact.toGlobal(globalToCompact.size())
+            );
         }
         else
         {
@@ -603,22 +324,17 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
     // Convert the nonLocal (labelHashSets) to labelLists.
 
     labelListList sendNonLocal(Pstream::nProcs());
-    labelList nNonLocal(Pstream::nProcs(), 0);
     forAll(sendNonLocal, procI)
     {
-        sendNonLocal[procI].setSize(nonLocal[procI].size());
-        forAllConstIter(labelHashSet, nonLocal[procI], iter)
-        {
-            sendNonLocal[procI][nNonLocal[procI]++] = iter.key();
-        }
+        sendNonLocal[procI] = nonLocal[procI].toc();
     }
 
     if (debug)
     {
-        forAll(nNonLocal, procI)
+        forAll(sendNonLocal, procI)
         {
             Pout<< "    from processor " << procI
-                << " want " << nNonLocal[procI]
+                << " want " << sendNonLocal[procI].size()
                 << " region numbers."
                 << endl;
         }
@@ -627,7 +343,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 
 
     // Get the wanted region labels into recvNonLocal
-    labelListList recvNonLocal;
+    labelListList recvNonLocal(Pstream::nProcs());
     labelListList sizes;
     Pstream::exchange<labelList, label>
     (
@@ -655,6 +371,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
 
     // Send back (into recvNonLocal)
     recvNonLocal.clear();
+    recvNonLocal.setSize(sendWantedLocal.size());
     sizes.clear();
     Pstream::exchange<labelList, label>
     (
diff --git a/src/meshTools/regionSplit/regionSplit.H b/src/meshTools/regionSplit/regionSplit.H
index 83302529df..543259a10b 100644
--- a/src/meshTools/regionSplit/regionSplit.H
+++ b/src/meshTools/regionSplit/regionSplit.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,6 +89,9 @@ Description
 
     Can optionally keep all regions local to the processor.
 
+    Note: does not walk across cyclicAMI/cyclicACMI - since not 'coupled()'
+          at the patch level.
+
 
 SourceFiles
     regionSplit.C
@@ -126,30 +129,10 @@ class regionSplit
 
     // Private Member Functions
 
-        //- Transfer faceRegion data from one face to the other (or vice versa)
-        void transferCoupledFaceRegion
-        (
-            const label faceI,
-            const label otherFaceI,
-
-            labelList& faceRegion,
-            DynamicList<label>& newChangedFaces
-        ) const;
-
-        //- Given a seed cell label, fill cellRegion/faceRegion with markValue
-        //  for contiguous region around it
-        void fillSeedMask
-        (
-            const List<labelPair>& explicitConnections,
-            labelList& cellRegion,
-            labelList& faceRegion,
-            const label seedCellID,
-            const label markValue
-        ) const;
-
-        //- Calculate local region split. Return number of regions.
-        label calcLocalRegionSplit
+        //- Calculate region split in non-compact (global) numbering.
+        void calcNonCompactRegionSplit
         (
+            const globalIndex& globalFaces,
             const boolList& blockedFace,
             const List<labelPair>& explicitConnections,
             labelList& cellRegion
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index 535b7e2871..5eac58aa33 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -58,7 +58,7 @@ void Foam::searchableBox::projectOntoCoordPlane
     }
     else
     {
-        FatalErrorIn("searchableBox::projectOntoCoordPlane(..)")
+        FatalErrorInFunction
             << "Point on plane " << planePt
             << " is not on coordinate " << min()[dir]
             << " nor " << max()[dir] << abort(FatalError);
@@ -172,14 +172,8 @@ Foam::searchableBox::searchableBox
 {
     if (!contains(midpoint()))
     {
-        FatalErrorIn
-        (
-            "Foam::searchableBox::searchableBox\n"
-            "(\n"
-            "    const IOobject& io,\n"
-            "    const treeBoundBox& bb\n"
-            ")\n"
-        )   << "Illegal bounding box specification : "
+        FatalErrorInFunction
+            << "Illegal bounding box specification : "
             << static_cast<const treeBoundBox>(*this) << exit(FatalError);
     }
 
@@ -198,14 +192,8 @@ Foam::searchableBox::searchableBox
 {
     if (!contains(midpoint()))
     {
-        FatalErrorIn
-        (
-            "Foam::searchableBox::searchableBox\n"
-            "(\n"
-            "    const IOobject& io,\n"
-            "    const treeBoundBox& bb\n"
-            ")\n"
-        )   << "Illegal bounding box specification : "
+        FatalErrorInFunction
+            << "Illegal bounding box specification : "
             << static_cast<const treeBoundBox>(*this) << exit(FatalError);
     }
 
@@ -377,11 +365,7 @@ Foam::pointIndexHit Foam::searchableBox::findNearest
     point& linePoint
 ) const
 {
-    notImplemented
-    (
-        "searchableBox::findNearest"
-        "(const linePointRef&, treeBoundBox&, point&)"
-    );
+    NotImplemented;
     return pointIndexHit();
 }
 
@@ -437,7 +421,7 @@ Foam::pointIndexHit Foam::searchableBox::findLine
 
         if (info.index() == -1)
         {
-            FatalErrorIn("searchableBox::findLine(const point&, const point&)")
+            FatalErrorInFunction
                 << "point " << info.rawPoint()
                 << " on segment " << start << end
                 << " should be on face of " << *this
diff --git a/src/meshTools/searchableSurface/searchableBox.H b/src/meshTools/searchableSurface/searchableBox.H
index 81e47680df..306ec460be 100644
--- a/src/meshTools/searchableSurface/searchableBox.H
+++ b/src/meshTools/searchableSurface/searchableBox.H
@@ -261,7 +261,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("searchableBox::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 };
diff --git a/src/meshTools/searchableSurface/searchableCone.C b/src/meshTools/searchableSurface/searchableCone.C
new file mode 100644
index 0000000000..b4c212a92b
--- /dev/null
+++ b/src/meshTools/searchableSurface/searchableCone.C
@@ -0,0 +1,1146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "searchableCone.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(searchableCone, 0);
+addToRunTimeSelectionTable(searchableSurface, searchableCone, dict);
+
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::tmp<Foam::pointField> Foam::searchableCone::coordinates() const
+{
+    tmp<pointField> tCtrs(new pointField(1, 0.5*(point1_ + point2_)));
+
+    return tCtrs;
+}
+
+
+void Foam::searchableCone::boundingSpheres
+(
+    pointField& centres,
+    scalarField& radiusSqr
+) const
+{
+    centres.setSize(1);
+    centres[0] = 0.5*(point1_ + point2_);
+
+    radiusSqr.setSize(1);
+    if (radius1_ > radius2_)
+    {
+        radiusSqr[0] = Foam::magSqr(point1_-centres[0]) + Foam::sqr(radius1_);
+    }
+    else
+    {
+        radiusSqr[0] = Foam::magSqr(point2_-centres[0]) + Foam::sqr(radius2_);
+    }
+
+    // Add a bit to make sure all points are tested inside
+    radiusSqr += Foam::sqr(SMALL);
+}
+
+
+Foam::tmp<Foam::pointField> Foam::searchableCone::points() const
+{
+    tmp<pointField> tPts(new pointField(2));
+    pointField& pts = tPts();
+
+    pts[0] = point1_;
+    pts[1] = point2_;
+
+    return tPts;
+}
+
+
+void Foam::searchableCone::findNearestAndNormal
+(
+    const point& sample,
+    const scalar nearestDistSqr,
+    pointIndexHit& info,
+    vector& nearNormal
+) const
+{
+    vector v(sample - point1_);
+
+    // Decompose sample-point1 into normal and parallel component
+    scalar parallel = (v & unitDir_);
+
+    // Remove the parallel component and normalise
+    v -= parallel*unitDir_;
+
+    scalar magV = mag(v);
+    if (magV < ROOTVSMALL)
+    {
+       v = vector::zero;
+    }
+    else
+    {
+       v /= magV;
+    }
+
+    // Nearest and normal on disk at point1
+    point disk1Point(point1_ + min(max(magV, innerRadius1_), radius1_)*v);
+    vector disk1Normal(-unitDir_);
+
+    // Nearest and normal on disk at point2
+    point disk2Point(point2_ + min(max(magV, innerRadius2_), radius2_)*v);
+    vector disk2Normal(unitDir_);
+
+    // Nearest and normal on cone. Initialise to far-away point so if not
+    // set it picks one of the disk points
+    point nearCone(GREAT, GREAT, GREAT);
+    vector normalCone(1, 0, 0);
+
+    // Nearest and normal on inner cone. Initialise to far-away point
+    point iCnearCone(GREAT, GREAT, GREAT);
+    vector iCnormalCone(1, 0, 0);
+
+    point projPt1 = point1_+ radius1_*v;
+    point projPt2 = point2_+ radius2_*v;
+
+    vector p1 = (projPt1 - point1_);
+    if (mag(p1) > ROOTVSMALL)
+    {
+        p1 /= mag(p1);
+
+        // Find vector along the two end of cone
+        vector b(projPt2 - projPt1);
+        scalar magS = mag(b);
+        b /= magS;
+
+        // Find the vector along sample pt and pt at one end of conde
+        vector a(sample - projPt1);
+
+        if (mag(a) <= ROOTVSMALL)
+        {
+            // Exception: sample on disk1. Redo with projPt2.
+            vector a(sample - projPt2);
+            // Find normal unitvector
+            nearCone = (a & b)*b+projPt2;
+            vector b1 = (p1 & b)*b;
+            normalCone = p1 - b1;
+            normalCone /= mag(normalCone);
+        }
+        else
+        {
+            // Find neartest point on cone surface
+            nearCone = (a & b)*b+projPt1;
+            // Find projection along surface of cone
+            vector b1 = (p1 & b)*b;
+            normalCone = p1 - b1;
+            normalCone /= mag(normalCone);
+        }
+
+        if (innerRadius1_ > 0 || innerRadius2_ > 0)
+        {
+            // Same for inner radius
+            point iCprojPt1 = point1_+ innerRadius1_*v;
+            point iCprojPt2 = point2_+ innerRadius2_*v;
+
+            vector iCp1 = (iCprojPt1 - point1_);
+            iCp1 /= mag(iCp1);
+
+            // Find vector along the two end of cone
+            vector iCb(iCprojPt2 - iCprojPt1);
+            magS = mag(iCb);
+            iCb /= magS;
+
+
+            // Find the vector along sample pt and pt at one end of conde
+            vector iCa(sample - iCprojPt1);
+
+            if (mag(iCa) <= ROOTVSMALL)
+            {
+                vector iCa(sample - iCprojPt2);
+
+                // Find normal unitvector
+                iCnearCone = (iCa & iCb)*iCb+iCprojPt2;
+                vector b1 = (iCp1 & iCb)*iCb;
+                iCnormalCone = iCp1 - b1;
+                iCnormalCone /= mag(iCnormalCone);
+            }
+            else
+            {
+                // Find nearest point on cone surface
+                iCnearCone = (iCa & iCb)*iCb+iCprojPt1;
+                // Find projection along surface of cone
+                vector b1 = (iCp1 & iCb)*iCb;
+                iCnormalCone = iCp1 - b1;
+                iCnormalCone /= mag(iCnormalCone);
+            }
+        }
+    }
+
+
+    // Select nearest out of the 4 points (outer cone, disk1, disk2, inner
+    // cone)
+
+    FixedList<scalar, 4> dist;
+    dist[0] = magSqr(nearCone-sample);
+    dist[1] = magSqr(disk1Point-sample);
+    dist[2] = magSqr(disk2Point-sample);
+    dist[3] = magSqr(iCnearCone-sample);
+
+    label minI = findMin(dist);
+
+
+    // Snap the point to the corresponding surface
+
+    if (minI == 0)  // Outer cone
+    {
+        // Closest to (infinite) outer cone. See if needs clipping to end disks
+
+        {
+            vector v1(nearCone-point1_);
+            scalar para = (v1 & unitDir_);
+            // Remove the parallel component and normalise
+            v1 -= para*unitDir_;
+            scalar magV1 = mag(v1);
+            v1 = v1/magV1;
+            if (para < 0.0 && magV1 >= radius1_)
+            {
+                // Near point 1. Set point to intersection of disk and cone.
+                // Keep normal from cone.
+                nearCone = disk1Point;
+            }
+            else if (para < 0.0 && magV1 < radius1_)
+            {
+                // On disk1
+                nearCone = disk1Point;
+                normalCone = disk1Normal;
+            }
+            else if (para > magDir_ && magV1 >= radius2_)
+            {
+                // Near point 2. Set point to intersection of disk and cone.
+                // Keep normal from cone.
+                nearCone = disk2Point;
+            }
+            else if (para > magDir_ && magV1 < radius2_)
+            {
+                // On disk2
+                nearCone = disk2Point;
+                normalCone = disk2Normal;
+            }
+        }
+        info.setPoint(nearCone);
+        nearNormal = normalCone;
+    }
+    else if (minI == 1) // Near to disk1
+    {
+        info.setPoint(disk1Point);
+        nearNormal = disk1Normal;
+    }
+    else if (minI == 2) // Near to disk2
+    {
+        info.setPoint(disk2Point);
+        nearNormal = disk2Normal;
+    }
+    else                // Near to inner cone
+    {
+        {
+            vector v1(iCnearCone-point1_);
+            scalar para = (v1 & unitDir_);
+            // Remove the parallel component and normalise
+            v1 -= para*unitDir_;
+            scalar magV1 = mag(v1);
+            v1 = v1/magV1;
+
+            if (para < 0.0 && magV1 >= innerRadius1_)
+            {
+               iCnearCone = disk1Point;
+            }
+            else if (para < 0.0 && magV1 < innerRadius1_)
+            {
+               iCnearCone = disk1Point;
+               iCnormalCone = disk1Normal;
+            }
+            else if (para > magDir_ && magV1 >= innerRadius2_)
+            {
+               iCnearCone = disk2Point;
+            }
+            else if (para > magDir_ && magV1 < innerRadius2_)
+            {
+               iCnearCone = disk2Point;
+               iCnormalCone = disk2Normal;
+            }
+        }
+        info.setPoint(iCnearCone);
+        nearNormal = iCnormalCone;
+    }
+
+
+    if (magSqr(sample - info.rawPoint()) < nearestDistSqr)
+    {
+        info.setHit();
+        info.setIndex(0);
+    }
+}
+
+
+Foam::scalar Foam::searchableCone::radius2
+(
+    const searchableCone& cone,
+    const point& pt
+)
+{
+    const vector x = (pt-cone.point1_) ^ cone.unitDir_;
+    return x&x;
+}
+
+
+// From mrl.nyu.edu/~dzorin/rend05/lecture2.pdf,
+// Ray Tracing II, Infinite cone ray intersection.
+void Foam::searchableCone::findLineAll
+(
+    const searchableCone& cone,
+    const scalar innerRadius1,
+    const scalar innerRadius2,
+    const point& start,
+    const point& end,
+    pointIndexHit& near,
+    pointIndexHit& far
+) const
+{
+    near.setMiss();
+    far.setMiss();
+
+    vector point1Start(start-cone.point1_);
+    vector point2Start(start-cone.point2_);
+    vector point1End(end-cone.point1_);
+
+    // Quick rejection of complete vector outside endcaps
+    scalar s1 = point1Start&(cone.unitDir_);
+    scalar s2 = point1End&(cone.unitDir_);
+
+    if ((s1 < 0.0 && s2 < 0.0) || (s1 > cone.magDir_ && s2 > cone.magDir_))
+    {
+        return;
+    }
+
+    // Line as P = start+t*V where V is unit vector and t=[0..mag(end-start)]
+    vector V(end-start);
+    scalar magV = mag(V);
+    if (magV < ROOTVSMALL)
+    {
+        return;
+    }
+    V /= magV;
+
+
+    // We now get the nearest intersections to start. This can either be
+    // the intersection with the end plane or with the cylinder side.
+
+    // Get the two points (expressed in t) on the end planes. This is to
+    // clip any cylinder intersection against.
+    scalar tPoint1;
+    scalar tPoint2;
+
+    // Maintain the two intersections with the endcaps
+    scalar tNear = VGREAT;
+    scalar tFar = VGREAT;
+
+    scalar radius_sec = cone.radius1_;
+
+    {
+        // Find dot product: mag(s)>VSMALL suggest that it is greater
+        scalar s = (V&unitDir_);
+        if (mag(s) > VSMALL)
+        {
+            tPoint1 = -s1/s;
+            tPoint2 = -(point2Start&(cone.unitDir_))/s;
+
+            if (tPoint2 < tPoint1)
+            {
+                Swap(tPoint1, tPoint2);
+            }
+            if (tPoint1 > magV || tPoint2 < 0)
+            {
+                return;
+            }
+            // See if the points on the endcaps are actually inside the cylinder
+            if (tPoint1 >= 0 && tPoint1 <= magV)
+            {
+                scalar r2 = radius2(cone, start+tPoint1*V);
+                vector p1 = (start+tPoint1*V-point1_);
+                vector p2 = (start+tPoint1*V-point2_);
+                radius_sec = cone.radius1_;
+                scalar inC_radius_sec = innerRadius1_;
+
+                if (mag(p2&(cone.unitDir_)) < mag(p1&(cone.unitDir_)))
+                {
+                    radius_sec = cone.radius2_;
+                    inC_radius_sec = innerRadius2_;
+                }
+
+                if (r2 <= sqr(radius_sec) && r2 >= sqr(inC_radius_sec))
+                {
+                    tNear = tPoint1;
+                }
+            }
+            if (tPoint2 >= 0 && tPoint2 <= magV)
+            {
+                // Decompose sample-point1 into normal and parallel component
+                vector p1 = (start+tPoint2*V-cone.point1_);
+                vector p2 = (start+tPoint2*V-cone.point2_);
+                radius_sec = cone.radius1_;
+                scalar inC_radius_sec = innerRadius1_;
+                if (mag(p2&(cone.unitDir_)) < mag(p1&(cone.unitDir_)))
+                {
+                    radius_sec = cone.radius2_;
+                    inC_radius_sec = innerRadius2_;
+                }
+                scalar r2 = radius2(cone, start+tPoint2*V);
+                if (r2 <= sqr(radius_sec) && r2 >= sqr(inC_radius_sec))
+                {
+                    // Check if already have a near hit from point1
+                    if (tNear <= 1)
+                    {
+                        tFar = tPoint2;
+                    }
+                    else
+                    {
+                        tNear = tPoint2;
+                    }
+                }
+            }
+        }
+        else
+        {
+            // Vector perpendicular to cylinder. Check for outside already done
+            // above so just set tpoint to allow all.
+            tPoint1 = -VGREAT;
+            tPoint2 = VGREAT;
+        }
+    }
+
+
+    // Second order equation of the form a*t^2 + b*t + c
+    scalar a, b, c;
+
+    scalar deltaRadius = cone.radius2_-cone.radius1_;
+    if (mag(deltaRadius) <= ROOTVSMALL)
+    {
+        vector point1Start(start-cone.point1_);
+        const vector x = point1Start ^ cone.unitDir_;
+        const vector y = V ^ cone.unitDir_;
+        const scalar d = sqr(0.5*(cone.radius1_ + cone.radius2_));
+
+        a = (y&y);
+        b = 2*(x&y);
+        c = (x&x)-d;
+    }
+    else
+    {
+        vector va = cone.unitDir_;
+        vector v1(end-start);
+        v1 = v1/mag(v1);
+        scalar p  = (va&v1);
+        vector a1 = (v1-p*va);
+
+        // Determine the end point of the cone
+        point pa =
+            cone.unitDir_*cone.radius1_*mag(cone.point2_-cone.point1_)
+           /(-deltaRadius)
+           +cone.point1_;
+
+        scalar l2 = sqr(deltaRadius)+sqr(cone.magDir_);
+        scalar sqrCosAlpha = sqr(cone.magDir_)/l2;
+        scalar sqrSinAlpha = sqr(deltaRadius)/l2;
+
+
+        vector delP(start-pa);
+        vector p1 = (delP-(delP&va)*va);
+
+        a = sqrCosAlpha*((v1-p*va)&(v1-p*va))-sqrSinAlpha*p*p;
+        b =
+            2.0*sqrCosAlpha*(a1&p1)
+           -2.0*sqrSinAlpha*(v1&va)*(delP&va);
+        c =
+            sqrCosAlpha
+           *((delP-(delP&va)*va)&(delP-(delP&va)*va))
+           -sqrSinAlpha*sqr(delP&va);
+    }
+
+    const scalar disc = b*b-4.0*a*c;
+
+    scalar t1 = -VGREAT;
+    scalar t2 = VGREAT;
+
+    if (disc < 0)
+    {
+        // Fully outside
+        return;
+    }
+    else if (disc < ROOTVSMALL)
+    {
+        // Single solution
+        if (mag(a) > ROOTVSMALL)
+        {
+            t1 = -b/(2.0*a);
+
+            if (t1 >= 0.0 && t1 <= magV && t1 >= tPoint1 && t1 <= tPoint2)
+            {
+                // Valid. Insert sorted.
+                if (t1 < tNear)
+                {
+                    tFar = tNear;
+                    tNear = t1;
+                }
+                else if (t1 < tFar)
+                {
+                    tFar = t1;
+                }
+            }
+            else
+            {
+                return;
+            }
+        }
+        else
+        {
+            // Aligned with axis. Check if outside radius
+            if (c > 0.0)
+            {
+                return;
+            }
+        }
+    }
+    else
+    {
+        if (mag(a) > ROOTVSMALL)
+        {
+            scalar sqrtDisc = sqrt(disc);
+
+            t1 = (-b - sqrtDisc)/(2.0*a);
+            t2 = (-b + sqrtDisc)/(2.0*a);
+            if (t2 < t1)
+            {
+                Swap(t1, t2);
+            }
+
+            if (t1 >= 0.0 && t1 <= magV && t1 >= tPoint1 && t1 <= tPoint2)
+            {
+                // Valid. Insert sorted.
+                if (t1 < tNear)
+                {
+                    tFar = tNear;
+                    tNear = t1;
+                }
+                else if (t1 < tFar)
+                {
+                    tFar = t1;
+                }
+            }
+            if (t2>=0 && t2 <= magV && t2 >= tPoint1 && t2 <= tPoint2)
+            {
+                // Valid. Insert sorted.
+                if (t2 < tNear)
+                {
+                    tFar = tNear;
+                    tNear = t2;
+                }
+                else if (t2 < tFar)
+                {
+                    tFar = t2;
+                }
+            }
+        }
+        else
+        {
+            // Aligned with axis. Check if outside radius
+            if (c > 0.0)
+            {
+                return;
+            }
+        }
+    }
+
+    // Check tNear, tFar
+    if (tNear>=0 && tNear <= magV)
+    {
+        near.setPoint(start+tNear*V);
+        near.setHit();
+        near.setIndex(0);
+        if (tFar <= magV)
+        {
+            far.setPoint(start+tFar*V);
+            far.setHit();
+            far.setIndex(0);
+        }
+    }
+    else if (tFar>=0 && tFar <= magV)
+    {
+        near.setPoint(start+tFar*V);
+        near.setHit();
+        near.setIndex(0);
+    }
+}
+
+
+void Foam::searchableCone::insertHit
+(
+    const point& start,
+    const point& end,
+    List<pointIndexHit>& info,
+    const pointIndexHit& hit
+) const
+{
+    scalar smallDistSqr = SMALL*magSqr(end-start);
+
+    scalar hitMagSqr = magSqr(hit.hitPoint()-start);
+
+    forAll(info, i)
+    {
+        scalar d2 = magSqr(info[i].hitPoint()-start);
+
+        if (d2 > hitMagSqr+smallDistSqr)
+        {
+            // Insert at i.
+            label sz = info.size();
+            info.setSize(sz+1);
+            for (label j = sz; j > i; --j)
+            {
+                info[j] = info[j-1];
+            }
+            info[i] = hit;
+            return;
+        }
+        else if (d2 > hitMagSqr-smallDistSqr)
+        {
+            // hit is same point as info[i].
+            return;
+        }
+    }
+    // Append
+    label sz = info.size();
+    info.setSize(sz+1);
+    info[sz] = hit;
+}
+
+
+Foam::boundBox Foam::searchableCone::calcBounds() const
+{
+    // Adapted from
+    // http://www.gamedev.net/community/forums
+    //       /topic.asp?topic_id=338522&forum_id=20&gforum_id=0
+
+    // Let cylinder have end points A,B and radius r,
+
+    // Bounds in direction X (same for Y and Z) can be found as:
+    // Let A.X<B.X (otherwise swap points)
+    // Good approximate lowest bound is A.X-r and highest is B.X+r (precise for
+    // capsule). At worst, in one direction it can be larger than needed by 2*r.
+
+    // Accurate bounds for cylinder is
+    // A.X-kx*r, B.X+kx*r
+    // where
+    // kx=sqrt(((A.Y-B.Y)^2+(A.Z-B.Z)^2)/((A.X-B.X)^2+(A.Y-B.Y)^2+(A.Z-B.Z)^2))
+
+    // similar thing for Y and Z
+    // (i.e.
+    // ky=sqrt(((A.X-B.X)^2+(A.Z-B.Z)^2)/((A.X-B.X)^2+(A.Y-B.Y)^2+(A.Z-B.Z)^2))
+    // kz=sqrt(((A.X-B.X)^2+(A.Y-B.Y)^2)/((A.X-B.X)^2+(A.Y-B.Y)^2+(A.Z-B.Z)^2))
+    // )
+
+    // How derived: geometric reasoning. Bounds of cylinder is same as for 2
+    // circles centered on A and B. This sqrt thingy gives sine of angle between
+    // axis and direction, used to find projection of radius.
+
+    vector kr
+    (
+        sqrt(sqr(unitDir_.y()) + sqr(unitDir_.z())),
+        sqrt(sqr(unitDir_.x()) + sqr(unitDir_.z())),
+        sqrt(sqr(unitDir_.x()) + sqr(unitDir_.y()))
+    );
+
+    if (radius2_ >= radius1_)
+    {
+        kr *= radius2_;
+    }
+    else
+    {
+        kr *= radius1_;
+    }
+
+    point min = point1_ - kr;
+    point max = point1_ + kr;
+
+    min = ::Foam::min(min, point2_ - kr);
+    max = ::Foam::max(max, point2_ + kr);
+
+    return boundBox(min, max);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::searchableCone::searchableCone
+(
+    const IOobject& io,
+    const point& point1,
+    const scalar radius1,
+    const scalar innerRadius1,
+    const point& point2,
+    const scalar radius2,
+    const scalar innerRadius2
+)
+:
+    searchableSurface(io),
+    point1_(point1),
+    radius1_(radius1),
+    innerRadius1_(innerRadius1),
+    point2_(point2),
+    radius2_(radius2),
+    innerRadius2_(innerRadius2),
+    magDir_(mag(point2_-point1_)),
+    unitDir_((point2_-point1_)/magDir_)
+{
+    bounds() = calcBounds();
+}
+
+
+Foam::searchableCone::searchableCone
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+:
+    searchableSurface(io),
+    point1_(dict.lookup("point1")),
+    radius1_(readScalar(dict.lookup("radius1"))),
+    innerRadius1_(dict.lookupOrDefault("innerRadius1", 0.0)),
+    point2_(dict.lookup("point2")),
+    radius2_(readScalar(dict.lookup("radius2"))),
+    innerRadius2_(dict.lookupOrDefault("innerRadius2", 0.0)),
+    magDir_(mag(point2_-point1_)),
+    unitDir_((point2_-point1_)/magDir_)
+{
+    bounds() = calcBounds();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::searchableCone::~searchableCone()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::wordList& Foam::searchableCone::regions() const
+{
+    if (regions_.empty())
+    {
+        regions_.setSize(1);
+        regions_[0] = "region0";
+    }
+    return regions_;
+}
+
+
+void Foam::searchableCone::findNearest
+(
+    const pointField& samples,
+    const scalarField& nearestDistSqr,
+    List<pointIndexHit>& info
+) const
+{
+    info.setSize(samples.size());
+    forAll(samples, i)
+    {
+        vector normal;
+        findNearestAndNormal(samples[i], nearestDistSqr[i], info[i], normal);
+    }
+}
+
+
+void Foam::searchableCone::findLine
+(
+    const pointField& start,
+    const pointField& end,
+    List<pointIndexHit>& info
+) const
+{
+    info.setSize(start.size());
+
+    forAll(start, i)
+    {
+        // Pick nearest intersection. If none intersected take second one.
+        pointIndexHit b;
+        findLineAll
+        (
+            *this,
+            innerRadius1_,
+            innerRadius2_,
+            start[i],
+            end[i],
+            info[i],
+            b
+        );
+        if (!info[i].hit() && b.hit())
+        {
+            info[i] = b;
+        }
+    }
+
+
+    if (innerRadius1_ > 0.0 || innerRadius2_ > 0.0)
+    {
+        IOobject io(*this);
+        io.rename(name()+"Inner");
+        searchableCone innerCone
+        (
+            io,
+            point1_,
+            innerRadius1_,
+            0.0,
+            point2_,
+            innerRadius2_,
+            0.0
+        );
+
+        forAll(info, i)
+        {
+            point newEnd;
+            if (info[i].hit())
+            {
+                newEnd = info[i].hitPoint();
+            }
+            else
+            {
+                newEnd = end[i];
+            }
+            pointIndexHit near;
+            pointIndexHit far;
+            findLineAll
+            (
+                innerCone,
+                innerRadius1_,
+                innerRadius2_,
+                start[i],
+                newEnd,
+                near,
+                far
+            );
+
+            if (near.hit())
+            {
+                info[i] = near;
+            }
+            else if (far.hit())
+            {
+                info[i] = far;
+            }
+        }
+    }
+}
+
+
+void Foam::searchableCone::findLineAny
+(
+    const pointField& start,
+    const pointField& end,
+    List<pointIndexHit>& info
+) const
+{
+    info.setSize(start.size());
+
+    forAll(start, i)
+    {
+        // Discard far intersection
+        pointIndexHit b;
+        findLineAll
+        (
+            *this,
+            innerRadius1_,
+            innerRadius2_,
+            start[i],
+            end[i],
+            info[i],
+            b
+        );
+        if (!info[i].hit() && b.hit())
+        {
+            info[i] = b;
+        }
+    }
+    if (innerRadius1_ > 0.0 || innerRadius2_ > 0.0)
+    {
+        IOobject io(*this);
+        io.rename(name()+"Inner");
+        searchableCone cone
+        (
+            io,
+            point1_,
+            innerRadius1_,
+            0.0,
+            point2_,
+            innerRadius2_,
+            0.0
+        );
+
+        forAll(info, i)
+        {
+            if (!info[i].hit())
+            {
+                pointIndexHit b;
+                findLineAll
+                (
+                    cone,
+                    innerRadius1_,
+                    innerRadius2_,
+                    start[i],
+                    end[i],
+                    info[i],
+                    b
+                );
+                if (!info[i].hit() && b.hit())
+                {
+                    info[i] = b;
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::searchableCone::findLineAll
+(
+    const pointField& start,
+    const pointField& end,
+    List<List<pointIndexHit> >& info
+) const
+{
+    info.setSize(start.size());
+
+    forAll(start, i)
+    {
+        pointIndexHit near, far;
+        findLineAll
+        (
+            *this,
+            innerRadius1_,
+            innerRadius2_,
+            start[i],
+            end[i],
+            near,
+            far
+        );
+
+        if (near.hit())
+        {
+            if (far.hit())
+            {
+                info[i].setSize(2);
+                info[i][0] = near;
+                info[i][1] = far;
+            }
+            else
+            {
+                info[i].setSize(1);
+                info[i][0] = near;
+            }
+        }
+        else
+        {
+            if (far.hit())
+            {
+                info[i].setSize(1);
+                info[i][0] = far;
+            }
+            else
+            {
+                info[i].clear();
+            }
+        }
+    }
+
+    if (innerRadius1_ > 0.0 || innerRadius2_ > 0.0)
+    {
+        IOobject io(*this);
+        io.rename(name()+"Inner");
+        searchableCone cone
+        (
+            io,
+            point1_,
+            innerRadius1_,
+            0.0,
+            point2_,
+            innerRadius2_,
+            0.0
+        );
+
+        forAll(info, i)
+        {
+            pointIndexHit near;
+            pointIndexHit far;
+            findLineAll
+            (
+                cone,
+                innerRadius1_,
+                innerRadius2_,
+                start[i],
+                end[i],
+                near,
+                far
+            );
+
+            if (near.hit())
+            {
+                insertHit(start[i], end[i], info[i], near);
+            }
+            if (far.hit())
+            {
+                insertHit(start[i], end[i], info[i], far);
+            }
+        }
+    }
+}
+
+
+void Foam::searchableCone::getRegion
+(
+    const List<pointIndexHit>& info,
+    labelList& region
+) const
+{
+    region.setSize(info.size());
+    region = 0;
+}
+
+
+void Foam::searchableCone::getNormal
+(
+    const List<pointIndexHit>& info,
+    vectorField& normal
+) const
+{
+    normal.setSize(info.size());
+    normal = vector::zero;
+
+    forAll(info, i)
+    {
+        if (info[i].hit())
+        {
+            pointIndexHit nearInfo;
+            findNearestAndNormal
+            (
+                info[i].hitPoint(),
+                Foam::sqr(GREAT),
+                nearInfo,
+                normal[i]
+            );
+        }
+    }
+}
+
+
+void Foam::searchableCone::getVolumeType
+(
+    const pointField& points,
+    List<volumeType>& volType
+) const
+{
+    volType.setSize(points.size());
+    volType = volumeType::INSIDE;
+
+    scalar magDir = magDir_;
+
+    bool swap = false;
+    bool swapInner = false;
+
+    if (radius1_ > radius2_)
+    {
+         swap = true;
+    }
+
+    if (innerRadius1_ > innerRadius2_)
+    {
+         swapInner = true;
+    }
+
+    forAll(points, pointI)
+    {
+        const point& pt = points[pointI];
+
+        vector v(pt - point1_);
+
+        // Decompose sample-point1 into normal and parallel component
+        scalar parallel = v & unitDir_;
+        scalar comp = parallel;
+        scalar compInner = parallel;
+        if (swap)
+        {
+            comp = -(magDir-parallel);
+        }
+
+        if (swapInner)
+        {
+            compInner = -(magDir-parallel);
+        }
+
+        scalar radius_sec = radius1_+comp*(radius2_-radius1_)/magDir_;
+
+        scalar radius_sec_inner =
+            innerRadius1_
+           +compInner*(innerRadius2_-innerRadius1_)/magDir_;
+
+        if (parallel < 0)
+        {
+            // Left of point1 endcap
+            volType[pointI] = volumeType::OUTSIDE;
+        }
+        else if (parallel > magDir_)
+        {
+            // Right of point2 endcap
+            volType[pointI] = volumeType::OUTSIDE;
+        }
+        else
+        {
+            // Remove the parallel component
+            v -= parallel*unitDir_;
+            if (mag(v) >= radius_sec_inner && mag(v) <= radius_sec)
+            {
+                volType[pointI] = volumeType::INSIDE;
+            }
+            else
+            {
+                volType[pointI] = volumeType::OUTSIDE;
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/searchableCone.H b/src/meshTools/searchableSurface/searchableCone.H
new file mode 100644
index 0000000000..b3f2dbd535
--- /dev/null
+++ b/src/meshTools/searchableSurface/searchableCone.H
@@ -0,0 +1,292 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::searchableCone
+
+Description
+    Searching on (optionally hollow) cone.
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        point1       | coordinate of endpoint  | yes         |
+        radius1      | radius at point1        | yes         | yes
+        innerRadius1 | inner radius at point1  | no          |
+        point2       | coordinate of endpoint  | yes         |
+        radius2      | radius at point2        | yes         | yes
+        innerRadius2 | inner radius at point2  | no          |
+    \endtable
+
+Note
+    Initial implementation, might suffer from robustness (e.g. radius1==radius2)
+
+SourceFiles
+    searchableCone.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef searchableCone_H
+#define searchableCone_H
+
+#include "searchableSurface.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class searchableCone Declaration
+\*---------------------------------------------------------------------------*/
+
+class searchableCone
+:
+    public searchableSurface
+{
+    // Private Member Data
+
+        //- 'Left' point
+        const point point1_;
+
+        //- Outer radius at point1
+        const scalar radius1_;
+
+        //- Inner radius at point1
+        const scalar innerRadius1_;
+
+
+        //- 'Right' point
+        const point point2_;
+
+        //- Outer radius at point2
+        const scalar radius2_;
+
+        //- Inner radius at point2
+        const scalar innerRadius2_;
+
+
+        //- Length of vector point2-point1
+        const scalar magDir_;
+
+        //- Normalised vector point2-point1
+        const vector unitDir_;
+
+
+        //- Names of regions
+        mutable wordList regions_;
+
+
+   // Private Member Functions
+
+        //- Find nearest point on cylinder.
+        void findNearestAndNormal
+        (
+            const point& sample,
+            const scalar nearestDistSqr,
+            pointIndexHit & nearInfo,
+            vector& normal
+        ) const;
+
+        //- Determine radial coordinate (squared)
+        static scalar radius2(const searchableCone& cone, const point& pt);
+
+        //- Find both intersections with cone. innerRadii supplied externally.
+        void findLineAll
+        (
+            const searchableCone& cone,
+            const scalar innerRadius1,
+            const scalar innerRadius2,
+            const point& start,
+            const point& end,
+            pointIndexHit& near,
+            pointIndexHit& far
+        ) const;
+
+        //- Insert a hit if it differs (by a tolerance) from the existing ones
+        void insertHit
+        (
+            const point& start,
+            const point& end,
+            List<pointIndexHit>& info,
+            const pointIndexHit& hit
+        ) const;
+
+        //- Return the boundBox of the cylinder
+        boundBox calcBounds() const;
+
+        //- Disallow default bitwise copy construct
+        searchableCone(const searchableCone&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const searchableCone&);
+
+
+public:
+
+    //- Runtime type information
+   TypeName("searchableCone");
+
+
+    // Constructors
+
+        //- Construct from components
+       searchableCone
+       (
+           const IOobject& io,
+           const point& point1,
+           const scalar radius1,
+           const scalar innerRadius1,
+           const point& point2,
+           const scalar radius2,
+           const scalar innerRadius2
+       );
+
+        //- Construct from dictionary (used by searchableSurface)
+        searchableCone
+        (
+            const IOobject& io,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+
+        virtual ~searchableCone();
+
+
+    // Member Functions
+
+        virtual const wordList& regions() const;
+
+        //- Whether supports volume type below
+        virtual bool hasVolumeType() const
+        {
+            return true;
+        }
+
+        //- Range of local indices that can be returned.
+        virtual label size() const
+        {
+            return 1;
+        }
+
+        //- Get representative set of element coordinates
+        //  Usually the element centres (should be of length size()).
+        virtual tmp<pointField> coordinates() const;
+
+        //- Get bounding spheres (centre and radius squared), one per element.
+        //  Any point on element is guaranteed to be inside.
+        virtual void boundingSpheres
+        (
+            pointField& centres,
+            scalarField& radiusSqr
+        ) const;
+
+        //- Get the points that define the surface.
+        virtual tmp<pointField> points() const;
+
+        //- Does any part of the surface overlap the supplied bound box?
+        virtual bool overlaps(const boundBox& bb) const
+        {
+            NotImplemented;
+            return false;
+        }
+
+
+        // Multiple point queries.
+
+            //- Find nearest point on cylinder
+            virtual void findNearest
+            (
+                const pointField& sample,
+                const scalarField& nearestDistSqr,
+                List<pointIndexHit>&
+            ) const;
+
+            //- Find nearest intersection on line from start to end
+            virtual void findLine
+            (
+                const pointField& start,
+                const pointField& end,
+                List<pointIndexHit>&
+            ) const;
+
+            //- Find all intersections in order from start to end
+            virtual void findLineAll
+            (
+                const pointField& start,
+                const pointField& end,
+                List<List<pointIndexHit> >&
+            ) const;
+
+            //- Find any intersection on line from start to end
+            virtual void findLineAny
+            (
+                const pointField& start,
+                const pointField& end,
+                List<pointIndexHit>&
+            ) const;
+
+            //- From a set of points and indices get the region
+            virtual void getRegion
+            (
+                const List<pointIndexHit>&,
+                labelList& region
+            ) const;
+
+            //- From a set of points and indices get the normal
+            virtual void getNormal
+            (
+                const List<pointIndexHit>&,
+                vectorField& normal
+            ) const;
+
+            //- Determine type (inside/outside/mixed) for point. unknown if
+            //  cannot be determined (e.g. non-manifold surface)
+            virtual void getVolumeType
+            (
+                const pointField&,
+                List<volumeType>&
+            ) const;
+
+
+        // regIOobject implementation
+
+            virtual bool writeData(Ostream&) const
+            {
+                NotImplemented;
+                return false;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/searchableCylinder.H b/src/meshTools/searchableSurface/searchableCylinder.H
index fe00bc4258..230acdb5b0 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.H
+++ b/src/meshTools/searchableSurface/searchableCylinder.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,8 +43,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-
 /*---------------------------------------------------------------------------*\
                            Class searchableCylinder Declaration
 \*---------------------------------------------------------------------------*/
@@ -171,10 +169,7 @@ public:
         //- Does any part of the surface overlap the supplied bound box?
         virtual bool overlaps(const boundBox& bb) const
         {
-            notImplemented
-            (
-                "searchableCylinder::overlaps(const boundBox&) const"
-            );
+            NotImplemented;
 
             return false;
         }
@@ -238,7 +233,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("searchableCylinder::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/meshTools/searchableSurface/searchableDisk.C b/src/meshTools/searchableSurface/searchableDisk.C
index a9c968aacd..db8f92f0a9 100644
--- a/src/meshTools/searchableSurface/searchableDisk.C
+++ b/src/meshTools/searchableSurface/searchableDisk.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -317,11 +317,8 @@ void Foam::searchableDisk::getVolumeType
     List<volumeType>& volType
 ) const
 {
-    FatalErrorIn
-    (
-        "searchableDisk::getVolumeType(const pointField&"
-        ", List<volumeType>&) const"
-    )   << "Volume type not supported for disk."
+    FatalErrorInFunction
+        << "Volume type not supported for disk."
         << exit(FatalError);
 }
 
diff --git a/src/meshTools/searchableSurface/searchableDisk.H b/src/meshTools/searchableSurface/searchableDisk.H
index c31ad42c4a..2dbf8b4df1 100644
--- a/src/meshTools/searchableSurface/searchableDisk.H
+++ b/src/meshTools/searchableSurface/searchableDisk.H
@@ -164,10 +164,7 @@ public:
         //- Does any part of the surface overlap the supplied bound box?
         virtual bool overlaps(const boundBox& bb) const
         {
-            notImplemented
-            (
-                "searchableDisk::overlaps(const boundBox&) const"
-            );
+            NotImplemented;
 
             return false;
         }
@@ -231,7 +228,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("searchableDisk::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/meshTools/searchableSurface/searchablePlane.C b/src/meshTools/searchableSurface/searchablePlane.C
index e6c9668b1f..5f931758f9 100644
--- a/src/meshTools/searchableSurface/searchablePlane.C
+++ b/src/meshTools/searchableSurface/searchablePlane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -256,11 +256,8 @@ void Foam::searchablePlane::getVolumeType
     List<volumeType>& volType
 ) const
 {
-    FatalErrorIn
-    (
-        "searchableCollection::getVolumeType(const pointField&"
-        ", List<volumeType>&) const"
-    )   << "Volume type not supported for plane."
+    FatalErrorInFunction
+        << "Volume type not supported for plane."
         << exit(FatalError);
 }
 
diff --git a/src/meshTools/searchableSurface/searchablePlane.H b/src/meshTools/searchableSurface/searchablePlane.H
index a79f93f902..4b2ffefb01 100644
--- a/src/meshTools/searchableSurface/searchablePlane.H
+++ b/src/meshTools/searchableSurface/searchablePlane.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,10 +148,7 @@ public:
         //- Does any part of the surface overlap the supplied bound box?
         virtual bool overlaps(const boundBox& bb) const
         {
-            notImplemented
-            (
-                "searchablePlane::overlaps(const boundBox&) const"
-            );
+            NotImplemented;
 
             return false;
         }
@@ -215,7 +212,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("searchablePlane::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index 163f282c50..a6ad5eeb6b 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::direction Foam::searchablePlate::calcNormal(const point& span)
     {
         if (span[dir] < 0)
         {
-            FatalErrorIn("searchablePlate::calcNormal()")
+            FatalErrorInFunction
                 << "Span should have two positive and one zero entry. Now:"
                 << span << exit(FatalError);
         }
@@ -69,7 +69,7 @@ Foam::direction Foam::searchablePlate::calcNormal(const point& span)
 
     if (normalDir == 3)
     {
-        FatalErrorIn("searchablePlate::calcNormal()")
+        FatalErrorInFunction
             << "Span should have two positive and one zero entry. Now:"
             << span << exit(FatalError);
     }
@@ -190,7 +190,7 @@ Foam::pointIndexHit Foam::searchablePlate::findLine
 
         if (!bb.contains(info.hitPoint()))
         {
-            FatalErrorIn("searchablePlate::findLine(..)")
+            FatalErrorInFunction
                 << "bb:" << bb << endl
                 << "origin_:" << origin_ << endl
                 << "span_:" << span_ << endl
@@ -440,11 +440,8 @@ void Foam::searchablePlate::getVolumeType
     List<volumeType>& volType
 ) const
 {
-    FatalErrorIn
-    (
-        "searchableCollection::getVolumeType(const pointField&"
-        ", List<volumeType>&) const"
-    )   << "Volume type not supported for plate."
+    FatalErrorInFunction
+        << "Volume type not supported for plate."
         << exit(FatalError);
 }
 
diff --git a/src/meshTools/searchableSurface/searchablePlate.H b/src/meshTools/searchableSurface/searchablePlate.H
index 0cbea9e01a..d1b69462a9 100644
--- a/src/meshTools/searchableSurface/searchablePlate.H
+++ b/src/meshTools/searchableSurface/searchablePlate.H
@@ -223,7 +223,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("searchablePlate::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 };
diff --git a/src/meshTools/searchableSurface/searchableRotatedBox.C b/src/meshTools/searchableSurface/searchableRotatedBox.C
new file mode 100644
index 0000000000..5fc3c79f58
--- /dev/null
+++ b/src/meshTools/searchableSurface/searchableRotatedBox.C
@@ -0,0 +1,396 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "searchableRotatedBox.H"
+#include "addToRunTimeSelectionTable.H"
+#include "axesRotation.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(searchableRotatedBox, 0);
+    addToRunTimeSelectionTable(searchableSurface, searchableRotatedBox, dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::searchableRotatedBox::searchableRotatedBox
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+:
+    searchableSurface(io),
+    box_
+    (
+        IOobject
+        (
+            io.name() + "_box",
+            io.instance(),
+            io.local(),
+            io.db(),
+            io.readOpt(),
+            io.writeOpt(),
+            false      //io.registerObject(),
+        ),
+        treeBoundBox(point::zero, dict.lookup("span"))
+    ),
+    transform_
+    (
+        "rotation",
+        dict.lookup("origin"),
+        dict.lookup("e3"),
+        dict.lookup("e1")
+    )
+{
+    points_ = transform_.globalPosition(box_.points());
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::searchableRotatedBox::~searchableRotatedBox()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::wordList& Foam::searchableRotatedBox::regions() const
+{
+    return box_.regions();
+}
+
+
+Foam::tmp<Foam::pointField> Foam::searchableRotatedBox::coordinates() const
+{
+    return transform_.globalPosition(box_.coordinates());
+}
+
+
+void Foam::searchableRotatedBox::boundingSpheres
+(
+    pointField& centres,
+    scalarField& radiusSqr
+) const
+{
+    box_.boundingSpheres(centres, radiusSqr);
+    centres = transform_.globalPosition(centres);
+}
+
+
+Foam::tmp<Foam::pointField> Foam::searchableRotatedBox::points() const
+{
+    return points_;
+}
+
+
+bool Foam::searchableRotatedBox::overlaps(const boundBox& bb) const
+{
+    // (from treeDataPrimitivePatch.C)
+
+    // 1. bounding box
+    if (!bb.overlaps(bounds()))
+    {
+        return false;
+    }
+
+    // 2. Check if one or more face points inside
+    const faceList& fcs = treeBoundBox::faces;
+    forAll(fcs, faceI)
+    {
+        if (bb.containsAny(points_))
+        {
+            return true;
+        }
+    }
+
+    // 3. Difficult case: all points are outside but connecting edges might
+    // go through cube.
+
+    const treeBoundBox treeBb(bb);
+
+    // 3a. my edges through bb faces
+    const edgeList& edges = treeBoundBox::edges;
+    forAll(edges, edgeI)
+    {
+        const edge& e = edges[edgeI];
+
+        point inter;
+        if (treeBb.intersects(points_[e[0]], points_[e[1]], inter))
+        {
+            return true;
+        }
+    }
+
+    // 3b. bb edges through my faces
+
+    const pointField bbPoints(bb.points());
+
+    forAll(fcs, faceI)
+    {
+        const face& f = fcs[faceI];
+        point fc = f.centre(points_);
+
+        forAll(edges, edgeI)
+        {
+            const edge& e = edges[edgeI];
+
+            pointHit inter = f.intersection
+            (
+                bbPoints[e[0]],
+                bbPoints[e[1]],
+                fc,
+                points_,
+                intersection::HALF_RAY
+            );
+
+            if (inter.hit() && inter.distance() <= 1)
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
+Foam::pointIndexHit Foam::searchableRotatedBox::findNearest
+(
+    const point& sample,
+    const scalar nearestDistSqr
+) const
+{
+    pointIndexHit boxNearest
+    (
+        box_.findNearest
+        (
+            transform_.localPosition(sample),
+            nearestDistSqr
+        )
+    );
+
+    boxNearest.rawPoint() = transform_.globalPosition(boxNearest.rawPoint());
+
+    return boxNearest;
+}
+
+
+Foam::pointIndexHit Foam::searchableRotatedBox::findNearest
+(
+    const linePointRef& ln,
+    treeBoundBox& tightest,
+    point& linePoint
+) const
+{
+    NotImplemented;
+    return pointIndexHit();
+}
+
+
+Foam::pointIndexHit Foam::searchableRotatedBox::findLine
+(
+    const point& start,
+    const point& end
+) const
+{
+    pointIndexHit boxHit
+    (
+        box_.findLine
+        (
+            transform_.localPosition(start),
+            transform_.localPosition(end)
+        )
+    );
+
+    boxHit.rawPoint() = transform_.globalPosition(boxHit.rawPoint());
+
+    return boxHit;
+}
+
+
+Foam::pointIndexHit Foam::searchableRotatedBox::findLineAny
+(
+    const point& start,
+    const point& end
+) const
+{
+    return findLine(start, end);
+}
+
+
+void Foam::searchableRotatedBox::findNearest
+(
+    const pointField& samples,
+    const scalarField& nearestDistSqr,
+    List<pointIndexHit>& info
+) const
+{
+    info.setSize(samples.size());
+
+    forAll(samples, i)
+    {
+        info[i] = findNearest(samples[i], nearestDistSqr[i]);
+    }
+}
+
+
+void Foam::searchableRotatedBox::findLine
+(
+    const pointField& start,
+    const pointField& end,
+    List<pointIndexHit>& info
+) const
+{
+    info.setSize(start.size());
+
+    forAll(start, i)
+    {
+        info[i] = findLine(start[i], end[i]);
+    }
+}
+
+
+void Foam::searchableRotatedBox::findLineAny
+(
+    const pointField& start,
+    const pointField& end,
+    List<pointIndexHit>& info
+) const
+{
+    info.setSize(start.size());
+
+    forAll(start, i)
+    {
+        info[i] = findLineAny(start[i], end[i]);
+    }
+}
+
+
+void Foam::searchableRotatedBox::findLineAll
+(
+    const pointField& start,
+    const pointField& end,
+    List<List<pointIndexHit> >& info
+) const
+{
+    info.setSize(start.size());
+
+    // Work array
+    DynamicList<pointIndexHit, 1, 1> hits;
+
+    // Tolerances:
+    // To find all intersections we add a small vector to the last intersection
+    // This is chosen such that
+    // - it is significant (SMALL is smallest representative relative tolerance;
+    //   we need something bigger since we're doing calculations)
+    // - if the start-end vector is zero we still progress
+    const vectorField dirVec(end-start);
+    const scalarField magSqrDirVec(magSqr(dirVec));
+    const vectorField smallVec
+    (
+        Foam::sqrt(SMALL)*dirVec
+      + vector(ROOTVSMALL,ROOTVSMALL,ROOTVSMALL)
+    );
+
+    forAll(start, pointI)
+    {
+        // See if any intersection between pt and end
+        pointIndexHit inter = findLine(start[pointI], end[pointI]);
+
+        if (inter.hit())
+        {
+            hits.clear();
+            hits.append(inter);
+
+            point pt = inter.hitPoint() + smallVec[pointI];
+
+            while (((pt-start[pointI])&dirVec[pointI]) <= magSqrDirVec[pointI])
+            {
+                // See if any intersection between pt and end
+                pointIndexHit inter = findLine(pt, end[pointI]);
+
+                // Check for not hit or hit same face as before (can happen
+                // if vector along surface of face)
+                if
+                (
+                    !inter.hit()
+                 || (inter.index() == hits.last().index())
+                )
+                {
+                    break;
+                }
+                hits.append(inter);
+
+                pt = inter.hitPoint() + smallVec[pointI];
+            }
+
+            info[pointI].transfer(hits);
+        }
+        else
+        {
+            info[pointI].clear();
+        }
+    }
+}
+
+
+void Foam::searchableRotatedBox::getRegion
+(
+    const List<pointIndexHit>& info,
+    labelList& region
+) const
+{
+    region.setSize(info.size());
+    region = 0;
+}
+
+
+void Foam::searchableRotatedBox::getNormal
+(
+    const List<pointIndexHit>& info,
+    vectorField& normal
+) const
+{
+    // searchableBox does not use hitPoints so no need to transform
+    box_.getNormal(info, normal);
+
+    normal = transform_.globalVector(normal);
+}
+
+
+void Foam::searchableRotatedBox::getVolumeType
+(
+    const pointField& points,
+    List<volumeType>& volType
+) const
+{
+    box_.getVolumeType(transform_.localPosition(points), volType);
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/searchableRotatedBox.H b/src/meshTools/searchableSurface/searchableRotatedBox.H
new file mode 100644
index 0000000000..0b7f206e65
--- /dev/null
+++ b/src/meshTools/searchableSurface/searchableRotatedBox.H
@@ -0,0 +1,262 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::searchableRotatedBox
+
+Description
+    Searching on a rotated box
+
+    Box defined as min and max coordinate. Rotation by coordinate system
+    at box middle.
+
+    E.g. box with sides 1 1 1 rotated 45 degrees around z-axis at
+         origin (0.5 0.5 0.5)
+    \verbatim
+        span     (1 1 1);
+        origin  (0.5 0.5 0.5);
+        e1      (1 1 0);
+        e3      (0 0 1);
+    \endverbatim
+
+SourceFiles
+    searchableRotatedBox.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef searchableRotatedBox_H
+#define searchableRotatedBox_H
+
+#include "searchableSurface.H"
+#include "coordinateSystem.H"
+#include "searchableBox.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class searchableRotatedBox Declaration
+\*---------------------------------------------------------------------------*/
+
+class searchableRotatedBox
+:
+    public searchableSurface
+{
+private:
+
+    // Private Member Data
+
+        //- box in local coordinate system
+        searchableBox box_;
+
+        //- transformation from local to global coordinates
+        coordinateSystem transform_;
+
+        //- (global) corner points (in treeBoundBox order)
+        pointField points_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        searchableRotatedBox(const searchableRotatedBox&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const searchableRotatedBox&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("searchableRotatedBox");
+
+
+    // Constructors
+
+        //- Construct from dictionary (used by searchableSurface)
+        searchableRotatedBox
+        (
+            const IOobject& io,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~searchableRotatedBox();
+
+
+    // Member Functions
+
+        virtual const wordList& regions() const;
+
+        //- Whether supports volume type below
+        virtual bool hasVolumeType() const
+        {
+            return true;
+        }
+
+        //- Range of local indices that can be returned.
+        virtual label size() const
+        {
+            return 6;
+        }
+
+        //- Get representative set of element coordinates
+        //  Usually the element centres (should be of length size()).
+        virtual tmp<pointField> coordinates() const;
+
+        //- Get bounding spheres (centre and radius squared), one per element.
+        //  Any point on element is guaranteed to be inside.
+        virtual void boundingSpheres
+        (
+            pointField& centres,
+            scalarField& radiusSqr
+        ) const;
+
+        //- Get the points that define the surface.
+        virtual tmp<pointField> points() const;
+
+        // Does any part of the surface overlap the supplied bound box?
+        virtual bool overlaps(const boundBox& bb) const;
+
+        // Single point queries.
+
+            //- Inherit findNearest from searchableSurface
+            using searchableSurface::findNearest;
+
+            //- Calculate nearest point on surface.
+            //  Returns
+            //  - bool : any point found nearer than nearestDistSqr
+            //  - label: relevant index in surface (=face 0..5)
+            //  - point: actual nearest point found
+            pointIndexHit findNearest
+            (
+                const point& sample,
+                const scalar nearestDistSqr
+            ) const;
+
+            //- Find nearest to segment.
+            //  Returns
+            //  - bool : any point found?
+            //  - label: relevant index in shapes (=face 0..5)
+            //  - point: actual nearest point found
+            //  sets:
+            //  - tightest  : bounding box
+            //  - linePoint : corresponding nearest point on line
+            pointIndexHit findNearest
+            (
+                const linePointRef& ln,
+                treeBoundBox& tightest,
+                point& linePoint
+            ) const;
+
+            //- Find nearest intersection of line between start and end.
+            pointIndexHit findLine
+            (
+                const point& start,
+                const point& end
+            ) const;
+
+            //- Find any intersection of line between start and end.
+            pointIndexHit findLineAny
+            (
+                const point& start,
+                const point& end
+            ) const;
+
+
+        // Multiple point queries.
+
+            virtual void findNearest
+            (
+                const pointField& sample,
+                const scalarField& nearestDistSqr,
+                List<pointIndexHit>&
+            ) const;
+
+            virtual void findLine
+            (
+                const pointField& start,
+                const pointField& end,
+                List<pointIndexHit>&
+            ) const;
+
+            virtual void findLineAny
+            (
+                const pointField& start,
+                const pointField& end,
+                List<pointIndexHit>&
+            ) const;
+
+            //- Get all intersections in order from start to end.
+            virtual void findLineAll
+            (
+                const pointField& start,
+                const pointField& end,
+                List<List<pointIndexHit> >&
+            ) const;
+
+            //- From a set of points and indices get the region
+            virtual void getRegion
+            (
+                const List<pointIndexHit>&,
+                labelList& region
+            ) const;
+
+            //- From a set of points and indices get the normal
+            virtual void getNormal
+            (
+                const List<pointIndexHit>&,
+                vectorField& normal
+            ) const;
+
+            //- Determine type (inside/outside/mixed) for point. unknown if
+            //  cannot be determined (e.g. non-manifold surface)
+            virtual void getVolumeType
+            (
+                const pointField&,
+                List<volumeType>&
+            ) const;
+
+
+        // regIOobject implementation
+
+            bool writeData(Ostream&) const
+            {
+                NotImplemented;
+                return false;
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/searchableSphere.H b/src/meshTools/searchableSurface/searchableSphere.H
index d30b83e8da..992c28d1a3 100644
--- a/src/meshTools/searchableSurface/searchableSphere.H
+++ b/src/meshTools/searchableSurface/searchableSphere.H
@@ -218,7 +218,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("searchableSphere::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C
index 5915195384..0f5fe77dec 100644
--- a/src/meshTools/searchableSurface/searchableSurface.C
+++ b/src/meshTools/searchableSurface/searchableSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,11 +48,8 @@ Foam::autoPtr<Foam::searchableSurface> Foam::searchableSurface::New
 
     if (cstrIter == dictConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "searchableSurface::New(const word&,"
-            " const IOobject&, const dictionary&)"
-        )   << "Unknown searchableSurface type " << searchableSurfaceType
+        FatalErrorInFunction
+            << "Unknown searchableSurface type " << searchableSurfaceType
             << endl << endl
             << "Valid searchableSurface types : " << endl
             << dictConstructorTablePtr_->sortedToc()
diff --git a/src/meshTools/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurface/searchableSurface.H
index 6a2adcc946..32fad48b09 100644
--- a/src/meshTools/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurface/searchableSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ public:
         //- Clone
         virtual autoPtr<searchableSurface> clone() const
         {
-            notImplemented("autoPtr<searchableSurface> clone() const");
+            NotImplemented;
             return autoPtr<searchableSurface>(NULL);
         }
 
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.C b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
index e43d831980..98ae2a26e0 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -218,11 +218,8 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
             // if all indices offset by globalSize() of the local region...
             if (s.size() != s.globalSize())
             {
-                FatalErrorIn
-                (
-                    "searchableSurfaceCollection::searchableSurfaceCollection"
-                    "(const IOobject&, const dictionary&)"
-                )   << "Cannot use a distributed surface in a collection."
+                FatalErrorInFunction
+                    << "Cannot use a distributed surface in a collection."
                     << exit(FatalError);
             }
 
@@ -532,10 +529,8 @@ void Foam::searchableSurfaceCollection::findLine
 
                     if (s < 0 || s > 1)
                     {
-                        FatalErrorIn
-                        (
-                            "searchableSurfaceCollection::findLine(..)"
-                        )   << "point:" << info[pointI]
+                        FatalErrorInFunction
+                            << "point:" << info[pointI]
                             << " s:" << s
                             << " outside vector "
                             << " start:" << start[pointI]
@@ -702,11 +697,8 @@ void Foam::searchableSurfaceCollection::getVolumeType
     List<volumeType>& volType
 ) const
 {
-    FatalErrorIn
-    (
-        "searchableSurfaceCollection::getVolumeType(const pointField&"
-        ", List<volumeType>&) const"
-    )   << "Volume type not supported for collection."
+    FatalErrorInFunction
+        << "Volume type not supported for collection."
         << exit(FatalError);
 }
 
@@ -721,7 +713,7 @@ void Foam::searchableSurfaceCollection::distribute
 {
     forAll(subGeom_, surfI)
     {
-        // Note:Tranform the bounding boxes? Something like
+        // Note:Transform the bounding boxes? Something like
         // pointField bbPoints =
         // cmptDivide
         // (
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.H b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
index b3153b6576..2b15158324 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,8 +25,8 @@ Class
     Foam::searchableSurfaceCollection
 
 Description
-    Set of transformed searchableSurfaces. Does not do boolean operations.
-    So when meshing might find parts 'inside'.
+    Set of transformed searchableSurfaces. Does not do boolean operations
+    so when meshing might find parts 'inside'.
 
 SourceFiles
     searchableSurfaceCollection.C
@@ -47,8 +47,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-
 /*---------------------------------------------------------------------------*\
                  Class searchableSurfaceCollection Declaration
 \*---------------------------------------------------------------------------*/
@@ -193,10 +191,7 @@ public:
         //- Does any part of the surface overlap the supplied bound box?
         virtual bool overlaps(const boundBox& bb) const
         {
-            notImplemented
-            (
-                "searchableSurfaceCollection::overlaps(const boundBox&) const"
-            );
+            NotImplemented;
 
             return false;
         }
@@ -281,10 +276,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented
-                (
-                    "searchableSurfaceCollection::writeData(Ostream&) const"
-                );
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
index 0cd23e807a..de668c28fe 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,22 @@ Description
     - extend the test vector slightly (with SMALL) to account for numerical
       inaccuracies.
 
+    \verbatim
+    sphere.stl
+    {
+        type triSurfaceMesh;
+    }
+
+    sphere
+    {
+        type searchableSurfaceWithGaps;
+        // Underlying surface
+        surface sphere.stl;
+        // Perturb distance
+        gap 1e-3;
+    }
+    \endverbatim
+
 SourceFiles
     searchableSurfaceWithGaps.C
 
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.C b/src/meshTools/searchableSurface/searchableSurfaces.C
index 49cbaf8ab0..3767daf4c0 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.C
+++ b/src/meshTools/searchableSurface/searchableSurfaces.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,9 +27,7 @@ License
 #include "searchableSurfacesQueries.H"
 #include "ListOps.H"
 #include "Time.H"
-//#include "vtkSetWriter.H"
 #include "DynamicField.H"
-//#include "OBJstream.H"
 #include "PatchTools.H"
 #include "triSurfaceMesh.H"
 
@@ -136,11 +134,8 @@ Foam::searchableSurfaces::searchableSurfaces(const label size)
 //
 //                    if (index == -1)
 //                    {
-//                        FatalErrorIn
-//                        (
-//                            "searchableSurfaces::searchableSurfaces"
-//                            "( const IOobject&, const dictionary&)"
-//                        )   << "Unknown region name " << key
+//                        FatalErrorInFunction
+//                            << "Unknown region name " << key
 //                            << " for surface " << s.name() << endl
 //                            << "Valid region names are " << localNames
 //                            << exit(FatalError);
@@ -191,11 +186,8 @@ Foam::searchableSurfaces::searchableSurfaces
 
         if (!topDict.isDict(key))
         {
-            FatalErrorIn
-            (
-                "searchableSurfaces::searchableSurfaces"
-                "( const IOobject&, const dictionary&)"
-            )   << "Found non-dictionary entry " << iter()
+            FatalErrorInFunction
+                << "Found non-dictionary entry " << iter()
                 << " in top-level dictionary " << topDict
                 << exit(FatalError);
         }
@@ -264,11 +256,8 @@ Foam::searchableSurfaces::searchableSurfaces
 
                     if (index == -1)
                     {
-                        FatalErrorIn
-                        (
-                            "searchableSurfaces::searchableSurfaces"
-                            "( const IOobject&, const dictionary&)"
-                        )   << "Unknown region name " << key
+                        FatalErrorInFunction
+                            << "Unknown region name " << key
                             << " for surface " << s.name() << endl
                             << "Valid region names are " << localNames
                             << exit(FatalError);
@@ -405,9 +394,9 @@ void Foam::searchableSurfaces::findNearest
 // Find nearest. Return -1 or nearest point
 void Foam::searchableSurfaces::findNearest
 (
+    const labelListList& regionIndices,
     const pointField& samples,
     const scalarField& nearestDistSqr,
-    const labelList& regionIndices,
     labelList& nearestSurfaces,
     List<pointIndexHit>& nearestInfo
 ) const
@@ -416,9 +405,11 @@ void Foam::searchableSurfaces::findNearest
     (
         *this,
         allSurfaces_,
+        regionIndices,
+
         samples,
         nearestDistSqr,
-        regionIndices,
+
         nearestSurfaces,
         nearestInfo
     );
@@ -926,10 +917,8 @@ const Foam::searchableSurface& Foam::searchableSurfaces::operator[]
 
     if (surfI < 0)
     {
-        FatalErrorIn
-        (
-            "searchableSurfaces::operator[](const word&) const"
-        )   << "Surface named " << surfName << " not found." << nl
+        FatalErrorInFunction
+            << "Surface named " << surfName << " not found." << nl
             << "Available surface names: " << names_ << endl
             << abort(FatalError);
     }
@@ -947,10 +936,8 @@ Foam::searchableSurface& Foam::searchableSurfaces::operator[]
 
     if (surfI < 0)
     {
-        FatalErrorIn
-        (
-            "searchableSurfaces::operator[](const word&)"
-        )   << "Surface named " << surfName << " not found." << nl
+        FatalErrorInFunction
+            << "Surface named " << surfName << " not found." << nl
             << "Available surface names: " << names_ << endl
             << abort(FatalError);
     }
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.H b/src/meshTools/searchableSurface/searchableSurfaces.H
index 1931c8d5b7..53b39e9bf1 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.H
+++ b/src/meshTools/searchableSurface/searchableSurfaces.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -200,9 +200,9 @@ public:
 
             void findNearest
             (
+                const labelListList& regionIndices,
                 const pointField& samples,
                 const scalarField& nearestDistSqr,
-                const labelList& regionIndices,
                 labelList& nearestSurfaces,
                 List<pointIndexHit>& nearestInfo
             ) const;
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 2073de3d76..61dc9694fb 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -672,9 +672,11 @@ void Foam::searchableSurfacesQueries::findNearest
 (
     const PtrList<searchableSurface>& allSurfaces,
     const labelList& surfacesToTest,
+    const labelListList& regionIndices,
+
     const pointField& samples,
     const scalarField& nearestDistSqr,
-    const labelList& regionIndices,
+
     labelList& nearestSurfaces,
     List<pointIndexHit>& nearestInfo
 )
@@ -707,7 +709,7 @@ void Foam::searchableSurfacesQueries::findNearest
         (
             samples,
             minDistSqr,
-            regionIndices,
+            regionIndices[testI],
             hitInfo
         );
 
@@ -810,7 +812,7 @@ void Foam::searchableSurfacesQueries::signedDistance
                     }
                     default:
                     {
-                        FatalErrorIn("signedDistance()")
+                        FatalErrorInFunction
                             << "getVolumeType failure,"
                             << " neither INSIDE or OUTSIDE."
                             << " point:" << surfPoints[i]
@@ -879,11 +881,8 @@ Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
         }
         else
         {
-            FatalErrorIn
-            (
-                "searchableSurfacesQueries::facesIntersection"
-                "(const labelList&, const scalar, const scalar, const point&)"
-            )   << "Did not find point within distance "
+            FatalErrorInFunction
+                << "Did not find point within distance "
                 << initDistSqr << " of starting point " << start
                 << " on surface "
                 << allSurfaces[surfacesToTest[i]].IOobject::name()
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.H b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
index 529d4b94fa..8cf80f4aa5 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.H
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -183,14 +183,14 @@ public:
                 List<pointIndexHit>&
             );
 
-            //- Find nearest points to a specific region of the surface
+            //- Find nearest points to a specific regions of the surface
             static void findNearest
             (
                 const PtrList<searchableSurface>& allSurfaces,
                 const labelList& surfacesToTest,
+                const labelListList& regionIndices,
                 const pointField& samples,
                 const scalarField& nearestDistSqr,
-                const labelList& regionIndices,
                 labelList& nearestSurfaces,
                 List<pointIndexHit>& nearestInfo
             );
diff --git a/src/meshTools/searchableSurface/subTriSurfaceMesh.C b/src/meshTools/searchableSurface/subTriSurfaceMesh.C
new file mode 100644
index 0000000000..2f5c142bfd
--- /dev/null
+++ b/src/meshTools/searchableSurface/subTriSurfaceMesh.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "subTriSurfaceMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(subTriSurfaceMesh, 0);
+addToRunTimeSelectionTable(searchableSurface, subTriSurfaceMesh, dict);
+
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::wordList Foam::subTriSurfaceMesh::patchNames(const triSurface& s)
+{
+    const geometricSurfacePatchList& patches = s.patches();
+
+    wordList names(patches.size());
+    forAll(patches, patchI)
+    {
+        names[patchI] = patches[patchI].name();
+    }
+    return names;
+}
+
+
+Foam::labelList Foam::subTriSurfaceMesh::selectedRegions
+(
+    const triSurface& s,
+    const wordReList& regionNames
+)
+{
+    const wordList names(patchNames(s));
+
+    labelList regions(names.size());
+
+    label compactI = 0;
+
+    forAll(names, regionI)
+    {
+        const word& name = names[regionI];
+
+        forAll(regionNames, i)
+        {
+            if (regionNames[i].match(name))
+            {
+                regions[compactI++] = regionI;
+            }
+        }
+    }
+    regions.setSize(compactI);
+
+    return regions;
+}
+
+
+Foam::triSurface Foam::subTriSurfaceMesh::subset
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+{
+    const word subGeomName(dict.lookup("surface"));
+
+    const triSurfaceMesh& s =
+        io.db().lookupObject<triSurfaceMesh>(subGeomName);
+
+    const wordReList regionNames(dict.lookup("patches"));
+
+    labelList regionMap(selectedRegions(s, regionNames));
+
+    if (regionMap.size() == 0)
+    {
+        FatalIOErrorInFunction(dict)
+            << "Found no regions in triSurface matching " << regionNames
+            << ". Valid regions are " << patchNames(s)
+            << exit(FatalIOError);
+    }
+
+    labelList reverseRegionMap(s.patches().size(), -1);
+    forAll(regionMap, i)
+    {
+        reverseRegionMap[regionMap[i]] = i;
+    }
+
+    boolList isSelected(s.size(), false);
+    forAll(s, triI)
+    {
+        if (reverseRegionMap[s.triSurface::operator[](triI).region()] != -1)
+        {
+            isSelected[triI] = true;
+        }
+    }
+
+    labelList pointMap;
+    labelList faceMap;
+    return s.subsetMesh(isSelected, pointMap, faceMap);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::subTriSurfaceMesh::subTriSurfaceMesh
+(
+    const IOobject& io,
+    const dictionary& dict
+)
+:
+    triSurfaceMesh(io, subset(io, dict))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::subTriSurfaceMesh::~subTriSurfaceMesh()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/subTriSurfaceMesh.H b/src/meshTools/searchableSurface/subTriSurfaceMesh.H
new file mode 100644
index 0000000000..9d0f508e14
--- /dev/null
+++ b/src/meshTools/searchableSurface/subTriSurfaceMesh.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::subTriSurfaceMesh
+
+Description
+    On-the-fly subset of triSurfaceMesh (based on selected patches)
+
+Note
+
+    Example usage:
+    \verbatim
+    spheres.stl
+    {
+        type subTriSurfaceMesh;
+
+        // Surface to operate on. Avoid duplicate loading
+        surface spheres.stl;
+
+        // Regions to operate on (regular expressions allowed)
+        patches (solid1);
+    }
+    \endverbatim
+
+
+SourceFiles
+    subTriSurfaceMesh.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef subTriSurfaceMesh_H
+#define subTriSurfaceMesh_H
+
+#include "triSurfaceMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class subTriSurfaceMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class subTriSurfaceMesh
+:
+    public triSurfaceMesh
+{
+    // Private member functions
+
+        //- Extract patch names of triSurface
+        static wordList patchNames(const triSurface& s);
+
+        //- Select regions by name
+        static labelList selectedRegions
+        (
+            const triSurface& s,
+            const wordReList& regionNames
+        );
+
+        //- Subset triSurface based on regions
+        static triSurface subset(const IOobject&, const dictionary&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("subTriSurfaceMesh");
+
+
+    // Constructors
+
+        //- Construct from IO and dictionary.
+        subTriSurfaceMesh
+        (
+            const IOobject& io,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~subTriSurfaceMesh();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 7b6b8ad6ad..02718f34af 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,8 @@ namespace Foam
 defineTypeNameAndDebug(triSurfaceMesh, 0);
 addToRunTimeSelectionTable(searchableSurface, triSurfaceMesh, dict);
 
+word triSurfaceMesh::meshSubDir = "triSurface";
+
 }
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -89,11 +91,8 @@ addToRunTimeSelectionTable(searchableSurface, triSurfaceMesh, dict);
 //        return runTime.constant();
 //    }
 //
-//    FatalErrorIn
-//    (
-//        "searchableSurfaces::findRawInstance"
-//        "(const Time&, const fileName&, const word&)"
-//    )   << "Cannot find file \"" << name << "\" in directory "
+//    FatalErrorInFunction
+//        << "Cannot find file \"" << name << "\" in directory "
 //        << runTime.constant()/dir
 //        << exit(FatalError);
 //
@@ -110,10 +109,8 @@ const Foam::fileName& Foam::triSurfaceMesh::checkFile
 {
     if (fName.empty())
     {
-        FatalErrorIn
-        (
-            "triSurfaceMesh::checkFile(const fileName&, const fileName&)"
-        )   << "Cannot find triSurfaceMesh starting from "
+        FatalErrorInFunction
+            << "Cannot find triSurfaceMesh starting from "
             << objectName << exit(FatalError);
     }
     return fName;
@@ -231,7 +228,7 @@ Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io, const triSurface& s)
         (
             io.name(),
             io.instance(),
-            io.local(),
+            io.local(),  //"triSurfaceFields",
             io.db(),
             io.readOpt(),
             io.writeOpt(),
@@ -239,9 +236,10 @@ Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io, const triSurface& s)
         )
     ),
     triSurface(s),
-    triSurfaceRegionSearch(s),
+    triSurfaceRegionSearch(static_cast<const triSurface&>(*this)),
     minQuality_(-1),
-    surfaceClosed_(-1)
+    surfaceClosed_(-1),
+    outsideVolType_(volumeType::UNKNOWN)
 {
     const pointField& pts = triSurface::points();
 
@@ -272,7 +270,7 @@ Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io)
         (
             io.name(),
             static_cast<const searchableSurface&>(*this).instance(),
-            io.local(),
+            io.local(), //"triSurfaceFields",
             io.db(),
             io.readOpt(),
             io.writeOpt(),
@@ -289,7 +287,8 @@ Foam::triSurfaceMesh::triSurfaceMesh(const IOobject& io)
     ),
     triSurfaceRegionSearch(static_cast<const triSurface&>(*this)),
     minQuality_(-1),
-    surfaceClosed_(-1)
+    surfaceClosed_(-1),
+    outsideVolType_(volumeType::UNKNOWN)
 {
     const pointField& pts = triSurface::points();
 
@@ -323,7 +322,7 @@ Foam::triSurfaceMesh::triSurfaceMesh
         (
             io.name(),
             static_cast<const searchableSurface&>(*this).instance(),
-            io.local(),
+            io.local(), //"triSurfaceFields",
             io.db(),
             io.readOpt(),
             io.writeOpt(),
@@ -340,7 +339,8 @@ Foam::triSurfaceMesh::triSurfaceMesh
     ),
     triSurfaceRegionSearch(static_cast<const triSurface&>(*this), dict),
     minQuality_(-1),
-    surfaceClosed_(-1)
+    surfaceClosed_(-1),
+    outsideVolType_(volumeType::UNKNOWN)
 {
     scalar scaleFactor = 0;
 
@@ -377,6 +377,7 @@ Foam::triSurfaceMesh::~triSurfaceMesh()
 
 void Foam::triSurfaceMesh::clearOut()
 {
+    outsideVolType_ = volumeType::UNKNOWN;
     triSurfaceRegionSearch::clearOut();
     edgeTree_.clear();
     triSurface::clearOut();
@@ -447,9 +448,22 @@ bool Foam::triSurfaceMesh::overlaps(const boundBox& bb) const
 
 void Foam::triSurfaceMesh::movePoints(const pointField& newPoints)
 {
+    outsideVolType_ = volumeType::UNKNOWN;
+
+    // Update local information (instance, event number)
+    searchableSurface::instance() = objectRegistry::time().timeName();
+    objectRegistry::instance() = searchableSurface::instance();
+
+    label event = getEvent();
+    searchableSurface::eventNo() = event;
+    objectRegistry::eventNo() = searchableSurface::eventNo();
+
+    // Clear additional addressing
     triSurfaceRegionSearch::clearOut();
     edgeTree_.clear();
     triSurface::movePoints(newPoints);
+
+    bounds() = boundBox(triSurface::points());
 }
 
 
@@ -714,27 +728,41 @@ void Foam::triSurfaceMesh::getNormal
 
 void Foam::triSurfaceMesh::setField(const labelList& values)
 {
-    autoPtr<triSurfaceLabelField> fldPtr
-    (
-        new triSurfaceLabelField
+    if (foundObject<triSurfaceLabelField>("values"))
+    {
+        triSurfaceLabelField& fld = const_cast<triSurfaceLabelField&>
         (
-            IOobject
+            lookupObject<triSurfaceLabelField>
             (
-                "values",
-                objectRegistry::time().timeName(),  // instance
-                "triSurface",                       // local
+                "values"
+            )
+        );
+        fld.field() = values;
+    }
+    else
+    {
+        autoPtr<triSurfaceLabelField> fldPtr
+        (
+            new triSurfaceLabelField
+            (
+                IOobject
+                (
+                    "values",
+                    objectRegistry::time().timeName(),  // instance
+                    meshSubDir,                         // local
+                    *this,
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE
+                ),
                 *this,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            *this,
-            dimless,
-            labelField(values)
-        )
-    );
+                dimless,
+                labelField(values)
+            )
+        );
 
-    // Store field on triMesh
-    fldPtr.ptr()->store();
+        // Store field on triMesh
+        fldPtr.ptr()->store();
+    }
 }
 
 
@@ -781,17 +809,26 @@ void Foam::triSurfaceMesh::getVolumeType
 
         if (!tree().bb().contains(pt))
         {
-            // Have to calculate directly as outside the octree
-            volType[pointI] = tree().shapes().getVolumeType(tree(), pt);
+            if (hasVolumeType())
+            {
+                // Precalculate and cache value for this outside point
+                if (outsideVolType_ == volumeType::UNKNOWN)
+                {
+                    outsideVolType_ = tree().shapes().getVolumeType(tree(), pt);
+                }
+                volType[pointI] = outsideVolType_;
+            }
+            else
+            {
+                // Have to calculate directly as outside the octree
+                volType[pointI] = tree().shapes().getVolumeType(tree(), pt);
+            }
         }
         else
         {
             // - use cached volume type per each tree node
             volType[pointI] = tree().getVolumeType(pt);
         }
-
-//        Info<< "octree : " << pt << " = "
-//            << volumeType::names[volType[pointI]] << endl;
     }
 
     indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
@@ -806,6 +843,24 @@ bool Foam::triSurfaceMesh::writeObject
     IOstream::compressionType cmp
 ) const
 {
+    const Time& runTime = searchableSurface::time();
+    const fileName& instance = searchableSurface::instance();
+
+    if
+    (
+        instance != runTime.timeName()
+     && instance != runTime.system()
+     && instance != runTime.caseSystem()
+     && instance != runTime.constant()
+     && instance != runTime.caseConstant()
+    )
+    {
+        const_cast<triSurfaceMesh&>(*this).searchableSurface::instance() =
+            runTime.timeName();
+        const_cast<triSurfaceMesh&>(*this).objectRegistry::instance() =
+            runTime.timeName();
+    }
+
     fileName fullPath(searchableSurface::objectPath());
 
     if (!mkDir(fullPath.path()))
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.H b/src/meshTools/searchableSurface/triSurfaceMesh.H
index 5751ead958..38bd11d1c1 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,6 +85,9 @@ private:
         //- Is surface closed
         mutable label surfaceClosed_;
 
+        //- If surface is closed, what is type of outside points
+        mutable volumeType outsideVolType_;
+
 
     // Private Member Functions
 
@@ -137,6 +140,9 @@ public:
     //- Runtime type information
     TypeName("triSurfaceMesh");
 
+    //- Return the mesh sub-directory name (usually "triSurface")
+    static word meshSubDir;
+
 
     // Constructors
 
@@ -276,7 +282,7 @@ public:
 
             bool writeData(Ostream&) const
             {
-                notImplemented("triSurfaceMesh::writeData(Ostream&) const");
+                NotImplemented;
                 return false;
             }
 
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
index cf0bf76e16..9157348433 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ void Foam::faceZoneToCell::combine(topoSet& set, const bool add) const
 
     if (!hasMatched)
     {
-        WarningIn("faceZoneToCell::combine(topoSet&, const bool)")
+        WarningInFunction
             << "Cannot find any faceZone named " << zoneName_ << endl
             << "Valid names are " << mesh_.faceZones().names() << endl;
     }
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
index a8d22a6ff8..475ba3c313 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -196,11 +196,8 @@ void Foam::fieldToCell::applyToSet
 
     if (!fieldObject.headerOk())
     {
-        WarningIn
-        (
-            "fieldToCell::applyToSet(const topoSetSource::setAction"
-            ", topoSet& set)"
-        )   << "Cannot read field " << fieldName_
+        WarningInFunction
+            << "Cannot read field " << fieldName_
             << " from time " << mesh().time().timeName() << endl;
     }
     else if (fieldObject.headerClassName() == "volScalarField")
@@ -227,11 +224,8 @@ void Foam::fieldToCell::applyToSet
     }
     else
     {
-        WarningIn
-        (
-            "fieldToCell::applyToSet(const topoSetSource::setAction"
-            ", topoSet& set)"
-        )   << "Cannot handle fields of type " << fieldObject.headerClassName()
+        WarningInFunction
+            << "Cannot handle fields of type " << fieldObject.headerClassName()
             << endl;
     }
 }
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
index 96c3077cde..2d2c7831ca 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ addToRunTimeSelectionTable(topoSetSource, regionToCell, istream);
 Foam::topoSetSource::addToUsageTable Foam::regionToCell::usage_
 (
     regionToCell::typeName,
-    "\n    Usage: regionToCell subCellSet (pt0 .. ptn)\n\n"
+    "\n    Usage: regionToCell subCellSet (pt0 .. ptn) nErode\n\n"
     "    Select all cells in the connected region containing"
     " points (pt0..ptn).\n"
 );
@@ -131,11 +131,8 @@ Foam::boolList Foam::regionToCell::findRegions
 
         if (keepProcI == -1)
         {
-            FatalErrorIn
-            (
-                "outsideCellSelection::findRegions"
-                "(const bool, const regionSplit&)"
-            )   << "Did not find " << insidePoints_[i]
+            FatalErrorInFunction
+                << "Did not find " << insidePoints_[i]
                 << " in mesh." << " Mesh bounds are " << mesh_.bounds()
                 << exit(FatalError);
         }
@@ -433,7 +430,7 @@ Foam::regionToCell::regionToCell
     topoSetSource(mesh),
     setName_(checkIs(is)),
     insidePoints_(checkIs(is)),
-    nErode_(0)
+    nErode_(readLabel(checkIs(is)))
 {}
 
 
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index 32662fb97f..1fcc249522 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,10 +105,8 @@ Foam::shapeToCell::shapeToCell
 {
     if (!cellModeller::lookup(type_) && (type_ != "splitHex"))
     {
-        FatalErrorIn
-        (
-            "shapeToCell::shapeToCell(const polyMesh&, const word&)"
-        )   << "Illegal cell type " << type_ << exit(FatalError);
+        FatalErrorInFunction
+            << "Illegal cell type " << type_ << exit(FatalError);
     }
 }
 
@@ -125,10 +123,8 @@ Foam::shapeToCell::shapeToCell
 {
     if (!cellModeller::lookup(type_) && (type_ != "splitHex"))
     {
-        FatalErrorIn
-        (
-            "shapeToCell::shapeToCell(const polyMesh&, const dictionary&)"
-        )   << "Illegal cell type " << type_ << exit(FatalError);
+        FatalErrorInFunction
+            << "Illegal cell type " << type_ << exit(FatalError);
     }
 }
 
@@ -145,10 +141,8 @@ Foam::shapeToCell::shapeToCell
 {
     if (!cellModeller::lookup(type_) && (type_ != "splitHex"))
     {
-        FatalErrorIn
-        (
-            "shapeToCell::shapeToCell(const polyMesh&, Istream&)"
-        )   << "Illegal cell type " << type_ << exit(FatalError);
+        FatalErrorInFunction
+            << "Illegal cell type " << type_ << exit(FatalError);
     }
 }
 
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
index 1b9e7e7643..b08d4b4c8a 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
@@ -194,7 +194,7 @@ void Foam::surfaceToCell::combine(topoSet& set, const bool add) const
             label cellI = queryMesh.findCell(outsidePoint, -1, false);
             if (returnReduce(cellI, maxOp<label>()) == -1)
             {
-                FatalErrorIn("surfaceToCell::combine(topoSet&, const bool)")
+                FatalErrorInFunction
                     << "outsidePoint " << outsidePoint
                     << " is not inside any cell"
                     << exit(FatalError);
@@ -332,10 +332,8 @@ void Foam::surfaceToCell::checkSettings() const
         )
     )
     {
-        FatalErrorIn
-        (
-            "surfaceToCell:checkSettings()"
-        )   << "Illegal include cell specification."
+        FatalErrorInFunction
+            << "Illegal include cell specification."
             << " Result would be either all or no cells." << endl
             << "Please set one of includeCut, includeInside, includeOutside"
             << " to true, set nearDistance to a value > 0"
@@ -345,10 +343,8 @@ void Foam::surfaceToCell::checkSettings() const
 
     if (useSurfaceOrientation_ && includeCut_)
     {
-        FatalErrorIn
-        (
-            "surfaceToCell:checkSettings()"
-        )   << "Illegal include cell specification."
+        FatalErrorInFunction
+            << "Illegal include cell specification."
             << " You cannot specify both 'useSurfaceOrientation'"
             << " and 'includeCut'"
             << " since 'includeCut' specifies a topological split"
diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
index 2f29a30216..10d5463839 100644
--- a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
+++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
         // Check that maxPoint indeed selects all cells
         if (maxCells != nTotCells)
         {
-            WarningIn("targetVolumeToCell::combine(topoSet&, const bool) const")
+            WarningInFunction
                 << "Plane " << plane(points[maxPointI], n_)
                 << " selects " << maxCells
                 << " cells instead of all " << nTotCells
@@ -241,7 +241,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
         }
         else
         {
-            WarningIn("targetVolumeToCell::combine(topoSet&, const bool) const")
+            WarningInFunction
                 << "Did not converge onto plane. " << nl
                 << "high plane:"
                 << plane(high*n_, n_)
diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C
index 291fb6bdb2..56ed36a172 100644
--- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C
+++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::zoneToCell::combine(topoSet& set, const bool add) const
 
     if (!hasMatched)
     {
-        WarningIn("zoneToCell::combine(topoSet&, const bool)")
+        WarningInFunction
             << "Cannot find any cellZone named " << zoneName_ << endl
             << "Valid names are " << mesh_.cellZones().names() << endl;
     }
diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C
index f0c0e646ed..7fc2aa1a3c 100644
--- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C
+++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,11 +105,8 @@ void Foam::setToCellZone::applyToSet
 {
     if (!isA<cellZoneSet>(set))
     {
-        WarningIn
-        (
-            "setToCellZone::applyToSet(const topoSetSource::setAction"
-            ", topoSet"
-        )   << "Operation only allowed on a cellZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a cellZoneSet." << endl;
     }
     else
     {
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index 4d40c128db..eb18912086 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,11 +62,8 @@ void Foam::normalToFace::setNormal()
 
     if (tol_ < -1 || tol_ > 1)
     {
-        FatalErrorIn
-        (
-            "normalToFace::normalToFace(const polyMesh&, const vector&"
-            ", const scalar)"
-        )   << "tolerance not within range -1..1 : " << tol_
+        FatalErrorInFunction
+            << "tolerance not within range -1..1 : " << tol_
             << exit(FatalError);
     }
 }
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
index 4dec426303..e4c36cbc28 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::patchToFace::combine(topoSet& set, const bool add) const
 
     if (patchIDs.empty())
     {
-        WarningIn("patchToFace::combine(topoSet&, const bool)")
+        WarningInFunction
             << "Cannot find any patch named " << patchName_ << endl
             << "Valid names are " << mesh_.boundaryMesh().names() << endl;
     }
diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C
index 34704105fa..fa29739e75 100644
--- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C
+++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::zoneToFace::combine(topoSet& set, const bool add) const
 
     if (!hasMatched)
     {
-        WarningIn("zoneToFace::combine(topoSet&, const bool)")
+        WarningInFunction
             << "Cannot find any faceZone named " << zoneName_ << endl
             << "Valid names are " << mesh_.faceZones().names() << endl;
     }
diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
index dd0c9d425a..e3f36bb25c 100644
--- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,11 +105,8 @@ void Foam::faceZoneToFaceZone::applyToSet
 {
     if (!isA<faceZoneSet>(set))
     {
-        WarningIn
-        (
-            "faceZoneToFaceZone::applyToSet(const topoSetSource::setAction"
-            ", topoSet"
-        )   << "Operation only allowed on a faceZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a faceZoneSet." << endl;
     }
     else
     {
diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C
index c9ce92f25b..1015de9bd6 100644
--- a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,12 +101,8 @@ void Foam::searchableSurfaceToFaceZone::applyToSet
 {
     if (!isA<faceZoneSet>(set))
     {
-        WarningIn
-        (
-            "searchableSurfaceToFaceZone::applyToSet"
-            "(const topoSetSource::setAction"
-            ", topoSet"
-        )   << "Operation only allowed on a faceZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a faceZoneSet." << endl;
     }
     else
     {
diff --git a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
index e94a2bf6d0..2f1ed95d79 100644
--- a/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/setAndNormalToFaceZone/setAndNormalToFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,14 +106,8 @@ void Foam::setAndNormalToFaceZone::applyToSet
 {
     if (!isA<faceZoneSet>(set))
     {
-        WarningIn
-        (
-            "setAndNormalToFaceZone::applyToSet"
-            "("
-                "const topoSetSource::setAction, "
-                "topoSet&"
-            ")"
-        )   << "Operation only allowed on a faceZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a faceZoneSet." << endl;
     }
     else
     {
diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C
index add3a1dbae..fc32253f96 100644
--- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,11 +106,8 @@ void Foam::setToFaceZone::applyToSet
 {
     if (!isA<faceZoneSet>(set))
     {
-        WarningIn
-        (
-            "setToFaceZone::applyToSet(const topoSetSource::setAction"
-            ", topoSet"
-        )   << "Operation only allowed on a faceZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a faceZoneSet." << endl;
     }
     else
     {
diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
index d4699870a4..91bb90e39b 100644
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,11 +111,8 @@ void Foam::setsToFaceZone::applyToSet
 {
     if (!isA<faceZoneSet>(set))
     {
-        WarningIn
-        (
-            "setsToFaceZone::applyToSet(const topoSetSource::setAction"
-            ", topoSet"
-        )   << "Operation only allowed on a faceZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a faceZoneSet." << endl;
     }
     else
     {
@@ -160,11 +157,8 @@ void Foam::setsToFaceZone::applyToSet
                         }
                         else
                         {
-                            WarningIn
-                            (
-                                "setsToFaceZone::applyToSet"
-                                "(const topoSetSource::setAction, topoSet)"
-                            )   << "One of owner or neighbour of internal face "
+                            WarningInFunction
+                                << "One of owner or neighbour of internal face "
                                 << faceI << " should be in cellSet "
                                 << cSet.name()
                                 << " to be able to determine orientation."
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
index c7bd9743b2..7f0d0ed9f9 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
@@ -108,7 +108,7 @@ void Foam::surfaceToPoint::checkSettings() const
 {
     if (nearDist_ < 0 && !includeInside_ && !includeOutside_)
     {
-        FatalErrorIn("surfaceToPoint:checkSettings()")
+        FatalErrorInFunction
             << "Illegal point selection specification."
             << " Result would be either all or no points." << endl
             << "Please set one of includeInside or includeOutside"
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
index a64138b481..e0059f85dc 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,16 +65,16 @@ class surfaceToPoint
         static addToUsageTable usage_;
 
         //- Name of surface file
-        fileName surfName_;
+        const fileName surfName_;
 
         //- If > 0 : include points with distance to surface less than nearDist.
-        scalar nearDist_;
+        const scalar nearDist_;
 
         //- Include all points on opposite sign of normal on nearest surface.
-        bool includeInside_;
+        const bool includeInside_;
 
         //- Include all points on this sign of normal on nearest surface.
-        bool includeOutside_;
+        const bool includeOutside_;
 
 
     // Private Member Functions
diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C
index bce531f8e5..8e9f620973 100644
--- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C
+++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ void Foam::zoneToPoint::combine(topoSet& set, const bool add) const
 
     if (!hasMatched)
     {
-        WarningIn("zoneToPoint::combine(topoSet&, const bool)")
+        WarningInFunction
             << "Cannot find any pointZone named " << zoneName_ << endl
             << "Valid names are " << mesh_.pointZones().names() << endl;
     }
diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
index 27d5209c46..dd6316d01a 100644
--- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
+++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,11 +105,8 @@ void Foam::setToPointZone::applyToSet
 {
     if (!isA<pointZoneSet>(set))
     {
-        WarningIn
-        (
-            "setToPointZone::applyToSet(const topoSetSource::setAction"
-            ", topoSet"
-        )   << "Operation only allowed on a pointZoneSet." << endl;
+        WarningInFunction
+            << "Operation only allowed on a pointZoneSet." << endl;
     }
     else
     {
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index 809fbac46d..25fce98506 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,11 +82,8 @@ Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "topoSetSource::New(const word&, "
-            "const polyMesh&, const dictionary&)"
-        )   << "Unknown topoSetSource type " << topoSetSourceType
+        FatalErrorInFunction
+            << "Unknown topoSetSource type " << topoSetSourceType
             << endl << endl
             << "Valid topoSetSource types : " << endl
             << wordConstructorTablePtr_->sortedToc()
@@ -109,11 +106,8 @@ Foam::autoPtr<Foam::topoSetSource> Foam::topoSetSource::New
 
     if (cstrIter == istreamConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "topoSetSource::New(const word&, "
-            "const polyMesh&, Istream&)"
-        )   << "Unknown topoSetSource type " << topoSetSourceType
+        FatalErrorInFunction
+            << "Unknown topoSetSource type " << topoSetSourceType
             << endl << endl
             << "Valid topoSetSource types : " << endl
             << istreamConstructorTablePtr_->sortedToc()
@@ -132,7 +126,7 @@ Foam::Istream& Foam::topoSetSource::checkIs(Istream& is)
     }
     else
     {
-        FatalErrorIn("cellToFace::cellToFace") << "Istream not good"
+        FatalErrorInFunction
             << exit(FatalError);
 
         return is;
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index 22f48e30c1..0b83d2b34c 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -242,7 +242,7 @@ public:
         //- Clone
         autoPtr<topoSetSource> clone() const
         {
-            notImplemented("autoPtr<topoSetSource> clone() const");
+            NotImplemented;
             return autoPtr<topoSetSource>(NULL);
         }
 
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index ea1e32e6cf..08dd1360d7 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ void faceSet::sync(const polyMesh& mesh)
         }
         else if (found(faceI))
         {
-            FatalErrorIn("faceSet::sync(const polyMesh&)")
+            FatalErrorInFunction
                 << "Problem : syncing removed faces from set."
                 << abort(FatalError);
         }
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index 5b4849c1ef..0467956ef7 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ void faceZoneSet::subset(const topoSet& set)
 
     if (nConflict > 0)
     {
-        WarningIn(" faceZoneSet::subset(const topoSet&)")
+        WarningInFunction
             << "subset : there are " << nConflict
             << " faces with different orientation in faceZonesSets "
             << name() << " and " << set.name() << endl;
@@ -257,7 +257,7 @@ void faceZoneSet::addSet(const topoSet& set)
 
     if (nConflict > 0)
     {
-        WarningIn("faceZoneSet::addSet(const topoSet&)")
+        WarningInFunction
             << "addSet : there are " << nConflict
             << " faces with different orientation in faceZonesSets "
             << name() << " and " << set.name() << endl;
@@ -309,7 +309,7 @@ void faceZoneSet::deleteSet(const topoSet& set)
 
     if (nConflict > 0)
     {
-        WarningIn("faceZoneSet::deleteSet(const topoSet&)")
+        WarningInFunction
             << "deleteSet : there are " << nConflict
             << " faces with different orientation in faceZonesSets "
             << name() << " and " << set.name() << endl;
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 4618b228d9..ee6fe930e2 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -56,11 +56,8 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "topoSet::New(const word&, "
-            "const polyMesh&, const word&, readOption, writeOption)"
-        )   << "Unknown set type " << setType
+        FatalErrorInFunction
+            << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
             << wordConstructorTablePtr_->sortedToc()
@@ -85,11 +82,8 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 
     if (cstrIter == sizeConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "topoSet::New(const word&, "
-            "const polyMesh&, const word&, const label, writeOption)"
-        )   << "Unknown set type " << setType
+        FatalErrorInFunction
+            << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
             << sizeConstructorTablePtr_->sortedToc()
@@ -114,11 +108,8 @@ Foam::autoPtr<Foam::topoSet> Foam::topoSet::New
 
     if (cstrIter == setConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "topoSet::New(const word&, "
-            "const polyMesh&, const word&, const topoSet&, writeOption)"
-        )   << "Unknown set type " << setType
+        FatalErrorInFunction
+            << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
             << setConstructorTablePtr_->sortedToc()
@@ -152,10 +143,8 @@ void Foam::topoSet::updateLabels(const labelList& map)
     {
         if ((iter.key() < 0) || (iter.key() > map.size()))
         {
-            FatalErrorIn
-            (
-                "topoSet::updateLabels(const labelList&, labelHashSet)"
-            )   << "Illegal content " << iter.key() << " of set:" << name()
+            FatalErrorInFunction
+                << "Illegal content " << iter.key() << " of set:" << name()
                 << " of type " << type() << endl
                 << "Value should be between 0 and " << map.size()-1
                 << abort(FatalError);
@@ -197,7 +186,7 @@ void Foam::topoSet::check(const label maxLabel)
     {
         if ((iter.key() < 0) || (iter.key() > maxLabel))
         {
-            FatalErrorIn("topoSet::check(const label)")
+            FatalErrorInFunction
                 << "Illegal content " << iter.key() << " of set:" << name()
                 << " of type " << type() << endl
                 << "Value should be between 0 and " << maxLabel
@@ -514,7 +503,7 @@ void Foam::topoSet::deleteSet(const topoSet& set)
 
 void Foam::topoSet::sync(const polyMesh&)
 {
-    notImplemented("topoSet::sync(const polyMesh&)");
+    NotImplemented;
 }
 
 
@@ -557,7 +546,7 @@ bool Foam::topoSet::writeData(Ostream& os) const
 
 void Foam::topoSet::updateMesh(const mapPolyMesh&)
 {
-    notImplemented("topoSet::updateMesh(const mapPolyMesh&)");
+    NotImplemented;
 }
 
 
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index c63e27eb2d..bcad4e1836 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,7 +219,7 @@ public:
         //- Clone
         autoPtr<topoSet> clone() const
         {
-            notImplemented("autoPtr<topoSet> clone() const");
+            NotImplemented;
             return autoPtr<topoSet>(NULL);
         }
 
diff --git a/src/meshTools/tetOverlapVolume/tetOverlapVolume.C b/src/meshTools/tetOverlapVolume/tetOverlapVolume.C
index db51ee66a6..1d2bdcc814 100644
--- a/src/meshTools/tetOverlapVolume/tetOverlapVolume.C
+++ b/src/meshTools/tetOverlapVolume/tetOverlapVolume.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,12 @@ namespace Foam
     defineTypeNameAndDebug(tetOverlapVolume, 0);
 }
 
+// When to consider a tet to be zero volume. We want to avoid doing clipping
+// against negative volume tets. Tet volume can be calculated incorrectly
+// due to truncation errors. The value below works for single and double
+// precision but could probably be tighter for double precision.
+Foam::scalar Foam::tetOverlapVolume::minTetVolume_ = SMALL*SMALL;
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -48,79 +54,12 @@ Foam::tetOverlapVolume::tetOverlapVolume()
 
 // * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::tetOverlapVolume::tetTetOverlapVol
-(
-    const tetPoints& tetA,
-    const tetPoints& tetB
-) const
-{
-    static tetPointRef::tetIntersectionList insideTets;
-    label nInside = 0;
-    static tetPointRef::tetIntersectionList cutInsideTets;
-    label nCutInside = 0;
-
-    tetPointRef::storeOp inside(insideTets, nInside);
-    tetPointRef::storeOp cutInside(cutInsideTets, nCutInside);
-    tetPointRef::sumVolOp volInside;
-    tetPointRef::dummyOp outside;
-
-    if ((tetA.tet().mag() < SMALL*SMALL) || (tetB.tet().mag() < SMALL*SMALL))
-    {
-        return 0.0;
-    }
-
-    // face0
-    plane pl0(tetB[1], tetB[3], tetB[2]);
-    tetA.tet().sliceWithPlane(pl0, cutInside, outside);
-    if (nCutInside == 0)
-    {
-        return 0.0;
-    }
-
-    // face1
-    plane pl1(tetB[0], tetB[2], tetB[3]);
-    nInside = 0;
-    for (label i = 0; i < nCutInside; i++)
-    {
-        const tetPointRef t = cutInsideTets[i].tet();
-        t.sliceWithPlane(pl1, inside, outside);
-    }
-    if (nInside == 0)
-    {
-        return 0.0;
-    }
-
-    // face2
-    plane pl2(tetB[0], tetB[3], tetB[1]);
-    nCutInside = 0;
-    for (label i = 0; i < nInside; i++)
-    {
-        const tetPointRef t = insideTets[i].tet();
-        t.sliceWithPlane(pl2, cutInside, outside);
-    }
-    if (nCutInside == 0)
-    {
-        return 0.0;
-    }
-
-    // face3
-    plane pl3(tetB[0], tetB[1], tetB[2]);
-    for (label i = 0; i < nCutInside; i++)
-    {
-        const tetPointRef t = cutInsideTets[i].tet();
-        t.sliceWithPlane(pl3, volInside, outside);
-    }
-
-    return volInside.vol_;
-}
-
-
 Foam::treeBoundBox Foam::tetOverlapVolume::pyrBb
 (
     const pointField& points,
     const face& f,
     const point& fc
-) const
+)
 {
     treeBoundBox bb(fc, fc);
     forAll(f, fp)
@@ -145,122 +84,18 @@ bool Foam::tetOverlapVolume::cellCellOverlapMinDecomp
     const scalar threshold
 ) const
 {
-    const cell& cFacesA = meshA.cells()[cellAI];
-    const point& ccA = meshA.cellCentres()[cellAI];
+    hasOverlapOp overlapCheckOp(threshold);
+    cellCellOverlapMinDecomp<hasOverlapOp>
+    (
+        meshA,
+        cellAI,
+        meshB,
+        cellBI,
+        cellBbB,
+        overlapCheckOp
+    );
 
-    const cell& cFacesB = meshB.cells()[cellBI];
-    const point& ccB = meshB.cellCentres()[cellBI];
-
-    scalar vol = 0.0;
-
-    forAll(cFacesA, cFA)
-    {
-        label faceAI = cFacesA[cFA];
-
-        const face& fA = meshA.faces()[faceAI];
-        const treeBoundBox pyrA = pyrBb(meshA.points(), fA, ccA);
-        if (!pyrA.overlaps(cellBbB))
-        {
-            continue;
-        }
-
-        bool ownA = (meshA.faceOwner()[faceAI] == cellAI);
-
-        label tetBasePtAI = 0;
-
-        const point& tetBasePtA = meshA.points()[fA[tetBasePtAI]];
-
-        for (label tetPtI = 1; tetPtI < fA.size() - 1; tetPtI++)
-        {
-            label facePtAI = (tetPtI + tetBasePtAI) % fA.size();
-            label otherFacePtAI = fA.fcIndex(facePtAI);
-
-            label pt0I = -1;
-            label pt1I = -1;
-
-            if (ownA)
-            {
-                pt0I = fA[facePtAI];
-                pt1I = fA[otherFacePtAI];
-            }
-            else
-            {
-                pt0I = fA[otherFacePtAI];
-                pt1I = fA[facePtAI];
-            }
-
-            const tetPoints tetA
-            (
-                ccA,
-                tetBasePtA,
-                meshA.points()[pt0I],
-                meshA.points()[pt1I]
-            );
-            const treeBoundBox tetABb(tetA.bounds());
-
-
-            // Loop over tets of cellB
-            forAll(cFacesB, cFB)
-            {
-                label faceBI = cFacesB[cFB];
-
-                const face& fB = meshB.faces()[faceBI];
-                const treeBoundBox pyrB = pyrBb(meshB.points(), fB, ccB);
-                if (!pyrB.overlaps(pyrA))
-                {
-                    continue;
-                }
-
-                bool ownB = (meshB.faceOwner()[faceBI] == cellBI);
-
-                label tetBasePtBI = 0;
-
-                const point& tetBasePtB = meshB.points()[fB[tetBasePtBI]];
-
-                for (label tetPtI = 1; tetPtI < fB.size() - 1; tetPtI++)
-                {
-                    label facePtBI = (tetPtI + tetBasePtBI) % fB.size();
-                    label otherFacePtBI = fB.fcIndex(facePtBI);
-
-                    label pt0I = -1;
-                    label pt1I = -1;
-
-                    if (ownB)
-                    {
-                        pt0I = fB[facePtBI];
-                        pt1I = fB[otherFacePtBI];
-                    }
-                    else
-                    {
-                        pt0I = fB[otherFacePtBI];
-                        pt1I = fB[facePtBI];
-                    }
-
-                    const tetPoints tetB
-                    (
-                        ccB,
-                        tetBasePtB,
-                        meshB.points()[pt0I],
-                        meshB.points()[pt1I]
-                    );
-
-                    if (!tetB.bounds().overlaps(tetABb))
-                    {
-                        continue;
-                    }
-
-                    vol += tetTetOverlapVol(tetA, tetB);
-
-                    if (vol > threshold)
-                    {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-
-    return false;
+    return overlapCheckOp.ok_;
 }
 
 
@@ -268,121 +103,50 @@ Foam::scalar Foam::tetOverlapVolume::cellCellOverlapVolumeMinDecomp
 (
     const primitiveMesh& meshA,
     const label cellAI,
+
     const primitiveMesh& meshB,
     const label cellBI,
     const treeBoundBox& cellBbB
 ) const
 {
-    const cell& cFacesA = meshA.cells()[cellAI];
-    const point& ccA = meshA.cellCentres()[cellAI];
+    sumOverlapOp overlapSumOp;
+    cellCellOverlapMinDecomp<sumOverlapOp>
+    (
+        meshA,
+        cellAI,
+        meshB,
+        cellBI,
+        cellBbB,
+        overlapSumOp
+    );
 
-    const cell& cFacesB = meshB.cells()[cellBI];
-    const point& ccB = meshB.cellCentres()[cellBI];
-
-    scalar vol = 0.0;
-
-    forAll(cFacesA, cFA)
-    {
-        label faceAI = cFacesA[cFA];
-
-        const face& fA = meshA.faces()[faceAI];
-        const treeBoundBox pyrA = pyrBb(meshA.points(), fA, ccA);
-        if (!pyrA.overlaps(cellBbB))
-        {
-            continue;
-        }
-
-        bool ownA = (meshA.faceOwner()[faceAI] == cellAI);
-
-        label tetBasePtAI = 0;
-
-        const point& tetBasePtA = meshA.points()[fA[tetBasePtAI]];
-
-        for (label tetPtI = 1; tetPtI < fA.size() - 1; tetPtI++)
-        {
-            label facePtAI = (tetPtI + tetBasePtAI) % fA.size();
-            label otherFacePtAI = fA.fcIndex(facePtAI);
-
-            label pt0I = -1;
-            label pt1I = -1;
-
-            if (ownA)
-            {
-                pt0I = fA[facePtAI];
-                pt1I = fA[otherFacePtAI];
-            }
-            else
-            {
-                pt0I = fA[otherFacePtAI];
-                pt1I = fA[facePtAI];
-            }
-
-            const tetPoints tetA
-            (
-                ccA,
-                tetBasePtA,
-                meshA.points()[pt0I],
-                meshA.points()[pt1I]
-            );
-            const treeBoundBox tetABb(tetA.bounds());
+    return overlapSumOp.iop_.vol_;
+}
 
 
-            // Loop over tets of cellB
-            forAll(cFacesB, cFB)
-            {
-                label faceBI = cFacesB[cFB];
+Foam::Tuple2<Foam::scalar, Foam::point>
+Foam::tetOverlapVolume::cellCellOverlapMomentMinDecomp
+(
+    const primitiveMesh& meshA,
+    const label cellAI,
 
-                const face& fB = meshB.faces()[faceBI];
-                const treeBoundBox pyrB = pyrBb(meshB.points(), fB, ccB);
-                if (!pyrB.overlaps(pyrA))
-                {
-                    continue;
-                }
+    const primitiveMesh& meshB,
+    const label cellBI,
+    const treeBoundBox& cellBbB
+) const
+{
+    sumOverlapMomentOp overlapSumOp;
+    cellCellOverlapMinDecomp<sumOverlapMomentOp>
+    (
+        meshA,
+        cellAI,
+        meshB,
+        cellBI,
+        cellBbB,
+        overlapSumOp
+    );
 
-                bool ownB = (meshB.faceOwner()[faceBI] == cellBI);
-
-                label tetBasePtBI = 0;
-
-                const point& tetBasePtB = meshB.points()[fB[tetBasePtBI]];
-
-                for (label tetPtI = 1; tetPtI < fB.size() - 1; tetPtI++)
-                {
-                    label facePtBI = (tetPtI + tetBasePtBI) % fB.size();
-                    label otherFacePtBI = fB.fcIndex(facePtBI);
-
-                    label pt0I = -1;
-                    label pt1I = -1;
-
-                    if (ownB)
-                    {
-                        pt0I = fB[facePtBI];
-                        pt1I = fB[otherFacePtBI];
-                    }
-                    else
-                    {
-                        pt0I = fB[otherFacePtBI];
-                        pt1I = fB[facePtBI];
-                    }
-
-                    const tetPoints tetB
-                    (
-                        ccB,
-                        tetBasePtB,
-                        meshB.points()[pt0I],
-                        meshB.points()[pt1I]
-                    );
-                    if (!tetB.bounds().overlaps(tetABb))
-                    {
-                        continue;
-                    }
-
-                    vol += tetTetOverlapVol(tetA, tetB);
-                }
-            }
-        }
-    }
-
-    return vol;
+    return overlapSumOp.iop_.vol_;
 }
 
 
diff --git a/src/meshTools/tetOverlapVolume/tetOverlapVolume.H b/src/meshTools/tetOverlapVolume/tetOverlapVolume.H
index 87c65dcd89..0a47519f58 100644
--- a/src/meshTools/tetOverlapVolume/tetOverlapVolume.H
+++ b/src/meshTools/tetOverlapVolume/tetOverlapVolume.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ Description
 
 SourceFiles
     tetOverlapVolume.C
+    tetOverlapVolumeTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -38,13 +39,14 @@ SourceFiles
 #include "FixedList.H"
 #include "labelList.H"
 #include "treeBoundBox.H"
+#include "Tuple2.H"
+#include "tetrahedron.H"
 
 namespace Foam
 {
 
 class primitiveMesh;
 class polyMesh;
-class tetPoints;
 
 /*---------------------------------------------------------------------------*\
                       Class tetOverlapVolume Declaration
@@ -52,22 +54,130 @@ class tetPoints;
 
 class tetOverlapVolume
 {
+    // Private data
+
+        //- Minimum tet volume to skip test
+        static scalar minTetVolume_;
+
+
+    // Private classes
+
+        //- tetPoints handling : sum resulting volumes
+        class sumMomentOp
+        {
+        public:
+            Tuple2<scalar, point> vol_;
+
+            inline sumMomentOp()
+            :
+                vol_(0.0, vector::zero)
+            {}
+
+            inline void operator()(const tetPoints& tet)
+            {
+                const tetPointRef t(tet.tet());
+                scalar tetVol = t.mag();
+                vol_.first() += tetVol;
+                vol_.second() += (tetVol*t.centre());
+            }
+        };
+
+        //- tetPoints combining : check for overlap
+        class hasOverlapOp
+        {
+        public:
+
+            const scalar threshold_;
+            tetPointRef::sumVolOp iop_;
+            bool ok_;
+
+            inline hasOverlapOp(const scalar threshold)
+            :
+                threshold_(threshold),
+                iop_(),
+                ok_(false)
+            {}
+
+            //- Overlap two tets
+            inline bool operator()(const tetPoints& A, const tetPoints& B)
+            {
+                tetTetOverlap<tetPointRef::sumVolOp>(A, B, iop_);
+                ok_ = (iop_.vol_ > threshold_);
+                return ok_;
+            }
+        };
+
+        //- tetPoints combining : sum overlap volume
+        class sumOverlapOp
+        {
+        public:
+
+            tetPointRef::sumVolOp iop_;
+
+            inline sumOverlapOp()
+            :
+                iop_()
+            {}
+
+            //- Overlap two tets
+            inline bool operator()(const tetPoints& A, const tetPoints& B)
+            {
+                tetTetOverlap<tetPointRef::sumVolOp>(A, B, iop_);
+                return false;
+            }
+        };
+
+        //- tetPoints combining : sum overlap volume
+        class sumOverlapMomentOp
+        {
+        public:
+
+            sumMomentOp iop_;
+
+            inline sumOverlapMomentOp()
+            :
+                iop_()
+            {}
+
+            //- Overlap two tets
+            inline bool operator()(const tetPoints& A, const tetPoints& B)
+            {
+                tetTetOverlap<sumMomentOp>(A, B, iop_);
+                return false;
+            }
+        };
+
+
     // Private member functions
 
-        //- Tet overlap volume
-        scalar tetTetOverlapVol
+        //- Tet overlap calculation
+        template<class tetPointsOp>
+        static void tetTetOverlap
         (
             const tetPoints& tetA,
-            const tetPoints& tetB
-        ) const;
+            const tetPoints& tetB,
+            tetPointsOp& insideOp
+        );
+
+        //- Cell overlap calculation
+        template<class tetsOp>
+        static void cellCellOverlapMinDecomp
+        (
+            const primitiveMesh& meshA,
+            const label cellAI,
+            const primitiveMesh& meshB,
+            const label cellBI,
+            const treeBoundBox& cellBbB,
+            tetsOp& combineTetsOp
+        );
 
         //- Return a const treeBoundBox
-        treeBoundBox pyrBb
+        static treeBoundBox pyrBb
         (
             const pointField& points,
             const face& f,
             const point& fc
-        ) const;
+        );
 
 
 public:
@@ -114,6 +224,17 @@ public:
             const label cellBI,
             const treeBoundBox& cellBbB
         ) const;
+
+        //- Calculates the overlap volume and moment
+        Tuple2<scalar, point> cellCellOverlapMomentMinDecomp
+        (
+            const primitiveMesh& meshA,
+            const label cellAI,
+
+            const primitiveMesh& meshB,
+            const label cellBI,
+            const treeBoundBox& cellBbB
+        ) const;
 };
 
 
@@ -123,6 +244,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "tetOverlapVolumeTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/meshTools/tetOverlapVolume/tetOverlapVolumeTemplates.C b/src/meshTools/tetOverlapVolume/tetOverlapVolumeTemplates.C
new file mode 100644
index 0000000000..4a58931cc9
--- /dev/null
+++ b/src/meshTools/tetOverlapVolume/tetOverlapVolumeTemplates.C
@@ -0,0 +1,220 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "tetOverlapVolume.H"
+#include "primitiveMesh.H"
+
+// * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
+
+template<class tetPointsOp>
+void Foam::tetOverlapVolume::tetTetOverlap
+(
+    const tetPoints& tetA,
+    const tetPoints& tetB,
+    tetPointsOp& insideOp
+)
+{
+    static tetPointRef::tetIntersectionList insideTets;
+    label nInside = 0;
+    static tetPointRef::tetIntersectionList cutInsideTets;
+    label nCutInside = 0;
+
+    tetPointRef::storeOp inside(insideTets, nInside);
+    tetPointRef::storeOp cutInside(cutInsideTets, nCutInside);
+    tetPointRef::dummyOp outside;
+
+    if (tetA.tet().mag() < minTetVolume_ || tetB.tet().mag() < minTetVolume_)
+    {
+        return;
+    }
+
+    // face0
+    plane pl0(tetB[1], tetB[3], tetB[2]);
+    tetA.tet().sliceWithPlane(pl0, cutInside, outside);
+    if (nCutInside == 0)
+    {
+        return;
+    }
+
+    // face1
+    plane pl1(tetB[0], tetB[2], tetB[3]);
+    nInside = 0;
+    for (label i = 0; i < nCutInside; i++)
+    {
+        const tetPointRef t = cutInsideTets[i].tet();
+        t.sliceWithPlane(pl1, inside, outside);
+    }
+    if (nInside == 0)
+    {
+        return;
+    }
+
+    // face2
+    plane pl2(tetB[0], tetB[3], tetB[1]);
+    nCutInside = 0;
+    for (label i = 0; i < nInside; i++)
+    {
+        const tetPointRef t = insideTets[i].tet();
+        t.sliceWithPlane(pl2, cutInside, outside);
+    }
+    if (nCutInside == 0)
+    {
+        return;
+    }
+
+    // face3
+    plane pl3(tetB[0], tetB[1], tetB[2]);
+    for (label i = 0; i < nCutInside; i++)
+    {
+        const tetPointRef t = cutInsideTets[i].tet();
+        t.sliceWithPlane(pl3, insideOp, outside);
+    }
+}
+
+
+template<class tetsOp>
+void Foam::tetOverlapVolume::cellCellOverlapMinDecomp
+(
+    const primitiveMesh& meshA,
+    const label cellAI,
+
+    const primitiveMesh& meshB,
+    const label cellBI,
+    const treeBoundBox& cellBbB,
+    tetsOp& combineTetsOp
+)
+{
+    const cell& cFacesA = meshA.cells()[cellAI];
+    const point& ccA = meshA.cellCentres()[cellAI];
+
+    const cell& cFacesB = meshB.cells()[cellBI];
+    const point& ccB = meshB.cellCentres()[cellBI];
+
+    forAll(cFacesA, cFA)
+    {
+        label faceAI = cFacesA[cFA];
+
+        const face& fA = meshA.faces()[faceAI];
+        const treeBoundBox pyrA = pyrBb(meshA.points(), fA, ccA);
+        if (!pyrA.overlaps(cellBbB))
+        {
+            continue;
+        }
+
+        bool ownA = (meshA.faceOwner()[faceAI] == cellAI);
+
+        label tetBasePtAI = 0;
+
+        const point& tetBasePtA = meshA.points()[fA[tetBasePtAI]];
+
+        for (label tetPtI = 1; tetPtI < fA.size() - 1; tetPtI++)
+        {
+            label facePtAI = (tetPtI + tetBasePtAI) % fA.size();
+            label otherFacePtAI = fA.fcIndex(facePtAI);
+
+            label pt0I = -1;
+            label pt1I = -1;
+
+            if (ownA)
+            {
+                pt0I = fA[facePtAI];
+                pt1I = fA[otherFacePtAI];
+            }
+            else
+            {
+                pt0I = fA[otherFacePtAI];
+                pt1I = fA[facePtAI];
+            }
+
+            const tetPoints tetA
+            (
+                ccA,
+                tetBasePtA,
+                meshA.points()[pt0I],
+                meshA.points()[pt1I]
+            );
+            const treeBoundBox tetABb(tetA.bounds());
+
+            // Loop over tets of cellB
+            forAll(cFacesB, cFB)
+            {
+                label faceBI = cFacesB[cFB];
+
+                const face& fB = meshB.faces()[faceBI];
+                const treeBoundBox pyrB = pyrBb(meshB.points(), fB, ccB);
+                if (!pyrB.overlaps(pyrA))
+                {
+                    continue;
+                }
+
+                bool ownB = (meshB.faceOwner()[faceBI] == cellBI);
+
+                label tetBasePtBI = 0;
+
+                const point& tetBasePtB = meshB.points()[fB[tetBasePtBI]];
+
+                for (label tetPtI = 1; tetPtI < fB.size() - 1; tetPtI++)
+                {
+                    label facePtBI = (tetPtI + tetBasePtBI) % fB.size();
+                    label otherFacePtBI = fB.fcIndex(facePtBI);
+
+                    label pt0I = -1;
+                    label pt1I = -1;
+
+                    if (ownB)
+                    {
+                        pt0I = fB[facePtBI];
+                        pt1I = fB[otherFacePtBI];
+                    }
+                    else
+                    {
+                        pt0I = fB[otherFacePtBI];
+                        pt1I = fB[facePtBI];
+                    }
+
+                    const tetPoints tetB
+                    (
+                        ccB,
+                        tetBasePtB,
+                        meshB.points()[pt0I],
+                        meshB.points()[pt1I]
+                    );
+                    if (!tetB.bounds().overlaps(tetABb))
+                    {
+                        continue;
+                    }
+
+                    if (combineTetsOp(tetA, tetB))
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 3d66eb6b8b..c3147cb12d 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,24 @@ License
 namespace Foam
 {
 defineTypeNameAndDebug(booleanSurface, 0);
+
+template<>
+const char* Foam::NamedEnum
+<
+    Foam::booleanSurface::booleanOpType,
+    4
+>::names[] =
+{
+    "union",
+    "intersection",
+    "difference",
+    "all"
+};
 }
 
+const Foam::NamedEnum<Foam::booleanSurface::booleanOpType, 4>
+Foam::booleanSurface::booleanOpTypeNames;
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -70,11 +86,8 @@ void Foam::booleanSurface::checkIncluded
 
         if (!usesIncluded)
         {
-            FatalErrorIn
-            (
-                "booleanSurface::checkIncluded(const intersectedSurface&"
-                ", const labelList&, const label)"
-            )   << "None of the faces reachable from face " << includedFace
+            FatalErrorInFunction
+                << "None of the faces reachable from face " << includedFace
                 << " connects to the intersection."
                 << exit(FatalError);
         }
@@ -114,11 +127,8 @@ Foam::label Foam::booleanSurface::findEdge
             return edgeLabels[edgeLabelI];
         }
     }
-    FatalErrorIn
-    (
-        "booleanSurface::findEdge(const edgeList&, const labelList&"
-        ", const edge&)"
-    )   << "Cannot find edge " << e << " in edges " << edgeLabels
+    FatalErrorInFunction
+        << "Cannot find edge " << e << " in edges " << edgeLabels
         << abort(FatalError);
 
     return -1;
@@ -213,12 +223,8 @@ void Foam::booleanSurface::propagateEdgeSide
 
     if (((eFaces.size() % 2) == 1) && (eFaces.size() != 1))
     {
-        FatalErrorIn
-        (
-            "booleanSurface::propagateEdgeSide(const triSurface&,"
-            "const label, const label, const label, const label,"
-            " labelList&)"
-        )   << "Don't know how to handle edges with odd number of faces"
+        FatalErrorInFunction
+            << "Don't know how to handle edges with odd number of faces"
             << endl
             << "edge:" << edgeI << " vertices:" << surf.edges()[edgeI]
             << " coming from face:" << prevFaceI
@@ -447,11 +453,8 @@ Foam::booleanSurface::booleanSurface
 
     if (cutSurf1FaceI == -1)
     {
-        FatalErrorIn
-        (
-           "booleanSurface(const triSurfaceSearch&"
-            ", const label, const triSurfaceSearch&, const label)"
-        )   << "Did not find face with label " << includeFace1
+        FatalErrorInFunction
+            << "Did not find face with label " << includeFace1
             << " in intersectedSurface."
             << exit(FatalError);
     }
@@ -466,11 +469,8 @@ Foam::booleanSurface::booleanSurface
     }
     if (cutSurf2FaceI == -1)
     {
-        FatalErrorIn
-        (
-           "booleanSurface(const triSurfaceSearch&"
-            ", const label, const triSurfaceSearch&, const label)"
-        )   << "Did not find face with label " << includeFace2
+        FatalErrorInFunction
+            << "Did not find face with label " << includeFace2
             << " in intersectedSurface."
             << exit(FatalError);
     }
@@ -727,7 +727,7 @@ Foam::booleanSurface::booleanSurface
 
                 if (eFaces.size() == 1)
                 {
-                    WarningIn("booleanSurface::booleanSurface")
+                    WarningInFunction
                         << "surf1 is open surface at edge " << edgeI
                         << " verts:" << surf1.edges()[edgeI]
                         << " connected to faces " << eFaces << endl;
@@ -743,7 +743,7 @@ Foam::booleanSurface::booleanSurface
 
                 if (eFaces.size() == 1)
                 {
-                    WarningIn("booleanSurface::booleanSurface")
+                    WarningInFunction
                         << "surf2 is open surface at edge " << edgeI
                         << " verts:" << surf2.edges()[edgeI]
                         << " connected to faces " << eFaces << endl;
@@ -1001,12 +1001,8 @@ Foam::booleanSurface::booleanSurface
     {
         if (side[faceI] == UNVISITED)
         {
-            FatalErrorIn
-            (
-                "booleanSurface::booleanSurface"
-                "(const triSurfaceSearch&, const triSurfaceSearch&"
-                ", const label booleanOp)"
-            )   << "Face " << faceI << " has not been reached by walking from"
+            FatalErrorInFunction
+                << "Face " << faceI << " has not been reached by walking from"
                 << " nearest point " << minHit.rawPoint()
                 << " nearest face " << minFaceI << exit(FatalError);
         }
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index 4cb538f5cd..f577033ded 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -170,6 +170,11 @@ public:
                           // surface. (Produces multiply connected surface)
         };
 
+    // Static data
+
+        static const NamedEnum<booleanOpType, 4> booleanOpTypeNames;
+
+
 
     // Constructors
 
@@ -218,7 +223,7 @@ public:
         {
             if (!from1(faceI))
             {
-                FatalErrorIn("booleanSurface::surf1Face(const label)")
+                FatalErrorInFunction
                     << "face " << faceI << " not from surface 1"
                     << abort(FatalError);
             }
@@ -229,7 +234,7 @@ public:
         {
             if (from1(faceI))
             {
-                FatalErrorIn("booleanSurface::surf2Face(const label)")
+                FatalErrorInFunction
                     << "face " << faceI << " not from surface 2"
                     << abort(FatalError);
             }
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
index 3916f352d8..720e99c3d3 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
@@ -170,10 +170,8 @@ public:
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "edgeSurface::parentEdge(const label edgeI) const"
-                    )   << "Trying to get parent (i.e. surface) edge for"
+                    FatalErrorInFunction
+                        << "Trying to get parent (i.e. surface) edge for"
                         << " intersection edge " << edgeI
                         << abort(FatalError);
                     return -1;
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 7cffb1309a..1f38acb5c1 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(intersectedSurface, 0);
+    defineTypeNameAndDebug(intersectedSurface, 0);
 }
 
 
@@ -242,7 +242,7 @@ bool Foam::intersectedSurface::sameEdgeOrder
             }
             else
             {
-                FatalErrorIn("intersectedSurface::sameEdgeOrder")
+                FatalErrorInFunction
                     << "Triangle:" << fA << " and triangle:" << fB
                     << " share a point but not an edge"
                     << abort(FatalError);
@@ -250,7 +250,7 @@ bool Foam::intersectedSurface::sameEdgeOrder
         }
     }
 
-    FatalErrorIn("intersectedSurface::sameEdgeOrder")
+    FatalErrorInFunction
         << "Triangle:" << fA << " and triangle:" << fB
         << " do not share an edge"
         << abort(FatalError);
@@ -341,11 +341,8 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         // Check on dangling points.
         if (iter().empty())
         {
-            FatalErrorIn
-            (
-                "intersectedSurface::calcPointEdgeAddressing"
-                "(const edgeSurface&, const label)"
-            )   << "Point:" << iter.key() << " used by too few edges:"
+            FatalErrorInFunction
+                << "Point:" << iter.key() << " used by too few edges:"
                 << iter() << abort(FatalError);
         }
     }
@@ -411,12 +408,8 @@ Foam::label Foam::intersectedSurface::nextEdge
             writeLocalOBJ(points, edges, connectedEdges, "faceEdges.obj");
         }
 
-        FatalErrorIn
-        (
-            "intersectedSurface::nextEdge(const pointField&, const edgeList&"
-            ", const vector&, Map<DynamicList<label> >, const label"
-            ", const label)"
-        )   << "Problem: prevVertI:" << prevVertI << " on edge " << prevEdgeI
+        FatalErrorInFunction
+            << "Problem: prevVertI:" << prevVertI << " on edge " << prevEdgeI
             << " has less than 2 connected edges."
             << " connectedEdges:" << connectedEdges << abort(FatalError);
 
@@ -471,7 +464,7 @@ Foam::label Foam::intersectedSurface::nextEdge
             writeLocalOBJ(points, edges, connectedEdges, "faceEdges.obj");
         }
 
-        FatalErrorIn("intersectedSurface::nextEdge")
+        FatalErrorInFunction
             << "Unnormalized normal e1:" << e1
             << " formed from cross product of e0:" << e0 << " n:" << n
             << abort(FatalError);
@@ -539,13 +532,8 @@ Foam::label Foam::intersectedSurface::nextEdge
             writeLocalOBJ(points, edges, connectedEdges, "faceEdges.obj");
         }
 
-        FatalErrorIn
-        (
-            "intersectedSurface::nextEdge(const pointField&, const edgeList&"
-            ", const Map<label>&, const vector&"
-            ", const Map<DynamicList<label> >&"
-            ", const label, const label"
-        )   << "Trying to step from edge " << edges[prevEdgeI]
+        FatalErrorInFunction
+            << "Trying to step from edge " << edges[prevEdgeI]
             << ", vertex " << prevVertI
             << " but cannot find 'unvisited' edges among candidates:"
             << connectedEdges
@@ -687,12 +675,12 @@ void Foam::intersectedSurface::findNearestVisited
     {
         const labelList& fEdges = eSurf.faceEdges()[faceI];
 
-        SeriousErrorIn("intersectedSurface::findNearestVisited")
+        SeriousErrorInFunction
             << "Dumping face edges to faceEdges.obj" << endl;
 
         writeLocalOBJ(eSurf.points(), eSurf.edges(), fEdges, "faceEdges.obj");
 
-        FatalErrorIn("intersectedSurface::findNearestVisited")
+        FatalErrorInFunction
             << "No fully visited edge found for pt " << pt
             << abort(FatalError);
     }
@@ -716,66 +704,35 @@ Foam::faceList Foam::intersectedSurface::resplitFace
     edgeSurface& eSurf
 )
 {
-    {
-        // Dump face for debugging.
-        Pout<< "Writing face:" << faceI << " to face.obj" << endl;
-        OFstream str("face.obj");
-        writeOBJ(eSurf.points(), eSurf.edges(), eSurf.faceEdges()[faceI], str);
-    }
-
-
     // Count the number of times point has been visited so we
     // can compare number to facePointEdges.
     Map<label> pointVisited(2*facePointEdges.size());
 
-
-    {
-        OFstream str0("visitedNone.obj");
-        OFstream str1("visitedOnce.obj");
-        OFstream str2("visitedTwice.obj");
-        forAll(eSurf.points(), pointI)
-        {
-            const point& pt = eSurf.points()[pointI];
-
-            str0 << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-            str1 << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-            str2 << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-        }
-
-
     forAllConstIter(Map<label>, visited, iter)
     {
         label edgeI = iter.key();
-
         const edge& e = eSurf.edges()[edgeI];
-
         label stat = iter();
 
         if (stat == STARTTOEND || stat == ENDTOSTART)
         {
             incCount(pointVisited, e[0], 1);
             incCount(pointVisited, e[1], 1);
-
-            str1 << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
         }
         else if (stat == BOTH)
         {
             incCount(pointVisited, e[0], 2);
             incCount(pointVisited, e[1], 2);
-
-            str2 << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
         }
         else if (stat == UNVISITED)
         {
             incCount(pointVisited, e[0], 0);
             incCount(pointVisited, e[1], 0);
-
-            str0 << "l " << e[0]+1 << ' ' << e[1]+1 << nl;
         }
     }
-    }
 
 
+    if (debug)
     {
         forAllConstIter(Map<label>, pointVisited, iter)
         {
@@ -838,8 +795,6 @@ Foam::faceList Foam::intersectedSurface::resplitFace
 
 
     // Find second intersection.
-    label visitedVert1 = -1;
-    label unvisitedVert1 = -1;
     {
         scalar minDist = GREAT;
 
@@ -876,8 +831,6 @@ Foam::faceList Foam::intersectedSurface::resplitFace
                     if (nearDist < minDist)
                     {
                         minDist = nearDist;
-                        visitedVert1 = nearVertI;
-                        unvisitedVert1 = pointI;
                     }
                 }
             }
@@ -885,32 +838,24 @@ Foam::faceList Foam::intersectedSurface::resplitFace
     }
 
 
-    Pout<< "resplitFace : adding intersection from " << visitedVert0
-        << " to " << unvisitedVert0 << endl
-        << " and from " << visitedVert1
-        << " to " << unvisitedVert1 << endl;
-
-
-//    // Add the new intersection edges to the edgeSurface
-//    edgeList additionalEdges(2);
-//    additionalEdges[0] = edge(visitedVert0, unvisitedVert0);
-//    additionalEdges[1] = edge(visitedVert1, unvisitedVert1);
-
     // Add the new intersection edges to the edgeSurface
     edgeList additionalEdges(1);
     additionalEdges[0] = edge(visitedVert0, unvisitedVert0);
 
     eSurf.addIntersectionEdges(faceI, additionalEdges);
 
-    fileName newFName("face_" + Foam::name(faceI) + "_newEdges.obj");
-    Pout<< "Dumping face:" << faceI << " to " << newFName << endl;
-    writeLocalOBJ
-    (
-        eSurf.points(),
-        eSurf.edges(),
-        eSurf.faceEdges()[faceI],
-        newFName
-    );
+    if (debug)
+    {
+        fileName newFName("face_" + Foam::name(faceI) + "_newEdges.obj");
+        Pout<< "Dumping face:" << faceI << " to " << newFName << endl;
+        writeLocalOBJ
+        (
+            eSurf.points(),
+            eSurf.edges(),
+            eSurf.faceEdges()[faceI],
+            newFName
+        );
+    }
 
     // Retry splitFace. Use recursion since is rare situation.
     return splitFace(surf, faceI, eSurf);
@@ -1069,12 +1014,12 @@ Foam::faceList Foam::intersectedSurface::splitFace
 
         if (eSurf.isSurfaceEdge(edgeI) && stat != BOTH)
         {
-            SeriousErrorIn("Foam::intersectedSurface::splitFace")
+            SeriousErrorInFunction
                 << "Dumping face edges to faceEdges.obj" << endl;
 
             writeLocalOBJ(points, edges, fEdges, "faceEdges.obj");
 
-            FatalErrorIn("intersectedSurface::splitFace")
+            FatalErrorInFunction
                << "Problem: edge " << edgeI << " vertices "
                 << edges[edgeI] << " on face " << faceI
                 << " has visited status " << stat << " from a "
@@ -1085,20 +1030,6 @@ Foam::faceList Foam::intersectedSurface::splitFace
         }
         else if (stat != BOTH)
         {
-            //{
-            //    Pout<< "Dumping faces so far to faces.obj" << nl
-            //        << faces << endl;
-            //
-            //    OFstream str("faces.obj");
-            //
-            //    forAll(faces, i)
-            //    {
-            //        writeOBJ(points, faces[i], str);
-            //    }
-            //}
-
-            Pout<< "** Resplitting **" << endl;
-
             // Redo face after introducing extra edge. Edge introduced
             // should be one nearest to any fully visited edge.
             return resplitFace
@@ -1220,34 +1151,6 @@ Foam::intersectedSurface::intersectedSurface
             forAll(newFaces, newFaceI)
             {
                 const face& newF = newFaces[newFaceI];
-
-//                {
-//                    fileName fName
-//                    (
-//                        "face_"
-//                      + Foam::name(faceI)
-//                      + "_subFace_"
-//                      + Foam::name(newFaceI)
-//                      + ".obj"
-//                    );
-//                    Pout<< "Writing original face:" << faceI << " subFace:"
-//                        << newFaceI << " to " << fName << endl;
-//
-//                    OFstream str(fName);
-//
-//                    forAll(newF, fp)
-//                    {
-//                        meshTools::writeOBJ(str, eSurf.points()[newF[fp]]);
-//                    }
-//                    str << 'l';
-//                    forAll(newF, fp)
-//                    {
-//                        str << ' ' << fp+1;
-//                    }
-//                    str<< " 1" << nl;
-//                }
-
-
                 const vector& n = surf.faceNormals()[faceI];
                 const label region = surf[faceI].region();
 
@@ -1261,10 +1164,8 @@ Foam::intersectedSurface::intersectedSurface
                     {
                         if (t[i] < 0 || t[i] >= eSurf.points().size())
                         {
-                            FatalErrorIn
-                            (
-                                "intersectedSurface::intersectedSurface"
-                            )   << "Face triangulation of face " << faceI
+                            FatalErrorInFunction
+                                << "Face triangulation of face " << faceI
                                 << " uses points outside range 0.."
                                 << eSurf.points().size()-1 << endl
                                 << "Triangulation:"
@@ -1359,7 +1260,7 @@ Foam::intersectedSurface::intersectedSurface
         }
         else
         {
-            FatalErrorIn("intersectedSurface::intersectedSurface")
+            FatalErrorInFunction
                 << "Cannot find edge among candidates " << pEdges
                 << " which uses points " << surfStartI
                 << " and " << surfEndI
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index c8167fb22d..1fc90e444f 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,6 @@ void Foam::edgeIntersections::checkEdges(const triSurface& surf)
 {
     const pointField& localPoints = surf.localPoints();
     const edgeList& edges = surf.edges();
-    const labelListList& edgeFaces = surf.edgeFaces();
 
     treeBoundBox bb(localPoints);
 
@@ -68,29 +67,14 @@ void Foam::edgeIntersections::checkEdges(const triSurface& surf)
 
         if (eMag < minSize)
         {
-            WarningIn
-            (
-                "Foam::edgeIntersections::checkEdges(const triSurface& surf)"
-            )   << "Edge " << edgeI << " vertices " << e
+            WarningInFunction
+                << "Edge " << edgeI << " vertices " << e
                 << " coords:" << localPoints[e[0]] << ' '
                 << localPoints[e[1]] << " is very small compared to bounding"
                 << " box dimensions " << bb << endl
                 << "This might lead to problems in intersection"
                 << endl;
         }
-
-        if (edgeFaces[edgeI].size() == 1)
-        {
-            WarningIn
-            (
-                "Foam::edgeIntersections::checkEdges(const triSurface& surf)"
-            )   << "Edge " << edgeI << " vertices " << e
-                << " coords:" << localPoints[e[0]] << ' '
-                << localPoints[e[1]] << " has only one face connected to it:"
-                << edgeFaces[edgeI] << endl
-                << "This might lead to problems in intersection"
-                << endl;
-        }
     }
 }
 
@@ -466,7 +450,6 @@ Foam::edgeIntersections::edgeIntersections()
 {}
 
 
-// Construct from surface and tolerance
 Foam::edgeIntersections::edgeIntersections
 (
     const triSurface& surf1,
@@ -478,16 +461,9 @@ Foam::edgeIntersections::edgeIntersections
     classification_(surf1.nEdges())
 {
     checkEdges(surf1);
-    checkEdges(query2.surface());
 
     // Current set of edges to test
-    labelList edgesToTest(surf1.nEdges());
-
-    // Start off with all edges
-    forAll(edgesToTest, i)
-    {
-        edgesToTest[i] = i;
-    }
+    labelList edgesToTest(identity(surf1.nEdges()));
 
     // Determine intersections for edgesToTest
     intersectEdges
@@ -682,7 +658,7 @@ Foam::label Foam::edgeIntersections::removeDegenerates
 
         if (edgesToTest.empty())
         {
-            FatalErrorIn("perturb") << "oops" << abort(FatalError);
+            FatalErrorInFunction << "oops" << abort(FatalError);
         }
 
         // Re intersect moved edges.
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 0ede58107c..d864315329 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -184,7 +184,7 @@ bool Foam::surfaceIntersection::excludeEdgeHit
 //        }
 //    }
 //
-//    FatalErrorIn("surfaceIntersection::borderEdgeIntersection")
+//    FatalErrorInFunction
 //        << "Did not find intersection of plane " << pl
 //        << " with edges of face " << hitFaceI << " verts:" << f
 //        << abort(FatalError);
@@ -239,13 +239,8 @@ void Foam::surfaceIntersection::storeIntersection
 
             if (mag(prevHit - thisHit) < SMALL)
             {
-                WarningIn
-                (
-                    "Foam::surfaceIntersection::storeIntersection"
-                    "(const bool isFirstSurf, const labelList& facesA,"
-                    "const label faceB, DynamicList<edge>& allCutEdges,"
-                    "DynamicList<point>& allCutPoints)"
-                )   << "Encountered degenerate edge between face "
+                WarningInFunction
+                    << "Encountered degenerate edge between face "
                     << twoFaces[0] << " on first surface"
                     << " and face " << twoFaces[1] << " on second surface"
                     << endl
@@ -815,7 +810,7 @@ Foam::surfaceIntersection::surfaceIntersection
 }
 
 
-// Construct from full intersection Poutrmation
+// Construct from full intersection information
 Foam::surfaceIntersection::surfaceIntersection
 (
     const triSurface& surf1,
@@ -968,7 +963,7 @@ Foam::surfaceIntersection::surfaceIntersection
 
             if (!usedPoints.found(pointI))
             {
-                WarningIn("surfaceIntersection::surfaceIntersection")
+                WarningInFunction
                     << "Problem: cut point:" << pointI
                     << " coord:" << cutPoints_[pointI]
                     << " not used by any edge" << endl;
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 2ef3fec0bc..753eeec355 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,11 +104,8 @@ Foam::label Foam::surfaceIntersection::getEdge
         }
     }
 
-    FatalErrorIn
-    (
-        "surfaceIntersection::getEdge(const triSurface&"
-        ", const label, const label"
-    )   << "Problem:: Cannot find edge with vertices " << faceEdge
+    FatalErrorInFunction
+        << "Problem:: Cannot find edge with vertices " << faceEdge
         << " in face " << faceI
         << abort(FatalError);
 
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index 0466343eb5..05ad8dc768 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,7 +106,7 @@ Foam::labelList Foam::orientedSurface::edgeToFace
             {
                 if (flip[face1] == UNVISITED)
                 {
-                    FatalErrorIn("orientedSurface::edgeToFace(..)") << "Problem"
+                    FatalErrorInFunction
                         << abort(FatalError);
                 }
                 else
@@ -330,10 +330,8 @@ bool Foam::orientedSurface::flipSurface
     {
         if (flipState[faceI] == UNVISITED)
         {
-            FatalErrorIn
-            (
-                "orientSurface(const point&, const label, const point&)"
-            )   << "unvisited face " << faceI
+            FatalErrorInFunction
+                << "unvisited face " << faceI
                 << abort(FatalError);
         }
         else if (flipState[faceI] == FLIP)
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 3d89e50aee..8212899215 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -949,7 +949,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
 
         if (!info.hit())
         {
-            FatalErrorIn("surfaceFeatures::nearestSamples")
+            FatalErrorInFunction
                 << "Problem for point "
                 << surfPointI << " in tree " << ppTree.bb()
                 << abort(FatalError);
@@ -1484,19 +1484,15 @@ void Foam::surfaceFeatures::operator=(const surfaceFeatures& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::surfaceFeatures::operator=(const Foam::surfaceFeatures&)"
-        )   << "Attempted assignment to self"
+        FatalErrorInFunction
+            << "Attempted assignment to self"
             << abort(FatalError);
     }
 
     if (&surf_ != &rhs.surface())
     {
-        FatalErrorIn
-        (
-            "Foam::surfaceFeatures::operator=(const Foam::surfaceFeatures&)"
-        )   << "Operating on different surfaces"
+        FatalErrorInFunction
+            << "Operating on different surfaces"
             << abort(FatalError);
     }
 
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
index 34dc89f920..b3c58c0e96 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -135,7 +135,7 @@ Foam::triSurfaceRegionSearch::treeByRegion() const
 
     //            if (nPoints != surface().points().size())
     //            {
-    //                WarningIn("triSurfaceRegionSearch::treeByRegion() const")
+    //                WarningInFunction
     //                    << "Surface does not have compact point numbering. "
     //                    << "Of " << surface().points().size()
     //                    << " only " << nPoints
@@ -163,7 +163,7 @@ Foam::triSurfaceRegionSearch::treeByRegion() const
                 (
                     treeDataIndirectTriSurface
                     (
-                        true,
+                        false,              //true,
                         indirectRegionPatches_[regionI],
                         tolerance()
                     ),
@@ -211,6 +211,7 @@ void Foam::triSurfaceRegionSearch::findNearest
             }
 
             const treeType& octree = octrees[treeI];
+            const treeDataIndirectTriSurface::findNearestOp nearOp(octree);
 
             forAll(samples, i)
             {
@@ -223,7 +224,7 @@ void Foam::triSurfaceRegionSearch::findNearest
                 (
                     samples[i],
                     nearestDistSqr[i],
-                    treeDataIndirectTriSurface::findNearestOp(octree)
+                    nearOp
                 );
 
                 if
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index 5d78faff69..7e5e88bbd2 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -209,7 +209,7 @@ Foam::triSurfaceSearch::tree() const
 
             if (nPoints != surface().points().size())
             {
-                WarningIn("triSurfaceSearch::tree() const")
+                WarningInFunction
                     << "Surface does not have compact point numbering."
                     << " Of " << surface().points().size()
                     << " only " << nPoints
@@ -234,7 +234,7 @@ Foam::triSurfaceSearch::tree() const
         (
             new indexedOctree<treeDataTriSurface>
             (
-                treeDataTriSurface(true, surface_, tolerance_),
+                treeDataTriSurface(false, surface_, tolerance_),
                 bb,
                 maxTreeDepth_,  // maxLevel
                 10,             // leafsize
@@ -290,15 +290,17 @@ void Foam::triSurfaceSearch::findNearest
 
     const indexedOctree<treeDataTriSurface>& octree = tree();
 
+    const treeDataTriSurface::findNearestOp fOp(octree);
+
     info.setSize(samples.size());
 
     forAll(samples, i)
     {
-        static_cast<pointIndexHit&>(info[i]) = octree.findNearest
+        info[i] = octree.findNearest
         (
             samples[i],
             nearestDistSqr[i],
-            treeDataTriSurface::findNearestOp(octree)
+            fOp
         );
     }
 
@@ -335,11 +337,7 @@ void Foam::triSurfaceSearch::findLine
 
     forAll(start, i)
     {
-        static_cast<pointIndexHit&>(info[i]) = octree.findLine
-        (
-            start[i],
-            end[i]
-        );
+        info[i] = octree.findLine(start[i], end[i]);
     }
 
     indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
@@ -362,11 +360,7 @@ void Foam::triSurfaceSearch::findLineAny
 
     forAll(start, i)
     {
-        static_cast<pointIndexHit&>(info[i]) = octree.findLineAny
-        (
-            start[i],
-            end[i]
-        );
+        info[i] = octree.findLineAny(start[i], end[i]);
     }
 
     indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index 5d69ba1f17..3810acc221 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,11 +51,8 @@ Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
 {
     if (points.size() < 3)
     {
-        FatalErrorIn
-        (
-            "pointToPointPlanarInterpolation::calcCoordinateSystem"
-            "(const pointField&)"
-        )   << "Only " << points.size() << " provided." << nl
+        FatalErrorInFunction
+            << "Only " << points.size() << " provided." << nl
             << "Need at least three non-colinear points"
             << " to be able to interpolate."
             << exit(FatalError);
@@ -103,11 +100,8 @@ Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
     }
     if (index2 == -1)
     {
-        FatalErrorIn
-        (
-            "pointToPointPlanarInterpolation::calcCoordinateSystem"
-            "(const pointField&)"
-        )   << "Cannot find points that make valid normal." << nl
+        FatalErrorInFunction
+            << "Cannot find points that make valid normal." << nl
             << "Have so far points " << p0 << " and " << p1
             << "Need at least three points which are not in a line."
             << exit(FatalError);
@@ -154,7 +148,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
 
         if (!fullMatch)
         {
-            FatalErrorIn("pointToPointPlanarInterpolation::calcWeights(..)")
+            FatalErrorInFunction
                 << "Did not find a corresponding sourcePoint for every face"
                 << " centre" << exit(FatalError);
         }
@@ -390,7 +384,7 @@ bool Foam::pointToPointPlanarInterpolation::findTime
 
     if (lo == -1)
     {
-        //FatalErrorIn("findTime(..)")
+        //FatalErrorInFunction
         //    << "Cannot find starting sampling values for current time "
         //    << timeVal << nl
         //    << "Have sampling values for times "
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
index f17f249d13..96c9481f5c 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,11 +35,8 @@ Foam::tmp<Foam::Field<Type> > Foam::pointToPointPlanarInterpolation::interpolate
 {
     if (nPoints_ != sourceFld.size())
     {
-        FatalErrorIn
-        (
-            "pointToPointPlanarInterpolation::interpolate"
-            "(const Field<Type>&) const"
-        )   << "Number of source points = " << nPoints_
+        FatalErrorInFunction
+            << "Number of source points = " << nPoints_
             << " number of values = " << sourceFld.size()
             << exit(FatalError);
     }
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 0f6d31c998..441f6136e9 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -615,7 +615,7 @@ Foam::scalar Foam::triSurfaceTools::edgeCosAngle
         }
         else
         {
-            FatalErrorIn("edgeCosAngle")
+            FatalErrorInFunction
                 << "face " << faceI << " does not use vertex "
                 << v1 << " of collapsed edge" << abort(FatalError);
         }
@@ -887,7 +887,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
 
         if (fp0 == -1)
         {
-            FatalErrorIn("cutEdge(..)") << "excludePointI:" << excludePointI
+            FatalErrorInFunction
                 << " localF:" << s.localFaces()[triI] << abort(FatalError);
         }
 
@@ -944,7 +944,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
             {
                 if (interI >= 2)
                 {
-                    FatalErrorIn("cutEdge(..)")
+                    FatalErrorInFunction
                         << "problem : triangle has three intersections." << nl
                         << "triangle:" << f.tri(points)
                         << " d:" << d << abort(FatalError);
@@ -963,7 +963,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
             {
                 if (interI >= 2)
                 {
-                    FatalErrorIn("cutEdge(..)")
+                    FatalErrorInFunction
                         << "problem : triangle has three intersections." << nl
                         << "triangle:" << f.tri(points)
                         << " d:" << d << abort(FatalError);
@@ -1210,7 +1210,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
                 // If crossing an edge we expect next edge to be cut.
                 if (excludeEdgeI != -1 && !cutInfo.hit())
                 {
-                    FatalErrorIn("triSurfaceTools::visitFaces(..)")
+                    FatalErrorInFunction
                         << "Triangle:" << triI
                         << " excludeEdge:" << excludeEdgeI
                         << " point:" << start.rawPoint()
@@ -1469,12 +1469,8 @@ void Foam::triSurfaceTools::otherEdges
 
     if (i0 == -1)
     {
-        FatalErrorIn
-        (
-            "otherEdges"
-            "(const triSurface&, const label, const label,"
-            " label&, label&)"
-        )   << "Edge " << surf.edges()[edgeI] << " not in face "
+        FatalErrorInFunction
+            << "Edge " << surf.edges()[edgeI] << " not in face "
             << surf.localFaces()[faceI] << abort(FatalError);
     }
 
@@ -1515,12 +1511,8 @@ void Foam::triSurfaceTools::otherVertices
     }
     else
     {
-        FatalErrorIn
-        (
-            "otherVertices"
-            "(const triSurface&, const label, const label,"
-            " label&, label&)"
-        )   << "Vertex " << vertI << " not in face " << f << abort(FatalError);
+        FatalErrorInFunction
+            << "Vertex " << vertI << " not in face " << f << abort(FatalError);
     }
 }
 
@@ -1547,11 +1539,8 @@ Foam::label Foam::triSurfaceTools::oppositeEdge
         }
     }
 
-    FatalErrorIn
-    (
-        "oppositeEdge"
-        "(const triSurface&, const label, const label)"
-    )   << "Cannot find vertex " << vertI << " in edges of face " << faceI
+    FatalErrorInFunction
+        << "Cannot find vertex " << vertI << " in edges of face " << faceI
         << abort(FatalError);
 
     return -1;
@@ -1579,7 +1568,7 @@ Foam::label Foam::triSurfaceTools::oppositeVertex
         }
     }
 
-    FatalErrorIn("triSurfaceTools::oppositeVertex")
+    FatalErrorInFunction
         << "Cannot find vertex opposite edge " << edgeI << " vertices " << e
         << " in face " << faceI << " vertices " << f << abort(FatalError);
 
@@ -1622,12 +1611,8 @@ Foam::label Foam::triSurfaceTools::getTriangle
 {
     if ((e0I == e1I) || (e0I == e2I) || (e1I == e2I))
     {
-        FatalErrorIn
-        (
-            "getTriangle"
-            "(const triSurface&, const label, const label,"
-            " const label)"
-        )   << "Duplicate edge labels : e0:" << e0I << " e1:" << e1I
+        FatalErrorInFunction
+            << "Duplicate edge labels : e0:" << e0I << " e1:" << e1I
             << " e2:" << e2I
             << abort(FatalError);
     }
@@ -1693,7 +1678,7 @@ Foam::triSurface Foam::triSurfaceTools::collapseEdges
     //
     //    if ((neighbours.size() != 2) && (neighbours.size() != 1))
     //    {
-    //        FatalErrorIn("collapseEdges")
+    //        FatalErrorInFunction
     //            << abort(FatalError);
     //    }
     //
@@ -1747,7 +1732,7 @@ Foam::triSurface Foam::triSurfaceTools::collapseEdges
 
         if ((edgeI < 0) || (edgeI >= surf.nEdges()))
         {
-            FatalErrorIn("collapseEdges")
+            FatalErrorInFunction
                 << "Edge label outside valid range." << endl
                 << "edge label:" << edgeI << endl
                 << "total number of edges:" << surf.nEdges() << endl
@@ -1777,7 +1762,7 @@ Foam::triSurface Foam::triSurfaceTools::collapseEdges
                  || (pointMap[e.end()] != e.end())
                 )
                 {
-                    FatalErrorIn("collapseEdges")
+                    FatalErrorInFunction
                         << "points already mapped. Double collapse." << endl
                         << "edgeI:" << edgeI
                         << "  start:" << e.start()
@@ -2224,7 +2209,7 @@ Foam::triSurfaceTools::sideType Foam::triSurfaceTools::surfaceSide
 
         //     if (mag(c) < 0.99)
         //     {
-        //         FatalErrorIn("triSurfaceTools::surfaceSide")
+        //         FatalErrorInFunction
         //             << "nearestPoint identified as being on triangle face "
         //             << "but vector from nearestPoint to sample is not "
         //             << "perpendicular to the normal." << nl
@@ -2274,7 +2259,7 @@ Foam::triSurfaceTools::sideType Foam::triSurfaceTools::surfaceSide
         //     != edge(f[nearLabel], f[f.fcIndex(nearLabel)])
         //    )
         //    {
-        //        FatalErrorIn("triSurfaceTools::surfaceSide")
+        //        FatalErrorInFunction
         //            << "Edge:" << edgeI << " local vertices:" << e
         //            << " mesh vertices:" << meshEdge
         //            << " not at position " << nearLabel
@@ -2335,7 +2320,7 @@ Foam::triSurfaceTools::sideType Foam::triSurfaceTools::surfaceSide
 
         if (minEdgeI == -1)
         {
-            FatalErrorIn("treeDataTriSurface::getSide")
+            FatalErrorInFunction
                 << "Problem: did not find edge closer than " << minDistSqr
                 << abort(FatalError);
         }
@@ -2565,7 +2550,7 @@ Foam::triSurface Foam::triSurfaceTools::delaunay2D(const List<vector2D>& pts)
 
     if (err != 0)
     {
-        FatalErrorIn("triSurfaceTools::delaunay2D(const List<vector2D>&)")
+        FatalErrorInFunction
             << "Failed dtris2 with vertices:" << pts.size()
             << abort(FatalError);
     }
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index 73aea238d0..95b1701ea3 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -102,7 +102,7 @@ void Foam::twoDPointCorrector::calcAddressing() const
 
     if (mag(pn) < VSMALL)
     {
-        FatalErrorIn("twoDPointCorrector::calcAddressing()")
+        FatalErrorInFunction
             << "Cannot determine normal vector from patches."
             << abort(FatalError);
     }
@@ -148,7 +148,7 @@ void Foam::twoDPointCorrector::calcAddressing() const
     {
         if (meshPoints.size() % 2 != 0)
         {
-            WarningIn("twoDPointCorrector::calcAddressing()")
+            WarningInFunction
                 << "the number of vertices in the geometry "
                 << "is odd - this should not be the case for a 2-D case. "
                 << "Please check the geometry."
@@ -157,7 +157,7 @@ void Foam::twoDPointCorrector::calcAddressing() const
 
         if (2*nNormalEdges != meshPoints.size())
         {
-            WarningIn("twoDPointCorrector::calcAddressing()")
+            WarningInFunction
                 << "The number of points in the mesh is "
                 << "not equal to twice the number of edges normal to the plane "
                 << "- this may be OK only for wedge geometries.\n"
@@ -235,7 +235,7 @@ Foam::direction Foam::twoDPointCorrector::normalDir() const
     }
     else
     {
-        FatalErrorIn("direction twoDPointCorrector::normalDir() const")
+        FatalErrorInFunction
             << "Plane normal not aligned with the coordinate system" << nl
             << "    pn = " << pn
             << abort(FatalError);
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 603ee5277b..bee297a6e9 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -29,11 +29,13 @@ wmakeMpiLib()
     do
     (
         WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
-        whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$FOAM_MPI"
-        whichscotch="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$SCOTCH_VERSION"
+        libDir="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName"
+        whichmpi="$libDir/using:$FOAM_MPI"
+        whichscotch="$libDir/using:$SCOTCH_VERSION"
         [ -e "$whichmpi" -a -e "$whichscotch" ] || wclean $libName
         echo "wmake $targetType $libName"
         wmake $targetType $libName
+        mkdir -p "$libDir"
         touch "$whichmpi" "$whichscotch"
     )
     done
@@ -50,6 +52,15 @@ then
 
     if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
     then
+        #- Bit of a hack: ptscotch 6 requires scotch linked as well as. Can be
+        #  removed once ptscotch declares dependency on scotch itself.
+        case "$SCOTCH_VERSION" in
+        scotch_6.*)
+            export LINK_FLAGS="-lscotch"
+            ;;
+        esac
+
+
         wmakeMpiLib ptscotchDecomp
     fi
 else
diff --git a/src/parallel/decompose/decompose/Make/files b/src/parallel/decompose/decompose/Make/files
index 2d0f959eae..5fabd38cce 100644
--- a/src/parallel/decompose/decompose/Make/files
+++ b/src/parallel/decompose/decompose/Make/files
@@ -1,3 +1,4 @@
+decompositionModel.C
 fvFieldDecomposer.C
 
 LIB = $(FOAM_LIBBIN)/libdecompose
diff --git a/src/parallel/decompose/decompose/Make/options b/src/parallel/decompose/decompose/Make/options
index 7a728f9dd7..6d9b2cd6e3 100644
--- a/src/parallel/decompose/decompose/Make/options
+++ b/src/parallel/decompose/decompose/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 LIB_LIBS = \
diff --git a/src/parallel/decompose/decompose/decompositionModel.C b/src/parallel/decompose/decompose/decompositionModel.C
new file mode 100644
index 0000000000..c4ff672485
--- /dev/null
+++ b/src/parallel/decompose/decompose/decompositionModel.C
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "decompositionModel.H"
+#include "polyMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(decompositionModel, 0);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionModel::decompositionModel
+(
+    const polyMesh& mesh,
+    const fileName& decompDictFile
+)
+:
+    MeshObject
+    <
+        polyMesh,
+        Foam::UpdateableMeshObject,
+        decompositionModel
+    >(mesh),
+    IOdictionary
+    (
+        selectIO
+        (
+            IOobject
+            (
+                "decomposeParDict",
+                mesh.time().system(),
+                mesh.local(),
+                mesh.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                false   //io.registerObject(),
+            ),
+            decompDictFile
+        )
+    )
+{}
+
+
+Foam::decompositionModel::decompositionModel
+(
+    const polyMesh& mesh,
+    const dictionary& dict,
+    const fileName& decompDictFile
+)
+:
+    MeshObject
+    <
+        polyMesh,
+        Foam::UpdateableMeshObject,
+        decompositionModel
+    >(mesh),
+    IOdictionary
+    (
+        selectIO
+        (
+            IOobject
+            (
+                "decomposeParDict",
+                mesh.time().system(),
+                mesh.local(),
+                mesh.db(),
+                (dict.size() ? IOobject::NO_READ : IOobject::MUST_READ),
+                IOobject::NO_WRITE,
+                false   //io.registerObject(),
+            ),
+            decompDictFile
+        ),
+        dict
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+const Foam::decompositionModel& Foam::decompositionModel::New
+(
+    const polyMesh& mesh,
+    const fileName& decompDictFile
+)
+{
+    return
+        MeshObject
+        <
+            polyMesh,
+            Foam::UpdateableMeshObject,
+            decompositionModel
+        >::New(mesh, decompDictFile);
+}
+
+
+const Foam::decompositionModel& Foam::decompositionModel::New
+(
+    const polyMesh& mesh,
+    const dictionary& dict,
+    const fileName& decompDictFile
+)
+{
+    return
+        MeshObject
+        <
+            polyMesh,
+            Foam::UpdateableMeshObject,
+            decompositionModel
+        >::New(mesh, dict, decompDictFile);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::IOobject Foam::decompositionModel::selectIO
+(
+    const IOobject& io,
+    const fileName& f
+)
+{
+    return
+    (
+        f.size()
+      ? IOobject        // construct from filePath instead
+        (
+            f,
+            io.db(),
+            io.readOpt(),
+            io.writeOpt(),
+            io.registerObject()
+        )
+     :  io
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompose/decompositionModel.H b/src/parallel/decompose/decompose/decompositionModel.H
new file mode 100644
index 0000000000..30a4b29514
--- /dev/null
+++ b/src/parallel/decompose/decompose/decompositionModel.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::decompositionModel
+
+Description
+    MeshObject wrapper of decompositionMethod
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef decompositionModel_H
+#define decompositionModel_H
+
+#include "IOdictionary.H"
+#include "MeshObject.H"
+#include "decompositionMethod.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class mapPolyMesh;
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                      Class decompositionModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class decompositionModel
+:
+    public MeshObject
+    <
+        polyMesh,
+        UpdateableMeshObject,
+        decompositionModel
+    >,
+    public IOdictionary
+{
+
+    // Private data
+
+        mutable autoPtr<decompositionMethod> decomposerPtr_;
+
+
+public:
+
+    // Declare name of the class and its debug switch
+    ClassName("decompositionModel");
+
+
+    // Selectors
+
+        //- Read (optionallly from absolute path) & register on mesh
+        static const decompositionModel& New
+        (
+            const polyMesh& mesh,
+            const fileName& decompDictFile = ""
+        );
+
+        //- Read (optionallly from supplied dictionary) & register on mesh
+        static const decompositionModel& New
+        (
+            const polyMesh& mesh,
+            const dictionary& dict,
+            const fileName& decompDictFile = ""
+        );
+
+
+    // Constructors
+
+        //- Construct from typeName or optional path to controlDictionary
+        decompositionModel(const polyMesh&, const fileName& = "");
+
+
+        //- Construct from typeName or optional path to controlDictionary
+        decompositionModel
+        (
+            const polyMesh&,
+            const dictionary& dict,
+            const fileName& = ""
+        );
+
+
+    // Member functions
+
+        decompositionMethod& decomposer() const
+        {
+            if (!decomposerPtr_.valid())
+            {
+                decomposerPtr_ = decompositionMethod::New(*this);
+            }
+            return decomposerPtr_();
+        }
+
+        //- Helper: return IOobject with optionally absolute path provided
+        static IOobject selectIO(const IOobject&, const fileName&);
+
+
+        // UpdateableMeshObject
+
+            virtual bool movePoints()
+            {
+                return false;
+            }
+
+            virtual void updateMesh(const mapPolyMesh&)
+            {}
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
index c72ceedfb8..fa3594d93a 100644
--- a/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerDecomposeFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ Foam::fvFieldDecomposer::decomposeField
         }
         else
         {
-            FatalErrorIn("fvFieldDecomposer::decomposeField()")
+            FatalErrorInFunction
                 << "Unknown type." << abort(FatalError);
         }
     }
@@ -307,7 +307,7 @@ Foam::fvFieldDecomposer::decomposeField
         }
         else
         {
-            FatalErrorIn("fvFieldDecomposer::decomposeField()")
+            FatalErrorInFunction
                 << "Unknown type." << abort(FatalError);
         }
     }
diff --git a/src/parallel/decompose/decompositionMethods/Make/files b/src/parallel/decompose/decompositionMethods/Make/files
index c2837d2eb3..2aef948ff7 100644
--- a/src/parallel/decompose/decompositionMethods/Make/files
+++ b/src/parallel/decompose/decompositionMethods/Make/files
@@ -7,4 +7,15 @@ multiLevelDecomp/multiLevelDecomp.C
 structuredDecomp/structuredDecomp.C
 noDecomp/noDecomp.C
 
+
+decompositionConstraints = decompositionConstraints
+
+$(decompositionConstraints)/decompositionConstraint/decompositionConstraint.C
+$(decompositionConstraints)/preserveBaffles/preserveBafflesConstraint.C
+$(decompositionConstraints)/preserveFaceZones/preserveFaceZonesConstraint.C
+$(decompositionConstraints)/preservePatches/preservePatchesConstraint.C
+$(decompositionConstraints)/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C
+$(decompositionConstraints)/refinementHistory/refinementHistoryConstraint.C
+
+
 LIB = $(FOAM_LIBBIN)/libdecompositionMethods
diff --git a/src/parallel/decompose/decompositionMethods/Make/options b/src/parallel/decompose/decompositionMethods/Make/options
index f3070a731e..45133caabb 100644
--- a/src/parallel/decompose/decompositionMethods/Make/options
+++ b/src/parallel/decompose/decompositionMethods/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
     -lmeshTools \
+    -ldynamicMesh \
     -lfiniteVolume
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
new file mode 100644
index 0000000000..8faed6fd9e
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "decompositionConstraint.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(decompositionConstraint, 1);
+defineRunTimeSelectionTable(decompositionConstraint, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionConstraint::decompositionConstraint
+(
+    const dictionary& constraintsDict,
+    const word& type
+)
+:
+    //coeffDict_(constraintsDict.subOrEmptyDict(type + "Coeffs"))
+    coeffDict_(constraintsDict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::decompositionConstraint>
+Foam::decompositionConstraint::New
+(
+    const dictionary& dict,
+    const word& modelType
+)
+{
+    Info<< "Selecting decompositionConstraint " << modelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalIOErrorInFunction(dict)
+            << "Unknown decompositionConstraint type "
+            << modelType << nl << nl
+            << "Valid decompositionConstraint types:" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalIOError);
+    }
+
+    return autoPtr<decompositionConstraint>
+    (
+        cstrIter()(dict, modelType)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::decompositionConstraint::~decompositionConstraint()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.H b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.H
new file mode 100644
index 0000000000..e06f7a07da
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::decompositionConstraint
+
+Description
+
+SourceFiles
+    decompositionConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef decompositionConstraint_H
+#define decompositionConstraint_H
+
+#include "dictionary.H"
+#include "runTimeSelectionTables.H"
+#include "boolList.H"
+#include "labelList.H"
+#include "labelPair.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                Class decompositionConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class decompositionConstraint
+{
+protected:
+
+    // Protected data
+
+        //- Model coefficients dictionary
+        dictionary coeffDict_;
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        decompositionConstraint(const decompositionConstraint&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const decompositionConstraint&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("decompositionConstraint");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            decompositionConstraint,
+            dictionary,
+            (
+                const dictionary& constraintsDict,
+                const word& type
+            ),
+            (constraintsDict, type)
+        );
+
+
+    // Constructors
+
+        //- Construct with generic dictionary with optional entry for type
+        decompositionConstraint
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+    // Selectors
+
+        //- Return a reference to the selected decompositionConstraint
+        static autoPtr<decompositionConstraint> New
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~decompositionConstraint();
+
+
+    // Member Functions
+
+        //- Add my constraints to list of constraints
+        virtual void add
+        (
+            const polyMesh& mesh,
+            boolList& blockedFace,
+            PtrList<labelList>& specifiedProcessorFaces,
+            labelList& specifiedProcessor,
+            List<labelPair>& explicitConnections
+        ) const = 0;
+
+        //- Apply any additional post-decomposition constraints. Usually no
+        //  need to do anything since decomposition method should have already
+        //  obeyed the constraints
+        virtual void apply
+        (
+            const polyMesh& mesh,
+            const boolList& blockedFace,
+            const PtrList<labelList>& specifiedProcessorFaces,
+            const labelList& specifiedProcessor,
+            const List<labelPair>& explicitConnections,
+            labelList& decomposition
+        ) const
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveBaffles/preserveBafflesConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveBaffles/preserveBafflesConstraint.C
new file mode 100644
index 0000000000..0601af2299
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveBaffles/preserveBafflesConstraint.C
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "preserveBafflesConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+#include "syncTools.H"
+#include "localPointRegion.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace decompositionConstraints
+{
+defineTypeName(preserveBafflesConstraint);
+addToRunTimeSelectionTable
+(
+    decompositionConstraint,
+    preserveBafflesConstraint,
+    dictionary
+);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionConstraints::preserveBafflesConstraint::
+preserveBafflesConstraint
+(
+    const dictionary& constraintsDict,
+    const word& modelType
+)
+:
+    decompositionConstraint(constraintsDict, typeName)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : setting constraints to preserve baffles"
+            //<< returnReduce(bafflePairs.size(), sumOp<label>())
+            << endl;
+    }
+}
+
+
+Foam::decompositionConstraints::preserveBafflesConstraint::
+preserveBafflesConstraint()
+:
+    decompositionConstraint(dictionary(), typeName)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : setting constraints to preserve baffles"
+            //<< returnReduce(bafflePairs.size(), sumOp<label>())
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::decompositionConstraints::preserveBafflesConstraint::add
+(
+    const polyMesh& mesh,
+    boolList& blockedFace,
+    PtrList<labelList>& specifiedProcessorFaces,
+    labelList& specifiedProcessor,
+    List<labelPair>& explicitConnections
+) const
+{
+    const labelPairList bafflePairs
+    (
+        localPointRegion::findDuplicateFacePairs(mesh)
+    );
+
+    if (decompositionConstraint::debug & 2)
+    {
+        Info<< type() << " : setting constraints to preserve "
+            << returnReduce(bafflePairs.size(), sumOp<label>())
+            << " baffles" << endl;
+    }
+
+
+    // Merge into explicitConnections
+    {
+        // Convert into face-to-face addressing
+        labelList faceToFace(mesh.nFaces(), -1);
+        forAll(explicitConnections, i)
+        {
+            const labelPair& p = explicitConnections[i];
+            faceToFace[p[0]] = p[1];
+            faceToFace[p[1]] = p[0];
+        }
+
+        // Merge in bafflePairs
+        forAll(bafflePairs, i)
+        {
+            const labelPair& p = bafflePairs[i];
+
+            if (faceToFace[p[0]] == -1 && faceToFace[p[1]] == -1)
+            {
+                faceToFace[p[0]] = p[1];
+                faceToFace[p[1]] = p[0];
+            }
+            else if (labelPair::compare(p, labelPair(p[0], faceToFace[p[0]])))
+            {
+                // Connection already present
+            }
+            else
+            {
+                label p0Slave = faceToFace[p[0]];
+                label p1Slave = faceToFace[p[1]];
+                IOWarningInFunction(coeffDict_)
+                    << "When adding baffle between faces "
+                    << p[0] << " at " << mesh.faceCentres()[p[0]]
+                    << " and "
+                    << p[1] << " at " << mesh.faceCentres()[p[1]]
+                    << " : face " << p[0] << " already is connected to face "
+                    << p0Slave << " at " << mesh.faceCentres()[p0Slave]
+                    << " and face " << p[1] << " already is connected to face "
+                    << p1Slave << " at " << mesh.faceCentres()[p1Slave]
+                    << endl;
+            }
+        }
+
+        // Convert back into labelPairList
+        label n = 0;
+        forAll(faceToFace, faceI)
+        {
+            label otherFaceI = faceToFace[faceI];
+            if (otherFaceI != -1 && faceI < otherFaceI)
+            {
+                // I am master of slave
+                n++;
+            }
+        }
+        explicitConnections.setSize(n);
+        n = 0;
+        forAll(faceToFace, faceI)
+        {
+            label otherFaceI = faceToFace[faceI];
+            if (otherFaceI != -1 && faceI < otherFaceI)
+            {
+                explicitConnections[n++] = labelPair(faceI, otherFaceI);
+            }
+        }
+    }
+
+    // Make sure blockedFace is uptodate
+    blockedFace.setSize(mesh.nFaces(), true);
+    forAll(explicitConnections, i)
+    {
+        blockedFace[explicitConnections[i].first()] = false;
+        blockedFace[explicitConnections[i].second()] = false;
+    }
+    syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
+}
+
+
+void Foam::decompositionConstraints::preserveBafflesConstraint::apply
+(
+    const polyMesh& mesh,
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+) const
+{
+    const labelPairList bafflePairs
+    (
+        localPointRegion::findDuplicateFacePairs(mesh)
+    );
+
+    label nChanged = 0;
+
+    forAll(bafflePairs, i)
+    {
+        const labelPair& baffle = bafflePairs[i];
+        label f0 = baffle.first();
+        label f1 = baffle.second();
+
+        const label procI = decomposition[mesh.faceOwner()[f0]];
+
+        if (mesh.isInternalFace(f0))
+        {
+            label nei0 = mesh.faceNeighbour()[f0];
+            if (decomposition[nei0] != procI)
+            {
+                decomposition[nei0] = procI;
+                nChanged++;
+            }
+        }
+
+        label own1 = mesh.faceOwner()[f1];
+        if (decomposition[own1] != procI)
+        {
+            decomposition[own1] = procI;
+            nChanged++;
+        }
+        if (mesh.isInternalFace(f1))
+        {
+            label nei1 = mesh.faceNeighbour()[f1];
+            if (decomposition[nei1] != procI)
+            {
+                decomposition[nei1] = procI;
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nChanged, sumOp<label>());
+        Info<< type() << " : changed decomposition on " << nChanged
+            << " cells" << endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveBaffles/preserveBafflesConstraint.H b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveBaffles/preserveBafflesConstraint.H
new file mode 100644
index 0000000000..ea6fcbfb38
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveBaffles/preserveBafflesConstraint.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::preserveBafflesConstraint
+
+Description
+    Detects baffles and keeps owner and neighbour on same processor.
+
+SourceFiles
+    preserveBafflesConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef preserveBafflesConstraint_H
+#define preserveBafflesConstraint_H
+
+#include "decompositionConstraint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace decompositionConstraints
+{
+
+/*---------------------------------------------------------------------------*\
+                Class preserveBafflesConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class preserveBafflesConstraint
+:
+    public decompositionConstraint
+{
+    // Private data
+
+public:
+
+    //- Runtime type information
+    TypeName("preserveBaffles");
+
+
+    // Constructors
+
+        //- Construct with generic dictionary with optional entry for type
+        preserveBafflesConstraint
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+        //- Construct from components
+        preserveBafflesConstraint();
+
+
+    //- Destructor
+    virtual ~preserveBafflesConstraint()
+    {}
+
+
+    // Member Functions
+
+        //- Add my constraints to list of constraints
+        virtual void add
+        (
+            const polyMesh& mesh,
+            boolList& blockedFace,
+            PtrList<labelList>& specifiedProcessorFaces,
+            labelList& specifiedProcessor,
+            List<labelPair>& explicitConnections
+        ) const;
+
+        //- Apply any additional post-decomposition constraints
+        virtual void apply
+        (
+            const polyMesh& mesh,
+            const boolList& blockedFace,
+            const PtrList<labelList>& specifiedProcessorFaces,
+            const labelList& specifiedProcessor,
+            const List<labelPair>& explicitConnections,
+            labelList& decomposition
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace decompositionConstraints
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
new file mode 100644
index 0000000000..fbc22df250
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.C
@@ -0,0 +1,215 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "preserveFaceZonesConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+#include "syncTools.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace decompositionConstraints
+{
+defineTypeName(preserveFaceZonesConstraint);
+addToRunTimeSelectionTable
+(
+    decompositionConstraint,
+    preserveFaceZonesConstraint,
+    dictionary
+);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionConstraints::preserveFaceZonesConstraint::
+preserveFaceZonesConstraint
+(
+    const dictionary& constraintsDict,
+    const word& modelType
+)
+:
+    decompositionConstraint(constraintsDict, typeName),
+    zones_(coeffDict_.lookup("zones"))
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : adding constraints to keep owner and neighbour"
+            << " of faces in zones " << zones_
+            << " on same processor" << endl;
+    }
+}
+
+
+Foam::decompositionConstraints::preserveFaceZonesConstraint::
+preserveFaceZonesConstraint
+(
+    const wordReList& zones
+)
+:
+    decompositionConstraint(dictionary(), typeName),
+    zones_(zones)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : adding constraints to keep owner and neighbour"
+            << " of faces in zones " << zones_
+            << " on same processor" << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::decompositionConstraints::preserveFaceZonesConstraint::add
+(
+    const polyMesh& mesh,
+    boolList& blockedFace,
+    PtrList<labelList>& specifiedProcessorFaces,
+    labelList& specifiedProcessor,
+    List<labelPair>& explicitConnections
+) const
+{
+    blockedFace.setSize(mesh.nFaces(), true);
+
+    const faceZoneMesh& fZones = mesh.faceZones();
+
+    const labelList zoneIDs = findStrings(zones_, fZones.names());
+
+    label nUnblocked = 0;
+
+    forAll(zoneIDs, i)
+    {
+        const faceZone& fz = fZones[zoneIDs[i]];
+
+        forAll(fz, i)
+        {
+            if (blockedFace[fz[i]])
+            {
+                blockedFace[fz[i]] = false;
+                nUnblocked++;
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nUnblocked, sumOp<label>());
+        Info<< type() << " : unblocked " << nUnblocked << " faces" << endl;
+    }
+
+    syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
+}
+
+
+void Foam::decompositionConstraints::preserveFaceZonesConstraint::apply
+(
+    const polyMesh& mesh,
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+) const
+{
+    // If the decomposition has not enforced the constraint do it over
+    // here.
+
+
+    // Synchronise decomposition on boundary
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    labelList destProc(mesh.nFaces()-mesh.nInternalFaces(), labelMax);
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+
+        const labelUList& faceCells = pp.faceCells();
+
+        forAll(faceCells, i)
+        {
+            label bFaceI = pp.start()+i-mesh.nInternalFaces();
+            destProc[bFaceI] = decomposition[faceCells[i]];
+        }
+    }
+
+    syncTools::syncBoundaryFaceList(mesh, destProc, minEqOp<label>());
+
+
+    // Override if differing
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    const faceZoneMesh& fZones = mesh.faceZones();
+
+    const labelList zoneIDs = findStrings(zones_, fZones.names());
+
+    label nChanged = 0;
+
+    forAll(zoneIDs, i)
+    {
+        const faceZone& fz = fZones[zoneIDs[i]];
+
+        forAll(fz, i)
+        {
+            label faceI = fz[i];
+
+            label own = mesh.faceOwner()[faceI];
+
+            if (mesh.isInternalFace(faceI))
+            {
+                label nei = mesh.faceNeighbour()[faceI];
+                if (decomposition[own] != decomposition[nei])
+                {
+                    decomposition[nei] = decomposition[own];
+                    nChanged++;
+                }
+            }
+            else
+            {
+                label bFaceI = faceI-mesh.nInternalFaces();
+                if (decomposition[own] != destProc[bFaceI])
+                {
+                    decomposition[own] = destProc[bFaceI];
+                    nChanged++;
+                }
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nChanged, sumOp<label>());
+        Info<< type() << " : changed decomposition on " << nChanged
+            << " cells" << endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.H b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.H
new file mode 100644
index 0000000000..0f98d9a634
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preserveFaceZones/preserveFaceZonesConstraint.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::preserveFaceZonesConstraint
+
+Description
+    Constraint to keep/move owner and neighbour of faceZone onto same
+    processor.
+
+SourceFiles
+    preserveFaceZonesConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef preserveFaceZonesConstraint_H
+#define preserveFaceZonesConstraint_H
+
+#include "decompositionConstraint.H"
+#include "wordReList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace decompositionConstraints
+{
+
+/*---------------------------------------------------------------------------*\
+                Class preserveFaceZonesConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class preserveFaceZonesConstraint
+:
+    public decompositionConstraint
+{
+    // Private data
+
+        //- List of zones to keep together
+        wordReList zones_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("preserveFaceZones");
+
+
+    // Constructors
+
+        //- Construct with generic dictionary with optional entry for type
+        preserveFaceZonesConstraint
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+        //- Construct from components
+        preserveFaceZonesConstraint(const wordReList& zones);
+
+
+    //- Destructor
+    virtual ~preserveFaceZonesConstraint()
+    {}
+
+
+    // Member Functions
+
+        //- Add my constraints to list of constraints
+        virtual void add
+        (
+            const polyMesh& mesh,
+            boolList& blockedFace,
+            PtrList<labelList>& specifiedProcessorFaces,
+            labelList& specifiedProcessor,
+            List<labelPair>& explicitConnections
+        ) const;
+
+        //- Apply any additional post-decomposition constraints
+        virtual void apply
+        (
+            const polyMesh& mesh,
+            const boolList& blockedFace,
+            const PtrList<labelList>& specifiedProcessorFaces,
+            const labelList& specifiedProcessor,
+            const List<labelPair>& explicitConnections,
+            labelList& decomposition
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace decompositionConstraints
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C
new file mode 100644
index 0000000000..d7918b0ea8
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.C
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "preservePatchesConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+#include "syncTools.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace decompositionConstraints
+{
+defineTypeName(preservePatchesConstraint);
+addToRunTimeSelectionTable
+(
+    decompositionConstraint,
+    preservePatchesConstraint,
+    dictionary
+);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionConstraints::preservePatchesConstraint::
+preservePatchesConstraint
+(
+    const dictionary& constraintsDict,
+    const word& modelType
+)
+:
+    decompositionConstraint(constraintsDict, typeName),
+    patches_(coeffDict_.lookup("patches"))
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : adding constraints to keep owner of faces"
+            << " in patches " << patches_
+            << " on same processor. This only makes sense for cyclics." << endl;
+    }
+}
+
+
+Foam::decompositionConstraints::preservePatchesConstraint::
+preservePatchesConstraint
+(
+    const wordReList& patches
+)
+:
+    decompositionConstraint(dictionary(), typeName),
+    patches_(patches)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : adding constraints to keep owner of faces"
+            << " in patches " << patches_
+            << " on same processor. This only makes sense for cyclics." << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::decompositionConstraints::preservePatchesConstraint::add
+(
+    const polyMesh& mesh,
+    boolList& blockedFace,
+    PtrList<labelList>& specifiedProcessorFaces,
+    labelList& specifiedProcessor,
+    List<labelPair>& explicitConnections
+) const
+{
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    blockedFace.setSize(mesh.nFaces(), true);
+
+    const labelList patchIDs(pbm.patchSet(patches_).sortedToc());
+
+    label nUnblocked = 0;
+
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = pbm[patchIDs[i]];
+
+        forAll(pp, i)
+        {
+            if (blockedFace[pp.start() + i])
+            {
+                blockedFace[pp.start() + i] = false;
+                nUnblocked++;
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nUnblocked, sumOp<label>());
+        Info<< type() << " : unblocked " << nUnblocked << " faces" << endl;
+    }
+
+    syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
+}
+
+
+void Foam::decompositionConstraints::preservePatchesConstraint::apply
+(
+    const polyMesh& mesh,
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+) const
+{
+    // If the decomposition has not enforced the constraint do it over
+    // here.
+
+    // Synchronise decomposition on patchIDs
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    labelList destProc(mesh.nFaces()-mesh.nInternalFaces(), labelMax);
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+
+        const labelUList& faceCells = pp.faceCells();
+
+        forAll(faceCells, i)
+        {
+            label bFaceI = pp.start()+i-mesh.nInternalFaces();
+            destProc[bFaceI] = decomposition[faceCells[i]];
+        }
+    }
+
+    syncTools::syncBoundaryFaceList(mesh, destProc, minEqOp<label>());
+
+
+    // Override if differing
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    const labelList patchIDs(pbm.patchSet(patches_).sortedToc());
+
+    label nChanged = 0;
+
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = pbm[patchIDs[i]];
+
+        const labelUList& faceCells = pp.faceCells();
+
+        forAll(faceCells, i)
+        {
+            label bFaceI = pp.start()+i-mesh.nInternalFaces();
+
+            if (decomposition[faceCells[i]] != destProc[bFaceI])
+            {
+                decomposition[faceCells[i]] = destProc[bFaceI];
+                nChanged++;
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nChanged, sumOp<label>());
+        Info<< type() << " : changed decomposition on " << nChanged
+            << " cells" << endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.H b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.H
new file mode 100644
index 0000000000..6b69a19ced
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/preservePatches/preservePatchesConstraint.H
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::preservePatchesConstraint
+
+Description
+    Constraint to keep owner and neighbour of (cyclic) patch on same
+    processor.
+
+SourceFiles
+    preservePatchesConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef preservePatchesConstraint_H
+#define preservePatchesConstraint_H
+
+#include "decompositionConstraint.H"
+#include "wordReList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace decompositionConstraints
+{
+
+/*---------------------------------------------------------------------------*\
+                Class preservePatchesConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class preservePatchesConstraint
+:
+    public decompositionConstraint
+{
+    // Private data
+
+        //- List of patches to keep together
+        wordReList patches_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("preservePatches");
+
+
+    // Constructors
+
+        //- Construct with generic dictionary with optional entry for type
+        preservePatchesConstraint
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+        //- Construct from components
+        preservePatchesConstraint(const wordReList& patches);
+
+
+
+    //- Destructor
+    virtual ~preservePatchesConstraint()
+    {}
+
+
+    // Member Functions
+
+        //- Add my constraints to list of constraints
+        virtual void add
+        (
+            const polyMesh& mesh,
+            boolList& blockedFace,
+            PtrList<labelList>& specifiedProcessorFaces,
+            labelList& specifiedProcessor,
+            List<labelPair>& explicitConnections
+        ) const;
+
+        //- Apply any additional post-decomposition constraints
+        virtual void apply
+        (
+            const polyMesh& mesh,
+            const boolList& blockedFace,
+            const PtrList<labelList>& specifiedProcessorFaces,
+            const labelList& specifiedProcessor,
+            const List<labelPair>& explicitConnections,
+            labelList& decomposition
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace decompositionConstraints
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
new file mode 100644
index 0000000000..25339a852b
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
@@ -0,0 +1,211 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "refinementHistoryConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+#include "syncTools.H"
+#include "refinementHistory.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeName(refinementHistoryConstraint);
+addToRunTimeSelectionTable
+(
+    decompositionConstraint,
+    refinementHistoryConstraint,
+    dictionary
+);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::refinementHistoryConstraint::refinementHistoryConstraint
+(
+    const dictionary& constraintsDict,
+    const word& modelType
+)
+:
+    decompositionConstraint(constraintsDict, typeName)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : setting constraints to preserve refinement history"
+            << endl;
+    }
+}
+
+
+Foam::refinementHistoryConstraint::refinementHistoryConstraint()
+:
+    decompositionConstraint(dictionary(), typeName)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type() << " : setting constraints to refinement history"
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::refinementHistoryConstraint::add
+(
+    const polyMesh& mesh,
+    boolList& blockedFace,
+    PtrList<labelList>& specifiedProcessorFaces,
+    labelList& specifiedProcessor,
+    List<labelPair>& explicitConnections
+) const
+{
+    autoPtr<const refinementHistory> storagePtr;
+    refinementHistory const* refPtr = NULL;
+
+    if (mesh.foundObject<refinementHistory>("refinementHistory"))
+    {
+        if (decompositionConstraint::debug)
+        {
+            Info<< type() << " : found refinementHistory" << endl;
+        }
+        refPtr = &mesh.lookupObject<refinementHistory>("refinementHistory");
+    }
+    else
+    {
+        if (decompositionConstraint::debug)
+        {
+            Info<< type() << " : reading refinementHistory from time "
+                << mesh.facesInstance() << endl;
+        }
+        storagePtr.reset
+        (
+            new refinementHistory
+            (
+                IOobject
+                (
+                    "refinementHistory",
+                    mesh.facesInstance(),
+                    polyMesh::meshSubDir,
+                    mesh,
+                    IOobject::READ_IF_PRESENT,
+                    IOobject::NO_WRITE
+                ),
+                mesh.nCells()
+            )
+        );
+    }
+
+    const refinementHistory& history =
+    (
+        storagePtr.valid()
+      ? storagePtr()
+      : *refPtr
+    );
+
+    if (history.active())
+    {
+        // refinementHistory itself implements decompositionConstraint
+        history.add
+        (
+            blockedFace,
+            specifiedProcessorFaces,
+            specifiedProcessor,
+            explicitConnections
+        );
+    }
+}
+
+
+void Foam::refinementHistoryConstraint::apply
+(
+    const polyMesh& mesh,
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+) const
+{
+    autoPtr<const refinementHistory> storagePtr;
+    refinementHistory const* refPtr = NULL;
+
+    if (mesh.foundObject<refinementHistory>("refinementHistory"))
+    {
+        //if (decompositionConstraint::debug)
+        //{
+        //    Info<< type() << " : found refinementHistory" << endl;
+        //}
+        refPtr = &mesh.lookupObject<refinementHistory>("refinementHistory");
+    }
+    else
+    {
+        //if (decompositionConstraint::debug)
+        //{
+        //    Info<< type() << " : reading refinementHistory from time "
+        //        << mesh.facesInstance() << endl;
+        //}
+        storagePtr.reset
+        (
+            new refinementHistory
+            (
+                IOobject
+                (
+                    "refinementHistory",
+                    mesh.facesInstance(),
+                    polyMesh::meshSubDir,
+                    mesh,
+                    IOobject::READ_IF_PRESENT,
+                    IOobject::NO_WRITE
+                ),
+                mesh.nCells()
+            )
+        );
+    }
+
+    const refinementHistory& history =
+    (
+        storagePtr.valid()
+      ? storagePtr()
+      : *refPtr
+    );
+
+    if (history.active())
+    {
+        // refinementHistory itself implements decompositionConstraint
+        history.apply
+        (
+            blockedFace,
+            specifiedProcessorFaces,
+            specifiedProcessor,
+            explicitConnections,
+            decomposition
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.H b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.H
new file mode 100644
index 0000000000..92ff3aa8b3
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::refinementHistoryConstraint
+
+Description
+    Constraint to keep all cells originating from refining the same cell
+    onto the same processor. Reads polyMesh/refinementHistory.
+
+SourceFiles
+    refinementHistoryConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef refinementHistoryConstraint_H
+#define refinementHistoryConstraint_H
+
+#include "decompositionConstraint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+
+/*---------------------------------------------------------------------------*\
+                Class refinementHistoryConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class refinementHistoryConstraint
+:
+    public decompositionConstraint
+{
+    // Private data
+
+public:
+
+    //- Runtime type information
+    TypeName("refinementHistory");
+
+
+    // Constructors
+
+        //- Construct with generic dictionary with optional entry for type
+        refinementHistoryConstraint
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+        //- Construct from components
+        refinementHistoryConstraint();
+
+
+    //- Destructor
+    virtual ~refinementHistoryConstraint()
+    {}
+
+
+    // Member Functions
+
+        //- Add my constraints to list of constraints
+        virtual void add
+        (
+            const polyMesh& mesh,
+            boolList& blockedFace,
+            PtrList<labelList>& specifiedProcessorFaces,
+            labelList& specifiedProcessor,
+            List<labelPair>& explicitConnections
+        ) const;
+
+        //- Apply any additional post-decomposition constraints
+        virtual void apply
+        (
+            const polyMesh& mesh,
+            const boolList& blockedFace,
+            const PtrList<labelList>& specifiedProcessorFaces,
+            const labelList& specifiedProcessor,
+            const List<labelPair>& explicitConnections,
+            labelList& decomposition
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C
new file mode 100644
index 0000000000..d0e6e2cab7
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.C
@@ -0,0 +1,318 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "singleProcessorFaceSetsConstraint.H"
+#include "addToRunTimeSelectionTable.H"
+#include "syncTools.H"
+#include "faceSet.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace decompositionConstraints
+{
+defineTypeName(singleProcessorFaceSetsConstraint);
+addToRunTimeSelectionTable
+(
+    decompositionConstraint,
+    singleProcessorFaceSetsConstraint,
+    dictionary
+);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionConstraints::singleProcessorFaceSetsConstraint::
+singleProcessorFaceSetsConstraint
+(
+    const dictionary& constraintsDict,
+    const word& modelType
+)
+:
+    decompositionConstraint(constraintsDict, typeName),
+    setNameAndProcs_(coeffDict_.lookup("singleProcessorFaceSets"))
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type()
+            << " : adding constraints to keep" << endl;
+
+        forAll(setNameAndProcs_, setI)
+        {
+            Info<< "    all cells connected to faceSet "
+                << setNameAndProcs_[setI].first()
+                << " on processor " << setNameAndProcs_[setI].second() << endl;
+        }
+    }
+}
+
+
+Foam::decompositionConstraints::singleProcessorFaceSetsConstraint::
+singleProcessorFaceSetsConstraint
+(
+    const List<Tuple2<word, label> >& setNameAndProcs
+)
+:
+    decompositionConstraint(dictionary(), typeName),
+    setNameAndProcs_(setNameAndProcs)
+{
+    if (decompositionConstraint::debug)
+    {
+        Info<< type()
+            << " : adding constraints to keep" << endl;
+
+        forAll(setNameAndProcs_, setI)
+        {
+            Info<< "    all cells connected to faceSet "
+                << setNameAndProcs_[setI].first()
+                << " on processor " << setNameAndProcs_[setI].second() << endl;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::decompositionConstraints::singleProcessorFaceSetsConstraint::add
+(
+    const polyMesh& mesh,
+    boolList& blockedFace,
+    PtrList<labelList>& specifiedProcessorFaces,
+    labelList& specifiedProcessor,
+    List<labelPair>& explicitConnections
+) const
+{
+    blockedFace.setSize(mesh.nFaces(), true);
+
+    // Mark faces already in set
+    labelList faceToSet(mesh.nFaces(), -1);
+    forAll(specifiedProcessorFaces, setI)
+    {
+        const labelList& faceLabels = specifiedProcessorFaces[setI];
+        forAll(faceLabels, i)
+        {
+            faceToSet[faceLabels[i]] = setI;
+        }
+    }
+
+
+    forAll(setNameAndProcs_, setI)
+    {
+        //Info<< "Keeping all cells connected to faceSet "
+        //    << setNameAndProcs_[setI].first()
+        //    << " on processor " << setNameAndProcs_[setI].second() << endl;
+
+        const label destProcI = setNameAndProcs_[setI].second();
+
+        // Read faceSet
+        const faceSet fz(mesh, setNameAndProcs_[setI].first());
+
+        // Check that it does not overlap with existing specifiedProcessorFaces
+        labelList nMatch(specifiedProcessorFaces.size(), 0);
+        forAllConstIter(faceSet, fz, iter)
+        {
+            label setI = faceToSet[iter.key()];
+            if (setI != -1)
+            {
+                nMatch[setI]++;
+            }
+        }
+
+
+        // Only store if all faces are not yet in specifiedProcessorFaces
+        // (on all processors)
+        bool store = true;
+
+        forAll(nMatch, setI)
+        {
+            if (nMatch[setI] == fz.size())
+            {
+                // full match
+                store = false;
+                break;
+            }
+            else if (nMatch[setI] > 0)
+            {
+                // partial match
+                store = false;
+                break;
+            }
+        }
+
+        reduce(store, andOp<bool>());
+
+
+        if (store)
+        {
+            specifiedProcessorFaces.append(new labelList(fz.sortedToc()));
+            specifiedProcessor.append(destProcI);
+        }
+    }
+
+
+    // Unblock all point connected faces
+    // 1. Mark all points on specifiedProcessorFaces
+    boolList procFacePoint(mesh.nPoints(), false);
+    forAll(specifiedProcessorFaces, setI)
+    {
+        const labelList& set = specifiedProcessorFaces[setI];
+        forAll(set, fI)
+        {
+            const face& f = mesh.faces()[set[fI]];
+            forAll(f, fp)
+            {
+                procFacePoint[f[fp]] = true;
+            }
+        }
+    }
+    syncTools::syncPointList(mesh, procFacePoint, orEqOp<bool>(), false);
+
+    // 2. Unblock all faces on procFacePoint
+
+    label nUnblocked = 0;
+
+    forAll(procFacePoint, pointI)
+    {
+        if (procFacePoint[pointI])
+        {
+            const labelList& pFaces = mesh.pointFaces()[pointI];
+            forAll(pFaces, i)
+            {
+                if (blockedFace[pFaces[i]])
+                {
+                    blockedFace[pFaces[i]] = false;
+                    nUnblocked++;
+                }
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nUnblocked, sumOp<label>());
+        Info<< type() << " : unblocked " << nUnblocked << " faces" << endl;
+    }
+
+    syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
+}
+
+
+void Foam::decompositionConstraints::singleProcessorFaceSetsConstraint::apply
+(
+    const polyMesh& mesh,
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+) const
+{
+    // For specifiedProcessorFaces rework the cellToProc to enforce
+    // all on one processor since we can't guarantee that the input
+    // to regionSplit was a single region.
+    // E.g. faceSet 'a' with the cells split into two regions
+    // by a notch formed by two walls
+    //
+    //          \   /
+    //           \ /
+    //    ---a----+-----a-----
+    //
+    //
+    // Note that reworking the cellToProc might make the decomposition
+    // unbalanced.
+    label nChanged = 0;
+
+    forAll(specifiedProcessorFaces, setI)
+    {
+        const labelList& set = specifiedProcessorFaces[setI];
+
+        // Get the processor to use for the set
+        label procI = specifiedProcessor[setI];
+        if (procI == -1)
+        {
+            // If no processor specified use the one from the
+            // 0th element
+            if (set.size())
+            {
+                procI = decomposition[mesh.faceOwner()[set[0]]];
+            }
+            reduce(procI, maxOp<label>());
+        }
+
+        // Get all points on the sets
+        boolList procFacePoint(mesh.nPoints(), false);
+        forAll(set, fI)
+        {
+            const face& f = mesh.faces()[set[fI]];
+            forAll(f, fp)
+            {
+                procFacePoint[f[fp]] = true;
+            }
+        }
+        syncTools::syncPointList(mesh, procFacePoint, orEqOp<bool>(), false);
+
+        // 2. Unblock all faces on procFacePoint
+        forAll(procFacePoint, pointI)
+        {
+            if (procFacePoint[pointI])
+            {
+                const labelList& pFaces = mesh.pointFaces()[pointI];
+                forAll(pFaces, i)
+                {
+                    label faceI = pFaces[i];
+
+                    label own = mesh.faceOwner()[faceI];
+                    if (decomposition[own] != procI)
+                    {
+                        decomposition[own] = procI;
+                        nChanged++;
+                    }
+                    if (mesh.isInternalFace(faceI))
+                    {
+                        label nei = mesh.faceNeighbour()[faceI];
+                        if (decomposition[nei] != procI)
+                        {
+                            decomposition[nei] = procI;
+                            nChanged++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (decompositionConstraint::debug & 2)
+    {
+        reduce(nChanged, sumOp<label>());
+        Info<< type() << " : changed decomposition on " << nChanged
+            << " cells" << endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.H b/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.H
new file mode 100644
index 0000000000..646e842459
--- /dev/null
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/singleProcessorFaceSets/singleProcessorFaceSetsConstraint.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::singleProcessorFaceSetsConstraint
+
+Description
+    Constraint to keep all cells connected to face or point of faceSet on
+    a single processor.
+
+SourceFiles
+    singleProcessorFaceSetsConstraint.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef singleProcessorFaceSetsConstraint_H
+#define singleProcessorFaceSetsConstraint_H
+
+#include "decompositionConstraint.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace decompositionConstraints
+{
+
+/*---------------------------------------------------------------------------*\
+                Class singleProcessorFaceSetsConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class singleProcessorFaceSetsConstraint
+:
+    public decompositionConstraint
+{
+    // Private data
+
+        //- List of faceSet+processor
+        List<Tuple2<word, label> > setNameAndProcs_;
+
+public:
+
+    //- Runtime type information
+    TypeName("singleProcessorFaceSets");
+
+
+    // Constructors
+
+        //- Construct with generic dictionary with optional entry for type
+        singleProcessorFaceSetsConstraint
+        (
+            const dictionary& constraintsDict,
+            const word& type
+        );
+
+        //- Construct from components
+        singleProcessorFaceSetsConstraint
+        (
+            const List<Tuple2<word, label> >& setNameAndProcs
+        );
+
+
+    //- Destructor
+    virtual ~singleProcessorFaceSetsConstraint()
+    {}
+
+
+    // Member Functions
+
+        //- Add my constraints to list of constraints
+        virtual void add
+        (
+            const polyMesh& mesh,
+            boolList& blockedFace,
+            PtrList<labelList>& specifiedProcessorFaces,
+            labelList& specifiedProcessor,
+            List<labelPair>& explicitConnections
+        ) const;
+
+        //- Apply any additional post-decomposition constraints
+        virtual void apply
+        (
+            const polyMesh& mesh,
+            const boolList& blockedFace,
+            const PtrList<labelList>& specifiedProcessorFaces,
+            const labelList& specifiedProcessor,
+            const List<labelPair>& explicitConnections,
+            labelList& decomposition
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace decompositionConstraints
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index ff2f3d6800..e668aba4a7 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,6 +36,11 @@ InClass
 #include "minData.H"
 #include "FaceCellWave.H"
 
+#include "preserveBafflesConstraint.H"
+#include "preservePatchesConstraint.H"
+#include "preserveFaceZonesConstraint.H"
+#include "singleProcessorFaceSetsConstraint.H"
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,6 +49,130 @@ namespace Foam
     defineRunTimeSelectionTable(decompositionMethod, dictionary);
 }
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::decompositionMethod::decompositionMethod
+(
+    const dictionary& decompositionDict
+)
+:
+    decompositionDict_(decompositionDict),
+    nProcessors_
+    (
+        readLabel(decompositionDict.lookup("numberOfSubdomains"))
+    )
+{
+    // Read any constraints
+    wordList constraintTypes_;
+    if (decompositionDict_.found("constraints"))
+    {
+        //PtrList<dictionary> constraintsList
+        //(
+        //    decompositionDict_.lookup("constraints")
+        //);
+        //forAll(constraintsList, i)
+        //{
+        //    const dictionary& dict = constraintsList[i];
+        const dictionary& constraintsList = decompositionDict_.subDict
+        (
+            "constraints"
+        );
+        forAllConstIter(dictionary, constraintsList, iter)
+        {
+            const dictionary& dict = iter().dict();
+
+            constraintTypes_.append(dict.lookup("type"));
+
+            constraints_.append
+            (
+                decompositionConstraint::New
+                (
+                    dict,
+                    constraintTypes_.last()
+                )
+            );
+        }
+    }
+
+    // Backwards compatibility
+    if
+    (
+        decompositionDict_.found("preserveBaffles")
+     && findIndex
+        (
+            constraintTypes_,
+            decompositionConstraints::preserveBafflesConstraint::typeName
+        ) == -1
+    )
+    {
+        constraints_.append
+        (
+            new decompositionConstraints::preserveBafflesConstraint()
+        );
+    }
+
+    if
+    (
+        decompositionDict_.found("preservePatches")
+     && findIndex
+        (
+            constraintTypes_,
+            decompositionConstraints::preservePatchesConstraint::typeName
+        ) == -1
+    )
+    {
+        const wordReList pNames(decompositionDict_.lookup("preservePatches"));
+
+        constraints_.append
+        (
+            new decompositionConstraints::preservePatchesConstraint(pNames)
+        );
+    }
+
+    if
+    (
+        decompositionDict_.found("preserveFaceZones")
+     && findIndex
+        (
+            constraintTypes_,
+            decompositionConstraints::preserveFaceZonesConstraint::typeName
+        ) == -1
+    )
+    {
+        const wordReList zNames(decompositionDict_.lookup("preserveFaceZones"));
+
+        constraints_.append
+        (
+            new decompositionConstraints::preserveFaceZonesConstraint(zNames)
+        );
+    }
+
+    if
+    (
+        decompositionDict_.found("singleProcessorFaceSets")
+     && findIndex
+        (
+            constraintTypes_,
+            decompositionConstraints::preserveFaceZonesConstraint::typeName
+        ) == -1
+    )
+    {
+        const List<Tuple2<word, label> > zNameAndProcs
+        (
+            decompositionDict_.lookup("singleProcessorFaceSets")
+        );
+
+        constraints_.append
+        (
+            new decompositionConstraints::singleProcessorFaceSetsConstraint
+            (
+                zNameAndProcs
+            )
+        );
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
@@ -53,12 +182,6 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
 {
     word methodType(decompositionDict.lookup("method"));
 
-    if (methodType == "scotch" && Pstream::parRun())
-    {
-        methodType = "ptscotch";
-    }
-
-
     Info<< "Selecting decompositionMethod " << methodType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
@@ -66,11 +189,8 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "decompositionMethod::New"
-            "(const dictionary& decompositionDict)"
-        )   << "Unknown decompositionMethod "
+        FatalErrorInFunction
+            << "Unknown decompositionMethod "
             << methodType << nl << nl
             << "Valid decompositionMethods are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
@@ -370,6 +490,210 @@ void Foam::decompositionMethod::calcCellCells
 }
 
 
+void Foam::decompositionMethod::calcCellCells
+(
+    const polyMesh& mesh,
+    const labelList& agglom,
+    const label nLocalCoarse,
+    const bool parallel,
+    CompactListList<label>& cellCells,
+    CompactListList<scalar>& cellCellWeights
+)
+{
+    const labelList& faceOwner = mesh.faceOwner();
+    const labelList& faceNeighbour = mesh.faceNeighbour();
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+
+    // Create global cell numbers
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    globalIndex globalAgglom
+    (
+        nLocalCoarse,
+        Pstream::msgType(),
+        Pstream::worldComm,
+        parallel
+    );
+
+
+    // Get agglomerate owner on other side of coupled faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelList globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
+        {
+            label faceI = pp.start();
+            label bFaceI = pp.start() - mesh.nInternalFaces();
+
+            forAll(pp, i)
+            {
+                globalNeighbour[bFaceI] = globalAgglom.toGlobal
+                (
+                    agglom[faceOwner[faceI]]
+                );
+
+                bFaceI++;
+                faceI++;
+            }
+        }
+    }
+
+    // Get the cell on the other side of coupled patches
+    syncTools::swapBoundaryFaceList(mesh, globalNeighbour);
+
+
+    // Count number of faces (internal + coupled)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Number of faces per coarse cell
+    labelList nFacesPerCell(nLocalCoarse, 0);
+
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        label own = agglom[faceOwner[faceI]];
+        label nei = agglom[faceNeighbour[faceI]];
+
+        nFacesPerCell[own]++;
+        nFacesPerCell[nei]++;
+    }
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
+        {
+            label faceI = pp.start();
+            label bFaceI = pp.start()-mesh.nInternalFaces();
+
+            forAll(pp, i)
+            {
+                label own = agglom[faceOwner[faceI]];
+
+                label globalNei = globalNeighbour[bFaceI];
+                if
+                (
+                   !globalAgglom.isLocal(globalNei)
+                 || globalAgglom.toLocal(globalNei) != own
+                )
+                {
+                    nFacesPerCell[own]++;
+                }
+
+                faceI++;
+                bFaceI++;
+            }
+        }
+    }
+
+
+    // Fill in offset and data
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+
+    cellCells.setSize(nFacesPerCell);
+    cellCellWeights.setSize(nFacesPerCell);
+
+    nFacesPerCell = 0;
+
+    labelList& m = cellCells.m();
+    scalarList& w = cellCellWeights.m();
+    const labelList& offsets = cellCells.offsets();
+
+    // For internal faces is just offsetted owner and neighbour
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        label own = agglom[faceOwner[faceI]];
+        label nei = agglom[faceNeighbour[faceI]];
+
+        label ownIndex = offsets[own] + nFacesPerCell[own]++;
+        label neiIndex = offsets[nei] + nFacesPerCell[nei]++;
+
+        m[ownIndex] = globalAgglom.toGlobal(nei);
+        w[ownIndex] = mag(mesh.faceAreas()[faceI]);
+        m[neiIndex] = globalAgglom.toGlobal(own);
+        w[ownIndex] = mag(mesh.faceAreas()[faceI]);
+    }
+
+    // For boundary faces is offsetted coupled neighbour
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
+        {
+            label faceI = pp.start();
+            label bFaceI = pp.start()-mesh.nInternalFaces();
+
+            forAll(pp, i)
+            {
+                label own = agglom[faceOwner[faceI]];
+
+                label globalNei = globalNeighbour[bFaceI];
+
+                if
+                (
+                   !globalAgglom.isLocal(globalNei)
+                 || globalAgglom.toLocal(globalNei) != own
+                )
+                {
+                    label ownIndex = offsets[own] + nFacesPerCell[own]++;
+                    m[ownIndex] = globalNei;
+                    w[ownIndex] = mag(mesh.faceAreas()[faceI]);
+                }
+
+                faceI++;
+                bFaceI++;
+            }
+        }
+    }
+
+
+    // Check for duplicates connections between cells
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Done as postprocessing step since we now have cellCells.
+    label newIndex = 0;
+    labelHashSet nbrCells;
+
+
+    if (cellCells.size() == 0)
+    {
+        return;
+    }
+
+    label startIndex = cellCells.offsets()[0];
+
+    forAll(cellCells, cellI)
+    {
+        nbrCells.clear();
+        nbrCells.insert(globalAgglom.toGlobal(cellI));
+
+        label endIndex = cellCells.offsets()[cellI+1];
+
+        for (label i = startIndex; i < endIndex; i++)
+        {
+            if (nbrCells.insert(cellCells.m()[i]))
+            {
+                cellCells.m()[newIndex] = cellCells.m()[i];
+                cellCellWeights.m()[newIndex] = cellCellWeights.m()[i];
+                newIndex++;
+            }
+        }
+        startIndex = endIndex;
+        cellCells.offsets()[cellI+1] = newIndex;
+        cellCellWeights.offsets()[cellI+1] = newIndex;
+    }
+
+    cellCells.m().setSize(newIndex);
+    cellCellWeights.m().setSize(newIndex);
+}
+
+
 //void Foam::decompositionMethod::calcCellCells
 //(
 //    const polyMesh& mesh,
@@ -768,17 +1092,8 @@ Foam::labelList Foam::decompositionMethod::decompose
 
     if (nWeights > 0 && cellWeights.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "decompositionMethod::decompose\n"
-            "(\n"
-            "   const polyMesh&,\n"
-            "   const scalarField&,\n"
-            "   const boolList&,\n"
-            "   const PtrList<labelList>&,\n"
-            "   const labelList&,\n"
-            "   const List<labelPair>&\n"
-        )   << "Number of weights " << cellWeights.size()
+        FatalErrorInFunction
+            << "Number of weights " << cellWeights.size()
             << " differs from number of cells " << mesh.nCells()
             << exit(FatalError);
     }
@@ -938,18 +1253,8 @@ Foam::labelList Foam::decompositionMethod::decompose
             }
             else if (blockedFace[f0] != blockedFace[f1])
             {
-                FatalErrorIn
-                (
-                    "labelList decompose\n"
-                    "(\n"
-                    "    const polyMesh&,\n"
-                    "    const scalarField&,\n"
-                    "    const boolList&,\n"
-                    "    const PtrList<labelList>&,\n"
-                    "    const labelList&,\n"
-                    "    const List<labelPair>&\n"
-                    ")"
-                )   << "On explicit connection between faces " << f0
+                FatalErrorInFunction
+                    << "On explicit connection between faces " << f0
                     << " and " << f1
                     << " the two blockedFace status are not equal : "
                     << blockedFace[f0] << " and " << blockedFace[f1]
@@ -1093,7 +1398,7 @@ Foam::labelList Foam::decompositionMethod::decompose
                             label nbrProc = nbrDecomp[bFaceI];
                             if (ownProc != nbrProc)
                             {
-                                FatalErrorIn("decompositionMethod::decompose()")
+                                FatalErrorInFunction
                                     << "patch:" << pp.name()
                                     << " face:" << faceI
                                     << " at:" << mesh.faceCentres()[faceI]
@@ -1123,172 +1428,45 @@ void Foam::decompositionMethod::setConstraints
 {
     blockedFace.setSize(mesh.nFaces());
     blockedFace = true;
-    //label nUnblocked = 0;
 
     specifiedProcessorFaces.clear();
     explicitConnections.clear();
 
-
-    if (decompositionDict_.found("preservePatches"))
+    forAll(constraints_, constraintI)
     {
-        wordList pNames(decompositionDict_.lookup("preservePatches"));
-
-        Info<< nl
-            << "Keeping owner of faces in patches " << pNames
-            << " on same processor. This only makes sense for cyclics." << endl;
-
-        const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-        forAll(pNames, i)
-        {
-            const label patchI = patches.findPatchID(pNames[i]);
-
-            if (patchI == -1)
-            {
-                FatalErrorIn("decompositionMethod::decompose(const polyMesh&)")
-                    << "Unknown preservePatch " << pNames[i]
-                    << endl << "Valid patches are " << patches.names()
-                    << exit(FatalError);
-            }
-
-            const polyPatch& pp = patches[patchI];
-
-            forAll(pp, i)
-            {
-                if (blockedFace[pp.start() + i])
-                {
-                    blockedFace[pp.start() + i] = false;
-                    //nUnblocked++;
-                }
-            }
-        }
-    }
-    if (decompositionDict_.found("preserveFaceZones"))
-    {
-        wordList zNames(decompositionDict_.lookup("preserveFaceZones"));
-
-        Info<< nl
-            << "Keeping owner and neighbour of faces in zones " << zNames
-            << " on same processor" << endl;
-
-        const faceZoneMesh& fZones = mesh.faceZones();
-
-        forAll(zNames, i)
-        {
-            label zoneI = fZones.findZoneID(zNames[i]);
-
-            if (zoneI == -1)
-            {
-                FatalErrorIn("decompositionMethod::decompose(const polyMesh&)")
-                    << "Unknown preserveFaceZone " << zNames[i]
-                    << endl << "Valid faceZones are " << fZones.names()
-                    << exit(FatalError);
-            }
-
-            const faceZone& fz = fZones[zoneI];
-
-            forAll(fz, i)
-            {
-                if (blockedFace[fz[i]])
-                {
-                    blockedFace[fz[i]] = false;
-                    //nUnblocked++;
-                }
-            }
-        }
-    }
-
-    bool preserveBaffles = decompositionDict_.lookupOrDefault
-    (
-        "preserveBaffles",
-        false
-    );
-    if (preserveBaffles)
-    {
-        Info<< nl
-            << "Keeping owner of faces in baffles "
-            << " on same processor." << endl;
-
-        explicitConnections = localPointRegion::findDuplicateFacePairs(mesh);
-        forAll(explicitConnections, i)
-        {
-            blockedFace[explicitConnections[i].first()] = false;
-            blockedFace[explicitConnections[i].second()] = false;
-        }
-    }
-
-    if
-    (
-        decompositionDict_.found("preservePatches")
-     || decompositionDict_.found("preserveFaceZones")
-     || preserveBaffles
-    )
-    {
-        syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
-        //reduce(nUnblocked, sumOp<label>());
-    }
-
-
-
-    // Specified processor for group of cells connected to faces
-
-    label nProcSets = 0;
-    if (decompositionDict_.found("singleProcessorFaceSets"))
-    {
-        List<Tuple2<word, label> > zNameAndProcs
+        constraints_[constraintI].add
         (
-            decompositionDict_.lookup("singleProcessorFaceSets")
+            mesh,
+            blockedFace,
+            specifiedProcessorFaces,
+            specifiedProcessor,
+            explicitConnections
         );
-
-        specifiedProcessorFaces.setSize(zNameAndProcs.size());
-        specifiedProcessor.setSize(zNameAndProcs.size());
-
-        forAll(zNameAndProcs, setI)
-        {
-            Info<< "Keeping all cells connected to faceSet "
-                << zNameAndProcs[setI].first()
-                << " on processor " << zNameAndProcs[setI].second() << endl;
-
-            // Read faceSet
-            faceSet fz(mesh, zNameAndProcs[setI].first());
-
-            specifiedProcessorFaces.set(setI, new labelList(fz.sortedToc()));
-            specifiedProcessor[setI] = zNameAndProcs[setI].second();
-            nProcSets += fz.size();
-        }
-        reduce(nProcSets, sumOp<label>());
+    }
+}
 
 
-        // Unblock all point connected faces
-        // 1. Mark all points on specifiedProcessorFaces
-        boolList procFacePoint(mesh.nPoints(), false);
-        forAll(specifiedProcessorFaces, setI)
-        {
-            const labelList& set = specifiedProcessorFaces[setI];
-            forAll(set, fI)
-            {
-                const face& f = mesh.faces()[set[fI]];
-                forAll(f, fp)
-                {
-                    procFacePoint[f[fp]] = true;
-                }
-            }
-        }
-        syncTools::syncPointList(mesh, procFacePoint, orEqOp<bool>(), false);
-
-        // 2. Unblock all faces on procFacePoint
-        forAll(procFacePoint, pointI)
-        {
-            if (procFacePoint[pointI])
-            {
-                const labelList& pFaces = mesh.pointFaces()[pointI];
-                forAll(pFaces, i)
-                {
-                    blockedFace[pFaces[i]] = false;
-                }
-            }
-        }
-        syncTools::syncFaceList(mesh, blockedFace, andEqOp<bool>());
+void Foam::decompositionMethod::applyConstraints
+(
+    const polyMesh& mesh,
+    const boolList& blockedFace,
+    const PtrList<labelList>& specifiedProcessorFaces,
+    const labelList& specifiedProcessor,
+    const List<labelPair>& explicitConnections,
+    labelList& decomposition
+)
+{
+    forAll(constraints_, constraintI)
+    {
+        constraints_[constraintI].apply
+        (
+            mesh,
+            blockedFace,
+            specifiedProcessorFaces,
+            specifiedProcessor,
+            explicitConnections,
+            decomposition
+        );
     }
 }
 
@@ -1299,6 +1477,8 @@ Foam::labelList Foam::decompositionMethod::decompose
     const scalarField& cellWeights
 )
 {
+    // Collect all constraints
+
     boolList blockedFace;
     PtrList<labelList> specifiedProcessorFaces;
     labelList specifiedProcessor;
@@ -1326,6 +1506,19 @@ Foam::labelList Foam::decompositionMethod::decompose
         explicitConnections     // baffles
     );
 
+
+    // Give any constraint the option of modifying the decomposition
+
+    applyConstraints
+    (
+        mesh,
+        blockedFace,
+        specifiedProcessorFaces,
+        specifiedProcessor,
+        explicitConnections,
+        finalDecomp
+    );
+
     return finalDecomp;
 }
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
index 2d02936d2b..cbef4aae18 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,8 @@ SourceFiles
 #define decompositionMethod_H
 
 #include "polyMesh.H"
-#include "pointField.H"
 #include "CompactListList.H"
+#include "decompositionConstraint.H"
 
 namespace Foam
 {
@@ -56,6 +56,8 @@ protected:
         const dictionary& decompositionDict_;
         label nProcessors_;
 
+        //- Optional constraints
+        PtrList<decompositionConstraint> constraints_;
 
 private:
 
@@ -98,14 +100,7 @@ public:
     // Constructors
 
         //- Construct given the decomposition dictionary
-        decompositionMethod(const dictionary& decompositionDict)
-        :
-            decompositionDict_(decompositionDict),
-            nProcessors_
-            (
-                readLabel(decompositionDict.lookup("numberOfSubdomains"))
-            )
-        {}
+        decompositionMethod(const dictionary& decompositionDict);
 
 
     //- Destructor
@@ -134,21 +129,14 @@ public:
                 const scalarField& pointWeights
             )
             {
-                notImplemented
-                (
-                    "decompositionMethod:decompose(const pointField&"
-                    ", const scalarField&)"
-                );
+                NotImplemented;
                 return labelList(0);
             }
 
             //- Like decompose but with uniform weights on the points
             virtual labelList decompose(const pointField&)
             {
-                notImplemented
-                (
-                    "decompositionMethod:decompose(const pointField&)"
-                );
+                NotImplemented;
                 return labelList(0);
             }
 
@@ -233,6 +221,19 @@ public:
                 CompactListList<label>& cellCells
             );
 
+            //- Helper: determine (local or global) cellCells and face weights
+            //  from mesh agglomeration.
+            //  Uses mag of faceArea as weights
+            static void calcCellCells
+            (
+                const polyMesh& mesh,
+                const labelList& agglom,
+                const label nLocalCoarse,
+                const bool parallel,
+                CompactListList<label>& cellCells,
+                CompactListList<scalar>& cellCellWeights
+            );
+
             //- Helper: extract constraints:
             //  blockedface: existing faces where owner and neighbour on same
             //               proc
@@ -248,6 +249,19 @@ public:
                 List<labelPair>& explicitConnections
             );
 
+            //- Helper: apply constraints to a decomposition. This gives
+            //  constraints opportunity to modify decomposition in case
+            //  the native decomposition method has not obeyed all constraints
+            void applyConstraints
+            (
+                const polyMesh& mesh,
+                const boolList& blockedFace,
+                const PtrList<labelList>& specifiedProcessorFaces,
+                const labelList& specifiedProcessor,
+                const List<labelPair>& explicitConnections,
+                labelList& finalDecomp
+            );
+
             // Decompose a mesh with constraints:
             // - blockedFace : whether owner and neighbour should be on same
             //   processor
diff --git a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
index 316c1bf482..a416d0dc30 100644
--- a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,11 +43,8 @@ Foam::geomDecomp::geomDecomp
 
     if (nProcessors_ != n_.x()*n_.y()*n_.z())
     {
-        FatalErrorIn
-        (
-            "geomDecomp::geomDecomp"
-            "(const dictionary& decompositionDict)"
-        )   << "Wrong number of processor divisions in geomDecomp:" << nl
+        FatalErrorInFunction
+            << "Wrong number of processor divisions in geomDecomp:" << nl
             << "Number of domains    : " << nProcessors_ << nl
             << "Wanted decomposition : " << n_
             << exit(FatalError);
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 9928f39f47..20a4c0a3da 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,10 +50,8 @@ void Foam::hierarchGeomDecomp::setDecompOrder()
 
     if (order.size() != 3)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "hierarchGeomDecomp::hierarchGeomDecomp"
-            "(const dictionary& decompositionDict)",
             decompositionDict_
         )   << "number of characters in order (" << order << ") != 3"
             << exit(FatalIOError);
@@ -75,10 +73,8 @@ void Foam::hierarchGeomDecomp::setDecompOrder()
         }
         else
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "hierarchGeomDecomp::hierarchGeomDecomp"
-                "(const dictionary& decompositionDict)",
                 decompositionDict_
             )   << "Illegal decomposition order " << order << endl
                 << "It should only contain x, y or z" << exit(FatalError);
@@ -229,7 +225,7 @@ void Foam::hierarchGeomDecomp::findBinary
 
         if (returnReduce(hasNotChanged, andOp<bool>()))
         {
-            WarningIn("hierarchGeomDecomp::findBinary(..)")
+            WarningInFunction
                 << "unable to find desired decomposition split, making do!"
                 << endl;
             break;
@@ -309,7 +305,7 @@ void Foam::hierarchGeomDecomp::findBinary
 
         if (returnReduce(hasNotChanged, andOp<bool>()))
         {
-            WarningIn("hierarchGeomDecomp::findBinary(..)")
+            WarningInFunction
                 << "unable to find desired deomposition split, making do!"
                 << endl;
             break;
@@ -408,7 +404,14 @@ void Foam::hierarchGeomDecomp::sortComponent
         {
             // No need for binary searching of bin size
             localSize = label(current.size()/n_[compI]);
-            rightCoord = sortedCoord[leftIndex+localSize];
+            if (leftIndex+localSize < sortedCoord.size())
+            {
+                rightCoord = sortedCoord[leftIndex+localSize];
+            }
+            else
+            {
+                rightCoord = maxCoord;
+            }
         }
         else
         {
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
index 6bb704515b..8af9083bc1 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,10 +85,8 @@ Foam::labelList Foam::manualDecomp::decompose
 
     if (finalDecomp.size() != points.size())
     {
-        FatalErrorIn
-        (
-            "manualDecomp::decompose(const pointField&, const scalarField&)"
-        )   << "Size of decomposition list does not correspond "
+        FatalErrorInFunction
+            << "Size of decomposition list does not correspond "
             << "to the number of points.  Size: "
             << finalDecomp.size() << " Number of points: "
             << points.size()
@@ -99,10 +97,8 @@ Foam::labelList Foam::manualDecomp::decompose
 
     if (min(finalDecomp) < 0 || max(finalDecomp) > nProcessors_ - 1)
     {
-        FatalErrorIn
-        (
-            "manualDecomp::decompose(const pointField&, const scalarField&)"
-        )   << "According to the decomposition, cells assigned to "
+        FatalErrorInFunction
+            << "According to the decomposition, cells assigned to "
             << "impossible processor numbers.  Min processor = "
             << min(finalDecomp) << " Max processor = " << max(finalDecomp)
             << ".\n" << "Manual decomposition data read from file "
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
index fe51798096..c453bcf73d 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
@@ -108,11 +108,7 @@ public:
             const scalarField& cWeights
         )
         {
-            notImplemented
-            (
-                "decompose(const labelListList&, const pointField&"
-                ", const scalarField&)"
-            );
+            NotImplemented;
             return labelList(0);
         }
 
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 927df123ab..f282c211e6 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -351,7 +351,7 @@ Foam::multiLevelDecomp::multiLevelDecomp(const dictionary& decompositionDict)
 
     if (n != nDomains())
     {
-        FatalErrorIn("multiLevelDecomp::multiLevelDecomp(const dictionary&)")
+        FatalErrorInFunction
             << "Top level decomposition specifies " << nDomains()
             << " domains which is not equal to the product of"
             << " all sub domains " << n
diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
index 1672e53d21..3dfd39f6de 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -149,7 +149,7 @@ Foam::labelList Foam::structuredDecomp::decompose
         {
             if (!haveWarned)
             {
-                WarningIn("structuredDecomp::decompose(..)")
+                WarningInFunction
                     << "Did not visit some cells, e.g. cell " << cellI
                     << " at " << mesh.cellCentres()[cellI] << endl
                     << "Assigning  these cells to domain 0." << endl;
@@ -174,15 +174,7 @@ Foam::labelList Foam::structuredDecomp::decompose
     const scalarField& pointWeights
 )
 {
-    notImplemented
-    (
-        "structuredDecomp::decompose\n"
-        "(\n"
-        "    const labelListList&,\n"
-        "    const pointField&,\n"
-        "    const scalarField&\n"
-        ")\n"
-    );
+    NotImplemented;
 
     return labelList::null();
 }
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index f14ef21e92..1fb0ea1c39 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,8 @@ License
 
 extern "C"
 {
-#define OMPI_SKIP_MPICXX
-#   include "metis.h"
+    #define OMPI_SKIP_MPICXX
+    #include "metis.h"
 }
 
 
@@ -40,14 +40,12 @@ extern "C"
 namespace Foam
 {
     defineTypeNameAndDebug(metisDecomp, 0);
-
     addToRunTimeSelectionTable(decompositionMethod, metisDecomp, dictionary);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Call Metis with options from dictionary.
 Foam::label Foam::metisDecomp::decompose
 (
     const List<label>& adjncy,
@@ -57,9 +55,6 @@ Foam::label Foam::metisDecomp::decompose
     List<label>& finalDecomp
 )
 {
-    // C style numbering
-    //int numFlag = 0;
-
     // Method of decomposition
     // recursive: multi-level recursive bisection (default)
     // k-way: multi-level k-way
@@ -88,21 +83,15 @@ Foam::label Foam::metisDecomp::decompose
     {
         if (minWeights <= 0)
         {
-            WarningIn
-            (
-                "metisDecomp::decompose"
-                "(const pointField&, const scalarField&)"
-            )   << "Illegal minimum weight " << minWeights
+            WarningInFunction
+                << "Illegal minimum weight " << minWeights
                 << endl;
         }
 
         if (cWeights.size() != numCells)
         {
-            FatalErrorIn
-            (
-                "metisDecomp::decompose"
-                "(const pointField&, const scalarField&)"
-            )   << "Number of cell weights " << cWeights.size()
+            FatalErrorInFunction
+                << "Number of cell weights " << cWeights.size()
                 << " does not equal number of cells " << numCells
                 << exit(FatalError);
         }
@@ -126,7 +115,7 @@ Foam::label Foam::metisDecomp::decompose
         {
             if (method != "recursive" && method != "k-way")
             {
-                FatalErrorIn("metisDecomp::decompose()")
+                FatalErrorInFunction
                     << "Method " << method << " in metisCoeffs in dictionary : "
                     << decompositionDict_.name()
                     << " should be 'recursive' or 'k-way'"
@@ -141,7 +130,7 @@ Foam::label Foam::metisDecomp::decompose
         {
             if (options.size() != METIS_NOPTIONS)
             {
-                FatalErrorIn("metisDecomp::decompose()")
+                FatalErrorInFunction
                     << "Number of options in metisCoeffs in dictionary : "
                     << decompositionDict_.name()
                     << " should be " << METIS_NOPTIONS
@@ -158,7 +147,7 @@ Foam::label Foam::metisDecomp::decompose
 
             if (processorWeights.size() != nProcessors_)
             {
-                FatalErrorIn("metisDecomp::decompose(const pointField&)")
+                FatalErrorInFunction
                     << "Number of processor weights "
                     << processorWeights.size()
                     << " does not equal number of domains " << nProcessors_
@@ -185,7 +174,7 @@ Foam::label Foam::metisDecomp::decompose
         //
         //    if (cellWeights.size() != xadj.size()-1)
         //    {
-        //        FatalErrorIn("metisDecomp::decompose(const pointField&)")
+        //        FatalErrorInFunction
         //            << "Number of cell weights " << cellWeights.size()
         //            << " does not equal number of cells " << xadj.size()-1
         //            << exit(FatalError);
@@ -193,15 +182,15 @@ Foam::label Foam::metisDecomp::decompose
         //}
     }
 
-    int ncon = 1;
+    label ncon = 1;
 
-    int nProcs = nProcessors_;
+    label nProcs = nProcessors_;
 
     // output: cell -> processor addressing
     finalDecomp.setSize(numCells);
 
     // output: number of cut edges
-    int edgeCut = 0;
+    label edgeCut = 0;
 
     if (method == "recursive")
     {
@@ -265,10 +254,8 @@ Foam::labelList Foam::metisDecomp::decompose
 {
     if (points.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "metisDecomp::decompose(const pointField&,const scalarField&)"
-        )   << "Can use this decomposition method only for the whole mesh"
+        FatalErrorInFunction
+            << "Can use this decomposition method only for the whole mesh"
             << endl
             << "and supply one coordinate (cellCentre) for every cell." << endl
             << "The number of coordinates " << points.size() << endl
@@ -304,11 +291,8 @@ Foam::labelList Foam::metisDecomp::decompose
 {
     if (agglom.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "metisDecomp::decompose"
-            "(const labelList&, const pointField&, const scalarField&)"
-        )   << "Size of cell-to-coarse map " << agglom.size()
+        FatalErrorInFunction
+            << "Size of cell-to-coarse map " << agglom.size()
             << " differs from number of cells in mesh " << mesh.nCells()
             << exit(FatalError);
     }
@@ -346,11 +330,8 @@ Foam::labelList Foam::metisDecomp::decompose
 {
     if (cellCentres.size() != globalCellCells.size())
     {
-        FatalErrorIn
-        (
-            "metisDecomp::decompose"
-            "(const pointField&, const labelListList&, const scalarField&)"
-        )   << "Inconsistent number of cells (" << globalCellCells.size()
+        FatalErrorInFunction
+            << "Inconsistent number of cells (" << globalCellCells.size()
             << ") and number of cell centres (" << cellCentres.size()
             << ")." << exit(FatalError);
     }
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index 5f92816124..84dc04bd93 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -51,6 +51,7 @@ class metisDecomp
 
     // Private Member Functions
 
+        //- Call Metis with options from dictionary.
         label decompose
         (
             const List<label>& adjncy,
@@ -131,7 +132,6 @@ public:
             const pointField& cc,
             const scalarField& cWeights
         );
-
 };
 
 
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 29f1f6b09a..524a19faa6 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,46 +63,134 @@ License
     "b{sep=m{vert=100,low=h,asc=f}x}"
 
     The current default mapping strategy in Scotch can be seen by using the
-    "-vs" option of program gmap. It is, to date:
+    "-vs" option of program dgpart. It is, to date:
 
-    b
+    r
     {
-        job=t,
-        map=t,
-        poli=S,
-        sep=
-        (
-            m
+        sep=m
+        {
+            asc=b
             {
-                asc=b
-                {
-                    bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
-                    org=f{move=80,pass=-1,bal=0.005},
-                    width=3
-                },
-                low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-          | m
+                width=3,
+                bnd=(d{pass=40,dif=1,rem=0,type=b}|)
+                q{strat=f{move=80,pass=-1,bal=0.01,type=b}}
+                x{sbbt=5,bal=0.05},
+                org=q{strat=f{move=80,pass=-1,bal=0.01,type=b}}
+                x{sbbt=5,bal=0.05}
+            },
+            low=q
             {
-                asc=b
+                strat=
+                (
+                    m
+                    {
+                        asc=b
+                        {
+                            bnd=(d{pass=40,type=b}|)
+                            f{move=80,pass=-1,bal=0.05,type=b},
+                            org=f{move=80,pass=-1,bal=0.05,type=b},
+                            width=3
+                        },
+                        low=h{pass=10}
+                        f{move=80,pass=-1,bal=0.05,type=b},
+                        vert=80,
+                        rat=0.8
+                    }
+                   |m
+                    {
+                        asc=b
+                        {
+                            bnd=(d{pass=40,type=b}|)
+                            f{move=80,pass=-1,bal=0.05,type=b},
+                            org=f{move=80,pass=-1,bal=0.05,type=b},
+                            width=3
+                        },
+                        low=h{pass=10}
+                        f{move=80,pass=-1,bal=0.05,type=b},
+                        vert=80,
+                        rat=0.8
+                    }
+                )
+            },
+            seq=q
+            {
+                strat=
+                (
+                    m
+                    {
+                        asc=b
+                        {
+                            bnd=(d{pass=40,type=b}|)
+                            f{move=80,pass=-1,bal=0.05,type=b},
+                            org=f{move=80,pass=-1,bal=0.05,type=b},
+                            width=3
+                        },
+                        low=h{pass=10}
+                        f{move=80,pass=-1,bal=0.05,type=b},
+                        vert=80,
+                        rat=0.8
+                    }
+                   |m
+                    {
+                        asc=b
+                        {
+                            bnd=(d{pass=40,type=b}|)
+                            f{move=80,pass=-1,bal=0.05,type=b},
+                            org=f{move=80,pass=-1,bal=0.05,type=b},
+                            width=3
+                        },
+                        low=h{pass=10}
+                        f{move=80,pass=-1,bal=0.05,type=b},
+                        vert=80,
+                        rat=0.8
+                    }
+                )
+            },
+            pass=5,
+            vert=10000,
+            rat=0.8
+        },
+        seq=r
+        {
+            job=t,
+            bal=0.05,
+            map=t,
+            poli=S,
+            sep=
+            (
+                m
                 {
-                    bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
-                    org=f{move=80,pass=-1,bal=0.005},
-                    width=3
-                },
-                low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-        )
+                    asc=b
+                    {
+                        bnd=(d{pass=40,type=b}|)
+                        f{move=80,pass=-1,bal=0.05,type=b},
+                        org=f{move=80,pass=-1,bal=0.05,type=b},
+                        width=3
+                    },
+                    low=h{pass=10}
+                    f{move=80,pass=-1,bal=0.05,type=b},
+                    vert=80,
+                    rat=0.8
+                }
+               |m
+                {
+                    asc=b
+                    {
+                        bnd=(d{pass=40,type=b}|)
+                        f{move=80,pass=-1,bal=0.05,type=b},
+                        org=f{move=80,pass=-1,bal=0.05,type=b},
+                        width=3
+                    },
+                    low=h{pass=10}
+                    f{move=80,pass=-1,bal=0.05,type=b},
+                    vert=80,
+                    rat=0.8
+                }
+            )
+        },
+        bal=0.05
     }
 
-
-
     Note: writeGraph=true : writes out .dgr files for debugging. Run with e.g.
 
         mpirun -np 4 dgpart 2 'region0_%r.dgr'
@@ -152,7 +240,7 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 {
     if (retVal)
     {
-        FatalErrorIn("ptscotchDecomp::decompose(..)")
+        FatalErrorInFunction
             << "Call to scotch routine " << str << " failed."
             << exit(FatalError);
     }
@@ -238,7 +326,7 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //
 //        if (prevXadj.size() != nSendCells[Pstream::myProcNo()-1])
 //        {
-//            FatalErrorIn("ptscotchDecomp::decompose(..)")
+//            FatalErrorInFunction
 //                << "Expected from processor " << Pstream::myProcNo()-1
 //                << " connectivity for " << nSendCells[Pstream::myProcNo()-1]
 //                << " nCells but only received " << prevXadj.size()
@@ -315,7 +403,7 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //
 //        if (nextFinalDecomp.size() != nSendCells[Pstream::myProcNo()])
 //        {
-//            FatalErrorIn("parMetisDecomp::decompose(..)")
+//            FatalErrorInFunction
 //                << "Expected from processor " << Pstream::myProcNo()+1
 //                << " decomposition for " << nSendCells[Pstream::myProcNo()]
 //                << " nCells but only received " << nextFinalDecomp.size()
@@ -489,19 +577,15 @@ Foam::label Foam::ptscotchDecomp::decompose
     {
         if (minWeights <= 0)
         {
-            WarningIn
-            (
-                "ptscotchDecomp::decompose(..)"
-            )   << "Illegal minimum weight " << minWeights
+            WarningInFunction
+                << "Illegal minimum weight " << minWeights
                 << endl;
         }
 
         if (cWeights.size() != xadjSize-1)
         {
-            FatalErrorIn
-            (
-                "ptscotchDecomp::decompose(..)"
-            )   << "Number of cell weights " << cWeights.size()
+            FatalErrorInFunction
+                << "Number of cell weights " << cWeights.size()
                 << " does not equal number of cells " << xadjSize-1
                 << exit(FatalError);
         }
@@ -519,10 +603,8 @@ Foam::label Foam::ptscotchDecomp::decompose
             // rangeScale tipping the subsequent sum over the integer limit.
             rangeScale = 0.9*scalar(labelMax - 1)/velotabSum;
 
-            WarningIn
-            (
-                "ptscotchDecomp::decompose(...)"
-            )   << "Sum of weights has overflowed integer: " << velotabSum
+            WarningInFunction
+                << "Sum of weights has overflowed integer: " << velotabSum
                 << ", compressing weight scale by a factor of " << rangeScale
                 << endl;
         }
@@ -737,10 +819,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
 {
     if (points.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "ptscotchDecomp::decompose(const pointField&, const scalarField&)"
-        )
+        FatalErrorInFunction
             << "Can use this decomposition method only for the whole mesh"
             << endl
             << "and supply one coordinate (cellCentre) for every cell." << endl
@@ -796,10 +875,8 @@ Foam::labelList Foam::ptscotchDecomp::decompose
 {
     if (agglom.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "ptscotchDecomp::decompose(const labelList&, const pointField&)"
-        )   << "Size of cell-to-coarse map " << agglom.size()
+        FatalErrorInFunction
+            << "Size of cell-to-coarse map " << agglom.size()
             << " differs from number of cells in mesh " << mesh.nCells()
             << exit(FatalError);
     }
@@ -850,10 +927,8 @@ Foam::labelList Foam::ptscotchDecomp::decompose
 {
     if (cellCentres.size() != globalCellCells.size())
     {
-        FatalErrorIn
-        (
-            "ptscotchDecomp::decompose(const pointField&, const labelListList&)"
-        )   << "Inconsistent number of cells (" << globalCellCells.size()
+        FatalErrorInFunction
+            << "Inconsistent number of cells (" << globalCellCells.size()
             << ") and number of cell centres (" << cellCentres.size()
             << ")." << exit(FatalError);
     }
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index 464d12b28f..fb74ba27c8 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,57 +65,59 @@ License
     The current default mapping strategy in Scotch can be seen by using the
     "-vs" option of program gmap. It is, to date:
 
-    r
+    m
     {
-        job=t,
-        map=t,
-        poli=S,
-        sep=
-        (
-            m
-            {
-                asc=b
+        asc=b
+        {
+            width=3,
+            bnd=d{pass=40, dif=1, rem=0}
+            f{move=80, pass=-1, bal=0.01},
+            org=f{move=80,pass=-1,bal=0.01}
+        },
+        low=r
+        {
+            job=t,
+            bal=0.01,
+            map=t,
+            poli=S,
+            sep=
+            (
+                m
                 {
-                    bnd=
-                    (
-                        d{pass=40,dif=1,rem=1}
-                     |
-                    )
-                    f{move=80,pass=-1,bal=0.002491},
-                    org=f{move=80,pass=-1,bal=0.002491},
-                    width=3
-                },
-                low=h{pass=10}
-                f{move=80,pass=-1,bal=0.002491},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-          | m
-            {
-                asc=b
+                    asc=b
+                    {
+                        bnd=f{move=120, pass=-1, bal=0.01, type=b},
+                        org=f{move=120,pass=-1,bal=0.01,type=b},
+                        width=3
+                    },
+                    low=h{pass=10}
+                    f{move=120,pass=-1,bal=0.01,type=b},
+                    vert=120,
+                    rat=0.8
+                }
+               |m
                 {
-                    bnd=
-                    (
-                        d{pass=40,dif=1,rem=1}
-                      |
-                    )
-                    f{move=80,pass=-1,bal=0.002491},
-                    org=f{move=80,pass=-1,bal=0.002491},
-                    width=3
-                },
-                low=h{pass=10}
-                f{move=80,pass=-1,bal=0.002491},
-                type=h,
-                vert=80,
-                rat=0.8
-            }
-        )
+                    asc=b
+                    {
+                        bnd=f{move=120,pass=-1,bal=0.01,type=b},
+                        org=f{move=120,pass=-1,bal=0.01,type=b},
+                        width=3
+                    },
+                    low=h{pass=10}
+                    f{move=120,pass=-1,bal=0.01,type=b},
+                    vert=120,
+                    rat=0.8
+                }
+            )
+        },
+        vert=10000,
+        rat=0.8,
+        type=0
     }
 
 
-    Note: instead of gmap run gpart <nProcs> -vs <grfFile>
-    where <grfFile> can be obtained by running with 'writeGraph=true'
+    Note: instead of gmap run gpart \<nProcs\> -vs \<grfFile\>
+    where \<grfFile\> can be obtained by running with 'writeGraph=true'
 
 \*---------------------------------------------------------------------------*/
 
@@ -163,7 +165,7 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
 {
     if (retVal)
     {
-        FatalErrorIn("scotchDecomp::decompose(..)")
+        FatalErrorInFunction
             << "Call to scotch routine " << str << " failed."
             << exit(FatalError);
     }
@@ -382,19 +384,15 @@ Foam::label Foam::scotchDecomp::decomposeOneProc
     {
         if (minWeights <= 0)
         {
-            WarningIn
-            (
-                "scotchDecomp::decompose(...)"
-            )   << "Illegal minimum weight " << minWeights
+            WarningInFunction
+                << "Illegal minimum weight " << minWeights
                 << endl;
         }
 
         if (cWeights.size() != xadj.size()-1)
         {
-            FatalErrorIn
-            (
-                "scotchDecomp::decompose(...)"
-            )   << "Number of cell weights " << cWeights.size()
+            FatalErrorInFunction
+                << "Number of cell weights " << cWeights.size()
                 << " does not equal number of cells " << xadj.size()-1
                 << exit(FatalError);
         }
@@ -409,10 +407,8 @@ Foam::label Foam::scotchDecomp::decomposeOneProc
             // rangeScale tipping the subsequent sum over the integer limit.
             rangeScale = 0.9*scalar(labelMax - 1)/velotabSum;
 
-            WarningIn
-            (
-                "scotchDecomp::decompose(...)"
-            )   << "Sum of weights has overflowed integer: " << velotabSum
+            WarningInFunction
+                << "Sum of weights has overflowed integer: " << velotabSum
                 << ", compressing weight scale by a factor of " << rangeScale
                 << endl;
         }
@@ -601,11 +597,8 @@ Foam::labelList Foam::scotchDecomp::decompose
 {
     if (points.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "scotchDecomp::decompose(const polyMesh&, const pointField&"
-            ", const scalarField&)"
-        )   << "Can use this decomposition method only for the whole mesh"
+        FatalErrorInFunction
+            << "Can use this decomposition method only for the whole mesh"
             << endl
             << "and supply one coordinate (cellCentre) for every cell." << endl
             << "The number of coordinates " << points.size() << endl
@@ -655,12 +648,8 @@ Foam::labelList Foam::scotchDecomp::decompose
 {
     if (agglom.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "scotchDecomp::decompose"
-            "(const polyMesh&, const labelList&, const pointField&"
-            ", const scalarField&)"
-        )   << "Size of cell-to-coarse map " << agglom.size()
+        FatalErrorInFunction
+            << "Size of cell-to-coarse map " << agglom.size()
             << " differs from number of cells in mesh " << mesh.nCells()
             << exit(FatalError);
     }
@@ -708,11 +697,8 @@ Foam::labelList Foam::scotchDecomp::decompose
 {
     if (cellCentres.size() != globalCellCells.size())
     {
-        FatalErrorIn
-        (
-            "scotchDecomp::decompose"
-            "(const labelListList&, const pointField&, const scalarField&)"
-        )   << "Inconsistent number of cells (" << globalCellCells.size()
+        FatalErrorInFunction
+            << "Inconsistent number of cells (" << globalCellCells.size()
             << ") and number of cell centres (" << cellCentres.size()
             << ")." << exit(FatalError);
     }
diff --git a/src/parallel/distributed/Make/options b/src/parallel/distributed/Make/options
index f003a7fed9..6753a2306c 100644
--- a/src/parallel/distributed/Make/options
+++ b/src/parallel/distributed/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index f17d26277e..88e1d30b19 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,6 +38,7 @@ License
 #include "vectorList.H"
 #include "PackedBoolList.H"
 #include "PatchTools.H"
+#include "OBJstream.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -815,40 +816,59 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 {
     if (!decomposer_.valid())
     {
-        // Use current decomposer.
-        // Note: or always use hierarchical?
-        IOdictionary decomposeDict
+        // Use singleton decomposeParDict. Cannot use decompositionModel
+        // here since we've only got Time and not a mesh.
+        if
         (
-            IOobject
+            searchableSurface::time().foundObject<IOdictionary>
             (
-                "decomposeParDict",
-                searchableSurface::time().system(),
-                searchableSurface::time(),
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
+                "decomposeParDict"
             )
-        );
-        decomposer_ = decompositionMethod::New(decomposeDict);
+        )
+        {
+            decomposer_ = decompositionMethod::New
+            (
+                searchableSurface::time().lookupObject<IOdictionary>
+                (
+                    "decomposeParDict"
+                )
+            );
+        }
+        else
+        {
+            if (!decomposeParDict_.valid())
+            {
+                decomposeParDict_.reset
+                (
+                    new IOdictionary
+                    (
+                        IOobject
+                        (
+                            "decomposeParDict",
+                            searchableSurface::time().system(),
+                            searchableSurface::time(),
+                            IOobject::MUST_READ_IF_MODIFIED,
+                            IOobject::NO_WRITE
+                        )
+                    )
+                );
+            }
+            decomposer_ = decompositionMethod::New(decomposeParDict_());
+        }
+
 
         if (!decomposer_().parallelAware())
         {
-            FatalErrorIn
-            (
-                "distributedTriSurfaceMesh::independentlyDistributedBbs"
-                "(const triSurface&)"
-            )   << "The decomposition method " << decomposer_().typeName
+            FatalErrorInFunction
+                << "The decomposition method " << decomposer_().typeName
                 << " does not decompose in parallel."
                 << " Please choose one that does." << exit(FatalError);
         }
 
         if (!isA<geomDecomp>(decomposer_()))
         {
-            FatalErrorIn
-            (
-                "distributedTriSurfaceMesh::independentlyDistributedBbs"
-                "(const triSurface&)"
-            )   << "The decomposition method " << decomposer_().typeName
+            FatalErrorInFunction
+                << "The decomposition method " << decomposer_().typeName
                 << " is not a geometric decomposition method." << endl
                 << "Only geometric decomposition methods are currently"
                 << " supported."
@@ -1381,8 +1401,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
         )
     )
     {
-        FatalErrorIn("Foam::distributedTriSurfaceMesh::read()")
-            << "    distributedTriSurfaceMesh is being constructed\n"
+        FatalErrorInFunction
             << "    using 'timeStampMaster' or 'inotifyMaster.'\n"
             << "    Modify the entry fileModificationChecking\n"
             << "    in the etc/controlDict.\n"
@@ -1465,8 +1484,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
         )
     )
     {
-        FatalErrorIn("Foam::distributedTriSurfaceMesh::read()")
-            << "    distributedTriSurfaceMesh is being constructed\n"
+        FatalErrorInFunction
             << "    using 'timeStampMaster' or 'inotifyMaster.'\n"
             << "    Modify the entry fileModificationChecking\n"
             << "    in the etc/controlDict.\n"
@@ -2004,11 +2022,8 @@ void Foam::distributedTriSurfaceMesh::getVolumeType
     List<volumeType>& volType
 ) const
 {
-    FatalErrorIn
-    (
-        "distributedTriSurfaceMesh::getVolumeType"
-        "(const pointField&, List<volumeType>&) const"
-    )   << "Volume type not supported for distributed surfaces."
+    FatalErrorInFunction
+        << "Volume type not supported for distributed surfaces."
         << exit(FatalError);
 }
 
@@ -2090,7 +2105,7 @@ void Foam::distributedTriSurfaceMesh::distribute
             break;
 
             default:
-                FatalErrorIn("distributedTriSurfaceMesh::distribute(..)")
+                FatalErrorInFunction
                     << "Unsupported distribution type." << exit(FatalError);
             break;
         }
@@ -2254,13 +2269,15 @@ void Foam::distributedTriSurfaceMesh::distribute
     // Send all
     // ~~~~~~~~
 
+    PstreamBuffers pBufs(Pstream::defaultCommsType);
+
     forAll(faceSendSizes, procI)
     {
         if (procI != Pstream::myProcNo())
         {
             if (faceSendSizes[Pstream::myProcNo()][procI] > 0)
             {
-                OPstream str(Pstream::blocking, procI);
+                UOPstream str(procI, pBufs);
 
                 labelList pointMap;
                 triSurface subSurface
@@ -2282,10 +2299,12 @@ void Foam::distributedTriSurfaceMesh::distribute
                 //}
 
                 str << subSurface;
-           }
+            }
         }
     }
 
+    pBufs.finishedSends();   // no-op for blocking
+
 
     // Receive and merge all
     // ~~~~~~~~~~~~~~~~~~~~~
@@ -2296,7 +2315,7 @@ void Foam::distributedTriSurfaceMesh::distribute
         {
             if (faceSendSizes[procI][Pstream::myProcNo()] > 0)
             {
-                IPstream str(Pstream::blocking, procI);
+                UIPstream str(procI, pBufs);
 
                 // Receive
                 triSurface subSurface(str);
@@ -2327,7 +2346,7 @@ void Foam::distributedTriSurfaceMesh::distribute
                 //    Pout<< "Current merged surface : faces:" << allTris.size()
                 //        << " points:" << allPoints.size() << endl << endl;
                 //}
-           }
+            }
         }
     }
 
@@ -2388,6 +2407,20 @@ void Foam::distributedTriSurfaceMesh::distribute
             Info<< '\t' << procI << '\t' << nTris[procI] << endl;
         }
         Info<< endl;
+
+        OBJstream str(searchableSurface::time().path()/"after.obj");
+        Info<< "Writing local bounding box to " << str.name() << endl;
+        const List<treeBoundBox>& myBbs = procBb_[Pstream::myProcNo()];
+        forAll(myBbs, i)
+        {
+            pointField pts(myBbs[i].points());
+            const edgeList& es = treeBoundBox::edges;
+            forAll(es, eI)
+            {
+                const edge& e = es[eI];
+                str.write(linePointRef(pts[e[0]], pts[e[1]]));
+            }
+        }
     }
 }
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
index 30c559f517..05d3c1948a 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -95,6 +95,8 @@ private:
         //- Merging distance
         scalar mergeDist_;
 
+        autoPtr<IOdictionary> decomposeParDict_;
+
         //- Decomposition used when independently decomposing surface.
         autoPtr<decompositionMethod> decomposer_;
 
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C
index 3c85d65c6e..c0ff1684e3 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,17 +53,8 @@ Foam::fvFieldReconstructor::fvFieldReconstructor
          || boundaryProcAddressing[procI].size() != procMesh.boundary().size()
         )
         {
-            FatalErrorIn
-            (
-                "fvFieldReconstructor::fvFieldReconstructor\n"
-                "(\n"
-                "   fvMesh&,\n"
-                "   const PtrList<fvMesh>&,\n"
-                "   const PtrList<labelIOList>&,\n"
-                "   const PtrList<labelIOList>&,\n"
-                "   const PtrList<labelIOList>&\n"
-                ")"
-            )   << "Size of maps does not correspond to size of mesh"
+            FatalErrorInFunction
+                << "Size of maps does not correspond to size of mesh"
                 << " for processor " << procI << endl
                 << "faceProcAddressing : " << faceProcAddressing[procI].size()
                 << " nFaces : " << procMesh.nFaces() << endl
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index 5ff0f7bf2e..7a9487667d 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -190,15 +190,8 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
                     // Check
                     if (cp[faceI] <= 0)
                     {
-                        FatalErrorIn
-                        (
-                            "fvFieldReconstructor::reconstructFvVolumeField\n"
-                            "(\n"
-                            "    const IOobject&,\n"
-                            "    const PtrList<GeometricField<Type,"
-                            " fvPatchField, volMesh> >&\n"
-                            ") const\n"
-                        )   << "Processor " << procI
+                        FatalErrorInFunction
+                            << "Processor " << procI
                             << " patch "
                             << procField.mesh().boundary()[patchI].name()
                             << " face " << faceI
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
index c987493c4e..de58b47c5c 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,17 +83,8 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
 
                 if (procPatchAddr.size() && min(procPatchAddr) < 0)
                 {
-                    FatalErrorIn
-                    (
-                        "pointFieldReconstructor::pointFieldReconstructor"
-                        "(\n"
-                        "    const pointMesh& mesh,\n"
-                        "    const PtrList<pointMesh>& procMeshes,\n"
-                        "    const PtrList<labelIOList>& pointProcAddressing,\n"
-                        "    const PtrList<labelIOList>& "
-                        "boundaryProcAddressing\n"
-                        ")"
-                    )   << "Incomplete patch point addressing"
+                    FatalErrorInFunction
+                        << "Incomplete patch point addressing"
                         << abort(FatalError);
                 }
             }
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index c9e63eebe3..c2c9871756 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -177,7 +177,7 @@ Foam::fvMesh::readUpdateState Foam::processorMeshes::readUpdate()
         }
         else if (stat != procStat)
         {
-            FatalErrorIn("processorMeshes::readUpdate()")
+            FatalErrorInFunction
                 << "Processor " << procI
                 << " has a different polyMesh at time "
                 << databases_[procI].timeName()
@@ -241,7 +241,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
 
         if (pointProcAddressingI.size() != procPoints.size())
         {
-            FatalErrorIn("processorMeshes")
+            FatalErrorInFunction
                 << "problem :"
                 << " pointProcAddressingI:" << pointProcAddressingI.size()
                 << " procPoints:" << procPoints.size()
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.H b/src/parallel/reconstruct/reconstruct/processorMeshes.H
index 44be3f7cd5..ed5a6601b8 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.H
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,6 +103,11 @@ public:
         //- Reconstruct point position after motion in parallel
         void reconstructPoints(fvMesh&);
 
+        const PtrList<fvMesh>& meshes() const
+        {
+            return meshes_;
+        }
+
         PtrList<fvMesh>& meshes()
         {
             return meshes_;
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
index a4a7941055..b83cb0bbd2 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ void Foam::calcTypes::addSubtract::writeAddSubtractFields
     }
     else
     {
-        FatalErrorIn("calcTypes::addSubtract::writeAddSubtractFields()")
+        FatalErrorInFunction
             << "Unable to read addSubtract field: " << addSubtractFieldName_
             << nl << exit(FatalError);
     }
@@ -162,7 +162,7 @@ void Foam::calcTypes::addSubtract::writeAddSubtractValues
 
     if (!processed)
     {
-        FatalErrorIn("calcTypes::addSubtract::writeAddSubtractValue()")
+        FatalErrorInFunction
             << "Unable to process " << baseFieldName_
             << " + " << addSubtractValueStr_ << nl
             << "No call to addSubtract for fields of type "
@@ -225,7 +225,7 @@ void Foam::calcTypes::addSubtract::preCalc
     }
     else
     {
-        FatalErrorIn("calcTypes::addSubtract::preCalc")
+        FatalErrorInFunction
             << "Invalid calcMode: " << calcModeName << nl
             << "    Valid calcModes are add and subtract" << nl
             << exit(FatalError);
@@ -241,7 +241,7 @@ void Foam::calcTypes::addSubtract::preCalc
     }
     else
     {
-        FatalErrorIn("calcTypes::addSubtract::preCalc")
+        FatalErrorInFunction
             << "addSubtract requires either -field or -value option"
             << nl << exit(FatalError);
     }
@@ -281,7 +281,7 @@ void Foam::calcTypes::addSubtract::calc
             }
             default:
             {
-                FatalErrorIn("calcTypes::addSubtract::calc")
+                FatalErrorInFunction
                     << "unknown calcType " << calcType_ << nl
                     << abort(FatalError);
             }
@@ -289,7 +289,7 @@ void Foam::calcTypes::addSubtract::calc
     }
     else
     {
-        FatalErrorIn("calcTypes::addSubtract::calc")
+        FatalErrorInFunction
             << "Unable to read base field: " << baseFieldName_
             << nl << exit(FatalError);
     }
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
index d9a57a70fa..89f9db57d6 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcTypeNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,14 +43,14 @@ Foam::autoPtr<Foam::calcType> Foam::calcType::New
         // exit without stack trace
         if (calcTypeName == "-help")
         {
-            FatalErrorIn("calcType::New()")
+            FatalErrorInFunction
                 << "Valid calcType selections are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
                 << exit(FatalError);
         }
         else
         {
-            FatalErrorIn("calcType::New()")
+            FatalErrorInFunction
                 << "Unknown calcType type " << calcTypeName << nl
                 << "Valid calcType selections are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc() << nl
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 535b8281c4..00961fcf4a 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -15,4 +15,6 @@ wmake $targetType jobControl
 wmake $targetType systemCall
 wmake $targetType utilities
 
+./graphics/Allwmake
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/IO/controlDict b/src/postProcessing/functionObjects/IO/controlDict
index a9e0fb2fe3..12ef17034f 100644
--- a/src/postProcessing/functionObjects/IO/controlDict
+++ b/src/postProcessing/functionObjects/IO/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H b/src/postProcessing/functionObjects/IO/doc/IOFunctionObjectsDoc.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/IO/doc/IOFunctionObjectsDoc.H
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
index cb3cfc7d5a..44d0ecfa47 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,7 +49,8 @@ Foam::partialWrite::partialWrite
 )
 :
     name_(name),
-    obr_(obr)
+    obr_(obr),
+    log_(true)
 {
     read(dict);
 }
@@ -65,21 +66,44 @@ Foam::partialWrite::~partialWrite()
 
 void Foam::partialWrite::read(const dictionary& dict)
 {
+    log_.readIfPresent("log", dict);
     dict.lookup("objectNames") >> objectNames_;
     dict.lookup("writeInterval") >> writeInterval_;
     writeInstance_ = 0;
 
-    Info<< type() << " " << name() << ":" << nl
-        << "    dumping every " << writeInterval_
-        << " th outputTime : " << nl << endl ;
-    forAllConstIter(HashSet<word>, objectNames_, iter)
+    if (log_)
     {
-        Info<< ' ' << iter.key();
+        Info<< type() << " " << name() << ":" << nl
+            << "    dumping every outputTime :";
+
+        forAllConstIter(HashSet<word>, objectNames_, iter)
+        {
+            Info<< ' ' << iter.key();
+        }
+
+        word postStr = "";
+        if (writeInterval_ == 2)
+        {
+            postStr = "nd ";
+        }
+        else if (writeInterval_ == 3)
+        {
+            postStr = "rd ";
+        }
+        else
+        {
+            postStr = "th ";
+        }
+
+        Info<< nl
+            << "    dumping all other fields every "
+            << writeInterval_ << postStr << " outputTime" << nl
+            << endl;
     }
 
     if (writeInterval_ < 1)
     {
-        FatalIOErrorIn("partialWrite::read(const dictionary&)", dict)
+        FatalIOErrorInFunction(dict)
             << "Illegal value for writeInterval " << writeInterval_
             << ". It should be >= 1."
             << exit(FatalIOError);
@@ -111,12 +135,12 @@ void Foam::partialWrite::read(const dictionary& dict)
 
 void Foam::partialWrite::execute()
 {
+    // Do nothing - only valid on write
 }
 
 
 void Foam::partialWrite::end()
 {
-    //Pout<< "end at time " << obr_.time().timeName() << endl;
     // Do nothing - only valid on write
 }
 
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
index 09197a671d..95c3f2f500 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,6 +50,7 @@ Description
         type         | type name: partialWrite | yes         |
         objectNames  | objects to write        | yes         |
         writeInterval | write interval         | yes         |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 SeeAlso
@@ -91,11 +92,15 @@ protected:
 
     // Private data
 
-        //- Name of this set of partialWrite
+        //- Name of this set of partialWrite object
         word name_;
 
+        //- Refefence to the database
         const objectRegistry& obr_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
         //- Loaded fields
         UPtrList<volScalarField> vsf_;
         UPtrList<volVectorField> vvf_;
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C b/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
index 56e0089313..16551f4b79 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ void Foam::partialWrite::loadField
                 << " found in database" << endl;
         }
 
-         sfType& sField =
+        sfType& sField =
             const_cast<sfType&>
             (
                 obr_.lookupObject<sfType>(fieldName)
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
index 28bb18292e..bd1b41479c 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(removeRegisteredObject, 0);
+    defineTypeNameAndDebug(removeRegisteredObject, 0);
 }
 
 
@@ -47,7 +47,8 @@ Foam::removeRegisteredObject::removeRegisteredObject
 :
     name_(name),
     obr_(obr),
-    objectNames_()
+    objectNames_(),
+    log_(true)
 {
     read(dict);
 }
@@ -78,7 +79,8 @@ void Foam::removeRegisteredObject::execute()
 
             if (obj.ownedByRegistry())
             {
-                Info<< type() << " " << name_ << " output:" << nl
+                if (log_) Info
+                    << type() << " " << name_ << " output:" << nl
                     << "    removing object " << obj.name() << nl
                     << endl;
 
@@ -92,7 +94,7 @@ void Foam::removeRegisteredObject::execute()
 
 void Foam::removeRegisteredObject::end()
 {
-    execute();
+    // Do nothing - only valid on execute
 }
 
 
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
index fc02432ad8..42aa1f3546 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,6 +46,7 @@ Description
         Property     | Description             | Required    | Default value
         type         | type name: removeRegisteredObject | yes |
         objectNames  | objects to remove       | yes         |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 SeeAlso
@@ -63,6 +64,7 @@ SourceFiles
 
 #include "wordList.H"
 #include "runTimeSelectionTables.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -85,9 +87,10 @@ protected:
 
     // Private data
 
-        //- Name of this set of removeRegisteredObject
+        //- Name of this set of removeRegisteredObject object
         word name_;
 
+        //- Refefence to the database
         const objectRegistry& obr_;
 
         // Read from dictionary
@@ -95,6 +98,9 @@ protected:
             //- Names of objects to control
             wordList objectNames_;
 
+            //- Switch to send output to Info as well as to file
+            Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
index 0e6ec44ce8..2578b44064 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -195,7 +195,7 @@ void Foam::writeDictionary::execute()
 
 void Foam::writeDictionary::end()
 {
-    execute();
+    // do nothing
 }
 
 
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index 81b58a1a5c..5d4e94a466 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(writeRegisteredObject, 0);
+    defineTypeNameAndDebug(writeRegisteredObject, 0);
 }
 
 
@@ -48,7 +48,8 @@ Foam::writeRegisteredObject::writeRegisteredObject
     name_(name),
     exclusiveWriting_(false),
     obr_(obr),
-    objectNames_()
+    objectNames_(),
+    log_(true)
 {
     read(dict);
 }
@@ -64,6 +65,8 @@ Foam::writeRegisteredObject::~writeRegisteredObject()
 
 void Foam::writeRegisteredObject::read(const dictionary& dict)
 {
+    log_.readIfPresent("log", dict);
+
     dict.lookup("objectNames") >> objectNames_;
     dict.readIfPresent("exclusiveWriting", exclusiveWriting_);
 }
@@ -89,7 +92,7 @@ void Foam::writeRegisteredObject::timeSet()
 
 void Foam::writeRegisteredObject::write()
 {
-    Info<< type() << " " << name_ << " output:" << nl;
+    if (log_) Info<< type() << " " << name_ << " output:" << nl;
 
     DynamicList<word> allNames(obr_.toc().size());
     forAll(objectNames_, i)
@@ -102,7 +105,7 @@ void Foam::writeRegisteredObject::write()
         }
         else
         {
-            WarningIn("Foam::writeRegisteredObject::write()")
+            WarningInFunction
                 << "Object " << objectNames_[i] << " not found in "
                 << "database. Available objects:" << nl << obr_.sortedToc()
                 << endl;
@@ -123,7 +126,7 @@ void Foam::writeRegisteredObject::write()
             obj.writeOpt() = IOobject::NO_WRITE;
         }
 
-        Info<< "    writing object " << obj.name() << nl << endl;
+        if (log_) Info<< "    writing object " << obj.name() << nl << endl;
 
         obj.write();
     }
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
index d08dc7c914..c3f282bfa5 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,13 +30,13 @@ Group
 Description
     This function object allows specification of different writing frequency
     of objects registered to the database. It has similar functionality
-    as the main time database through the outputControl setting:
-        timeStep
-        outputTime
-        adjustableTime
-        runTime
-        clockTime
-        cpuTime
+    as the main time database through the \c outputControl setting:
+    - timeStep
+    - outputTime
+    - adjustableTime
+    - runTime
+    - clockTime
+    - cpuTime
 
     Example of function object specification:
     \verbatim
@@ -56,6 +56,7 @@ Description
         type         | type name: writeRegisteredObject | yes |
         objectNames  | objects to write        | yes         |
         exclusiveWriting    | Takes over object writing | no | yes
+        log          | Log to standard output  | no          | yes
     \endtable
 
     exclusiveWriting disables automatic writing (i.e through database) of the
@@ -76,6 +77,7 @@ SourceFiles
 
 #include "wordReList.H"
 #include "runTimeSelectionTables.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -104,7 +106,7 @@ protected:
         //- Takes over the writing from Db
         bool exclusiveWriting_;
 
-        //- Refererence to Db
+        //- Refererence to the database
         const objectRegistry& obr_;
 
         // Read from dictionary
@@ -112,6 +114,9 @@ protected:
             //- Names of objects to control
             wordReList objectNames_;
 
+            //- Switch to send output to Info as well as to file
+            Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
index 480d5fa8be..85595ab6a8 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,13 +37,16 @@ namespace Foam
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::cloudInfo::writeFileHeader(const label i)
+void Foam::cloudInfo::writeFileHeader(Ostream& os) const
 {
-    writeHeader(file(), "Cloud information");
-    writeCommented(file(), "Time");
-    writeTabbed(file(), "nParcels");
-    writeTabbed(file(), "mass");
-    file() << endl;
+    writeHeader(os, "Cloud information");
+    writeCommented(os, "Time");
+    writeTabbed(os, "nParcels");
+    writeTabbed(os, "mass");
+    writeTabbed(os, "Dmax");
+    writeTabbed(os, "D10");
+    writeTabbed(os, "D32");
+    os  << endl;
 }
 
 
@@ -60,7 +63,10 @@ Foam::cloudInfo::cloudInfo
     functionObjectFile(obr, name),
     name_(name),
     obr_(obr),
-    active_(true)
+    active_(true),
+    log_(true),
+    cloudNames_(),
+    filePtrs_()
 {
     read(dict);
 }
@@ -78,47 +84,70 @@ void Foam::cloudInfo::read(const dictionary& dict)
 {
     if (active_)
     {
-        functionObjectFile::resetNames(dict.lookup("clouds"));
+        functionObjectFile::read(dict);
 
-        Info<< type() << " " << name_ << ": ";
-        if (names().size())
+        log_ = dict.lookupOrDefault<Switch>("log", true);
+        dict.lookup("clouds") >> cloudNames_;
+
+        if (log_)
         {
-            Info<< "applying to clouds:" << nl;
-            forAll(names(), i)
+            Info<< type() << " " << name_ << ": ";
+
+            if (cloudNames_.size())
             {
-                Info<< "    " << names()[i] << nl;
+                Info<< "applying to clouds:" << nl;
+                forAll(cloudNames_, i)
+                {
+                    Info<< "    " << cloudNames_[i] << nl;
+                }
+                Info<< endl;
+            }
+            else
+            {
+                Info<< "no clouds to be processed" << nl << endl;
             }
-            Info<< endl;
         }
-        else
+
+        if (writeToFile())
         {
-            Info<< "no clouds to be processed" << nl << endl;
+            filePtrs_.setSize(cloudNames_.size());
+            filePtrs_.clear();
+            forAll(filePtrs_, fileI)
+            {
+                const word& cloudName = cloudNames_[fileI];
+                filePtrs_.set(fileI, createFile(cloudName));
+                writeFileHeader(filePtrs_[fileI]);
+            }
         }
     }
 }
 
 
 void Foam::cloudInfo::execute()
-{}
+{
+    // Do nothing
+}
 
 
 void Foam::cloudInfo::end()
-{}
+{
+    // Do nothing
+}
 
 
 void Foam::cloudInfo::timeSet()
-{}
+{
+    // Do nothing
+}
 
 
 void Foam::cloudInfo::write()
 {
     if (active_)
     {
-        functionObjectFile::write();
-
-        forAll(names(), i)
+        forAll(cloudNames_, cloudI)
         {
-            const word& cloudName = names()[i];
+            const word& cloudName = cloudNames_[cloudI];
 
             const kinematicCloud& cloud =
                 obr_.lookupObject<kinematicCloud>(cloudName);
@@ -127,13 +156,31 @@ void Foam::cloudInfo::write()
             scalar massInSystem =
                 returnReduce(cloud.massInSystem(), sumOp<scalar>());
 
+            scalar Dmax = cloud.Dmax();
+            scalar D10 = cloud.Dij(1, 0);
+            scalar D32 = cloud.Dij(3, 2);
+
             if (Pstream::master())
             {
-                file(i)
-                    << obr_.time().value() << token::TAB
+                writeTime(filePtrs_[cloudI]);
+                filePtrs_[cloudI]
+                    << token::TAB
                     << nParcels << token::TAB
-                    << massInSystem << endl;
+                    << massInSystem << token::TAB
+                    << Dmax << token::TAB
+                    << D10 << token::TAB
+                    << D32 << token::TAB
+                    << endl;
             }
+
+            if (log_) Info
+                << type() << " " << name_ <<  " output:" << nl
+                << "    number of parcels : " << nParcels << nl
+                << "    mass in system    : " << massInSystem << nl
+                << "    maximum diameter  : " << Dmax << nl
+                << "    D10 diameter      : " << D10 << nl
+                << "    D32 diameter      : " << D32 << nl
+                << endl;
         }
     }
 }
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
index 9bd1761061..760b56da9a 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -109,11 +109,20 @@ protected:
         //- on/off switch
         bool active_;
 
+        //- Switch to send output to Info as well
+        Switch log_;
+
+        //- List of cloud names
+        wordList cloudNames_;
+
+        //- Output file per cloud
+        PtrList<OFstream> filePtrs_;
+
 
     // Protected Member Functions
 
         //- File header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
         //- Disallow default bitwise copy construct
         cloudInfo(const cloudInfo&);
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
index da6d02204c..f90ac4a88d 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H b/src/postProcessing/functionObjects/cloud/doc/cloudFunctionObjectsDoc.H
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/cloud/doc/cloudFunctionObjectsDoc.H
diff --git a/src/postProcessing/functionObjects/doc/functionObjects.dox b/src/postProcessing/functionObjects/doc/functionObjects.dox
index 4fa79c730c..d39e82c137 100644
--- a/src/postProcessing/functionObjects/doc/functionObjects.dox
+++ b/src/postProcessing/functionObjects/doc/functionObjects.dox
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,6 +40,7 @@ The current range of features comprises of:
 - \ref grpFieldFunctionObjects
 - \ref grpForcesFunctionObjects
 - \ref grpFVFunctionObjects
+- \ref grpGraphicsFunctionObjects
 - \ref grpIOFunctionObjects
 - \ref grpJobControlFunctionObjects
 - \ref grpUtilitiesFunctionObjects
@@ -63,6 +64,8 @@ functions
         enabled             yes;
         timeStart           0;
         timeEnd             10;
+        evaluateControl     timeStep;
+        evaluateInterval    1;
         outputControl       outputTime;
         outputInterval      1;
         ...
@@ -78,7 +81,9 @@ Where:
     region   | name of region for multi-region cases | no       |
     enabled  | on/off switch                         | no       | yes
     timeStart| start time                            | no       |
-    timeEnd  | end time                              | no       | 
+    timeEnd  | end time                              | no       |
+    evaluateControl | when to evaluate: either 'outputTime' or 'timeStep'| no | timeStep
+    evaluateInterval| steps between evaluation when evaluateControl=timeStep | no | 1
     outputControl | when to output: either 'outputTime' or 'timeStep'| no | timeStep
     outputInterval| steps between output when outputControl=timeStep | no | 1
 \endtable
@@ -88,7 +93,7 @@ typically used as the name of the output directory for any derived data.  The
 \c type entry defines the type of function object properties that follow.
 Since the function objects are packaged into separate libraries, the user must
 tell the code where to find the function object implementation, identified
-using the \c libs entry.  
+using the \c functionObjectLibs entry.
 
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index 75464c4013..3f2b8f9f50 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/src/postProcessing/functionObjects/field/Make/files
@@ -30,20 +30,24 @@ readFields/readFields.C
 readFields/readFieldsFunctionObject.C
 
 streamLine/streamLine.C
+streamLine/streamLineBase.C
 streamLine/streamLineParticle.C
 streamLine/streamLineParticleCloud.C
 streamLine/streamLineFunctionObject.C
 
-wallBoundedStreamLine/wallBoundedStreamLine.C
-wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.C
-wallBoundedStreamLine/wallBoundedStreamLineParticle.C
-wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.C
-wallBoundedStreamLine/wallBoundedParticle.C
-
 surfaceInterpolateFields/surfaceInterpolateFields.C
 surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.C
 
 regionSizeDistribution/regionSizeDistribution.C
 regionSizeDistribution/regionSizeDistributionFunctionObject.C
 
+valueAverage/valueAverage.C
+valueAverage/valueAverageFunctionObject.C
+
+wallBoundedStreamLine/wallBoundedStreamLine.C
+wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.C
+wallBoundedStreamLine/wallBoundedStreamLineParticle.C
+wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.C
+wallBoundedStreamLine/wallBoundedParticle.C
+
 LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects
diff --git a/src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H b/src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
similarity index 100%
rename from src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 97f270f2bb..ce27c9ee39 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 62407d8316..9104b2d293 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,7 +66,8 @@ void Foam::fieldAverage::initialize()
 {
     resetFields();
 
-    Info<< type() << " " << name_ << ":" << nl;
+    if (log_) Info << type() << " " << name_ << ":" << nl;
+
 
     // Add mean fields to the field lists
     forAll(faItems_, fieldI)
@@ -89,7 +90,7 @@ void Foam::fieldAverage::initialize()
     {
         if (!faItems_[fieldI].active())
         {
-            WarningIn("void Foam::fieldAverage::initialize()")
+            WarningInFunction
                 << "Field " << faItems_[fieldI].fieldName()
                 << " not found in database for averaging";
         }
@@ -98,7 +99,7 @@ void Foam::fieldAverage::initialize()
     // ensure first averaging works unconditionally
     prevTimeIndex_ = -1;
 
-    Info<< endl;
+    if (log_) Info << endl;
 
     initialised_ = true;
 }
@@ -123,9 +124,9 @@ void Foam::fieldAverage::calcAverages()
         prevTimeIndex_ = currentTimeIndex;
     }
 
-    Info<< type() << " " << name_ << " output:" << nl;
-
-    Info<< "    Calculating averages" << nl;
+    if (log_) Info
+        << type() << " " << name_ << " output:" << nl
+        << "    Calculating averages" << nl;
 
     addMeanSqrToPrime2Mean<scalar, scalar>();
     addMeanSqrToPrime2Mean<vector, symmTensor>();
@@ -149,7 +150,7 @@ void Foam::fieldAverage::calcAverages()
 
 void Foam::fieldAverage::writeAverages() const
 {
-    Info<< "    Writing average fields" << endl;
+    if (log_) Info << "    Writing average fields" << endl;
 
     writeFields<scalar>();
     writeFields<vector>();
@@ -159,31 +160,17 @@ void Foam::fieldAverage::writeAverages() const
 }
 
 
-void Foam::fieldAverage::writeAveragingProperties() const
+void Foam::fieldAverage::writeAveragingProperties()
 {
-    IOdictionary propsDict
-    (
-        IOobject
-        (
-            "fieldAveragingProperties",
-            obr_.time().timeName(),
-            "uniform",
-            obr_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        )
-    );
-
     forAll(faItems_, fieldI)
     {
         const word& fieldName = faItems_[fieldI].fieldName();
-        propsDict.add(fieldName, dictionary());
-        propsDict.subDict(fieldName).add("totalIter", totalIter_[fieldI]);
-        propsDict.subDict(fieldName).add("totalTime", totalTime_[fieldI]);
-    }
 
-    propsDict.regIOobject::write();
+        dictionary propsDict;
+        propsDict.add("totalIter", totalIter_[fieldI]);
+        propsDict.add("totalTime", totalTime_[fieldI]);
+        setProperty(fieldName, propsDict);
+    }
 }
 
 
@@ -195,47 +182,38 @@ void Foam::fieldAverage::readAveragingProperties()
     totalTime_.clear();
     totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
 
-    if (resetOnRestart_ || resetOnOutput_)
+    if (log_ && (resetOnRestart_ || resetOnOutput_))
     {
         Info<< "    Starting averaging at time " << obr_.time().timeName()
             << nl;
     }
     else
     {
-        IOobject propsDictHeader
-        (
-            "fieldAveragingProperties",
-            obr_.time().timeName(obr_.time().startTime().value()),
-            "uniform",
-            obr_,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE,
-            false
-        );
+        if (log_) Info << "    Restarting averaging for fields:" << nl;
 
-        if (!propsDictHeader.headerOk())
-        {
-            Info<< "    Starting averaging at time " << obr_.time().timeName()
-                << nl;
-            return;
-        }
-
-        IOdictionary propsDict(propsDictHeader);
-
-        Info<< "    Restarting averaging for fields:" << nl;
         forAll(faItems_, fieldI)
         {
             const word& fieldName = faItems_[fieldI].fieldName();
-            if (propsDict.found(fieldName))
+            if (foundProperty(fieldName))
             {
-                dictionary fieldDict(propsDict.subDict(fieldName));
+                dictionary fieldDict;
+                getProperty(fieldName, fieldDict);
 
                 totalIter_[fieldI] = readLabel(fieldDict.lookup("totalIter"));
                 totalTime_[fieldI] = readScalar(fieldDict.lookup("totalTime"));
-                Info<< "        " << fieldName
+
+                if (log_) Info
+                    << "        " << fieldName
                     << " iters = " << totalIter_[fieldI]
                     << " time = " << totalTime_[fieldI] << nl;
             }
+            else
+            {
+                if (log_) Info
+                    << "        " << fieldName
+                    << ": starting averaging at time "
+                    << obr_.time().timeName() << endl;
+            }
         }
     }
 }
@@ -251,37 +229,22 @@ Foam::fieldAverage::fieldAverage
     const bool loadFromFiles
 )
 :
-    name_(name),
+    functionObjectState(obr, name),
     obr_(obr),
-    active_(true),
     prevTimeIndex_(-1),
     resetOnRestart_(false),
     resetOnOutput_(false),
+    log_(true),
     initialised_(false),
     faItems_(),
     totalIter_(),
     totalTime_()
 {
     // Only active if a fvMesh is available
-    if (isA<fvMesh>(obr_))
+    if (setActive<fvMesh>())
     {
         read(dict);
     }
-    else
-    {
-        active_ = false;
-        WarningIn
-        (
-            "fieldAverage::fieldAverage"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool "
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
-            << endl;
-    }
 }
 
 
@@ -299,7 +262,9 @@ void Foam::fieldAverage::read(const dictionary& dict)
     {
         initialised_ = false;
 
-        Info<< type() << " " << name_ << ":" << nl;
+        log_.readIfPresent("log", dict);
+
+        if (log_) Info << type() << " " << name_ << ":" << nl;
 
         dict.readIfPresent("resetOnRestart", resetOnRestart_);
         dict.readIfPresent("resetOnOutput", resetOnOutput_);
@@ -307,7 +272,7 @@ void Foam::fieldAverage::read(const dictionary& dict)
 
         readAveragingProperties();
 
-        Info<< endl;
+        if (log_) Info << endl;
     }
 }
 
@@ -317,19 +282,13 @@ void Foam::fieldAverage::execute()
     if (active_)
     {
         calcAverages();
-        Info<< endl;
+        if (log_) Info << endl;
     }
 }
 
 
 void Foam::fieldAverage::end()
-{
-    if (active_)
-    {
-        calcAverages();
-        Info<< endl;
-    }
-}
+{}
 
 
 void Foam::fieldAverage::timeSet()
@@ -345,7 +304,8 @@ void Foam::fieldAverage::write()
 
         if (resetOnOutput_)
         {
-            Info<< "    Restarting averaging at time " << obr_.time().timeName()
+            if (log_) Info
+                << "    Restarting averaging at time " << obr_.time().timeName()
                 << nl << endl;
 
             totalIter_.clear();
@@ -357,7 +317,7 @@ void Foam::fieldAverage::write()
             initialize();
         }
 
-        Info<< endl;
+        if (log_) Info << endl;
     }
 }
 
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 01b2558010..77216d1191 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -94,9 +94,10 @@ Description
     \table
         Property     | Description             | Required    | Default value
         type         | type name: fieldAverage | yes         |
-        resetOnRestart | flag to reset the averaging on restart | yes  |
+        resetOnRestart | flag to reset the averaging on restart | yes |
         resetOnOutput| flag to reset the averaging on output | yes |
         fields       | list of fields and averaging options | yes |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 
@@ -117,6 +118,7 @@ SourceFiles
 #ifndef fieldAverage_H
 #define fieldAverage_H
 
+#include "functionObjectState.H"
 #include "volFieldsFwd.H"
 #include "Switch.H"
 
@@ -139,20 +141,16 @@ class mapPolyMesh;
 \*---------------------------------------------------------------------------*/
 
 class fieldAverage
+:
+    public functionObjectState
 {
 protected:
 
     // Protected data
 
-        //- Name of this set of field averages.
-        word name_;
-
-        //- Database this class is registered to
+        //- Reference to the database
         const objectRegistry& obr_;
 
-        //- On/off switch
-        bool active_;
-
         //- Time at last call, prevents repeated averaging
         label prevTimeIndex_;
 
@@ -162,6 +160,9 @@ protected:
         //- Reset the averaging process on output flag
         Switch resetOnOutput_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
         //- Initialised flag
         bool initialised_;
 
@@ -251,7 +252,7 @@ protected:
             void writeFields() const;
 
             //- Write averaging properties - steps and time
-            void writeAveragingProperties() const;
+            void writeAveragingProperties();
 
             //- Read averaging properties - steps and time
             void readAveragingProperties();
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
index 62e733481d..e9a0277476 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,7 +38,7 @@ void Foam::fieldAverage::addMeanFieldType(const label fieldI)
     const word& fieldName = faItems_[fieldI].fieldName();
     const word& meanFieldName = faItems_[fieldI].meanFieldName();
 
-    Info<< "    Reading/initialising field " << meanFieldName << endl;
+    if (log_) Info << "    Reading/initialising field " << meanFieldName << endl;
 
     if (obr_.foundObject<Type>(meanFieldName))
     {
@@ -46,7 +46,8 @@ void Foam::fieldAverage::addMeanFieldType(const label fieldI)
     }
     else if (obr_.found(meanFieldName))
     {
-        Info<< "    Cannot allocate average field " << meanFieldName
+        if (log_) Info
+            << "    Cannot allocate average field " << meanFieldName
             << " since an object with that name already exists."
             << " Disabling averaging for field." << endl;
 
@@ -107,7 +108,8 @@ void Foam::fieldAverage::addPrime2MeanFieldType(const label fieldI)
     const word& meanFieldName = faItems_[fieldI].meanFieldName();
     const word& prime2MeanFieldName = faItems_[fieldI].prime2MeanFieldName();
 
-    Info<< "    Reading/initialising field " << prime2MeanFieldName << nl;
+    if (log_) Info
+        << "    Reading/initialising field " << prime2MeanFieldName << endl;
 
     if (obr_.foundObject<Type2>(prime2MeanFieldName))
     {
@@ -115,9 +117,10 @@ void Foam::fieldAverage::addPrime2MeanFieldType(const label fieldI)
     }
     else if (obr_.found(prime2MeanFieldName))
     {
-        Info<< "    Cannot allocate average field " << prime2MeanFieldName
+        if (log_) Info
+            << "    Cannot allocate average field " << prime2MeanFieldName
             << " since an object with that name already exists."
-            << " Disabling averaging for field." << nl;
+            << " Disabling averaging for field." << endl;
 
         faItems_[fieldI].prime2Mean() = false;
     }
@@ -163,10 +166,7 @@ void Foam::fieldAverage::addPrime2MeanField(const label fieldI)
 
         if (!faItems_[fieldI].mean())
         {
-            FatalErrorIn
-            (
-                "void Foam::fieldAverage::addPrime2MeanField(const label) const"
-            )
+            FatalErrorInFunction
                 << "To calculate the prime-squared average, the "
                 << "mean average must also be selected for field "
                 << fieldName << nl << exit(FatalError);
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
index 9f5334c03a..da0d3f0021 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,10 +92,8 @@ void Foam::fieldAverageItem::operator=(const fieldAverageItem& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn
-        (
-            "Foam::fieldAverageItem::operator=(const Foam::fieldAverageItem&)"
-        )   << "Attempted assignment to self" << nl
+        FatalErrorInFunction
+            << "Attempted assignment to self" << nl
             << abort(FatalError);
     }
 
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index 4e30b881ca..0275f78878 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(fieldCoordinateSystemTransform, 0);
+    defineTypeNameAndDebug(fieldCoordinateSystemTransform, 0);
 }
 
 
@@ -48,30 +48,24 @@ Foam::fieldCoordinateSystemTransform::fieldCoordinateSystemTransform
     obr_(obr),
     active_(true),
     fieldSet_(),
-    coordSys_(obr, dict)
+    coordSys_(obr, dict),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (isA<fvMesh>(obr_))
     {
         read(dict);
 
-        Info<< type() << " " << name_ << ":" << nl
+        if (log_) Info
+            << type() << " " << name_ << ":" << nl
             << "   Applying transformation from global Cartesian to local "
             << coordSys_ << nl << endl;
     }
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "fieldCoordinateSystemTransform::fieldCoordinateSystemTransform"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 }
@@ -89,6 +83,7 @@ void Foam::fieldCoordinateSystemTransform::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_.readIfPresent("log", dict);
         dict.lookup("fields") >> fieldSet_;
     }
 }
@@ -98,7 +93,7 @@ void Foam::fieldCoordinateSystemTransform::execute()
 {
     if (active_)
     {
-        Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info<< type() << " " << name_ << " output:" << nl;
 
         forAll(fieldSet_, fieldI)
         {
@@ -115,10 +110,7 @@ void Foam::fieldCoordinateSystemTransform::execute()
 
 void Foam::fieldCoordinateSystemTransform::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -132,7 +124,7 @@ void Foam::fieldCoordinateSystemTransform::write()
 {
     if (active_)
     {
-        Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info<< type() << " " << name_ << " output:" << nl;
 
         forAll(fieldSet_, fieldI)
         {
@@ -141,12 +133,12 @@ void Foam::fieldCoordinateSystemTransform::write()
             const regIOobject& field =
                 obr_.lookupObject<regIOobject>(fieldName);
 
-            Info<< "    writing field " << field.name() << nl;
+            if (log_) Info << "    writing field " << field.name() << nl;
 
             field.write();
         }
 
-        Info<< endl;
+        if (log_) Info<< endl;
     }
 }
 
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index edd1f13b50..3dcf6fcead 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,9 +45,11 @@ Description
             UMean
             UPrime2Mean
         );
-        coordinateSystem
+        origin      (0.001 0 0);
+
+        coordinateRotation
         {
-            origin  (0.001  0       0);
+            type    axesRotation;
             e1      (1      0.15    0);
             e3      (0      0      -1);
         }
@@ -59,7 +61,9 @@ Description
         Property     | Description             | Required    | Default value
         type         | type name: fieldCoordinateSystemTransform | yes |
         fields       | list of fields to be transformed |yes |
-        coordinateSystem | local co-ordinate system | yes    |
+        origin       | origin of local co-ordinate system | yes    |
+        coordinateRotation | orientation of local co-ordinate system | yes    |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 SeeAlso
@@ -117,6 +121,9 @@ protected:
         //- Co-ordinate system to transform to
         coordinateSystem coordSys_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Protected Member Functions
 
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
index 627414b9e4..d56aa1e71a 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,7 +67,7 @@ void Foam::fieldCoordinateSystemTransform::transformField
 
     Foam::transform(transField, R, transField);
 
-    Info<< "    writing field " << transField.name() << nl << endl;
+    if (log_) Info<< "    writing field " << transField.name() << nl << endl;
 
     transField.write();
 }
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
index 4522612dbf..bdda2c6cdd 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -38,9 +38,11 @@ functions
             UPrime2Mean
         );
 
-        coordinateSystem
+        origin  (0.001  0       0);
+
+        coordinateRotation
         {
-            origin  (0.001  0       0);
+            type    axesRotation;
             e1      (1      0.15    0);
             e3      (0      0      -1);
         }
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
index 397b57cf0f..a16386bc88 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index dac7d8a71e..1ffe7b29fd 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,6 +49,45 @@ const Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>
 Foam::fieldMinMax::modeTypeNames_;
 
 
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+void Foam::fieldMinMax::writeFileHeader(Ostream& os) const
+{
+    writeHeader(os, "Field minima and maxima");
+    writeCommented(os, "Time");
+
+    if (writeLocation_)
+    {
+        writeTabbed(os, "field");
+        writeTabbed(os, "min");
+        writeTabbed(os, "position(min)");
+
+        if (Pstream::parRun())
+        {
+            writeTabbed(os, "processor");
+        }
+
+        writeTabbed(os, "max");
+        writeTabbed(os, "position(max)");
+
+        if (Pstream::parRun())
+        {
+            writeTabbed(os, "processor");
+        }
+    }
+    else
+    {
+        forAll(fieldSet_, fieldI)
+        {
+            writeTabbed(os, "min(" + fieldSet_[fieldI] + ')');
+            writeTabbed(os, "max(" + fieldSet_[fieldI] + ')');
+        }
+    }
+
+    os  << endl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::fieldMinMax::fieldMinMax
@@ -59,33 +98,20 @@ Foam::fieldMinMax::fieldMinMax
     const bool loadFromFiles
 )
 :
-    functionObjectFile(obr, name, typeName),
-    name_(name),
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name, typeName, dict),
     obr_(obr),
-    active_(true),
     log_(true),
-    location_(true),
+    writeLocation_(true),
     mode_(mdMag),
     fieldSet_()
 {
     // Check if the available mesh is an fvMesh otherise deactivate
-    if (!isA<fvMesh>(obr_))
+    if (setActive<fvMesh>())
     {
-        active_ = false;
-        WarningIn
-        (
-            "fieldMinMax::fieldMinMax"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
-            << endl;
+        read(dict);
+        writeFileHeader(file());
     }
-
-    read(dict);
 }
 
 
@@ -101,8 +127,10 @@ void Foam::fieldMinMax::read(const dictionary& dict)
 {
     if (active_)
     {
+        functionObjectFile::read(dict);
+
         log_ = dict.lookupOrDefault<Switch>("log", true);
-        location_ = dict.lookupOrDefault<Switch>("location", true);
+        writeLocation_ = dict.lookupOrDefault<Switch>("writeLocation", true);
 
         mode_ = modeTypeNames_[dict.lookupOrDefault<word>("mode", "magnitude")];
         dict.lookup("fields") >> fieldSet_;
@@ -110,46 +138,6 @@ void Foam::fieldMinMax::read(const dictionary& dict)
 }
 
 
-void Foam::fieldMinMax::writeFileHeader(const label i)
-{
-    OFstream& file = this->file();
-
-    writeHeader(file, "Field minima and maxima");
-    writeCommented(file, "Time");
-
-    if (location_)
-    {
-        writeTabbed(file, "field");
-
-        writeTabbed(file, "min");
-        writeTabbed(file, "location(min)");
-
-        if (Pstream::parRun())
-        {
-            writeTabbed(file, "processor");
-        }
-
-        writeTabbed(file, "max");
-        writeTabbed(file, "location(max)");
-
-        if (Pstream::parRun())
-        {
-            writeTabbed(file, "processor");
-        }
-    }
-    else
-    {
-        forAll(fieldSet_, fieldI)
-        {
-            writeTabbed(file, "min(" + fieldSet_[fieldI] + ')');
-            writeTabbed(file, "max(" + fieldSet_[fieldI] + ')');
-        }
-    }
-
-    file<< endl;
-}
-
-
 void Foam::fieldMinMax::execute()
 {
     // Do nothing - only valid on write
@@ -172,9 +160,8 @@ void Foam::fieldMinMax::write()
 {
     if (active_)
     {
-        functionObjectFile::write();
+        if (!writeLocation_) writeTime(file());
 
-        if (!location_) file()<< obr_.time().value();
         if (log_) Info<< type() << " " << name_ <<  " output:" << nl;
 
         forAll(fieldSet_, fieldI)
@@ -186,7 +173,7 @@ void Foam::fieldMinMax::write()
             calcMinMaxFields<tensor>(fieldSet_[fieldI], mode_);
         }
 
-        if (!location_) file()<< endl;
+        if (!writeLocation_) file()<< endl;
         if (log_) Info<< endl;
     }
 }
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index b2246eb9b1..1683375244 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ Group
     grpFieldFunctionObjects
 
 Description
-    This function object calculates the value and location of scalar minimim
+    This function object calculates the value and position of scalar minimim
     and maximum for a list of user-specified fields.  For variables with a rank
     greater than zero, either the min/max of a component value or the magnitude
     is reported.  When operating in parallel, the processor owning the value
@@ -41,15 +41,11 @@ Description
         type        fieldMinMax;
         functionObjectLibs ("libfieldFunctionObjects.so");
         ...
-        write       yes;
+        writeToFile yes;
         log         yes;
-        location    yes;
+        writeLocation yes;
         mode        magnitude;
-        fields
-        (
-            U
-            p
-        );
+        fields      (U p);
     }
     \endverbatim
 
@@ -57,20 +53,24 @@ Description
     \table
         Property     | Description             | Required    | Default value
         type         | type name: fieldMinMax  | yes         |
-        write        | write min/max data to file |  no      | yes
-        log          | write min/max data to standard output | no | no
-        location     | write location of the min/max value | no | yes
+        writeToFile  | write min/max data to file | no       | yes
+        log          | write min/max data to standard output | no | yes
+        writeLocation | write location of the min/max value | no | yes
         mode         | calculation mode: magnitude or component | no | magnitude
+        fields       | list of fields to process | yes       |
     \endtable
 
     Output data is written to the file \<timeDir\>/fieldMinMax.dat
 
 SeeAlso
     Foam::functionObject
+    Foam::functionObjectFile
+    Foam::functionObjectState
     Foam::OutputFilterFunctionObject
 
 SourceFiles
     fieldMinMax.C
+    fieldMinMaxTemplates.C
     IOfieldMinMax.H
 
 \*---------------------------------------------------------------------------*/
@@ -78,8 +78,10 @@ SourceFiles
 #ifndef fieldMinMax_H
 #define fieldMinMax_H
 
+#include "functionObjectState.H"
 #include "functionObjectFile.H"
 #include "Switch.H"
+#include "NamedEnum.H"
 #include "vector.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -94,20 +96,24 @@ class polyMesh;
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                       Class fieldMinMax Declaration
+                         Class fieldMinMax Declaration
 \*---------------------------------------------------------------------------*/
 
 class fieldMinMax
 :
+    public functionObjectState,
     public functionObjectFile
 {
 public:
 
-    enum modeType
-    {
-        mdMag,
-        mdCmpt
-    };
+    // Public enumerations
+
+        enum modeType
+        {
+            mdMag,      // magnitude
+            mdCmpt      // component
+        };
+
 
 protected:
 
@@ -116,20 +122,14 @@ protected:
         //- Mode type names
         static const NamedEnum<modeType, 2> modeTypeNames_;
 
-        //- Name of this set of field min/max
-        //  Also used as the name of the output directory
-        word name_;
-
+        //- Reference to the database
         const objectRegistry& obr_;
 
-        //- on/off switch
-        bool active_;
-
         //- Switch to send output to Info as well
         Switch log_;
 
         //- Switch to write location of min/max values
-        Switch location_;
+        Switch writeLocation_;
 
         //- Mode for min/max - only applicable for ranks > 0
         modeType mode_;
@@ -154,15 +154,16 @@ protected:
             const Type& maxValue
         );
 
+
+        //- Output file header information
+        virtual void writeFileHeader(Ostream& os) const;
+
         //- Disallow default bitwise copy construct
         fieldMinMax(const fieldMinMax&);
 
         //- Disallow default bitwise assignment
         void operator=(const fieldMinMax&);
 
-        //- Output file header information
-        virtual void writeFileHeader(const label i);
-
 
 public:
 
@@ -189,12 +190,6 @@ public:
 
     // Member Functions
 
-        //- Return name of the set of field min/max
-        virtual const word& name() const
-        {
-            return name_;
-        }
-
         //- Read the field min/max data
         virtual void read(const dictionary&);
 
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index 729500caef..78f28c3fa7 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,9 +43,9 @@ void Foam::fieldMinMax::output
 {
     OFstream& file = this->file();
 
-    if (location_)
+    if (writeLocation_)
     {
-        file<< obr_.time().value();
+        writeTime(file());
 
         writeTabbed(file, fieldName);
 
@@ -95,6 +95,15 @@ void Foam::fieldMinMax::output
     }
 
     if (log_) Info<< endl;
+
+    // Write state/results information
+    word nameStr('(' + outputName + ')');
+    this->setResult("min" + nameStr, minValue);
+    this->setResult("min" + nameStr + "_position", minC);
+    this->setResult("min" + nameStr + "_processor", minProcI);
+    this->setResult("max" + nameStr, maxValue);
+    this->setResult("max" + nameStr + "_position", maxC);
+    this->setResult("max" + nameStr + "_processor", maxProcI);
 }
 
 
@@ -163,33 +172,34 @@ void Foam::fieldMinMax::calcMinMaxFields
                 }
 
                 Pstream::gatherList(minVs);
+                Pstream::scatterList(minVs);
                 Pstream::gatherList(minCs);
+                Pstream::scatterList(minCs);
 
                 Pstream::gatherList(maxVs);
+                Pstream::scatterList(maxVs);
                 Pstream::gatherList(maxCs);
+                Pstream::scatterList(maxCs);
 
-                if (Pstream::master())
-                {
-                    label minI = findMin(minVs);
-                    scalar minValue = minVs[minI];
-                    const vector& minC = minCs[minI];
+                label minI = findMin(minVs);
+                scalar minValue = minVs[minI];
+                const vector& minC = minCs[minI];
 
-                    label maxI = findMax(maxVs);
-                    scalar maxValue = maxVs[maxI];
-                    const vector& maxC = maxCs[maxI];
+                label maxI = findMax(maxVs);
+                scalar maxValue = maxVs[maxI];
+                const vector& maxC = maxCs[maxI];
 
-                    output
-                    (
-                        fieldName,
-                        word("mag(" + fieldName + ")"),
-                        minC,
-                        maxC,
-                        minI,
-                        maxI,
-                        minValue,
-                        maxValue
-                    );
-                }
+                output
+                (
+                    fieldName,
+                    word("mag(" + fieldName + ")"),
+                    minC,
+                    maxC,
+                    minI,
+                    maxI,
+                    minValue,
+                    maxValue
+                );
                 break;
             }
             case mdCmpt:
@@ -236,45 +246,40 @@ void Foam::fieldMinMax::calcMinMaxFields
                 }
 
                 Pstream::gatherList(minVs);
+                Pstream::scatterList(minVs);
                 Pstream::gatherList(minCs);
+                Pstream::scatterList(minCs);
 
                 Pstream::gatherList(maxVs);
+                Pstream::scatterList(maxVs);
                 Pstream::gatherList(maxCs);
+                Pstream::scatterList(maxCs);
 
-                if (Pstream::master())
-                {
-                    label minI = findMin(minVs);
-                    Type minValue = minVs[minI];
-                    const vector& minC = minCs[minI];
+                label minI = findMin(minVs);
+                Type minValue = minVs[minI];
+                const vector& minC = minCs[minI];
 
-                    label maxI = findMax(maxVs);
-                    Type maxValue = maxVs[maxI];
-                    const vector& maxC = maxCs[maxI];
+                label maxI = findMax(maxVs);
+                Type maxValue = maxVs[maxI];
+                const vector& maxC = maxCs[maxI];
 
-                    output
-                    (
-                        fieldName,
-                        fieldName,
-                        minC,
-                        maxC,
-                        minI,
-                        maxI,
-                        minValue,
-                        maxValue
-                    );
-                }
+                output
+                (
+                    fieldName,
+                    fieldName,
+                    minC,
+                    maxC,
+                    minI,
+                    maxI,
+                    minValue,
+                    maxValue
+                );
                 break;
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "Foam::fieldMinMax::calcMinMaxFields"
-                    "("
-                        "const word&, "
-                        "const modeType&"
-                    ")"
-                )   << "Unknown min/max mode: " << modeTypeNames_[mode_]
+                FatalErrorInFunction
+                    << "Unknown min/max mode: " << modeTypeNames_[mode_]
                     << exit(FatalError);
             }
         }
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index 9d4b8400c8..683b5df34b 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -79,13 +79,11 @@ void Foam::fieldValues::cellSource::setCellZoneCells()
     {
         case stCellZone:
         {
-            dict().lookup("sourceName") >> sourceName_;
-
             label zoneId = mesh().cellZones().findZoneID(sourceName_);
 
             if (zoneId < 0)
             {
-                FatalErrorIn("cellSource::cellSource::setCellZoneCells()")
+                FatalErrorInFunction
                     << "Unknown cell zone name: " << sourceName_
                     << ". Valid cell zones are: " << mesh().cellZones().names()
                     << nl << exit(FatalError);
@@ -105,7 +103,7 @@ void Foam::fieldValues::cellSource::setCellZoneCells()
 
         default:
         {
-            FatalErrorIn("cellSource::setCellZoneCells()")
+            FatalErrorInFunction
                << "Unknown source type. Valid source types are:"
                 << sourceTypeNames_ << nl << exit(FatalError);
         }
@@ -132,10 +130,8 @@ void Foam::fieldValues::cellSource::initialise(const dictionary& dict)
 
     if (nCells_ == 0)
     {
-        WarningIn
-        (
-            "Foam::fieldValues::cellSource::initialise(const dictionary&)"
-        )   << type() << " " << name_ << ": "
+        WarningInFunction
+            << type() << " " << name_ << ": "
             << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl
             << "    Source has no cells - deactivating" << endl;
 
@@ -145,7 +141,8 @@ void Foam::fieldValues::cellSource::initialise(const dictionary& dict)
 
     volume_ = volume();
 
-    Info<< type() << " " << name_ << ":"
+    if (log_) Info
+        << type() << " " << name_ << ":"
         << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl
         << "    total cells  = " << nCells_ << nl
         << "    total volume = " << volume_
@@ -153,36 +150,35 @@ void Foam::fieldValues::cellSource::initialise(const dictionary& dict)
 
     if (dict.readIfPresent("weightField", weightFieldName_))
     {
-        Info<< "    weight field = " << weightFieldName_;
+        if (log_) Info << "    weight field = " << weightFieldName_;
     }
 
-    Info<< nl << endl;
+    if (log_) Info << nl << endl;
 }
 
 
-void Foam::fieldValues::cellSource::writeFileHeader(const label i)
+void Foam::fieldValues::cellSource::writeFileHeader(Ostream& os) const
 {
-    writeCommented(file(), "Source : ");
-    file() << sourceTypeNames_[source_] << " " << sourceName_ << endl;
-    writeCommented(file(), "Cells  : ");
-    file() << nCells_ << endl;
-    writeCommented(file(), "Volume : ");
-    file() << volume_ << endl;
+    writeHeaderValue(os, "Source", sourceTypeNames_[source_]);
+    writeHeaderValue(os, "Name", sourceName_);
+    writeHeaderValue(os, "Cells", nCells_);
+    writeHeaderValue(os, "Volume", volume_);
+    writeHeaderValue(os, "Scale factor", scaleFactor_);
 
-    writeCommented(file(), "Time");
+
+    writeCommented(os, "Time");
     if (writeVolume_)
     {
-        file() << tab << "Volume";
+        os  << tab << "Volume";
     }
 
     forAll(fields_, i)
     {
-        file()
-            << tab << operationTypeNames_[operation_]
+        os  << tab << operationTypeNames_[operation_]
             << "(" << fields_[i] << ")";
     }
 
-    file() << endl;
+    os << endl;
 }
 
 
@@ -204,7 +200,11 @@ Foam::fieldValues::cellSource::cellSource
     weightFieldName_("none"),
     writeVolume_(dict.lookupOrDefault("writeVolume", false))
 {
-    read(dict);
+    if (active_)
+    {
+        read(dict);
+        writeFileHeader(file());
+    }
 }
 
 
@@ -218,11 +218,11 @@ Foam::fieldValues::cellSource::~cellSource()
 
 void Foam::fieldValues::cellSource::read(const dictionary& dict)
 {
-    fieldValue::read(dict);
-
     if (active_)
     {
-        // no additional info to read
+        fieldValue::read(dict);
+
+        // No additional info to read
         initialise(dict);
     }
 }
@@ -234,45 +234,43 @@ void Foam::fieldValues::cellSource::write()
 
     if (active_)
     {
-        if (Pstream::master())
+        writeTime(file());
+
+        // Construct weight field. Note: zero size indicates unweighted
+        scalarField weightField;
+        if (weightFieldName_ != "none")
         {
-            file() << obr_.time().value();
+            weightField = setFieldValues<scalar>(weightFieldName_, true);
         }
 
         if (writeVolume_)
         {
             volume_ = volume();
-            if (Pstream::master())
-            {
-                file() << tab << volume_;
-            }
+            file() << tab << volume_;
             if (log_) Info<< "    total volume = " << volume_ << endl;
         }
 
         forAll(fields_, i)
         {
             const word& fieldName = fields_[i];
-            bool processed = false;
+            bool ok = false;
 
-            processed = processed || writeValues<scalar>(fieldName);
-            processed = processed || writeValues<vector>(fieldName);
-            processed = processed || writeValues<sphericalTensor>(fieldName);
-            processed = processed || writeValues<symmTensor>(fieldName);
-            processed = processed || writeValues<tensor>(fieldName);
+            ok = ok || writeValues<scalar>(fieldName, weightField);
+            ok = ok || writeValues<vector>(fieldName, weightField);
+            ok = ok || writeValues<sphericalTensor>(fieldName, weightField);
+            ok = ok || writeValues<symmTensor>(fieldName, weightField);
+            ok = ok || writeValues<tensor>(fieldName, weightField);
 
-            if (!processed)
+            if (!ok)
             {
-                WarningIn("void Foam::fieldValues::cellSource::write()")
+                WarningInFunction
                     << "Requested field " << fieldName
                     << " not found in database and not processed"
                     << endl;
             }
         }
 
-        if (Pstream::master())
-        {
-            file()<< endl;
-        }
+        file()<< endl;
 
         if (log_) Info<< endl;
     }
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 42f788d884..912b189d25 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,11 +62,11 @@ Description
         log          | Write data to standard output | no    | no
         valueOutput  | Write the raw output values | yes     |
         writeVolume  | Write the volume of the cellSource | no |
-        source       | cell source: see below  | yes         |
-        sourceName   | name of cell source if required  | no |
-        operation    | operation to perform    | yes         |
-        weightField  | name of field to apply weighting | no |
-        fields       | list of fields to operate on | yes    |
+        source       | Cell source: see below  | yes         |
+        sourceName   | Name of cell source if required  | no |
+        operation    | Operation to perform    | yes         |
+        weightField  | Name of field to apply weighting | no |
+        fields       | List of fields to operate on | yes    |
     \endtable
 
     \linebreak
@@ -228,7 +228,7 @@ protected:
         ) const;
 
         //- Output file header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
 
 public:
@@ -272,7 +272,11 @@ public:
 
             //- Templated helper function to output field values
             template<class Type>
-            bool writeValues(const word& fieldName);
+            bool writeValues
+            (
+                const word& fieldName,
+                const scalarField& weightField
+            );
 
             //- Filter a field according to cellIds
             template<class Type>
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
index 15030ea689..206949836a 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,15 +58,8 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::cellSource::setFieldValues
 
     if (mustGet)
     {
-        FatalErrorIn
-        (
-            "Foam::tmp<Foam::Field<Type> > "
-            "Foam::fieldValues::cellSource::setFieldValues"
-            "("
-                "const word&, "
-                "const bool"
-            ") const"
-        )   << "Field " << fieldName << " not found in database"
+        FatalErrorInFunction
+            << "Field " << fieldName << " not found in database"
             << abort(FatalError);
     }
 
@@ -87,52 +80,66 @@ Type Foam::fieldValues::cellSource::processValues
     {
         case opSum:
         {
-            result = sum(values);
+            result = gSum(values);
             break;
         }
         case opSumMag:
         {
-            result = sum(cmptMag(values));
+            result = gSum(cmptMag(values));
             break;
         }
         case opAverage:
         {
-            result = sum(values)/values.size();
+            label n = returnReduce(values.size(), sumOp<label>());
+            result = gSum(values)/(scalar(n) + ROOTVSMALL);
             break;
         }
         case opWeightedAverage:
         {
-            result = sum(weightField*values)/sum(weightField);
+            label wSize = returnReduce(weightField.size(), sumOp<label>());
+
+            if (wSize > 0)
+            {
+                result =
+                    gSum(weightField*values)/(gSum(weightField) + ROOTVSMALL);
+            }
+            else
+            {
+                label n = returnReduce(values.size(), sumOp<label>());
+                result = gSum(values)/(scalar(n) + ROOTVSMALL);
+            }
             break;
         }
         case opVolAverage:
         {
-            result = sum(V*values)/sum(V);
+            result = gSum(values*V)/(gSum(V) + ROOTVSMALL);
             break;
         }
         case opWeightedVolAverage:
         {
-            result = sum(weightField*V*values)/sum(weightField*V);
+            result = gSum(weightField*V*values)/gSum(weightField*V);
             break;
         }
         case opVolIntegrate:
         {
-            result = sum(V*values);
+            result = gSum(V*values);
             break;
         }
         case opMin:
         {
-            result = min(values);
+            result = gMin(values);
             break;
         }
         case opMax:
         {
-            result = max(values);
+            result = gMax(values);
             break;
         }
         case opCoV:
         {
-            Type meanValue = sum(values*V)/sum(V);
+            const scalar sumV = gSum(V);
+
+            Type meanValue = gSum(V*values)/sumV;
 
             const label nComp = pTraits<Type>::nComponents;
 
@@ -142,7 +149,7 @@ Type Foam::fieldValues::cellSource::processValues
                 scalar mean = component(meanValue, d);
                 scalar& res = setComponent(result, d);
 
-                res = sqrt(sum(V*sqr(vals - mean))/sum(V))/mean;
+                res = sqrt(gSum(V*sqr(vals - mean))/sumV)/(mean + ROOTVSMALL);
             }
 
             break;
@@ -160,7 +167,11 @@ Type Foam::fieldValues::cellSource::processValues
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
+bool Foam::fieldValues::cellSource::writeValues
+(
+    const word& fieldName,
+    const scalarField& weightField
+)
 {
     const bool ok = validField<Type>(fieldName);
 
@@ -168,26 +179,13 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
     {
         Field<Type> values(setFieldValues<Type>(fieldName));
         scalarField V(filterField(mesh().V()));
-        scalarField weightField(values.size(), 1.0);
 
-        if (weightFieldName_ != "none")
+        if (valueOutput_)
         {
-            weightField = setFieldValues<scalar>(weightFieldName_, true);
-        }
+            Field<Type> allValues(values);
+            combineFields(allValues);
 
-        // Combine onto master
-        combineFields(values);
-        combineFields(V);
-        combineFields(weightField);
-
-        if (Pstream::master())
-        {
-            Type result = processValues(values, V, weightField);
-
-            // Add to result dictionary, over-writing any previous entry
-            resultDict_.add(fieldName, result, true);
-
-            if (valueOutput_)
+            if (Pstream::master())
             {
                 IOField<Type>
                 (
@@ -200,17 +198,27 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
                         IOobject::NO_READ,
                         IOobject::NO_WRITE
                     ),
-                    weightField*values
+                    allValues
                 ).write();
             }
-
-
-            file()<< tab << result;
-
-            if (log_) Info<< "    " << operationTypeNames_[operation_]
-                << "(" << sourceName_ << ") of " << fieldName
-                <<  " = " << result << endl;
         }
+
+        // Apply scale factor
+        values *= scaleFactor_;
+
+        Type result = processValues(values, V, weightField);
+
+        file()<< tab << result;
+
+        if (log_) Info
+            << "    " << operationTypeNames_[operation_]
+            << "(" << sourceName_ << ") of " << fieldName
+            <<  " = " << result << endl;
+
+        // write state/results information
+        const word& opName = operationTypeNames_[operation_];
+        word resultName = opName + '(' + sourceName_ + ',' + fieldName + ')';
+        this->setResult(resultName, result);
     }
 
     return ok;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 5b0e8b7a3e..f94eb29475 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -60,10 +60,13 @@ functions
         // Output field values as well
         valueOutput     true;
 
+        // Output format for field values
+        surfaceFormat vtk;
+
         // Type of source: patch/faceZone/sampledSurface
         source          patch;
 
-        // if patch or faceZone: name of patch or faceZone
+        // If patch or faceZone: name of patch or faceZone
         sourceName      movingWall;
 
         //// if sampledSurface: dictionary with a sampledSurface
@@ -96,6 +99,7 @@ functions
         outputControl   outputTime;
         log             true;
         valueOutput     true;
+        surfaceFormat   vtk;
         source          faceZone;
         sourceName      f0;
         operation       sum;
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 4e1f79807d..da3e4cd635 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -90,7 +90,7 @@ void Foam::fieldValues::faceSource::setFaceZoneFaces()
 
     if (zoneId < 0)
     {
-        FatalErrorIn("faceSource::faceSource::setFaceZoneFaces()")
+        FatalErrorInFunction
             << type() << " " << name_ << ": "
             << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl
             << "    Unknown face zone name: " << sourceName_
@@ -175,7 +175,7 @@ void Foam::fieldValues::faceSource::setPatchFaces()
 
     if (patchId < 0)
     {
-        FatalErrorIn("faceSource::constructFaceAddressing()")
+        FatalErrorInFunction
             << type() << " " << name_ << ": "
             << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl
             << "    Unknown patch name: " << sourceName_
@@ -352,7 +352,7 @@ void Foam::fieldValues::faceSource::combineSurfaceGeometry
 
         if (Pstream::parRun())
         {
-            // dimension as fraction of mesh bounding box
+            // Dimension as fraction of mesh bounding box
             scalar mergeDim = 1e-10*mesh().bounds().mag();
 
             labelList pointsMap;
@@ -400,8 +400,6 @@ Foam::scalar Foam::fieldValues::faceSource::totalArea() const
 
 void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
 {
-    dict.lookup("sourceName") >> sourceName_;
-
     switch (source_)
     {
         case stFaceZone:
@@ -421,7 +419,7 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
         }
         default:
         {
-            FatalErrorIn("faceSource::initialise()")
+            FatalErrorInFunction
                 << type() << " " << name_ << ": "
                 << sourceTypeNames_[source_] << "(" << sourceName_ << "):"
                 << nl << "    Unknown source type. Valid source types are:"
@@ -431,10 +429,7 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
 
     if (nFaces_ == 0)
     {
-        WarningIn
-        (
-            "Foam::fieldValues::faceSource::initialise(const dictionary&)"
-        )
+        WarningInFunction
             << type() << " " << name_ << ": "
             << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl
             << "    Source has no faces - deactivating" << endl;
@@ -450,26 +445,18 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
 
     totalArea_ = totalArea();
 
-    Info<< type() << " " << name_ << ":" << nl
-        << "    total faces  = " << nFaces_
-        << nl
-        << "    total area   = " << totalArea_
-        << nl;
+    if (log_) Info
+        << type() << " " << name_ << ":" << nl
+        << "    total faces  = " << nFaces_ << nl
+        << "    total area   = " << totalArea_ << nl;
 
     if (dict.readIfPresent("weightField", weightFieldName_))
     {
-        Info<< "    weight field = " << weightFieldName_ << nl;
+        if (log_) Info << "    weight field = " << weightFieldName_ << nl;
 
         if (source_ == stSampledSurface)
         {
-            FatalIOErrorIn
-            (
-                "void Foam::fieldValues::faceSource::initialise"
-                "("
-                    "const dictionary&"
-                ")",
-                dict
-            )
+            FatalIOErrorInFunction(dict)
                 << "Cannot use weightField for a sampledSurface"
                 << exit(FatalIOError);
         }
@@ -480,19 +467,12 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
         if (weightFieldName_ == "none")
         {
             dict.lookup("orientedWeightField") >>  weightFieldName_;
-            Info<< "    weight field = " << weightFieldName_ << nl;
+            if (log_) Info << "    weight field = " << weightFieldName_ << nl;
             orientWeightField_ = true;
         }
         else
         {
-            FatalIOErrorIn
-            (
-                "void Foam::fieldValues::faceSource::initialise"
-                "("
-                    "const dictionary&"
-                ")",
-                dict
-            )
+            FatalIOErrorInFunction(dict)
                 << "Either weightField or orientedWeightField can be supplied, "
                 << "but not both"
                 << exit(FatalIOError);
@@ -506,12 +486,7 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
         fields_.append(orientedFields);
     }
 
-    if (dict.readIfPresent("scaleFactor", scaleFactor_))
-    {
-        Info<< "    scale factor = " << scaleFactor_ << nl;
-    }
-
-    Info<< nl << endl;
+    if (log_) Info << nl << endl;
 
     if (valueOutput_)
     {
@@ -530,29 +505,27 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict)
 }
 
 
-void Foam::fieldValues::faceSource::writeFileHeader(const label i)
+void Foam::fieldValues::faceSource::writeFileHeader(Ostream& os) const
 {
-    writeCommented(file(), "Source : ");
-    file() << sourceTypeNames_[source_] << " " << sourceName_ << endl;
-    writeCommented(file(), "Faces  : ");
-    file() << nFaces_ << endl;
-    writeCommented(file(), "Area   : ");
-    file() << totalArea_ << endl;
+    writeHeaderValue(os, "Source", sourceTypeNames_[source_]);
+    writeHeaderValue(os, "Name", sourceName_);
+    writeHeaderValue(os, "Faces", nFaces_);
+    writeHeaderValue(os, "Total area", totalArea_);
+    writeHeaderValue(os, "Scale factor", scaleFactor_);
 
-    writeCommented(file(), "Time");
+    writeCommented(os, "Time");
     if (writeArea_)
     {
-        file() << tab << "Area";
+        os  << tab << "Area";
     }
 
     forAll(fields_, i)
     {
-        file()
-            << tab << operationTypeNames_[operation_]
+        os  << tab << operationTypeNames_[operation_]
             << "(" << fields_[i] << ")";
     }
 
-    file() << endl;
+    os  << endl;
 }
 
 
@@ -569,14 +542,14 @@ Foam::scalar Foam::fieldValues::faceSource::processValues
         case opSumDirection:
         {
             vector n(dict_.lookup("direction"));
-            return sum(pos(values*(Sf & n))*mag(values));
+            return gSum(pos(values*(Sf & n))*mag(values));
         }
         case opSumDirectionBalance:
         {
             vector n(dict_.lookup("direction"));
             const scalarField nv(values*(Sf & n));
 
-            return sum(pos(nv)*mag(values) - neg(nv)*mag(values));
+            return gSum(pos(nv)*mag(values) - neg(nv)*mag(values));
         }
         default:
         {
@@ -603,7 +576,7 @@ Foam::vector Foam::fieldValues::faceSource::processValues
             n /= mag(n) + ROOTVSMALL;
             const scalarField nv(n & values);
 
-            return sum(pos(nv)*n*(nv));
+            return gSum(pos(nv)*n*(nv));
         }
         case opSumDirectionBalance:
         {
@@ -611,16 +584,16 @@ Foam::vector Foam::fieldValues::faceSource::processValues
             n /= mag(n) + ROOTVSMALL;
             const scalarField nv(n & values);
 
-            return sum(pos(nv)*n*(nv));
+            return gSum(pos(nv)*n*(nv));
         }
         case opAreaNormalAverage:
         {
-            scalar result = sum(values & Sf)/sum(mag(Sf));
+            scalar result = gSum(values & Sf)/gSum(mag(Sf));
             return vector(result, 0.0, 0.0);
         }
         case opAreaNormalIntegrate:
         {
-            scalar result = sum(values & Sf);
+            scalar result = gSum(values & Sf);
             return vector(result, 0.0, 0.0);
         }
         default:
@@ -649,14 +622,17 @@ Foam::fieldValues::faceSource::faceSource
     weightFieldName_("none"),
     orientWeightField_(false),
     orientedFieldsStart_(labelMax),
-    scaleFactor_(1.0),
     writeArea_(dict.lookupOrDefault("writeArea", false)),
     nFaces_(0),
     faceId_(),
     facePatchId_(),
     faceSign_()
 {
-    read(dict);
+    if (active_)
+    {
+        read(dict);
+        writeFileHeader(file());
+    }
 }
 
 
@@ -670,10 +646,11 @@ Foam::fieldValues::faceSource::~faceSource()
 
 void Foam::fieldValues::faceSource::read(const dictionary& dict)
 {
-    fieldValue::read(dict);
-
     if (active_)
     {
+        fieldValue::read(dict);
+
+        // No additional info to read
         initialise(dict);
     }
 }
@@ -690,27 +667,21 @@ void Foam::fieldValues::faceSource::write()
             surfacePtr_().update();
         }
 
-        if (Pstream::master())
-        {
-            file() << obr_.time().value();
-        }
+        writeTime(file());
 
         if (writeArea_)
         {
             totalArea_ = totalArea();
-            if (Pstream::master())
-            {
-                file() << tab << totalArea_;
-            }
+            file() << tab << totalArea_;
             if (log_) Info<< "    total area = " << totalArea_ << endl;
         }
 
-        // construct weight field. Note: zero size means weight = 1
+        // Construct weight field. Note: zero size indicates unweighted
         scalarField weightField;
         if (weightFieldName_ != "none")
         {
             weightField =
-                getFieldValues<scalar>
+                setFieldValues<scalar>
                 (
                     weightFieldName_,
                     true,
@@ -718,10 +689,7 @@ void Foam::fieldValues::faceSource::write()
                 );
         }
 
-        // Combine onto master
-        combineFields(weightField);
-
-        // process the fields
+        // Process the fields
         forAll(fields_, i)
         {
             const word& fieldName = fields_[i];
@@ -730,24 +698,21 @@ void Foam::fieldValues::faceSource::write()
             bool orient = i >= orientedFieldsStart_;
             ok = ok || writeValues<scalar>(fieldName, weightField, orient);
             ok = ok || writeValues<vector>(fieldName, weightField, orient);
-            ok = ok
-              || writeValues<sphericalTensor>(fieldName, weightField, orient);
+            ok = ok ||
+                writeValues<sphericalTensor>(fieldName, weightField, orient);
             ok = ok || writeValues<symmTensor>(fieldName, weightField, orient);
             ok = ok || writeValues<tensor>(fieldName, weightField, orient);
 
             if (!ok)
             {
-                WarningIn("void Foam::fieldValues::faceSource::write()")
+                WarningInFunction
                     << "Requested field " << fieldName
                     << " not found in database and not processed"
                     << endl;
             }
         }
 
-        if (Pstream::master())
-        {
-            file()<< endl;
-        }
+        file()<< endl;
 
         if (log_) Info<< endl;
     }
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index e74b840f18..b85ebbf560 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -257,9 +257,6 @@ protected:
         //- Start index of fields that require application of flipMap
         label orientedFieldsStart_;
 
-        //- Scale factor - optional
-        scalar scaleFactor_;
-
         //- Total area of the faceSource
         scalar totalArea_;
 
@@ -300,7 +297,7 @@ protected:
 
         //- Return field values by looking up field name
         template<class Type>
-        tmp<Field<Type> > getFieldValues
+        tmp<Field<Type> > setFieldValues
         (
             const word& fieldName,
             const bool mustGet = false,
@@ -328,7 +325,7 @@ protected:
         ) const;
 
         //- Output file header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
 
 public:
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index 53bca6f1fa..de2c0044bb 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,7 @@ bool Foam::fieldValues::faceSource::validField(const word& fieldName) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
+Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::setFieldValues
 (
     const word& fieldName,
     const bool mustGet,
@@ -110,16 +110,8 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
 
     if (mustGet)
     {
-        FatalErrorIn
-        (
-            "Foam::tmp<Foam::Field<Type> > "
-            "Foam::fieldValues::faceSource::getFieldValues"
-            "("
-                "const word&, "
-                "const bool, "
-                "const bool"
-            ") const"
-        )   << "Field " << fieldName << " not found in database"
+        FatalErrorInFunction
+            << "Field " << fieldName << " not found in database"
             << abort(FatalError);
     }
 
@@ -140,26 +132,17 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
     {
         case opSum:
         {
-            result = sum(values);
+            result = gSum(values);
             break;
         }
         case opSumMag:
         {
-            result = sum(cmptMag(values));
+            result = gSum(cmptMag(values));
             break;
         }
         case opSumDirection:
         {
-            FatalErrorIn
-            (
-                "template<class Type>"
-                "Type Foam::fieldValues::faceSource::processSameTypeValues"
-                "("
-                    "const Field<Type>&, "
-                    "const vectorField&, "
-                    "const scalarField&"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "Operation " << operationTypeNames_[operation_]
                 << " not available for values of type "
                 << pTraits<Type>::typeName
@@ -170,16 +153,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         }
         case opSumDirectionBalance:
         {
-            FatalErrorIn
-            (
-                "template<class Type>"
-                "Type Foam::fieldValues::faceSource::processSameTypeValues"
-                "("
-                    "const Field<Type>&, "
-                    "const vectorField&, "
-                    "const scalarField&"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "Operation " << operationTypeNames_[operation_]
                 << " not available for values of type "
                 << pTraits<Type>::typeName
@@ -190,18 +164,23 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         }
         case opAverage:
         {
-            result = sum(values)/values.size();
+            label n = returnReduce(values.size(), sumOp<label>());
+            result = gSum(values)/(scalar(n) + ROOTVSMALL);
             break;
         }
         case opWeightedAverage:
         {
-            if (weightField.size())
+            label wSize = returnReduce(weightField.size(), sumOp<label>());
+
+            if (wSize > 0)
             {
-                result = sum(weightField*values)/sum(weightField);
+                result =
+                    gSum(weightField*values)/(gSum(weightField) + ROOTVSMALL);
             }
             else
             {
-                result = sum(values)/values.size();
+                label n = returnReduce(values.size(), sumOp<label>());
+                result = gSum(values)/(scalar(n) + ROOTVSMALL);
             }
             break;
         }
@@ -209,20 +188,21 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         {
             const scalarField magSf(mag(Sf));
 
-            result = sum(magSf*values)/sum(magSf);
+            result = gSum(magSf*values)/gSum(magSf);
             break;
         }
         case opWeightedAreaAverage:
         {
             const scalarField magSf(mag(Sf));
+            label wSize = returnReduce(weightField.size(), sumOp<label>());
 
-            if (weightField.size())
+            if (wSize > 0)
             {
-                result = sum(weightField*magSf*values)/sum(magSf*weightField);
+                result = gSum(weightField*magSf*values)/gSum(magSf*weightField);
             }
             else
             {
-                result = sum(magSf*values)/sum(magSf);
+                result = gSum(magSf*values)/gSum(magSf);
             }
             break;
         }
@@ -230,24 +210,26 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         {
             const scalarField magSf(mag(Sf));
 
-            result = sum(magSf*values);
+            result = gSum(magSf*values);
             break;
         }
         case opMin:
         {
-            result = min(values);
+            result = gMin(values);
             break;
         }
         case opMax:
         {
-            result = max(values);
+            result = gMax(values);
             break;
         }
         case opCoV:
         {
             const scalarField magSf(mag(Sf));
 
-            Type meanValue = sum(values*magSf)/sum(magSf);
+            const scalar gSumMagSf = gSum(magSf);
+
+            Type meanValue = gSum(values*magSf)/gSumMagSf;
 
             const label nComp = pTraits<Type>::nComponents;
 
@@ -257,7 +239,9 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
                 scalar mean = component(meanValue, d);
                 scalar& res = setComponent(result, d);
 
-                res = sqrt(sum(magSf*sqr(vals - mean))/sum(magSf))/mean;
+                res =
+                    sqrt(gSum(magSf*sqr(vals - mean))/gSumMagSf)
+                   /(mean + ROOTVSMALL);
             }
 
             break;
@@ -299,7 +283,7 @@ bool Foam::fieldValues::faceSource::writeValues
 
     if (ok)
     {
-        Field<Type> values(getFieldValues<Type>(fieldName, true, orient));
+        Field<Type> values(setFieldValues<Type>(fieldName, true, orient));
 
         vectorField Sf;
         if (surfacePtr_.valid())
@@ -313,13 +297,12 @@ bool Foam::fieldValues::faceSource::writeValues
             Sf = filterField(mesh().Sf(), true);
         }
 
-        // Combine onto master
-        combineFields(values);
-        combineFields(Sf);
-
         // Write raw values on surface if specified
         if (surfaceWriterPtr_.valid())
         {
+            Field<Type> allValues(values);
+            combineFields(allValues);
+
             faceList faces;
             pointField points;
 
@@ -344,29 +327,28 @@ bool Foam::fieldValues::faceSource::writeValues
                     points,
                     faces,
                     fieldName,
-                    values,
+                    allValues,
                     false
                 );
             }
         }
 
-
         // Apply scale factor
         values *= scaleFactor_;
 
-        if (Pstream::master())
-        {
-            Type result = processValues(values, Sf, weightField);
+        Type result = processValues(values, Sf, weightField);
 
-            // Add to result dictionary, over-writing any previous entry
-            resultDict_.add(fieldName, result, true);
+        file()<< tab << result;
 
-            file()<< tab << result;
+        if (log_) Info
+            << "    " << operationTypeNames_[operation_]
+            << "(" << sourceName_ << ") for " << fieldName
+            <<  " = " << result << endl;
 
-            if (log_) Info<< "    " << operationTypeNames_[operation_]
-                << "(" << sourceName_ << ") of " << fieldName
-                <<  " = " << result << endl;
-        }
+        // Write state/results information
+        const word& opName = operationTypeNames_[operation_];
+        word resultName = opName + '(' + sourceName_ + ',' + fieldName + ')';
+        this->setResult(resultName, result);
     }
 
     return ok;
@@ -393,14 +375,8 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::filterField
         }
         else
         {
-            FatalErrorIn
-            (
-                "fieldValues::faceSource::filterField"
-                "("
-                    "const GeometricField<Type, fvPatchField, volMesh>&, "
-                    "const bool"
-                ") const"
-            )   << type() << " " << name_ << ": "
+            FatalErrorInFunction
+                << type() << " " << name_ << ": "
                 << sourceTypeNames_[source_] << "(" << sourceName_ << "):"
                 << nl
                 << "    Unable to process internal faces for volume field "
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
index e54187c5f4..0274a753dd 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,11 +43,14 @@ void Foam::fieldValue::read(const dictionary& dict)
 {
     if (active_)
     {
+        functionObjectFile::read(dict);
+
         dict_ = dict;
 
         log_ = dict.lookupOrDefault<Switch>("log", true);
         dict.lookup("fields") >> fields_;
         dict.lookup("valueOutput") >> valueOutput_;
+        dict.readIfPresent("scaleFactor", scaleFactor_);
     }
 }
 
@@ -56,9 +59,7 @@ void Foam::fieldValue::write()
 {
     if (active_)
     {
-        functionObjectFile::write();
-
-        if (log_) Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info << type() << " " << name_ << " output:" << nl;
     }
 }
 
@@ -74,37 +75,21 @@ Foam::fieldValue::fieldValue
     const bool loadFromFiles
 )
 :
-    functionObjectFile(obr, name, valueType),
-    name_(name),
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name, valueType, dict),
     obr_(obr),
     dict_(dict),
-    active_(true),
     log_(true),
-    sourceName_(word::null),
-    fields_(dict.lookup("fields")),
-    valueOutput_(dict.lookup("valueOutput")),
-    resultDict_(fileName("name"), dictionary::null)
+    sourceName_(dict.lookupOrDefault<word>("sourceName", "sampledSurface")),
+    fields_(),
+    valueOutput_(false),
+    scaleFactor_(1.0)
 {
     // Only active if obr is an fvMesh
-    if (isA<fvMesh>(obr_))
+    if (setActive<fvMesh>())
     {
         read(dict);
     }
-    else
-    {
-        WarningIn
-        (
-            "fieldValue::fieldValue"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name << nl
-            << endl;
-        active_ = false;
-    }
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
index 9d852cdfb7..529ae7afc4 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ Group
     grpFieldFunctionObjects
 
 Description
-    Base class for field value -based function objects.
+    Base class for field value-based function objects.
 
 SourceFiles
     fieldValue.C
@@ -38,6 +38,7 @@ SourceFiles
 #ifndef fieldValue_H
 #define fieldValue_H
 
+#include "functionObjectState.H"
 #include "functionObjectFile.H"
 #include "Switch.H"
 #include "OFstream.H"
@@ -62,6 +63,7 @@ class mapPolyMesh;
 
 class fieldValue
 :
+    public functionObjectState,
     public functionObjectFile
 {
 
@@ -69,18 +71,12 @@ protected:
 
     // Protected data
 
-        //- Name of this fieldValue object
-        word name_;
-
         //- Database this class is registered to
         const objectRegistry& obr_;
 
         //- Construction dictionary
         dictionary dict_;
 
-        //- Active flag
-        bool active_;
-
         //- Switch to send output to Info as well as to file
         Switch log_;
 
@@ -93,8 +89,8 @@ protected:
         //- Output field values flag
         Switch valueOutput_;
 
-        //- Results dictionary for external access of results
-        dictionary resultDict_;
+        //- Scale factor - optional
+        scalar scaleFactor_;
 
 
 public:
@@ -173,9 +169,6 @@ public:
             //- Helper function to return the reference to the mesh
             inline const fvMesh& mesh() const;
 
-            //- Return access to the latest set of results
-            inline const dictionary& resultDict() const;
-
 
         // Function object functions
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueI.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueI.H
index 55651a3539..c57e4f7022 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueI.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,10 +82,4 @@ inline const Foam::fvMesh& Foam::fieldValue::mesh() const
 }
 
 
-inline const Foam::dictionary& Foam::fieldValue::resultDict() const
-{
-    return resultDict_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
index f418ad0215..68f272127f 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,16 +48,8 @@ Foam::autoPtr<Foam::fieldValue> Foam::fieldValue::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "fieldValue::New"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "Unknown " << typeName << " type "
+        FatalErrorInFunction
+            << "Unknown " << typeName << " type "
             << modelType << nl << nl
             << "Valid " << typeName << " types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
index 43d1a18d99..233af06057 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,16 +37,14 @@ void Foam::fieldValue::combineFields(Field<Type>& field)
     allValues[Pstream::myProcNo()] = field;
 
     Pstream::gatherList(allValues);
+    Pstream::scatterList(allValues);
 
-    if (Pstream::master())
-    {
-        field =
-            ListListOps::combine<Field<Type> >
-            (
-                allValues,
-                accessOp<Field<Type> >()
-            );
-    }
+    field =
+        ListListOps::combine<Field<Type> >
+        (
+            allValues,
+            accessOp<Field<Type> >()
+        );
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index 28e5866b01..d03d641a40 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,30 +54,9 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-Foam::fieldValues::fieldValueDelta::fieldValueDelta
-(
-    const word& name,
-    const objectRegistry& obr,
-    const dictionary& dict,
-    const bool loadFromFiles
-)
-:
-    functionObjectFile(obr, name, typeName),
-    name_(name),
-    obr_(obr),
-    loadFromFiles_(loadFromFiles),
-    log_(true),
-    operation_(opSubtract),
-    source1Ptr_(NULL),
-    source2Ptr_(NULL)
-{
-    read(dict);
-}
-
-
-void Foam::fieldValues::fieldValueDelta::writeFileHeader(const label i)
+void Foam::fieldValues::fieldValueDelta::writeFileHeader(Ostream& os) const
 {
     const wordList& fields1 = source1Ptr_->fields();
     const wordList& fields2 = source2Ptr_->fields();
@@ -92,8 +71,6 @@ void Foam::fieldValues::fieldValueDelta::writeFileHeader(const label i)
         }
     }
 
-    Ostream& os = file();
-
     writeHeaderValue(os, "Source1", source1Ptr_->name());
     writeHeaderValue(os, "Source2", source2Ptr_->name());
     writeHeaderValue(os, "Operation", operationTypeNames_[operation_]);
@@ -108,6 +85,33 @@ void Foam::fieldValues::fieldValueDelta::writeFileHeader(const label i)
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fieldValues::fieldValueDelta::fieldValueDelta
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name, typeName, dict),
+    obr_(obr),
+    loadFromFiles_(loadFromFiles),
+    log_(true),
+    operation_(opSubtract),
+    source1Ptr_(NULL),
+    source2Ptr_(NULL)
+{
+    if (setActive<fvMesh>())
+    {
+        read(dict);
+        writeFileHeader(file());
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::fieldValues::fieldValueDelta::~fieldValueDelta()
@@ -118,77 +122,118 @@ Foam::fieldValues::fieldValueDelta::~fieldValueDelta()
 
 void Foam::fieldValues::fieldValueDelta::read(const dictionary& dict)
 {
-    log_ = dict.lookupOrDefault<Switch>("log", true);
-    source1Ptr_.reset
-    (
-        fieldValue::New
-        (
-            name_ + ".source1",
-            obr_,
-            dict.subDict("source1"),
-            loadFromFiles_,
-            false
-        ).ptr()
-    );
-    source2Ptr_.reset
-    (
-        fieldValue::New
-        (
-            name_ + ".source2",
-            obr_,
-            dict.subDict("source2"),
-            loadFromFiles_,
-            false
-        ).ptr()
-    );
+    if (active_)
+    {
+        functionObjectFile::read(dict);
 
-    operation_ = operationTypeNames_.read(dict.lookup("operation"));
+        log_ = dict.lookupOrDefault<Switch>("log", true);
+        source1Ptr_.reset
+        (
+            fieldValue::New
+            (
+                name_ + ".source1",
+                obr_,
+                dict.subDict("source1"),
+                loadFromFiles_,
+                false
+            ).ptr()
+        );
+        source2Ptr_.reset
+        (
+            fieldValue::New
+            (
+                name_ + ".source2",
+                obr_,
+                dict.subDict("source2"),
+                loadFromFiles_,
+                false
+            ).ptr()
+        );
+
+        operation_ = operationTypeNames_.read(dict.lookup("operation"));
+    }
 }
 
 
 void Foam::fieldValues::fieldValueDelta::write()
 {
-    functionObjectFile::write();
-
-    source1Ptr_->write();
-    source2Ptr_->write();
-
-    if (Pstream::master())
-    {
-        file()<< obr_.time().value();
-    }
-
-    if (log_) Info<< type() << " " << name_ << " output:" << endl;
-
-    bool found = false;
-    processFields<scalar>(found);
-    processFields<vector>(found);
-    processFields<sphericalTensor>(found);
-    processFields<symmTensor>(found);
-    processFields<tensor>(found);
-
-    if (Pstream::master())
-    {
-        file()<< endl;
-    }
-
-    if (log_)
-    {
-        if (!found)
-        {
-            Info<< "    none" << endl;
-        }
-        else
-        {
-            Info<< endl;
-        }
-    }
+    // Do nothing
 }
 
 
 void Foam::fieldValues::fieldValueDelta::execute()
 {
-    // Do nothing
+    if (active_)
+    {
+        source1Ptr_->write();
+        source2Ptr_->write();
+
+        writeTime(file());
+
+        if (log_) Info << type() << " " << name_ << " output:" << endl;
+
+        const word& name1 = source1Ptr_->name();
+        const word& name2 = source2Ptr_->name();
+
+        const wordList entries1 = objectResultEntries(name1);
+        const wordList entries2 = objectResultEntries(name2);
+
+        if (entries1.size() != entries2.size())
+        {
+            FatalErrorInFunction
+                << name_ << ": objects must generate the same number of results"
+                << nl
+                << "    " << name1 << " objects: " << entries1 << nl
+                << "    " << name2 << " objects: " << entries2 << nl
+                << exit(FatalError);
+        }
+
+        forAll(entries1, i)
+        {
+            const word& entry1(entries1[i]);
+            const word& entry2(entries2[i]);
+            const word type1 = objectResultType(name1, entry1);
+            const word type2 = objectResultType(name2, entry2);
+
+            if (type1 != type2)
+            {
+                FatalErrorInFunction
+                    << name_
+                    << ": input values for operation must be of the same type"
+                    << nl
+                    << "    " << entry1 << ": " << type1 << nl
+                    << "    " << entry2 << ": " << type2 << nl
+                    << exit(FatalError);
+            }
+
+            bool found = false;
+
+            apply<scalar>(type1, name1, name2, entry1, entry2, found);
+            apply<vector>(type1, name1, name2, entry1, entry2, found);
+            apply<sphericalTensor>(type1, name1, name2, entry1, entry2, found);
+            apply<symmTensor>(type1, name1, name2, entry1, entry2, found);
+            apply<tensor>(type1, name1, name2, entry1, entry2, found);
+
+            if (log_ && !found)
+            {
+                Info<< "Operation between "
+                    << name1 << " with result " << entry1 << " and "
+                    << name2 << " with result " << entry2 << " not applied"
+                    << endl;
+            }
+        }
+
+        if (log_)
+        {
+            if (entries1.empty())
+            {
+                Info<< "    none";
+            }
+            Info<< endl;
+        }
+
+        file()<< endl;
+    }
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index d408227bbc..056b91f5b4 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,11 @@ Group
     grpFieldFunctionObjects
 
 Description
-    This function object provides a differencing option between two 'field
-    value' function objects.
+    This function object provides applies an operation to the output of two
+    fieldValue function objects.
+
+    The operation is applied to all results of each fieldValue object.
+    Accordingly, each object must generate the same number and type of results.
 
     Example of function object specification:
     \verbatim
@@ -39,11 +42,11 @@ Description
         functionObjectLibs ("libfieldFunctionObjects.so");
         operation       subtract;
 
-        fieldValue1
+        source1
         {
             ...
         }
-        fieldValue2
+        source2
         {
             ...
         }
@@ -65,6 +68,7 @@ Description
        max           | maximum
        average       | average
     \endplaintable
+
 SeeAlso
     Foam::fieldValue
 
@@ -76,6 +80,7 @@ SourceFiles
 #ifndef fieldValueDelta_H
 #define fieldValueDelta_H
 
+#include "functionObjectState.H"
 #include "functionObjectFile.H"
 #include "fieldValue.H"
 #include "autoPtr.H"
@@ -94,6 +99,7 @@ namespace fieldValues
 
 class fieldValueDelta
 :
+    public functionObjectState,
     public functionObjectFile
 {
 public:
@@ -115,9 +121,6 @@ private:
 
     // Private data
 
-        //- Name of this fieldValue object
-        word name_;
-
         //- Database this class is registered to
         const objectRegistry& obr_;
 
@@ -139,13 +142,17 @@ private:
 
     // Private Member Functions
 
-        //- Templated function to process common fields
-        template<class Type>
-        void processFields(bool& found);
-
         //- Templated function to apply the operation
         template<class Type>
-        Type applyOperation(const Type& value1, const Type& value2) const;
+        void apply
+        (
+            const word& resultType,
+            const word& name1,
+            const word& name2,
+            const word& entryName1,
+            const word& entryName2,
+            bool& found
+        );
 
 
 protected:
@@ -153,7 +160,7 @@ protected:
     // Functions to be over-ridden from IOoutputFilter class
 
         //- Output file header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
 
 public:
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
index 70c64effab..31879f63ce 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,21 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "GeometricField.H"
-#include "volMesh.H"
-#include "surfaceMesh.H"
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::fieldValues::fieldValueDelta::applyOperation
+void Foam::fieldValues::fieldValueDelta::apply
 (
-    const Type& value1,
-    const Type& value2
-) const
+    const word& resultType,
+    const word& name1,
+    const word& name2,
+    const word& entryName1,
+    const word& entryName2,
+    bool& found
+)
 {
+    if (pTraits<Type>::typeName != resultType)
+    {
+        return;
+    }
+
     Type result = pTraits<Type>::zero;
 
+    Type value1 = this->getObjectResult<Type>(name1, entryName1);
+    Type value2 = this->getObjectResult<Type>(name2, entryName2);
+
+    const word& opName = operationTypeNames_[operation_];
+
     switch (operation_)
     {
         case opAdd:
@@ -67,65 +77,23 @@ Type Foam::fieldValues::fieldValueDelta::applyOperation
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Type Foam::fieldValues::fieldValueDelta::applyOperation"
-                "("
-                    "const Type&, "
-                    "const Type&"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "Unable to process operation "
                 << operationTypeNames_[operation_]
                 << abort(FatalError);
         }
     }
 
-    return result;
-}
+    const word resultName(opName + '(' + entryName1 + ',' + entryName2 + ')');
 
+    if (log_) Info << "    " << resultName << " = " << result << endl;
 
-template<class Type>
-void Foam::fieldValues::fieldValueDelta::processFields(bool& found)
-{
-    typedef GeometricField<Type, fvPatchField, volMesh> vf;
-    typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf;
+    this->file()<< tab << result;
 
-    const wordList& fields1 = source1Ptr_->fields();
+    // Write state/results information
+    this->setResult(resultName, result);
 
-    const dictionary& results1 = source1Ptr_->resultDict();
-    const dictionary& results2 = source2Ptr_->resultDict();
-
-    Type r1(pTraits<Type>::zero);
-    Type r2(pTraits<Type>::zero);
-
-    forAll(fields1, i)
-    {
-        const word& fieldName = fields1[i];
-
-        if
-        (
-            (obr_.foundObject<vf>(fieldName) || obr_.foundObject<sf>(fieldName))
-         && results2.found(fieldName)
-        )
-        {
-            results1.lookup(fieldName) >> r1;
-            results2.lookup(fieldName) >> r2;
-
-            Type result = applyOperation(r1, r2);
-
-            if (log_) Info<< "    " << operationTypeNames_[operation_]
-                << "(" << fieldName << ") = " << result
-                << endl;
-
-            if (Pstream::master())
-            {
-                file()<< tab << result;
-            }
-
-            found = true;
-        }
-    }
+    found = true;
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/controlDict b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
index b0810202ce..ad0a23d024 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/controlDict
+++ b/src/postProcessing/functionObjects/field/nearWallFields/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
index 6625f2e4cc..fdea64319d 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -242,16 +242,8 @@ Foam::nearWallFields::nearWallFields
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "nearWallFields::nearWallFields"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 
@@ -369,15 +361,7 @@ void Foam::nearWallFields::execute()
 
 void Foam::nearWallFields::end()
 {
-    if (debug)
-    {
-        Info<< "nearWallFields:end()" << endl;
-    }
-
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index 014313b2aa..9fcfa0ccee 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,9 +55,10 @@ Description
     \table
         Property | Description               | Required    | Default value
         type     | type name: nearWallFields | yes         |
-        fields   | list of fields with correspoding output field names | yes |
+        fields   | list of fields with corresponding output field names | yes |
         patches  | list of patches to sample | yes         |
         distance | distance from patch to sample | yes     |
+        log      | Log to standard output    | no          | yes
     \endtable
 
 SeeAlso
@@ -111,6 +112,9 @@ protected:
             //- Fields to process
             List<Tuple2<word, word> > fieldSet_;
 
+            //- Switch to send output to Info as well as to file
+            Switch log_;
+
             //- Patches to sample
             labelHashSet patchSet_;
 
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
index 42b1b2abef..275d98a093 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,8 +47,9 @@ void Foam::nearWallFields::createFields
 
             if (obr_.found(sampleFldName))
             {
-                Info<< "    a field " << sampleFldName
-                    << " already exists on the mesh."
+                WarningInFunction
+                    << "    a field named " << sampleFldName
+                    << " already exists on the mesh"
                     << endl;
             }
             else
@@ -63,7 +64,8 @@ void Foam::nearWallFields::createFields
 
                 sflds.set(sz, new vfType(io, fld));
 
-                Info<< "    created " << sflds[sz].name() << " to sample "
+                if (log_) Info
+                    << "    created " << sflds[sz].name() << " to sample "
                     << fld.name() << endl;
             }
         }
diff --git a/src/postProcessing/functionObjects/field/processorField/postProcessingDict b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
index 683e70c493..bfb258f357 100644
--- a/src/postProcessing/functionObjects/field/processorField/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/processorField/postProcessingDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.C b/src/postProcessing/functionObjects/field/processorField/processorField.C
index a57ee9a293..604b2409f0 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.C
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(processorField, 0);
+    defineTypeNameAndDebug(processorField, 0);
 }
 
 
@@ -47,7 +47,9 @@ Foam::processorField::processorField
 :
     name_(name),
     obr_(obr),
-    active_(true)
+    active_(true),
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (isA<fvMesh>(obr_))
@@ -62,7 +64,7 @@ Foam::processorField::processorField
             (
                 IOobject
                 (
-                    "processorID",
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -78,16 +80,8 @@ Foam::processorField::processorField
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "processorField::processorField"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 }
@@ -103,7 +97,10 @@ Foam::processorField::~processorField()
 
 void Foam::processorField::read(const dictionary& dict)
 {
-    // do nothing
+    if (active_)
+    {
+        log_.readIfPresent("log", dict);
+    }
 }
 
 
@@ -112,7 +109,7 @@ void Foam::processorField::execute()
     if (active_)
     {
         const volScalarField& procField =
-            obr_.lookupObject<volScalarField>("processorID");
+            obr_.lookupObject<volScalarField>(resultName_);
 
         const_cast<volScalarField&>(procField) ==
             dimensionedScalar("procI", dimless, Pstream::myProcNo());
@@ -122,10 +119,7 @@ void Foam::processorField::execute()
 
 void Foam::processorField::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -140,7 +134,12 @@ void Foam::processorField::write()
     if (active_)
     {
         const volScalarField& procField =
-            obr_.lookupObject<volScalarField>("processorID");
+            obr_.lookupObject<volScalarField>(resultName_);
+
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
+            << "    writing field " << procField.name() << nl
+            << endl;
 
         procField.write();
     }
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H
index 6d45e32acb..560c302e92 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.H
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.H
@@ -45,6 +45,7 @@ Description
     \table
         Property     | Description             | Required    | Default value
         type         | type name: processorField | yes       |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 SeeAlso
@@ -95,6 +96,12 @@ protected:
         //- on/off switch
         bool active_;
 
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Protected Member Functions
 
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index c98ce21a4a..921118f505 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index 869f46beb0..07a43d6bbc 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,8 @@ Foam::readFields::readFields
     name_(name),
     obr_(obr),
     active_(true),
-    fieldSet_()
+    fieldSet_(),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (isA<fvMesh>(obr_))
@@ -57,16 +58,8 @@ Foam::readFields::readFields
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "readFields::readFields"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 }
@@ -84,6 +77,7 @@ void Foam::readFields::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_.readIfPresent("log", dict);
         dict.lookup("fields") >> fieldSet_;
     }
 }
@@ -93,29 +87,16 @@ void Foam::readFields::execute()
 {
     if (active_)
     {
-        // Clear out any previously loaded fields
-        vsf_.clear();
-        vvf_.clear();
-        vSpheretf_.clear();
-        vSymmtf_.clear();
-        vtf_.clear();
-
-        ssf_.clear();
-        svf_.clear();
-        sSpheretf_.clear();
-        sSymmtf_.clear();
-        stf_.clear();
-
         forAll(fieldSet_, fieldI)
         {
             const word& fieldName = fieldSet_[fieldI];
 
             // If necessary load field
-            loadField<scalar>(fieldName, vsf_, ssf_);
-            loadField<vector>(fieldName, vvf_, svf_);
-            loadField<sphericalTensor>(fieldName, vSpheretf_, sSpheretf_);
-            loadField<symmTensor>(fieldName, vSymmtf_, sSymmtf_);
-            loadField<tensor>(fieldName, vtf_, stf_);
+            loadField<scalar>(fieldName);
+            loadField<vector>(fieldName);
+            loadField<sphericalTensor>(fieldName);
+            loadField<symmTensor>(fieldName);
+            loadField<tensor>(fieldName);
         }
     }
 }
@@ -123,10 +104,7 @@ void Foam::readFields::execute()
 
 void Foam::readFields::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index bf13dac4e4..be1d012783 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,8 @@ Group
     grpFieldFunctionObjects
 
 Description
-    This function object reads fields from the time directories and adds them to
-    the mesh database for further post-processing.
+    This function object reads fields from the time directories and adds them
+    to the mesh database for further post-processing.
 
     Example of function object specification:
     \verbatim
@@ -38,11 +38,7 @@ Description
         type        readFields;
         functionObjectLibs ("libfieldFunctionObjects.so");
         ...
-        fields
-        (
-            U
-            p
-        );
+        fields      (U p);
     }
     \endverbatim
 
@@ -51,6 +47,7 @@ Description
         Property     | Description             | Required    | Default value
         type         | type name: readFields   | yes         |
         fields       | list of fields to read  |  no         |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 SeeAlso
@@ -102,18 +99,8 @@ protected:
         //- Fields to load
         wordList fieldSet_;
 
-        //- Loaded fields
-        PtrList<volScalarField> vsf_;
-        PtrList<volVectorField> vvf_;
-        PtrList<volSphericalTensorField> vSpheretf_;
-        PtrList<volSymmTensorField> vSymmtf_;
-        PtrList<volTensorField> vtf_;
-
-        PtrList<surfaceScalarField> ssf_;
-        PtrList<surfaceVectorField> svf_;
-        PtrList<surfaceSphericalTensorField> sSpheretf_;
-        PtrList<surfaceSymmTensorField> sSymmtf_;
-        PtrList<surfaceTensorField> stf_;
+        //- Switch to send output to Info as well as to file
+        Switch log_;
 
 
     // Protected Member Functions
@@ -125,12 +112,7 @@ protected:
         void operator=(const readFields&);
 
         template<class Type>
-        void loadField
-        (
-            const word&,
-            PtrList<GeometricField<Type, fvPatchField, volMesh> >&,
-            PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
-        ) const;
+        void loadField(const word&) const;
 
 
 public:
diff --git a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
index 0d7a89bc00..57973a1da6 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,12 +31,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::readFields::loadField
-(
-    const word& fieldName,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& vflds,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
-) const
+void Foam::readFields::loadField(const word& fieldName) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> vfType;
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
@@ -45,7 +40,8 @@ void Foam::readFields::loadField
     {
         if (debug)
         {
-            Info<< "readFields : Field " << fieldName << " already in database"
+            Info<< "readFields: " << vfType::typeName << " "
+                << fieldName << " already exists in database"
                 << endl;
         }
     }
@@ -53,7 +49,8 @@ void Foam::readFields::loadField
     {
         if (debug)
         {
-            Info<< "readFields : Field " << fieldName << " already in database"
+            Info<< "readFields: " << sfType::typeName << " "
+                << fieldName << " already exists in database"
                 << endl;
         }
     }
@@ -76,11 +73,10 @@ void Foam::readFields::loadField
          && fieldHeader.headerClassName() == vfType::typeName
         )
         {
-            // store field locally
-            Info<< "    Reading " << fieldName << endl;
-            label sz = vflds.size();
-            vflds.setSize(sz+1);
-            vflds.set(sz, new vfType(fieldHeader, mesh));
+            // Store field on mesh database
+            if (log_) Info<< "    Reading " << fieldName << endl;
+            vfType* vfPtr = new vfType(fieldHeader, mesh);
+            mesh.objectRegistry::store(vfPtr);
         }
         else if
         (
@@ -88,11 +84,10 @@ void Foam::readFields::loadField
          && fieldHeader.headerClassName() == sfType::typeName
         )
         {
-            // store field locally
-            Info<< "    Reading " << fieldName << endl;
-            label sz = sflds.size();
-            sflds.setSize(sz+1);
-            sflds.set(sz, new sfType(fieldHeader, mesh));
+            // Store field on mesh database
+            if (log_) Info<< "    Reading " << fieldName << endl;
+            sfType* sfPtr = new sfType(fieldHeader, mesh);
+            mesh.objectRegistry::store(sfPtr);
         }
     }
 }
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 6a081fd49f..d90f5992e4 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,7 +72,8 @@ void Foam::regionSizeDistribution::writeGraph
 
     OFstream str(outputPath/formatterPtr_().getFileName(coords, valNames));
 
-    Info<< "Writing distribution of " << valueName << " to " << str.name()
+    if (log_) Info
+        << "Writing distribution of " << valueName << " to " << str.name()
         << endl;
 
     List<const scalarField*> valPtrs(1);
@@ -149,16 +150,22 @@ void Foam::regionSizeDistribution::writeAlphaFields
     liquidCore.correctBoundaryConditions();
     backgroundAlpha.correctBoundaryConditions();
 
-    Info<< "    Volume of liquid-core = "
-        << fvc::domainIntegrate(liquidCore).value()
-        << endl;
-    Info<< "    Volume of background  = "
-        << fvc::domainIntegrate(backgroundAlpha).value()
-        << endl;
+    if (log_)
+    {
+        Info<< "    Volume of liquid-core = "
+            << fvc::domainIntegrate(liquidCore).value()
+            << endl;
+        Info<< "    Volume of background  = "
+            << fvc::domainIntegrate(backgroundAlpha).value()
+            << endl;
+    }
 
-    Info<< "Writing liquid-core field to " << liquidCore.name() << endl;
+    if (log_) Info
+        << "Writing liquid-core field to " << liquidCore.name() << endl;
     liquidCore.write();
-    Info<< "Writing background field to " << backgroundAlpha.name() << endl;
+
+    if (log_) Info
+        << "Writing background field to " << backgroundAlpha.name() << endl;
     backgroundAlpha.write();
 }
 
@@ -322,12 +329,13 @@ Foam::regionSizeDistribution::regionSizeDistribution
     const bool loadFromFiles
 )
 :
-    functionObjectFile(obr, name, typeName),
+    functionObjectFile(obr, name),
     name_(name),
     obr_(obr),
     active_(true),
     alphaName_(dict.lookup("field")),
-    patchNames_(dict.lookup("patches"))
+    patchNames_(dict.lookup("patches")),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (isA<fvMesh>(obr_))
@@ -337,16 +345,8 @@ Foam::regionSizeDistribution::regionSizeDistribution
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "regionSizeDistribution::regionSizeDistribution"
-            "("
-                "const word&,  "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 }
@@ -364,6 +364,10 @@ void Foam::regionSizeDistribution::read(const dictionary& dict)
 {
     if (active_)
     {
+        functionObjectFile::read(dict);
+
+        log_.readIfPresent("log", dict);
+
         dict.lookup("field") >> alphaName_;
         dict.lookup("patches") >> patchNames_;
         dict.lookup("threshold") >> threshold_;
@@ -380,7 +384,8 @@ void Foam::regionSizeDistribution::read(const dictionary& dict)
         {
             coordSysPtr_.reset(new coordinateSystem(obr_, dict));
 
-            Info<< "Transforming all vectorFields with coordinate system "
+            if (log_) Info
+                << "Transforming all vectorFields with coordinate system "
                 << coordSysPtr_().name() << endl;
         }
     }
@@ -409,18 +414,18 @@ void Foam::regionSizeDistribution::write()
 {
     if (active_)
     {
-        Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info << type() << " " << name_ << " output:" << nl;
 
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         autoPtr<volScalarField> alphaPtr;
         if (obr_.foundObject<volScalarField>(alphaName_))
         {
-            Info<< "    Looking up field " << alphaName_ << endl;
+            if (log_) Info << "    Looking up field " << alphaName_ << endl;
         }
         else
         {
-            Info<< "    Reading field " << alphaName_ << endl;
+            if (log_) Info << "    Reading field " << alphaName_ << endl;
             alphaPtr.reset
             (
                 new volScalarField
@@ -446,7 +451,8 @@ void Foam::regionSizeDistribution::write()
            : obr_.lookupObject<volScalarField>(alphaName_)
         );
 
-        Info<< "    Volume of alpha          = "
+        if (log_) Info
+            << "    Volume of alpha          = "
             << fvc::domainIntegrate(alpha).value()
             << endl;
 
@@ -454,9 +460,11 @@ void Foam::regionSizeDistribution::write()
         const scalar maxDropletVol = 1.0/6.0*pow(maxDiam_, 3);
         const scalar delta = (maxDiam_-minDiam_)/nBins_;
 
-        Info<< "    Mesh volume              = " << meshVol << endl;
-        Info<< "    Maximum droplet diameter = " << maxDiam_ << endl;
-        Info<< "    Maximum droplet volume   = " << maxDropletVol << endl;
+        if (log_) Info
+            << "    Mesh volume              = " << meshVol << nl
+            << "    Maximum droplet diameter = " << maxDiam_ << nl
+            << "    Maximum droplet volume   = " << maxDropletVol
+            << endl;
 
 
         // Determine blocked faces
@@ -515,7 +523,8 @@ void Foam::regionSizeDistribution::write()
 
         regionSplit regions(mesh, blockedFace);
 
-        Info<< "    Determined " << regions.nRegions()
+        if (log_) Info
+            << "    Determined " << regions.nRegions()
             << " disconnected regions" << endl;
 
 
@@ -534,8 +543,10 @@ void Foam::regionSizeDistribution::write()
                 mesh,
                 dimensionedScalar("zero", dimless, 0)
             );
-            Info<< "    Dumping region as volScalarField to " << region.name()
-                << endl;
+
+            if (log_) Info
+                << "    Dumping region as " << volScalarField::typeName
+                << " to " << region.name() << endl;
 
             forAll(regions, cellI)
             {
@@ -566,11 +577,13 @@ void Foam::regionSizeDistribution::write()
 
         if (debug)
         {
-            Info<< "    " << token::TAB << "Region"
+            if (log_) Info
+                << "    " << token::TAB << "Region"
                 << token::TAB << "Volume(mesh)"
                 << token::TAB << "Volume(" << alpha.name() << "):"
                 << token::TAB << "nCells"
                 << endl;
+
             scalar meshSumVol = 0.0;
             scalar alphaSumVol = 0.0;
             label nCells = 0;
@@ -586,7 +599,8 @@ void Foam::regionSizeDistribution::write()
                 ++vIter, ++aIter, ++numIter
             )
             {
-                Info<< "    " << token::TAB << vIter.key()
+                if (log_) Info
+                    << "    " << token::TAB << vIter.key()
                     << token::TAB << vIter()
                     << token::TAB << aIter()
                     << token::TAB << numIter()
@@ -596,40 +610,46 @@ void Foam::regionSizeDistribution::write()
                 alphaSumVol += aIter();
                 nCells += numIter();
             }
-            Info<< "    " << token::TAB << "Total:"
+
+            if (log_) Info
+                << "    " << token::TAB << "Total:"
                 << token::TAB << meshSumVol
                 << token::TAB << alphaSumVol
                 << token::TAB << nCells
-                << endl;
-            Info<< endl;
+                << nl << endl;
         }
 
 
 
-
+        if (log_)
         {
-            Info<< "    Patch connected regions (liquid core):" << endl;
-            Info<< token::TAB << "    Region"
+            Info<< "    Patch connected regions (liquid core):" << nl
+                << token::TAB << "    Region"
                 << token::TAB << "Volume(mesh)"
                 << token::TAB << "Volume(" << alpha.name() << "):"
                 << endl;
+
             forAllConstIter(Map<label>, patchRegions, iter)
             {
                 label regionI = iter.key();
+
                 Info<< "    " << token::TAB << iter.key()
                     << token::TAB << allRegionVolume[regionI]
                     << token::TAB << allRegionAlphaVolume[regionI] << endl;
 
             }
+
             Info<< endl;
         }
 
+        if (log_)
         {
-            Info<< "    Background regions:" << endl;
-            Info<< "    " << token::TAB << "Region"
+            Info<< "    Background regions:" << nl
+                << "    " << token::TAB << "Region"
                 << token::TAB << "Volume(mesh)"
                 << token::TAB << "Volume(" << alpha.name() << "):"
                 << endl;
+
             Map<scalar>::const_iterator vIter = allRegionVolume.begin();
             Map<scalar>::const_iterator aIter = allRegionAlphaVolume.begin();
 
@@ -652,6 +672,7 @@ void Foam::regionSizeDistribution::write()
                         << token::TAB << aIter() << endl;
                 }
             }
+
             Info<< endl;
         }
 
@@ -746,9 +767,10 @@ void Foam::regionSizeDistribution::write()
             }
 
             // Write to screen
+            if (log_)
             {
-                Info<< "    Bins:" << endl;
-                Info<< "    " << token::TAB << "Bin"
+                Info<< "    Bins:" << nl
+                    << "    " << token::TAB << "Bin"
                     << token::TAB << "Min diameter"
                     << token::TAB << "Count:"
                     << endl;
@@ -759,8 +781,10 @@ void Foam::regionSizeDistribution::write()
                     Info<< "    " << token::TAB << binI
                         << token::TAB << diam
                         << token::TAB << binCount[binI] << endl;
+
                     diam += delta;
                 }
+
                 Info<< endl;
             }
 
@@ -783,7 +807,7 @@ void Foam::regionSizeDistribution::write()
                 forAll(selected, i)
                 {
                     const word& fldName = scalarNames[selected[i]];
-                    Info<< "    Scalar field " << fldName << endl;
+                    if (log_) Info << "    Scalar field " << fldName << endl;
 
                     const scalarField& fld = obr_.lookupObject
                     <
@@ -812,7 +836,7 @@ void Foam::regionSizeDistribution::write()
                 forAll(selected, i)
                 {
                     const word& fldName = vectorNames[selected[i]];
-                    Info<< "    Vector field " << fldName << endl;
+                    if (log_) Info << "    Vector field " << fldName << endl;
 
                     vectorField fld = obr_.lookupObject
                     <
@@ -821,10 +845,10 @@ void Foam::regionSizeDistribution::write()
 
                     if (coordSysPtr_.valid())
                     {
-                        Info<< "Transforming vector field " << fldName
+                        if (log_) Info
+                            << "Transforming vector field " << fldName
                             << " with coordinate system "
-                            << coordSysPtr_().name()
-                            << endl;
+                            << coordSysPtr_().name() << endl;
 
                         fld = coordSysPtr_().localVector(fld);
                     }
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index b639d8e251..d89106bdde 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -92,6 +92,7 @@ Description
         minDiameter  | minimum region equivalent diameter | no  | 0
         setFormat    | writing format          | yes         |
         coordinateSystem | transformation for vector fields | no         |
+        log          | Log to standard output  | no          | yes
     \endtable
 
 SeeAlso
@@ -113,6 +114,7 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "wordReList.H"
 #include "coordinateSystem.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -150,6 +152,9 @@ class regionSizeDistribution
         //- Patches to walk from
         wordReList patchNames_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
         //- Clip value
         scalar threshold_;
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/controlDict b/src/postProcessing/functionObjects/field/streamLine/controlDict
index 4f4ccd8055..4a7430d21b 100644
--- a/src/postProcessing/functionObjects/field/streamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/streamLine/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -84,6 +84,10 @@ functions
             // subcycling.
             nSubCycle 5;
 
+
+        // Optional clipping
+        //bounds  (0.2 -10 -10)(0.22 10 10);
+
         // Cloud name to use
         cloudName       particleTracks;
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 0017a33826..3122e2b899 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,18 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Pstream.H"
-#include "functionObjectList.H"
 #include "streamLine.H"
 #include "fvMesh.H"
 #include "streamLineParticleCloud.H"
-#include "ReadFields.H"
-#include "meshSearch.H"
 #include "sampledSet.H"
-#include "globalIndex.H"
-#include "mapDistribute.H"
-#include "interpolationCellPoint.H"
-#include "PatchTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -46,60 +38,8 @@ defineTypeNameAndDebug(streamLine, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::streamLine::wallPatch() const
-{
-    const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
-
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    label nFaces = 0;
-
-    forAll(patches, patchI)
-    {
-        //if (!polyPatch::constraintType(patches[patchI].type()))
-        if (isA<wallPolyPatch>(patches[patchI]))
-        {
-            nFaces += patches[patchI].size();
-        }
-    }
-
-    labelList addressing(nFaces);
-
-    nFaces = 0;
-
-    forAll(patches, patchI)
-    {
-        //if (!polyPatch::constraintType(patches[patchI].type()))
-        if (isA<wallPolyPatch>(patches[patchI]))
-        {
-            const polyPatch& pp = patches[patchI];
-
-            forAll(pp, i)
-            {
-                addressing[nFaces++] = pp.start()+i;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>
-    (
-        new indirectPrimitivePatch
-        (
-            IndirectList<face>
-            (
-                mesh.faces(),
-                addressing
-            ),
-            mesh.points()
-        )
-    );
-}
-
-
 void Foam::streamLine::track()
 {
-    const Time& runTime = obr_.time();
     const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
 
     IDLList<streamLineParticle> initialParticles;
@@ -128,173 +68,26 @@ void Foam::streamLine::track()
 
     label nSeeds = returnReduce(particles.size(), sumOp<label>());
 
-    Info << "    seeded " << nSeeds << " particles" << endl;
+    if (log_) Info<< "    seeded " << nSeeds << " particles" << endl;
 
     // Read or lookup fields
     PtrList<volScalarField> vsFlds;
     PtrList<interpolation<scalar> > vsInterp;
     PtrList<volVectorField> vvFlds;
     PtrList<interpolation<vector> > vvInterp;
-
     label UIndex = -1;
 
-    if (loadFromFiles_)
-    {
-        IOobjectList allObjects(mesh, runTime.timeName());
+    initInterpolations
+    (
+        nSeeds,
+        UIndex,
+        vsFlds,
+        vsInterp,
+        vvFlds,
+        vvInterp
+    );
 
-        IOobjectList objects(2*fields_.size());
-        forAll(fields_, i)
-        {
-            objects.add(*allObjects[fields_[i]]);
-        }
-
-        ReadFields(mesh, objects, vsFlds);
-        vsInterp.setSize(vsFlds.size());
-        forAll(vsFlds, i)
-        {
-            vsInterp.set
-            (
-                i,
-                interpolation<scalar>::New
-                (
-                    interpolationScheme_,
-                    vsFlds[i]
-                )
-            );
-        }
-        ReadFields(mesh, objects, vvFlds);
-        vvInterp.setSize(vvFlds.size());
-        forAll(vvFlds, i)
-        {
-            vvInterp.set
-            (
-                i,
-                interpolation<vector>::New
-                (
-                    interpolationScheme_,
-                    vvFlds[i]
-                )
-            );
-        }
-    }
-    else
-    {
-        label nScalar = 0;
-        label nVector = 0;
-
-        forAll(fields_, i)
-        {
-            if (mesh.foundObject<volScalarField>(fields_[i]))
-            {
-                nScalar++;
-            }
-            else if (mesh.foundObject<volVectorField>(fields_[i]))
-            {
-                nVector++;
-            }
-            else
-            {
-                FatalErrorIn("streamLine::track()")
-                    << "Cannot find field " << fields_[i] << nl
-                    << "Valid scalar fields are:"
-                    << mesh.names(volScalarField::typeName) << nl
-                    << "Valid vector fields are:"
-                    << mesh.names(volVectorField::typeName)
-                    << exit(FatalError);
-            }
-        }
-        vsInterp.setSize(nScalar);
-        nScalar = 0;
-        vvInterp.setSize(nVector);
-        nVector = 0;
-
-        forAll(fields_, i)
-        {
-            if (mesh.foundObject<volScalarField>(fields_[i]))
-            {
-                const volScalarField& f = mesh.lookupObject<volScalarField>
-                (
-                    fields_[i]
-                );
-                vsInterp.set
-                (
-                    nScalar++,
-                    interpolation<scalar>::New
-                    (
-                        interpolationScheme_,
-                        f
-                    )
-                );
-            }
-            else if (mesh.foundObject<volVectorField>(fields_[i]))
-            {
-                const volVectorField& f = mesh.lookupObject<volVectorField>
-                (
-                    fields_[i]
-                );
-
-                if (f.name() == UName_)
-                {
-                    UIndex = nVector;
-                }
-
-                vvInterp.set
-                (
-                    nVector++,
-                    interpolation<vector>::New
-                    (
-                        interpolationScheme_,
-                        f
-                    )
-                );
-            }
-        }
-    }
-
-    // Store the names
-    scalarNames_.setSize(vsInterp.size());
-    forAll(vsInterp, i)
-    {
-        scalarNames_[i] = vsInterp[i].psi().name();
-    }
-    vectorNames_.setSize(vvInterp.size());
-    forAll(vvInterp, i)
-    {
-        vectorNames_[i] = vvInterp[i].psi().name();
-    }
-
-    // Check that we know the index of U in the interpolators.
-
-    if (UIndex == -1)
-    {
-        FatalErrorIn("streamLine::track()")
-            << "Cannot find field to move particles with : " << UName_ << nl
-            << "This field has to be present in the sampled fields " << fields_
-            << " and in the objectRegistry."
-            << exit(FatalError);
-    }
-
-    // Sampled data
-    // ~~~~~~~~~~~~
-
-    // Size to maximum expected sizes.
-    allTracks_.clear();
-    allTracks_.setCapacity(nSeeds);
-    allScalars_.setSize(vsInterp.size());
-    forAll(allScalars_, i)
-    {
-        allScalars_[i].clear();
-        allScalars_[i].setCapacity(nSeeds);
-    }
-    allVectors_.setSize(vvInterp.size());
-    forAll(allVectors_, i)
-    {
-        allVectors_[i].clear();
-        allVectors_[i].setCapacity(nSeeds);
-    }
-
-
-    // additional particle info
+    // Additional particle info
     streamLineParticle::trackingData td
     (
         particles,
@@ -330,33 +123,13 @@ Foam::streamLine::streamLine
     const bool loadFromFiles
 )
 :
-    dict_(dict),
-    name_(name),
-    obr_(obr),
-    loadFromFiles_(loadFromFiles),
-    active_(true),
-    nSubCycle_(0)
+    streamLineBase(name, obr, dict, loadFromFiles)
 {
-    // Only active if a fvMesh is available
-    if (isA<fvMesh>(obr_))
+    // Check if the available mesh is an fvMesh otherise deactivate
+    if (setActive<fvMesh>())
     {
         read(dict_);
     }
-    else
-    {
-        active_ = false;
-        WarningIn
-        (
-            "streamLine::streamLine\n"
-            "(\n"
-                "const word&,\n"
-                "const objectRegistry&,\n"
-                "const dictionary&,\n"
-                "const bool\n"
-            ")"
-        )   << "No fvMesh available, deactivating."
-            << nl << endl;
-    }
 }
 
 
@@ -372,59 +145,20 @@ void Foam::streamLine::read(const dictionary& dict)
 {
     if (active_)
     {
-        Info<< type() << " " << name_ << ":" << nl;
-
-        //dict_ = dict;
-        dict.lookup("fields") >> fields_;
-        if (dict.found("UName"))
-        {
-            dict.lookup("UName") >> UName_;
-        }
-        else
-        {
-            UName_ = "U";
-            if (dict.found("U"))
-            {
-                IOWarningIn("streamLine::read(const dictionary&)", dict)
-                    << "Using deprecated entry \"U\"."
-                    << " Please use \"UName\" instead."
-                    << endl;
-                dict.lookup("U") >> UName_;
-            }
-        }
-
-        if (findIndex(fields_, UName_) == -1)
-        {
-            FatalIOErrorIn("streamLine::read(const dictionary&)", dict)
-                << "Velocity field for tracking " << UName_
-                << " should be present in the list of fields " << fields_
-                << exit(FatalIOError);
-        }
-
-
-        dict.lookup("trackForward") >> trackForward_;
-        dict.lookup("lifeTime") >> lifeTime_;
-        if (lifeTime_ < 1)
-        {
-            FatalErrorIn(":streamLine::read(const dictionary&)")
-                << "Illegal value " << lifeTime_ << " for lifeTime"
-                << exit(FatalError);
-        }
-
+        streamLineBase::read(dict);
 
         bool subCycling = dict.found("nSubCycle");
         bool fixedLength = dict.found("trackLength");
 
         if (subCycling && fixedLength)
         {
-            FatalIOErrorIn("streamLine::read(const dictionary&)", dict)
+            FatalIOErrorInFunction(dict)
                 << "Cannot both specify automatic time stepping (through '"
                 << "nSubCycle' specification) and fixed track length (through '"
                 << "trackLength')"
                 << exit(FatalIOError);
         }
 
-
         nSubCycle_ = 1;
         if (dict.readIfPresent("nSubCycle", nSubCycle_))
         {
@@ -433,347 +167,14 @@ void Foam::streamLine::read(const dictionary& dict)
             {
                 nSubCycle_ = 1;
             }
-            Info<< "    automatic track length specified through"
-                << " number of sub cycles : " << nSubCycle_ << nl << endl;
-        }
-        else
-        {
-            dict.lookup("trackLength") >> trackLength_;
 
-            Info<< "    fixed track length specified : "
-                << trackLength_ << nl << endl;
-        }
-
-
-        interpolationScheme_ = dict.lookupOrDefault
-        (
-            "interpolationScheme",
-            interpolationCellPoint<scalar>::typeName
-        );
-
-        //Info<< "    using interpolation " << interpolationScheme_
-        //    << endl;
-
-        cloudName_ = dict.lookupOrDefault<word>("cloudName", "streamLine");
-        dict.lookup("seedSampleSet") >> seedSet_;
-
-        const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
-
-        meshSearchPtr_.reset(new meshSearch(mesh));
-
-        const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
-        sampledSetPtr_ = sampledSet::New
-        (
-            seedSet_,
-            mesh,
-            meshSearchPtr_(),
-            coeffsDict
-        );
-        coeffsDict.lookup("axis") >> sampledSetAxis_;
-
-        scalarFormatterPtr_ = writer<scalar>::New(dict.lookup("setFormat"));
-        vectorFormatterPtr_ = writer<vector>::New(dict.lookup("setFormat"));
-    }
-}
-
-
-void Foam::streamLine::execute()
-{
-//    const Time& runTime = obr_.time();
-//    Pout<< "**streamLine::execute : time:" << runTime.timeName() << endl;
-//
-//    bool isOutputTime = false;
-//
-//    const functionObjectList& fobs = runTime.functionObjects();
-//
-//    forAll(fobs, i)
-//    {
-//        if (isA<streamLineFunctionObject>(fobs[i]))
-//        {
-//            const streamLineFunctionObject& fo =
-//                dynamic_cast<const streamLineFunctionObject&>(fobs[i]);
-//
-//            if (fo.name() == name_)
-//            {
-//                Pout<< "found me:" << i << endl;
-//                if (fo.outputControl().output())
-//                {
-//                    isOutputTime = true;
-//                    break;
-//                }
-//            }
-//        }
-//    }
-//
-//
-//    if (active_ && isOutputTime)
-//    {
-//        track();
-//    }
-}
-
-
-void Foam::streamLine::end()
-{}
-
-
-void Foam::streamLine::timeSet()
-{}
-
-
-void Foam::streamLine::write()
-{
-    if (active_)
-    {
-        Info<< type() << " " << name_ << " output:" << nl;
-
-        const Time& runTime = obr_.time();
-        const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
-
-
-        // Do all injection and tracking
-        track();
-
-
-        if (Pstream::parRun())
-        {
-            // Append slave tracks to master ones
-            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-            globalIndex globalTrackIDs(allTracks_.size());
-
-            // Construct a distribution map to pull all to the master.
-            labelListList sendMap(Pstream::nProcs());
-            labelListList recvMap(Pstream::nProcs());
-
-            if (Pstream::master())
-            {
-                // Master: receive all. My own first, then consecutive
-                // processors.
-                label trackI = 0;
-
-                forAll(recvMap, procI)
-                {
-                    labelList& fromProc = recvMap[procI];
-                    fromProc.setSize(globalTrackIDs.localSize(procI));
-                    forAll(fromProc, i)
-                    {
-                        fromProc[i] = trackI++;
-                    }
-                }
-            }
-
-            labelList& toMaster = sendMap[0];
-            toMaster.setSize(globalTrackIDs.localSize());
-            forAll(toMaster, i)
-            {
-                toMaster[i] = i;
-            }
-
-            const mapDistribute distMap
-            (
-                globalTrackIDs.size(),
-                sendMap.xfer(),
-                recvMap.xfer()
-            );
-
-
-            // Distribute the track positions. Note: use scheduled comms
-            // to prevent buffering.
-            mapDistribute::distribute
-            (
-                Pstream::scheduled,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                distMap.constructMap(),
-                allTracks_
-            );
-
-            // Distribute the scalars
-            forAll(allScalars_, scalarI)
-            {
-                mapDistribute::distribute
-                (
-                    Pstream::scheduled,
-                    distMap.schedule(),
-                    distMap.constructSize(),
-                    distMap.subMap(),
-                    distMap.constructMap(),
-                    allScalars_[scalarI]
-                );
-            }
-            // Distribute the vectors
-            forAll(allVectors_, vectorI)
-            {
-                mapDistribute::distribute
-                (
-                    Pstream::scheduled,
-                    distMap.schedule(),
-                    distMap.constructSize(),
-                    distMap.subMap(),
-                    distMap.constructMap(),
-                    allVectors_[vectorI]
-                );
-            }
-        }
-
-
-        label n = 0;
-        forAll(allTracks_, trackI)
-        {
-            n += allTracks_[trackI].size();
-        }
-
-        Info<< "    Tracks:" << allTracks_.size() << nl
-            << "    Total samples:" << n
-            << endl;
-
-
-        // Massage into form suitable for writers
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        if (Pstream::master() && allTracks_.size())
-        {
-            // Make output directory
-
-            fileName vtkPath
-            (
-                Pstream::parRun()
-              ? runTime.path()/".."/"postProcessing"/"sets"/name()
-              : runTime.path()/"postProcessing"/"sets"/name()
-            );
-            if (mesh.name() != fvMesh::defaultRegion)
-            {
-                vtkPath = vtkPath/mesh.name();
-            }
-            vtkPath = vtkPath/mesh.time().timeName();
-
-            mkDir(vtkPath);
-
-            // Convert track positions
-
-            PtrList<coordSet> tracks(allTracks_.size());
-            forAll(allTracks_, trackI)
-            {
-                tracks.set
-                (
-                    trackI,
-                    new coordSet
-                    (
-                        "track" + Foam::name(trackI),
-                        sampledSetAxis_                 //"xyz"
-                    )
-                );
-                tracks[trackI].transfer(allTracks_[trackI]);
-            }
-
-            // Convert scalar values
-
-            if (allScalars_.size() > 0)
-            {
-                List<List<scalarField> > scalarValues(allScalars_.size());
-
-                forAll(allScalars_, scalarI)
-                {
-                    DynamicList<scalarList>& allTrackVals =
-                        allScalars_[scalarI];
-                    scalarValues[scalarI].setSize(allTrackVals.size());
-
-                    forAll(allTrackVals, trackI)
-                    {
-                        scalarList& trackVals = allTrackVals[trackI];
-                        scalarValues[scalarI][trackI].transfer(trackVals);
-                    }
-                }
-
-                fileName vtkFile
-                (
-                    vtkPath
-                  / scalarFormatterPtr_().getFileName
-                    (
-                        tracks[0],
-                        scalarNames_
-                    )
-                );
-
-                Info<< "    Writing data to " << vtkFile.path() << endl;
-
-                scalarFormatterPtr_().write
-                (
-                    true,           // writeTracks
-                    tracks,
-                    scalarNames_,
-                    scalarValues,
-                    OFstream(vtkFile)()
-                );
-            }
-
-            // Convert vector values
-
-            if (allVectors_.size() > 0)
-            {
-                List<List<vectorField> > vectorValues(allVectors_.size());
-
-                forAll(allVectors_, vectorI)
-                {
-                    DynamicList<vectorList>& allTrackVals =
-                        allVectors_[vectorI];
-                    vectorValues[vectorI].setSize(allTrackVals.size());
-
-                    forAll(allTrackVals, trackI)
-                    {
-                        vectorList& trackVals = allTrackVals[trackI];
-                        vectorValues[vectorI][trackI].transfer(trackVals);
-                    }
-                }
-
-                fileName vtkFile
-                (
-                    vtkPath
-                  / vectorFormatterPtr_().getFileName
-                    (
-                        tracks[0],
-                        vectorNames_
-                    )
-                );
-
-                //Info<< "    Writing vector data to " << vtkFile << endl;
-
-                vectorFormatterPtr_().write
-                (
-                    true,           // writeTracks
-                    tracks,
-                    vectorNames_,
-                    vectorValues,
-                    OFstream(vtkFile)()
-                );
-            }
+            if (log_) Info
+                << "    automatic track length specified through"
+                << " number of sub cycles : " << nSubCycle_ << nl
+                << endl;
         }
     }
 }
 
 
-void Foam::streamLine::updateMesh(const mapPolyMesh&)
-{
-    read(dict_);
-}
-
-
-void Foam::streamLine::movePoints(const polyMesh&)
-{
-    // Moving mesh affects the search tree
-    read(dict_);
-}
-
-
-//void Foam::streamLine::readUpdate(const polyMesh::readUpdateState state)
-//{
-//    if (state != UNCHANGED)
-//    {
-//        read(dict_);
-//    }
-//}
-
-
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 59d9d9026e..d1f319b490 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,6 +50,7 @@ Description
         lifeTime        10000;
         trackLength     1e-3;
         nSubCycle       5;
+        bounds          (0.2 -10 -10)(0.22 10 10);
         cloudName       particleTracks;
         seedSampleSet   uniform;
         uniformCoeffs
@@ -74,6 +75,8 @@ Description
         trackLength  | tracking segment length | no          |
         nSubCycle    | number of tracking steps per cell | no|
         cloudName    | cloud name to use       | yes         |
+        log          | Log to standard output  | no          | yes
+        bounds       | Bounding box to trim tracks | no | greatBox
         seedSampleSet| seeding method (see below)| yes       |
     \endtable
 
@@ -94,6 +97,7 @@ SeeAlso
     Foam::OutputFilterFunctionObject
     Foam::sampledSet
     Foam::wallBoundedStreamLine
+    Foam::streamLineBase
 
 SourceFiles
     streamLine.C
@@ -103,15 +107,7 @@ SourceFiles
 #ifndef streamLine_H
 #define streamLine_H
 
-#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
-#include "Switch.H"
-#include "DynamicList.H"
-#include "scalarList.H"
-#include "vectorList.H"
-#include "polyMesh.H"
-#include "writer.H"
-#include "indirectPrimitivePatch.H"
+#include "streamLineBase.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -121,103 +117,22 @@ namespace Foam
 // Forward declaration of classes
 class objectRegistry;
 class dictionary;
-class mapPolyMesh;
-class meshSearch;
-class sampledSet;
 
 /*---------------------------------------------------------------------------*\
                          Class streamLine Declaration
 \*---------------------------------------------------------------------------*/
 
 class streamLine
+:
+    public streamLineBase
 {
     // Private data
 
-        //- Input dictionary
-        dictionary dict_;
-
-        //- Name of this set of field averages.
-        word name_;
-
-        //- Database this class is registered to
-        const objectRegistry& obr_;
-
-        //- Load fields from files (not from objectRegistry)
-        bool loadFromFiles_;
-
-        //- On/off switch
-        bool active_;
-
-        //- List of fields to sample
-        wordList fields_;
-
-        //- Field to transport particle with
-        word UName_;
-
-        //- Interpolation scheme to use
-        word interpolationScheme_;
-
-        //- Whether to use +u or -u
-        bool trackForward_;
-
-        //- Maximum lifetime (= number of cells) of particle
-        label lifeTime_;
-
         //- Number of subcycling steps
         label nSubCycle_;
 
-        //- Track length
-        scalar trackLength_;
 
-        //- Optional specified name of particles
-        word cloudName_;
-
-        //- Type of seed
-        word seedSet_;
-
-        //- Names of scalar fields
-        wordList scalarNames_;
-
-        //- Names of vector fields
-        wordList vectorNames_;
-
-
-
-        // Demand driven
-
-            //- Mesh searching enigne
-            autoPtr<meshSearch> meshSearchPtr_;
-
-            //- Seed set engine
-            autoPtr<sampledSet> sampledSetPtr_;
-
-            //- Axis of the sampled points to output
-            word sampledSetAxis_;
-
-            //- File writer for scalar data
-            autoPtr<writer<scalar> > scalarFormatterPtr_;
-
-            //- File writer for vector data
-            autoPtr<writer<vector> > vectorFormatterPtr_;
-
-
-        // Generated data
-
-            //- All tracks. Per particle the points it passed through
-            DynamicList<List<point> > allTracks_;
-
-            //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<scalarList> > allScalars_;
-
-            //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<vectorList> > allVectors_;
-
-
-        //- Construct patch out of all wall patch faces
-        autoPtr<indirectPrimitivePatch> wallPatch() const;
-
-        //- Do all seeding and tracking
-        void track();
+   // Private Member Functions
 
         //- Disallow default bitwise copy construct
         streamLine(const streamLine&);
@@ -251,35 +166,11 @@ public:
 
     // Member Functions
 
-        //- Return name of the set of field averages
-        virtual const word& name() const
-        {
-            return name_;
-        }
-
-        //- Read the field average data
+        //- Read settings
         virtual void read(const dictionary&);
 
-        //- Execute the averaging
-        virtual void execute();
-
-        //- Execute the averaging at the final time-loop, currently does nothing
-        virtual void end();
-
-        //- Called when time was set at the end of the Time::operator++
-        virtual void timeSet();
-
-        //- Calculate the field average data and write
-        virtual void write();
-
-        //- Update for changes of mesh
-        virtual void updateMesh(const mapPolyMesh&);
-
-        //- Update for mesh point-motion
-        virtual void movePoints(const polyMesh&);
-
-        ////- Update for changes of mesh due to readUpdate
-        //virtual void readUpdate(const polyMesh::readUpdateState state);
+        //- Do the actual tracking to fill the track data
+        virtual void track();
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C b/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C
new file mode 100644
index 0000000000..c7e421a504
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C
@@ -0,0 +1,977 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "streamLineBase.H"
+#include "fvMesh.H"
+#include "ReadFields.H"
+#include "sampledSet.H"
+#include "globalIndex.H"
+#include "mapDistribute.H"
+#include "interpolationCellPoint.H"
+#include "wallPolyPatch.H"
+#include "meshSearchMeshObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(streamLineBase, 0);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::indirectPrimitivePatch>
+Foam::streamLineBase::wallPatch() const
+{
+    const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
+
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    label nFaces = 0;
+
+    forAll(patches, patchI)
+    {
+        //if (!polyPatch::constraintType(patches[patchI].type()))
+        if (isA<wallPolyPatch>(patches[patchI]))
+        {
+            nFaces += patches[patchI].size();
+        }
+    }
+
+    labelList addressing(nFaces);
+
+    nFaces = 0;
+
+    forAll(patches, patchI)
+    {
+        //if (!polyPatch::constraintType(patches[patchI].type()))
+        if (isA<wallPolyPatch>(patches[patchI]))
+        {
+            const polyPatch& pp = patches[patchI];
+
+            forAll(pp, i)
+            {
+                addressing[nFaces++] = pp.start()+i;
+            }
+        }
+    }
+
+    return autoPtr<indirectPrimitivePatch>
+    (
+        new indirectPrimitivePatch
+        (
+            IndirectList<face>
+            (
+                mesh.faces(),
+                addressing
+            ),
+            mesh.points()
+        )
+    );
+}
+
+
+void Foam::streamLineBase::initInterpolations
+(
+    const label nSeeds,
+    label& UIndex,
+    PtrList<volScalarField>& vsFlds,
+    PtrList<interpolation<scalar> >& vsInterp,
+    PtrList<volVectorField>& vvFlds,
+    PtrList<interpolation<vector> >& vvInterp
+)
+{
+    const Time& runTime = obr_.time();
+    const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
+
+    // Read or lookup fields
+
+    if (loadFromFiles_)
+    {
+        IOobjectList allObjects(mesh, runTime.timeName());
+
+        IOobjectList objects(2*fields_.size());
+        forAll(fields_, i)
+        {
+            objects.add(*allObjects[fields_[i]]);
+        }
+
+        ReadFields(mesh, objects, vsFlds);
+        vsInterp.setSize(vsFlds.size());
+        forAll(vsFlds, i)
+        {
+            vsInterp.set
+            (
+                i,
+                interpolation<scalar>::New
+                (
+                    interpolationScheme_,
+                    vsFlds[i]
+                )
+            );
+        }
+        ReadFields(mesh, objects, vvFlds);
+        vvInterp.setSize(vvFlds.size());
+        forAll(vvFlds, i)
+        {
+            vvInterp.set
+            (
+                i,
+                interpolation<vector>::New
+                (
+                    interpolationScheme_,
+                    vvFlds[i]
+                )
+            );
+        }
+    }
+    else
+    {
+        label nScalar = 0;
+        label nVector = 0;
+
+        forAll(fields_, i)
+        {
+            if (mesh.foundObject<volScalarField>(fields_[i]))
+            {
+                nScalar++;
+            }
+            else if (mesh.foundObject<volVectorField>(fields_[i]))
+            {
+                nVector++;
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Cannot find field " << fields_[i] << nl
+                    << "Valid scalar fields are:"
+                    << mesh.names(volScalarField::typeName) << nl
+                    << "Valid vector fields are:"
+                    << mesh.names(volVectorField::typeName)
+                    << exit(FatalError);
+            }
+        }
+        vsInterp.setSize(nScalar);
+        nScalar = 0;
+        vvInterp.setSize(nVector);
+        nVector = 0;
+
+        forAll(fields_, i)
+        {
+            if (mesh.foundObject<volScalarField>(fields_[i]))
+            {
+                const volScalarField& f = mesh.lookupObject<volScalarField>
+                (
+                    fields_[i]
+                );
+                vsInterp.set
+                (
+                    nScalar++,
+                    interpolation<scalar>::New
+                    (
+                        interpolationScheme_,
+                        f
+                    )
+                );
+            }
+            else if (mesh.foundObject<volVectorField>(fields_[i]))
+            {
+                const volVectorField& f = mesh.lookupObject<volVectorField>
+                (
+                    fields_[i]
+                );
+
+                if (f.name() == UName_)
+                {
+                    UIndex = nVector;
+                }
+
+                vvInterp.set
+                (
+                    nVector++,
+                    interpolation<vector>::New
+                    (
+                        interpolationScheme_,
+                        f
+                    )
+                );
+            }
+        }
+    }
+
+    // Store the names
+    scalarNames_.setSize(vsInterp.size());
+    forAll(vsInterp, i)
+    {
+        scalarNames_[i] = vsInterp[i].psi().name();
+    }
+    vectorNames_.setSize(vvInterp.size());
+    forAll(vvInterp, i)
+    {
+        vectorNames_[i] = vvInterp[i].psi().name();
+    }
+
+    // Check that we know the index of U in the interpolators.
+
+    if (UIndex == -1)
+    {
+        FatalErrorInFunction
+            << "Cannot find field to move particles with : " << UName_ << nl
+            << "This field has to be present in the sampled fields " << fields_
+            << " and in the objectRegistry."
+            << exit(FatalError);
+    }
+
+    // Sampled data
+    // ~~~~~~~~~~~~
+
+    // Size to maximum expected sizes.
+    allTracks_.clear();
+    allTracks_.setCapacity(nSeeds);
+    allScalars_.setSize(vsInterp.size());
+    forAll(allScalars_, i)
+    {
+        allScalars_[i].clear();
+        allScalars_[i].setCapacity(nSeeds);
+    }
+    allVectors_.setSize(vvInterp.size());
+    forAll(allVectors_, i)
+    {
+        allVectors_[i].clear();
+        allVectors_[i].setCapacity(nSeeds);
+    }
+}
+
+
+void Foam::streamLineBase::storePoint
+(
+    const label trackI,
+
+    const scalar w,
+    const label leftI,
+    const label rightI,
+
+    DynamicList<point>& newTrack,
+    DynamicList<scalarList>& newScalars,
+    DynamicList<vectorList>& newVectors
+) const
+{
+    label sz = newTrack.size();
+
+    const List<point>& track = allTracks_[trackI];
+
+    newTrack.append((1.0-w)*track[leftI] + w*track[rightI]);
+
+    // Scalars
+    {
+        newScalars.append(scalarList(allScalars_.size()));
+        scalarList& newVals = newScalars[sz];
+
+        forAll(allScalars_, scalarI)
+        {
+            const scalarList& trackVals = allScalars_[scalarI][trackI];
+            newVals[scalarI] = (1.0-w)*trackVals[leftI] + w*trackVals[rightI];
+        }
+    }
+
+    // Vectors
+    {
+        newVectors.append(vectorList(allVectors_.size()));
+        vectorList& newVals = newVectors[sz];
+
+        forAll(allVectors_, vectorI)
+        {
+            const vectorList& trackVals = allVectors_[vectorI][trackI];
+            newVals[vectorI] = (1.0-w)*trackVals[leftI] + w*trackVals[rightI];
+        }
+    }
+}
+
+
+// Can split a track into multiple tracks
+void Foam::streamLineBase::trimToBox
+(
+    const treeBoundBox& bb,
+    const label trackI,
+    PtrList<DynamicList<point> >& newTracks,
+    PtrList<DynamicList<scalarList> >& newScalars,
+    PtrList<DynamicList<vectorList> >& newVectors
+) const
+{
+    const List<point>& track = allTracks_[trackI];
+    if (track.size())
+    {
+        for
+        (
+            label segmentI = 1;
+            segmentI < track.size();
+            segmentI++
+        )
+        {
+            const point& startPt = track[segmentI-1];
+            const point& endPt = track[segmentI];
+
+            const vector d(endPt-startPt);
+            scalar magD = mag(d);
+            if (magD > ROOTVSMALL)
+            {
+                if (bb.contains(startPt))
+                {
+                    // Store 1.0*track[segmentI-1]+0*track[segmentI]
+                    storePoint
+                    (
+                        trackI,
+
+                        0.0,
+                        segmentI-1,
+                        segmentI,
+
+                        newTracks.last(),
+                        newScalars.last(),
+                        newVectors.last()
+                    );
+
+                    if (!bb.contains(endPt))
+                    {
+                        point clipPt;
+                        if (bb.intersects(endPt, startPt, clipPt))
+                        {
+                            // End of track. Store point and interpolated
+                            // values
+                            storePoint
+                            (
+                                trackI,
+
+                                mag(clipPt-startPt)/magD,
+                                segmentI-1,
+                                segmentI,
+
+                                newTracks.last(),
+                                newScalars.last(),
+                                newVectors.last()
+                            );
+
+                            newTracks.last().shrink();
+                            newScalars.last().shrink();
+                            newVectors.last().shrink();
+                        }
+                    }
+                }
+                else
+                {
+                    // startPt outside box. New track. Get starting point
+
+                    point clipPt;
+                    if (bb.intersects(startPt, endPt, clipPt))
+                    {
+                        // New track
+                        newTracks.append
+                        (
+                            new DynamicList<point>(track.size()/10)
+                        );
+                        newScalars.append
+                        (
+                            new DynamicList<scalarList>(track.size()/10)
+                        );
+                        newVectors.append
+                        (
+                            new DynamicList<vectorList>(track.size()/10)
+                        );
+
+                        // Store point and interpolated values
+                        storePoint
+                        (
+                            trackI,
+
+                            mag(clipPt-startPt)/magD,
+                            segmentI-1,
+                            segmentI,
+
+                            newTracks.last(),
+                            newScalars.last(),
+                            newVectors.last()
+                        );
+
+                        if (!bb.contains(endPt))
+                        {
+                            bb.intersects
+                            (
+                                endPt,
+                                point(clipPt),
+                                clipPt
+                            );
+
+                            // Store point and interpolated values
+                            storePoint
+                            (
+                                trackI,
+
+                                mag(clipPt-startPt)/magD,
+                                segmentI-1,
+                                segmentI,
+
+                                newTracks.last(),
+                                newScalars.last(),
+                                newVectors.last()
+                            );
+
+                            newTracks.last().shrink();
+                            newScalars.last().shrink();
+                            newVectors.last().shrink();
+                        }
+                    }
+                }
+            }
+        }
+
+        // Last point
+        if (bb.contains(track.last()))
+        {
+            storePoint
+            (
+                trackI,
+
+                1.0,
+                track.size()-2,
+                track.size()-1,
+
+                newTracks.last(),
+                newScalars.last(),
+                newVectors.last()
+            );
+        }
+    }
+}
+
+
+void Foam::streamLineBase::trimToBox(const treeBoundBox& bb)
+{
+    // Storage for new tracks. Per track, per sample the coordinate (newTracks)
+    // or values for all the sampled fields (newScalars, newVectors)
+    PtrList<DynamicList<point> > newTracks;
+    PtrList<DynamicList<scalarList> > newScalars;
+    PtrList<DynamicList<vectorList> > newVectors;
+
+    forAll(allTracks_, trackI)
+    {
+        const List<point>& track = allTracks_[trackI];
+
+        if (track.size())
+        {
+            // New track. Assume it consists of the whole track
+            newTracks.append(new DynamicList<point>(track.size()));
+            newScalars.append(new DynamicList<scalarList>(track.size()));
+            newVectors.append(new DynamicList<vectorList>(track.size()));
+
+            // Trim, split and append to newTracks
+            trimToBox(bb, trackI, newTracks, newScalars, newVectors);
+        }
+    }
+
+    // Transfer newTracks to allTracks_
+    allTracks_.setSize(newTracks.size());
+    forAll(allTracks_, trackI)
+    {
+        allTracks_[trackI].transfer(newTracks[trackI]);
+    }
+    // Replace track scalars
+    forAll(allScalars_, scalarI)
+    {
+        DynamicList<scalarList>& fieldVals = allScalars_[scalarI];
+        fieldVals.setSize(newTracks.size());
+
+        forAll(fieldVals, trackI)
+        {
+            scalarList& trackVals = allScalars_[scalarI][trackI];
+            trackVals.setSize(newScalars[trackI].size());
+            forAll(trackVals, sampleI)
+            {
+                trackVals[sampleI] = newScalars[trackI][sampleI][scalarI];
+            }
+        }
+    }
+    // Replace track vectors
+    forAll(allVectors_, vectorI)
+    {
+        DynamicList<vectorList>& fieldVals = allVectors_[vectorI];
+        fieldVals.setSize(newTracks.size());
+        forAll(fieldVals, trackI)
+        {
+            vectorList& trackVals = allVectors_[vectorI][trackI];
+            trackVals.setSize(newVectors[trackI].size());
+            forAll(trackVals, sampleI)
+            {
+                trackVals[sampleI] = newVectors[trackI][sampleI][vectorI];
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::streamLineBase::streamLineBase
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectState(obr, name),
+    dict_(dict),
+    obr_(obr),
+    loadFromFiles_(loadFromFiles),
+    log_(true)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::streamLineBase::~streamLineBase()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::streamLineBase::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        log_.readIfPresent("log", dict);
+
+        if (log_) Info<< type() << " " << name_ << ":" << nl;
+
+        dict.lookup("fields") >> fields_;
+        if (dict.found("UName"))
+        {
+            dict.lookup("UName") >> UName_;
+        }
+        else
+        {
+            UName_ = "U";
+            if (dict.found("U"))
+            {
+                IOWarningInFunction(dict)
+                    << "Using deprecated entry \"U\"."
+                    << " Please use \"UName\" instead."
+                    << endl;
+                dict.lookup("U") >> UName_;
+            }
+        }
+
+        if (findIndex(fields_, UName_) == -1)
+        {
+            FatalIOErrorInFunction(dict)
+                << "Velocity field for tracking " << UName_
+                << " should be present in the list of fields " << fields_
+                << exit(FatalIOError);
+        }
+
+
+        dict.lookup("trackForward") >> trackForward_;
+        dict.lookup("lifeTime") >> lifeTime_;
+        if (lifeTime_ < 1)
+        {
+            FatalErrorInFunction
+                << "Illegal value " << lifeTime_ << " for lifeTime"
+                << exit(FatalError);
+        }
+
+
+        trackLength_ = VGREAT;
+        if (dict.found("trackLength"))
+        {
+            dict.lookup("trackLength") >> trackLength_;
+
+            if (log_)
+            {
+                Info<< type() << " : fixed track length specified : "
+                    << trackLength_ << nl << endl;
+            }
+        }
+
+
+        bounds_ = boundBox::greatBox;
+        if (dict.readIfPresent("bounds", bounds_))
+        {
+            if (log_) Info<< "    clipping all segments to " << bounds_ << nl << endl;
+        }
+
+
+        interpolationScheme_ = dict.lookupOrDefault
+        (
+            "interpolationScheme",
+            interpolationCellPoint<scalar>::typeName
+        );
+
+        //if (log_) Info<< "    using interpolation " << interpolationScheme_
+        //    << endl;
+
+        cloudName_ = dict.lookupOrDefault<word>("cloudName", type());
+        dict.lookup("seedSampleSet") >> seedSet_;
+
+        const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
+
+        const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
+
+        sampledSetPtr_ = sampledSet::New
+        (
+            seedSet_,
+            mesh,
+            meshSearchMeshObject::New(mesh),
+            coeffsDict
+        );
+        coeffsDict.lookup("axis") >> sampledSetAxis_;
+
+        scalarFormatterPtr_ = writer<scalar>::New(dict.lookup("setFormat"));
+        vectorFormatterPtr_ = writer<vector>::New(dict.lookup("setFormat"));
+    }
+}
+
+
+void Foam::streamLineBase::execute()
+{}
+
+
+void Foam::streamLineBase::end()
+{}
+
+
+void Foam::streamLineBase::timeSet()
+{}
+
+
+void Foam::streamLineBase::write()
+{
+    if (active_)
+    {
+        if (log_) Info<< type() << " " << name_ << " output:" << nl;
+
+        const Time& runTime = obr_.time();
+        const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
+
+
+        // Do all injection and tracking
+        track();
+
+
+        if (Pstream::parRun())
+        {
+            // Append slave tracks to master ones
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            globalIndex globalTrackIDs(allTracks_.size());
+
+            // Construct a distribution map to pull all to the master.
+            labelListList sendMap(Pstream::nProcs());
+            labelListList recvMap(Pstream::nProcs());
+
+            if (Pstream::master())
+            {
+                // Master: receive all. My own first, then consecutive
+                // processors.
+                label trackI = 0;
+
+                forAll(recvMap, procI)
+                {
+                    labelList& fromProc = recvMap[procI];
+                    fromProc.setSize(globalTrackIDs.localSize(procI));
+                    forAll(fromProc, i)
+                    {
+                        fromProc[i] = trackI++;
+                    }
+                }
+            }
+
+            labelList& toMaster = sendMap[0];
+            toMaster.setSize(globalTrackIDs.localSize());
+            forAll(toMaster, i)
+            {
+                toMaster[i] = i;
+            }
+
+            const mapDistribute distMap
+            (
+                globalTrackIDs.size(),
+                sendMap.xfer(),
+                recvMap.xfer()
+            );
+
+
+            // Distribute the track positions. Note: use scheduled comms
+            // to prevent buffering.
+            allTracks_.shrink();
+            mapDistributeBase::distribute
+            (
+                Pstream::scheduled,
+                distMap.schedule(),
+                distMap.constructSize(),
+                distMap.subMap(),
+                false,
+                distMap.constructMap(),
+                false,
+                allTracks_,
+                flipOp()
+            );
+            allTracks_.setCapacity(allTracks_.size());
+
+            // Distribute the scalars
+            forAll(allScalars_, scalarI)
+            {
+                allScalars_[scalarI].shrink();
+                mapDistributeBase::distribute
+                (
+                    Pstream::scheduled,
+                    distMap.schedule(),
+                    distMap.constructSize(),
+                    distMap.subMap(),
+                    false,
+                    distMap.constructMap(),
+                    false,
+                    allScalars_[scalarI],
+                    flipOp()
+                );
+                allScalars_[scalarI].setCapacity(allScalars_[scalarI].size());
+            }
+            // Distribute the vectors
+            forAll(allVectors_, vectorI)
+            {
+                allVectors_[vectorI].shrink();
+                mapDistributeBase::distribute
+                (
+                    Pstream::scheduled,
+                    distMap.schedule(),
+                    distMap.constructSize(),
+                    distMap.subMap(),
+                    false,
+                    distMap.constructMap(),
+                    false,
+                    allVectors_[vectorI],
+                    flipOp()
+                );
+                allVectors_[vectorI].setCapacity(allVectors_[vectorI].size());
+            }
+        }
+
+
+        if (Pstream::master())
+        {
+            if (bounds_ != boundBox::greatBox)
+            {
+                // Clip to bounding box
+                trimToBox(treeBoundBox(bounds_));
+            }
+
+
+            label nTracks = 0;
+            label n = 0;
+            forAll(allTracks_, trackI)
+            {
+                if (allTracks_[trackI].size())
+                {
+                    nTracks++;
+                    n += allTracks_[trackI].size();
+                }
+            }
+
+            if (log_)
+            {
+                Info<< "    Tracks:" << nTracks << nl
+                    << "    Total samples:" << n
+                    << endl;
+            }
+
+
+            // Massage into form suitable for writers
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            // Make output directory
+
+            fileName vtkPath
+            (
+                Pstream::parRun()
+              ? runTime.path()/".."/"postProcessing"/"sets"/name()
+              : runTime.path()/"postProcessing"/"sets"/name()
+            );
+            if (mesh.name() != fvMesh::defaultRegion)
+            {
+                vtkPath = vtkPath/mesh.name();
+            }
+            vtkPath = vtkPath/mesh.time().timeName();
+
+            mkDir(vtkPath);
+
+            // Convert track positions (and compact out empty tracks)
+
+            PtrList<coordSet> tracks(nTracks);
+            nTracks = 0;
+            labelList oldToNewTrack(allTracks_.size(), -1);
+
+            forAll(allTracks_, trackI)
+            {
+                if (allTracks_[trackI].size())
+                {
+                    tracks.set
+                    (
+                        nTracks,
+                        new coordSet
+                        (
+                            "track" + Foam::name(nTracks),
+                            sampledSetAxis_                 //"xyz"
+                        )
+                    );
+                    oldToNewTrack[trackI] = nTracks;
+                    tracks[nTracks].transfer(allTracks_[trackI]);
+                    nTracks++;
+                }
+            }
+
+            // Convert scalar values
+
+            if (allScalars_.size() > 0)
+            {
+                List<List<scalarField> > scalarValues(allScalars_.size());
+
+                forAll(allScalars_, scalarI)
+                {
+                    DynamicList<scalarList>& allTrackVals =
+                        allScalars_[scalarI];
+                    scalarValues[scalarI].setSize(nTracks);
+
+                    forAll(allTrackVals, trackI)
+                    {
+                        scalarList& vals = allTrackVals[trackI];
+                        if (vals.size())
+                        {
+                            label newTrackI = oldToNewTrack[trackI];
+                            scalarValues[scalarI][newTrackI].transfer(vals);
+                        }
+                    }
+                }
+
+                fileName vtkFile
+                (
+                    vtkPath
+                  / scalarFormatterPtr_().getFileName
+                    (
+                        tracks[0],
+                        scalarNames_
+                    )
+                );
+
+                if (log_) Info
+                    << "    Writing data to " << vtkFile.path() << endl;
+
+                scalarFormatterPtr_().write
+                (
+                    true,           // writeTracks
+                    tracks,
+                    scalarNames_,
+                    scalarValues,
+                    OFstream(vtkFile)()
+                );
+
+                forAll(scalarNames_, nameI)
+                {
+                    dictionary propsDict;
+                    propsDict.add("file", vtkFile);
+                    const word& fieldName = scalarNames_[nameI];
+                    setProperty(fieldName, propsDict);
+                }
+            }
+
+            // Convert vector values
+
+            if (allVectors_.size() > 0)
+            {
+                List<List<vectorField> > vectorValues(allVectors_.size());
+
+                forAll(allVectors_, vectorI)
+                {
+                    DynamicList<vectorList>& allTrackVals =
+                        allVectors_[vectorI];
+                    vectorValues[vectorI].setSize(nTracks);
+
+                    forAll(allTrackVals, trackI)
+                    {
+                        vectorList& vals = allTrackVals[trackI];
+                        if (vals.size())
+                        {
+                            label newTrackI = oldToNewTrack[trackI];
+                            vectorValues[vectorI][newTrackI].transfer(vals);
+                        }
+                    }
+                }
+
+                fileName vtkFile
+                (
+                    vtkPath
+                  / vectorFormatterPtr_().getFileName
+                    (
+                        tracks[0],
+                        vectorNames_
+                    )
+                );
+
+                //if (log_) Info<< "    Writing vector data to " << vtkFile << endl;
+
+                vectorFormatterPtr_().write
+                (
+                    true,           // writeTracks
+                    tracks,
+                    vectorNames_,
+                    vectorValues,
+                    OFstream(vtkFile)()
+                );
+
+                forAll(vectorNames_, nameI)
+                {
+                    dictionary propsDict;
+                    propsDict.add("file", vtkFile);
+                    const word& fieldName = vectorNames_[nameI];
+                    setProperty(fieldName, propsDict);
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::streamLineBase::updateMesh(const mapPolyMesh&)
+{
+    read(dict_);
+}
+
+
+void Foam::streamLineBase::movePoints(const polyMesh&)
+{
+    // Moving mesh affects the search tree
+    read(dict_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineBase.H b/src/postProcessing/functionObjects/field/streamLine/streamLineBase.H
new file mode 100644
index 0000000000..5b7e893d77
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineBase.H
@@ -0,0 +1,246 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::streamLineBase
+
+SeeAlso
+    Foam::streamLine
+    Foam::wallBoundedStreamLine
+
+SourceFiles
+    streamLineBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef streamLineBase_H
+#define streamLineBase_H
+
+#include "functionObjectState.H"
+#include "DynamicList.H"
+#include "scalarList.H"
+#include "vectorList.H"
+#include "writer.H"
+#include "indirectPrimitivePatch.H"
+#include "interpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+class meshSearch;
+class sampledSet;
+
+/*---------------------------------------------------------------------------*\
+                         Class streamLineBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class streamLineBase
+:
+    public functionObjectState
+{
+protected:
+
+        //- Input dictionary
+        dictionary dict_;
+
+        //- Database this class is registered to
+        const objectRegistry& obr_;
+
+        //- Load fields from files (not from objectRegistry)
+        bool loadFromFiles_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
+        //- List of fields to sample
+        wordList fields_;
+
+        //- Field to transport particle with
+        word UName_;
+
+        //- Interpolation scheme to use
+        word interpolationScheme_;
+
+        //- Whether to use +u or -u
+        bool trackForward_;
+
+        //- Maximum lifetime (= number of cells) of particle
+        label lifeTime_;
+
+        //- Track length
+        scalar trackLength_;
+
+        //- Optional trimming of tracks
+        boundBox bounds_;
+
+        //- Optional specified name of particles
+        word cloudName_;
+
+        //- Type of seed
+        word seedSet_;
+
+        //- Names of scalar fields
+        wordList scalarNames_;
+
+        //- Names of vector fields
+        wordList vectorNames_;
+
+
+        // Demand driven
+
+            //- Mesh searching enigne
+            autoPtr<meshSearch> meshSearchPtr_;
+
+            //- Seed set engine
+            autoPtr<sampledSet> sampledSetPtr_;
+
+            //- Axis of the sampled points to output
+            word sampledSetAxis_;
+
+            //- File writer for scalar data
+            autoPtr<writer<scalar> > scalarFormatterPtr_;
+
+            //- File writer for vector data
+            autoPtr<writer<vector> > vectorFormatterPtr_;
+
+
+        // Generated data
+
+            //- All tracks. Per track the points it passed through
+            DynamicList<List<point> > allTracks_;
+
+            //- Per scalarField, per track, the sampled values
+            List<DynamicList<scalarList> > allScalars_;
+
+            //- Per vectorField, per track, the sampled values
+            List<DynamicList<vectorList> > allVectors_;
+
+
+        //- Construct patch out of all wall patch faces
+        autoPtr<indirectPrimitivePatch> wallPatch() const;
+
+        //- Initialise fields, interpolators and track storage
+        void initInterpolations
+        (
+            const label nSeeds,
+            label& UIndex,
+            PtrList<volScalarField>& vsFlds,
+            PtrList<interpolation<scalar> >& vsInterp,
+            PtrList<volVectorField>& vvFlds,
+            PtrList<interpolation<vector> >& vvInterp
+        );
+
+        //- Generate point and values by interpolating from existing values
+        void storePoint
+        (
+            const label trackI,
+
+            const scalar w,
+            const label leftI,
+            const label rightI,
+
+            DynamicList<point>& newTrack,
+            DynamicList<List<scalar> >& newScalars,
+            DynamicList<List<vector> >& newVectors
+        ) const;
+
+        //- Trim and possibly split a track
+        void trimToBox
+        (
+            const treeBoundBox& bb,
+            const label trackI,
+            PtrList<DynamicList<point> >& newTracks,
+            PtrList<DynamicList<scalarList> >& newScalars,
+            PtrList<DynamicList<vectorList> >& newVectors
+        ) const;
+
+        //- Trim tracks to bounding box
+        void trimToBox(const treeBoundBox& bb);
+
+        //- Do the actual tracking to fill the track data
+        virtual void track() = 0;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("streamLineBase");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        streamLineBase
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~streamLineBase();
+
+
+    // Member Functions
+
+        //- Read the field average data
+        virtual void read(const dictionary&);
+
+        //- Execute the averaging
+        virtual void execute();
+
+        //- Execute the averaging at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Track and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&);
+
+        //- Update for mesh point-motion
+        virtual void movePoints(const polyMesh&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index b62409d6bb..4b31d77e39 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ Foam::vector Foam::streamLineParticle::interpolateFields
 {
     if (cellI == -1)
     {
-        FatalErrorIn("streamLineParticle::interpolateFields(..)")
+        FatalErrorInFunction
             << "Cell:" << cellI << abort(FatalError);
     }
 
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
index 0048f0d15a..c2fd737800 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,7 +46,8 @@ Foam::surfaceInterpolateFields::surfaceInterpolateFields
     name_(name),
     obr_(obr),
     active_(true),
-    fieldSet_()
+    fieldSet_(),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (isA<fvMesh>(obr_))
@@ -56,16 +57,8 @@ Foam::surfaceInterpolateFields::surfaceInterpolateFields
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "surfaceInterpolateFields::surfaceInterpolateFields"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 }
@@ -83,6 +76,7 @@ void Foam::surfaceInterpolateFields::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_.readIfPresent("log", dict);
         dict.lookup("fields") >> fieldSet_;
     }
 }
@@ -92,7 +86,7 @@ void Foam::surfaceInterpolateFields::execute()
 {
     if (active_)
     {
-        Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info<< type() << " " << name_ << " output:" << nl;
 
         // Clear out any previously loaded fields
         ssf_.clear();
@@ -107,17 +101,14 @@ void Foam::surfaceInterpolateFields::execute()
         interpolateFields<symmTensor>(sSymmtf_);
         interpolateFields<tensor>(stf_);
 
-        Info<< endl;
+        if (log_) Info<< endl;
     }
 }
 
 
 void Foam::surfaceInterpolateFields::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -131,9 +122,9 @@ void Foam::surfaceInterpolateFields::write()
 {
     if (active_)
     {
-        Info<< type() << " " << name_ << " output:" << nl;
-
-        Info<< "    Writing interpolated surface fields to "
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
+            << "    Writing interpolated surface fields to "
             << obr_.time().timeName() << endl;
 
         forAll(ssf_, i)
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index 1a5d38a075..b71503f393 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,7 @@ Description
         Property | Description               | Required    | Default value
         type     | type name: nearWallFields | yes         |
         fields   | list of fields with correspoding output field names | yes |
+        log      | Log to standard output    | no          | yes
     \endtable
 
 
@@ -103,9 +104,11 @@ protected:
         bool active_;
 
         //- Fields to process
-        //wordList fieldSet_;
         List<Tuple2<word, word> > fieldSet_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
         //- Locally constructed fields
         PtrList<surfaceScalarField> ssf_;
         PtrList<surfaceVectorField> svf_;
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
index f302ae1f2c..ad89ee2716 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,8 @@ void Foam::surfaceInterpolateFields::interpolateFields
 
             if (obr_.found(sName))
             {
-                Info<< "        surface field " << sName << " already exists"
+                if (log_) Info
+                    << "        surface field " << sName << " already exists"
                     << endl;
             }
             else
@@ -68,7 +69,8 @@ void Foam::surfaceInterpolateFields::interpolateFields
                 sflds.setSize(sz+1);
                 sflds.set(sz, new sfType(sName, linearInterpolate(fld)));
 
-                Info<< "        interpolated " << fld.name() << " to create "
+                if (log_) Info
+                    << "        interpolated " << fld.name() << " to create "
                     << sflds[sz].name() << endl;
             }
         }
diff --git a/src/postProcessing/functionObjects/field/valueAverage/IOvalueAverage.H b/src/postProcessing/functionObjects/field/valueAverage/IOvalueAverage.H
new file mode 100644
index 0000000000..d6d58060b9
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/valueAverage/IOvalueAverage.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOvalueAverage
+
+Description
+    Instance of the generic IOOutputFilter for valueAverage.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOvalueAverage_H
+#define IOvalueAverage_H
+
+#include "valueAverage.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<valueAverage> IOvalueAverage;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C b/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C
new file mode 100644
index 0000000000..8db50b1f6f
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/valueAverage/valueAverage.C
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "valueAverage.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(valueAverage, 0);
+}
+
+
+// * * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * //
+
+void Foam::valueAverage::writeFileHeader(Ostream& os) const
+{
+    writeHeader(os, "Value averages");
+    writeCommented(os, "Time");
+    forAll(fieldNames_, fieldI)
+    {
+        writeTabbed(os, fieldNames_[fieldI]);
+    }
+    os  << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::valueAverage::valueAverage
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name, typeName, dict),
+    obr_(obr),
+    functionObjectName_(dict.lookup("functionObjectName")),
+    fieldNames_(dict.lookup("fields")),
+    window_(dict.lookupOrDefault<scalar>("window", -1)),
+    totalTime_(fieldNames_.size(), obr_.time().deltaTValue()),
+    resetOnRestart_(false),
+    log_(true)
+{
+    if (resetOnRestart_)
+    {
+        forAll(fieldNames_, fieldI)
+        {
+            const word& fieldName = fieldNames_[fieldI];
+
+            if (dict.found(fieldName))
+            {
+                const dictionary& valueDict = dict.subDict(fieldName);
+                totalTime_[fieldI] = readScalar(valueDict.lookup("totalTime"));
+            }
+        }
+    }
+
+    writeFileHeader(file());
+}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::valueAverage::~valueAverage()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+void Foam::valueAverage::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        functionObjectFile::read(dict);
+
+        log_ = dict.lookupOrDefault<Switch>("log", true);
+    }
+}
+
+
+void Foam::valueAverage::execute()
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    scalar dt = obr_.time().deltaTValue();
+
+    if (log_) Info<< type() << ": " << name_ << " averages:" << nl;
+
+    file() << obr_.time().timeName();
+
+    DynamicList<label> unprocessedFields(fieldNames_.size());
+
+    forAll(fieldNames_, fieldI)
+    {
+        const word& fieldName(fieldNames_[fieldI]);
+        const word meanName(fieldName + "Mean");
+
+        scalar Dt = totalTime_[fieldI];
+        scalar alpha = (Dt - dt)/Dt;
+        scalar beta = dt/Dt;
+
+        if (window_ > 0)
+        {
+            if (Dt - dt >= window_)
+            {
+                alpha = (window_ - dt)/window_;
+                beta = dt/window_;
+            }
+        }
+
+        bool processed = false;
+        calc<scalar>(fieldName, meanName, alpha, beta, processed);
+        calc<vector>(fieldName, meanName, alpha, beta, processed);
+        calc<sphericalTensor>(fieldName, meanName, alpha, beta, processed);
+        calc<symmTensor>(fieldName, meanName, alpha, beta, processed);
+        calc<tensor>(fieldName, meanName, alpha, beta, processed);
+
+        if (!processed)
+        {
+            unprocessedFields.append(fieldI);
+
+            if (writeToFile())
+            {
+                file() << tab << "n/a";
+            }
+        }
+
+        totalTime_[fieldI] += dt;
+    }
+
+    file()<< endl;
+
+    if (unprocessedFields.size())
+    {
+        WarningInFunction
+            << "From function object: " << functionObjectName_ << nl
+            << "Unprocessed fields:" << nl;
+
+        forAll(unprocessedFields, i)
+        {
+            label fieldI = unprocessedFields[i];
+            Info<< "        " << fieldNames_[fieldI] << nl;
+        }
+        Info<< endl;
+    }
+
+    if (log_) Info<< endl;
+}
+
+
+void Foam::valueAverage::end()
+{
+    // Do nothing
+}
+
+
+void Foam::valueAverage::timeSet()
+{
+    // Do nothing
+}
+
+
+void Foam::valueAverage::write()
+{
+    // Do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/valueAverage/valueAverage.H b/src/postProcessing/functionObjects/field/valueAverage/valueAverage.H
new file mode 100644
index 0000000000..584e148106
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/valueAverage/valueAverage.H
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::valueAverage
+
+Group
+    grpFieldFunctionObjects
+
+Description
+    This function object calculates the average value from the output of
+    function objects that generate singular values.
+
+    Example of function object specification:
+    \verbatim
+    valueAverage1
+    {
+        type        valueAverage;
+        functionObjectLibs ("libfieldFunctionObjects.so");
+        ...
+        writeToFile yes;
+        log         yes;
+        functionObjectName forceCoeffs1;
+        fields      (Cm Cd Cl);
+        window      0.5;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type name: valueAverage | yes         |
+        writeToFile  | write average data to file |  no      | yes
+        log          | write average data to standard output | no | yes
+        fields       | list of fields to process | yes       |
+    \endtable
+
+    Output data is written to the file \<timeDir\>/valueAverage.dat
+
+SeeAlso
+    Foam::functionObject
+    Foam::functionObjectFile
+    Foam::functionObjectState
+    Foam::OutputFilterFunctionObject
+
+SourceFiles
+    valueAverage.C
+    valueAverageTemplates.C
+    IOvalueAverage.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef valueAverage_H
+#define valueAverage_H
+
+#include "functionObjectState.H"
+#include "functionObjectFile.H"
+#include "Switch.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                        Class valueAverage Declaration
+\*---------------------------------------------------------------------------*/
+
+class valueAverage
+:
+    public functionObjectState,
+    public functionObjectFile
+{
+protected:
+
+    // Protected data
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- Name of function object to retrueve data from
+        word functionObjectName_;
+
+        //- List of fields on which to operate
+        wordList fieldNames_;
+
+        //- Averaging window
+        const scalar window_;
+
+        //- Average time per field
+        List<scalar> totalTime_;
+
+        //- Reset the averaging process on restart flag
+        Switch resetOnRestart_;
+
+        //- Switch to send output to Info as well
+        Switch log_;
+
+
+    // Protected Member Functions
+
+        //- Templated function to calculate the average
+        template<class Type>
+        void calc
+        (
+            const word& fieldName,
+            const word& meanName,
+            const scalar alpha,
+            const scalar beta,
+            bool& processed
+        );
+
+        //- Output file header information
+        virtual void writeFileHeader(Ostream& os) const;
+
+        //- Disallow default bitwise copy construct
+        valueAverage(const valueAverage&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const valueAverage&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("valueAverage");
+
+    //- Constructor
+    valueAverage
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+       const bool loadFromFiles = false
+    );
+
+    //- Destructor
+    virtual ~valueAverage();
+
+
+    // Public Member Functions
+
+        //- Read the field min/max data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Write the fieldMinMax
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "valueAverageTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.C b/src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.C
new file mode 100644
index 0000000000..347cc28b52
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "valueAverageFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(valueAverageFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        valueAverageFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.H b/src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.H
new file mode 100644
index 0000000000..0845bc655c
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::valueAverageFunctionObject
+
+Description
+    FunctionObject wrapper around valueAverageFunctionObject to allow them
+    to be created via the functions entry within controlDict.
+
+SourceFiles
+    fieldMinMaxFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef valueAverageFunctionObject_H
+#define valueAverageFunctionObject_H
+
+#include "valueAverage.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<valueAverage>
+        valueAverageFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/valueAverage/valueAverageTemplates.C b/src/postProcessing/functionObjects/field/valueAverage/valueAverageTemplates.C
new file mode 100644
index 0000000000..10bff88779
--- /dev/null
+++ b/src/postProcessing/functionObjects/field/valueAverage/valueAverageTemplates.C
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class Type>
+void Foam::valueAverage::calc
+(
+    const word& fieldName,
+    const word& meanName,
+    const scalar alpha,
+    const scalar beta,
+    bool& processed
+)
+{
+    const word valueType = objectResultType(functionObjectName_, fieldName);
+
+    if (pTraits<Type>::typeName != valueType)
+    {
+        return;
+    }
+
+    Type currentValue = getObjectResult<Type>(functionObjectName_, fieldName);
+
+    Type meanValue = getResult<Type>(meanName);
+    meanValue = alpha*meanValue + beta*currentValue;
+
+    setResult(meanName, meanValue);
+
+    file() << tab << meanValue;
+
+    if (log_) Info<< "    " << meanName << ": " << meanValue << nl;
+
+    processed = true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
index 3cf1f74d88..956906ebf4 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -112,6 +112,9 @@ functions
         // Size of single track segment [m]
         //trackLength 1e-3;
 
+        // Optional clipping
+        //bounds  (0.2 -10 -10)(0.22 10 10);
+
         // Cloud name to use
         cloudName       particleTracks;
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
index f9d1407c1e..79bf458d24 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
@@ -39,7 +39,7 @@ Foam::edge Foam::wallBoundedParticle::currentEdge() const
 {
     if ((meshEdgeStart_ != -1) == (diagEdge_ != -1))
     {
-        FatalErrorIn("wallBoundedParticle::currentEdge() const")
+        FatalErrorInFunction
             << "Particle:"
             << info()
             << "cannot both be on a mesh edge and a face-diagonal edge."
@@ -93,11 +93,8 @@ void Foam::wallBoundedParticle::crossEdgeConnectedFace
         }
         else
         {
-            FatalErrorIn
-            (
-                "wallBoundedParticle::crossEdgeConnectedFace"
-                "(const edge&)"
-            )   << "Problem :"
+            FatalErrorInFunction
+                << "Problem :"
                 << " particle:"
                 << info()
                 << "face:" << tetFace()
@@ -113,11 +110,8 @@ void Foam::wallBoundedParticle::crossEdgeConnectedFace
     const edge eNew(f[meshEdgeStart_], f.nextLabel(meshEdgeStart_));
     if (eNew != meshEdge)
     {
-        FatalErrorIn
-        (
-            "wallBoundedParticle::crossEdgeConnectedFace"
-            "(const edge&)"
-        )   << "Problem" << abort(FatalError);
+        FatalErrorInFunction
+            << "Problem" << abort(FatalError);
     }
 }
 
@@ -126,14 +120,14 @@ void Foam::wallBoundedParticle::crossDiagonalEdge()
 {
     if (diagEdge_ == -1)
     {
-        FatalErrorIn("wallBoundedParticle::crossDiagonalEdge()")
+        FatalErrorInFunction
             << "Particle:"
             << info()
             << "not on a diagonal edge" << abort(FatalError);
     }
     if (meshEdgeStart_ != -1)
     {
-        FatalErrorIn("wallBoundedParticle::crossDiagonalEdge()")
+        FatalErrorInFunction
             << "Particle:"
             << info()
             << "meshEdgeStart_:" << meshEdgeStart_ << abort(FatalError);
@@ -156,7 +150,7 @@ void Foam::wallBoundedParticle::crossDiagonalEdge()
         }
         else
         {
-            FatalErrorIn("wallBoundedParticle::crossDiagonalEdge()")
+            FatalErrorInFunction
                 << "Particle:"
                 << info()
                 << "tetPt:" << tetPt()
@@ -190,9 +184,7 @@ Foam::scalar Foam::wallBoundedParticle::trackFaceTri
         currentE = currentEdge();
     }
 
-    // Determine path along line position+s*d to see where intersections
-    // are.
-
+    // Determine path along line position+s*d to see where intersections are.
     forAll(tri, i)
     {
         label j = tri.fcIndex(i);
@@ -259,23 +251,17 @@ bool Foam::wallBoundedParticle::isTriAlongTrack
     const triFace triVerts(currentTetIndices().faceTriIs(mesh_));
     const edge currentE = currentEdge();
 
-    //if (debug)
+    if
+    (
+        currentE[0] == currentE[1]
+     || findIndex(triVerts, currentE[0]) == -1
+     || findIndex(triVerts, currentE[1]) == -1
+    )
     {
-        if
-        (
-            currentE[0] == currentE[1]
-         || findIndex(triVerts, currentE[0]) == -1
-         || findIndex(triVerts, currentE[1]) == -1
-        )
-        {
-            FatalErrorIn
-            (
-                "wallBoundedParticle::isTriAlongTrack"
-                "(const point&)"
-            )   << "Edge " << currentE << " not on triangle " << triVerts
-                << info()
-                << abort(FatalError);
-        }
+        FatalErrorInFunction
+            << "Edge " << currentE << " not on triangle " << triVerts
+            << info()
+            << abort(FatalError);
     }
 
 
@@ -298,11 +284,8 @@ bool Foam::wallBoundedParticle::isTriAlongTrack
         }
     }
 
-    FatalErrorIn
-    (
-        "wallBoundedParticle::isTriAlongTrack"
-        "(const point&)"
-    )   << "Problem" << abort(FatalError);
+    FatalErrorInFunction
+        << "Problem" << abort(FatalError);
 
     return false;
 }
@@ -344,12 +327,7 @@ Foam::wallBoundedParticle::wallBoundedParticle
         }
         else
         {
-            is.read
-            (
-                reinterpret_cast<char*>(&meshEdgeStart_),
-                sizeof(meshEdgeStart_)
-              + sizeof(diagEdge_)
-            );
+            is.read(reinterpret_cast<char*>(&meshEdgeStart_), sizeofFields_);
         }
     }
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
index 0054ec2bb9..2be575b54e 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
@@ -115,15 +115,6 @@ protected:
         //- Construct current edge
         edge currentEdge() const;
 
-        //- Check if inside current tet
-        //void checkInside() const;
-
-        //- Check if on current edge
-        //void checkOnEdge() const;
-
-        //- Check if point on triangle
-        //void checkOnTriangle(const point&) const;
-
         //- Cross mesh edge into different face on same cell
         void crossEdgeConnectedFace(const edge& meshEdge);
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
index 265621ae05..dc4cb717d7 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,11 +206,8 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
 
         if (mesh_.isInternalFace(tetFace()))
         {
-            FatalErrorIn
-            (
-                "wallBoundedParticle::trackToEdge"
-                "(TrackData&, const vector&)"
-            )   << "Can only track on boundary faces."
+            FatalErrorInFunction
+                << "Can only track on boundary faces."
                 << " Face:" << tetFace()
                 << " at:" << mesh_.faceCentres()[tetFace()]
                 << abort(FatalError);
@@ -286,7 +283,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
                 {
                     //Note: should not happen since boundary face so owner
                     //Pout<< "Real edge." << endl;
-                    FatalErrorIn("shold not happend") << info()
+                    FatalErrorInFunction
                         << abort(FatalError);
 
                     diagEdge_ = -1;
@@ -332,7 +329,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
                 {
                     //Note: should not happen since boundary face so owner
                     //Pout<< "Real edge." << endl;
-                    FatalErrorIn("shold not happend") << info()
+                    FatalErrorInFunction
                         << abort(FatalError);
 
                     diagEdge_ = -1;
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index 863221f220..834fb6ac71 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,82 +23,22 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Pstream.H"
-#include "functionObjectList.H"
 #include "wallBoundedStreamLine.H"
 #include "fvMesh.H"
 #include "wallBoundedStreamLineParticleCloud.H"
-#include "ReadFields.H"
-#include "meshSearch.H"
 #include "sampledSet.H"
-#include "globalIndex.H"
-#include "mapDistribute.H"
-#include "interpolationCellPoint.H"
-#include "PatchTools.H"
-#include "meshSearchMeshObject.H"
 #include "faceSet.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-defineTypeNameAndDebug(wallBoundedStreamLine, 0);
+    defineTypeNameAndDebug(wallBoundedStreamLine, 0);
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::wallBoundedStreamLine::wallPatch() const
-{
-    const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
-
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    label nFaces = 0;
-
-    forAll(patches, patchI)
-    {
-        //if (!polyPatch::constraintType(patches[patchI].type()))
-        if (isA<wallPolyPatch>(patches[patchI]))
-        {
-            nFaces += patches[patchI].size();
-        }
-    }
-
-    labelList addressing(nFaces);
-
-    nFaces = 0;
-
-    forAll(patches, patchI)
-    {
-        //if (!polyPatch::constraintType(patches[patchI].type()))
-        if (isA<wallPolyPatch>(patches[patchI]))
-        {
-            const polyPatch& pp = patches[patchI];
-
-            forAll(pp, i)
-            {
-                addressing[nFaces++] = pp.start()+i;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>
-    (
-        new indirectPrimitivePatch
-        (
-            IndirectList<face>
-            (
-                mesh.faces(),
-                addressing
-            ),
-            mesh.points()
-        )
-    );
-}
-
-
 Foam::tetIndices Foam::wallBoundedStreamLine::findNearestTet
 (
     const PackedBoolList& isWallPatch,
@@ -158,7 +98,7 @@ Foam::tetIndices Foam::wallBoundedStreamLine::findNearestTet
 
 void Foam::wallBoundedStreamLine::track()
 {
-    const Time& runTime = obr_.time();
+    //const Time& runTime = obr_.time();
     const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
 
 
@@ -227,14 +167,14 @@ void Foam::wallBoundedStreamLine::track()
             else
             {
                 Pout<< type() << " : ignoring seed " << seedPt
-                    << " since not in wall cell." << endl;
+                    << " since not in wall cell" << endl;
             }
         }
     }
 
     label nSeeds = returnReduce(particles.size(), sumOp<label>());
 
-    Info<< type() << " : seeded " << nSeeds << " particles." << endl;
+    if (log_) Info<< type() << " : seeded " << nSeeds << " particles" << endl;
 
 
 
@@ -243,168 +183,19 @@ void Foam::wallBoundedStreamLine::track()
     PtrList<interpolation<scalar> > vsInterp;
     PtrList<volVectorField> vvFlds;
     PtrList<interpolation<vector> > vvInterp;
-
     label UIndex = -1;
 
-    if (loadFromFiles_)
-    {
-        IOobjectList allObjects(mesh, runTime.timeName());
+    initInterpolations
+    (
+        nSeeds,
+        UIndex,
+        vsFlds,
+        vsInterp,
+        vvFlds,
+        vvInterp
+    );
 
-        IOobjectList objects(2*fields_.size());
-        forAll(fields_, i)
-        {
-            objects.add(*allObjects[fields_[i]]);
-        }
-
-        ReadFields(mesh, objects, vsFlds);
-        vsInterp.setSize(vsFlds.size());
-        forAll(vsFlds, i)
-        {
-            vsInterp.set
-            (
-                i,
-                interpolation<scalar>::New
-                (
-                    interpolationScheme_,
-                    vsFlds[i]
-                )
-            );
-        }
-        ReadFields(mesh, objects, vvFlds);
-        vvInterp.setSize(vvFlds.size());
-        forAll(vvFlds, i)
-        {
-            vvInterp.set
-            (
-                i,
-                interpolation<vector>::New
-                (
-                    interpolationScheme_,
-                    vvFlds[i]
-                )
-            );
-        }
-    }
-    else
-    {
-        label nScalar = 0;
-        label nVector = 0;
-
-        forAll(fields_, i)
-        {
-            if (mesh.foundObject<volScalarField>(fields_[i]))
-            {
-                nScalar++;
-            }
-            else if (mesh.foundObject<volVectorField>(fields_[i]))
-            {
-                nVector++;
-            }
-            else
-            {
-                FatalErrorIn("wallBoundedStreamLine::execute()")
-                    << "Cannot find field " << fields_[i] << endl
-                    << "Valid scalar fields are:"
-                    << mesh.names(volScalarField::typeName) << endl
-                    << "Valid vector fields are:"
-                    << mesh.names(volVectorField::typeName)
-                    << exit(FatalError);
-            }
-        }
-        vsInterp.setSize(nScalar);
-        nScalar = 0;
-        vvInterp.setSize(nVector);
-        nVector = 0;
-
-        forAll(fields_, i)
-        {
-            if (mesh.foundObject<volScalarField>(fields_[i]))
-            {
-                const volScalarField& f = mesh.lookupObject<volScalarField>
-                (
-                    fields_[i]
-                );
-                vsInterp.set
-                (
-                    nScalar++,
-                    interpolation<scalar>::New
-                    (
-                        interpolationScheme_,
-                        f
-                    )
-                );
-            }
-            else if (mesh.foundObject<volVectorField>(fields_[i]))
-            {
-                const volVectorField& f = mesh.lookupObject<volVectorField>
-                (
-                    fields_[i]
-                );
-
-                if (f.name() == UName_)
-                {
-                    UIndex = nVector;
-                }
-
-                vvInterp.set
-                (
-                    nVector++,
-                    interpolation<vector>::New
-                    (
-                        interpolationScheme_,
-                        f
-                    )
-                );
-            }
-        }
-    }
-
-    // Store the names
-    scalarNames_.setSize(vsInterp.size());
-    forAll(vsInterp, i)
-    {
-        scalarNames_[i] = vsInterp[i].psi().name();
-    }
-    vectorNames_.setSize(vvInterp.size());
-    forAll(vvInterp, i)
-    {
-        vectorNames_[i] = vvInterp[i].psi().name();
-    }
-
-    // Check that we know the index of U in the interpolators.
-
-    if (UIndex == -1)
-    {
-        FatalErrorIn("wallBoundedStreamLine::execute()")
-            << "Cannot find field to move particles with : " << UName_
-            << endl
-            << "This field has to be present in the sampled fields "
-            << fields_
-            << " and in the objectRegistry." << endl
-            << exit(FatalError);
-    }
-
-    // Sampled data
-    // ~~~~~~~~~~~~
-
-    // Size to maximum expected sizes.
-    allTracks_.clear();
-    allTracks_.setCapacity(nSeeds);
-    allScalars_.setSize(vsInterp.size());
-    forAll(allScalars_, i)
-    {
-        allScalars_[i].clear();
-        allScalars_[i].setCapacity(nSeeds);
-    }
-    allVectors_.setSize(vvInterp.size());
-    forAll(allVectors_, i)
-    {
-        allVectors_[i].clear();
-        allVectors_[i].setCapacity(nSeeds);
-    }
-
-
-    // additional particle info
+    // Additional particle info
     wallBoundedStreamLineParticle::trackingData td
     (
         particles,
@@ -440,32 +231,13 @@ Foam::wallBoundedStreamLine::wallBoundedStreamLine
     const bool loadFromFiles
 )
 :
-    dict_(dict),
-    name_(name),
-    obr_(obr),
-    loadFromFiles_(loadFromFiles),
-    active_(true)
+    streamLineBase(name, obr, dict, loadFromFiles)
 {
-    // Only active if a fvMesh is available
-    if (isA<fvMesh>(obr_))
+    // Check if the available mesh is an fvMesh otherise deactivate
+    if (setActive<fvMesh>())
     {
         read(dict_);
     }
-    else
-    {
-        active_ = false;
-        WarningIn
-        (
-            "wallBoundedStreamLine::wallBoundedStreamLine\n"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool "
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
-            << nl << endl;
-    }
 }
 
 
@@ -481,94 +253,13 @@ void Foam::wallBoundedStreamLine::read(const dictionary& dict)
 {
     if (active_)
     {
-        //dict_ = dict;
-        dict.lookup("fields") >> fields_;
-        if (dict.found("UName"))
-        {
-            dict.lookup("UName") >> UName_;
-        }
-        else
-        {
-            UName_ = "U";
-            if (dict.found("U"))
-            {
-                IOWarningIn
-                (
-                    "wallBoundedStreamLine::read(const dictionary&)",
-                    dict
-                )   << "Using deprecated entry \"U\"."
-                    << " Please use \"UName\" instead."
-                    << endl;
-                dict.lookup("U") >> UName_;
-            }
-        }
-
-        if (findIndex(fields_, UName_) == -1)
-        {
-            FatalIOErrorIn
-            (
-                "wallBoundedStreamLine::read(const dictionary&)",
-                dict
-            )   << "Velocity field for tracking " << UName_
-                << " should be present in the list of fields " << fields_
-                << exit(FatalIOError);
-        }
-
-
-        dict.lookup("trackForward") >> trackForward_;
-        dict.lookup("lifeTime") >> lifeTime_;
-        if (lifeTime_ < 1)
-        {
-            FatalErrorIn(":wallBoundedStreamLine::read(const dictionary&)")
-                << "Illegal value " << lifeTime_ << " for lifeTime"
-                << exit(FatalError);
-        }
-        trackLength_ = VGREAT;
-        if (dict.found("trackLength"))
-        {
-            dict.lookup("trackLength") >> trackLength_;
-
-            Info<< type() << " : fixed track length specified : "
-                << trackLength_ << nl << endl;
-        }
-
-
-        interpolationScheme_ = dict.lookupOrDefault
-        (
-            "interpolationScheme",
-            interpolationCellPoint<scalar>::typeName
-        );
-
-        //Info<< typeName << " using interpolation " << interpolationScheme_
-        //    << endl;
-
-        cloudName_ = dict.lookupOrDefault<word>
-        (
-            "cloudName",
-            "wallBoundedStreamLine"
-        );
-        dict.lookup("seedSampleSet") >> seedSet_;
-
-        const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
-
-        const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
-
-        sampledSetPtr_ = sampledSet::New
-        (
-            seedSet_,
-            mesh,
-            meshSearchMeshObject::New(mesh),
-            coeffsDict
-        );
-        coeffsDict.lookup("axis") >> sampledSetAxis_;
-
-        scalarFormatterPtr_ = writer<scalar>::New(dict.lookup("setFormat"));
-        vectorFormatterPtr_ = writer<vector>::New(dict.lookup("setFormat"));
-
+        streamLineBase::read(dict);
 
         // Make sure that the mesh is trackable
         if (debug)
         {
+            const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
+
             // 1. positive volume decomposition tets
             faceSet faces(mesh, "lowQualityTetFaces", mesh.nFaces()/100+1);
             if
@@ -584,7 +275,7 @@ void Foam::wallBoundedStreamLine::read(const dictionary& dict)
             {
                 label nFaces = returnReduce(faces.size(), sumOp<label>());
 
-                WarningIn("wallBoundedStreamLine::read(const dictionary&)")
+                WarningInFunction
                     << "Found " << nFaces
                     <<" faces with low quality or negative volume "
                     << "decomposition tets. Writing to faceSet " << faces.name()
@@ -623,10 +314,8 @@ void Foam::wallBoundedStreamLine::read(const dictionary& dict)
                 {
                     if (iter() != 2)
                     {
-                        FatalErrorIn
-                        (
-                            "wallBoundedStreamLine::read(const dictionary&)"
-                        )   << "problem cell:" << cellI
+                        FatalErrorInFunction
+                            << "problem cell:" << cellI
                             << abort(FatalError);
                     }
                 }
@@ -636,269 +325,4 @@ void Foam::wallBoundedStreamLine::read(const dictionary& dict)
 }
 
 
-void Foam::wallBoundedStreamLine::execute()
-{}
-
-
-void Foam::wallBoundedStreamLine::end()
-{}
-
-
-void Foam::wallBoundedStreamLine::timeSet()
-{}
-
-
-void Foam::wallBoundedStreamLine::write()
-{
-    if (active_)
-    {
-        const Time& runTime = obr_.time();
-        const fvMesh& mesh = dynamic_cast<const fvMesh&>(obr_);
-
-
-        // Do all injection and tracking
-        track();
-
-
-        if (Pstream::parRun())
-        {
-            // Append slave tracks to master ones
-            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-            globalIndex globalTrackIDs(allTracks_.size());
-
-            // Construct a distribution map to pull all to the master.
-            labelListList sendMap(Pstream::nProcs());
-            labelListList recvMap(Pstream::nProcs());
-
-            if (Pstream::master())
-            {
-                // Master: receive all. My own first, then consecutive
-                // processors.
-                label trackI = 0;
-
-                forAll(recvMap, procI)
-                {
-                    labelList& fromProc = recvMap[procI];
-                    fromProc.setSize(globalTrackIDs.localSize(procI));
-                    forAll(fromProc, i)
-                    {
-                        fromProc[i] = trackI++;
-                    }
-                }
-            }
-
-            labelList& toMaster = sendMap[0];
-            toMaster.setSize(globalTrackIDs.localSize());
-            forAll(toMaster, i)
-            {
-                toMaster[i] = i;
-            }
-
-            const mapDistribute distMap
-            (
-                globalTrackIDs.size(),
-                sendMap.xfer(),
-                recvMap.xfer()
-            );
-
-
-            // Distribute the track positions. Note: use scheduled comms
-            // to prevent buffering.
-            mapDistribute::distribute
-            (
-                Pstream::scheduled,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                distMap.constructMap(),
-                allTracks_
-            );
-
-            // Distribute the scalars
-            forAll(allScalars_, scalarI)
-            {
-                mapDistribute::distribute
-                (
-                    Pstream::scheduled,
-                    distMap.schedule(),
-                    distMap.constructSize(),
-                    distMap.subMap(),
-                    distMap.constructMap(),
-                    allScalars_[scalarI]
-                );
-            }
-            // Distribute the vectors
-            forAll(allVectors_, vectorI)
-            {
-                mapDistribute::distribute
-                (
-                    Pstream::scheduled,
-                    distMap.schedule(),
-                    distMap.constructSize(),
-                    distMap.subMap(),
-                    distMap.constructMap(),
-                    allVectors_[vectorI]
-                );
-            }
-        }
-
-
-        label n = 0;
-        forAll(allTracks_, trackI)
-        {
-            n += allTracks_[trackI].size();
-        }
-
-        Info<< "    Tracks:" << allTracks_.size() << nl
-            << "    Total samples:" << n << endl;
-
-
-        // Massage into form suitable for writers
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        if (Pstream::master() && allTracks_.size())
-        {
-            // Make output directory
-
-            fileName vtkPath
-            (
-                Pstream::parRun()
-              ? runTime.path()/".."/"postProcessing"/"sets"/name()
-              : runTime.path()/"postProcessing"/"sets"/name()
-            );
-            if (mesh.name() != fvMesh::defaultRegion)
-            {
-                vtkPath = vtkPath/mesh.name();
-            }
-            vtkPath = vtkPath/mesh.time().timeName();
-
-            mkDir(vtkPath);
-
-            // Convert track positions
-
-            PtrList<coordSet> tracks(allTracks_.size());
-            forAll(allTracks_, trackI)
-            {
-                tracks.set
-                (
-                    trackI,
-                    new coordSet
-                    (
-                        "track" + Foam::name(trackI),
-                        sampledSetAxis_                 //"xyz"
-                    )
-                );
-                tracks[trackI].transfer(allTracks_[trackI]);
-            }
-
-            // Convert scalar values
-
-            if (allScalars_.size() > 0)
-            {
-                List<List<scalarField> > scalarValues(allScalars_.size());
-
-                forAll(allScalars_, scalarI)
-                {
-                    DynamicList<scalarList>& allTrackVals =
-                        allScalars_[scalarI];
-                    scalarValues[scalarI].setSize(allTrackVals.size());
-
-                    forAll(allTrackVals, trackI)
-                    {
-                        scalarList& trackVals = allTrackVals[trackI];
-                        scalarValues[scalarI][trackI].transfer(trackVals);
-                    }
-                }
-
-                fileName vtkFile
-                (
-                    vtkPath
-                  / scalarFormatterPtr_().getFileName
-                    (
-                        tracks[0],
-                        scalarNames_
-                    )
-                );
-
-                Info<< "Writing data to " << vtkFile.path() << endl;
-
-                scalarFormatterPtr_().write
-                (
-                    true,           // writeTracks
-                    tracks,
-                    scalarNames_,
-                    scalarValues,
-                    OFstream(vtkFile)()
-                );
-            }
-
-            // Convert vector values
-
-            if (allVectors_.size() > 0)
-            {
-                List<List<vectorField> > vectorValues(allVectors_.size());
-
-                forAll(allVectors_, vectorI)
-                {
-                    DynamicList<vectorList>& allTrackVals =
-                        allVectors_[vectorI];
-                    vectorValues[vectorI].setSize(allTrackVals.size());
-
-                    forAll(allTrackVals, trackI)
-                    {
-                        vectorList& trackVals = allTrackVals[trackI];
-                        vectorValues[vectorI][trackI].transfer(trackVals);
-                    }
-                }
-
-                fileName vtkFile
-                (
-                    vtkPath
-                  / vectorFormatterPtr_().getFileName
-                    (
-                        tracks[0],
-                        vectorNames_
-                    )
-                );
-
-                //Info<< "Writing vector data to " << vtkFile << endl;
-
-                vectorFormatterPtr_().write
-                (
-                    true,           // writeTracks
-                    tracks,
-                    vectorNames_,
-                    vectorValues,
-                    OFstream(vtkFile)()
-                );
-            }
-        }
-    }
-}
-
-
-void Foam::wallBoundedStreamLine::updateMesh(const mapPolyMesh&)
-{
-    read(dict_);
-}
-
-
-void Foam::wallBoundedStreamLine::movePoints(const polyMesh&)
-{
-    // Moving mesh affects the search tree
-    read(dict_);
-}
-
-
-//void Foam::wallBoundedStreamLine::readUpdate
-//(const polyMesh::readUpdateState state)
-//{
-//    if (state != UNCHANGED)
-//    {
-//        read(dict_);
-//    }
-//}
-
-
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index 98956ba9ca..fe7d3366ac 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,7 +49,7 @@ Description
         );
         lifeTime        10000;
         trackLength     1e-3;
-        nSubCycle       5;
+        bounds          (0.2 -10 -10)(0.22 10 10);
         cloudName       particleTracks;
         seedSampleSet   patchSeed;
         patchSeedCoeffs
@@ -71,8 +71,9 @@ Description
         fields       | fields to sample        | yes         |
         lifetime     | maximum number of particle tracking steps | yes |
         trackLength  | tracking segment length | no          |
-        nSubCycle    | number of tracking steps per cell | no|
         cloudName    | cloud name to use       | yes         |
+        log          | Log to standard output  | no          | yes
+        bounds       | Bounding box to trim tracks | no | greatBox
         seedSampleSet| seeding method (see below)| yes       |
     \endtable
 
@@ -85,14 +86,11 @@ Description
         triSurfaceMeshPointSet | points according to a tri-surface mesh
     \endplaintable
 
-Note
-    When specifying the track resolution, the \c trackLength OR \c nSubCycle
-    option should be used
-
 SeeAlso
     Foam::functionObject
     Foam::OutputFilterFunctionObject
     Foam::sampledSet
+    Foam::streamLineBase
     Foam::streamLine
 
 SourceFiles
@@ -103,16 +101,7 @@ SourceFiles
 #ifndef wallBoundedStreamLine_H
 #define wallBoundedStreamLine_H
 
-#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
-#include "Switch.H"
-#include "DynamicList.H"
-#include "scalarList.H"
-#include "vectorList.H"
-#include "polyMesh.H"
-#include "writer.H"
-#include "indirectPrimitivePatch.H"
-#include "tetIndices.H"
+#include "streamLineBase.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -120,99 +109,15 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-class objectRegistry;
-class dictionary;
-class mapPolyMesh;
-class meshSearch;
-class sampledSet;
-
 /*---------------------------------------------------------------------------*\
                     Class wallBoundedStreamLine Declaration
 \*---------------------------------------------------------------------------*/
 
 class wallBoundedStreamLine
+:
+    public streamLineBase
 {
-    // Private data
-
-        //- Input dictionary
-        dictionary dict_;
-
-        //- Name of this set of field averages.
-        word name_;
-
-        //- Database this class is registered to
-        const objectRegistry& obr_;
-
-        //- Load fields from files (not from objectRegistry)
-        bool loadFromFiles_;
-
-        //- On/off switch
-        bool active_;
-
-
-        //- List of fields to sample
-        wordList fields_;
-
-        //- Field to transport particle with
-        word UName_;
-
-        //- Interpolation scheme to use
-        word interpolationScheme_;
-
-        //- Whether to use +u or -u
-        bool trackForward_;
-
-        //- Maximum lifetime (= number of cells) of particle
-        label lifeTime_;
-
-        //- Track length
-        scalar trackLength_;
-
-        //- Optional specified name of particles
-        word cloudName_;
-
-        //- Type of seed
-        word seedSet_;
-
-        //- Names of scalar fields
-        wordList scalarNames_;
-
-        //- Names of vector fields
-        wordList vectorNames_;
-
-
-        // Demand driven
-
-            //- Mesh searching enigne
-            autoPtr<meshSearch> meshSearchPtr_;
-
-            //- Seed set engine
-            autoPtr<sampledSet> sampledSetPtr_;
-
-            //- Axis of the sampled points to output
-            word sampledSetAxis_;
-
-            //- File output writer
-            autoPtr<writer<scalar> > scalarFormatterPtr_;
-
-            autoPtr<writer<vector> > vectorFormatterPtr_;
-
-
-        // Generated data
-
-            //- All tracks. Per particle the points it passed through
-            DynamicList<List<point> > allTracks_;
-
-            //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<scalarList> > allScalars_;
-
-            //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<vectorList> > allVectors_;
-
-
-        //- Construct patch out of all wall patch faces
-        autoPtr<indirectPrimitivePatch> wallPatch() const;
+   // Private Member Functions
 
         //- Find wall tet on cell
         tetIndices findNearestTet
@@ -222,9 +127,6 @@ class wallBoundedStreamLine
             const label cellI
         ) const;
 
-        //- Do all seeding and tracking
-        void track();
-
         //- Disallow default bitwise copy construct
         wallBoundedStreamLine(const wallBoundedStreamLine&);
 
@@ -257,35 +159,11 @@ public:
 
     // Member Functions
 
-        //- Return name of the set of field averages
-        virtual const word& name() const
-        {
-            return name_;
-        }
-
-        //- Read the field average data
+        //- Read settings
         virtual void read(const dictionary&);
 
-        //- Execute the averaging
-        virtual void execute();
-
-        //- Execute the averaging at the final time-loop, currently does nothing
-        virtual void end();
-
-        //- Called when time was set at the end of the Time::operator++
-        virtual void timeSet();
-
-        //- Calculate the field average data and write
-        virtual void write();
-
-        //- Update for changes of mesh
-        virtual void updateMesh(const mapPolyMesh&);
-
-        //- Update for mesh point-motion
-        virtual void movePoints(const polyMesh&);
-
-        ////- Update for changes of mesh due to readUpdate
-        //virtual void readUpdate(const polyMesh::readUpdateState state);
+        //- Do the actual tracking to fill the track data
+        virtual void track();
 };
 
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
index 0bdf7006da..0efa297151 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::vector Foam::wallBoundedStreamLineParticle::interpolateFields
 {
     if (cellI == -1)
     {
-        FatalErrorIn("wallBoundedStreamLineParticle::interpolateFields(..)")
+        FatalErrorInFunction
             << "Cell:" << cellI << abort(FatalError);
     }
 
diff --git a/src/postProcessing/functionObjects/forces/forcesFunctionObjectsDoc.H b/src/postProcessing/functionObjects/forces/doc/forcesFunctionObjectsDoc.H
similarity index 100%
rename from src/postProcessing/functionObjects/forces/forcesFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/forces/doc/forcesFunctionObjectsDoc.H
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index fe09f4fd94..ef37661708 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,9 @@ License
 #include "Time.H"
 #include "Pstream.H"
 #include "IOmanip.H"
+#include "fvMesh.H"
+#include "dimensionedTypes.H"
+#include "volFields.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -39,81 +42,157 @@ namespace Foam
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::forceCoeffs::writeFileHeader(const label i)
+void Foam::forceCoeffs::createFiles()
 {
-    if (i == 0)
+    // Note: Only possible to create bin files after bins have been initialised
+
+    if (writeToFile() && !coeffFilePtr_.valid())
     {
-        // force coeff data
+        coeffFilePtr_ = createFile("coefficient");
+        writeIntegratedHeader("Coefficients", coeffFilePtr_());
 
-        writeHeader(file(i), "Force coefficients");
-        writeHeaderValue(file(i), "liftDir", liftDir_);
-        writeHeaderValue(file(i), "dragDir", dragDir_);
-        writeHeaderValue(file(i), "pitchAxis", pitchAxis_);
-        writeHeaderValue(file(i), "magUInf", magUInf_);
-        writeHeaderValue(file(i), "lRef", lRef_);
-        writeHeaderValue(file(i), "Aref", Aref_);
-        writeHeaderValue(file(i), "CofR", coordSys_.origin());
-        writeCommented(file(i), "Time");
-        writeTabbed(file(i), "Cm");
-        writeTabbed(file(i), "Cd");
-        writeTabbed(file(i), "Cl");
-        writeTabbed(file(i), "Cl(f)");
-        writeTabbed(file(i), "Cl(r)");
-        file(i)
-            << tab << "Cm" << tab << "Cd" << tab << "Cl" << tab << "Cl(f)"
-            << tab << "Cl(r)";
-    }
-    else if (i == 1)
-    {
-        // bin coeff data
-
-        writeHeader(file(i), "Force coefficient bins");
-        writeHeaderValue(file(i), "bins", nBin_);
-        writeHeaderValue(file(i), "start", binMin_);
-        writeHeaderValue(file(i), "delta", binDx_);
-        writeHeaderValue(file(i), "direction", binDir_);
-
-        vectorField binPoints(nBin_);
-        writeCommented(file(i), "x co-ords  :");
-        forAll(binPoints, pointI)
+        if (nBin_ > 1)
         {
-            binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
-            file(i) << tab << binPoints[pointI].x();
-        }
-        file(i) << nl;
-
-        writeCommented(file(i), "y co-ords  :");
-        forAll(binPoints, pointI)
-        {
-            file(i) << tab << binPoints[pointI].y();
-        }
-        file(i) << nl;
-
-        writeCommented(file(i), "z co-ords  :");
-        forAll(binPoints, pointI)
-        {
-            file(i) << tab << binPoints[pointI].z();
-        }
-        file(i) << nl;
-
-        writeCommented(file(i), "Time");
-
-        for (label j = 0; j < nBin_; j++)
-        {
-            const word jn('(' + Foam::name(j) + ')');
-            writeTabbed(file(i), "Cm" + jn);
-            writeTabbed(file(i), "Cd" + jn);
-            writeTabbed(file(i), "Cl" + jn);
+            CmBinFilePtr_ = createFile("CmBin");
+            writeBinHeader("Moment coefficient bins", CmBinFilePtr_());
+            CdBinFilePtr_ = createFile("CdBin");
+            writeBinHeader("Drag coefficient bins", CdBinFilePtr_());
+            ClBinFilePtr_ = createFile("ClBin");
+            writeBinHeader("Lift coefficient bins", ClBinFilePtr_());
         }
     }
-    else
+}
+
+
+void Foam::forceCoeffs::writeIntegratedHeader
+(
+    const word& header,
+    Ostream& os
+) const
+{
+    writeHeader(os, "Force coefficients");
+    writeHeaderValue(os, "liftDir", liftDir_);
+    writeHeaderValue(os, "dragDir", dragDir_);
+    writeHeaderValue(os, "pitchAxis", pitchAxis_);
+    writeHeaderValue(os, "magUInf", magUInf_);
+    writeHeaderValue(os, "lRef", lRef_);
+    writeHeaderValue(os, "Aref", Aref_);
+    writeHeaderValue(os, "CofR", coordSys_.origin());
+    writeHeader(os, "");
+    writeCommented(os, "Time");
+    writeTabbed(os, "Cm");
+    writeTabbed(os, "Cd");
+    writeTabbed(os, "Cl");
+    writeTabbed(os, "Cl(f)");
+    writeTabbed(os, "Cl(r)");
+    os  << endl;
+}
+
+
+void Foam::forceCoeffs::writeBinHeader
+(
+    const word& header,
+    Ostream& os
+) const
+{
+    writeHeader(os, header);
+    writeHeaderValue(os, "bins", nBin_);
+    writeHeaderValue(os, "start", binMin_);
+    writeHeaderValue(os, "delta", binDx_);
+    writeHeaderValue(os, "direction", binDir_);
+
+    vectorField binPoints(nBin_);
+    writeCommented(os, "x co-ords  :");
+    forAll(binPoints, pointI)
     {
-        FatalErrorIn("void Foam::forces::writeFileHeader(const label)")
-            << "Unhandled file index: " << i
-            << abort(FatalError);
+        binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
+        os << tab << binPoints[pointI].x();
+    }
+    os << nl;
+
+    writeCommented(os, "y co-ords  :");
+    forAll(binPoints, pointI)
+    {
+        os << tab << binPoints[pointI].y();
+    }
+    os << nl;
+
+    writeCommented(os, "z co-ords  :");
+    forAll(binPoints, pointI)
+    {
+        os << tab << binPoints[pointI].z();
+    }
+    os << nl;
+
+    writeHeader(os, "");
+    writeCommented(os, "Time");
+
+    for (label j = 0; j < nBin_; j++)
+    {
+        word jn(Foam::name(j) + ':');
+        writeTabbed(os, jn + "total");
+        writeTabbed(os, jn + "pressure");
+        writeTabbed(os, jn + "viscous");
+
+        if (porosity_)
+        {
+            writeTabbed(os, jn + "porous");
+        }
     }
 
-    file(i)<< endl;
+    os  << endl;
+}
+
+
+void Foam::forceCoeffs::writeIntegratedData
+(
+    const word& title,
+    const List<Field<scalar> >& coeff
+) const
+{
+    scalar pressure = sum(coeff[0]);
+    scalar viscous = sum(coeff[1]);
+    scalar porous = sum(coeff[2]);
+    scalar total = pressure + viscous + porous;
+
+    if (log_)
+    {
+        Info<< "        " << title << "       : " << total << token::TAB
+            << "("
+            << "pressure: " << pressure << token::TAB
+            << "viscous: " << viscous;
+
+        if (porosity_)
+        {
+            Info<< token::TAB << "porous: " << porous;
+        }
+
+        Info<< ")" << endl;
+    }
+}
+
+
+void Foam::forceCoeffs::writeBinData
+(
+    const List<Field<scalar> > coeffs,
+    Ostream& os
+) const
+{
+    os  << obr_.time().value();
+
+    for (label binI = 0; binI < nBin_; binI++)
+    {
+        scalar total = coeffs[0][binI] + coeffs[1][binI] + coeffs[2][binI];
+
+        os  << tab << total << tab << coeffs[0][binI] << tab << coeffs[1][binI];
+
+        if (porosity_)
+        {
+            os  << tab << coeffs[2][binI];
+        }
+    }
+
+    os  << endl;
 }
 
 
@@ -124,7 +203,8 @@ Foam::forceCoeffs::forceCoeffs
     const word& name,
     const objectRegistry& obr,
     const dictionary& dict,
-    const bool loadFromFiles
+    const bool loadFromFiles,
+    const bool readFields
 )
 :
     forces(name, obr, dict, loadFromFiles, false),
@@ -133,11 +213,17 @@ Foam::forceCoeffs::forceCoeffs
     pitchAxis_(vector::zero),
     magUInf_(0.0),
     lRef_(0.0),
-    Aref_(0.0)
+    Aref_(0.0),
+    coeffFilePtr_(),
+    CmBinFilePtr_(),
+    CdBinFilePtr_(),
+    ClBinFilePtr_()
 {
-    read(dict);
-
-    Info<< endl;
+    if (readFields)
+    {
+        read(dict);
+        if (log_) Info << endl;
+    }
 }
 
 
@@ -151,115 +237,221 @@ Foam::forceCoeffs::~forceCoeffs()
 
 void Foam::forceCoeffs::read(const dictionary& dict)
 {
-    if (active_)
+    if (!active_)
     {
-        forces::read(dict);
+        return;
+    }
 
-        // Directions for lift and drag forces, and pitch moment
-        dict.lookup("liftDir") >> liftDir_;
-        dict.lookup("dragDir") >> dragDir_;
-        dict.lookup("pitchAxis") >> pitchAxis_;
+    forces::read(dict);
 
-        // Free stream velocity magnitude
-        dict.lookup("magUInf") >> magUInf_;
+    // Directions for lift and drag forces, and pitch moment
+    dict.lookup("liftDir") >> liftDir_;
+    dict.lookup("dragDir") >> dragDir_;
+    dict.lookup("pitchAxis") >> pitchAxis_;
 
-        // Reference length and area scales
-        dict.lookup("lRef") >> lRef_;
-        dict.lookup("Aref") >> Aref_;
+    // Free stream velocity magnitude
+    dict.lookup("magUInf") >> magUInf_;
+
+    // Reference length and area scales
+    dict.lookup("lRef") >> lRef_;
+    dict.lookup("Aref") >> Aref_;
+
+    if (writeFields_)
+    {
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        tmp<volVectorField> tforceCoeff
+        (
+            new volVectorField
+            (
+                IOobject
+                (
+                    fieldName("forceCoeff"),
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedVector("0", dimless, vector::zero)
+            )
+        );
+
+        obr_.store(tforceCoeff.ptr());
+
+        tmp<volVectorField> tmomentCoeff
+        (
+            new volVectorField
+            (
+                IOobject
+                (
+                    fieldName("momentCoeff"),
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedVector("0", dimless, vector::zero)
+            )
+        );
+
+        obr_.store(tmomentCoeff.ptr());
     }
 }
 
 
 void Foam::forceCoeffs::execute()
 {
-    // Do nothing - only valid on write
-}
-
-
-void Foam::forceCoeffs::end()
-{
-    // Do nothing - only valid on write
-}
-
-
-void Foam::forceCoeffs::timeSet()
-{
-    // Do nothing - only valid on write
-}
-
-
-void Foam::forceCoeffs::write()
-{
-    forces::calcForcesMoment();
-
     if (!active_)
     {
         return;
     }
 
-    if (Pstream::master())
+    forces::calcForcesMoment();
+
+    createFiles();
+
+    scalar pDyn = 0.5*rhoRef_*magUInf_*magUInf_;
+
+    // Storage for pressure, viscous and porous contributions to coeffs
+    List<Field<scalar> > momentCoeffs(3);
+    List<Field<scalar> > dragCoeffs(3);
+    List<Field<scalar> > liftCoeffs(3);
+    forAll(liftCoeffs, i)
     {
-        functionObjectFile::write();
+        momentCoeffs[i].setSize(nBin_);
+        dragCoeffs[i].setSize(nBin_);
+        liftCoeffs[i].setSize(nBin_);
+    }
 
-        scalar pDyn = 0.5*rhoRef_*magUInf_*magUInf_;
+    // Calculate coefficients
+    scalar CmTot = 0;
+    scalar CdTot = 0;
+    scalar ClTot = 0;
+    forAll(liftCoeffs, i)
+    {
+        momentCoeffs[i] = (moment_[i] & pitchAxis_)/(Aref_*pDyn*lRef_);
+        dragCoeffs[i] = (force_[i] & dragDir_)/(Aref_*pDyn);
+        liftCoeffs[i] = (force_[i] & liftDir_)/(Aref_*pDyn);
 
-        Field<vector> totForce(force_[0] + force_[1] + force_[2]);
-        Field<vector> totMoment(moment_[0] + moment_[1] + moment_[2]);
+        CmTot += sum(momentCoeffs[i]);
+        CdTot += sum(dragCoeffs[i]);
+        ClTot += sum(liftCoeffs[i]);
+    }
 
-        List<Field<scalar> > coeffs(3);
-        coeffs[0].setSize(nBin_);
-        coeffs[1].setSize(nBin_);
-        coeffs[2].setSize(nBin_);
+    scalar ClfTot = ClTot/2.0 + CmTot;
+    scalar ClrTot = ClTot/2.0 - CmTot;
 
-        // lift, drag and moment
-        coeffs[0] = (totForce & liftDir_)/(Aref_*pDyn);
-        coeffs[1] = (totForce & dragDir_)/(Aref_*pDyn);
-        coeffs[2] = (totMoment & pitchAxis_)/(Aref_*lRef_*pDyn);
+    if (log_) Info
+        << type() << " " << name_ << " output:" << nl
+        << "    Coefficients" << nl;
 
-        scalar Cl = sum(coeffs[0]);
-        scalar Cd = sum(coeffs[1]);
-        scalar Cm = sum(coeffs[2]);
+    writeIntegratedData("Cm", momentCoeffs);
+    writeIntegratedData("Cd", dragCoeffs);
+    writeIntegratedData("Cl", liftCoeffs);
 
-        scalar Clf = Cl/2.0 + Cm;
-        scalar Clr = Cl/2.0 - Cm;
+    if (log_) Info
+        << "        Cl(f)    : " << ClfTot << nl
+        << "        Cl(r)    : " << ClrTot << nl
+        << endl;
 
-        file(0)
-            << obr_.time().value() << tab << Cm << tab  << Cd
-            << tab << Cl << tab << Clf << tab << Clr << endl;
+    if (writeToFile())
+    {
+        writeTime(coeffFilePtr_());
+        coeffFilePtr_()
+            << tab << CmTot << tab  << CdTot
+            << tab << ClTot << tab << ClfTot << tab << ClrTot << endl;
 
-        if (log_) Info<< type() << " " << name_ << " output:" << nl
-            << "    Cm    = " << Cm << nl
-            << "    Cd    = " << Cd << nl
-            << "    Cl    = " << Cl << nl
-            << "    Cl(f) = " << Clf << nl
-            << "    Cl(r) = " << Clr << endl;
 
         if (nBin_ > 1)
         {
             if (binCumulative_)
             {
-                for (label i = 1; i < coeffs[0].size(); i++)
+                forAll(liftCoeffs, i)
                 {
-                    coeffs[0][i] += coeffs[0][i-1];
-                    coeffs[1][i] += coeffs[1][i-1];
-                    coeffs[2][i] += coeffs[2][i-1];
+                    for (label binI = 1; binI < nBin_; binI++)
+                    {
+                        liftCoeffs[i][binI] += liftCoeffs[i][binI-1];
+                        dragCoeffs[i][binI] += dragCoeffs[i][binI-1];
+                        momentCoeffs[i][binI] += momentCoeffs[i][binI-1];
+                    }
                 }
             }
 
-            file(1)<< obr_.time().value();
-
-            forAll(coeffs[0], i)
-            {
-                file(1)
-                    << tab << coeffs[2][i]
-                    << tab << coeffs[1][i]
-                    << tab << coeffs[0][i];
-            }
-
-            file(1) << endl;
+            writeBinData(dragCoeffs, CdBinFilePtr_());
+            writeBinData(liftCoeffs, ClBinFilePtr_());
+            writeBinData(momentCoeffs, CmBinFilePtr_());
         }
+    }
 
-        if (log_) Info<< endl;
+    // Write state/results information
+    {
+        setResult("Cm", CmTot);
+        setResult("Cd", CdTot);
+        setResult("Cl", ClTot);
+        setResult("Cl(f)", ClfTot);
+        setResult("Cl(r)", ClrTot);
+    }
+
+    if (writeFields_)
+    {
+        const volVectorField& force =
+            obr_.lookupObject<volVectorField>(fieldName("force"));
+
+        const volVectorField& moment =
+            obr_.lookupObject<volVectorField>(fieldName("moment"));
+
+        volVectorField& forceCoeff =
+            const_cast<volVectorField&>
+            (
+                obr_.lookupObject<volVectorField>(fieldName("forceCoeff"))
+            );
+
+        volVectorField& momentCoeff =
+            const_cast<volVectorField&>
+            (
+                obr_.lookupObject<volVectorField>(fieldName("momentCoeff"))
+            );
+
+        dimensionedScalar f0("f0", dimForce, Aref_*pDyn);
+        dimensionedScalar m0("m0", dimForce*dimLength, Aref_*lRef_*pDyn);
+
+        forceCoeff == force/f0;
+        momentCoeff == moment/m0;
+    }
+}
+
+
+void Foam::forceCoeffs::end()
+{
+    // Do nothing
+}
+
+
+void Foam::forceCoeffs::timeSet()
+{
+    // Do nothing
+}
+
+
+void Foam::forceCoeffs::write()
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    if (writeFields_)
+    {
+        const volVectorField& forceCoeff =
+            obr_.lookupObject<volVectorField>(fieldName("forceCoeff"));
+
+        const volVectorField& momentCoeff =
+            obr_.lookupObject<volVectorField>(fieldName("momentCoeff"));
+
+        forceCoeff.write();
+        momentCoeff.write();
     }
 }
 
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index e291065f33..3addb5596e 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,19 @@ Description
     lift, drag and moment coefficients.  The data can optionally be output into
     bins, defined in a given direction.
 
+    The binned data provides the total and consitituentcomponents per bin:
+    - total coefficient
+    - pressure coefficient contribution
+    - viscous coefficient contribution
+    - porous coefficient contribution
+
+    Data is written into multiple files in the
+    postProcessing/\<functionObjectName\> directory:
+    - coefficient.dat   : integrated coefficients over all geometries
+    - CmBin.dat         : moment coefficient bins
+    - CdBin.dat         : drag coefficient bins
+    - ClBin.dat         : lift coefficient bins
+
     Example of function object specification:
     \verbatim
     forceCoeffs1
@@ -40,6 +53,7 @@ Description
         functionObjectLibs ("libforces.so");
         ...
         log         yes;
+        writeFields yes;
         patches     (walls);
         liftDir     (0 1 0);
         dragDir     (-1 0 0);
@@ -62,6 +76,7 @@ Description
         Property     | Description             | Required    | Default value
         type         | type name: forces       | yes         |
         log          | write force data to standard output | no | no
+        writeFields  | write the force and moment coefficient fields | no | no
         patches      | patches included in the forces calculation | yes |
         liftDir      | lift direction          | yes         |
         dragDir      | drag direction          | yes         |
@@ -69,6 +84,7 @@ Description
         magUInf      | free stream velocity magnitude | yes  |
         lRef         | reference length scale for moment calculations | yes |
         Aref         | reference area          | yes |
+        porosity     | flag to include porosity contributions | no | no
     \endtable
 
     Bin data is optional, but if the dictionary is present, the entries must
@@ -137,6 +153,21 @@ class forceCoeffs
             scalar Aref_;
 
 
+        // File streams
+
+            //- Integrated coefficients
+            autoPtr<OFstream> coeffFilePtr_;
+
+            //- Moment coefficient
+            autoPtr<OFstream> CmBinFilePtr_;
+
+            //- Drag coefficient
+            autoPtr<OFstream> CdBinFilePtr_;
+
+            //- Lift coefficient
+            autoPtr<OFstream> ClBinFilePtr_;
+
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -148,8 +179,26 @@ class forceCoeffs
 
 protected:
 
-    //- Output file header information
-    virtual void writeFileHeader(const label i);
+    // Protected Member Functions
+
+        //- Create the output files
+        void createFiles();
+
+        //- Write header for integrated data
+        void writeIntegratedHeader(const word& header, Ostream& os) const;
+
+        //- Write header for binned data
+        void writeBinHeader(const word& header, Ostream& os) const;
+
+        //- Write integrated data
+        void writeIntegratedData
+        (
+            const word& title,
+            const List<Field<scalar> >& coeff
+        ) const;
+
+        //- Write binned data
+        void writeBinData(const List<Field<scalar> > coeffs, Ostream& os) const;
 
 
 public:
@@ -167,7 +216,8 @@ public:
             const word& name,
             const objectRegistry&,
             const dictionary&,
-            const bool loadFromFiles = false
+            const bool loadFromFiles = false,
+            const bool readFields = true
         );
 
 
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index dfb4a1cb42..9501fad1b0 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,113 +43,121 @@ namespace Foam
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-Foam::wordList Foam::forces::createFileNames(const dictionary& dict) const
+Foam::word Foam::forces::fieldName(const word& name) const
 {
-    DynamicList<word> names(1);
-
-    const word forceType(dict.lookup("type"));
-
-    if (dict.found("binData"))
-    {
-        const dictionary& binDict(dict.subDict("binData"));
-        label nb = readLabel(binDict.lookup("nBin"));
-        if (nb > 0)
-        {
-            names.append(forceType + "_bins");
-        }
-    }
-
-    names.append(forceType);
-
-    return names;
+    return name_ + ":" + name;
 }
 
 
-void Foam::forces::writeFileHeader(const label i)
+void Foam::forces::createFiles()
 {
-    if (i == 0)
+    // Note: Only possible to create bin files after bins have been initialised
+
+    if (writeToFile() && !forceFilePtr_.valid())
     {
-        // force data
+        forceFilePtr_ = createFile("force");
+        writeIntegratedHeader("Force", forceFilePtr_());
+        momentFilePtr_ = createFile("moment");
+        writeIntegratedHeader("Moment", momentFilePtr_());
 
-        writeHeader(file(i), "Forces");
-        writeHeaderValue(file(i), "CofR", coordSys_.origin());
-        writeCommented(file(i), "Time");
-
-        file(i)
-            << "forces(pressure viscous porous) "
-            << "moment(pressure viscous porous)";
+        if (nBin_ > 1)
+        {
+            forceBinFilePtr_ = createFile("forceBin");
+            writeBinHeader("Force", forceBinFilePtr_());
+            momentBinFilePtr_ = createFile("momentBin");
+            writeBinHeader("Moment", momentBinFilePtr_());
+        }
 
         if (localSystem_)
         {
-            file(i)
-                << tab
-                << "localForces(pressure,viscous,porous) "
-                << "localMoments(pressure,viscous,porous)";
-        }
-    }
-    else if (i == 1)
-    {
-        // bin data
+            localForceFilePtr_ = createFile("localForce");
+            writeIntegratedHeader("Force", localForceFilePtr_());
+            localMomentFilePtr_ = createFile("localMoment");
+            writeIntegratedHeader("Moment", localMomentFilePtr_());
 
-        writeHeader(file(i), "Force bins");
-        writeHeaderValue(file(i), "bins", nBin_);
-        writeHeaderValue(file(i), "start", binMin_);
-        writeHeaderValue(file(i), "delta", binDx_);
-        writeHeaderValue(file(i), "direction", binDir_);
-
-        vectorField binPoints(nBin_);
-        writeCommented(file(i), "x co-ords  :");
-        forAll(binPoints, pointI)
-        {
-            binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
-            file(i) << tab << binPoints[pointI].x();
-        }
-        file(i) << nl;
-
-        writeCommented(file(i), "y co-ords  :");
-        forAll(binPoints, pointI)
-        {
-            file(i) << tab << binPoints[pointI].y();
-        }
-        file(i) << nl;
-
-        writeCommented(file(i), "z co-ords  :");
-        forAll(binPoints, pointI)
-        {
-            file(i) << tab << binPoints[pointI].z();
-        }
-        file(i) << nl;
-
-        writeCommented(file(i), "Time");
-
-        for (label j = 0; j < nBin_; j++)
-        {
-            const word jn('(' + Foam::name(j) + ')');
-            const word f("forces" + jn + "[pressure,viscous,porous]");
-            const word m("moments" + jn + "[pressure,viscous,porous]");
-
-            file(i)<< tab << f << tab << m;
-        }
-        if (localSystem_)
-        {
-            for (label j = 0; j < nBin_; j++)
+            if (nBin_ > 1)
             {
-                const word jn('(' + Foam::name(j) + ')');
-                const word f("localForces" + jn + "[pressure,viscous,porous]");
-                const word m("localMoments" + jn + "[pressure,viscous,porous]");
-
-                file(i)<< tab << f << tab << m;
+                localForceBinFilePtr_ = createFile("localForceBin");
+                writeBinHeader("Force", localForceBinFilePtr_());
+                localMomentBinFilePtr_ = createFile("localMomentBin");
+                writeBinHeader("Moment", localMomentBinFilePtr_());
             }
         }
     }
-    else
+}
+
+
+void Foam::forces::writeIntegratedHeader
+(
+    const word& header,
+    Ostream& os
+) const
+{
+    writeHeader(os, header);
+    writeHeaderValue(os, "CofR", coordSys_.origin());
+    writeHeader(os, "");
+    writeCommented(os, "Time");
+    writeTabbed(os, "(total_x total_y total_z)");
+    writeTabbed(os, "(pressure_x pressure_y pressure_z)");
+    writeTabbed(os, "(viscous_x viscous_y viscous_z)");
+
+    if (porosity_)
     {
-        FatalErrorIn("void Foam::forces::writeFileHeader(const label)")
-            << "Unhandled file index: " << i
-            << abort(FatalError);
+        writeTabbed(os, "(porous_x porous_y porous_z)");
     }
 
-    file(i)<< endl;
+    os  << endl;
+}
+
+
+void Foam::forces::writeBinHeader(const word& header, Ostream& os) const
+{
+    writeHeader(os, header + " bins");
+    writeHeaderValue(os, "bins", nBin_);
+    writeHeaderValue(os, "start", binMin_);
+    writeHeaderValue(os, "delta", binDx_);
+    writeHeaderValue(os, "direction", binDir_);
+
+    vectorField binPoints(nBin_);
+    writeCommented(os, "x co-ords  :");
+    forAll(binPoints, pointI)
+    {
+        binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
+        os  << tab << binPoints[pointI].x();
+    }
+    os  << nl;
+
+    writeCommented(os, "y co-ords  :");
+    forAll(binPoints, pointI)
+    {
+        os  << tab << binPoints[pointI].y();
+    }
+    os  << nl;
+
+    writeCommented(os, "z co-ords  :");
+    forAll(binPoints, pointI)
+    {
+        os  << tab << binPoints[pointI].z();
+    }
+    os  << nl;
+
+    writeHeader(os, "");
+    writeCommented(os, "Time");
+
+    for (label j = 0; j < nBin_; j++)
+    {
+        const word jn(Foam::name(j) + ':');
+        os  << tab << jn << "(total_x total_y total_z)"
+            << tab << jn << "(pressure_x pressure_y pressure_z)"
+            << tab << jn << "(viscous_x viscous_y viscous_z)";
+
+        if (porosity_)
+        {
+            os  << tab << jn << "(porous_x porous_y porous_z)";
+        }
+    }
+
+    os << endl;
 }
 
 
@@ -165,7 +173,7 @@ void Foam::forces::initialise()
         if (!obr_.foundObject<volVectorField>(fDName_))
         {
             active_ = false;
-            WarningIn("void Foam::forces::initialise()")
+            WarningInFunction
                 << "Could not find " << fDName_ << " in database." << nl
                 << "    De-activating forces."
                 << endl;
@@ -185,7 +193,7 @@ void Foam::forces::initialise()
         {
             active_ = false;
 
-            WarningIn("void Foam::forces::initialise()")
+            WarningInFunction
                 << "Could not find " << UName_ << ", " << pName_;
 
             if (rhoName_ != "rhoInf")
@@ -198,10 +206,117 @@ void Foam::forces::initialise()
         }
     }
 
+    initialiseBins();
+
     initialised_ = true;
 }
 
 
+void Foam::forces::initialiseBins()
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    if (nBin_ > 1)
+    {
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+        const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+        // Determine extents of patches
+        binMin_ = GREAT;
+        scalar binMax = -GREAT;
+        forAllConstIter(labelHashSet, patchSet_, iter)
+        {
+            label patchI = iter.key();
+            const polyPatch& pp = pbm[patchI];
+            scalarField d(pp.faceCentres() & binDir_);
+            binMin_ = min(min(d), binMin_);
+            binMax = max(max(d), binMax);
+        }
+
+        // Include porosity
+        if (porosity_)
+        {
+            const HashTable<const porosityModel*> models =
+                obr_.lookupClass<porosityModel>();
+
+            const scalarField dd(mesh.C() & binDir_);
+
+            forAllConstIter(HashTable<const porosityModel*>, models, iter)
+            {
+                const porosityModel& pm = *iter();
+                const labelList& cellZoneIDs = pm.cellZoneIDs();
+
+                forAll(cellZoneIDs, i)
+                {
+                    label zoneI = cellZoneIDs[i];
+                    const cellZone& cZone = mesh.cellZones()[zoneI];
+                    const scalarField d(dd, cZone);
+                    binMin_ = min(min(d), binMin_);
+                    binMax = max(max(d), binMax);
+                }
+            }
+        }
+
+        reduce(binMin_, minOp<scalar>());
+        reduce(binMax, maxOp<scalar>());
+
+        // Slightly boost binMax so that region of interest is fully
+        // within bounds
+        binMax = 1.0001*(binMax - binMin_) + binMin_;
+
+        binDx_ = (binMax - binMin_)/scalar(nBin_);
+
+        // Create the bin points used for writing
+        binPoints_.setSize(nBin_);
+        forAll(binPoints_, i)
+        {
+            binPoints_[i] = (i + 0.5)*binDir_*binDx_;
+        }
+
+        // Allocate storage for forces and moments
+        forAll(force_, i)
+        {
+            force_[i].setSize(nBin_);
+            moment_[i].setSize(nBin_);
+        }
+    }
+}
+
+
+void Foam::forces::resetFields()
+{
+    force_[0] = vector::zero;
+    force_[1] = vector::zero;
+    force_[2] = vector::zero;
+
+    moment_[0] = vector::zero;
+    moment_[1] = vector::zero;
+    moment_[2] = vector::zero;
+
+    if (writeFields_)
+    {
+        volVectorField& force =
+            const_cast<volVectorField&>
+            (
+                obr_.lookupObject<volVectorField>(fieldName("force"))
+            );
+
+        force == dimensionedVector("0", force.dimensions(), vector::zero);
+
+        volVectorField& moment =
+            const_cast<volVectorField&>
+            (
+                obr_.lookupObject<volVectorField>(fieldName("moment"))
+            );
+
+        moment == dimensionedVector("0", moment.dimensions(), vector::zero);
+    }
+}
+
+
 Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 {
     typedef compressible::turbulenceModel cmpTurbModel;
@@ -255,7 +370,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
     }
     else
     {
-        FatalErrorIn("forces::devRhoReff()")
+        FatalErrorInFunction
             << "No valid model for viscous stress calculation"
             << exit(FatalError);
 
@@ -294,7 +409,7 @@ Foam::tmp<Foam::volScalarField> Foam::forces::mu() const
     }
     else
     {
-        FatalErrorIn("forces::mu()")
+        FatalErrorInFunction
             << "No valid model for dynamic viscosity calculation"
             << exit(FatalError);
 
@@ -341,7 +456,7 @@ Foam::scalar Foam::forces::rho(const volScalarField& p) const
     {
         if (rhoName_ != "rhoInf")
         {
-            FatalErrorIn("forces::rho(const volScalarField& p)")
+            FatalErrorInFunction
                 << "Dynamic pressure is expected but kinematic is provided."
                 << exit(FatalError);
         }
@@ -388,59 +503,180 @@ void Foam::forces::applyBins
 }
 
 
-void Foam::forces::writeForces()
+void Foam::forces::addToFields
+(
+    const label patchI,
+    const vectorField& Md,
+    const vectorField& fN,
+    const vectorField& fT,
+    const vectorField& fP
+)
 {
-    if (log_) Info
-        << type() << " " << name_ << " output:" << nl
-        << "    sum of forces:" << nl
-        << "        pressure : " << sum(force_[0]) << nl
-        << "        viscous  : " << sum(force_[1]) << nl
-        << "        porous   : " << sum(force_[2]) << nl
-        << "    sum of moments:" << nl
-        << "        pressure : " << sum(moment_[0]) << nl
-        << "        viscous  : " << sum(moment_[1]) << nl
-        << "        porous   : " << sum(moment_[2])
-        << endl;
-
-    file(0) << obr_.time().value() << tab << setw(1) << '('
-        << sum(force_[0]) << setw(1) << ' '
-        << sum(force_[1]) << setw(1) << ' '
-        << sum(force_[2]) << setw(3) << ") ("
-        << sum(moment_[0]) << setw(1) << ' '
-        << sum(moment_[1]) << setw(1) << ' '
-        << sum(moment_[2]) << setw(1) << ')'
-        << endl;
-
-    if (localSystem_)
-    {
-        vectorField localForceN(coordSys_.localVector(force_[0]));
-        vectorField localForceT(coordSys_.localVector(force_[1]));
-        vectorField localForceP(coordSys_.localVector(force_[2]));
-        vectorField localMomentN(coordSys_.localVector(moment_[0]));
-        vectorField localMomentT(coordSys_.localVector(moment_[1]));
-        vectorField localMomentP(coordSys_.localVector(moment_[2]));
-
-        file(0) << obr_.time().value() << tab << setw(1) << '('
-            << sum(localForceN) << setw(1) << ' '
-            << sum(localForceT) << setw(1) << ' '
-            << sum(localForceP) << setw(3) << ") ("
-            << sum(localMomentN) << setw(1) << ' '
-            << sum(localMomentT) << setw(1) << ' '
-            << sum(localMomentP) << setw(1) << ')'
-            << endl;
-    }
-}
-
-
-void Foam::forces::writeBins()
-{
-    if (nBin_ == 1)
+    if (!writeFields_)
     {
         return;
     }
 
-    List<Field<vector> > f(force_);
-    List<Field<vector> > m(moment_);
+    volVectorField& force =
+        const_cast<volVectorField&>
+        (
+            obr_.lookupObject<volVectorField>(fieldName("force"))
+        );
+
+    vectorField& pf = force.boundaryField()[patchI];
+    pf += fN + fT + fP;
+
+    volVectorField& moment =
+        const_cast<volVectorField&>
+        (
+            obr_.lookupObject<volVectorField>(fieldName("moment"))
+        );
+
+    vectorField& pm = moment.boundaryField()[patchI];
+    pm += Md;
+}
+
+
+void Foam::forces::addToFields
+(
+    const labelList& cellIDs,
+    const vectorField& Md,
+    const vectorField& fN,
+    const vectorField& fT,
+    const vectorField& fP
+)
+{
+    if (!writeFields_)
+    {
+        return;
+    }
+
+    volVectorField& force =
+        const_cast<volVectorField&>
+        (
+            obr_.lookupObject<volVectorField>(fieldName("force"))
+        );
+
+    volVectorField& moment =
+        const_cast<volVectorField&>
+        (
+            obr_.lookupObject<volVectorField>(fieldName("moment"))
+        );
+
+    forAll(cellIDs, i)
+    {
+        label cellI = cellIDs[i];
+        force[cellI] += fN[i] + fT[i] + fP[i];
+        moment[cellI] += Md[i];
+    }
+}
+
+
+void Foam::forces::writeIntegratedForceMoment
+(
+    const string& descriptor,
+    const vectorField& fm0,
+    const vectorField& fm1,
+    const vectorField& fm2,
+    autoPtr<OFstream>& osPtr
+) const
+{
+    vector pressure = sum(fm0);
+    vector viscous = sum(fm1);
+    vector porous = sum(fm2);
+    vector total = pressure + viscous + porous;
+
+    if (log_)
+    {
+        Info<< "    Sum of " << descriptor.c_str() << nl
+            << "        Total    : " << total << nl
+            << "        Pressure : " << pressure << nl
+            << "        Viscous  : " << viscous << nl;
+
+        if (porosity_)
+        {
+            Info<< "        Porous   : " << porous << nl;
+        }
+    }
+
+    if (writeToFile())
+    {
+        Ostream& os = osPtr();
+
+        os  << obr_.time().value()
+            << tab << total
+            << tab << pressure
+            << tab << viscous;
+
+        if (porosity_)
+        {
+            os  << tab << porous;
+        }
+
+        os  << endl;
+    }
+}
+
+
+void Foam::forces::writeForces()
+{
+    if (log_) Info << type() << " " << name_ << " output:" << nl;
+
+    writeIntegratedForceMoment
+    (
+        "forces",
+        force_[0],
+        force_[1],
+        force_[2],
+        forceFilePtr_
+    );
+
+    writeIntegratedForceMoment
+    (
+        "moments",
+        moment_[0],
+        moment_[1],
+        moment_[2],
+        momentFilePtr_
+    );
+
+    if (localSystem_)
+    {
+        writeIntegratedForceMoment
+        (
+            "local forces",
+            coordSys_.localVector(force_[0]),
+            coordSys_.localVector(force_[1]),
+            coordSys_.localVector(force_[2]),
+            localForceFilePtr_
+        );
+
+        writeIntegratedForceMoment
+        (
+            "local moments",
+            coordSys_.localVector(moment_[0]),
+            coordSys_.localVector(moment_[1]),
+            coordSys_.localVector(moment_[2]),
+            localMomentFilePtr_
+        );
+    }
+
+    if (log_) Info << endl;
+}
+
+
+void Foam::forces::writeBinnedForceMoment
+(
+    const List<Field<vector> >& fm,
+    autoPtr<OFstream>& osPtr
+) const
+{
+    if ((nBin_ == 1) || !writeToFile())
+    {
+        return;
+    }
+
+    List<Field<vector> > f(fm);
 
     if (binCumulative_)
     {
@@ -449,27 +685,36 @@ void Foam::forces::writeBins()
             f[0][i] += f[0][i-1];
             f[1][i] += f[1][i-1];
             f[2][i] += f[2][i-1];
-
-            m[0][i] += m[0][i-1];
-            m[1][i] += m[1][i-1];
-            m[2][i] += m[2][i-1];
         }
     }
 
-    file(1) << obr_.time().value();
+    Ostream& os = osPtr();
+
+    writeTime(os);
 
     forAll(f[0], i)
     {
-        file(1)
-            << tab << setw(1) << '('
-            << f[0][i] << setw(1) << ' '
-            << f[1][i] << setw(1) << ' '
-            << f[2][i] << setw(3) << ") ("
-            << m[0][i] << setw(1) << ' '
-            << m[1][i] << setw(1) << ' '
-            << m[2][i] << setw(1) << ')';
+        vector total = f[0][i] + f[1][i] + f[2][i];
+
+        os  << tab << total
+            << tab << f[0][i]
+            << tab << f[1][i];
+
+        if (porosity_)
+        {
+            os  << tab << f[2][i];
+        }
     }
 
+    os  << nl;
+}
+
+
+void Foam::forces::writeBins()
+{
+    writeBinnedForceMoment(force_, forceBinFilePtr_);
+    writeBinnedForceMoment(moment_, momentBinFilePtr_);
+
     if (localSystem_)
     {
         List<Field<vector> > lf(3);
@@ -481,33 +726,9 @@ void Foam::forces::writeBins()
         lm[1] = coordSys_.localVector(moment_[1]);
         lm[2] = coordSys_.localVector(moment_[2]);
 
-        if (binCumulative_)
-        {
-            for (label i = 1; i < lf[0].size(); i++)
-            {
-                lf[0][i] += lf[0][i-1];
-                lf[1][i] += lf[1][i-1];
-                lf[2][i] += lf[2][i-1];
-                lm[0][i] += lm[0][i-1];
-                lm[1][i] += lm[1][i-1];
-                lm[2][i] += lm[2][i-1];
-            }
-        }
-
-        forAll(lf[0], i)
-        {
-            file(1)
-                << tab << setw(1) << '('
-                << lf[0][i] << setw(1) << ' '
-                << lf[1][i] << setw(1) << ' '
-                << lf[2][i] << setw(3) << ") ("
-                << lm[0][i] << setw(1) << ' '
-                << lm[1][i] << setw(1) << ' '
-                << lm[2][i] << setw(1) << ')';
-        }
+        writeBinnedForceMoment(lf, localForceBinFilePtr_);
+        writeBinnedForceMoment(lm, localMomentBinFilePtr_);
     }
-
-    file(1) << endl;
 }
 
 
@@ -522,13 +743,20 @@ Foam::forces::forces
     const bool readFields
 )
 :
-    functionObjectFile(obr, name, createFileNames(dict)),
-    name_(name),
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name),
     obr_(obr),
-    active_(true),
     log_(true),
     force_(3),
     moment_(3),
+    forceFilePtr_(),
+    momentFilePtr_(),
+    forceBinFilePtr_(),
+    momentBinFilePtr_(),
+    localForceFilePtr_(),
+    localMomentFilePtr_(),
+    localForceBinFilePtr_(),
+    localMomentBinFilePtr_(),
     patchSet_(),
     pName_(word::null),
     UName_(word::null),
@@ -546,33 +774,18 @@ Foam::forces::forces
     binMin_(GREAT),
     binPoints_(),
     binCumulative_(true),
+    writeFields_(false),
     initialised_(false)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
-    if (isA<fvMesh>(obr_))
+    if (setActive<fvMesh>())
     {
         if (readFields)
         {
             read(dict);
-            Info<< endl;
+            if (log_) Info << endl;
         }
     }
-    else
-    {
-        active_ = false;
-        WarningIn
-        (
-            "Foam::forces::forces"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
-            << endl;
-    }
-
 }
 
 
@@ -589,13 +802,20 @@ Foam::forces::forces
     const coordinateSystem& coordSys
 )
 :
-    functionObjectFile(obr, name, typeName),
-    name_(name),
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name),
     obr_(obr),
-    active_(true),
     log_(true),
     force_(3),
     moment_(3),
+    forceFilePtr_(),
+    momentFilePtr_(),
+    forceBinFilePtr_(),
+    momentBinFilePtr_(),
+    localForceFilePtr_(),
+    localMomentFilePtr_(),
+    localForceBinFilePtr_(),
+    localMomentBinFilePtr_(),
     patchSet_(patchSet),
     pName_(pName),
     UName_(UName),
@@ -613,8 +833,12 @@ Foam::forces::forces
     binMin_(GREAT),
     binPoints_(),
     binCumulative_(true),
+    writeFields_(false),
     initialised_(false)
 {
+    // Turn off writing to file
+    writeToFile_ = false;
+
     forAll(force_, i)
     {
         force_[i].setSize(nBin_);
@@ -633,159 +857,153 @@ Foam::forces::~forces()
 
 void Foam::forces::read(const dictionary& dict)
 {
-    if (active_)
+    if (!active_)
     {
-        initialised_ = false;
+        return;
+    }
 
-        log_ = dict.lookupOrDefault<Switch>("log", false);
+    functionObjectFile::read(dict);
 
-        if (log_) Info<< type() << " " << name_ << ":" << nl;
+    initialised_ = false;
 
-        directForceDensity_ = dict.lookupOrDefault("directForceDensity", false);
+    log_ = dict.lookupOrDefault<Switch>("log", false);
 
-        const fvMesh& mesh = refCast<const fvMesh>(obr_);
-        const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+    if (log_) Info << type() << " " << name_ << ":" << nl;
 
-        patchSet_ = pbm.patchSet(wordReList(dict.lookup("patches")));
+    directForceDensity_ = dict.lookupOrDefault("directForceDensity", false);
 
-        if (directForceDensity_)
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    patchSet_ = pbm.patchSet(wordReList(dict.lookup("patches")));
+
+    if (directForceDensity_)
+    {
+        // Optional entry for fDName
+        fDName_ = dict.lookupOrDefault<word>("fDName", "fD");
+    }
+    else
+    {
+        // Optional entries U and p
+        pName_ = dict.lookupOrDefault<word>("pName", "p");
+        UName_ = dict.lookupOrDefault<word>("UName", "U");
+        rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+
+        // Reference density needed for incompressible calculations
+        rhoRef_ = readScalar(dict.lookup("rhoInf"));
+
+        // Reference pressure, 0 by default
+        pRef_ = dict.lookupOrDefault<scalar>("pRef", 0.0);
+    }
+
+    coordSys_.clear();
+
+    // Centre of rotation for moment calculations
+    // specified directly, from coordinate system, or implicitly (0 0 0)
+    if (!dict.readIfPresent<point>("CofR", coordSys_.origin()))
+    {
+        coordSys_ = coordinateSystem(obr_, dict);
+        localSystem_ = true;
+    }
+
+    dict.readIfPresent("porosity", porosity_);
+    if (porosity_)
+    {
+        if (log_) Info << "    Including porosity effects" << endl;
+    }
+    else
+    {
+        if (log_) Info << "    Not including porosity effects" << endl;
+    }
+
+    if (dict.found("binData"))
+    {
+        const dictionary& binDict(dict.subDict("binData"));
+        binDict.lookup("nBin") >> nBin_;
+
+        if (nBin_ < 0)
         {
-            // Optional entry for fDName
-            fDName_ = dict.lookupOrDefault<word>("fDName", "fD");
+            FatalIOErrorInFunction(dict)
+                << "Number of bins (nBin) must be zero or greater"
+                << exit(FatalIOError);
+        }
+        else if (nBin_ == 0)
+        {
+            nBin_ = 1;
         }
         else
         {
-            // Optional entries U and p
-            pName_ = dict.lookupOrDefault<word>("pName", "p");
-            UName_ = dict.lookupOrDefault<word>("UName", "U");
-            rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
-
-            // Reference density needed for incompressible calculations
-            rhoRef_ = readScalar(dict.lookup("rhoInf"));
-
-            // Reference pressure, 0 by default
-            pRef_ = dict.lookupOrDefault<scalar>("pRef", 0.0);
+            binDict.lookup("cumulative") >> binCumulative_;
+            binDict.lookup("direction") >> binDir_;
+            binDir_ /= mag(binDir_);
         }
+    }
 
-        coordSys_.clear();
-
-        // Centre of rotation for moment calculations
-        // specified directly, from coordinate system, or implicitly (0 0 0)
-        if (!dict.readIfPresent<point>("CofR", coordSys_.origin()))
+    if (nBin_ == 1)
+    {
+        // Allocate storage for forces and moments
+        forAll(force_, i)
         {
-            coordSys_ = coordinateSystem(obr_, dict);
-            localSystem_ = true;
+            force_[i].setSize(1);
+            moment_[i].setSize(1);
         }
+    }
 
-        dict.readIfPresent("porosity", porosity_);
-        if (porosity_)
-        {
-            if (log_) Info<< "    Including porosity effects" << endl;
-        }
-        else
-        {
-            if (log_) Info<< "    Not including porosity effects" << endl;
-        }
+    writeFields_ = dict.lookupOrDefault("writeFields", false);
 
-        if (dict.found("binData"))
-        {
-            const dictionary& binDict(dict.subDict("binData"));
-            binDict.lookup("nBin") >> nBin_;
+    if (writeFields_)
+    {
+        if (log_) Info << "    Fields will be written" << endl;
 
-            if (nBin_ < 0)
-            {
-                FatalIOErrorIn
+        tmp<volVectorField> tforce
+        (
+            new volVectorField
+            (
+                IOobject
                 (
-                    "void Foam::forces::read(const dictionary&)", dict
-                )   << "Number of bins (nBin) must be zero or greater"
-                    << exit(FatalIOError);
-            }
-            else if ((nBin_ == 0) || (nBin_ == 1))
-            {
-                nBin_ = 1;
-                forAll(force_, i)
-                {
-                    force_[i].setSize(1);
-                    moment_[i].setSize(1);
-                }
-            }
+                    fieldName("force"),
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedVector("0", dimForce, vector::zero)
+            )
+        );
 
-            if (nBin_ > 1)
-            {
-                binDict.lookup("direction") >> binDir_;
-                binDir_ /= mag(binDir_);
+        obr_.store(tforce.ptr());
 
-                binMin_ = GREAT;
-                scalar binMax = -GREAT;
-                forAllConstIter(labelHashSet, patchSet_, iter)
-                {
-                    label patchI = iter.key();
-                    const polyPatch& pp = pbm[patchI];
-                    scalarField d(pp.faceCentres() & binDir_);
-                    binMin_ = min(min(d), binMin_);
-                    binMax = max(max(d), binMax);
-                }
-                reduce(binMin_, minOp<scalar>());
-                reduce(binMax, maxOp<scalar>());
+        tmp<volVectorField> tmoment
+        (
+            new volVectorField
+            (
+                IOobject
+                (
+                    fieldName("moment"),
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedVector("0", dimForce*dimLength, vector::zero)
+            )
+        );
 
-                // slightly boost binMax so that region of interest is fully
-                // within bounds
-                binMax = 1.0001*(binMax - binMin_) + binMin_;
-
-                binDx_ = (binMax - binMin_)/scalar(nBin_);
-
-                // create the bin points used for writing
-                binPoints_.setSize(nBin_);
-                forAll(binPoints_, i)
-                {
-                    binPoints_[i] = (i + 0.5)*binDir_*binDx_;
-                }
-
-                binDict.lookup("cumulative") >> binCumulative_;
-
-                // allocate storage for forces and moments
-                forAll(force_, i)
-                {
-                    force_[i].setSize(nBin_);
-                    moment_[i].setSize(nBin_);
-                }
-            }
-        }
-
-        if (nBin_ == 1)
-        {
-            // allocate storage for forces and moments
-            force_[0].setSize(1);
-            force_[1].setSize(1);
-            force_[2].setSize(1);
-            moment_[0].setSize(1);
-            moment_[1].setSize(1);
-            moment_[2].setSize(1);
-        }
+        obr_.store(tmoment.ptr());
     }
 }
 
 
 void Foam::forces::execute()
 {
-    // Do nothing - only valid on write
-}
+    if (!active_)
+    {
+        return;
+    }
 
-
-void Foam::forces::end()
-{
-    // Do nothing - only valid on write
-}
-
-
-void Foam::forces::timeSet()
-{
-    // Do nothing - only valid on write
-}
-
-
-void Foam::forces::write()
-{
+    // calcForcesMoment may have reset the active flag - need to re-check
     calcForcesMoment();
 
     if (!active_)
@@ -795,33 +1013,69 @@ void Foam::forces::write()
 
     if (Pstream::master())
     {
-        functionObjectFile::write();
+        createFiles();
 
         writeForces();
 
         writeBins();
 
-        if (log_) Info<< endl;
+        if (log_) Info << endl;
+    }
+
+    // write state/results information
+    setResult("normalForce", sum(force_[0]));
+    setResult("tangentialForce", sum(force_[1]));
+    setResult("porousForce", sum(force_[2]));
+
+    setResult("normalMoment", sum(moment_[0]));
+    setResult("tangentialMoment", sum(moment_[1]));
+    setResult("porousMoment", sum(moment_[2]));
+}
+
+
+void Foam::forces::end()
+{
+    // Do nothing
+}
+
+
+void Foam::forces::timeSet()
+{
+    // Do nothing
+}
+
+
+void Foam::forces::write()
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    if (writeFields_)
+    {
+        obr_.lookupObject<volVectorField>(fieldName("force")).write();
+        obr_.lookupObject<volVectorField>(fieldName("moment")).write();
     }
 }
 
 
 void Foam::forces::calcForcesMoment()
 {
-    initialise();
-
     if (!active_)
     {
         return;
     }
 
-    force_[0] = vector::zero;
-    force_[1] = vector::zero;
-    force_[2] = vector::zero;
+    initialise();
 
-    moment_[0] = vector::zero;
-    moment_[1] = vector::zero;
-    moment_[2] = vector::zero;
+    // Initialise may have reset the active flag - need to re-check
+    if (!active_)
+    {
+        return;
+    }
+
+    resetFields();
 
     if (directForceDensity_)
     {
@@ -858,6 +1112,8 @@ void Foam::forces::calcForcesMoment()
             //- Porous force
             vectorField fP(Md.size(), vector::zero);
 
+            addToFields(patchI, Md, fN, fT, fP);
+
             applyBins(Md, fN, fT, fP, mesh.C().boundaryField()[patchI]);
         }
     }
@@ -896,6 +1152,8 @@ void Foam::forces::calcForcesMoment()
 
             vectorField fP(Md.size(), vector::zero);
 
+            addToFields(patchI, Md, fN, fT, fP);
+
             applyBins(Md, fN, fT, fP, mesh.C().boundaryField()[patchI]);
         }
     }
@@ -913,7 +1171,7 @@ void Foam::forces::calcForcesMoment()
 
         if (models.empty())
         {
-            WarningIn("void Foam::forces::calcForcesMoment()")
+            WarningInFunction
                 << "Porosity effects requested, but no porosity models found "
                 << "in the database"
                 << endl;
@@ -939,6 +1197,8 @@ void Foam::forces::calcForcesMoment()
 
                 const vectorField fDummy(Md.size(), vector::zero);
 
+                addToFields(cZone, Md, fDummy, fDummy, fP);
+
                 applyBins(Md, fDummy, fDummy, fP, d);
             }
         }
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index f0131f0c32..db048f5aa8 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,11 +29,24 @@ Group
 
 Description
     This function object calculates the forces and moments by integrating the
-    pressure and skin-friction forces over a given list of patches.
+    pressure and skin-friction forces over a given list of patches, and
+    the resistance from porous zones.
 
-    Member function forces::write() calculates the forces/moments and
-    writes the forces/moments into the file \<timeDir\>/forces.dat and bin
-    data (if selected) to the file \<timeDir\>/forces_bin.dat
+    Forces and moments are calculated, with optional co-ordinate system and
+    writing of binned data, where force and moment contributions are collected
+    into a user-defined number of bins that span the input geometries for a
+    user-defined direction vector.
+
+    Data is written into multiple files in the
+    postProcessing/\<functionObjectName\> directory:
+    - force.dat          : forces in global Cartesian co-ordinate system
+    - moment.dat         : moments in global Cartesian co-ordinate system
+    - forceBin.dat       : force bins in global Cartesian co-ordinate system
+    - momentBin.dat      : moment bins in global Cartesian co-ordinate system
+    - localForce.dat     : forces in local co-ordinate system
+    - localMoment.dat    : moments in local co-ordinate system
+    - localForceBin.dat  : force bins in local co-ordinate system
+    - localMomentBin.dat : moment bins in local co-ordinate system
 
     Example of function object specification:
     \verbatim
@@ -43,6 +56,7 @@ Description
         functionObjectLibs ("libforces.so");
         ...
         log         yes;
+        writeFields yes;
         patches     (walls);
 
         binData
@@ -59,11 +73,13 @@ Description
         Property     | Description             | Required    | Default value
         type         | type name: forces       | yes         |
         log          | write force data to standard output | no | no
+        writeFields  | write the force and moment fields | no | no
         patches      | patches included in the forces calculation | yes |
         pName        | pressure field name     | no          | p
         UName        | velocity field name     | no          | U
         rhoName      | density field name (see below) | no   | rho
         CofR         | centre of rotation (see below) | no   |
+        porosity     | flag to include porosity contributions | no | no
         directForceDensity | force density supplied directly (see below)|no|no
         fDName       | name of force density field (see below) | no | fD
     \endtable
@@ -101,6 +117,8 @@ Note
 
 SeeAlso
     Foam::functionObject
+    Foam::functionObjectFile
+    Foam::functionObjectState
     Foam::OutputFilterFunctionObject
     Foam::forceCoeffs
 
@@ -113,6 +131,7 @@ SourceFiles
 #ifndef forces_H
 #define forces_H
 
+#include "functionObjectState.H"
 #include "functionObjectFile.H"
 #include "coordinateSystem.H"
 #include "coordinateSystems.H"
@@ -122,7 +141,6 @@ SourceFiles
 #include "Tuple2.H"
 #include "OFstream.H"
 #include "Switch.H"
-#include "writer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -141,21 +159,16 @@ class mapPolyMesh;
 
 class forces
 :
+    public functionObjectState,
     public functionObjectFile
 {
 protected:
 
     // Protected data
 
-        //- Name of this set of forces,
-        //  Also used as the name of the probes directory.
-        word name_;
-
+        //- Reference to the database
         const objectRegistry& obr_;
 
-        //- On/off switch
-        bool active_;
-
         //- Switch to send output to Info as well as to file
         Switch log_;
 
@@ -165,6 +178,32 @@ protected:
         //- Pressure, viscous and porous moment per bin
         List<Field<vector> > moment_;
 
+        // File streams
+
+            //- Forces
+            autoPtr<OFstream> forceFilePtr_;
+
+            //- Moments
+            autoPtr<OFstream> momentFilePtr_;
+
+            //- Force bins
+            autoPtr<OFstream> forceBinFilePtr_;
+
+            //- Moment bins
+            autoPtr<OFstream> momentBinFilePtr_;
+
+            //- Local force
+            autoPtr<OFstream> localForceFilePtr_;
+
+            //- Local moment
+            autoPtr<OFstream> localMomentFilePtr_;
+
+            //- Local force bins
+            autoPtr<OFstream> localForceBinFilePtr_;
+
+            //- Local moment bins
+            autoPtr<OFstream> localMomentBinFilePtr_;
+
 
         // Read from dictionary
 
@@ -223,21 +262,36 @@ protected:
                 bool binCumulative_;
 
 
+            //- Write fields flag
+            bool writeFields_;
+
             //- Initialised flag
             bool initialised_;
 
 
     // Protected Member Functions
 
-        //- Create file names for forces and bins
-        wordList createFileNames(const dictionary& dict) const;
+        //- Create a field name
+        word fieldName(const word& name) const;
 
-        //- Output file header information
-        virtual void writeFileHeader(const label i);
+        //- Create the output files
+        void createFiles();
+
+        //- Write header for integrated data
+        void writeIntegratedHeader(const word& header, Ostream& os) const;
+
+        //- Write header for binned data
+        void writeBinHeader(const word& header, Ostream& os) const;
 
         //- Initialise the fields
         void initialise();
 
+        //- Initialise the collection bins
+        void initialiseBins();
+
+        //- Reset the fields prior to accumulation of force/moments
+        void resetFields();
+
         //- Return the effective viscous stress (laminar + turbulent).
         tmp<volSymmTensorField> devRhoReff() const;
 
@@ -261,10 +315,47 @@ protected:
             const vectorField& d
         );
 
-        //- Helper function to write force data
+        //- Add patch contributions to force and moment fields
+        void addToFields
+        (
+            const label patchI,
+            const vectorField& Md,
+            const vectorField& fN,
+            const vectorField& fT,
+            const vectorField& fP
+        );
+
+        //- Add cell contributions to force and moment fields
+        void addToFields
+        (
+            const labelList& cellIDs,
+            const vectorField& Md,
+            const vectorField& fN,
+            const vectorField& fT,
+            const vectorField& fP
+        );
+
+        //- Helper function to write integrated forces and moments
+        void writeIntegratedForceMoment
+        (
+            const string& descriptor,
+            const vectorField& fm0,
+            const vectorField& fm1,
+            const vectorField& fm2,
+            autoPtr<OFstream>& osPtr
+        ) const;
+
+        //- Write force data
         void writeForces();
 
-        //- Helper function to write bin data
+        //- Helper function to write binned forces and moments
+        void writeBinnedForceMoment
+        (
+            const List<Field<vector> >& fm,
+            autoPtr<OFstream>& osPtr
+        ) const;
+
+        //- Write binned data
         void writeBins();
 
         //- Disallow default bitwise copy construct
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
index 8c951de8ec..965b2d4198 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(calcFvcDiv, 0);
+    defineTypeNameAndDebug(calcFvcDiv, 0);
 }
 
 
@@ -88,22 +88,15 @@ Foam::calcFvcDiv::calcFvcDiv
     obr_(obr),
     active_(true),
     fieldName_("undefined-fieldName"),
-    resultName_("undefined-resultName")
+    resultName_(word::null),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "calcFvcDiv::calcFvcDiv"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating." << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating." << nl
             << endl;
     }
 
@@ -123,10 +116,12 @@ void Foam::calcFvcDiv::read(const dictionary& dict)
 {
     if (active_)
     {
-        dict.lookup("fieldName") >> fieldName_;
-        dict.lookup("resultName") >> resultName_;
+        log_.readIfPresent("log", dict);
 
-        if (resultName_ == "none")
+        dict.lookup("fieldName") >> fieldName_;
+        dict.readIfPresent("resultName", resultName_);
+
+        if (resultName_ == word::null)
         {
             resultName_ = "fvc::div(" + fieldName_ + ")";
         }
@@ -145,7 +140,7 @@ void Foam::calcFvcDiv::execute()
 
         if (!processed)
         {
-            WarningIn("void Foam::calcFvcDiv::write()")
+            WarningInFunction
                 << "Unprocessed field " << fieldName_ << endl;
         }
     }
@@ -154,10 +149,7 @@ void Foam::calcFvcDiv::execute()
 
 void Foam::calcFvcDiv::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -176,7 +168,8 @@ void Foam::calcFvcDiv::write()
             const regIOobject& field =
                 obr_.lookupObject<regIOobject>(resultName_);
 
-            Info<< type() << " " << name_ << " output:" << nl
+            if (log_) Info
+                << type() << " " << name_ << " output:" << nl
                 << "    writing field " << field.name() << nl << endl;
 
             field.write();
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
index 447b00c92c..bc498be4ec 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,29 @@ Group
     grpFVFunctionObjects
 
 Description
-    This function object calculates the divergence of a field.  The operation is
-    limited to surfaceScalarFields and volumeVector fields, and the output is a
-    volume scalar field.
+    This function object calculates the divergence of a field.  The operation
+    is limited to surfaceScalarFields and volumeVector fields, and the output
+    is a volume scalar field.
+
+    Example of function object specification:
+    \verbatim
+    calcFvcDiv1
+    {
+        type        calcFvcDiv;
+        functionObjectLibs ("libFVFunctionObjects.so");
+        ...
+        fieldName   U;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property | Description                | Required  | Default value
+        type     | type name: calcFvcDiv      | yes       |
+        fieldName | Name of field to process  | yes       |
+        resultName | Name of divergence field | no        | fvc::div(fieldName)
+        log      | Log to standard output     | no        | yes
+    \endtable
 
 SourceFiles
     calcFvcDiv.C
@@ -82,6 +102,9 @@ class calcFvcDiv
         //- Name of result field
         word resultName_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
index c0642ecf01..f7152472d1 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(calcFvcGrad, 0);
+    defineTypeNameAndDebug(calcFvcGrad, 0);
 }
 
 
@@ -50,22 +50,15 @@ Foam::calcFvcGrad::calcFvcGrad
     obr_(obr),
     active_(true),
     fieldName_("undefined-fieldName"),
-    resultName_("undefined-resultName")
+    resultName_(word::null),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "calcFvcGrad::calcFvcGrad"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating." << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating." << nl
             << endl;
     }
 
@@ -85,10 +78,12 @@ void Foam::calcFvcGrad::read(const dictionary& dict)
 {
     if (active_)
     {
-        dict.lookup("fieldName") >> fieldName_;
-        dict.lookup("resultName") >> resultName_;
+        log_.readIfPresent("log", dict);
 
-        if (resultName_ == "none")
+        dict.lookup("fieldName") >> fieldName_;
+        dict.readIfPresent("resultName", resultName_);
+
+        if (resultName_ == word::null)
         {
             resultName_ = "fvc::grad(" + fieldName_ + ")";
         }
@@ -107,7 +102,7 @@ void Foam::calcFvcGrad::execute()
 
         if (!processed)
         {
-            WarningIn("void Foam::calcFvcGrad::write()")
+            WarningInFunction
                 << "Unprocessed field " << fieldName_ << endl;
         }
     }
@@ -116,10 +111,7 @@ void Foam::calcFvcGrad::execute()
 
 void Foam::calcFvcGrad::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -138,7 +130,8 @@ void Foam::calcFvcGrad::write()
             const regIOobject& field =
                 obr_.lookupObject<regIOobject>(resultName_);
 
-            Info<< type() << " " << name_ << " output:" << nl
+            if (log_) Info
+                << type() << " " << name_ << " output:" << nl
                 << "    writing field " << field.name() << nl << endl;
 
             field.write();
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
index bdaf5383ed..45b6d9c727 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,29 @@ Group
     grpFVFunctionObjects
 
 Description
-    This function object calculates the gradient of a field.  The operation is
-    limited to scalar and vector volume or surface fields, and the output is a
-    volume vector or tensor field.
+    This function object calculates the gradient of a field.  The operation
+    is limited to scalar and vector volume or surface fields, and the output
+    is a volume vector or tensor field.
+
+    Example of function object specification:
+    \verbatim
+    calcFvcGrad1
+    {
+        type        calcFvcGrad;
+        functionObjectLibs ("libFVFunctionObjects.so");
+        ...
+        fieldName   U;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property | Description                | Required  | Default value
+        type     | type name: calcFvcGrad     | yes       |
+        fieldName | Name of field to process  | yes       |
+        resultName | Name of gradient field   | no        | fvc::grad(fieldName)
+        log      | Log to standard output     | no        | yes
+    \endtable
 
 SourceFiles
     calcFvcGrad.C
@@ -82,6 +102,9 @@ class calcFvcGrad
         //- Name of result field
         word resultName_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
index d853aaf00d..b77cc92ba9 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
+++ b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(calcMag, 0);
+    defineTypeNameAndDebug(calcMag, 0);
 }
 
 
@@ -50,22 +50,15 @@ Foam::calcMag::calcMag
     obr_(obr),
     active_(true),
     fieldName_("undefined-fieldName"),
-    resultName_("undefined-resultName")
+    resultName_(word::null),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "calcMag::calcMag"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating." << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating." << nl
             << endl;
     }
 
@@ -85,10 +78,12 @@ void Foam::calcMag::read(const dictionary& dict)
 {
     if (active_)
     {
-        dict.lookup("fieldName") >> fieldName_;
-        dict.lookup("resultName") >> resultName_;
+        log_.readIfPresent("log", dict);
 
-        if (resultName_ == "none")
+        dict.lookup("fieldName") >> fieldName_;
+        dict.readIfPresent("resultName", resultName_);
+
+        if (resultName_ == word::null)
         {
             resultName_ = "mag(" + fieldName_ + ")";
         }
@@ -110,7 +105,7 @@ void Foam::calcMag::execute()
 
         if (!processed)
         {
-            WarningIn("void Foam::calcMag::write()")
+            WarningInFunction
                 << "Unprocessed field " << fieldName_ << endl;
         }
     }
@@ -119,10 +114,7 @@ void Foam::calcMag::execute()
 
 void Foam::calcMag::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -141,7 +133,8 @@ void Foam::calcMag::write()
             const regIOobject& field =
                 obr_.lookupObject<regIOobject>(resultName_);
 
-            Info<< type() << " " << name_ << " output:" << nl
+            if (log_) Info
+                << type() << " " << name_ << " output:" << nl
                 << "    writing field " << field.name() << nl << endl;
 
             field.write();
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
index 76f1072111..1df80da3aa 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
+++ b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,25 @@ Description
     can be applied to any volume or surface fieldsm and the output is a
     volume or surface scalar field.
 
+    Example of function object specification:
+    \verbatim
+    calcMag1
+    {
+        type        calcMag;
+        functionObjectLibs ("libFVFunctionObjects.so");
+        ...
+        fieldName   U;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property | Description                | Required  | Default value
+        type     | type name: calcMag         | yes       |
+        fieldName | Name of field to process  | yes       |
+        resultName | Name of magnitude field  | no        | mag(fieldName)
+        log      | Log to standard output     | no        | yes
+    \endtable
 SourceFiles
     calcMag.C
     IOcalcMag.H
@@ -82,6 +101,9 @@ class calcMag
         //- Name of result field
         word resultName_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/graphics/Allwmake b/src/postProcessing/functionObjects/graphics/Allwmake
new file mode 100755
index 0000000000..fc5ea8144b
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/Allwmake
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+./runTimePostProcessing/Allwmake
diff --git a/src/postProcessing/functionObjects/graphics/doc/graphicsFunctionObjectsDoc.H b/src/postProcessing/functionObjects/graphics/doc/graphicsFunctionObjectsDoc.H
new file mode 100644
index 0000000000..9839333c76
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/doc/graphicsFunctionObjectsDoc.H
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the Free
+    Software Foundation, either version 3 of the License, or (at your option)
+    any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    details.
+
+    You should have received a copy of the GNU General Public License along with
+    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\defgroup grpGraphicsFunctionObjects Graphics function objects
+@{
+    \ingroup grpFunctionObjects
+    This group contains graphics-based function objects
+@}
+
+\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/Allwclean b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/Allwclean
new file mode 100755
index 0000000000..b570283bce
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/Allwclean
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source the wmake functions
+. $WM_DIR/scripts/wmakeFunctions
+
+(
+    # Where are the generated files stored?
+    findObjectDir dummy.C
+    depDir="$objectsDir"
+    rm -rf "$depDir" > /dev/null 2>&1
+)
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/Allwmake b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/Allwmake
new file mode 100755
index 0000000000..aa7ed7cc7e
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/Allwmake
@@ -0,0 +1,28 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source the wmake functions
+. $WM_DIR/scripts/wmakeFunctions
+
+# Store current directory
+sourceDir=$PWD
+
+# Where are any generated files stored?
+findObjectDir dummy.C
+depDir="$objectsDir"
+
+if [ -d "$VTK_DIR" -o  -d "$ParaView_DIR" ]
+then
+    # ensure CMake gets the correct C++ compiler
+    [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
+    [ -n "$WM_CC" ] && export CC="$WM_CC"
+
+    (mkdir -p $depDir && cd $depDir && cmake $sourceDir && make)
+else
+    echo "ERROR: Build of $PWD requires a valid VTK installation which"
+    echo "       can be supplied either by ParaView by VTK. In case of"
+    echo "       - ParaView : export the ParaView_DIR environment variable"
+    echo "       - VTK      : export the VTK_DIR variable"
+fi
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt
new file mode 100644
index 0000000000..d309a24fd5
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt
@@ -0,0 +1,84 @@
+include(${VTK_USE_FILE})
+
+if(VTK_LIBRARIES)
+    message("Found VTK LIBRARIES: " ${VTK_USE_FILE})
+endif()
+
+if(${VTK_VERSION} VERSION_GREATER "6")
+    message("VTK version: " ${VTK_VERSION})
+else()
+    message(FATAL_ERROR " VTK6 required")
+endif()
+
+include_directories(
+    $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
+    $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
+    $ENV{WM_PROJECT_DIR}/src/triSurface/lnInclude
+    $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+link_directories(
+    $ENV{FOAM_LIBBIN}
+    $ENV{FOAM_EXT_LIBBIN}
+)
+
+add_definitions(
+    -DWM_$ENV{WM_PRECISION_OPTION} -DNoRepository
+    -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
+)
+
+set(CMAKE_BUILD_TYPE Release)
+
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-g -O0 -Wall -Wextra -Wno-unused-parameter -Wnon-virtual-dtor -Wno-overloaded-virtual"
+)
+set(CMAKE_C_FLAGS_DEBUG "-g -O0")
+
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-O3 -Wall -Wextra -Wno-unused-parameter -Wnon-virtual-dtor -Wno-overloaded-virtual")
+set(CMAKE_C_FLAGS_RELEASE "-O3")
+
+# Set output library destination to plugin directory
+set(LIBRARY_OUTPUT_PATH $ENV{FOAM_LIBBIN}
+    CACHE INTERNAL
+    ""
+)
+
+file(GLOB SOURCE_FILES
+    fieldVisualisationBase.C
+    functionObjectCloud.C
+    functionObjectLine.C
+    functionObjectSurface.C
+    geometryBase.C
+    geometrySurface.C
+    pathline.C
+    pointData.C
+    runTimePostProcessing.C
+    runTimePostProcessingFunctionObject.C
+    scene.C
+    surface.C
+    text.C
+)
+
+set(OPENFOAM_LIBRARIES
+    OpenFOAM
+    triSurface
+    finiteVolume
+)
+
+add_library(
+    runTimePostProcessing
+    SHARED
+    ${SOURCE_FILES}
+)
+
+target_link_libraries(
+    runTimePostProcessing
+    ${VTK_LIBRARIES}
+    ${OPENFOAM_LIBRARIES}
+)
+
+
+#-----------------------------------------------------------------------------
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/CMakeLists.txt b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/CMakeLists.txt
new file mode 100644
index 0000000000..903942b305
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(runTimePostProcessing)
+
+# Set policy for CMP0002 needed for cmake > 3
+cmake_policy(SET CMP0002 OLD)
+
+if (EXISTS "$ENV{VTK_DIR}")
+    message("Building with VTK from $ENV{VTK_DIR}")
+    find_package(VTK REQUIRED HINTS $ENV{VTK_DIR})
+    include(${VTK_USE_FILE})
+elseif (EXISTS "$ENV{ParaView_DIR}")
+    message("Building with Paraview from $ENV{ParaView_DIR}")
+    find_package(ParaView REQUIRED)
+    include(${VTK_USE_FILE})
+    set(
+        VTK_VERSION
+        "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}"
+    )
+else ()
+    message (FATAL_ERROR "VTK not found using VTK_DIR or ParaView_DIR")
+endif ()
+
+include(CMakeLists-Common.txt)
+
+
+#-----------------------------------------------------------------------------
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/IOrunTimePostProcessing.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/IOrunTimePostProcessing.H
new file mode 100644
index 0000000000..dd39c24c33
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/IOrunTimePostProcessing.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOrunTimePostProcessing
+
+Description
+    Instance of the generic IOOutputFilter for runTimePostProcessing.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOrunTimePostProcessing_H
+#define IOrunTimePostProcessing_H
+
+#include "runTimePostProcessing.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<runTimePostProcessing> IOrunTimePostProcessing;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
new file mode 100644
index 0000000000..ed48eb60c0
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -0,0 +1,505 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "fieldVisualisationBase.H"
+#include "runTimePostProcessing.H"
+
+// VTK includes
+#include "vtkArrowSource.h"
+#include "vtkColorTransferFunction.h"
+#include "vtkFloatArray.h"
+#include "vtkGlyph3D.h"
+#include "vtkLookupTable.h"
+#include "vtkPointData.h"
+#include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkRenderer.h"
+#include "vtkScalarBarActor.h"
+#include "vtkSmartPointer.h"
+#include "vtkSphereSource.h"
+#include "vtkTextActor.h"
+#include "vtkTextProperty.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<fieldVisualisationBase::colourByType, 2>::names[] =
+    {
+        "colour",
+        "field"
+    };
+
+    template<>
+    const char* NamedEnum<fieldVisualisationBase::colourMapType, 4>::names[] =
+    {
+        "rainbow",
+        "blueWhiteRed",
+        "fire",
+        "greyscale"
+    };
+}
+
+const Foam::NamedEnum<Foam::fieldVisualisationBase::colourByType, 2>
+    Foam::fieldVisualisationBase::colourByTypeNames;
+
+const Foam::NamedEnum<Foam::fieldVisualisationBase::colourMapType, 4>
+    Foam::fieldVisualisationBase::colourMapTypeNames;
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::fieldVisualisationBase::setColourMap(vtkLookupTable* lut) const
+{
+    label nColours = 256;
+
+    lut->SetNumberOfColors(nColours);
+
+    vtkSmartPointer<vtkColorTransferFunction> ctf =
+        vtkSmartPointer<vtkColorTransferFunction>::New();
+
+    switch (colourMap_)
+    {
+        case cmRainbow:
+        {
+            ctf->SetColorSpaceToHSV();
+            ctf->AddRGBPoint(0, 0, 0, 1);
+            ctf->AddRGBPoint(0.5, 0, 1, 0);
+            ctf->AddRGBPoint(1, 1, 0, 0);
+            break;
+        }
+        case cmBlueWhiteRed:
+        {
+            // Values taken from ParaView settings
+            ctf->SetColorSpaceToDiverging();
+            ctf->AddRGBPoint(0.0, 0.231373, 0.298039, 0.752941);
+            ctf->AddRGBPoint(0.5, 0.865003, 0.865003, 0.865003);
+            ctf->AddRGBPoint(1.0, 0.705882, 0.0156863, 0.14902);
+            break;
+        }
+        case cmFire:
+        {
+            // Values taken from ParaView settings
+            ctf->SetColorSpaceToRGB();
+            ctf->AddRGBPoint(0, 0, 0, 0);
+            ctf->AddRGBPoint(0.4, 0.901961, 0, 0);
+            ctf->AddRGBPoint(0.8, 0.901961, 0.901961, 0);
+            ctf->AddRGBPoint(1, 1, 1, 1);
+            break;
+        }
+        case cmGreyscale:
+        {
+            ctf->SetColorSpaceToRGB();
+            ctf->AddRGBPoint(0, 0, 0, 0);
+            ctf->AddRGBPoint(1, 1, 1, 1);
+            break;
+        }
+    }
+
+
+    for (label i = 0; i < nColours; i++)
+    {
+        double* c = ctf->GetColor(scalar(i)/scalar(nColours));
+        lut->SetTableValue(i, c[0], c[1], c[2], 1.0);
+    }
+}
+
+
+void Foam::fieldVisualisationBase::addScalarBar
+(
+    const scalar position,
+    vtkRenderer* renderer,
+    vtkLookupTable* lut
+) const
+{
+    // add scalar bar legend
+    if (!scalarBar_.visible_)
+    {
+        return;
+    }
+
+    vtkSmartPointer<vtkScalarBarActor> sbar =
+        vtkSmartPointer<vtkScalarBarActor>::New();
+    sbar->SetLookupTable(lut);
+    sbar->SetNumberOfLabels(scalarBar_.numberOfLabels_);
+
+    const vector textColour = colours_["text"]->value(position);
+
+    // workaround to supply our own scalarbar title
+    vtkSmartPointer<vtkTextActor> titleActor =
+        vtkSmartPointer<vtkTextActor>::New();
+    sbar->SetTitle(" ");
+    titleActor->SetInput(scalarBar_.title_.c_str());
+    titleActor->GetTextProperty()->SetFontFamilyToArial();
+    titleActor->GetTextProperty()->SetFontSize(3*scalarBar_.fontSize_);
+    titleActor->GetTextProperty()->SetJustificationToCentered();
+    titleActor->GetTextProperty()->SetVerticalJustificationToBottom();
+    titleActor->GetTextProperty()->BoldOn();
+    titleActor->GetTextProperty()->ItalicOff();
+    titleActor->GetTextProperty()->SetColor
+    (
+        textColour[0],
+        textColour[1],
+        textColour[2]
+    );
+    titleActor->GetPositionCoordinate()->
+        SetCoordinateSystemToNormalizedViewport();
+
+/*
+    sbar->SetTitle(scalarBar_.title_.c_str());
+    sbar->GetTitleTextProperty()->SetColor
+    (
+        textColour[0],
+        textColour[1],
+        textColour[2]
+    );
+    sbar->GetTitleTextProperty()->SetFontSize(scalarBar_.fontSize_);
+    sbar->GetTitleTextProperty()->ShadowOff();
+    sbar->GetTitleTextProperty()->BoldOn();
+    sbar->GetTitleTextProperty()->ItalicOff();
+*/
+
+    sbar->GetLabelTextProperty()->SetColor
+    (
+        textColour[0],
+        textColour[1],
+        textColour[2]
+    );
+    sbar->GetLabelTextProperty()->SetFontSize(scalarBar_.fontSize_);
+    sbar->GetLabelTextProperty()->ShadowOff();
+    sbar->GetLabelTextProperty()->BoldOff();
+    sbar->GetLabelTextProperty()->ItalicOff();
+    sbar->SetLabelFormat(scalarBar_.labelFormat_.c_str());
+
+    sbar->GetPositionCoordinate()->SetCoordinateSystemToNormalizedViewport();
+    sbar->GetPositionCoordinate()->SetValue
+    (
+        scalarBar_.position_.first(),
+        scalarBar_.position_.second()
+    );
+    if (scalarBar_.vertical_)
+    {
+        sbar->SetOrientationToVertical();
+        sbar->SetWidth(0.1);
+        sbar->SetHeight(0.75);
+        sbar->SetTextPositionToSucceedScalarBar();
+    }
+    else
+    {
+        sbar->SetOrientationToHorizontal();
+
+        // adjustments since not using scalarbar title property
+        sbar->SetWidth(0.75);
+        sbar->SetHeight(0.07);
+        sbar->SetBarRatio(0.5);
+//        sbar->SetHeight(0.1);
+//        sbar->SetTitleRatio(0.01);
+        sbar->SetTextPositionToPrecedeScalarBar();
+    }
+
+    titleActor->GetPositionCoordinate()->SetValue
+    (
+        scalarBar_.position_.first() + 0.5*sbar->GetWidth(),
+        scalarBar_.position_.second() + sbar->GetHeight()
+    );
+
+//    sbar->DrawFrameOn();
+//    sbar->DrawBackgroundOn();
+//    sbar->UseOpacityOff();
+//    sbar->VisibilityOff();
+    sbar->VisibilityOn();
+
+    renderer->AddActor(sbar);
+    renderer->AddActor2D(titleActor);
+}
+
+
+void Foam::fieldVisualisationBase::setField
+(
+    const scalar position,
+    const word& colourFieldName,
+    vtkPolyDataMapper* mapper,
+    vtkRenderer* renderer
+) const
+{
+    mapper->InterpolateScalarsBeforeMappingOn();
+
+    switch (colourBy_)
+    {
+        case cbColour:
+        {
+            mapper->ScalarVisibilityOff();
+            break;
+        }
+        case cbField:
+        {
+            // create look-up table for colours
+            vtkSmartPointer<vtkLookupTable> lut =
+                vtkSmartPointer<vtkLookupTable>::New();
+            setColourMap(lut);
+            lut->SetVectorMode(vtkScalarsToColors::MAGNITUDE);
+
+            // configure the mapper
+            mapper->SelectColorArray(colourFieldName.c_str());
+            mapper->SetScalarRange(range_.first(), range_.second());
+            mapper->SetScalarModeToUsePointFieldData();
+
+            mapper->SetColorModeToMapScalars();
+            mapper->SetLookupTable(lut);
+            mapper->ScalarVisibilityOn();
+
+            // add the bar
+            addScalarBar(position, renderer, lut);
+            break;
+        }
+    }
+
+    mapper->Modified();
+}
+
+
+
+void Foam::fieldVisualisationBase::addGlyphs
+(
+    const scalar position,
+    const word& scaleFieldName,
+    const word& colourFieldName,
+    const scalar maxGlyphLength,
+    vtkPolyData* data,
+    vtkActor* actor,
+    vtkRenderer* renderer
+) const
+{
+    vtkSmartPointer<vtkGlyph3D> glyph = vtkSmartPointer<vtkGlyph3D>::New();
+    vtkSmartPointer<vtkPolyDataMapper> glyphMapper =
+        vtkSmartPointer<vtkPolyDataMapper>::New();
+    glyphMapper->SetInputConnection(glyph->GetOutputPort());
+
+    glyph->SetInputData(data);
+    glyph->ScalingOn();
+    bool ok = true;
+
+    label nComponents =
+        data->GetPointData()->GetArray(scaleFieldName.c_str())
+            ->GetNumberOfComponents();
+
+    if (nComponents == 1)
+    {
+        vtkSmartPointer<vtkSphereSource> sphere =
+            vtkSmartPointer<vtkSphereSource>::New();
+        sphere->SetCenter(0, 0, 0);
+        sphere->SetRadius(0.5);
+// setting higher resolution slows the rendering significantly
+//        sphere->SetPhiResolution(20);
+//        sphere->SetThetaResolution(20);
+
+        glyph->SetSourceConnection(sphere->GetOutputPort());
+
+        if (maxGlyphLength > 0)
+        {
+            double range[2];
+
+// can use values to find range
+//            vtkDataArray* values =
+//                data->GetPointData()->GetScalars(scaleFieldName.c_str());
+//            values->GetRange(range);
+
+            // set range accoding to user-supplied limits
+            range[0] = range_.first();
+            range[1] = range_.second();
+            glyph->ClampingOn();
+            glyph->SetRange(range);
+
+            // if range[0] != min(value), maxGlyphLength behaviour will not
+            // be correct...
+            glyph->SetScaleFactor(maxGlyphLength);
+        }
+        else
+        {
+            glyph->SetScaleFactor(1);
+        }
+        glyph->SetScaleModeToScaleByScalar();
+        glyph->OrientOff();
+        glyph->SetColorModeToColorByScalar();
+        glyph->SetInputArrayToProcess
+        (
+            0, // scalars
+            0,
+            0,
+            vtkDataObject::FIELD_ASSOCIATION_POINTS,
+            scaleFieldName.c_str()
+        );
+    }
+    else if (nComponents == 3)
+    {
+        vtkSmartPointer<vtkArrowSource> arrow =
+            vtkSmartPointer<vtkArrowSource>::New();
+        arrow->SetTipResolution(10);
+        arrow->SetTipRadius(0.1);
+        arrow->SetTipLength(0.35);
+        arrow->SetShaftResolution(10);
+        arrow->SetShaftRadius(0.03);
+
+        glyph->SetSourceConnection(arrow->GetOutputPort());
+
+        if (maxGlyphLength > 0)
+        {
+            vtkDataArray* values =
+                data->GetPointData()->GetVectors(scaleFieldName.c_str());
+            double range[6];
+            values->GetRange(range);
+
+/*
+            // attempt to set range for vectors...
+            scalar x0 = sqrt(sqr(range_.first())/3.0);
+            scalar x1 = sqrt(sqr(range_.second())/3.0);
+            range[0] = x0;
+            range[1] = x0;
+            range[2] = x0;
+            range[3] = x1;
+            range[4] = x1;
+            range[5] = x1;
+*/
+            glyph->ClampingOn();
+            glyph->SetRange(range);
+            glyph->SetScaleFactor(maxGlyphLength);
+        }
+        else
+        {
+            glyph->SetScaleFactor(1);
+        }
+        glyph->SetScaleModeToScaleByVector();
+        glyph->OrientOn();
+        glyph->SetVectorModeToUseVector();
+        glyph->SetColorModeToColorByVector();
+        glyph->SetInputArrayToProcess
+        (
+            1, // vectors
+            0,
+            0,
+            vtkDataObject::FIELD_ASSOCIATION_POINTS,
+            scaleFieldName.c_str()
+        );
+    }
+    else
+    {
+        WarningInFunction
+            << "Glyphs can only be added to " << pTraits<scalar>::typeName
+            << " and " << pTraits<vector>::typeName << " fields. "
+            << " Field " << scaleFieldName << " has " << nComponents
+            << " components" << endl;
+
+        ok = false;
+    }
+
+    if (ok)
+    {
+        glyph->Update();
+
+        setField(position, colourFieldName, glyphMapper, renderer);
+
+        glyphMapper->Update();
+
+        actor->SetMapper(glyphMapper);
+
+        renderer->AddActor(actor);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fieldVisualisationBase::fieldVisualisationBase
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    parent_(parent),
+    colours_(colours),
+    fieldName_(dict.lookup("fieldName")),
+    colourBy_(cbColour),
+    colourMap_(cmRainbow),
+    range_()
+{
+    colourBy_ = colourByTypeNames.read(dict.lookup("colourBy"));
+
+    switch (colourBy_)
+    {
+        case cbColour:
+        {
+            break;
+        }
+        case cbField:
+        {
+            dict.lookup("range") >> range_;
+            break;
+        }
+    }
+
+    if (dict.found("colourMap"))
+    {
+        colourMap_ = colourMapTypeNames.read(dict.lookup("colourMap"));
+    }
+
+    const dictionary& sbarDict = dict.subDict("scalarBar");
+    sbarDict.lookup("visible") >> scalarBar_.visible_;
+    if (scalarBar_.visible_)
+    {
+        sbarDict.lookup("vertical") >> scalarBar_.vertical_;
+        sbarDict.lookup("position") >> scalarBar_.position_;
+        sbarDict.lookup("title") >> scalarBar_.title_;
+        sbarDict.lookup("fontSize") >> scalarBar_.fontSize_;
+        sbarDict.lookup("labelFormat") >> scalarBar_.labelFormat_;
+        sbarDict.lookup("numberOfLabels") >> scalarBar_.numberOfLabels_;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fieldVisualisationBase::~fieldVisualisationBase()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+const Foam::HashPtrTable<Foam::DataEntry<Foam::vector>, Foam::word>&
+Foam::fieldVisualisationBase::colours() const
+{
+    return colours_;
+}
+
+
+const Foam::word& Foam::fieldVisualisationBase::fieldName() const
+{
+    return fieldName_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
new file mode 100644
index 0000000000..e365ddf597
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.H
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fieldVisualisationBase
+
+Description
+
+SourceFiles
+    fieldVisualisationBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fieldVisualisationBase_H
+#define fieldVisualisationBase_H
+
+#include "dictionary.H"
+#include "Tuple2.H"
+#include "NamedEnum.H"
+#include "vector.H"
+#include "HashPtrTable.H"
+#include "DataEntry.H"
+
+#include "vtkSmartPointer.h"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkActor;
+class vtkLookupTable;
+class vtkPolyData;
+class vtkPolyDataMapper;
+class vtkRenderer;
+
+
+class vtkMapper;
+
+namespace Foam
+{
+
+class runTimePostProcessing;
+
+/*---------------------------------------------------------------------------*\
+                   Class fieldVisualisationBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class fieldVisualisationBase
+{
+public:
+
+    // Public enumerations
+
+        enum colourByType
+        {
+            cbColour,
+            cbField
+        };
+
+        static const NamedEnum<colourByType, 2> colourByTypeNames;
+
+        enum colourMapType
+        {
+            cmRainbow,
+            cmBlueWhiteRed,
+            cmFire,
+            cmGreyscale
+        };
+
+        static const NamedEnum<colourMapType, 4> colourMapTypeNames;
+
+
+private:
+
+    // Private data
+
+        //- Reference to the parent function object
+        const runTimePostProcessing& parent_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        fieldVisualisationBase(const fieldVisualisationBase&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const fieldVisualisationBase&);
+
+
+protected:
+
+    // Protected data
+
+        struct scalarBar
+        {
+            bool visible_;
+            bool vertical_;
+            Tuple2<scalar, scalar> position_;
+            string title_;
+            label fontSize_;
+            string labelFormat_;
+            label numberOfLabels_;
+        };
+
+        //- Colours
+        const HashPtrTable<DataEntry<vector>, word>& colours_;
+
+        //- Field name
+        word fieldName_;
+
+        //- Colour by type
+        colourByType colourBy_;
+
+        //- Colour map type
+        colourMapType colourMap_;
+
+        //- Range of values
+        Tuple2<scalar, scalar> range_;
+
+        //- Scalar bar
+        scalarBar scalarBar_;
+
+
+    // Protected Member Functions
+
+        //- Set the colour map
+        void setColourMap(vtkLookupTable* lut) const;
+
+        //- Add scalar bar to renderer
+        void addScalarBar
+        (
+            const scalar position,
+            vtkRenderer* renderer,
+            vtkLookupTable* lut
+        ) const;
+
+        //- Set field/configure mapper, add scalar bar
+        void setField
+        (
+            const scalar position,
+            const word& colourFieldName,
+            vtkPolyDataMapper* mapper,
+            vtkRenderer* renderer
+        ) const;
+
+        //- Add glyphs
+        void addGlyphs
+        (
+            const scalar position,
+            const word& scaleFieldName,
+            const word& colourFieldName,
+            const scalar maxGlyphLength,
+            vtkPolyData* data,
+            vtkActor* actor,
+            vtkRenderer* renderer
+        ) const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary
+        fieldVisualisationBase
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    //- Destructor
+    virtual ~fieldVisualisationBase();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the colours
+            const HashPtrTable<DataEntry<vector>, word>& colours() const;
+
+            //- Return the field name
+            const word& fieldName() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
new file mode 100644
index 0000000000..8c1f4e8535
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "functionObjectCloud.H"
+#include "runTimePostProcessing.H"
+#include "addToRunTimeSelectionTable.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPolyDataReader.h"
+#include "vtkProperty.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(functionObjectCloud, 0);
+    addToRunTimeSelectionTable(pointData, functionObjectCloud, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjectCloud::functionObjectCloud
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    pointData(parent, dict, colours),
+    fieldVisualisationBase(parent, dict, colours),
+    cloudName_(dict.lookup("cloudName")),
+    functionObject_(dict.lookup("functionObject")),
+    colourFieldName_(dict.lookup("colourFieldName")),
+    actor_()
+{
+    actor_ = vtkSmartPointer<vtkActor>::New();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjectCloud::~functionObjectCloud()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::functionObjectCloud::addGeometryToScene
+(
+    const scalar position,
+    vtkRenderer* renderer
+)
+{
+    if (!visible_)
+    {
+        return;
+    }
+
+    const dictionary& cloudDict =
+        geometryBase::parent_.obr().lookupObject<IOdictionary>
+        (
+            cloudName_ + "OutputProperties"
+        );
+
+    fileName fName;
+    if (cloudDict.found("cloudFunctionObject"))
+    {
+        const dictionary& foDict = cloudDict.subDict("cloudFunctionObject");
+        if (foDict.found(functionObject_))
+        {
+            foDict.subDict(functionObject_).readIfPresent("file", fName);
+        }
+    }
+
+    if (fName.empty())
+    {
+        WarningInFunction
+            << "Unable to find function object " << functionObject_
+            << " output for field " << fieldName_
+            << ". Line will not be processed"
+            << endl;
+        return;
+    }
+
+    if (fName.ext() == "vtk")
+    {
+        vtkSmartPointer<vtkPolyDataReader> points =
+            vtkSmartPointer<vtkPolyDataReader>::New();
+        points->SetFileName(fName.c_str());
+        points->Update();
+
+        vtkSmartPointer<vtkPolyDataMapper> mapper =
+            vtkSmartPointer<vtkPolyDataMapper>::New();
+
+        actor_->SetMapper(mapper);
+
+        addGlyphs
+        (
+            position,
+            fieldName_,
+            colourFieldName_,
+            maxGlyphLength_,
+            points->GetOutput(),
+            actor_,
+            renderer
+        );
+
+        renderer->AddActor(actor_);
+    }
+}
+
+
+void Foam::functionObjectCloud::updateActors(const scalar position)
+{
+    actor_->GetProperty()->SetOpacity(opacity(position));
+
+    vector pc = pointColour_->value(position);
+    actor_->GetProperty()->SetColor(pc[0], pc[1], pc[2]);
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H
new file mode 100644
index 0000000000..553bf96f3a
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::functionObjectCloud
+
+Description
+
+SourceFiles
+    functionObjectCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjectCloud_H
+#define functionObjectCloud_H
+
+#include "pointData.H"
+#include "fieldVisualisationBase.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class functionObjectCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class functionObjectCloud
+:
+    public pointData,
+    public fieldVisualisationBase
+{
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        functionObjectCloud(const functionObjectCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionObjectCloud&);
+
+
+protected:
+
+    // Protected data
+
+        //- Name of cloud
+        word cloudName_;
+
+        //- Name of cloud function object result to render
+        word functionObject_;
+
+        //- Name of field to colour by
+        word colourFieldName_;
+
+        //- Actor
+        vtkSmartPointer<vtkActor> actor_;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("functionObjectCloud");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        functionObjectCloud
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    //- Destructor
+    virtual ~functionObjectCloud();
+
+
+    // Member Functions
+
+        //- Add tube(s) to scene
+        virtual void addGeometryToScene
+        (
+            const scalar position,
+            vtkRenderer* renderer
+        );
+
+        //- Update actors
+        virtual void updateActors(const scalar position);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
new file mode 100644
index 0000000000..d950997598
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectLine.C
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "functionObjectLine.H"
+#include "runTimePostProcessing.H"
+#include "addToRunTimeSelectionTable.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPolyDataReader.h"
+#include "vtkProperty.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(functionObjectLine, 0);
+    addToRunTimeSelectionTable(pathline, functionObjectLine, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjectLine::functionObjectLine
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    pathline(parent, dict, colours),
+    fieldVisualisationBase(parent, dict, colours),
+    functionObject_(dict.lookup("functionObject")),
+    actor_()
+{
+    actor_ = vtkSmartPointer<vtkActor>::New();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjectLine::~functionObjectLine()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::functionObjectLine::addGeometryToScene
+(
+    const scalar position,
+    vtkRenderer* renderer
+)
+{
+    if (!visible_)
+    {
+        return;
+    }
+
+    const dictionary dict =
+        geometryBase::parent_.getObjectProperty
+        (
+            functionObject_,
+            fieldName_,
+            dictionary::null
+        );
+
+    fileName fName;
+    if (!dict.readIfPresent("file", fName))
+    {
+        WarningInFunction
+            << "Unable to find function object " << functionObject_
+            << " output for field " << fieldName_
+            << ". Line will not be processed"
+            << endl;
+        return;
+    }
+
+    if (fName.ext() == "vtk")
+    {
+        vtkSmartPointer<vtkPolyDataReader> lines =
+            vtkSmartPointer<vtkPolyDataReader>::New();
+        lines->SetFileName(fName.c_str());
+        lines->Update();
+
+        vtkSmartPointer<vtkPolyDataMapper> mapper =
+            vtkSmartPointer<vtkPolyDataMapper>::New();
+        setField(position, fieldName_, mapper, renderer);
+
+        actor_->SetMapper(mapper);
+
+        addLines(position, actor_, lines->GetOutput());
+
+        renderer->AddActor(actor_);
+    }
+}
+
+
+void Foam::functionObjectLine::updateActors(const scalar position)
+{
+    actor_->GetProperty()->SetLineWidth(2);
+    actor_->GetProperty()->SetOpacity(opacity(position));
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H
new file mode 100644
index 0000000000..9224d7246a
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectLine.H
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::functionObjectLine
+
+Description
+
+SourceFiles
+    functionObjectLine.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjectLine_H
+#define functionObjectLine_H
+
+#include "pathline.H"
+#include "fieldVisualisationBase.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class functionObjectLine Declaration
+\*---------------------------------------------------------------------------*/
+
+class functionObjectLine
+:
+    public pathline,
+    public fieldVisualisationBase
+{
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        functionObjectLine(const functionObjectLine&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionObjectLine&);
+
+
+protected:
+
+    // Protected data
+
+        //- Name of function object result to render
+        word functionObject_;
+
+        //- Actor
+        vtkSmartPointer<vtkActor> actor_;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("line");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        functionObjectLine
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    //- Destructor
+    virtual ~functionObjectLine();
+
+
+    // Member Functions
+
+        //- Add tube(s) to scene
+        virtual void addGeometryToScene
+        (
+            const scalar position,
+            vtkRenderer* renderer
+        );
+
+        //- Update actors
+        virtual void updateActors(const scalar position);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
new file mode 100644
index 0000000000..e7c6c69176
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "functionObjectSurface.H"
+#include "runTimePostProcessing.H"
+#include "addToRunTimeSelectionTable.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPolyDataReader.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(functionObjectSurface, 0);
+    addToRunTimeSelectionTable(surface, functionObjectSurface, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjectSurface::functionObjectSurface
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    geometrySurface(parent, dict, colours, List<fileName>()),
+    fieldVisualisationBase(parent, dict, colours),
+    functionObject_("")
+{
+    if (visible_)
+    {
+        dict.lookup("functionObject") >> functionObject_;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjectSurface::~functionObjectSurface()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::functionObjectSurface::addGeometryToScene
+(
+    const scalar position,
+    vtkRenderer* renderer
+)
+{
+    if (!visible_)
+    {
+        return;
+    }
+
+    const dictionary dict =
+        geometryBase::parent_.getObjectProperty
+        (
+            functionObject_,
+            fieldName_,
+            dictionary::null
+        );
+
+    fileName fName;
+    if (!dict.readIfPresent("file", fName))
+    {
+        WarningInFunction
+            << "Unable to find function object " << functionObject_
+            << " output for field " << fieldName_
+            << ". Surface will not be processed"
+            << endl;
+        return;
+    }
+
+
+    if (representation_ == rtGlyph)
+    {
+        vtkSmartPointer<vtkPolyDataReader> surf =
+            vtkSmartPointer<vtkPolyDataReader>::New();
+        surf->SetFileName(fName.c_str());
+        surf->Update();
+
+        addGlyphs
+        (
+            position,
+            fieldName_,
+            fieldName_,
+            maxGlyphLength_,
+            surf->GetOutput(),
+            surfaceActor_,
+            renderer
+        );
+    }
+    else
+    {
+        if ((colourBy_ == cbField) && (fName.ext() == "vtk"))
+        {
+            vtkSmartPointer<vtkPolyDataReader> surf =
+                vtkSmartPointer<vtkPolyDataReader>::New();
+            surf->SetFileName(fName.c_str());
+            surf->Update();
+
+            addFeatureEdges(renderer, surf->GetOutput());
+
+            vtkSmartPointer<vtkPolyDataMapper> mapper =
+                vtkSmartPointer<vtkPolyDataMapper>::New();
+            mapper->SetInputConnection(surf->GetOutputPort());
+
+            setField(position, fieldName_, mapper, renderer);
+
+            surfaceActor_->SetMapper(mapper);
+
+            setRepresentation(surfaceActor_);
+
+            renderer->AddActor(surfaceActor_);
+        }
+        else
+        {
+            geometrySurface::addGeometryToScene(position, renderer);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H
new file mode 100644
index 0000000000..32f4a7572c
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/functionObjectSurface.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::functionObjectSurface
+
+Description
+
+SourceFiles
+    functionObjectSurface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjectSurface_H
+#define functionObjectSurface_H
+
+#include "geometrySurface.H"
+#include "fieldVisualisationBase.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class functionObjectSurface Declaration
+\*---------------------------------------------------------------------------*/
+
+class functionObjectSurface
+:
+    public geometrySurface,
+    public fieldVisualisationBase
+{
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        functionObjectSurface(const functionObjectSurface&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const functionObjectSurface&);
+
+
+protected:
+
+    // Protected data
+
+        //- Name of function object result to render
+        word functionObject_;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("functionObject");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        functionObjectSurface
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    //- Destructor
+    virtual ~functionObjectSurface();
+
+
+    // Member Functions
+
+        //- Add surface(s) to scene
+        virtual void addGeometryToScene
+        (
+            const scalar position,
+            vtkRenderer* renderer
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.C
new file mode 100644
index 0000000000..a40bd6b9fe
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.C
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "geometryBase.H"
+#include "runTimePostProcessing.H"
+#include "Constant.H"
+
+#include "vtkActor.h"
+#include "vtkProperty.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<geometryBase::renderModeType, 3>::names[] =
+    {
+        "flat",
+        "gouraud",
+        "phong"
+    };
+}
+
+const Foam::NamedEnum<Foam::geometryBase::renderModeType, 3>
+    Foam::geometryBase::renderModeTypeNames;
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::geometryBase::initialiseActor(vtkActor* actor) const
+{
+    actor->GetProperty()->SetSpecular(0);
+    actor->GetProperty()->SetSpecularPower(20);
+
+    switch (renderMode_)
+    {
+        case rmFlat:
+        {
+            actor->GetProperty()->SetInterpolationToFlat();
+            break;
+        }
+        case rmGouraud:
+        {
+            actor->GetProperty()->SetInterpolationToGouraud();
+            break;
+        }
+        case rmPhong:
+        {
+            actor->GetProperty()->SetInterpolationToPhong();
+            break;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::geometryBase::geometryBase
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    parent_(parent),
+    name_(dict.dictName()),
+    visible_(readBool(dict.lookup("visible"))),
+    renderMode_(rmGouraud),
+    opacity_(NULL),
+    colours_(colours)
+{
+    if (dict.found("renderMode"))
+    {
+        renderMode_ = renderModeTypeNames.read(dict.lookup("renderMode"));
+    }
+
+    if (dict.found("opacity"))
+    {
+        opacity_.reset(DataEntry<scalar>::New("opacity", dict).ptr());
+    }
+    else
+    {
+        opacity_.reset(new Constant<scalar>("opacity", 1.0));
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::geometryBase::~geometryBase()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+const Foam::runTimePostProcessing& Foam::geometryBase::parent() const
+{
+    return parent_;
+}
+
+
+const Foam::word& Foam::geometryBase::name() const
+{
+    return name_;
+}
+
+
+bool Foam::geometryBase::visible() const
+{
+    return visible_;
+}
+
+
+Foam::scalar Foam::geometryBase::opacity(const scalar position) const
+{
+    return opacity_->value(position);
+}
+
+
+const Foam::HashPtrTable<Foam::DataEntry<Foam::vector>, Foam::word>&
+Foam::geometryBase::colours() const
+{
+    return colours_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.H
new file mode 100644
index 0000000000..ee6afe332a
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometryBase.H
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::geometryBase
+
+Description
+
+SourceFiles
+    geometryBase.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef geometryBase_H
+#define geometryBase_H
+
+#include "dictionary.H"
+#include "vector.H"
+#include "DataEntry.H"
+#include "HashPtrTable.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkRenderer;
+class vtkActor;
+
+namespace Foam
+{
+
+class runTimePostProcessing;
+
+/*---------------------------------------------------------------------------*\
+                        Class geometryBase Declaration
+\*---------------------------------------------------------------------------*/
+
+class geometryBase
+{
+
+public:
+
+    // Public enumerations
+
+        enum renderModeType
+        {
+            rmFlat,
+            rmGouraud,
+            rmPhong
+        };
+
+        static const NamedEnum<renderModeType, 3> renderModeTypeNames;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        geometryBase(const geometryBase&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const geometryBase&);
+
+
+protected:
+
+    // Protected data
+
+        //- Reference to the parent function object
+        const runTimePostProcessing& parent_;
+
+        //- Name
+        word name_;
+
+        //- Visible flag
+        bool visible_;
+
+        //- Render mode
+        renderModeType renderMode_;
+
+        //- Opacity
+        autoPtr<DataEntry<scalar> > opacity_;
+
+        //- Reference to the colours
+        const HashPtrTable<DataEntry<vector>, word>& colours_;
+
+
+    // Protected functions
+
+        //- Initialse actor
+        void initialiseActor(vtkActor* actor) const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary
+        geometryBase
+        (
+            const runTimePostProcessing& parent_,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    //- Destructor
+    virtual ~geometryBase();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the reference to the parent function object
+            const runTimePostProcessing& parent() const;
+
+            //- Return the name
+            const word& name() const;
+
+            //- Return the visible flag
+            bool visible() const;
+
+            //- Return the opacity
+            scalar opacity(const scalar position) const;
+
+            //- Return reference to the colours
+            const HashPtrTable<DataEntry<vector>, word>& colours() const;
+
+
+        //- Add geometry to scene
+        virtual void addGeometryToScene
+        (
+            const scalar position,
+            vtkRenderer* renderer
+        ) = 0;
+
+        //- Update the actors
+        virtual void updateActors(const scalar position) = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometrySurface.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
new file mode 100644
index 0000000000..535cdddc99
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometrySurface.C
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "geometrySurface.H"
+#include "stringOps.H"
+#include "triSurface.H"
+#include "runTimePostProcessing.H"
+#include "addToRunTimeSelectionTable.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkDoubleArray.h"
+#include "vtkPointData.h"
+#include "vtkPoints.h"
+#include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+#include "vtkTriangle.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(geometrySurface, 0);
+    addToRunTimeSelectionTable(surface, geometrySurface, dictionary);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::geometrySurface::addGeometryToScene
+(
+    const scalar position,
+    vtkRenderer* renderer,
+    const fileName& fName
+) const
+{
+    if (representation_ == rtGlyph)
+    {
+        FatalErrorInFunction
+            << "Glyph representation not available for " << typeName
+            << "object" << exit(FatalError);
+    }
+
+    triSurface surf(fName);
+
+    const Field<point>& surfPoints = surf.points();
+    const Field<vector>& surfFaceNormals = surf.faceNormals();
+
+    vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
+    vtkSmartPointer<vtkCellArray> triangles =
+        vtkSmartPointer<vtkCellArray>::New();
+    vtkSmartPointer<vtkDoubleArray> faceNormals =
+        vtkSmartPointer<vtkDoubleArray>::New();
+
+    faceNormals->SetNumberOfComponents(3);
+
+    forAll(surfPoints, i)
+    {
+        const point& pt = surfPoints[i];
+        points->InsertNextPoint(pt.x(), pt.y(), pt.z());
+    }
+
+    forAll(surf, i)
+    {
+        const Foam::face& f = surf[i];
+
+        vtkSmartPointer<vtkTriangle> triangle =
+            vtkSmartPointer<vtkTriangle>::New();
+        triangle->GetPointIds()->SetId(0, f[0]);
+        triangle->GetPointIds()->SetId(1, f[1]);
+        triangle->GetPointIds()->SetId(2, f[2]);
+        triangles->InsertNextCell(triangle);
+
+        double n[3];
+        n[0] = surfFaceNormals[i].x();
+        n[1] = surfFaceNormals[i].y();
+        n[2] = surfFaceNormals[i].z();
+
+        faceNormals->InsertNextTuple(n);
+    }
+
+    surf.clearOut();
+
+    vtkSmartPointer<vtkPolyData> polyData =
+        vtkSmartPointer<vtkPolyData>::New();
+    polyData->SetPoints(points);
+    polyData->SetPolys(triangles);
+    polyData->GetCellData()->SetNormals(faceNormals);
+
+    vtkSmartPointer<vtkPolyDataMapper> mapper =
+        vtkSmartPointer<vtkPolyDataMapper>::New();
+    mapper->ScalarVisibilityOff();
+    mapper->SetInputData(polyData);
+
+    addFeatureEdges(renderer, polyData);
+
+    surfaceActor_->SetMapper(mapper);
+
+    setRepresentation(surfaceActor_);
+
+    renderer->AddActor(surfaceActor_);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::geometrySurface::geometrySurface
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    surface(parent, dict, colours),
+    fileNames_(dict.lookup("files"))
+{}
+
+
+Foam::geometrySurface::geometrySurface
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours,
+    const List<fileName>& fileNames
+)
+:
+    surface(parent, dict, colours),
+    fileNames_(fileNames)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::geometrySurface::~geometrySurface()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::geometrySurface::addGeometryToScene
+(
+    const scalar position,
+    vtkRenderer* renderer
+)
+{
+    if (!visible_)
+    {
+        return;
+    }
+
+    forAll(fileNames_, i)
+    {
+        fileName fName = fileNames_[i].expand();
+        addGeometryToScene(position, renderer, fName);
+    }
+}
+
+
+void Foam::geometrySurface::updateActors(const scalar position)
+{
+    if (!visible_)
+    {
+        return;
+    }
+
+    surface::updateActors(position);
+
+    surfaceActor_->GetProperty()->SetOpacity(opacity(position));
+
+    vector sc = surfaceColour_->value(position);
+    surfaceActor_->GetProperty()->SetColor(sc[0], sc[1], sc[2]);
+
+    vector ec = edgeColour_->value(position);
+    surfaceActor_->GetProperty()->SetEdgeColor(ec[0], ec[1], ec[2]);
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometrySurface.H
similarity index 53%
rename from src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H
rename to src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometrySurface.H
index d8cacd876b..5eec3ee8d6 100644
--- a/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/geometrySurface.H
@@ -22,74 +22,106 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::SpecificCompressibleTurbulenceModel
+    Foam::geometrySurface
 
 Description
-    Templated abstract base class for specific (RAS/LES) compressible
-    turbulence models
 
 SourceFiles
-    SpecificCompressibleTurbulenceModel.C
+    geometrySurface.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef SpecificCompressibleTurbulenceModel_H
-#define SpecificCompressibleTurbulenceModel_H
+#ifndef geometrySurface_H
+#define geometrySurface_H
 
-#include "CompressibleTurbulenceModel.H"
+#include "surface.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+class vtkPolyData;
+
 namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-             Class SpecificCompressibleTurbulenceModel Declaration
+                        Class geometrySurface Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class BasicCompressibleTurbulenceModel>
-class SpecificCompressibleTurbulenceModel
+class geometrySurface
 :
-    public BasicCompressibleTurbulenceModel
+    public surface
 {
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        geometrySurface(const geometrySurface&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const geometrySurface&);
+
+
+protected:
+
+    // Protected data
+
+        //- File names
+        List<fileName> fileNames_;
+
+
+    // Protected Member Functions
+
+        //- Add surface (file) to scene
+        void addGeometryToScene
+        (
+            const scalar position,
+            vtkRenderer* renderer,
+            const fileName& fName
+        ) const;
+
 
 public:
 
-    typedef typename BasicCompressibleTurbulenceModel::transportModel
-        transportModel;
+    //- Run-time type information
+    TypeName("geometry");
+
 
     // Constructors
 
-        //- Construct from components
-        SpecificCompressibleTurbulenceModel
+        //- Construct from dictionary
+        geometrySurface
         (
-            const word& type,
-            const geometricOneField& alpha,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& alphaRhoPhi,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& propertiesName
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+        //- Construct from components
+        geometrySurface
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours,
+            const List<fileName>& fileNames
         );
 
 
     //- Destructor
-    virtual ~SpecificCompressibleTurbulenceModel()
-    {}
+    virtual ~geometrySurface();
 
 
-    // Selectors
+    // Member Functions
 
-        //- Return a reference to the selected RAS model
-        static autoPtr<SpecificCompressibleTurbulenceModel> New
+        //- Add surface(s) to scene
+        virtual void addGeometryToScene
         (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& transport,
-            const word& propertiesName = turbulenceModel::propertiesName
+            const scalar position,
+            vtkRenderer* renderer
         );
+
+        //- Update actors
+        virtual void updateActors(const scalar position);
 };
 
 
@@ -99,12 +131,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-#   include "SpecificCompressibleTurbulenceModel.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.C
new file mode 100644
index 0000000000..744c092cf8
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.C
@@ -0,0 +1,203 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "pathline.H"
+#include "runTimePostProcessing.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+#include "vtkTubeFilter.h"
+#include "vtkLookupTable.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<pathline::representationType, 4>::names[] =
+    {
+        "none",
+        "line",
+        "tube",
+        "vector"
+    };
+
+    defineTypeNameAndDebug(pathline, 0);
+    defineRunTimeSelectionTable(pathline, dictionary);
+}
+
+const Foam::NamedEnum<Foam::pathline::representationType, 4>
+    Foam::pathline::representationTypeNames;
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::pathline::addLines
+(
+    const label frameI,
+    vtkActor* actor,
+    vtkPolyData* data
+) const
+{
+    geometryBase::initialiseActor(actor);
+
+    vector colour = lineColour_->value(frameI);
+    actor->GetProperty()->SetColor(colour[0], colour[1], colour[2]);
+
+    vtkPolyDataMapper* mapper =
+            vtkPolyDataMapper::SafeDownCast(actor->GetMapper());
+
+    switch (representation_)
+    {
+        case rtNone:
+        {
+            actor->VisibilityOff();
+            break;
+        }
+        case rtLine:
+        {
+            mapper->SetInputData(data);
+            mapper->Update();
+            break;
+
+        }
+        case rtTube:
+        {
+            vtkSmartPointer<vtkTubeFilter> tubes =
+                vtkSmartPointer<vtkTubeFilter>::New();
+            tubes->SetInputData(data);
+            tubes->SetRadius(tubeRadius_);
+            tubes->SetNumberOfSides(20);
+            tubes->CappingOn();
+            tubes->Update();
+
+            mapper->SetInputConnection(tubes->GetOutputPort());
+            mapper->Update();
+
+            break;
+
+        }
+        case rtVector:
+        {
+            break;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pathline::pathline
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    geometryBase(parent, dict, colours),
+    representation_
+    (
+        representationTypeNames.read(dict.lookup("representation"))
+    ),
+    tubeRadius_(0.0),
+    lineColour_(NULL)
+{
+    if (dict.found("lineColour"))
+    {
+        lineColour_.reset(DataEntry<vector>::New("lineColour", dict).ptr());
+    }
+    else
+    {
+        lineColour_.reset(colours["line"]->clone().ptr());
+    }
+
+    switch (representation_)
+    {
+        case rtNone:
+        {
+            break;
+        }
+        case rtLine:
+        {
+            break;
+        }
+        case rtTube:
+        {
+            dict.lookup("tubeRadius") >> tubeRadius_;
+            break;
+        }
+        case rtVector:
+        {
+            break;
+        }
+    }
+
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::pathline> Foam::pathline::New
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours,
+    const word& pathlineType
+)
+{
+    if (debug)
+    {
+        Info<< "Selecting pathline " << pathlineType << endl;
+    }
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(pathlineType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown pathline type "
+            << pathlineType << nl << nl
+            << "Valid pathline types are:" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<pathline>(cstrIter()(parent, dict, colours));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::pathline::~pathline()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.H
new file mode 100644
index 0000000000..0813210117
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pathline.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pathline
+
+Description
+
+SourceFiles
+    pathline.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pathline_H
+#define pathline_H
+
+#include "geometryBase.H"
+#include "NamedEnum.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkActor;
+class vtkPolyData;
+class vtkPolyDataMapper;
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class pathline Declaration
+\*---------------------------------------------------------------------------*/
+
+class pathline
+:
+    public geometryBase
+{
+public:
+
+    // Public enumerations
+
+        enum representationType
+        {
+            rtNone,
+            rtLine,
+            rtTube,
+            rtVector
+        };
+
+        static const NamedEnum<representationType, 4> representationTypeNames;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        pathline(const pathline&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const pathline&);
+
+
+protected:
+
+    // Protected data
+
+        //- Representation type
+        representationType representation_;
+
+        //- Radius for the tube filter
+        scalar tubeRadius_;
+
+        //- Line colour
+        autoPtr<DataEntry<vector> > lineColour_;
+
+
+    // Protected Member Functions
+
+        //- Add the pathlines to the renderer
+        void addLines
+        (
+            const label frameI,
+            vtkActor* actor,
+            vtkPolyData* data
+        ) const;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("pathline");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            pathline,
+            dictionary,
+            (
+                const runTimePostProcessing& parent,
+                const dictionary& dict,
+                const HashPtrTable<DataEntry<vector>, word>& colours
+            ),
+            (parent, dict, colours)
+        );
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        pathline
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected RAS model
+        static autoPtr<pathline> New
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours,
+            const word& pathlineName
+        );
+
+
+    //- Destructor
+    virtual ~pathline();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.C
new file mode 100644
index 0000000000..cae1853e65
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "pointData.H"
+#include "runTimePostProcessing.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+#include "vtkTubeFilter.h"
+#include "vtkLookupTable.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<pointData::representationType, 2>::names[] =
+    {
+        "sphere",
+        "vector"
+    };
+
+    defineTypeNameAndDebug(pointData, 0);
+    defineRunTimeSelectionTable(pointData, dictionary);
+}
+
+const Foam::NamedEnum<Foam::pointData::representationType, 2>
+    Foam::pointData::representationTypeNames;
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::pointData::addPoints
+(
+    const label frameI,
+    vtkActor* actor,
+    vtkPolyDataMapper* mapper,
+    vtkPolyData* data
+) const
+{
+    geometryBase::initialiseActor(actor);
+
+    vector colour = pointColour_->value(frameI);
+    actor->GetProperty()->SetColor(colour[0], colour[1], colour[2]);
+
+    switch (representation_)
+    {
+        case rtSphere:
+        case rtVector:
+        {
+            break;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pointData::pointData
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    geometryBase(parent, dict, colours),
+    representation_
+    (
+        representationTypeNames.read(dict.lookup("representation"))
+    ),
+    maxGlyphLength_(readScalar(dict.lookup("maxGlyphLength"))),
+    pointColour_(NULL)
+{
+    if (dict.found("pointColour"))
+    {
+        pointColour_.reset(DataEntry<vector>::New("pointColour", dict).ptr());
+    }
+    else
+    {
+        pointColour_.reset(colours["point"]->clone().ptr());
+    }
+
+    switch (representation_)
+    {
+        case rtSphere:
+        {
+            break;
+        }
+        case rtVector:
+        {
+            break;
+        }
+    }
+
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::pointData> Foam::pointData::New
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours,
+    const word& pointDataType
+)
+{
+    if (debug)
+    {
+        Info<< "Selecting pointData " << pointDataType << endl;
+    }
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(pointDataType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown pointData type "
+            << pointDataType << nl << nl
+            << "Valid pointData types are:" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<pointData>(cstrIter()(parent, dict, colours));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::pointData::~pointData()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.H
new file mode 100644
index 0000000000..068ee78fc0
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/pointData.H
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pointData
+
+Description
+
+SourceFiles
+    pointData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pointData_H
+#define pointData_H
+
+#include "geometryBase.H"
+#include "NamedEnum.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkActor;
+class vtkPolyData;
+class vtkPolyDataMapper;
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class pointData Declaration
+\*---------------------------------------------------------------------------*/
+
+class pointData
+:
+    public geometryBase
+{
+public:
+
+    // Public enumerations
+
+        enum representationType
+        {
+            rtSphere,
+            rtVector
+        };
+
+        static const NamedEnum<representationType, 2> representationTypeNames;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        pointData(const pointData&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointData&);
+
+
+protected:
+
+    // Protected data
+
+        //- Representation type
+        representationType representation_;
+
+        //- Max glyph length
+        scalar maxGlyphLength_;
+
+        //- Point colour
+        autoPtr<DataEntry<vector> > pointColour_;
+
+
+    // Protected Member Functions
+
+        //- Add the point data to the renderer
+        void addPoints
+        (
+            const label frameI,
+            vtkActor* actor,
+            vtkPolyDataMapper* mapper,
+            vtkPolyData* data
+        ) const;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("pointData");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            pointData,
+            dictionary,
+            (
+                const runTimePostProcessing& parent,
+                const dictionary& dict,
+                const HashPtrTable<DataEntry<vector>, word>& colours
+            ),
+            (parent, dict, colours)
+        );
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        pointData
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected RAS model
+        static autoPtr<pointData> New
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours,
+            const word& pointDataName
+        );
+
+
+    //- Destructor
+    virtual ~pointData();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
new file mode 100644
index 0000000000..88857bf924
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.C
@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "runTimePostProcessing.H"
+#include "dictionary.H"
+#include "pointData.H"
+#include "pathline.H"
+#include "surface.H"
+#include "text.H"
+#include "Time.H"
+#include "sigFpe.H"
+
+// VTK includes
+#include "vtkPolyDataMapper.h"
+#include "vtkRenderer.h"
+#include "vtkRenderWindow.h"
+#include "vtkSmartPointer.h"
+
+#include "vtkLight.h"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(runTimePostProcessing, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::runTimePostProcessing::runTimePostProcessing
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectState(obr, name),
+    scene_(obr, name),
+    points_(),
+    lines_(),
+    surfaces_(),
+    text_(),
+    obr_(obr),
+    active_(true)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::runTimePostProcessing::~runTimePostProcessing()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::runTimePostProcessing::read(const dictionary& dict)
+{
+    Info<< type() << " " << name_ << ": reading post-processing data" << endl;
+
+    scene_.read(dict);
+
+    const dictionary& outputDict = dict.subDict("output");
+    outputDict.lookup("name") >> output_.name_;
+    outputDict.lookup("width") >> output_.width_;
+    outputDict.lookup("height") >> output_.height_;
+
+
+    readObjects(dict.subOrEmptyDict("points"), points_);
+    readObjects(dict.subOrEmptyDict("lines"), lines_);
+    readObjects(dict.subOrEmptyDict("surfaces"), surfaces_);
+
+
+    const dictionary& textDict = dict.subDict("text");
+    forAllConstIter(dictionary, textDict, iter)
+    {
+        if (!iter().isDict())
+        {
+            FatalIOErrorInFunction(textDict)
+                << "text must be specified in dictionary format"
+                << exit(FatalIOError);
+        }
+
+        text_.append(new text(*this, iter().dict(), scene_.colours()));
+    }
+}
+
+
+void Foam::runTimePostProcessing::execute()
+{
+    // Do nothing
+}
+
+
+void Foam::runTimePostProcessing::end()
+{
+    // Do nothing
+}
+
+
+void Foam::runTimePostProcessing::timeSet()
+{
+    // Do nothing
+}
+
+
+void Foam::runTimePostProcessing::write()
+{
+    if (!Pstream::master())
+    {
+        return;
+    }
+
+    Info<< type() << " " << name_ <<  " output:" << nl
+        << "    Constructing scene" << endl;
+
+    // Unset any floating point trapping (some low-level rendering functionality
+    // does not like it)
+    sigFpe::unset(false);
+
+    // Initialise render window
+    vtkSmartPointer<vtkRenderWindow> renderWindow =
+        vtkSmartPointer<vtkRenderWindow>::New();
+    renderWindow->OffScreenRenderingOn();
+    renderWindow->SetSize(output_.width_, output_.height_);
+    renderWindow->SetAAFrames(10);
+    renderWindow->SetAlphaBitPlanes(true);
+    renderWindow->SetMultiSamples(0);
+//    renderWindow->PolygonSmoothingOn();
+
+    vtkSmartPointer<vtkRenderer> renderer = vtkSmartPointer<vtkRenderer>::New();
+    scene_.initialise(renderer, output_.name_);
+
+    renderWindow->AddRenderer(renderer);
+
+    // Add the points
+    forAll(points_, i)
+    {
+        points_[i].addGeometryToScene(0, renderer);
+    }
+
+    // Add the lines
+    forAll(lines_, i)
+    {
+        lines_[i].addGeometryToScene(0, renderer);
+    }
+
+    // Add the surfaces
+    forAll(surfaces_, i)
+    {
+        surfaces_[i].addGeometryToScene(0, renderer);
+    }
+
+    while (scene_.loop(renderer))
+    {
+        scalar position = scene_.position();
+
+        // Add the text
+        forAll(text_, i)
+        {
+            text_[i].addGeometryToScene(position, renderer);
+        }
+
+        // Update the points
+        forAll(points_, i)
+        {
+            points_[i].updateActors(position);
+        }
+
+        // Update the lines
+        forAll(lines_, i)
+        {
+            lines_[i].updateActors(position);
+        }
+
+        // Update the surfaces
+        forAll(surfaces_, i)
+        {
+            surfaces_[i].updateActors(position);
+        }
+    }
+
+    // Reset any floating point trapping
+    sigFpe::set(false);
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.H
new file mode 100644
index 0000000000..d386aae369
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessing.H
@@ -0,0 +1,208 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::runTimePostProcessing
+
+Group
+    grpGraphicsFunctionObjects
+
+Description
+    Function object to generate images during run-time.
+
+    The functionality makes use of the VTK libraries (see http://www.vtk.org)
+    which provide a broad set of functionality for scene composition and
+    manipulation.
+
+    Images are generated using a combination of function object output, and
+    additional data e.gg triangulated surfaces and text.  Current capabilities
+    include support for:
+    - Camera
+    - Objects
+    - Points
+    - Lines
+    - Surfaces
+    - Scalar bars
+    - Annotations
+    - Selection of colour maps
+    Scene configuration is performed using standard OpenFOAM dictionaries, using
+    the main headings of: output=, camera, colours, points, lines,
+    surfaces and text.
+
+SourceFiles
+    runTimePostProcessing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef runTimePostProcessing_H
+#define runTimePostProcessing_H
+
+#include "functionObjectState.H"
+#include "objectRegistry.H"
+#include "mapPolyMesh.H"
+#include "PtrList.H"
+#include "scene.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkRenderer;
+class vtkRenderWindow;
+
+namespace Foam
+{
+
+class dictionary;
+class pointData;
+class pathline;
+class surface;
+class text;
+
+/*---------------------------------------------------------------------------*\
+                   Class runTimePostProcessing Declaration
+\*---------------------------------------------------------------------------*/
+
+class runTimePostProcessing
+:
+    public functionObjectState
+{
+private:
+
+    // Private data
+
+        // Output
+        struct outputType
+        {
+            word name_;
+            label width_;
+            label height_;
+        };
+
+        //- Output instance
+        outputType output_;
+
+        //- Scene manager
+        scene scene_;
+
+        //- List of points
+        PtrList<pointData> points_;
+
+        //- List of lines
+        PtrList<pathline> lines_;
+
+        //- List of surfaces
+        PtrList<surface> surfaces_;
+
+        //- List of text
+        PtrList<text> text_;
+
+
+        // Private Member Functions
+
+            //- Helper function to read scene objects
+            template<class Type>
+            void readObjects
+            (
+                const dictionary& dict,
+                PtrList<Type>& objects
+            ) const;
+
+
+protected:
+
+    // Protected data
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("runTimePostProcessing");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        runTimePostProcessing
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+    //- Desructor
+    virtual ~runTimePostProcessing();
+
+
+    // Member Functions
+
+        virtual const objectRegistry& obr() const
+        {
+            return obr_;
+        }
+
+        //- Read the field min/max data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "runTimePostProcessingTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.C
new file mode 100644
index 0000000000..abe87dfffd
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "runTimePostProcessingFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(runTimePostProcessingFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        runTimePostProcessingFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.H
new file mode 100644
index 0000000000..389447e8b5
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::runTimePostProcessingFunctionObject
+
+Description
+    FunctionObject wrapper around runTimePostProcessing to allow them to be
+    created via the functions entry within controlDict.
+
+SourceFiles
+    runTimePostProcessingFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef runTimePostProcessingFunctionObject_H
+#define runTimePostProcessingFunctionObject_H
+
+#include "runTimePostProcessing.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<runTimePostProcessing>
+        runTimePostProcessingFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingTemplates.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingTemplates.C
new file mode 100644
index 0000000000..47540015eb
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingTemplates.C
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::runTimePostProcessing::readObjects
+(
+    const dictionary& dict,
+    PtrList<Type>& objects
+) const
+{
+    objects.clear();
+    forAllConstIter(dictionary, dict, iter)
+    {
+        if (!iter().isDict())
+        {
+            FatalIOErrorInFunction(dict)
+                << dict.dictName()
+                << " objects must be specified in dictionary format"
+                << exit(FatalIOError);
+        }
+
+        const dictionary& objectDict(iter().dict());
+        word objectType = objectDict.lookup("type");
+
+        objects.append
+        (
+            Type::New(*this, iter().dict(), scene_.colours(), objectType)
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.C
new file mode 100644
index 0000000000..3ceace9695
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -0,0 +1,401 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "scene.H"
+#include "Constant.H"
+
+// VTK includes
+#include "vtkCamera.h"
+#include "vtkCubeSource.h"
+#include "vtkLightKit.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPNGWriter.h"
+#include "vtkRenderer.h"
+#include "vtkRendererCollection.h"
+#include "vtkRenderWindow.h"
+#include "vtkWindowToImageFilter.h"
+
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<scene::modeType, 2>::names[] =
+    {
+        "static",
+        "flightPath"
+    };
+}
+
+const Foam::NamedEnum<Foam::scene::modeType, 2> modeTypeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::scene::readCamera(const dictionary& dict)
+{
+    if (dict.readIfPresent("nFrameTotal", nFrameTotal_))
+    {
+        if (nFrameTotal_ < 1)
+        {
+            FatalIOErrorInFunction(dict)
+                << "nFrameTotal must be 1 or greater"
+                << exit(FatalIOError);
+        }
+    }
+
+    if (dict.readIfPresent("startPosition", position_))
+    {
+        if ((position_ < 0) || (position_ > 1))
+        {
+            FatalIOErrorInFunction(dict)
+                << "startPosition must be in the range 0-1"
+                << exit(FatalIOError);
+        }
+    }
+
+
+    dict.lookup("parallelProjection") >> parallelProjection_;
+
+    if (nFrameTotal_ > 1)
+    {
+        scalar endPosition = dict.lookupOrDefault<scalar>("endPosition", 1);
+        if ((endPosition < 0) || (endPosition > 1))
+        {
+            FatalIOErrorInFunction(dict)
+                << "endPosition must be in the range 0-1"
+                << exit(FatalIOError);
+        }
+        dPosition_ = (endPosition - position_)/scalar(nFrameTotal_ - 1);
+    }
+
+    mode_ = modeTypeNames_.read(dict.lookup("mode"));
+
+    word coeffsName = modeTypeNames_[mode_] + word("Coeffs");
+    const dictionary& coeffs = dict.subDict(coeffsName);
+
+    switch (mode_)
+    {
+        case mtStatic:
+        {
+            clipBox_ = boundBox(coeffs.lookup("clipBox"));
+            const vector lookDir(vector(coeffs.lookup("lookDir")));
+            cameraPosition_.reset(new Constant<point>("position", -lookDir));
+            const vector focalPoint(coeffs.lookup("focalPoint"));
+            cameraFocalPoint_.reset
+            (
+                new Constant<point>("focalPoint", focalPoint)
+            );
+            const vector up(coeffs.lookup("up"));
+            cameraUp_.reset(new Constant<point>("up", up));
+            break;
+        }
+        case mtFlightPath:
+        {
+            cameraPosition_.reset
+            (
+                DataEntry<vector>::New("position", coeffs).ptr()
+            );
+            cameraFocalPoint_.reset
+            (
+                DataEntry<point>::New("focalPoint", coeffs).ptr()
+            );
+            cameraUp_.reset(DataEntry<vector>::New("up", coeffs).ptr());
+            break;
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << modeTypeNames_[mode_]
+                << abort(FatalError);
+        }
+    }
+
+    if (dict.found("zoom"))
+    {
+        cameraZoom_.reset(DataEntry<scalar>::New("zoom", dict).ptr());
+    }
+    else
+    {
+        cameraZoom_.reset(new Constant<scalar>("zoom", 1.0));
+    }
+
+    if (dict.found("viewAngle"))
+    {
+        cameraViewAngle_.reset(DataEntry<scalar>::New("viewAngle", dict).ptr());
+    }
+    else
+    {
+        cameraViewAngle_.reset(new Constant<scalar>("viewAngle", 35.0));
+    }
+}
+
+
+void Foam::scene::readColours(const dictionary& dict)
+{
+    const wordList colours = dict.toc();
+    forAll(colours, i)
+    {
+        const word& c = colours[i];
+        colours_.insert(c, DataEntry<vector>::New(c, dict).ptr());
+    }
+}
+
+
+void Foam::scene::initialise(vtkRenderer* renderer, const word& outputName)
+{
+    currentFrameI_ = 0;
+
+    outputName_ = outputName;
+
+    // Set the background
+    const vector backgroundColour = colours_["background"]->value(position());
+    renderer->SetBackground
+    (
+        backgroundColour.x(),
+        backgroundColour.y(),
+        backgroundColour.z()
+    );
+
+    // Apply gradient background if "background2" defined
+    if (colours_.found("background2"))
+    {
+        renderer->GradientBackgroundOn();
+        vector backgroundColour2 = colours_["background2"]->value(position());
+
+        renderer->SetBackground2
+        (
+            backgroundColour2.x(),
+            backgroundColour2.y(),
+            backgroundColour2.z()
+        );
+    }
+
+    // Depth peeling
+    renderer->SetUseDepthPeeling(true);
+    renderer->SetMaximumNumberOfPeels(4);
+    renderer->SetOcclusionRatio(0);
+
+    // Set the camera
+    vtkSmartPointer<vtkCamera> camera = vtkSmartPointer<vtkCamera>::New();
+    camera->SetParallelProjection(parallelProjection_);
+    renderer->SetActiveCamera(camera);
+
+    setCamera(renderer, true);
+
+    // Initialise the extents
+    if (mode_ == mtStatic)
+    {
+        const point& min = clipBox_.min();
+        const point& max = clipBox_.max();
+        vtkSmartPointer<vtkCubeSource> clipBox =
+            vtkSmartPointer<vtkCubeSource>::New();
+        clipBox->SetXLength(max.x() - min.x());
+        clipBox->SetYLength(max.y() - min.y());
+        clipBox->SetZLength(max.z() - min.z());
+        clipBox->SetCenter
+        (
+            min.x() + 0.5*(max.x() - min.x()),
+            min.y() + 0.5*(max.y() - min.y()),
+            min.z() + 0.5*(max.z() - min.z())
+        );
+        vtkSmartPointer<vtkPolyDataMapper> clipMapper =
+            vtkSmartPointer<vtkPolyDataMapper>::New();
+        clipMapper->SetInputConnection(clipBox->GetOutputPort());
+
+        vtkSmartPointer<vtkActor> clipActor = vtkSmartPointer<vtkActor>::New();
+        clipActor->SetMapper(clipMapper);
+        clipActor->VisibilityOn();
+        renderer->AddActor(clipActor);
+
+        renderer->ResetCamera();
+
+        clipActor->VisibilityOff();
+    }
+}
+
+
+void Foam::scene::setCamera(vtkRenderer* renderer, const bool override) const
+{
+    if (mode_ == mtFlightPath || override)
+    {
+        vtkCamera* camera = renderer->GetActiveCamera();
+
+        if (!parallelProjection_)
+        {
+            camera->SetViewAngle(cameraViewAngle_->value(position()));
+        }
+
+        const vector up = cameraUp_->value(position());
+        const vector pos = cameraPosition_->value(position());
+        const point focalPoint = cameraFocalPoint_->value(position());
+
+        camera->SetViewUp(up.x(), up.y(), up.z());
+        camera->SetPosition(pos.x(), pos.y(), pos.z());
+        camera->SetFocalPoint(focalPoint.x(), focalPoint.y(), focalPoint.z());
+        camera->Modified();
+
+        vtkSmartPointer<vtkLightKit> lightKit =
+            vtkSmartPointer<vtkLightKit>::New();
+        lightKit->AddLightsToRenderer(renderer);
+    }
+}
+
+
+Foam::string Foam::scene::frameIndexStr() const
+{
+    string str = Foam::name(currentFrameI_);
+    str.insert(0, 4 - str.length(), '0');
+
+    return str;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::scene::scene(const objectRegistry& obr, const word& name)
+:
+    obr_(obr),
+    name_(name),
+    colours_(),
+    mode_(mtStatic),
+    cameraPosition_(NULL),
+    cameraFocalPoint_(NULL),
+    cameraUp_(NULL),
+    cameraZoom_(NULL),
+    cameraViewAngle_(NULL),
+    clipBox_(),
+    parallelProjection_(true),
+    nFrameTotal_(1),
+    position_(0),
+    dPosition_(0),
+    currentFrameI_(0),
+    outputName_("unknown")
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::scene::~scene()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::HashPtrTable<Foam::DataEntry<Foam::vector>, Foam::word>&
+Foam::scene::colours() const
+{
+    return colours_;
+}
+
+
+Foam::label Foam::scene::frameIndex() const
+{
+    return currentFrameI_;
+}
+
+
+Foam::scalar Foam::scene::position() const
+{
+    return position_;
+}
+
+
+void Foam::scene::read(const dictionary& dict)
+{
+    readCamera(dict.subDict("camera"));
+    readColours(dict.subDict("colours"));
+}
+
+
+bool Foam::scene::loop(vtkRenderer* renderer)
+{
+    static bool initialised = false;
+
+    setCamera(renderer, false);
+
+    if (!initialised)
+    {
+        initialised = true;
+        return true;
+    }
+
+    // Save image from last iteration
+    saveImage(renderer->GetRenderWindow());
+
+    currentFrameI_++;
+
+    position_ += currentFrameI_*dPosition_;
+
+    if (currentFrameI_ < nFrameTotal_)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+void Foam::scene::saveImage(vtkRenderWindow* renderWindow) const
+{
+    if (!renderWindow)
+    {
+        return;
+    }
+
+    fileName prefix("postProcessing"/name_/obr_.time().timeName());
+    mkDir(prefix);
+
+    renderWindow->Render();
+
+    // Set up off-screen rendering
+    vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
+        vtkSmartPointer<vtkWindowToImageFilter>::New();
+
+    windowToImageFilter->SetInput(renderWindow);
+
+    //// Add alpha channel for transparency
+    // windowToImageFilter->SetInputBufferTypeToRGBA();
+    windowToImageFilter->SetInputBufferTypeToRGB();
+
+//    windowToImageFilter->ReadFrontBufferOff();
+    windowToImageFilter->Update();
+
+    // Save the image
+    vtkSmartPointer<vtkPNGWriter> writer = vtkSmartPointer<vtkPNGWriter>::New();
+    fileName fName(prefix/outputName_ + '.' + frameIndexStr() + ".png");
+    writer->SetFileName(fName.c_str());
+    writer->SetInputConnection(windowToImageFilter->GetOutputPort());
+
+    Info<< "    Generating image: " << fName << endl;
+
+    writer->Write();
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.H
new file mode 100644
index 0000000000..d3bd156e39
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.H
@@ -0,0 +1,202 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::camera
+
+Description
+
+SourceFiles
+    scene.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef scene_H
+#define scene_H
+
+// OpenFOAM includes
+#include "dictionary.H"
+#include "DataEntry.H"
+#include "vector.H"
+#include "point.H"
+#include "boundBox.H"
+#include "NamedEnum.H"
+#include "HashPtrTable.H"
+#include "vector.H"
+
+// VTK includes
+#include "vtkSmartPointer.h"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkRenderer;
+class vtkRenderWindow;
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class scene Declaration
+\*---------------------------------------------------------------------------*/
+
+class scene
+{
+public:
+
+    enum modeType{mtStatic, mtFlightPath};
+
+    NamedEnum<modeType, 2> modeTypeNames_;
+
+
+private:
+
+    // Private data
+
+        //- Reference to the object registry
+        const objectRegistry& obr_;
+
+        //- Object name
+        const word name_;
+
+
+    // Private Member Functions
+
+        //- Read camera properties
+        void readCamera(const dictionary& dict);
+
+        //- Read solour properties
+        void readColours(const dictionary& dict);
+
+        //- Disallow default bitwise copy construct
+        scene(const scene&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const scene&);
+
+
+protected:
+
+    // Protected data
+
+        //- Colours
+        HashPtrTable<DataEntry<vector>, word> colours_;
+
+
+        // Camera settings
+
+            //- Mode
+            modeType mode_;
+
+            //- Position
+            autoPtr<DataEntry<point> > cameraPosition_;
+
+            //- Focal point
+            autoPtr<DataEntry<point> > cameraFocalPoint_;
+
+            //- Up direction
+            autoPtr<DataEntry<vector> > cameraUp_;
+
+            //- Zoom level
+            autoPtr<DataEntry<scalar> > cameraZoom_;
+
+            //- View angle
+            autoPtr<DataEntry<scalar> > cameraViewAngle_;
+
+
+        // Scene management
+
+            //- Clipping box
+            boundBox clipBox_;
+
+            //- Parallel projection flag
+            bool parallelProjection_;
+
+            //- Number of frames
+            label nFrameTotal_;
+
+            //- Position [0-1]
+            scalar position_;
+
+            //- Change in position per frame
+            scalar dPosition_;
+
+            //- Index of current frame
+            label currentFrameI_;
+
+            //- Name prefix of output
+            word outputName_;
+
+
+    // Protected Member Functions
+
+        void setCamera(vtkRenderer* renderer, const bool override) const;
+
+        string frameIndexStr() const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        scene(const objectRegistry& obr, const word& name);
+
+
+    //- Destructor
+    virtual ~scene();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the colours
+            const HashPtrTable<DataEntry<vector>, word>& colours() const;
+
+            //- Return the current frame index
+            label frameIndex() const;
+
+            //- Return the current position (in range 0-1)
+            scalar position() const;
+
+            void read(const dictionary& dict);
+
+            void initialise(vtkRenderer* renderer, const word& outputName);
+
+            //- Main control loop
+            bool loop(vtkRenderer* renderer);
+
+            //- Save image to file
+            void saveImage(vtkRenderWindow* renderWindow) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.C
new file mode 100644
index 0000000000..1cb877d9cb
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.C
@@ -0,0 +1,254 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "surface.H"
+#include "runTimePostProcessing.H"
+
+// VTK includes
+#include "vtkActor.h"
+#include "vtkFeatureEdges.h"
+#include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<surface::representationType, 5>::names[] =
+    {
+        "none",
+        "wireframe",
+        "surface",
+        "surfaceWithEdges",
+        "glyph"
+    };
+
+    defineTypeNameAndDebug(surface, 0);
+    defineRunTimeSelectionTable(surface, dictionary);
+}
+
+const Foam::NamedEnum<Foam::surface::representationType, 5>
+    Foam::surface::representationTypeNames;
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::surface::setRepresentation(vtkActor* actor) const
+{
+    geometryBase::initialiseActor(actor);
+
+    switch (representation_)
+    {
+        case rtNone:
+        {
+            actor->VisibilityOff();
+            break;
+        }
+        case rtWireframe:
+        {
+            // note: colour is set using general SetColour, not setEdgeColor
+            actor->GetProperty()->SetRepresentationToWireframe();
+            break;
+        }
+        case rtGlyph:
+        case rtSurface:
+        {
+            actor->GetProperty()->SetRepresentationToSurface();
+            break;
+        }
+        case rtSurfaceWithEdges:
+        {
+            actor->GetProperty()->SetRepresentationToSurface();
+            actor->GetProperty()->EdgeVisibilityOn();
+            break;
+        }
+    }
+}
+
+
+void Foam::surface::addFeatureEdges
+(
+    vtkRenderer* renderer,
+    vtkPolyData* data
+) const
+{
+    if (!featureEdges_)
+    {
+        return;
+    }
+
+    vtkSmartPointer<vtkFeatureEdges> featureEdges =
+        vtkSmartPointer<vtkFeatureEdges>::New();
+    featureEdges->SetInputData(data);
+    featureEdges->BoundaryEdgesOn();
+    featureEdges->FeatureEdgesOn();
+    featureEdges->ManifoldEdgesOff();
+    featureEdges->NonManifoldEdgesOff();
+//    featureEdges->SetFeatureAngle(60);
+    featureEdges->ColoringOff();
+    featureEdges->Update();
+
+    vtkSmartPointer<vtkPolyDataMapper> mapper =
+        vtkSmartPointer<vtkPolyDataMapper>::New();
+    mapper->SetInputConnection(featureEdges->GetOutputPort());
+    mapper->ScalarVisibilityOff();
+
+    edgeActor_->GetProperty()->SetSpecular(0);
+    edgeActor_->GetProperty()->SetSpecularPower(20);
+    edgeActor_->GetProperty()->SetRepresentationToWireframe();
+    edgeActor_->SetMapper(mapper);
+
+    renderer->AddActor(edgeActor_);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::surface::surface
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    geometryBase(parent, dict, colours),
+    representation_
+    (
+        representationTypeNames.read(dict.lookup("representation"))
+    ),
+    featureEdges_(false),
+    surfaceColour_(NULL),
+    edgeColour_(NULL),
+    surfaceActor_(),
+    edgeActor_(),
+    maxGlyphLength_(0.0)
+{
+    surfaceActor_ = vtkSmartPointer<vtkActor>::New();
+    edgeActor_ = vtkSmartPointer<vtkActor>::New();
+
+    if (dict.found("surfaceColour"))
+    {
+        surfaceColour_.reset
+        (
+            DataEntry<vector>::New("surfaceColour", dict).ptr()
+        );
+    }
+    else
+    {
+        surfaceColour_.reset(colours["surface"]->clone().ptr());
+    }
+
+    if (dict.found("edgeColour"))
+    {
+        edgeColour_.reset(DataEntry<vector>::New("edgeColour", dict).ptr());
+    }
+    else
+    {
+        edgeColour_.reset(colours["edge"]->clone().ptr());
+    }
+
+    if (representation_ == rtGlyph)
+    {
+        dict.lookup("maxGlyphLength") >> maxGlyphLength_;
+    }
+    else
+    {
+        dict.lookup("featureEdges") >> featureEdges_;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::surface> Foam::surface::New
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours,
+    const word& surfaceType
+)
+{
+    if (debug)
+    {
+        Info<< "Selecting surface " << surfaceType << endl;
+    }
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(surfaceType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown surface type "
+            << surfaceType << nl << nl
+            << "Valid surface types are:" << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<surface>(cstrIter()(parent, dict, colours));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::surface::~surface()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::surface::updateActors(const scalar position)
+{
+    if (!featureEdges_)
+    {
+        return;
+    }
+
+    edgeActor_->GetProperty()->SetLineWidth(2);
+    edgeActor_->GetProperty()->SetOpacity(opacity(position));
+
+    const vector colour = edgeColour_->value(position);
+    edgeActor_->GetProperty()->SetColor
+    (
+        colour[0],
+        colour[1],
+        colour[2]
+    );
+    edgeActor_->GetProperty()->SetEdgeColor
+    (
+        colour[0],
+        colour[1],
+        colour[2]
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.H
new file mode 100644
index 0000000000..d03ff34fb7
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/surface.H
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::surface
+
+Description
+
+SourceFiles
+    surface.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef surface_H
+#define surface_H
+
+#include "geometryBase.H"
+#include "NamedEnum.H"
+#include "runTimeSelectionTables.H"
+
+#include "vtkSmartPointer.h"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkActor;
+class vtkRenderer;
+class vtkPolyData;
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class surface Declaration
+\*---------------------------------------------------------------------------*/
+
+class surface
+:
+    public geometryBase
+{
+public:
+
+    // Public enumerations
+
+        enum representationType
+        {
+            rtNone,
+            rtWireframe,
+            rtSurface,
+            rtSurfaceWithEdges,
+            rtGlyph
+        };
+
+        static const NamedEnum<representationType, 5> representationTypeNames;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        surface(const surface&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const surface&);
+
+
+protected:
+
+    // Protected data
+
+        //- Representation type
+        representationType representation_;
+
+        //- Activate feature edges
+        bool featureEdges_;
+
+        //- Surface colour
+        autoPtr<DataEntry<vector> > surfaceColour_;
+
+        //- Edge colour
+        autoPtr<DataEntry<vector> > edgeColour_;
+
+        //- Surface actor
+        vtkSmartPointer<vtkActor> surfaceActor_;
+
+        //- Edge actor
+        vtkSmartPointer<vtkActor> edgeActor_;
+
+        //- Max glyph length for representation type rtGlyph
+        scalar maxGlyphLength_;
+
+
+    // Protected Member Functions
+
+        //- Set the representation
+        void setRepresentation(vtkActor* actor) const;
+
+        //- Add feature edges to scene
+        void addFeatureEdges
+        (
+            vtkRenderer* renderer,
+            vtkPolyData* data
+        ) const;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("surface");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            surface,
+            dictionary,
+            (
+                const runTimePostProcessing& parent,
+                const dictionary& dict,
+                const HashPtrTable<DataEntry<vector>, word>& colours
+            ),
+            (parent, dict, colours)
+        );
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        surface
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected RAS model
+        static autoPtr<surface> New
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours,
+            const word& surfaceName
+        );
+
+
+    //- Destructor
+    virtual ~surface();
+
+
+    // Member Functions
+
+        //- Update the actors
+        virtual void updateActors(const scalar position);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.C b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.C
new file mode 100644
index 0000000000..b4c1ff3f86
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.C
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// OpenFOAM includes
+#include "text.H"
+#include "runTimePostProcessing.H"
+
+// VTK includes
+#include "vtkRenderer.h"
+#include "vtkSmartPointer.h"
+#include "vtkTextActor.h"
+#include "vtkTextProperty.h"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::text::text
+(
+    const runTimePostProcessing& parent,
+    const dictionary& dict,
+    const HashPtrTable<DataEntry<vector>, word>& colours
+)
+:
+    geometryBase(parent, dict, colours),
+    string_(dict.lookup("string")),
+    position_(dict.lookup("position")),
+    size_(readScalar(dict.lookup("size"))),
+    colour_(NULL),
+    bold_(readBool(dict.lookup("bold")))
+{
+    if (dict.found("colour"))
+    {
+        colour_.reset(DataEntry<vector>::New("colour", dict).ptr());
+    }
+    else
+    {
+        colour_.reset(colours["text"]->clone().ptr());
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::text::~text()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::text::addGeometryToScene
+(
+    const scalar position,
+    vtkRenderer* renderer
+)
+{
+    if (!visible_)
+    {
+        return;
+    }
+
+    vtkSmartPointer<vtkTextActor> actor = vtkSmartPointer<vtkTextActor>::New();
+
+    actor->SetInput(string_.c_str());
+    actor->GetTextProperty()->SetFontFamilyToArial();
+    actor->GetTextProperty()->SetFontSize(size_);
+    actor->GetTextProperty()->SetJustificationToLeft();
+    actor->GetTextProperty()->SetVerticalJustificationToBottom();
+    actor->GetTextProperty()->SetBold(bold_);
+
+    const vector colour = colour_->value(position);
+    actor->GetTextProperty()->SetColor(colour[0], colour[1], colour[2]);
+    actor->GetPositionCoordinate()->SetCoordinateSystemToNormalizedViewport();
+    actor->GetPositionCoordinate()->SetValue
+    (
+        position_.first(),
+        position_.second()
+    );
+
+    renderer->AddActor2D(actor);
+}
+
+
+void Foam::text::updateActors(const scalar position)
+{
+    // do nothing - all handled by addGeometryToScene
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.H b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.H
new file mode 100644
index 0000000000..bee0020ef5
--- /dev/null
+++ b/src/postProcessing/functionObjects/graphics/runTimePostProcessing/text.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::text
+
+Description
+
+SourceFiles
+    text.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef text_H
+#define text_H
+
+#include "geometryBase.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class vtkRenderer;
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class text Declaration
+\*---------------------------------------------------------------------------*/
+
+class text
+:
+    public geometryBase
+{
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        text(const text&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const text&);
+
+
+protected:
+
+    // Protected data
+
+        //- Text
+        string string_;
+
+        //- Position
+        Tuple2<scalar, scalar> position_;
+
+        //- Size
+        scalar size_;
+
+        //- Colour
+        autoPtr<DataEntry<vector> > colour_;
+
+        //- Bold flag
+        bool bold_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary
+        text
+        (
+            const runTimePostProcessing& parent,
+            const dictionary& dict,
+            const HashPtrTable<DataEntry<vector>, word>& colours
+        );
+
+
+    //- Destructor
+    virtual ~text();
+
+
+    // Member Functions
+
+        //- Add surface(s) to scene
+        virtual void addGeometryToScene
+        (
+            const scalar position,
+            vtkRenderer* renderer
+        );
+
+        //- Update actors
+        virtual void updateActors(const scalar position);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
index c86cc727f6..9d4ebe3aeb 100644
--- a/src/postProcessing/functionObjects/jobControl/Make/files
+++ b/src/postProcessing/functionObjects/jobControl/Make/files
@@ -1,4 +1,20 @@
 abortCalculation/abortCalculation.C
 abortCalculation/abortCalculationFunctionObject.C
 
+runTimeControl/runTimeControl.C
+runTimeControl/runTimeControlFunctionObject.C
+runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C
+runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
+runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
+runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
+runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
+runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.C
+
+externalCoupled = externalCoupled
+$(externalCoupled)/externalCoupledFunctionObject.C
+$(externalCoupled)/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
+$(externalCoupled)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+
+
 LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/jobControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options
index e69de29bb2..c6867bf0d1 100644
--- a/src/postProcessing/functionObjects/jobControl/Make/options
+++ b/src/postProcessing/functionObjects/jobControl/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lcompressibleTurbulenceModels
diff --git a/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H b/src/postProcessing/functionObjects/jobControl/doc/jobControlFunctionObjectsDoc.H
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/jobControl/doc/jobControlFunctionObjectsDoc.H
diff --git a/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.C b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.C
new file mode 100644
index 0000000000..46d44f65a3
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.C
@@ -0,0 +1,1057 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "externalCoupledFunctionObject.H"
+#include "addToRunTimeSelectionTable.H"
+#include "OSspecific.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "volFields.H"
+#include "globalIndex.H"
+#include "fvMesh.H"
+#include "DynamicField.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(externalCoupledFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        externalCoupledFunctionObject,
+        dictionary
+    );
+}
+
+Foam::word Foam::externalCoupledFunctionObject::lockName = "OpenFOAM";
+
+Foam::string Foam::externalCoupledFunctionObject::patchKey = "# Patch: ";
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::fileName Foam::externalCoupledFunctionObject::baseDir() const
+{
+    fileName result(commsDir_);
+    result.clean();
+
+    return result;
+}
+
+
+Foam::fileName Foam::externalCoupledFunctionObject::groupDir
+(
+    const fileName& commsDir,
+    const word& regionGroupName,
+    const wordRe& groupName
+)
+{
+    fileName result
+    (
+        commsDir
+       /regionGroupName
+       /string::validate<fileName>(groupName)
+    );
+    result.clean();
+
+    return result;
+}
+
+
+Foam::fileName Foam::externalCoupledFunctionObject::lockFile() const
+{
+    return fileName(baseDir()/(lockName + ".lock"));
+}
+
+
+void Foam::externalCoupledFunctionObject::createLockFile() const
+{
+    if (!Pstream::master())
+    {
+        return;
+    }
+
+    const fileName fName(lockFile());
+    IFstream is(fName);
+
+    // Only create lock file if it doesn't already exist
+    if (!is.good())
+    {
+        if (log_) Info<< type() << ": creating lock file" << endl;
+
+        OFstream os(fName);
+        os  << "lock file";
+        os.flush();
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::removeLockFile() const
+{
+    if (!Pstream::master())
+    {
+        return;
+    }
+
+    if (log_) Info<< type() << ": removing lock file" << endl;
+
+    rm(lockFile());
+}
+
+
+void Foam::externalCoupledFunctionObject::removeReadFiles() const
+{
+    if (!Pstream::master())
+    {
+        return;
+    }
+
+    if (log_) Info<< type() << ": removing all read files" << endl;
+
+    forAll(regionGroupNames_, regionI)
+    {
+        const word& compName = regionGroupNames_[regionI];
+
+        const labelList& groups = regionToGroups_[compName];
+        forAll(groups, i)
+        {
+            label groupI = groups[i];
+            const wordRe& groupName = groupNames_[groupI];
+
+            forAll(groupReadFields_[groupI], fieldI)
+            {
+                const word& fieldName = groupReadFields_[groupI][fieldI];
+                rm
+                (
+                    groupDir(commsDir_, compName, groupName)
+                  / fieldName + ".in"
+                );
+            }
+        }
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::removeWriteFiles() const
+{
+    if (!Pstream::master())
+    {
+        return;
+    }
+
+    if (log_) Info<< type() << ": removing all write files" << endl;
+
+    forAll(regionGroupNames_, regionI)
+    {
+        const word& compName = regionGroupNames_[regionI];
+
+        const labelList& groups = regionToGroups_[compName];
+        forAll(groups, i)
+        {
+            label groupI = groups[i];
+            const wordRe& groupName = groupNames_[groupI];
+
+            forAll(groupReadFields_[groupI], fieldI)
+            {
+                const word& fieldName = groupReadFields_[groupI][fieldI];
+                rm
+                (
+                    groupDir(commsDir_, compName, groupName)
+                  / fieldName + ".out"
+                );
+            }
+        }
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::wait() const
+{
+    const fileName fName(lockFile());
+    label found = 0;
+    label totalTime = 0;
+
+    if (log_) Info<< type() << ": beginning wait for lock file " << fName << nl;
+
+    while (found == 0)
+    {
+        if (Pstream::master())
+        {
+            if (totalTime > timeOut_)
+            {
+                FatalErrorInFunction
+                    << "Wait time exceeded time out time of " << timeOut_
+                    << " s" << abort(FatalError);
+            }
+
+            IFstream is(fName);
+
+            if (is.good())
+            {
+                found++;
+
+                if (log_)
+                {
+                    Info<< type() << ": found lock file " << fName << endl;
+                }
+            }
+            else
+            {
+                sleep(waitInterval_);
+                totalTime += waitInterval_;
+
+                if (log_)
+                {
+                    Info<< type() << ": wait time = " << totalTime << endl;
+                }
+            }
+        }
+
+        // prevent other procs from racing ahead
+        reduce(found, sumOp<label>());
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::readColumns
+(
+    const label nRows,
+    const label nColumns,
+    autoPtr<IFstream>& masterFilePtr,
+    List<scalarField>& data
+) const
+{
+    // Get sizes for all processors
+    const globalIndex globalFaces(nRows);
+
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+    if (Pstream::master())
+    {
+        string line;
+
+        // Read data from file and send to destination processor
+
+        for (label procI = 0; procI < Pstream::nProcs(); procI++)
+        {
+            // Temporary storage
+            List<scalarField> values(nColumns);
+
+            // Number of rows to read for processor procI
+            label procNRows = globalFaces.localSize(procI);
+
+            forAll(values, columnI)
+            {
+                values[columnI].setSize(procNRows);
+            }
+
+            for (label rowI = 0; rowI < procNRows; rowI++)
+            {
+                // Get a line
+                do
+                {
+                    if (!masterFilePtr().good())
+                    {
+                        FatalIOErrorInFunction(masterFilePtr())
+                            << "Trying to read data for processor " << procI
+                            << " row " << rowI
+                            << ". Does your file have as many rows as there are"
+                            << " patch faces (" << globalFaces.size()
+                            << ") ?" << exit(FatalIOError);
+                    }
+
+                    masterFilePtr().getLine(line);
+                } while (line.empty() || line[0] == '#');
+
+                IStringStream lineStr(line);
+
+                for (label columnI = 0; columnI < nColumns; columnI++)
+                {
+                    lineStr >> values[columnI][rowI];
+                }
+            }
+
+            // Send to procI
+            UOPstream str(procI, pBufs);
+            str << values;
+        }
+    }
+    pBufs.finishedSends();
+
+    // Read from PstreamBuffers
+    UIPstream str(Pstream::masterNo(), pBufs);
+    str >> data;
+}
+
+
+void Foam::externalCoupledFunctionObject::readLines
+(
+    const label nRows,
+    autoPtr<IFstream>& masterFilePtr,
+    OStringStream& lines
+) const
+{
+    // Get sizes for all processors
+    const globalIndex globalFaces(nRows);
+
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    if (Pstream::master())
+    {
+        string line;
+
+        // Read line from file and send to destination processor
+
+        for (label procI = 0; procI < Pstream::nProcs(); procI++)
+        {
+            // Number of rows to read for processor procI
+            label procNRows = globalFaces.localSize(procI);
+
+            UOPstream toProc(procI, pBufs);
+
+            for (label rowI = 0; rowI < procNRows; rowI++)
+            {
+                // Get a line
+                do
+                {
+                    if (!masterFilePtr().good())
+                    {
+                        FatalIOErrorInFunction(masterFilePtr())
+                            << "Trying to read data for processor " << procI
+                            << " row " << rowI
+                            << ". Does your file have as many rows as there are"
+                            << " patch faces (" << globalFaces.size()
+                            << ") ?" << exit(FatalIOError);
+                    }
+
+                    masterFilePtr().getLine(line);
+                } while (line.empty() || line[0] == '#');
+
+                // Send line to the destination processor
+                toProc << line;
+            }
+        }
+    }
+
+
+    pBufs.finishedSends();
+
+    // Read lines from PstreamBuffers
+    UIPstream str(Pstream::masterNo(), pBufs);
+    for (label rowI = 0; rowI < nRows; rowI++)
+    {
+        string line(str);
+        lines << line.c_str() << nl;
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::writeGeometry
+(
+    const UPtrList<const fvMesh>& meshes,
+    const fileName& commsDir,
+    const wordRe& groupName
+)
+{
+    wordList regionNames(meshes.size());
+    forAll(meshes, i)
+    {
+        regionNames[i] = meshes[i].dbDir();
+    }
+
+    // Make sure meshes are provided in sorted order
+    checkOrder(regionNames);
+
+    fileName dir(groupDir(commsDir, compositeName(regionNames), groupName));
+
+    //if (log_)
+    {
+        Info<< typeName << ": writing geometry to " << dir << endl;
+    }
+
+    autoPtr<OFstream> osPointsPtr;
+    autoPtr<OFstream> osFacesPtr;
+    if (Pstream::master())
+    {
+        mkDir(dir);
+        osPointsPtr.reset(new OFstream(dir/"patchPoints"));
+        osFacesPtr.reset(new OFstream(dir/"patchFaces"));
+    }
+
+
+    DynamicList<face> allMeshesFaces;
+    DynamicField<point> allMeshesPoints;
+
+    forAll(meshes, meshI)
+    {
+        const fvMesh& mesh = meshes[meshI];
+
+        const labelList patchIDs
+        (
+            mesh.boundaryMesh().patchSet
+            (
+                List<wordRe>(1, groupName)
+            ).sortedToc()
+        );
+
+        // Count faces
+        label nFaces = 0;
+        forAll(patchIDs, i)
+        {
+            nFaces += mesh.boundaryMesh()[patchIDs[i]].size();
+        }
+
+        // Collect faces
+        DynamicList<label> allFaceIDs(nFaces);
+        forAll(patchIDs, i)
+        {
+            const polyPatch& p = mesh.boundaryMesh()[patchIDs[i]];
+
+            forAll(p, pI)
+            {
+                allFaceIDs.append(p.start()+pI);
+            }
+        }
+
+        // Construct overall patch
+        indirectPrimitivePatch allPatch
+        (
+            IndirectList<face>(mesh.faces(), allFaceIDs),
+            mesh.points()
+        );
+
+        labelList pointToGlobal;
+        labelList uniquePointIDs;
+        mesh.globalData().mergePoints
+        (
+            allPatch.meshPoints(),
+            allPatch.meshPointMap(),
+            pointToGlobal,
+            uniquePointIDs
+        );
+
+        label procI = Pstream::myProcNo();
+
+        List<pointField> collectedPoints(Pstream::nProcs());
+        collectedPoints[procI] = pointField(mesh.points(), uniquePointIDs);
+        Pstream::gatherList(collectedPoints);
+
+        List<faceList> collectedFaces(Pstream::nProcs());
+        faceList& patchFaces = collectedFaces[procI];
+        patchFaces = allPatch.localFaces();
+        forAll(patchFaces, faceI)
+        {
+            inplaceRenumber(pointToGlobal, patchFaces[faceI]);
+        }
+        Pstream::gatherList(collectedFaces);
+
+        if (Pstream::master())
+        {
+            // Append and renumber
+            label nPoints = allMeshesPoints.size();
+
+            forAll(collectedPoints, procI)
+            {
+                allMeshesPoints.append(collectedPoints[procI]);
+
+            }
+            face newFace;
+            forAll(collectedFaces, procI)
+            {
+                const faceList& procFaces = collectedFaces[procI];
+
+                forAll(procFaces, faceI)
+                {
+                    const face& f = procFaces[faceI];
+
+                    newFace.setSize(f.size());
+                    forAll(f, fp)
+                    {
+                        newFace[fp] = f[fp]+nPoints;
+                    }
+                    allMeshesFaces.append(newFace);
+                }
+
+                nPoints += collectedPoints[procI].size();
+            }
+        }
+
+        //if (log_)
+        {
+            Info<< typeName << ": for mesh " << mesh.name()
+                << " writing " << allMeshesPoints.size() << " points to "
+                << osPointsPtr().name() << endl;
+            Info<< typeName << ": for mesh " << mesh.name()
+                << " writing " << allMeshesFaces.size() << " faces to "
+                << osFacesPtr().name() << endl;
+        }
+    }
+
+    // Write points
+    if (osPointsPtr.valid())
+    {
+        osPointsPtr() << allMeshesPoints << endl;
+    }
+
+    // Write faces
+    if (osFacesPtr.valid())
+    {
+        osFacesPtr() << allMeshesFaces << endl;
+    }
+}
+
+
+Foam::word Foam::externalCoupledFunctionObject::compositeName
+(
+    const wordList& regionNames
+)
+{
+    if (regionNames.size() == 0)
+    {
+        FatalErrorInFunction
+            << "Empty regionNames" << abort(FatalError);
+        return word::null;
+    }
+    else if (regionNames.size() == 1)
+    {
+        if (regionNames[0] == polyMesh::defaultRegion)
+        {
+            // For compatibility with single region cases suppress single
+            // region name
+            return word("");
+        }
+        else
+        {
+            return regionNames[0];
+        }
+    }
+    else
+    {
+        // Enforce lexical ordering
+        checkOrder(regionNames);
+
+        word composite(regionNames[0]);
+        for (label i = 1; i < regionNames.size(); i++)
+        {
+            composite += "_" + regionNames[i];
+        }
+
+        return composite;
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::checkOrder
+(
+    const wordList& regionNames
+)
+{
+    labelList order;
+    sortedOrder(regionNames, order);
+    if (order != identity(regionNames.size()))
+    {
+        FatalErrorInFunction
+            << "regionNames " << regionNames << " not in alphabetical order :"
+            << order << exit(FatalError);
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::readData()
+{
+    forAll(regionGroupNames_, regionI)
+    {
+        const word& compName = regionGroupNames_[regionI];
+        const wordList& regionNames = regionGroupRegions_[regionI];
+
+        // Get the meshes for the region-group
+        UPtrList<const fvMesh> meshes(regionNames.size());
+        forAll(regionNames, j)
+        {
+            const word& regionName = regionNames[j];
+            meshes.set(j, &time_.lookupObject<fvMesh>(regionName));
+        }
+
+        const labelList& groups = regionToGroups_[compName];
+
+        forAll(groups, i)
+        {
+            label groupI = groups[i];
+            const wordRe& groupName = groupNames_[groupI];
+            const wordList& fieldNames = groupReadFields_[groupI];
+
+            forAll(fieldNames, fieldI)
+            {
+                const word& fieldName = fieldNames[fieldI];
+
+                bool ok = readData<scalar>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || readData<vector>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || readData<sphericalTensor>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || readData<symmTensor>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || readData<tensor>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+
+                if (!ok)
+                {
+                    WarningInFunction
+                        << "Field " << fieldName << " in regions " << compName
+                        << " was not found." << endl;
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::writeData() const
+{
+    forAll(regionGroupNames_, regionI)
+    {
+        const word& compName = regionGroupNames_[regionI];
+        const wordList& regionNames = regionGroupRegions_[regionI];
+
+        // Get the meshes for the region-group
+        UPtrList<const fvMesh> meshes(regionNames.size());
+        forAll(regionNames, j)
+        {
+            const word& regionName = regionNames[j];
+            meshes.set(j, &time_.lookupObject<fvMesh>(regionName));
+        }
+
+        const labelList& groups = regionToGroups_[compName];
+
+        forAll(groups, i)
+        {
+            label groupI = groups[i];
+            const wordRe& groupName = groupNames_[groupI];
+            const wordList& fieldNames = groupWriteFields_[groupI];
+
+            forAll(fieldNames, fieldI)
+            {
+                const word& fieldName = fieldNames[fieldI];
+
+                bool ok = writeData<scalar>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || writeData<vector>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || writeData<sphericalTensor>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || writeData<symmTensor>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+                ok = ok || writeData<tensor>
+                (
+                    meshes,
+                    groupName,
+                    fieldName
+                );
+
+                if (!ok)
+                {
+                    WarningInFunction
+                        << "Field " << fieldName << " in regions " << compName
+                        << " was not found." << endl;
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::externalCoupledFunctionObject::initialise()
+{
+    if (initialised_)
+    {
+        return;
+    }
+
+    // Write the geometry if not already there
+    forAll(regionGroupRegions_, i)
+    {
+        const word& compName = regionGroupNames_[i];
+        const wordList& regionNames = regionGroupRegions_[i];
+
+        // Get the meshes for the region-group
+        UPtrList<const fvMesh> meshes(regionNames.size());
+        forAll(regionNames, j)
+        {
+            const word& regionName = regionNames[j];
+            meshes.set(j, &time_.lookupObject<fvMesh>(regionName));
+        }
+
+        const labelList& groups = regionToGroups_[compName];
+
+        forAll(groups, i)
+        {
+            label groupI = groups[i];
+            const wordRe& groupName = groupNames_[groupI];
+
+            bool exists = false;
+            if (Pstream::master())
+            {
+                fileName dir(groupDir(commsDir_, compName, groupName));
+
+                exists =
+                    isFile(dir/"patchPoints")
+                 || isFile(dir/"patchFaces");
+            }
+
+            if (!returnReduce(exists, orOp<bool>()))
+            {
+                writeGeometry(meshes, commsDir_, groupName);
+            }
+        }
+    }
+
+    if (initByExternal_)
+    {
+        // Wait for initial data to be made available
+        wait();
+
+        // Eead data passed back from external source
+        readData();
+    }
+
+    initialised_ = true;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::externalCoupledFunctionObject::externalCoupledFunctionObject
+(
+    const word& name,
+    const Time& runTime,
+    const dictionary& dict
+)
+:
+    functionObject(name),
+    time_(runTime),
+    enabled_(true),
+    initialised_(false)
+{
+    read(dict);
+
+    if (Pstream::master())
+    {
+        mkDir(baseDir());
+    }
+
+    if (!initByExternal_)
+    {
+        createLockFile();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::externalCoupledFunctionObject::~externalCoupledFunctionObject()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::externalCoupledFunctionObject::on()
+{
+    enabled_ = true;
+}
+
+
+void Foam::externalCoupledFunctionObject::off()
+{
+    enabled_ = false;
+}
+
+
+bool Foam::externalCoupledFunctionObject::start()
+{
+    return true;
+}
+
+
+bool Foam::externalCoupledFunctionObject::execute(const bool forceWrite)
+{
+    if
+    (
+        enabled()
+     && (!initialised_ || time_.timeIndex() % calcFrequency_ == 0)
+    )
+    {
+        // Initialise the coupling
+        initialise();
+
+        // Write data for external source
+        writeData();
+
+        // remove lock file, signalling external source to execute
+        removeLockFile();
+
+        // Wait for response
+        wait();
+
+        // Remove old data files from OpenFOAM
+        removeWriteFiles();
+
+        // Read data passed back from external source
+        readData();
+
+        // create lock file for external source
+        createLockFile();
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+bool Foam::externalCoupledFunctionObject::end()
+{
+    if (enabled())
+    {
+        // Remove old data files
+        removeReadFiles();
+        removeWriteFiles();
+        removeLockFile();
+    }
+
+    return true;
+}
+
+
+bool Foam::externalCoupledFunctionObject::timeSet()
+{
+    // Do nothing - only valid on execute
+    return true;
+}
+
+
+bool Foam::externalCoupledFunctionObject::adjustTimeStep()
+{
+    return true;
+}
+
+
+bool Foam::externalCoupledFunctionObject::read(const dictionary& dict)
+{
+    dict.readIfPresent("enabled", enabled_);
+
+    if (!enabled_)
+    {
+        return true;
+    }
+
+    dict.lookup("commsDir") >> commsDir_;
+    commsDir_.expand();
+
+    waitInterval_ = dict.lookupOrDefault("waitInterval", 1);
+    timeOut_ = dict.lookupOrDefault("timeOut", 100*waitInterval_);
+    calcFrequency_ = dict.lookupOrDefault("calcFrequency", 1);
+    initByExternal_ = readBool(dict.lookup("initByExternal"));
+    log_ = dict.lookupOrDefault("log", false);
+
+
+    // Get names of all fvMeshes (and derived types)
+    wordList allRegionNames(time_.lookupClass<fvMesh>().sortedToc());
+
+
+
+    const dictionary& allRegionsDict = dict.subDict("regions");
+
+    forAllConstIter(dictionary, allRegionsDict, iter)
+    {
+        if (!iter().isDict())
+        {
+            FatalIOErrorInFunction(allRegionsDict)
+                << "Regions must be specified in dictionary format"
+                << exit(FatalIOError);
+        }
+
+        const wordRe regionGroupName(iter().keyword());
+        const dictionary& regionDict = iter().dict();
+
+        labelList regionIDs = findStrings(regionGroupName, allRegionNames);
+
+        const wordList regionNames(allRegionNames, regionIDs);
+
+        regionGroupNames_.append(compositeName(regionNames));
+        regionGroupRegions_.append(regionNames);
+
+
+        forAllConstIter(dictionary, regionDict, regionIter)
+        {
+            if (!regionIter().isDict())
+            {
+                FatalIOErrorInFunction(regionDict)
+                    << "Regions must be specified in dictionary format"
+                    << exit(FatalIOError);
+            }
+            const wordRe groupName(regionIter().keyword());
+            const dictionary& groupDict = regionIter().dict();
+
+            label nGroups = groupNames_.size();
+            const wordList readFields(groupDict.lookup("readFields"));
+            const wordList writeFields(groupDict.lookup("writeFields"));
+
+            HashTable<labelList>::iterator fnd = regionToGroups_.find
+            (
+                regionGroupNames_.last()
+            );
+            if (fnd != regionToGroups_.end())
+            {
+                fnd().append(nGroups);
+            }
+            else
+            {
+                regionToGroups_.insert
+                (
+                    regionGroupNames_.last(),
+                    labelList(1, nGroups)
+                );
+            }
+            groupNames_.append(groupName);
+            groupReadFields_.append(readFields);
+            groupWriteFields_.append(writeFields);
+        }
+    }
+
+
+    // Print a bit
+    if (log_)
+    {
+        Info<< type() << ": Communicating with regions:" << endl;
+        forAll(regionGroupNames_, rgI)
+        {
+            //const wordList& regionNames = regionGroupRegions_[rgI];
+            const word& compName = regionGroupNames_[rgI];
+
+            Info<< "Region: " << compName << endl << incrIndent;
+            const labelList& groups = regionToGroups_[compName];
+            forAll(groups, i)
+            {
+                label groupI = groups[i];
+                const wordRe& groupName = groupNames_[groupI];
+
+                Info<< indent << "patchGroup: " << groupName << "\t"
+                    << endl
+                    << incrIndent
+                    << indent << "Reading fields: "
+                    << groupReadFields_[groupI]
+                    << endl
+                    << indent << "Writing fields: "
+                    << groupWriteFields_[groupI]
+                    << endl
+                    << decrIndent;
+            }
+            Info<< decrIndent;
+        }
+        Info<< endl;
+    }
+
+
+    // Note: we should not have to make directories since the geometry
+    //       should already be written - but just make sure
+    if (Pstream::master())
+    {
+        forAll(regionGroupNames_, rgI)
+        {
+            const word& compName = regionGroupNames_[rgI];
+
+            const labelList& groups = regionToGroups_[compName];
+            forAll(groups, i)
+            {
+                label groupI = groups[i];
+                const wordRe& groupName = groupNames_[groupI];
+
+                fileName dir(groupDir(commsDir_, compName, groupName));
+                if (!isDir(dir))
+                {
+                    if (log_)
+                    {
+                        Info<< type() << ": creating communications directory "
+                            << dir << endl;
+                    }
+                    mkDir(dir);
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+
+void Foam::externalCoupledFunctionObject::updateMesh(const mapPolyMesh& mpm)
+{}
+
+
+void Foam::externalCoupledFunctionObject::movePoints(const polyMesh& mesh)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.H b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.H
new file mode 100644
index 0000000000..5985f1f587
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.H
@@ -0,0 +1,390 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify i
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::externalCoupledFunctionObject
+
+Group
+    grpJobControlFunctionObjects
+
+Description
+    This functionObject provides a simple interface for explicit coupling with
+    an external application. The coupling is through plain text files
+    where OpenFOAM boundary data is read/written as one line per face
+    (data from all processors collated):
+
+        # Patch: <patch name>
+        <fld1> <fld2> .. <fldn>             //face0
+        <fld1> <fld2> .. <fldn>             //face1
+        ..
+        <fld1> <fld2> .. <fldn>             //faceN
+
+    where the actual entries depend on the bc type:
+    - mixed: value, snGrad, refValue, refGrad, valueFraction
+    - externalCoupledMixed: output of writeData
+    - other: value, snGrad
+
+    These text files are located in a user specified communications directory
+    which gets read/written on the master processor only. In the
+    communications directory the structure will be
+
+        <regionsName>/<patchGroup>/<fieldName>.[in|out]
+
+    (where regionsName is either the name of a single region or a composite
+     of multiple region names)
+
+    At start-up, the boundary creates a lock file, i.e..
+
+        OpenFOAM.lock
+
+    ... to signal the external source to wait. During the functionObject
+    execution the boundary values are written to files (one per region,
+    per patch(group), per field), e.g.
+
+        <regionsName>/<patchGroup>/<fieldName>.out
+
+    The lock file is then removed, instructing the external source to take
+    control of the program execution. When ready, the external program
+    should create the return values, e.g. to files
+
+        <regionsName>/<patchGroup>/<fieldName>.in
+
+    ... and then re-instate the lock file. The functionObject will then
+    read these values, apply them to the boundary conditions and pass
+    program execution back to OpenFOAM.
+
+    Example of function object specification:
+    \verbatim
+    externalCoupled
+    {
+        type            externalCoupled;
+        ...
+        log             yes;
+        commsDir        "${FOAM_CASE}/comms";
+        initByExternal  yes;
+
+        regions
+        {
+            "(region1|region0)"         // Name of region(s)
+            {
+                TPatchGroup             // Name of patch(group)
+                {
+                    readFields  (p);    // List of fields to read
+                    writeFields (T);    // List of fields to write
+                }
+            }
+        }
+    }
+    \endverbatim
+
+    This reads/writes (on the master processor) the directory:
+        comms/region0_region1/TPatchGroup/
+    with contents:
+        patchPoints     (collected points)
+        patchFaces      (collected faces)
+        p.in            (input file of p, written by external application)
+        T.out           (output file of T, written by OpenFOAM)
+
+    The patchPoints/patchFaces files denote the (collated) geometry
+    which will be written if it does not exist yet or can be written as
+    a preprocessing step using the createExternalCoupledPatchGeometry
+    application.
+
+SourceFiles
+    externalCoupledFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef externalCoupledFunctionObject_H
+#define externalCoupledFunctionObject_H
+
+#include "functionObject.H"
+#include "DynamicList.H"
+#include "wordReList.H"
+#include "scalarField.H"
+#include "Switch.H"
+#include "UPtrList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+class IFstream;
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                Class externalCoupledFunctionObject Declaration
+\*---------------------------------------------------------------------------*/
+
+class externalCoupledFunctionObject
+:
+    public functionObject
+{
+    // Private data
+
+        //- Reference to the time database
+        const Time& time_;
+
+        //- Switch for the execution - defaults to 'yes/on'
+        Switch enabled_;
+
+        //- Path to communications directory
+        fileName commsDir_;
+
+        //- Interval time between checking for return data [s]
+        label waitInterval_;
+
+        //- Time out time [s]
+        label timeOut_;
+
+        //- Calculation frequency
+        label calcFrequency_;
+
+        //- Flag to indicate values are initialised by external application
+        bool initByExternal_;
+
+        //- Log flag
+        bool log_;
+
+        //- Names of (composite) regions
+        DynamicList<word> regionGroupNames_;
+
+        // Per (composite) region the names of the regions
+        DynamicList<wordList> regionGroupRegions_;
+
+        // Per (composite) region the indices of the group information
+        HashTable<labelList> regionToGroups_;
+
+        // Per group the names of the patches/patchGroups
+        DynamicList<wordRe> groupNames_;
+
+        // Per group the names of the fields to read
+        DynamicList<wordList> groupReadFields_;
+
+        // Per group the names of the fields to write
+        DynamicList<wordList> groupWriteFields_;
+
+        //- Initialised flag
+        bool initialised_;
+
+
+    // Private Member Functions
+
+        //- Return the file path to the communications directory for the region
+        static fileName groupDir
+        (
+            const fileName& commsDir,
+            const word& regionsName,
+            const wordRe& groupName
+        );
+
+        //- Return the file path to the base communications directory
+        fileName baseDir() const;
+
+        //- Return the file path to the lock file
+        fileName lockFile() const;
+
+        //- Create lock file
+        void createLockFile() const;
+
+        //- Remove lock file
+        void removeLockFile() const;
+
+        //- Remove files written by OpenFOAM
+        void removeWriteFiles() const;
+
+        //- Remove files written by external code
+        void removeReadFiles() const;
+
+        //- Wait for response from external source
+        void wait() const;
+
+
+        //- Read data for a single region, single field
+        template<class Type>
+        bool readData
+        (
+            const UPtrList<const fvMesh>& meshes,
+            const wordRe& groupName,
+            const word& fieldName
+        );
+        //- Read data for all regions, all fields
+        void readData();
+
+        //- Write data for a single region, single field
+        template<class Type>
+        bool writeData
+        (
+            const UPtrList<const fvMesh>& meshes,
+            const wordRe& groupName,
+            const word& fieldName
+        ) const;
+
+        //- Write data for all regions, all fields
+        void writeData() const;
+
+        void initialise();
+
+        //- Read (and distribute) scalar columns from stream. Every processor
+        //  gets nRows (= patch size) of these. Note: could make its argument
+        //  ISstream& but then would need additional logic to construct valid
+        //  stream on all processors.
+        void readColumns
+        (
+            const label nRows,
+            const label nColumns,
+            autoPtr<IFstream>& masterFilePtr,
+            List<scalarField>& data
+        ) const;
+
+        //- Read (and distribute) lines from stream. Every processor
+        //  gets nRows (= patch size) of these. Data kept as stream (instead
+        //  of strings) for ease of interfacing to readData routines that take
+        //  an Istream.
+        void readLines
+        (
+            const label nRows,
+            autoPtr<IFstream>& masterFilePtr,
+            OStringStream& data
+        ) const;
+
+        //- Helper: append data from all processors onto master
+        template<class Type>
+        static tmp<Field<Type> > gatherAndCombine(const Field<Type>& fld);
+
+        static void checkOrder(const wordList&);
+
+        //- Disallow default bitwise copy construc
+        externalCoupledFunctionObject(const externalCoupledFunctionObject&);
+
+        //- Disallow default bitwise assignmen
+        void operator=(const externalCoupledFunctionObject&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("externalCoupled");
+
+    //- Name of lock file
+    static word lockName;
+
+    //- Name of patch key, e.g. '# Patch:' when looking for start of patch data
+    static string patchKey;
+
+
+    // Constructors
+
+        //- Construct given time and dictionary
+        externalCoupledFunctionObject
+        (
+            const word& name,
+            const Time& runTime,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~externalCoupledFunctionObject();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the enabled flag
+            virtual bool enabled() const
+            {
+                return enabled_;
+            }
+
+
+        // Function object control
+
+            //- Switch the function object on
+            virtual void on();
+
+            //- Switch the function object off
+            virtual void off();
+
+            //- Called at the start of the time-loop
+            virtual bool start();
+
+            //- Called at each ++ or += of the time-loop
+            virtual bool execute(const bool forceWrite);
+
+            //- Called when Time::run() determines that the time-loop exits
+            virtual bool end();
+
+            //- Called when time was set at the end of the Time::operator++
+            virtual bool timeSet();
+
+            //- Called at the end of Time::adjustDeltaT() if adjustTime is true
+            virtual bool adjustTimeStep();
+
+            //- Read and set the function object if its data have changed
+            virtual bool read(const dictionary&);
+
+            //- Update for changes of mesh
+            virtual void updateMesh(const mapPolyMesh& mpm);
+
+            //- Update for changes of mesh
+            virtual void movePoints(const polyMesh& mesh);
+
+
+        // Other
+
+            //- Create single name by appending words (in sorted order),
+            //  separated by '_'
+            static word compositeName(const wordList&);
+
+            //- Write geometry for the group/patch
+            static void writeGeometry
+            (
+                const UPtrList<const fvMesh>& meshes,
+                const fileName& commsDir,
+                const wordRe& groupName
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "externalCoupledFunctionObjectTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObjectTemplates.C b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObjectTemplates.C
new file mode 100644
index 0000000000..7cb6ef9b17
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObjectTemplates.C
@@ -0,0 +1,505 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify i
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "externalCoupledFunctionObject.H"
+#include "OSspecific.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "volFields.H"
+#include "externalCoupledMixedFvPatchFields.H"
+#include "mixedFvPatchFields.H"
+#include "fixedGradientFvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+#include "OStringStream.H"
+#include "globalIndex.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::externalCoupledFunctionObject::readData
+(
+    const UPtrList<const fvMesh>& meshes,
+    const wordRe& groupName,
+    const word& fieldName
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
+    typedef externalCoupledMixedFvPatchField<Type> patchFieldType;
+
+    wordList regionNames(meshes.size());
+    forAll(meshes, i)
+    {
+        regionNames[i] = meshes[i].dbDir();
+    }
+
+    // File only opened on master; contains data for all processors, for all
+    // patchIDs.
+    autoPtr<IFstream> masterFilePtr;
+    if (Pstream::master())
+    {
+        const fileName transferFile
+        (
+            groupDir(commsDir_, compositeName(regionNames), groupName)
+          / fieldName + ".in"
+        );
+
+        if (log_)
+        {
+            Info<< type() << ": reading data from " << transferFile << endl;
+        }
+        masterFilePtr.reset(new IFstream(transferFile));
+
+        if (!masterFilePtr().good())
+        {
+            FatalIOErrorInFunction(masterFilePtr())
+                << "Cannot open file for region " << compositeName(regionNames)
+                << ", field " << fieldName
+                << exit(FatalIOError);
+        }
+    }
+
+
+    label nFound = 0;
+
+
+    forAll(meshes, i)
+    {
+        const fvMesh& mesh = meshes[i];
+
+        if (!mesh.foundObject<volFieldType>(fieldName))
+        {
+            continue;
+        }
+
+        nFound++;
+
+        const volFieldType& cvf = mesh.lookupObject<volFieldType>(fieldName);
+        const typename volFieldType::GeometricBoundaryField& bf =
+            cvf.boundaryField();
+
+
+        // Get the patches
+        const labelList patchIDs
+        (
+            mesh.boundaryMesh().patchSet
+            (
+                List<wordRe>(1, groupName)
+            ).sortedToc()
+        );
+
+        // Handle column-wise reading of patch data. Supports most easy types
+        forAll(patchIDs, i)
+        {
+            label patchI = patchIDs[i];
+
+            if (isA<patchFieldType>(bf[patchI]))
+            {
+                // Explicit handling of externalCoupledMixed bcs - they
+                // have specialised reading routines.
+
+                patchFieldType& pf = const_cast<patchFieldType&>
+                (
+                    refCast<const patchFieldType>
+                    (
+                        bf[patchI]
+                    )
+                );
+
+                // Read from master into local stream
+                OStringStream os;
+                readLines
+                (
+                    bf[patchI].size(),      // number of lines to read
+                    masterFilePtr,
+                    os
+                );
+
+                // Pass responsability for all reading over to bc
+                pf.readData(IStringStream(os.str())());
+
+                // Update the value from the read coefficicient. Bypass any
+                // additional processing by derived type.
+                pf.patchFieldType::evaluate();
+            }
+            else if (isA<mixedFvPatchField<Type> >(bf[patchI]))
+            {
+                // Read columns from file for
+                // value, snGrad, refValue, refGrad, valueFraction
+                List<scalarField> data;
+                readColumns
+                (
+                    bf[patchI].size(),              // number of lines to read
+                    4*pTraits<Type>::nComponents+1, // nColumns: 4*Type+1*scalar
+                    masterFilePtr,
+                    data
+                );
+
+                mixedFvPatchField<Type>& pf =
+                const_cast<mixedFvPatchField<Type>&>
+                (
+                    refCast<const mixedFvPatchField<Type> >
+                    (
+                        bf[patchI]
+                    )
+                );
+
+                // Transfer read data to bc.
+                // Skip value, snGrad
+                direction columnI = 2*pTraits<Type>::nComponents;
+
+                Field<Type>& refValue = pf.refValue();
+                for
+                (
+                    direction cmpt = 0;
+                    cmpt < pTraits<Type>::nComponents;
+                    cmpt++
+                )
+                {
+                    refValue.replace(cmpt, data[columnI++]);
+                }
+                Field<Type>& refGrad = pf.refGrad();
+                for
+                (
+                    direction cmpt = 0;
+                    cmpt < pTraits<Type>::nComponents;
+                    cmpt++
+                )
+                {
+                    refGrad.replace(cmpt, data[columnI++]);
+                }
+                pf.valueFraction() = data[columnI];
+
+                // Update the value from the read coefficicient. Bypass any
+                // additional processing by derived type.
+                pf.mixedFvPatchField<Type>::evaluate();
+            }
+            else if (isA<fixedGradientFvPatchField<Type> >(bf[patchI]))
+            {
+                // Read columns for value and gradient
+                List<scalarField> data;
+                readColumns
+                (
+                    bf[patchI].size(),              // number of lines to read
+                    2*pTraits<Type>::nComponents,   // nColumns: Type
+                    masterFilePtr,
+                    data
+                );
+
+                fixedGradientFvPatchField<Type>& pf =
+                const_cast<fixedGradientFvPatchField<Type>&>
+                (
+                    refCast<const fixedGradientFvPatchField<Type> >
+                    (
+                        bf[patchI]
+                    )
+                );
+
+                // Transfer gradient to bc
+                Field<Type>& gradient = pf.gradient();
+                for
+                (
+                    direction cmpt = 0;
+                    cmpt < pTraits<Type>::nComponents;
+                    cmpt++
+                )
+                {
+                    gradient.replace
+                    (
+                        cmpt,
+                        data[pTraits<Type>::nComponents+cmpt]
+                    );
+                }
+
+                // Update the value from the read coefficicient. Bypass any
+                // additional processing by derived type.
+                pf.fixedGradientFvPatchField<Type>::evaluate();
+            }
+            else if (isA<fixedValueFvPatchField<Type> >(bf[patchI]))
+            {
+                // Read columns for value only
+                List<scalarField> data;
+                readColumns
+                (
+                    bf[patchI].size(),              // number of lines to read
+                    pTraits<Type>::nComponents,     // number of columns to read
+                    masterFilePtr,
+                    data
+                );
+
+                // Transfer read value to bc
+                Field<Type> value(bf[patchI].size());
+                for
+                (
+                    direction cmpt = 0;
+                    cmpt < pTraits<Type>::nComponents;
+                    cmpt++
+                )
+                {
+                    value.replace(cmpt, data[cmpt]);
+                }
+
+                fixedValueFvPatchField<Type>& pf =
+                const_cast<fixedValueFvPatchField<Type>&>
+                (
+                    refCast<const fixedValueFvPatchField<Type> >
+                    (
+                        bf[patchI]
+                    )
+                );
+
+                pf == value;
+
+                // Update the value from the read coefficicient. Bypass any
+                // additional processing by derived type.
+                pf.fixedValueFvPatchField<Type>::evaluate();
+            }
+            else
+            {
+                FatalErrorInFunction
+                    << "Unsupported boundary condition " << bf[patchI].type()
+                    << " for patch " << bf[patchI].patch().name()
+                    << " in region " << mesh.name()
+                    << exit(FatalError);
+            }
+
+            initialised_ = true;
+        }
+    }
+
+    return nFound > 0;
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::externalCoupledFunctionObject::gatherAndCombine
+(
+    const Field<Type>& fld
+)
+{
+    // Collect values from all processors
+    List<Field<Type> > gatheredValues(Pstream::nProcs());
+    gatheredValues[Pstream::myProcNo()] = fld;
+    Pstream::gatherList(gatheredValues);
+
+
+    tmp<Field<Type> > tresult(new Field<Type>(0));
+    Field<Type>& result = tresult();
+
+    if (Pstream::master())
+    {
+        // Combine values into single field
+        label globalElemI = 0;
+
+        forAll(gatheredValues, lstI)
+        {
+            globalElemI += gatheredValues[lstI].size();
+        }
+
+        result.setSize(globalElemI);
+
+        globalElemI = 0;
+
+        forAll(gatheredValues, lstI)
+        {
+            const Field<Type>& sub = gatheredValues[lstI];
+
+            forAll(sub, elemI)
+            {
+                result[globalElemI++] = sub[elemI];
+            }
+        }
+    }
+
+    return tresult;
+}
+
+
+template<class Type>
+bool Foam::externalCoupledFunctionObject::writeData
+(
+    const UPtrList<const fvMesh>& meshes,
+    const wordRe& groupName,
+    const word& fieldName
+) const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
+    typedef externalCoupledMixedFvPatchField<Type> patchFieldType;
+
+    wordList regionNames(meshes.size());
+    forAll(meshes, i)
+    {
+        regionNames[i] = meshes[i].dbDir();
+    }
+
+    // File only opened on master; contains data for all processors, for all
+    // patchIDs
+    autoPtr<OFstream> masterFilePtr;
+    if (Pstream::master())
+    {
+        const fileName transferFile
+        (
+            groupDir(commsDir_, compositeName(regionNames), groupName)
+          / fieldName + ".out"
+        );
+
+        if (log_)
+        {
+            Info<< type() << ": writing data to " << transferFile << endl;
+        }
+        masterFilePtr.reset(new OFstream(transferFile));
+
+        if (!masterFilePtr().good())
+        {
+            FatalIOErrorInFunction(masterFilePtr())
+                << "Cannot open file for region " << compositeName(regionNames)
+                << ", field " << fieldName
+                << exit(FatalIOError);
+        }
+    }
+
+
+    bool headerDone = false;
+
+    label nFound = 0;
+
+    forAll(meshes, i)
+    {
+        const fvMesh& mesh = meshes[i];
+
+        if (!mesh.foundObject<volFieldType>(fieldName))
+        {
+            continue;
+        }
+
+        nFound++;
+
+        const volFieldType& cvf = mesh.lookupObject<volFieldType>(fieldName);
+        const typename volFieldType::GeometricBoundaryField& bf =
+            cvf.boundaryField();
+
+
+        // Get the patches
+        const labelList patchIDs
+        (
+            mesh.boundaryMesh().patchSet
+            (
+                List<wordRe>(1, groupName)
+            ).sortedToc()
+        );
+
+        // Handle column-wise writing of patch data. Supports most easy types
+        forAll(patchIDs, i)
+        {
+            label patchI = patchIDs[i];
+
+            const globalIndex globalFaces(bf[patchI].size());
+
+            if (isA<patchFieldType>(bf[patchI]))
+            {
+                // Explicit handling of externalCoupledMixed bcs - they
+                // have specialised writing routines
+
+                const patchFieldType& pf = refCast<const patchFieldType>
+                (
+                    bf[patchI]
+                );
+                OStringStream os;
+
+                // Pass responsibility for all writing over to bc
+                pf.writeData(os);
+
+                // Collect contributions from all processors and output them on
+                // master
+                if (Pstream::master())
+                {
+                    // Output master data first
+                    if (!headerDone)
+                    {
+                        pf.writeHeader(masterFilePtr());
+                        headerDone = true;
+                    }
+                    masterFilePtr() << os.str().c_str();
+
+                    for (label procI = 1; procI < Pstream::nProcs(); procI++)
+                    {
+                        IPstream fromSlave(Pstream::scheduled, procI);
+                        string str(fromSlave);
+                        masterFilePtr() << str.c_str();
+                    }
+                }
+                else
+                {
+                    OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
+                    toMaster << os.str();
+                }
+            }
+            else if (isA<mixedFvPatchField<Type> >(bf[patchI]))
+            {
+                const mixedFvPatchField<Type>& pf =
+                    refCast<const mixedFvPatchField<Type> >(bf[patchI]);
+
+                Field<Type> value(gatherAndCombine(pf));
+                Field<Type> snGrad(gatherAndCombine(pf.snGrad()()));
+                Field<Type> refValue(gatherAndCombine(pf.refValue()));
+                Field<Type> refGrad(gatherAndCombine(pf.refGrad()));
+                scalarField valueFraction(gatherAndCombine(pf.valueFraction()));
+
+                if (Pstream::master())
+                {
+                    forAll(refValue, faceI)
+                    {
+                        masterFilePtr()
+                            << value[faceI] << token::SPACE
+                            << snGrad[faceI] << token::SPACE
+                            << refValue[faceI] << token::SPACE
+                            << refGrad[faceI] << token::SPACE
+                            << valueFraction[faceI] << nl;
+                    }
+                }
+            }
+            else
+            {
+                // Output the value and snGrad
+                Field<Type> value(gatherAndCombine(bf[patchI]));
+                Field<Type> snGrad(gatherAndCombine(bf[patchI].snGrad()()));
+                if (Pstream::master())
+                {
+                    forAll(value, faceI)
+                    {
+                        masterFilePtr()
+                            << value[faceI] << token::SPACE
+                            << snGrad[faceI] << nl;
+                    }
+                }
+            }
+        }
+    }
+
+    return nFound > 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
new file mode 100644
index 0000000000..c99e3cc1e5
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "externalCoupledMixedFvPatchField.H"
+#include "fvPatchFieldMapper.H"
+#include "ISstream.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+externalCoupledMixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    mixedFvPatchField<Type>(p, iF)
+{
+    this->refValue() = pTraits<Type>::zero;
+    this->refGrad() = pTraits<Type>::zero;
+    this->valueFraction() = 0.0;
+}
+
+
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+externalCoupledMixedFvPatchField
+(
+    const externalCoupledMixedFvPatchField& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+externalCoupledMixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchField<Type>(p, iF, dict)
+{}
+
+
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+externalCoupledMixedFvPatchField
+(
+    const externalCoupledMixedFvPatchField& ecmpf
+)
+:
+    mixedFvPatchField<Type>(ecmpf)
+{}
+
+
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+externalCoupledMixedFvPatchField
+(
+    const externalCoupledMixedFvPatchField& ecmpf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    mixedFvPatchField<Type>(ecmpf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+~externalCoupledMixedFvPatchField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::externalCoupledMixedFvPatchField<Type>::writeHeader
+(
+    Ostream& os
+) const
+{
+    os  << "# Values: value snGrad refValue refGrad valueFraction" << endl;
+}
+
+
+template<class Type>
+void Foam::externalCoupledMixedFvPatchField<Type>::writeData
+(
+    Ostream& os
+) const
+{
+    const Field<Type> snGrad(this->snGrad());
+    const Field<Type>& refValue(this->refValue());
+    const Field<Type>& refGrad(this->refGrad());
+    const scalarField& valueFraction(this->valueFraction());
+
+    forAll(refValue, faceI)
+    {
+        os  << this->operator[](faceI) << token::SPACE
+            << snGrad[faceI] << token::SPACE
+            << refValue[faceI] << token::SPACE
+            << refGrad[faceI] << token::SPACE
+            << valueFraction[faceI] << nl;
+    }
+}
+
+
+template<class Type>
+void Foam::externalCoupledMixedFvPatchField<Type>::readData(Istream& is)
+{
+    // Assume generic input stream so we can do line-based format and skip
+    // unused columns
+    ISstream& iss = dynamic_cast<ISstream&>(is);
+
+    string line;
+
+    forAll(*this, faceI)
+    {
+        iss.getLine(line);
+        IStringStream lineStr(line);
+
+        // For symmetry with writing ignore value, snGrad columns
+
+        Type value, snGrad;
+
+        lineStr
+            >> value
+            >> snGrad
+            >> this->refValue()[faceI]
+            >> this->refGrad()[faceI]
+            >> this->valueFraction()[faceI];
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.H
new file mode 100644
index 0000000000..2d700207d1
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::externalCoupledMixedFvPatchField
+
+Group
+    grpGenericBoundaryConditions grpCoupledBoundaryConditions
+
+Description
+    This boundary condition extends the mixed boundary condition with
+    serialisation through
+    - writeHeader
+    - writeData
+    - readData
+    functions. It is used for coupling to external applications in combination
+    with the externalCoupled functionObject. The default output is one
+    line per face, with columns
+    <value> <snGrad> <refValue> <refGrad> <valueFraction>
+
+Notes
+    readData,writeData are not callbacks for regIOobject (since fvPatchField
+    not derived from it). They do however do exactly the same - streaming of
+    data.
+
+SeeAlso
+    mixedFvPatchField
+    externalCoupledFunctionObject
+
+SourceFiles
+    externalCoupledMixedFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef externalCoupledMixedFvPatchField_H
+#define externalCoupledMixedFvPatchField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+              Class externalCoupledMixedFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class externalCoupledMixedFvPatchField
+:
+    public mixedFvPatchField<Type>
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("externalCoupled");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        externalCoupledMixedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        externalCoupledMixedFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given externalCoupledMixedFvPatchField
+        //  onto a new patch
+        externalCoupledMixedFvPatchField
+        (
+            const externalCoupledMixedFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        externalCoupledMixedFvPatchField
+        (
+            const externalCoupledMixedFvPatchField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new externalCoupledMixedFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        externalCoupledMixedFvPatchField
+        (
+            const externalCoupledMixedFvPatchField&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new externalCoupledMixedFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~externalCoupledMixedFvPatchField();
+
+
+    // Member functions
+
+        //- Write header
+        virtual void writeHeader(Ostream&) const;
+
+        //- Write data
+        virtual void writeData(Ostream&) const;
+
+        //- Read data
+        virtual void readData(Istream&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "externalCoupledMixedFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFields.C b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
similarity index 95%
rename from src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
rename to src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
index 42ab10636d..3a5bce74c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFields.H b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.H
similarity index 95%
rename from src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFields.H
rename to src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.H
index 36d457004b..72b563638b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFields.H
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
similarity index 95%
rename from src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
rename to src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
index 7aae5c7b50..b39a8d7da5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
similarity index 62%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
rename to src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index 9791087190..01976d4304 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -28,16 +28,15 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
-#include "OFstream.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeHeader
 (
-    OFstream& os
+    Ostream& os
 ) const
 {
-    os  << "# Values: magSf value qDot htc" << endl;
+    os  << "# Values: magSf T qDot htc" << endl;
 }
 
 
@@ -75,8 +74,40 @@ externalCoupledTemperatureMixedFvPatchScalarField
     const dictionary& dict
 )
 :
-    externalCoupledMixedFvPatchField<scalar>(p, iF, dict)
-{}
+    //externalCoupledMixedFvPatchField<scalar>(p, iF, dict)
+    externalCoupledMixedFvPatchField<scalar>(p, iF)
+{
+    if (dict.found("refValue"))
+    {
+        // Initialise same way as mixed
+        this->refValue() = scalarField("refValue", dict, p.size());
+        this->refGrad() = scalarField("refGradient", dict, p.size());
+        this->valueFraction() = scalarField("valueFraction", dict, p.size());
+
+        evaluate();
+    }
+    else
+    {
+        // For convenience: initialise as fixedValue with either read value
+        // or extrapolated value
+        if (dict.found("value"))
+        {
+            fvPatchField<scalar>::operator=
+            (
+                scalarField("value", dict, p.size())
+            );
+        }
+        else
+        {
+            fvPatchField<scalar>::operator=(this->patchInternalField());
+        }
+
+        // Initialise as a fixed value
+        this->refValue() = *this;
+        this->refGrad() = pTraits<scalar>::zero;
+        this->valueFraction() = 1.0;
+    }
+}
 
 
 Foam::externalCoupledTemperatureMixedFvPatchScalarField::
@@ -109,21 +140,14 @@ Foam::externalCoupledTemperatureMixedFvPatchScalarField::
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
+void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
 (
-    OFstream& os
+    Ostream& os
 ) const
 {
-    if (log())
-    {
-        Info<< type() << ": " << this->patch().name()
-            << ": writing data to " << os.name()
-            << endl;
-    }
-
     const label patchI = patch().index();
 
-    // heat flux [W/m2]
+    // Heat flux [W/m2]
     scalarField qDot(this->patch().size(), 0.0);
 
     typedef compressible::turbulenceModel cmpTurbModelType;
@@ -137,7 +161,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
         )
     );
 
-    static word thermoName(basicThermo::dictName);
+    static word thermoName("thermophysicalProperties");
 
     if (db().foundObject<cmpTurbModelType>(turbName))
     {
@@ -160,105 +184,54 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData
     }
     else
     {
-        FatalErrorIn
-        (
-            "void Foam::externalCoupledTemperatureMixedFvPatchScalarField::"
-            "transferData"
-            "("
-                "OFstream&"
-            ") const"
-        )   << "Condition requires either compressible turbulence and/or "
+        FatalErrorInFunction
+            << "Condition requires either compressible turbulence and/or "
             << "thermo model to be available" << exit(FatalError);
     }
 
-    // patch temperature [K]
-    const scalarField Tp(*this);
+    // Patch temperature [K]
+    const scalarField& Tp(*this);
 
-    // near wall cell temperature [K]
+    // Near wall cell temperature [K]
     const scalarField Tc(patchInternalField());
 
-    // heat transfer coefficient [W/m2/K]
+    // Heat transfer coefficient [W/m2/K]
     const scalarField htc(qDot/(Tp - Tc + ROOTVSMALL));
 
-    if (Pstream::parRun())
+    const Field<scalar>& magSf(this->patch().magSf());
+
+    forAll(patch(), faceI)
     {
-        int tag = Pstream::msgType() + 1;
-
-        List<Field<scalar> > magSfs(Pstream::nProcs());
-        magSfs[Pstream::myProcNo()].setSize(this->patch().size());
-        magSfs[Pstream::myProcNo()] = this->patch().magSf();
-        Pstream::gatherList(magSfs, tag);
-
-        List<Field<scalar> > values(Pstream::nProcs());
-        values[Pstream::myProcNo()].setSize(this->patch().size());
-        values[Pstream::myProcNo()] = Tp;
-        Pstream::gatherList(values, tag);
-
-        List<Field<scalar> > qDots(Pstream::nProcs());
-        qDots[Pstream::myProcNo()].setSize(this->patch().size());
-        qDots[Pstream::myProcNo()] = qDot;
-        Pstream::gatherList(qDots, tag);
-
-        List<Field<scalar> > htcs(Pstream::nProcs());
-        htcs[Pstream::myProcNo()].setSize(this->patch().size());
-        htcs[Pstream::myProcNo()] = htc;
-        Pstream::gatherList(htcs, tag);
-
-        if (Pstream::master())
-        {
-            forAll(values, procI)
-            {
-                const Field<scalar>& magSf = magSfs[procI];
-                const Field<scalar>& value = values[procI];
-                const Field<scalar>& qDot = qDots[procI];
-                const Field<scalar>& htc = htcs[procI];
-
-                forAll(magSf, faceI)
-                {
-                    os  << magSf[faceI] << token::SPACE
-                        << value[faceI] << token::SPACE
-                        << qDot[faceI] << token::SPACE
-                        << htc[faceI] << token::SPACE
-                        << nl;
-                }
-            }
-
-            os.flush();
-        }
-    }
-    else
-    {
-        const Field<scalar>& magSf(this->patch().magSf());
-
-        forAll(patch(), faceI)
-        {
-            os  << magSf[faceI] << token::SPACE
-                << Tp[faceI] << token::SPACE
-                << qDot[faceI] << token::SPACE
-                << htc[faceI] << token::SPACE
-                << nl;
-        }
-
-        os.flush();
+        os  << magSf[faceI] << token::SPACE
+            << Tp[faceI] << token::SPACE
+            << qDot[faceI] << token::SPACE
+            << htc[faceI] << token::SPACE
+            << nl;
     }
 }
 
 
-void Foam::externalCoupledTemperatureMixedFvPatchScalarField::evaluate
+void Foam::externalCoupledTemperatureMixedFvPatchScalarField::readData
 (
-    const Pstream::commsTypes comms
+    Istream& is
 )
 {
-    externalCoupledMixedFvPatchField<scalar>::evaluate(comms);
-}
+    // Assume generic input stream so we can do line-based format and skip
+    // unused columns
+    ISstream& iss = dynamic_cast<ISstream&>(is);
 
+    string line;
 
-void Foam::externalCoupledTemperatureMixedFvPatchScalarField::write
-(
-    Ostream& os
-) const
-{
-    externalCoupledMixedFvPatchField<scalar>::write(os);
+    forAll(*this, faceI)
+    {
+        iss.getLine(line);
+        IStringStream lineStr(line);
+
+        lineStr
+            >> this->refValue()[faceI]
+            >> this->refGrad()[faceI]
+            >> this->valueFraction()[faceI];
+    }
 }
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
similarity index 73%
rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
rename to src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
index 47fb915318..70ba538e17 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
+++ b/src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
@@ -29,28 +29,28 @@ Group
 
 Description
     This boundary condition provides a temperatue interface to an external
-    application.  Values are transferred as plain text files, where OpenFOAM
+    application. Values are transferred as plain text files, where OpenFOAM
     data is written as:
 
-        # Patch: <patch name>
-        <magSf1> <value1> <qDot1> <htc1>
-        <magSf2> <value2> <qDot2> <htc2>
-        <magSf3> <value3> <qDot3> <htc2>
+        # Patch: \<patch name\>
+        \<magSf1\> \<value1\> \<qDot1\> \<htc1\>
+        \<magSf2\> \<value2\> \<qDot2\> \<htc2\>
+        \<magSf3\> \<value3\> \<qDot3\> \<htc2\>
         ...
-        <magSfN> <valueN> <qDotN> <htcN>
+        \<magSfN\> \<valueN\> \<qDotN\> \<htcN\>
 
     and received as the constituent pieces of the `mixed' condition, i.e.
 
-        # Patch: <patch name>
-        <value1> <gradient1> <valueFracion1>
-        <value2> <gradient2> <valueFracion2>
-        <value3> <gradient3> <valueFracion3>
+        # Patch: \<patch name\>
+        \<value1\> \<gradient1\> \<valueFracion1\>
+        \<value2\> \<gradient2\> \<valueFracion2\>
+        \<value3\> \<gradient3\> \<valueFracion3\>
         ...
-        <valueN> <gradientN> <valueFracionN>
+        \<valueN\> \<gradientN\> \<valueFracionN\>
 
     Data is sent/received as a single file for all patches from the directory
 
-        $FOAM_CASE/<commsDir>
+        $FOAM_CASE/\<commsDir\>
 
     At start-up, the boundary creates a lock file, i.e..
 
@@ -59,42 +59,21 @@ Description
     ... to signal the external source to wait.  During the boundary condition
     update, boundary values are written to file, e.g.
 
-        <fileName>.out
+        \<fileName\>.out
 
     The lock file is then removed, instructing the external source to take
     control of the program execution.  When ready, the external program
     should create the return values, e.g. to file
 
-        <fileName>.in
+        \<fileName\>.in
 
     ... and then re-instate the lock file.  The boundary condition will then
     read the return values, and pass program execution back to OpenFOAM.
 
-
-    \heading Patch usage
-
-    \table
-        Property     | Description             | Required    | Default value
-        commsDir     | communications directory   | yes         |
-        fileName     | transfer file name      | yes         |
-        waitInterval | interval [s] between file checks | no | 1
-        timeOut      | time after which error invoked [s] |no |100*waitInterval
-        calcFrequency | calculation frequency  | no          | 1
-        log          | log program control     | no          | no
-    \endtable
-
-    Example of the boundary condition specification:
-    \verbatim
-    myPatch
-    {
-        type            externalCoupledTemperature;
-        commsDir        "$FOAM_CASE/comms";
-        fileName        data;
-        calcFrequency   1;
-    }
-    \endverbatim
+    To be used in combination with the externalCoupled functionObject.
 
 SeeAlso
+    externalCoupledFunctionObject
     mixedFvPatchField
     externalCoupledMixedFvPatchField
 
@@ -113,10 +92,8 @@ SourceFiles
 namespace Foam
 {
 
-class IFstream;
-
 /*---------------------------------------------------------------------------*\
-     Class externalCoupledTemperatureMixedFvPatchScalarField Declaration
+      Class externalCoupledTemperatureMixedFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class externalCoupledTemperatureMixedFvPatchScalarField
@@ -124,14 +101,6 @@ class externalCoupledTemperatureMixedFvPatchScalarField
     public externalCoupledMixedFvPatchField<scalar>
 {
 
-protected:
-
-    // Protected Member Functions
-
-        //- Write header to transfer file
-        virtual void writeHeader(OFstream& os) const;
-
-
 public:
 
     //- Runtime type information
@@ -210,20 +179,14 @@ public:
 
     // Member functions
 
-        // Evaluation functions
+        //- Write header
+        virtual void writeHeader(Ostream&) const;
 
-            //- Evaluate the patch field
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::blocking
-            );
+        //- Write data
+        virtual void writeData(Ostream&) const;
 
-            //- Transfer data for external source
-            virtual void transferData(OFstream& os) const;
-
-
-        //- Write
-        virtual void write(Ostream&) const;
+        //- Read data
+        virtual void readData(Istream&);
 };
 
 
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/IOrunTimeControl.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/IOrunTimeControl.H
new file mode 100644
index 0000000000..da73cb5db3
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/IOrunTimeControl.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOrunTimeControl
+
+Description
+    Instance of the generic IOOutputFilter for runTimeControl.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOrunTimeControl_H
+#define IOrunTimeControl_H
+
+#include "runTimeControl.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<runTimeControl> IOrunTimeControl;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
new file mode 100644
index 0000000000..486a70c797
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "averageCondition.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(averageCondition, 0);
+    addToRunTimeSelectionTable(runTimeCondition, averageCondition, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::averageCondition::averageCondition
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+:
+    runTimeCondition(name, obr, dict, state),
+    functionObjectName_(dict.lookup("functionObjectName")),
+    fieldNames_(dict.lookup("fields")),
+    tolerance_(readScalar(dict.lookup("tolerance"))),
+    window_(dict.lookupOrDefault<scalar>("window", -1)),
+    totalTime_(fieldNames_.size(), obr_.time().deltaTValue()),
+    resetOnRestart_(false)
+{
+    if (resetOnRestart_)
+    {
+        const dictionary& dict = conditionDict();
+
+        forAll(fieldNames_, fieldI)
+        {
+            const word& fieldName = fieldNames_[fieldI];
+
+            if (dict.found(fieldName))
+            {
+                const dictionary& valueDict = dict.subDict(fieldName);
+                totalTime_[fieldI] = readScalar(valueDict.lookup("totalTime"));
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::averageCondition::~averageCondition()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+bool Foam::averageCondition::apply()
+{
+    bool satisfied = true;
+
+    if (!active_)
+    {
+        return satisfied;
+    }
+
+    scalar dt = obr_.time().deltaTValue();
+
+    if (log_) Info<< "    " << type() << ": " << name_ << " averages:" << nl;
+
+    DynamicList<label> unprocessedFields(fieldNames_.size());
+
+    forAll(fieldNames_, fieldI)
+    {
+        const word& fieldName(fieldNames_[fieldI]);
+
+        scalar Dt = totalTime_[fieldI];
+        scalar alpha = (Dt - dt)/Dt;
+        scalar beta = dt/Dt;
+
+        if (window_ > 0)
+        {
+            if (Dt - dt >= window_)
+            {
+                alpha = (window_ - dt)/window_;
+                beta = dt/window_;
+            }
+            else
+            {
+                // Ensure that averaging is performed over window time
+                // before condition can be satisfied
+                satisfied = false;
+            }
+        }
+
+        bool processed = false;
+        calc<scalar>(fieldName, alpha, beta, satisfied, processed);
+        calc<vector>(fieldName, alpha, beta, satisfied, processed);
+        calc<sphericalTensor>(fieldName, alpha, beta, satisfied, processed);
+        calc<symmTensor>(fieldName, alpha, beta, satisfied, processed);
+        calc<tensor>(fieldName, alpha, beta, satisfied, processed);
+
+        if (!processed)
+        {
+            unprocessedFields.append(fieldI);
+        }
+
+        totalTime_[fieldI] += dt;
+    }
+
+    if (unprocessedFields.size())
+    {
+        WarningInFunction
+            << "From function object: " << functionObjectName_ << nl
+            << "Unprocessed fields:" << nl;
+
+        forAll(unprocessedFields, i)
+        {
+            label fieldI = unprocessedFields[i];
+            Info<< "        " << fieldNames_[fieldI] << nl;
+        }
+    }
+
+    if (log_) Info<< endl;
+
+    return satisfied;
+}
+
+
+void Foam::averageCondition::write()
+{
+    dictionary& conditionDict = this->conditionDict();
+
+    forAll(fieldNames_, fieldI)
+    {
+        const word& fieldName = fieldNames_[fieldI];
+
+        // value dictionary should be present - mean values are written there
+        if (conditionDict.found(fieldName))
+        {
+            dictionary& valueDict = conditionDict.subDict(fieldName);
+            valueDict.add("totalTime", totalTime_[fieldI], true);
+        }
+        else
+        {
+            dictionary valueDict;
+            valueDict.add("totalTime", totalTime_[fieldI], true);
+            conditionDict.add(fieldName, valueDict);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageCondition.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageCondition.H
new file mode 100644
index 0000000000..0734cda8fd
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageCondition.H
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::averageCondition
+
+Description
+    Average run time condition - satisfied when average does not change by
+    more than a given value.
+
+SourceFiles
+    averageCondition.H
+    averageCondition.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef averageCondition_H
+#define averageCondition_H
+
+#include "runTimeCondition.H"
+#include "Switch.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class averageCondition Declaration
+\*---------------------------------------------------------------------------*/
+
+class averageCondition
+:
+    public runTimeCondition
+{
+protected:
+
+    // Protected data
+
+        //- Name of function object to retrueve data from
+        word functionObjectName_;
+
+        //- List of fields on which to operate
+        wordList fieldNames_;
+
+        //- Satisfied when difference in mean values is less than this value
+        const scalar tolerance_;
+
+        //- Averaging window
+        const scalar window_;
+
+        //- Average time per field
+        List<scalar> totalTime_;
+
+        //- Reset the averaging process on restart flag
+        Switch resetOnRestart_;
+
+
+    // Protected Member Functions
+
+        //- Templated function to calculate the average
+        template<class Type>
+        void calc
+        (
+            const word& fieldName,
+            const scalar alpha,
+            const scalar beta,
+            bool& satisfied,
+            bool& processed
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("average");
+
+    //- Constructor
+    averageCondition
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+    //- Destructor
+    virtual ~averageCondition();
+
+
+    // Public Member Functions
+
+        //- Apply the condition
+        virtual bool apply();
+
+        //- Write
+        virtual void write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "averageConditionTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C
new file mode 100644
index 0000000000..d5d35ed61d
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class Type>
+void Foam::averageCondition::calc
+(
+    const word& fieldName,
+    const scalar alpha,
+    const scalar beta,
+    bool& satisfied,
+    bool& processed
+)
+{
+    const word valueType =
+        state_.objectResultType(functionObjectName_, fieldName);
+
+    if (pTraits<Type>::typeName != valueType)
+    {
+        return;
+    }
+
+    Type currentValue =
+        state_.getObjectResult<Type>(functionObjectName_, fieldName);
+
+    const word meanName(fieldName + "Mean");
+
+    Type meanValue = state_.getResult<Type>(meanName);
+    meanValue = alpha*meanValue + beta*currentValue;
+
+    scalar delta = mag(meanValue - currentValue);
+
+    if (log_)
+    {
+        Info<< "        " << meanName << ": " << meanValue
+            << ", delta: " << delta << nl;
+    }
+
+    state_.setResult(meanName, meanValue);
+
+    if (delta > tolerance_)
+    {
+        satisfied = false;
+    }
+
+    processed = true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
new file mode 100644
index 0000000000..9db4093b8b
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "equationInitialResidualCondition.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(equationInitialResidualCondition, 0);
+    addToRunTimeSelectionTable
+    (
+        runTimeCondition,
+        equationInitialResidualCondition,
+        dictionary
+    );
+
+    template<>
+    const char* Foam::NamedEnum
+    <
+        equationInitialResidualCondition::operatingMode,
+        2
+    >::names[] =
+    {
+        "minimum",
+        "maximum"
+    };
+
+    const NamedEnum<Foam::equationInitialResidualCondition::operatingMode, 2>
+        Foam::equationInitialResidualCondition::operatingModeNames;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::equationInitialResidualCondition::equationInitialResidualCondition
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+:
+    runTimeCondition(name, obr, dict, state),
+    fieldNames_(dict.lookup("fields")),
+    value_(readScalar(dict.lookup("value"))),
+    timeStart_(dict.lookupOrDefault("timeStart", -GREAT)),
+    mode_(operatingModeNames.read(dict.lookup("mode")))
+{
+    if (!fieldNames_.size())
+    {
+        WarningInFunction
+            << "No fields supplied: deactivating" << endl;
+
+        active_ = false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::equationInitialResidualCondition::
+~equationInitialResidualCondition()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+bool Foam::equationInitialResidualCondition::apply()
+{
+    bool satisfied = false;
+
+    if (!active_)
+    {
+        return true;
+    }
+
+    if ((obr_.time().timeIndex() < 3) || (obr_.time().value() < timeStart_))
+    {
+        // Do not start checking until reached start time
+        return false;
+    }
+
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+    const dictionary& solverDict = mesh.solverPerformanceDict();
+
+    List<scalar> result(fieldNames_.size(), -VGREAT);
+
+    forAll(fieldNames_, fieldI)
+    {
+        const word& fieldName = fieldNames_[fieldI];
+
+        if (solverDict.found(fieldName))
+        {
+            const List<solverPerformance> sp(solverDict.lookup(fieldName));
+            const scalar residual = sp.first().initialResidual();
+            result[fieldI] = residual;
+
+            switch (mode_)
+            {
+                case omMin:
+                {
+                    if (residual < value_)
+                    {
+                        satisfied = true;
+                    }
+                    break;
+                }
+                case omMax:
+                {
+                    if (residual > value_)
+                    {
+                        satisfied = true;
+                    }
+                    break;
+                }
+                default:
+                {
+                    FatalErrorInFunction
+                        << "Unhandled enumeration "
+                        << operatingModeNames[mode_]
+                        << abort(FatalError);
+                }
+            }
+        }
+    }
+
+    bool valid = false;
+    forAll(result, i)
+    {
+        if (result[i] < 0)
+        {
+            WarningInFunction
+                << "Initial residual data not found for field "
+                << fieldNames_[i] << endl;
+        }
+        else
+        {
+            valid = true;
+        }
+    }
+
+    if (!valid)
+    {
+        WarningInFunction
+            << "Initial residual data not found for any fields: "
+            << "deactivating" << endl;
+
+        active_ = false;
+    }
+
+    if (satisfied && valid)
+    {
+        if (log_)
+        {
+            Info<< type() << ": " << name_
+                << ": satisfied using threshold value: " << value_ << nl;
+        }
+
+        forAll(result, resultI)
+        {
+            if (result[resultI] > 0)
+            {
+                if (log_)
+                {
+                    Info<< "    field: " << fieldNames_[resultI]
+                        << ", residual: " << result[resultI] << nl;
+                }
+            }
+        }
+        if (log_) Info<< endl;
+    }
+
+    return satisfied;
+}
+
+
+void Foam::equationInitialResidualCondition::write()
+{
+    // do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
new file mode 100644
index 0000000000..60a2163b7d
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::equationInitialResidualCondition
+
+Description
+    Minimum or maximum initial residual run time condition
+
+SourceFiles
+    equationInitialResidualCondition.H
+    equationInitialResidualCondition.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef equationInitialResidualCondition_H
+#define equationInitialResidualCondition_H
+
+#include "runTimeCondition.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+              Class equationInitialResidualCondition Declaration
+\*---------------------------------------------------------------------------*/
+
+class equationInitialResidualCondition
+:
+    public runTimeCondition
+{
+public:
+
+    enum operatingMode
+    {
+        omMin,
+        omMax
+    };
+
+    static const NamedEnum<operatingMode, 2> operatingModeNames;
+
+
+protected:
+
+    // Protected data
+
+        //- Field name
+        const wordList fieldNames_;
+
+        //- Value to compare
+        const scalar value_;
+
+        //- Start checking from time - always skips first iteration
+        scalar timeStart_;
+
+        //- Operating mode
+        operatingMode mode_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("equationInitialResidual");
+
+    //- Constructor
+    equationInitialResidualCondition
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+    //- Destructor
+    virtual ~equationInitialResidualCondition();
+
+
+    // Public Member Functions
+
+        //- Apply the condition
+        virtual bool apply();
+
+        //- Write
+        virtual void write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
new file mode 100644
index 0000000000..0788cf81bf
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "equationMaxIterCondition.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(equationMaxIterCondition, 0);
+    addToRunTimeSelectionTable
+    (
+        runTimeCondition,
+        equationMaxIterCondition,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::equationMaxIterCondition::equationMaxIterCondition
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+:
+    runTimeCondition(name, obr, dict, state),
+    fieldNames_(dict.lookup("fields")),
+    threshold_(readLabel(dict.lookup("threshold"))),
+    startIter_(dict.lookupOrDefault("startIter", 2))
+{
+    if (!fieldNames_.size())
+    {
+        WarningInFunction
+            << "No fields supplied: deactivating" << endl;
+
+        active_ = false;
+    }
+
+    startIter_ = max(startIter_, 2);
+}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::equationMaxIterCondition::~equationMaxIterCondition()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+bool Foam::equationMaxIterCondition::apply()
+{
+    bool satisfied = false;
+
+    if (!active_)
+    {
+        return true;
+    }
+
+    if (obr_.time().timeIndex() < startIter_)
+    {
+        // Do not start checking until start iter
+        return false;
+    }
+
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+    const dictionary& solverDict = mesh.solverPerformanceDict();
+
+    List<label> result(fieldNames_.size(), -1);
+
+    forAll(fieldNames_, fieldI)
+    {
+        const word& fieldName = fieldNames_[fieldI];
+
+        if (solverDict.found(fieldName))
+        {
+            const List<solverPerformance> sp(solverDict.lookup(fieldName));
+            const label nIterations = sp.first().nIterations();
+            result[fieldI] = nIterations;
+
+            if (nIterations > threshold_)
+            {
+                satisfied = true;
+            }
+        }
+    }
+
+    bool valid = false;
+    forAll(result, i)
+    {
+        if (result[i] < 0)
+        {
+            WarningInFunction
+                << "Number of iterations data not found for field "
+                << fieldNames_[i] << endl;
+        }
+        else
+        {
+            valid = true;
+        }
+    }
+
+    if (!valid)
+    {
+        WarningInFunction
+            << "Number of iterations data not found for any fields: "
+            << "deactivating" << endl;
+
+        active_ = false;
+    }
+
+    if (satisfied && valid)
+    {
+        if (log_)
+        {
+            Info<< type() << ": " << name_
+                << ": satisfied using threshold value: " << threshold_ << nl;
+        }
+
+        forAll(result, resultI)
+        {
+            if (result[resultI] != -1)
+            {
+                if (log_)
+                {
+                    Info<< "    field: " << fieldNames_[resultI]
+                        << ", iterations: " << result[resultI] << nl;
+                }
+            }
+        }
+        if (log_) Info<< endl;
+    }
+
+    return satisfied;
+}
+
+
+void Foam::equationMaxIterCondition::write()
+{
+    // do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.H
new file mode 100644
index 0000000000..d77ab68366
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::equationMaxIterCondition
+
+Description
+    Maximum number of equation iterations run time condition
+
+SourceFiles
+    equationMaxIterCondition.H
+    equationMaxIterCondition.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef equationMaxIterCondition_H
+#define equationMaxIterCondition_H
+
+#include "runTimeCondition.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class equationMaxIterCondition Declaration
+\*---------------------------------------------------------------------------*/
+
+class equationMaxIterCondition
+:
+    public runTimeCondition
+{
+protected:
+
+    // Protected data
+
+        //- Field name
+        const wordList fieldNames_;
+
+        //- Threshold for maximum number of iterations
+        const label threshold_;
+
+        //- Start checking from iteration - always skips first iteration
+        label startIter_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("equationMaxIter");
+
+    //- Constructor
+    equationMaxIterCondition
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+    //- Destructor
+    virtual ~equationMaxIterCondition();
+
+
+    // Public Member Functions
+
+        //- Apply the condition
+        virtual bool apply();
+
+        //- Write
+        virtual void write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
new file mode 100644
index 0000000000..26418217b6
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "minMaxCondition.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<>
+void Foam::minMaxCondition::setValue<Foam::scalar>
+(
+    const word& valueType,
+    const word& fieldName,
+    scalar& value
+) const
+{
+    state_.getObjectResult(functionObjectName_, fieldName, value);
+}
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(minMaxCondition, 0);
+    addToRunTimeSelectionTable(runTimeCondition, minMaxCondition, dictionary);
+
+    template<>
+    const char* NamedEnum<minMaxCondition::modeType, 2>::names[] =
+    {
+        "minimum",
+        "maximum"
+    };
+}
+
+const Foam::NamedEnum<Foam::minMaxCondition::modeType, 2>
+    Foam::minMaxCondition::modeTypeNames_;
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::minMaxCondition::minMaxCondition
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+:
+    runTimeCondition(name, obr, dict, state),
+    functionObjectName_(dict.lookup("functionObjectName")),
+    mode_(modeTypeNames_.read(dict.lookup("mode"))),
+    fieldNames_(dict.lookup("fields")),
+    value_(readScalar(dict.lookup("value")))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::minMaxCondition::~minMaxCondition()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+bool Foam::minMaxCondition::apply()
+{
+    bool satisfied = true;
+
+    if (!active_)
+    {
+        return satisfied;
+    }
+
+    forAll(fieldNames_, fieldI)
+    {
+        const word& fieldName = fieldNames_[fieldI];
+
+        const word valueType =
+            state_.objectResultType(functionObjectName_, fieldName);
+
+        if (valueType == word::null)
+        {
+            WarningInFunction
+                << "Unable to find entry " << fieldName
+                << " for function object " << functionObjectName_
+                << ".  Condition will not be applied."
+                << endl;
+
+            continue;
+        }
+
+        scalar v = 0;
+        setValue<scalar>(valueType, fieldName, v);
+        setValue<vector>(valueType, fieldName, v);
+        setValue<sphericalTensor>(valueType, fieldName, v);
+        setValue<symmTensor>(valueType, fieldName, v);
+        setValue<tensor>(valueType, fieldName, v);
+
+        Switch ok = false;
+        switch (mode_)
+        {
+            case mdMin:
+            {
+                if (v < value_)
+                {
+                    ok = true;
+                }
+                break;
+            }
+            case mdMax:
+            {
+                if (v > value_)
+                {
+                    ok = true;
+                }
+                break;
+            }
+        }
+
+        if (log_)
+        {
+            Info<< "    " << type() << ": " << modeTypeNames_[mode_] << " "
+                << fieldName << ": value = " << v
+                << ", threshold value = " << value_
+                << ", satisfied = " << ok << endl;
+        }
+
+        satisfied = satisfied && ok;
+    }
+
+    return satisfied;
+}
+
+
+void Foam::minMaxCondition::write()
+{
+    // do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
new file mode 100644
index 0000000000..7bd899d3fe
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::minMaxCondition
+
+Description
+    Minimum/maximum run time conditions.  If the value type is not scalar,
+    the magnitude of the value is used in the evaluation.
+
+SourceFiles
+    minMaxCondition.H
+    minMaxCondition.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef minMaxCondition_H
+#define minMaxCondition_H
+
+#include "runTimeCondition.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class minMaxCondition Declaration
+\*---------------------------------------------------------------------------*/
+
+class minMaxCondition
+:
+    public runTimeCondition
+{
+public:
+
+    // Public enumerations
+
+        // Mode type
+        enum modeType
+        {
+            mdMin,
+            mdMax
+        };
+
+        static const NamedEnum<modeType, 2> modeTypeNames_;
+
+
+protected:
+
+    // Protected data
+
+        //- Name of function object to retrueve data from
+        word functionObjectName_;
+
+        //- Mode
+        modeType mode_;
+
+        //- Field names
+        const wordList fieldNames_;
+
+        //- Value to compare
+        const scalar value_;
+
+        //- Helper function to retrieve the value from the state dictionary
+        template<class Type>
+        void setValue
+        (
+            const word& valueType,
+            const word& fieldName,
+            scalar& value
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("minMax");
+
+    //- Constructor
+    minMaxCondition
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+    //- Destructor
+    virtual ~minMaxCondition();
+
+
+    // Public Member Functions
+
+        //- Apply the condition
+        virtual bool apply();
+
+        //- Write
+        virtual void write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<>
+void minMaxCondition::setValue<Foam::scalar>
+(
+    const word& valueType,
+    const word& fieldName,
+    scalar& value
+) const;
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "minMaxConditionTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxConditionTemplates.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxConditionTemplates.C
new file mode 100644
index 0000000000..a8befe9cda
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minMaxCondition/minMaxConditionTemplates.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class Type>
+void Foam::minMaxCondition::setValue
+(
+    const word& valueType,
+    const word& fieldName,
+    scalar& value
+) const
+{
+    if (pTraits<Type>::typeName != valueType)
+    {
+        return;
+    }
+
+    Type v = state_.getObjectResult<Type>(functionObjectName_, fieldName);
+    value = mag(v);
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.C
new file mode 100644
index 0000000000..4b91fd14dc
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "minTimeStepCondition.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(minTimeStepCondition, 0);
+    addToRunTimeSelectionTable
+    (
+        runTimeCondition,
+        minTimeStepCondition,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::minTimeStepCondition::minTimeStepCondition
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+:
+    runTimeCondition(name, obr, dict, state),
+    minValue_(readScalar(dict.lookup("minValue")))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::minTimeStepCondition::~minTimeStepCondition()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+bool Foam::minTimeStepCondition::apply()
+{
+    bool satisfied = false;
+
+    if (!active_)
+    {
+        return true;
+    }
+
+    if (obr_.time().deltaTValue() < minValue_)
+    {
+        satisfied = true;
+    }
+
+    return satisfied;
+}
+
+
+void Foam::minTimeStepCondition::write()
+{
+    // do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
new file mode 100644
index 0000000000..b5088a162d
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::minTimeStepCondition
+
+Description
+    Initial residual run time condition
+
+SourceFiles
+    minTimeStepCondition.H
+    minTimeStepCondition.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef minTimeStepCondition_H
+#define minTimeStepCondition_H
+
+#include "runTimeCondition.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class minTimeStepCondition Declaration
+\*---------------------------------------------------------------------------*/
+
+class minTimeStepCondition
+:
+    public runTimeCondition
+{
+protected:
+
+    // Protected data
+
+        //- Minumim time step value to compare
+        const scalar minValue_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("minTimeStep");
+
+    //- Constructor
+    minTimeStepCondition
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+    //- Destructor
+    virtual ~minTimeStepCondition();
+
+
+    // Public Member Functions
+
+        //- Apply the condition
+        virtual bool apply();
+
+        //- Write
+        virtual void write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C
new file mode 100644
index 0000000000..16bcc6cb94
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "runTimeCondition.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(runTimeCondition, 0);
+    defineRunTimeSelectionTable(runTimeCondition, dictionary);
+}
+
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+Foam::dictionary& Foam::runTimeCondition::setConditionDict()
+{
+    dictionary& propertyDict = state_.propertyDict();
+
+    if (!propertyDict.found(name_))
+    {
+        propertyDict.add(name_, dictionary());
+    }
+
+    return propertyDict.subDict(name_);
+}
+
+
+const Foam::dictionary& Foam::runTimeCondition::conditionDict() const
+{
+    return conditionDict_;
+}
+
+
+Foam::dictionary& Foam::runTimeCondition::conditionDict()
+{
+    return conditionDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::runTimeCondition::runTimeCondition
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+:
+    name_(name),
+    obr_(obr),
+    state_(state),
+    active_(dict.lookupOrDefault<bool>("active", true)),
+    conditionDict_(setConditionDict()),
+    log_(dict.lookupOrDefault("log", true)),
+    groupID_(dict.lookupOrDefault("groupID", -1))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::runTimeCondition::~runTimeCondition()
+{}
+
+
+// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * //
+
+const Foam::word& Foam::runTimeCondition::name() const
+{
+    return name_;
+}
+
+
+bool Foam::runTimeCondition::active() const
+{
+    return active_;
+}
+
+
+Foam::label Foam::runTimeCondition::groupID() const
+{
+    return groupID_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.H
new file mode 100644
index 0000000000..752a0ad8ec
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::runTimeCondition
+
+Description
+    Base class for run time conditions
+
+SourceFiles
+    runTimeCondition.C
+    runTimeConditionNew.C
+    runTimeCondition.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef runTimeCondition_H
+#define runTimeCondition_H
+
+#include "functionObjectState.H"
+#include "dictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class runTimeCondition Declaration
+\*---------------------------------------------------------------------------*/
+
+class runTimeCondition
+{
+
+protected:
+
+    // Protected data
+
+        //- Condition name
+        word name_;
+
+        //- Reference to the object registry
+        const objectRegistry& obr_;
+
+        //- State
+        functionObjectState& state_;
+
+        //- On/off switch
+        bool active_;
+
+        //- Reference to the condition dictionary
+        dictionary& conditionDict_;
+
+        //- Switch to send output to Info
+        Switch log_;
+
+        //- Group index - if applied, all conditions in a group must be
+        //  satisfield before condition is met
+        label groupID_;
+
+
+    // Protected Member Functions
+
+        //- Set the condition dictionary (create if necessary)
+        dictionary& setConditionDict();
+
+        //- Return const access to the conditions dictionary
+        const dictionary& conditionDict() const;
+
+        //- Return non-const access to the conditions dictionary
+        dictionary& conditionDict();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("runTimeCondition");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        runTimeCondition,
+        dictionary,
+        (
+            const word& name,
+            const objectRegistry& obr,
+            const dictionary& dict,
+            functionObjectState& state
+        ),
+        (name, obr, dict, state)
+    );
+
+
+    //- Constructor
+    runTimeCondition
+    (
+        const word& name,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+    //- Destructor
+    virtual ~runTimeCondition();
+
+    //- Selector
+    static autoPtr<runTimeCondition> New
+    (
+        const word& conditionName,
+        const objectRegistry& obr,
+        const dictionary& dict,
+        functionObjectState& state
+    );
+
+
+    // Public Member Functions
+
+        //- Return the condition name
+        virtual const word& name() const;
+
+        //- Return the active flag
+        virtual bool active() const;
+
+        //- Return the group index
+        virtual label groupID() const;
+
+        //- Apply the condition
+        virtual bool apply() = 0;
+
+        //- Write
+        virtual void write() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
new file mode 100644
index 0000000000..000dbe1142
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "runTimeCondition.H"
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::runTimeCondition> Foam::runTimeCondition::New
+(
+    const word& conditionName,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    functionObjectState& state
+)
+{
+    word conditionType(dict.lookup("type"));
+
+    Info<< "Selecting runTimeCondition " << conditionType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(conditionType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown runTimeCondition type "
+            << conditionType << nl << nl
+            << "Valid runTimeCondition types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<runTimeCondition>
+        (
+            cstrIter()(conditionName, obr, dict, state)
+        );
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C
new file mode 100644
index 0000000000..31e417cfdb
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.C
@@ -0,0 +1,261 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "runTimeControl.H"
+#include "dictionary.H"
+#include "runTimeCondition.H"
+#include "fvMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(runTimeControl, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::runTimeControl::runTimeControl
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectState(obr, name),
+    obr_(obr),
+    conditions_(),
+    groupMap_(),
+    nWriteStep_(0),
+    writeStepI_(0)
+{
+    // Check if the available mesh is an fvMesh, otherwise deactivate
+    if (setActive<fvMesh>())
+    {
+        read(dict);
+
+        // Check that some conditions are set
+        if (conditions_.empty())
+        {
+            Info<< type() << " " << name_ << " output:" << nl
+                << "    No conditions present - deactivating" << nl
+                << endl;
+
+            active_ = false;
+        }
+        else
+        {
+            // Check that at least one condition is active
+            active_ = false;
+            forAll(conditions_, conditionI)
+            {
+                if (conditions_[conditionI].active())
+                {
+                    active_ = true;
+                    break;
+                }
+            }
+
+            if (!active_)
+            {
+                Info<< type() << " " << name_ << " output:" << nl
+                    << "    All conditions inactive - deactivating" << nl
+                    << endl;
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::runTimeControl::~runTimeControl()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::runTimeControl::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        const dictionary& conditionsDict = dict.subDict("conditions");
+        const wordList conditionNames(conditionsDict.toc());
+        conditions_.setSize(conditionNames.size());
+
+        label uniqueGroupI = 0;
+        forAll(conditionNames, conditionI)
+        {
+            const word& conditionName = conditionNames[conditionI];
+            const dictionary& dict = conditionsDict.subDict(conditionName);
+
+            conditions_.set
+            (
+                conditionI,
+                runTimeCondition::New(conditionName, obr_, dict, *this)
+            );
+
+            label groupI = conditions_[conditionI].groupID();
+
+            if (groupMap_.insert(groupI, uniqueGroupI))
+            {
+                uniqueGroupI++;
+            }
+        }
+
+        dict.readIfPresent("nWriteStep", nWriteStep_);
+    }
+}
+
+
+void Foam::runTimeControl::execute()
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    Info<< type() << " " << name_ << " output:" << nl;
+
+    // IDs of satisfied conditions
+    DynamicList<label> IDs(conditions_.size());
+
+    // Run stops only if all conditions within a group are satisfied
+    List<bool> groupSatisfied(groupMap_.size(), true);
+    List<bool> groupActive(groupMap_.size(), false);
+
+    forAll(conditions_, conditionI)
+    {
+        runTimeCondition& condition = conditions_[conditionI];
+
+        if (condition.active())
+        {
+            bool conditionSatisfied = condition.apply();
+
+            label groupI = condition.groupID();
+
+            Map<label>::const_iterator conditionIter = groupMap_.find(groupI);
+
+            if (conditionIter == groupMap_.end())
+            {
+                FatalErrorInFunction
+                    << "group " << groupI << " not found in map"
+                    << abort(FatalError);
+            }
+
+            if (conditionSatisfied)
+            {
+                IDs.append(conditionI);
+
+                groupActive[conditionIter()] = true;
+
+                if (groupI == -1)
+                {
+                    // Condition not part of a group - only requires this to be
+                    // satisfied for completion flag to be set
+                    groupSatisfied[conditionIter()] = true;
+                    break;
+                }
+            }
+            else
+            {
+                groupSatisfied[conditionIter()] = false;
+            }
+        }
+    }
+
+    bool done = false;
+    forAll(groupSatisfied, groupI)
+    {
+        if (groupSatisfied[groupI] && groupActive[groupI])
+        {
+            done = true;
+            break;
+        }
+    }
+
+    if (done)
+    {
+        forAll(IDs, conditionI)
+        {
+            Info<< "    " << conditions_[conditionI].type() << ": "
+                <<  conditions_[conditionI].name()
+                << " condition satisfied" << nl;
+        }
+
+
+        // Set to write a data dump or finalise the calculation
+        Time& time = const_cast<Time&>(obr_.time());
+
+        if (writeStepI_ < nWriteStep_ - 1)
+        {
+            writeStepI_++;
+            Info<< "    Writing fields - step " << writeStepI_ << nl;
+            time.writeNow();
+        }
+        else
+        {
+            Info<< "    Stopping calculation" << nl
+                << "    Writing fields - final step" << nl;
+            time.writeAndEnd();
+        }
+    }
+    else
+    {
+        Info<< "    Conditions not met - calculations proceeding" << nl;
+    }
+
+    Info<< endl;
+}
+
+
+void Foam::runTimeControl::end()
+{
+    // Do nothing
+}
+
+
+void Foam::runTimeControl::timeSet()
+{
+    // Do nothing
+}
+
+
+void Foam::runTimeControl::write()
+{
+    if (active_)
+    {
+        forAll(conditions_, conditionI)
+        {
+            conditions_[conditionI].write();
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.H
new file mode 100644
index 0000000000..fff6c44648
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControl.H
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::runTimeControl
+
+Group
+    grpJobControlFunctionObjects
+
+Description
+    This function object controls when the calculation is terminated based on
+    satisfying user-specified conditions.
+
+    Optionally specify a number of write steps before the calculation is
+    terminated.  Here, a write is performed each time that all conditons are
+    satisfied.
+
+SourceFiles
+    runTimeControl.C
+    IOrunTimeControl.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef runTimeControl_H
+#define runTimeControl_H
+
+#include "functionObjectState.H"
+#include "Map.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+class runTimeCondition;
+
+/*---------------------------------------------------------------------------*\
+                       Class runTimeControl Declaration
+\*---------------------------------------------------------------------------*/
+
+class runTimeControl
+:
+    public functionObjectState
+{
+    // Private data
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- List of conditions to satisfy
+        PtrList<runTimeCondition> conditions_;
+
+        //- Map to define group IDs
+        Map<label> groupMap_;
+
+        //- Number of write steps before exiting
+        label nWriteStep_;
+
+        //- Current number of steps written
+        label writeStepI_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        runTimeControl(const runTimeControl&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const runTimeControl&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("runTimeControl");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        runTimeControl
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~runTimeControl();
+
+
+    // Member Functions
+
+        //- Return name of the set of runTimeControl
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the runTimeControl data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Calculate the runTimeControl and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.C b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.C
new file mode 100644
index 0000000000..7ba3518564
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "runTimeControlFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(runTimeControlFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        runTimeControlFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.H b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.H
new file mode 100644
index 0000000000..6b600c33d1
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::runTimeControlFunctionObject
+
+Description
+    FunctionObject wrapper around runTimeControl to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    runTimeControlFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef runTimeControlFunctionObject_H
+#define runTimeControlFunctionObject_H
+
+#include "runTimeControl.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<runTimeControl>
+        runTimeControlFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/systemCall/controlDict b/src/postProcessing/functionObjects/systemCall/controlDict
index 459278ca5b..e8e667d71d 100644
--- a/src/postProcessing/functionObjects/systemCall/controlDict
+++ b/src/postProcessing/functionObjects/systemCall/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index 8a2df60b44..1ad82b58d3 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,13 +70,13 @@ void Foam::systemCall::read(const dictionary& dict)
 
     if (executeCalls_.empty() && endCalls_.empty() && writeCalls_.empty())
     {
-        WarningIn("Foam::system::read(const dictionary&)")
+        WarningInFunction
             << "no executeCalls, endCalls or writeCalls defined."
             << endl;
     }
     else if (!dynamicCode::allowSystemOperations)
     {
-        FatalErrorIn("systemCall::read(const dictionary&)")
+        FatalErrorInFunction
             << "Executing user-supplied system calls is not enabled by "
             << "default because of " << nl
             << "security issues.  If you trust the case you can enable this "
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
index 5653a6a177..be18bbc0bc 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,22 +68,16 @@ Foam::CourantNo::CourantNo
     obr_(obr),
     active_(true),
     phiName_("phi"),
-    rhoName_("rho")
+    rhoName_("rho"),
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "CourantNo::CourantNo"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -99,7 +93,7 @@ Foam::CourantNo::CourantNo
             (
                 IOobject
                 (
-                    type(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -128,8 +122,11 @@ void Foam::CourantNo::read(const dictionary& dict)
 {
     if (active_)
     {
-        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
-        rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+        log_.readIfPresent("log", dict);
+
+        dict.readIfPresent("phiName", phiName_);
+        dict.readIfPresent("rhoName", rhoName_);
+        dict.readIfPresent("resultName", resultName_);
     }
 }
 
@@ -146,7 +143,7 @@ void Foam::CourantNo::execute()
         volScalarField& Co =
             const_cast<volScalarField&>
             (
-                mesh.lookupObject<volScalarField>(type())
+                mesh.lookupObject<volScalarField>(resultName_)
             );
 
         Co.dimensionedInternalField() = byRho
@@ -162,10 +159,7 @@ void Foam::CourantNo::execute()
 
 void Foam::CourantNo::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -178,9 +172,10 @@ void Foam::CourantNo::write()
     if (active_)
     {
         const volScalarField& CourantNo =
-            obr_.lookupObject<volScalarField>(type());
+            obr_.lookupObject<volScalarField>(resultName_);
 
-        Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << CourantNo.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
index 7460d74ffb..df22943ae1 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,6 +32,27 @@ Description
     volScalarField.  The field is stored on the mesh database so that it can
     be retrieved and used for other applications.
 
+    Example of function object specification to calculate the Courant number:
+    \verbatim
+    CourantNo1
+    {
+        type        CourantNo;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: CourantNo    | yes         |
+        rhoName      | Name of density field   | no          | rho
+        phiName      | Name of flux field      | no          | phi
+        resultName   | Name of Courant number field | no     | <function name>
+        log          | Log to standard output  | no          | yes
+    \endtable
+
+
 SourceFiles
     CourantNo.C
     IOCourantNo.H
@@ -77,6 +98,12 @@ class CourantNo
         //- Name of density field (optional)
         word rhoName_;
 
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
new file mode 100644
index 0000000000..1578ebdc3a
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "DESModelRegions.H"
+#include "volFields.H"
+#include "DESModelBase.H"
+#include "turbulenceModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+defineTypeNameAndDebug(DESModelRegions, 0);
+}
+
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+void Foam::DESModelRegions::writeFileHeader(Ostream& os) const
+{
+    writeHeader(os, "DES model region coverage (% volume)");
+
+    writeCommented(os, "Time");
+    writeTabbed(os, "LES");
+    writeTabbed(os, "RAS");
+    os << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::DESModelRegions::DESModelRegions
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectFile(obr, name, typeName, dict),
+    name_(name),
+    obr_(obr),
+    active_(true),
+    resultName_(name),
+    log_(true)
+{
+    // Check if the available mesh is an fvMesh, otherwise deactivate
+    if (!isA<fvMesh>(obr_))
+    {
+        active_ = false;
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
+            << endl;
+    }
+
+    read(dict);
+
+    if (active_)
+    {
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        volScalarField* DESModelRegionsPtr
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    resultName_,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedScalar("0", dimless, 0.0)
+            )
+        );
+
+        mesh.objectRegistry::store(DESModelRegionsPtr);
+
+        writeFileHeader(file());
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::DESModelRegions::~DESModelRegions()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::DESModelRegions::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        functionObjectFile::read(dict);
+
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("resultName", resultName_);
+    }
+}
+
+
+void Foam::DESModelRegions::execute()
+{
+    if (active_)
+    {
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        if (log_) Info<< type() << " " << name_ <<  " output:" << nl;
+
+        volScalarField& DESModelRegions =
+            const_cast<volScalarField&>
+            (
+                mesh.lookupObject<volScalarField>(resultName_)
+            );
+
+
+        if (mesh.foundObject<DESModelBase>(turbulenceModel::propertiesName))
+        {
+            const DESModelBase& model =
+                mesh.lookupObject<DESModelBase>
+                (
+                    turbulenceModel::propertiesName
+                );
+
+            DESModelRegions == model.LESRegion();
+
+            scalar prc =
+                gSum(DESModelRegions.internalField()*mesh.V())
+               /gSum(mesh.V())*100.0;
+
+            file() << obr_.time().value()
+                << token::TAB << prc
+                << token::TAB << 100.0 - prc
+                << endl;
+
+            if (log_) Info
+                << "    LES = " << prc << " % (volume)" << nl
+                << "    RAS = " << 100.0 - prc << " % (volume)" << nl
+                << endl;
+        }
+        else
+        {
+            if (log_) Info
+                << "    No DES turbulence model found in database" << nl
+                << endl;
+        }
+    }
+}
+
+
+void Foam::DESModelRegions::end()
+{
+    // Do nothing
+}
+
+
+void Foam::DESModelRegions::timeSet()
+{
+    // Do nothing
+}
+
+
+void Foam::DESModelRegions::write()
+{
+    if (active_)
+    {
+        const volScalarField& DESModelRegions =
+            obr_.lookupObject<volScalarField>(resultName_);
+
+        if (log_) Info
+            << type() << " " << name_ <<  " output:" << nl
+            << "    writing field " << DESModelRegions.name() << nl
+            << endl;
+
+        DESModelRegions.write();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H
new file mode 100644
index 0000000000..2db27d53f2
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::DESModelRegions
+
+Group
+    grpUtilitiesFunctionObjects
+
+Description
+    This function object writes out an indicator field for DES turbulence
+    calculations, that is:
+    - 0 for RAS regions
+    - 1 for LES regions
+
+    The field is stored on the mesh database so that it can be retrieved and
+    used for other applications.
+
+    Example of function object specification to generate DES indicator field:
+    \verbatim
+    DESModelRegions1
+    {
+        type        DESModelRegions;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type name: DESModelRegions| yes       |
+        resultName   | Name of DES indicator field | no      | <function name>
+        log          | log to standard output  | no          | yes
+    \endtable
+
+SourceFiles
+    DESModelRegions.C
+    IODESModelRegions.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DESModelRegions_H
+#define DESModelRegions_H
+
+#include "functionObjectFile.H"
+#include "volFieldsFwd.H"
+#include "Switch.H"
+#include "OFstream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                       Class DESModelRegions Declaration
+\*---------------------------------------------------------------------------*/
+
+class DESModelRegions
+:
+    public functionObjectFile
+{
+protected:
+
+    // Protected data
+
+        //- Name of this set of DESModelRegions object
+        word name_;
+
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
+
+    // Protected Member Functions
+
+        //- File header information
+        virtual void writeFileHeader(Ostream& os) const;
+
+        //- Disallow default bitwise copy construct
+        DESModelRegions(const DESModelRegions&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const DESModelRegions&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("DESModelRegions");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        DESModelRegions
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~DESModelRegions();
+
+
+    // Member Functions
+
+        //- Return name of the set of DESModelRegions
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the DESModelRegions data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Calculate the DESModelRegions and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.C b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.C
new file mode 100644
index 0000000000..2312e6f5fb
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "DESModelRegionsFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(DESModelRegionsFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        DESModelRegionsFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.H b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.H
new file mode 100644
index 0000000000..7e9a6ba45c
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::DESModelRegionsFunctionObject
+
+Description
+    FunctionObject wrapper around DESModelRegions to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    DESModelRegionsFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DESModelRegionsFunctionObject_H
+#define DESModelRegionsFunctionObject_H
+
+#include "DESModelRegions.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<DESModelRegions>
+        DESModelRegionsFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/IODESModelRegions.H b/src/postProcessing/functionObjects/utilities/DESModelRegions/IODESModelRegions.H
new file mode 100644
index 0000000000..17cc16b74e
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/IODESModelRegions.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IODESModelRegions
+
+Description
+    Instance of the generic IOOutputFilter for DESModelRegions.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IODESModelRegions_H
+#define IODESModelRegions_H
+
+#include "DESModelRegions.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<DESModelRegions> IODESModelRegions;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
index 3c72fbfd9b..45726130e7 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,22 +50,16 @@ Foam::Lambda2::Lambda2
     name_(name),
     obr_(obr),
     active_(true),
-    UName_("U")
+    UName_("U"),
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "Lambda2::Lambda2"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -81,7 +75,7 @@ Foam::Lambda2::Lambda2
             (
                 IOobject
                 (
-                    type(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -109,7 +103,17 @@ void Foam::Lambda2::read(const dictionary& dict)
 {
     if (active_)
     {
-        UName_ = dict.lookupOrDefault<word>("UName", "U");
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("UName", UName_);
+
+        if (!dict.readIfPresent("resultName", resultName_))
+        {
+            resultName_ = name_;
+            if (UName_ != "U")
+            {
+                resultName_ = resultName_ + "(" + UName_ + ")";
+            }
+        }
     }
 }
 
@@ -134,7 +138,7 @@ void Foam::Lambda2::execute()
         volScalarField& Lambda2 =
             const_cast<volScalarField&>
             (
-                mesh.lookupObject<volScalarField>(type())
+                mesh.lookupObject<volScalarField>(resultName_)
             );
 
         Lambda2 = -eigenValues(SSplusWW)().component(vector::Y);
@@ -144,10 +148,7 @@ void Foam::Lambda2::execute()
 
 void Foam::Lambda2::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -162,9 +163,10 @@ void Foam::Lambda2::write()
     if (active_)
     {
         const volScalarField& Lambda2 =
-            obr_.lookupObject<volScalarField>(type());
+            obr_.lookupObject<volScalarField>(resultName_);
 
-        Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << Lambda2.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
index f4360f4640..3de1eb049b 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,25 @@ Description
     of the sum of the square of the symmetrical and anti-symmetrical parts of
     the velocity gradient tensor.
 
+    Example of function object specification to calculate Lambda2:
+    \verbatim
+    Lambda2_1
+    {
+        type        Lambda2;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: Lambda2      | yes         |
+        UName        | Name of velocity field  | no          | U
+        resultName   | Name of Lambda2 field   | no          | <function name>
+        log          | Log to standard output  | no          | yes
+    \endtable
+
 SourceFiles
     Lambda2.C
     IOLambda2.H
@@ -77,6 +96,12 @@ class Lambda2
         //- Name of velocity field, default is "U"
         word UName_;
 
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 4c38b4ba67..f42510d7a5 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -1,28 +1,31 @@
+blendingFactor/blendingFactor.C
+blendingFactor/blendingFactorFunctionObject.C
+
 codedFunctionObject/codedFunctionObject.C
 
 CourantNo/CourantNo.C
 CourantNo/CourantNoFunctionObject.C
 
+DESModelRegions/DESModelRegions.C
+DESModelRegions/DESModelRegionsFunctionObject.C
+
+dsmcFields/dsmcFields.C
+dsmcFields/dsmcFieldsFunctionObject.C
+
+fluxSummary/fluxSummary.C
+fluxSummary/fluxSummaryFunctionObject.C
+
 Lambda2/Lambda2.C
 Lambda2/Lambda2FunctionObject.C
 
 Peclet/Peclet.C
 Peclet/PecletFunctionObject.C
 
-Q/Q.C
-Q/QFunctionObject.C
-
-blendingFactor/blendingFactor.C
-blendingFactor/blendingFactorFunctionObject.C
-
-dsmcFields/dsmcFields.C
-dsmcFields/dsmcFieldsFunctionObject.C
-
 pressureTools/pressureTools.C
 pressureTools/pressureToolsFunctionObject.C
 
-residuals/residuals.C
-residuals/residualsFunctionObject.C
+Q/Q.C
+Q/QFunctionObject.C
 
 scalarTransport/scalarTransport.C
 scalarTransport/scalarTransportFunctionObject.C
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index b59c6b86db..da63b33ea2 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/transportModels \
@@ -11,7 +10,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude
 
 LIB_LIBS = \
     -lfvOptions \
@@ -26,4 +26,5 @@ LIB_LIBS = \
     -lDSMC \
     -lfiniteVolume \
     -lmeshTools \
-    -lsampling
+    -lsampling \
+    -lsurfMesh
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
index 18ac584332..8f9193b7da 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,22 +53,15 @@ Foam::Peclet::Peclet
     obr_(obr),
     active_(true),
     phiName_("phi"),
-    rhoName_("rho")
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "Peclet::Peclet"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -84,7 +77,7 @@ Foam::Peclet::Peclet
             (
                 IOobject
                 (
-                    type(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -112,8 +105,9 @@ void Foam::Peclet::read(const dictionary& dict)
 {
     if (active_)
     {
-        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
-        rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("phiName", phiName_);
+        dict.readIfPresent("resultName", resultName_);
     }
 }
 
@@ -127,7 +121,10 @@ void Foam::Peclet::execute()
     {
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
-        tmp<volScalarField> nuEff;
+        // Obtain nuEff of muEff.  Assumes that a compressible flux is present
+        // when using a compressible turbulence model, and an incompressible
+        // flux when using an incompressible turbulence model
+        tmp<volScalarField> nuOrMuEff;
         if (mesh.foundObject<cmpTurbModel>(turbulenceModel::propertiesName))
         {
             const cmpTurbModel& model =
@@ -136,10 +133,7 @@ void Foam::Peclet::execute()
                     turbulenceModel::propertiesName
                 );
 
-            const volScalarField& rho =
-                mesh.lookupObject<volScalarField>(rhoName_);
-
-            nuEff = model.muEff()/rho;
+            nuOrMuEff = model.muEff();
         }
         else if
         (
@@ -152,14 +146,14 @@ void Foam::Peclet::execute()
                     turbulenceModel::propertiesName
                 );
 
-            nuEff = model.nuEff();
+            nuOrMuEff = model.nuEff();
         }
         else if (mesh.foundObject<dictionary>("transportProperties"))
         {
             const dictionary& model =
                 mesh.lookupObject<dictionary>("transportProperties");
 
-            nuEff =
+            nuOrMuEff =
                 tmp<volScalarField>
                 (
                     new volScalarField
@@ -179,18 +173,20 @@ void Foam::Peclet::execute()
         }
         else
         {
-            FatalErrorIn("void Foam::Peclet::write()")
+            FatalErrorInFunction
                 << "Unable to determine the viscosity"
                 << exit(FatalError);
         }
 
+        // Note: dimensions of phi will change depending on whether this is
+        //       applied to an incompressible or compressible case
         const surfaceScalarField& phi =
             mesh.lookupObject<surfaceScalarField>(phiName_);
 
         surfaceScalarField& Peclet =
             const_cast<surfaceScalarField&>
             (
-                mesh.lookupObject<surfaceScalarField>(type())
+                mesh.lookupObject<surfaceScalarField>(resultName_)
             );
 
         Peclet =
@@ -198,7 +194,7 @@ void Foam::Peclet::execute()
            /(
                 mesh.magSf()
                *mesh.surfaceInterpolation::deltaCoeffs()
-               *fvc::interpolate(nuEff)
+               *fvc::interpolate(nuOrMuEff)
             );
     }
 }
@@ -206,12 +202,10 @@ void Foam::Peclet::execute()
 
 void Foam::Peclet::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
+
 void Foam::Peclet::timeSet()
 {
     // Do nothing
@@ -223,9 +217,10 @@ void Foam::Peclet::write()
     if (active_)
     {
         const surfaceScalarField& Peclet =
-            obr_.lookupObject<surfaceScalarField>(type());
+            obr_.lookupObject<surfaceScalarField>(resultName_);
 
-        Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << Peclet.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
index 5becbe93e9..e72129a21b 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +31,25 @@ Description
     This function object calculates and outputs the Peclet number as a
     surfaceScalarField.
 
+    Example of function object specification to calculate the Peclet number:
+    \verbatim
+    Peclet1
+    {
+        type        Peclet;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type name: Peclet       | yes         |
+        phiName      | Name of flux field      | no          | phi
+        resultName   | Name of Peclet field    | no          | <function name>
+        log          | Log to standard output  | no          | yes
+    \endtable
+
 SourceFiles
     Peclet.C
     IOPeclet.H
@@ -76,8 +95,11 @@ class Peclet
         //- Name of flux field, default is "phi"
         word phiName_;
 
-        //- Name of density field (compressible cases only), default is "rho"
-        word rhoName_;
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
 
 
     // Private Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.C b/src/postProcessing/functionObjects/utilities/Q/Q.C
index 2dda80a88b..aa0bc8db84 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.C
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(Q, 0);
+    defineTypeNameAndDebug(Q, 0);
 }
 
 
@@ -49,22 +49,16 @@ Foam::Q::Q
     name_(name),
     obr_(obr),
     active_(true),
-    UName_("U")
+    UName_("U"),
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "Q::Q"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -80,7 +74,7 @@ Foam::Q::Q
             (
                 IOobject
                 (
-                    type(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -108,7 +102,17 @@ void Foam::Q::read(const dictionary& dict)
 {
     if (active_)
     {
-        UName_ = dict.lookupOrDefault<word>("UName", "U");
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("UName", UName_);
+
+        if (!dict.readIfPresent("resultName", resultName_))
+        {
+            resultName_ = name_;
+            if (UName_ != "U")
+            {
+                resultName_ = resultName_ + "(" + UName_ + ")";
+            }
+        }
     }
 }
 
@@ -127,7 +131,7 @@ void Foam::Q::execute()
         volScalarField& Q =
             const_cast<volScalarField&>
             (
-                mesh.lookupObject<volScalarField>(type())
+                mesh.lookupObject<volScalarField>(resultName_)
             );
 
         Q = 0.5*(sqr(tr(gradU)) - tr(((gradU) & (gradU))));
@@ -137,10 +141,7 @@ void Foam::Q::execute()
 
 void Foam::Q::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -155,9 +156,10 @@ void Foam::Q::write()
     if (active_)
     {
         const volScalarField& Q =
-            obr_.lookupObject<volScalarField>(type());
+            obr_.lookupObject<volScalarField>(resultName_);
 
-        Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << Q.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.H b/src/postProcessing/functionObjects/utilities/Q/Q.H
index aed626228c..15452f71a4 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.H
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,30 @@ Description
         Q = 0.5(sqr(tr(\nabla U)) - tr(((\nabla U) \cdot (\nabla U))))
     \f]
 
+    where
+    \vartable
+        U           | velocity [m/s]
+    \endvartable
+
+    Example of function object specification to calculate Q:
+    \verbatim
+    Q1
+    {
+        type        Q;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type name: Q            | yes         |
+        UName        | Name of velocity field  | no          | U
+        resultName   | Name of Q field         | no          | <function name>
+        log          | Log to standard output  | no          | yes
+    \endtable
+
 SourceFiles
     Q.C
     IOQ.H
@@ -80,6 +104,12 @@ class Q
         //- Name of velocity field, default is "U"
         word UName_;
 
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
index 3c98c9d86f..1b01cbb4b3 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,19 @@ namespace Foam
 }
 
 
+// * * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * //
+
+void Foam::blendingFactor::writeFileHeader(Ostream& os) const
+{
+    writeHeader(os, "Blending factor");
+    writeCommented(os, "Time");
+    writeTabbed(os, "Scheme1");
+    writeTabbed(os, "Scheme2");
+    writeTabbed(os, "Blended");
+    os  << endl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::blendingFactor::blendingFactor
@@ -44,30 +57,44 @@ Foam::blendingFactor::blendingFactor
     const bool loadFromFiles
 )
 :
+    functionObjectState(obr, name),
+    functionObjectFile(obr, name, typeName, dict),
     name_(name),
     obr_(obr),
-    active_(true),
-    phiName_("unknown-phiName"),
-    fieldName_("unknown-fieldName")
+    phiName_("phi"),
+    fieldName_("unknown-fieldName"),
+    resultName_(word::null),
+    tolerance_(0.001),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
-    if (!isA<fvMesh>(obr_))
+    if (setActive<fvMesh>())
     {
-        active_ = false;
-        WarningIn
-        (
-            "blendingFactor::blendingFactor"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
-            << endl;
-    }
+        read(dict);
+        writeFileHeader(file());
 
-    read(dict);
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        volScalarField* indicatorPtr
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    resultName_,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedScalar("0", dimless, 0.0),
+                zeroGradientFvPatchScalarField::typeName
+            )
+        );
+
+        mesh.objectRegistry::store(indicatorPtr);
+    }
 }
 
 
@@ -83,8 +110,26 @@ void Foam::blendingFactor::read(const dictionary& dict)
 {
     if (active_)
     {
-        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
+        functionObjectFile::read(dict);
+
+        log_.readIfPresent("log", dict);
+
+        dict.readIfPresent("phiName", phiName_);
         dict.lookup("fieldName") >> fieldName_;
+
+
+        if (!dict.readIfPresent("resultName", resultName_))
+        {
+            resultName_ = name_ + ':' + fieldName_;
+        }
+
+        dict.readIfPresent("tolerance", tolerance_);
+        if ((tolerance_ < 0) || (tolerance_ > 1))
+        {
+            FatalErrorInFunction
+                << "tolerance must be in the range 0 to 1.  Supplied value: "
+                << tolerance_ << exit(FatalError);
+        }
     }
 }
 
@@ -101,12 +146,10 @@ void Foam::blendingFactor::execute()
 
 void Foam::blendingFactor::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
+
 void Foam::blendingFactor::timeSet()
 {
     // Do nothing
@@ -117,16 +160,15 @@ void Foam::blendingFactor::write()
 {
     if (active_)
     {
-        const word fieldName = "blendingFactor:" + fieldName_;
+        const volScalarField& indicator =
+            obr_.lookupObject<volScalarField>(resultName_);
 
-        const volScalarField& blendingFactor =
-            obr_.lookupObject<volScalarField>(fieldName);
-
-        Info<< type() << " " << name_ << " output:" << nl
-            << "    writing field " << blendingFactor.name() << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
+            << "    writing field " << indicator.name() << nl
             << endl;
 
-        blendingFactor.write();
+        indicator.write();
     }
 }
 
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
index 8b86a25cea..f7166470af 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,49 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    This function object calculates and outputs the blendingFactor as used by
-    the bended convection schemes.  The output is a volume field (cells) whose
-    value is calculated via the maximum blending factor for any cell face.
+    This function object provides information on the mode of operation of
+    blended convection schemes.
 
+    The weight of a blended scheme is given by a function of the blending
+    factor, f:
+
+        weight = f*scheme1 + (1 - f)*scheme2
+
+    The factor is a face-based quantity, which is converted to a cell-based
+    quantity by assigning the minimum blending factor for any cell face.
+
+    An indicator (volume) field, named <functionObjectName>:<fieldName>, is
+    generated that is set to (1 - f), i.e. values of:
+    - 0 represent scheme1 as active, and
+    - 1 represent scheme2 as active.
+    - intermediate values show the contribution to scheme2
+
+    Additional reporting is written to the standard output, providing
+    statistics as to the number of cells used by each scheme.
+
+    Example of function object specification to calculate the blending factor:
+    \verbatim
+    blendingFactor1
+    {
+        type        blendingFactor;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+
+        ...
+
+        // Name of field
+        fieldName   U;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: blendingFactor | yes       |
+        phiName      | Name of flux field      | no          | phi
+        fieldName    | Name of field to evaluate | yes       |
+        tolerance    | Tolerance for number of blended cells | no | 0.001
+        log          | Log to standard output  | no          | yes
+    \endtable
 
 SourceFiles
     blendingFactor.C
@@ -42,6 +81,8 @@ SourceFiles
 #ifndef blendingFactor_H
 #define blendingFactor_H
 
+#include "functionObjectState.H"
+#include "functionObjectFile.H"
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
 #include "OFstream.H"
@@ -59,28 +100,37 @@ class polyMesh;
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                          Class blendingFactor Declaration
+                       Class blendingFactor Declaration
 \*---------------------------------------------------------------------------*/
 
 class blendingFactor
+:
+    public functionObjectState,
+    public functionObjectFile
 {
     // Private data
 
-        //- Name of this set of blendingFactor objects
-        word name_;
+        //- Name
+        const word name_;
 
         //- Reference to the database
         const objectRegistry& obr_;
 
-        //- On/off switch
-        bool active_;
-
         //- Name of flux field, default is "phi"
         word phiName_;
 
         //- Field name
         word fieldName_;
 
+        //- Result field name
+        word resultName_;
+
+        //- Tolerance used when calculating the number of blended cells
+        scalar tolerance_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
@@ -90,18 +140,19 @@ class blendingFactor
         //- Disallow default bitwise assignment
         void operator=(const blendingFactor&);
 
-        //- Return the blending factor field from the database
-        template<class Type>
-        volScalarField& factor
-        (
-            const GeometricField<Type, fvPatchField, volMesh>& field
-        );
-
         //- Calculate the blending factor
         template<class Type>
         void calc();
 
 
+protected:
+
+    // Protected Member Functions
+
+        //- Write the file header
+        virtual void writeFileHeader(Ostream& os) const;
+
+
 public:
 
     //- Runtime type information
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
index 3a284b8c73..7dfe5b9726 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,45 +29,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::volScalarField& Foam::blendingFactor::factor
-(
-    const GeometricField<Type, fvPatchField, volMesh>& field
-)
-{
-    const word fieldName = "blendingFactor:" + field.name();
-
-    if (!obr_.foundObject<volScalarField>(fieldName))
-    {
-        const fvMesh& mesh = refCast<const fvMesh>(obr_);
-
-        volScalarField* factorPtr =
-            new volScalarField
-            (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                mesh,
-                dimensionedScalar("0", dimless, 0.0),
-                zeroGradientFvPatchScalarField::typeName
-            );
-
-        obr_.store(factorPtr);
-    }
-
-    return
-        const_cast<volScalarField&>
-        (
-            obr_.lookupObject<volScalarField>(fieldName)
-        );
-}
-
-
 template<class Type>
 void Foam::blendingFactor::calc()
 {
@@ -99,20 +60,65 @@ void Foam::blendingFactor::calc()
 
     if (!isA<blendedSchemeBase<Type> >(interpScheme))
     {
-        FatalErrorIn("void Foam::blendingFactor::execute()")
+        FatalErrorInFunction
             << interpScheme.typeName << " is not a blended scheme"
             << exit(FatalError);
     }
 
-    // retrieve the face-based blending factor
+    // Retrieve the face-based blending factor
     const blendedSchemeBase<Type>& blendedScheme =
         refCast<const blendedSchemeBase<Type> >(interpScheme);
     const surfaceScalarField factorf(blendedScheme.blendingFactor(field));
 
-    // convert into vol field whose values represent the local face maxima
-    volScalarField& factor = this->factor(field);
-    factor = fvc::cellReduce(factorf, maxEqOp<scalar>());
-    factor.correctBoundaryConditions();
+    // Convert into vol field whose values represent the local face minima
+    // Note: factor applied to 1st scheme, and (1-factor) to 2nd scheme
+    volScalarField& indicator =
+        const_cast<volScalarField&>
+        (
+            obr_.lookupObject<volScalarField>(resultName_)
+        );
+    indicator = 1 - fvc::cellReduce(factorf, minEqOp<scalar>(), GREAT);
+    indicator.correctBoundaryConditions();
+
+    // Generate scheme statistics
+    label nCellsScheme1 = 0;
+    label nCellsScheme2 = 0;
+    label nCellsBlended = 0;
+    forAll(indicator, cellI)
+    {
+        scalar i = indicator[cellI];
+
+        if (i < tolerance_)
+        {
+            nCellsScheme1++;
+        }
+        else if (i > (1 - tolerance_))
+        {
+            nCellsScheme2++;
+        }
+        else
+        {
+            nCellsBlended++;
+        }
+    }
+
+    reduce(nCellsScheme1, sumOp<label>());
+    reduce(nCellsScheme2, sumOp<label>());
+    reduce(nCellsBlended, sumOp<label>());
+
+    if (log_) Info
+        << type() << " " << name_ << " output:" << nl
+        << "    scheme 1 cells :  " << nCellsScheme1 << nl
+        << "    scheme 2 cells :  " << nCellsScheme2 << nl
+        << "    blended cells  :  " << nCellsBlended << nl
+        << endl;
+
+    file()
+        << obr_.time().time().value()
+        << token::TAB << nCellsScheme1
+        << token::TAB << nCellsScheme2
+        << token::TAB << nCellsBlended
+        << endl;
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
index dd9400bb94..adddc8f50e 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,22 +52,15 @@ Foam::dsmcFields::dsmcFields
 :
     name_(name),
     obr_(obr),
-    active_(true)
+    active_(true),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "dsmcFields::dsmcFields"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -87,7 +80,7 @@ void Foam::dsmcFields::read(const dictionary& dict)
 {
     if (active_)
     {
-
+        log_.readIfPresent("log", dict);
     }
 }
 
@@ -122,46 +115,32 @@ void Foam::dsmcFields::write()
         word iDofMeanName = "iDofMean";
         word fDMeanName = "fDMean";
 
-        const volScalarField& rhoNMean = obr_.lookupObject<volScalarField>
-        (
-            rhoNMeanName
-        );
+        const volScalarField& rhoNMean =
+            obr_.lookupObject<volScalarField>(rhoNMeanName);
 
-        const volScalarField& rhoMMean = obr_.lookupObject<volScalarField>
-        (
-            rhoMMeanName
-        );
+        const volScalarField& rhoMMean =
+            obr_.lookupObject<volScalarField>(rhoMMeanName);
 
-        const volVectorField& momentumMean = obr_.lookupObject<volVectorField>
-        (
-            momentumMeanName
-        );
+        const volVectorField& momentumMean =
+            obr_.lookupObject<volVectorField>(momentumMeanName);
 
-        const volScalarField& linearKEMean = obr_.lookupObject<volScalarField>
-        (
-            linearKEMeanName
-        );
+        const volScalarField& linearKEMean =
+            obr_.lookupObject<volScalarField>(linearKEMeanName);
 
-        const volScalarField& internalEMean = obr_.lookupObject<volScalarField>
-        (
-            internalEMeanName
-        );
+        const volScalarField& internalEMean =
+            obr_.lookupObject<volScalarField>(internalEMeanName);
 
-        const volScalarField& iDofMean = obr_.lookupObject<volScalarField>
-        (
-            iDofMeanName
-        );
+        const volScalarField& iDofMean =
+            obr_.lookupObject<volScalarField>(iDofMeanName);
 
-        const volVectorField& fDMean = obr_.lookupObject<volVectorField>
-        (
-            fDMeanName
-        );
+        const volVectorField& fDMean =
+            obr_.lookupObject<volVectorField>(fDMeanName);
 
         if (min(mag(rhoNMean)).value() > VSMALL)
         {
-            Info<< "Calculating dsmcFields." << endl;
+            if (log_) Info<< type() << " " << name_ << " output:" << endl;
 
-            Info<< "    Calculating UMean field." << endl;
+            if (log_) Info<< "    Calculating UMean field" << endl;
             volVectorField UMean
             (
                 IOobject
@@ -174,7 +153,7 @@ void Foam::dsmcFields::write()
                 momentumMean/rhoMMean
             );
 
-            Info<< "    Calculating translationalT field." << endl;
+            if (log_) Info<< "    Calculating translationalT field" << endl;
             volScalarField translationalT
             (
                 IOobject
@@ -189,7 +168,7 @@ void Foam::dsmcFields::write()
                *(linearKEMean - 0.5*rhoMMean*(UMean & UMean))
             );
 
-            Info<< "    Calculating internalT field." << endl;
+            if (log_) Info<< "    Calculating internalT field" << endl;
             volScalarField internalT
             (
                 IOobject
@@ -202,7 +181,7 @@ void Foam::dsmcFields::write()
                 (2.0/physicoChemical::k.value())*(internalEMean/iDofMean)
             );
 
-            Info<< "    Calculating overallT field." << endl;
+            if (log_) Info<< "    Calculating overallT field" << endl;
             volScalarField overallT
             (
                 IOobject
@@ -216,7 +195,7 @@ void Foam::dsmcFields::write()
                *(linearKEMean - 0.5*rhoMMean*(UMean & UMean) + internalEMean)
             );
 
-            Info<< "    Calculating pressure field." << endl;
+            if (log_) Info<< "    Calculating pressure field" << endl;
             volScalarField p
             (
                 IOobject
@@ -243,25 +222,28 @@ void Foam::dsmcFields::write()
                 }
             }
 
-            Info<< "    mag(UMean) max/min : "
-                << max(mag(UMean)).value() << " "
-                << min(mag(UMean)).value() << endl;
+            if (log_)
+            {
+                Info<< "    mag(UMean) max/min: "
+                    << max(mag(UMean)).value() << " "
+                    << min(mag(UMean)).value() << endl;
 
-            Info<< "    translationalT max/min : "
-                << max(translationalT).value() << " "
-                << min(translationalT).value() << endl;
+                Info<< "    translationalT max/min: "
+                    << max(translationalT).value() << " "
+                    << min(translationalT).value() << endl;
 
-            Info<< "    internalT max/min : "
-                << max(internalT).value() << " "
-                << min(internalT).value() << endl;
+                Info<< "    internalT max/min: "
+                    << max(internalT).value() << " "
+                    << min(internalT).value() << endl;
 
-            Info<< "    overallT max/min : "
-                << max(overallT).value() << " "
-                << min(overallT).value() << endl;
+                Info<< "    overallT max/min: "
+                    << max(overallT).value() << " "
+                    << min(overallT).value() << endl;
 
-            Info<< "    p max/min : "
-                << max(p).value() << " "
-                << min(p).value() << endl;
+                Info<< "    p max/min: "
+                    << max(p).value() << " "
+                    << min(p).value() << endl;
+            }
 
             UMean.write();
 
@@ -273,13 +255,14 @@ void Foam::dsmcFields::write()
 
             p.write();
 
-            Info<< "dsmcFields written." << nl << endl;
+            if (log_) Info<< "    " << type() << " written" << nl << endl;
         }
         else
         {
-            Info<< "Small value (" << min(mag(rhoNMean))
+            if (log_) Info
+                << "Small value (" << min(mag(rhoNMean))
                 << ") found in rhoNMean field. "
-                << "Not calculating dsmcFields to avoid division by zero."
+                << "Not calculating " << type() << " to avoid division by zero."
                 << endl;
         }
     }
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index b6f7ae68d6..ccef65a107 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,13 +28,32 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    Calculate intensive fields:
+    This function object calculates and outputs the intensive fields:
     - UMean
     - translationalT
     - internalT
     - overallT
     from averaged extensive fields from a DSMC calculation.
 
+
+    Example of function object specification to calculate DSMC fields:
+    \verbatim
+    dsmcFields1
+    {
+        type        dsmcFields;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: dsmcFields   | yes         |
+        log          | Log to standard output  | no          | yes
+    \endtable
+
+
 SourceFiles
     dsmcFields.C
     IOdsmcFields.H
@@ -45,6 +64,7 @@ SourceFiles
 #define dsmcFields_H
 
 #include "typeInfo.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,6 +93,9 @@ class dsmcFields
         //- on/off switch
         bool active_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/utilities/fluxSummary/IOfluxSummary.H b/src/postProcessing/functionObjects/utilities/fluxSummary/IOfluxSummary.H
new file mode 100644
index 0000000000..f29c2e41d1
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/fluxSummary/IOfluxSummary.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOfluxSummary
+
+Description
+    Instance of the generic IOOutputFilter for fluxSummary.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOfluxSummary_H
+#define IOfluxSummary_H
+
+#include "fluxSummary.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<fluxSummary> IOfluxSummary;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.C b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.C
new file mode 100644
index 0000000000..a5f481c52f
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.C
@@ -0,0 +1,917 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fluxSummary.H"
+#include "surfaceFields.H"
+#include "dictionary.H"
+#include "Time.H"
+#include "syncTools.H"
+#include "meshTools.H"
+#include "PatchEdgeFaceWave.H"
+#include "patchEdgeFaceRegion.H"
+#include "globalIndex.H"
+#include "OBJstream.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(fluxSummary, 0);
+
+    template<>
+    const char* NamedEnum
+    <
+        fluxSummary::modeType,
+        3
+    >::names[] =
+    {
+        "faceZone",
+        "faceZoneAndDirection",
+        "cellZoneAndDirection"
+    };
+}
+
+
+const Foam::NamedEnum<Foam::fluxSummary::modeType, 3>
+Foam::fluxSummary::modeTypeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::fluxSummary::initialiseFaceZone
+(
+    const word& faceZoneName,
+    DynamicList<word>& faceZoneNames,
+    DynamicList<List<label> >& faceID,
+    DynamicList<List<label> >& facePatchID,
+    DynamicList<List<scalar> >& faceSign
+) const
+{
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    label zoneI = mesh.faceZones().findZoneID(faceZoneName);
+
+    if (zoneI == -1)
+    {
+        FatalErrorInFunction
+            << "Unable to find faceZone " << faceZoneName
+            << ".  Valid faceZones are: " << mesh.faceZones().names()
+            << exit(FatalError);
+    }
+
+    faceZoneNames.append(faceZoneName);
+
+    const faceZone& fZone = mesh.faceZones()[zoneI];
+
+    DynamicList<label> faceIDs(fZone.size());
+    DynamicList<label> facePatchIDs(fZone.size());
+    DynamicList<scalar> faceSigns(fZone.size());
+
+    forAll(fZone, i)
+    {
+        label faceI = fZone[i];
+
+        label faceID = -1;
+        label facePatchID = -1;
+        if (mesh.isInternalFace(faceI))
+        {
+            faceID = faceI;
+            facePatchID = -1;
+        }
+        else
+        {
+            facePatchID = mesh.boundaryMesh().whichPatch(faceI);
+            const polyPatch& pp = mesh.boundaryMesh()[facePatchID];
+            if (isA<coupledPolyPatch>(pp))
+            {
+                if (refCast<const coupledPolyPatch>(pp).owner())
+                {
+                    faceID = pp.whichFace(faceI);
+                }
+                else
+                {
+                    faceID = -1;
+                }
+            }
+            else if (!isA<emptyPolyPatch>(pp))
+            {
+                faceID = faceI - pp.start();
+            }
+            else
+            {
+                faceID = -1;
+                facePatchID = -1;
+            }
+        }
+
+        if (faceID >= 0)
+        {
+            // orientation set by faceZone flip map
+            if (fZone.flipMap()[faceI])
+            {
+                faceSigns.append(-1);
+            }
+            else
+            {
+                faceSigns.append(1);
+            }
+
+            faceIDs.append(faceID);
+            facePatchIDs.append(facePatchID);
+        }
+    }
+
+    faceID.append(faceIDs);
+    facePatchID.append(facePatchIDs);
+    faceSign.append(faceSigns);
+}
+
+
+void Foam::fluxSummary::initialiseFaceZoneAndDirection
+(
+    const word& faceZoneName,
+    const vector& dir,
+    DynamicList<vector>& zoneRefDir,
+    DynamicList<word>& faceZoneNames,
+    DynamicList<List<label> >& faceID,
+    DynamicList<List<label> >& facePatchID,
+    DynamicList<List<scalar> >& faceSign
+) const
+{
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    vector refDir = dir/(mag(dir) + ROOTVSMALL);
+
+    label zoneI = mesh.faceZones().findZoneID(faceZoneName);
+
+    if (zoneI == -1)
+    {
+         FatalErrorInFunction
+            << "Unable to find faceZone " << faceZoneName
+            << ".  Valid faceZones are: " << mesh.faceZones().names()
+            << exit(FatalError);
+    }
+
+    faceZoneNames.append(faceZoneName);
+    zoneRefDir.append(refDir);
+
+    const faceZone& fZone = mesh.faceZones()[zoneI];
+
+    DynamicList<label> faceIDs(fZone.size());
+    DynamicList<label> facePatchIDs(fZone.size());
+    DynamicList<scalar> faceSigns(fZone.size());
+
+    const surfaceVectorField& Sf = mesh.Sf();
+    const surfaceScalarField& magSf = mesh.magSf();
+
+    vector n = vector::zero;
+
+    forAll(fZone, i)
+    {
+        label faceI = fZone[i];
+
+        label faceID = -1;
+        label facePatchID = -1;
+        if (mesh.isInternalFace(faceI))
+        {
+            faceID = faceI;
+            facePatchID = -1;
+        }
+        else
+        {
+            facePatchID = mesh.boundaryMesh().whichPatch(faceI);
+            const polyPatch& pp = mesh.boundaryMesh()[facePatchID];
+            if (isA<coupledPolyPatch>(pp))
+            {
+                if (refCast<const coupledPolyPatch>(pp).owner())
+                {
+                    faceID = pp.whichFace(faceI);
+                }
+                else
+                {
+                    faceID = -1;
+                }
+            }
+            else if (!isA<emptyPolyPatch>(pp))
+            {
+                faceID = faceI - pp.start();
+            }
+            else
+            {
+                faceID = -1;
+                facePatchID = -1;
+            }
+        }
+
+        if (faceID >= 0)
+        {
+            // orientation set by comparison with reference direction
+            if (facePatchID != -1)
+            {
+                n = Sf.boundaryField()[facePatchID][faceID]
+                   /(magSf.boundaryField()[facePatchID][faceID] + ROOTVSMALL);
+            }
+            else
+            {
+                n = Sf[faceID]/(magSf[faceID] + ROOTVSMALL);
+            }
+
+            if ((n & refDir) > tolerance_)
+            {
+                faceSigns.append(1);
+            }
+            else
+            {
+                faceSigns.append(-1);
+            }
+
+            faceIDs.append(faceID);
+            facePatchIDs.append(facePatchID);
+        }
+    }
+
+    faceID.append(faceIDs);
+    facePatchID.append(facePatchIDs);
+    faceSign.append(faceSigns);
+}
+
+
+void Foam::fluxSummary::initialiseCellZoneAndDirection
+(
+    const word& cellZoneName,
+    const vector& dir,
+    DynamicList<vector>& zoneRefDir,
+    DynamicList<word>& faceZoneNames,
+    DynamicList<List<label> >& faceID,
+    DynamicList<List<label> >& facePatchID,
+    DynamicList<List<scalar> >& faceSign
+) const
+{
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    vector refDir = dir/(mag(dir) + ROOTVSMALL);
+
+    const label cellZoneI = mesh.cellZones().findZoneID(cellZoneName);
+
+    if (cellZoneI == -1)
+    {
+        FatalErrorInFunction
+            << "Unable to find cellZone " << cellZoneName
+            << ". Valid zones are: " << mesh.cellZones().names()
+            << exit(FatalError);
+    }
+
+    const label nInternalFaces = mesh.nInternalFaces();
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    labelList cellAddr(mesh.nCells(), -1);
+    const labelList& cellIDs = mesh.cellZones()[cellZoneI];
+    UIndirectList<label>(cellAddr, cellIDs) = identity(cellIDs.size());
+    labelList nbrFaceCellAddr(mesh.nFaces() - nInternalFaces, -1);
+
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+
+        if (pp.coupled())
+        {
+            forAll(pp, i)
+            {
+                label faceI = pp.start() + i;
+                label nbrFaceI = faceI - nInternalFaces;
+                label own = mesh.faceOwner()[faceI];
+                nbrFaceCellAddr[nbrFaceI] = cellAddr[own];
+            }
+        }
+    }
+
+    // correct boundary values for parallel running
+    syncTools::swapBoundaryFaceList(mesh, nbrFaceCellAddr);
+
+    // collect faces
+    DynamicList<label> faceIDs(floor(0.1*mesh.nFaces()));
+    DynamicList<label> facePatchIDs(faceIDs.size());
+    DynamicList<label> faceLocalPatchIDs(faceIDs.size());
+    DynamicList<scalar> faceSigns(faceIDs.size());
+
+    // internal faces
+    for (label faceI = 0; faceI < nInternalFaces; faceI++)
+    {
+        const label own = cellAddr[mesh.faceOwner()[faceI]];
+        const label nbr = cellAddr[mesh.faceNeighbour()[faceI]];
+
+        if (((own != -1) && (nbr == -1)) || ((own == -1) && (nbr != -1)))
+        {
+            vector n = mesh.faces()[faceI].normal(mesh.points());
+            n /= mag(n) + ROOTVSMALL;
+
+            if ((n & refDir) > tolerance_)
+            {
+                faceIDs.append(faceI);
+                faceLocalPatchIDs.append(faceI);
+                facePatchIDs.append(-1);
+                faceSigns.append(1);
+            }
+            else if ((n & -refDir) > tolerance_)
+            {
+                faceIDs.append(faceI);
+                faceLocalPatchIDs.append(faceI);
+                facePatchIDs.append(-1);
+                faceSigns.append(-1);
+            }
+        }
+    }
+
+    // loop of boundary faces
+    forAll(pbm, patchI)
+    {
+        const polyPatch& pp = pbm[patchI];
+
+        forAll(pp, localFaceI)
+        {
+            const label faceI = pp.start() + localFaceI;
+            const label own = cellAddr[mesh.faceOwner()[faceI]];
+            const label nbr = nbrFaceCellAddr[faceI - nInternalFaces];
+
+            if ((own != -1) && (nbr == -1))
+            {
+                vector n = mesh.faces()[faceI].normal(mesh.points());
+                n /= mag(n) + ROOTVSMALL;
+
+                if ((n & refDir) > tolerance_)
+                {
+                    faceIDs.append(faceI);
+                    faceLocalPatchIDs.append(localFaceI);
+                    facePatchIDs.append(patchI);
+                    faceSigns.append(1);
+                }
+                else if ((n & -refDir) > tolerance_)
+                {
+                    faceIDs.append(faceI);
+                    faceLocalPatchIDs.append(localFaceI);
+                    facePatchIDs.append(patchI);
+                    faceSigns.append(-1);
+                }
+            }
+        }
+    }
+
+    // convert into primitivePatch for convenience
+    indirectPrimitivePatch patch
+    (
+        IndirectList<face>(mesh.faces(), faceIDs),
+        mesh.points()
+    );
+
+    if (debug)
+    {
+        OBJstream os(mesh.time().path()/"patch.obj");
+        faceList faces(patch);
+        os.write(faces, mesh.points(), false);
+    }
+
+
+    // data on all edges and faces
+    List<patchEdgeFaceRegion> allEdgeInfo(patch.nEdges());
+    List<patchEdgeFaceRegion> allFaceInfo(patch.size());
+
+    bool search = true;
+
+    if (debug)
+    {
+        Info<< "initialiseCellZoneAndDirection: "
+            << "Starting walk to split patch into faceZones"
+            << endl;
+    }
+
+    globalIndex globalFaces(patch.size());
+
+    label oldFaceID = 0;
+    label regionI = 0;
+    while (search)
+    {
+        DynamicList<label> changedEdges;
+        DynamicList<patchEdgeFaceRegion> changedInfo;
+
+        label seedFaceI = labelMax;
+        for (; oldFaceID < patch.size(); oldFaceID++)
+        {
+            if (allFaceInfo[oldFaceID].region() == -1)
+            {
+                seedFaceI = globalFaces.toGlobal(oldFaceID);
+                break;
+            }
+        }
+        reduce(seedFaceI, minOp<label>());
+
+        if (seedFaceI == labelMax)
+        {
+            break;
+        }
+
+        if (globalFaces.isLocal(seedFaceI))
+        {
+            label localFaceI = globalFaces.toLocal(seedFaceI);
+            const labelList& fEdges = patch.faceEdges()[localFaceI];
+
+            forAll(fEdges, i)
+            {
+                if (allEdgeInfo[fEdges[i]].region() != -1)
+                {
+                    WarningInFunction
+                        << "Problem in edge face wave: attempted to assign a "
+                        << "value to an edge that has already been visited. "
+                        << "Edge info: " << allEdgeInfo[fEdges[i]]
+                        << endl;
+                }
+
+                changedEdges.append(fEdges[i]);
+                changedInfo.append(regionI);
+            }
+        }
+
+
+        PatchEdgeFaceWave
+        <
+            indirectPrimitivePatch,
+            patchEdgeFaceRegion
+        > calc
+        (
+            mesh,
+            patch,
+            changedEdges,
+            changedInfo,
+            allEdgeInfo,
+            allFaceInfo,
+            returnReduce(patch.nEdges(), sumOp<label>())
+        );
+
+        if (debug)
+        {
+            label nCells = 0;
+            forAll(allFaceInfo, faceI)
+            {
+                if (allFaceInfo[faceI].region() == regionI)
+                {
+                    nCells++;
+                }
+            }
+
+            Info<< "*** region:" << regionI
+                << "  found:" << returnReduce(nCells, sumOp<label>())
+                << " faces" << endl;
+        }
+
+        regionI++;
+    }
+
+    // collect the data per region
+    label nRegion = regionI;
+
+    List<DynamicList<label> > regionFaceIDs(nRegion);
+    List<DynamicList<label> > regionFacePatchIDs(nRegion);
+    List<DynamicList<scalar> > regionFaceSigns(nRegion);
+
+    forAll(allFaceInfo, faceI)
+    {
+        regionI = allFaceInfo[faceI].region();
+
+        regionFaceIDs[regionI].append(faceLocalPatchIDs[faceI]);
+        regionFacePatchIDs[regionI].append(facePatchIDs[faceI]);
+        regionFaceSigns[regionI].append(faceSigns[faceI]);
+    }
+
+    // transfer to persistent storage
+    forAll(regionFaceIDs, regionI)
+    {
+        const word zoneName = cellZoneName + ":faceZone" + Foam::name(regionI);
+        faceZoneNames.append(zoneName);
+        zoneRefDir.append(refDir);
+        faceID.append(regionFaceIDs[regionI]);
+        facePatchID.append(regionFacePatchIDs[regionI]);
+        faceSign.append(regionFaceSigns[regionI]);
+
+        // write OBJ of faces to file
+        if (debug)
+        {
+            OBJstream os(mesh.time().path()/zoneName + ".obj");
+            faceList faces(mesh.faces(), regionFaceIDs[regionI]);
+            os.write(faces, mesh.points(), false);
+        }
+    }
+
+    if (log_)
+    {
+        Info<< type() << " " << name_ << " output:" << nl
+            << "    Created " << faceID.size()
+            << " separate face zones from cell zone " << cellZoneName << nl;
+
+        forAll(faceZoneNames, i)
+        {
+            label nFaces = returnReduce(faceID[i].size(), sumOp<label>());
+            Info<< "    " << faceZoneNames[i] << ": "
+                << nFaces << " faces" << nl;
+        }
+
+        Info<< endl;
+    }
+}
+
+
+void Foam::fluxSummary::initialiseFaceArea()
+{
+    faceArea_.setSize(faceID_.size(), 0);
+
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+    const surfaceScalarField& magSf = mesh.magSf();
+
+    forAll(faceID_, zoneI)
+    {
+        const labelList& faceIDs = faceID_[zoneI];
+        const labelList& facePatchIDs = facePatchID_[zoneI];
+
+        scalar sumMagSf = 0;
+
+        forAll(faceIDs, i)
+        {
+            label faceI = faceIDs[i];
+
+            if (facePatchIDs[i] == -1)
+            {
+                sumMagSf += magSf[faceI];
+            }
+            else
+            {
+                label patchI = facePatchIDs[i];
+                sumMagSf += magSf.boundaryField()[patchI][faceI];
+            }
+        }
+
+        faceArea_[zoneI] = returnReduce(sumMagSf, sumOp<scalar>());
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fluxSummary::fluxSummary
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    functionObjectFile(obr, name),
+    name_(name),
+    obr_(obr),
+    active_(true),
+    log_(true),
+    mode_(mdFaceZone),
+    scaleFactor_(1),
+    phiName_("phi"),
+    faceZoneName_(),
+    refDir_(),
+    faceID_(),
+    facePatchID_(),
+    faceSign_(),
+    faceArea_(),
+    filePtrs_(),
+    tolerance_(0.8)
+{
+    // Check if the available mesh is an fvMesh otherise deactivate
+    if (!isA<fvMesh>(obr_))
+    {
+        active_ = false;
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
+            << endl;
+    }
+
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::fluxSummary::~fluxSummary()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fluxSummary::read(const dictionary& dict)
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    functionObjectFile::read(dict);
+
+    log_ = dict.lookupOrDefault<Switch>("log", true);
+
+    mode_ = modeTypeNames_.read(dict.lookup("mode"));
+    phiName_= dict.lookupOrDefault<word>("phiName", "phi");
+    dict.readIfPresent("scaleFactor", scaleFactor_);
+    dict.readIfPresent("tolerance", tolerance_);
+
+    // initialise with capacity of 10 faceZones
+    DynamicList<vector> refDir(10);
+    DynamicList<word> faceZoneName(refDir.size());
+    DynamicList<List<label> > faceID(refDir.size());
+    DynamicList<List<label> > facePatchID(refDir.size());
+    DynamicList<List<scalar> > faceSign(refDir.size());
+
+    switch (mode_)
+    {
+        case mdFaceZone:
+        {
+            List<word> zones(dict.lookup("faceZones"));
+
+            forAll(zones, i)
+            {
+                initialiseFaceZone
+                (
+                    zones[i],
+                    faceZoneName,
+                    faceID,
+                    facePatchID,
+                    faceSign
+                );
+            }
+            break;
+        }
+        case mdFaceZoneAndDirection:
+        {
+            List<Tuple2<word, vector> >
+                zoneAndDirection(dict.lookup("faceZoneAndDirection"));
+
+            forAll(zoneAndDirection, i)
+            {
+                initialiseFaceZoneAndDirection
+                (
+                    zoneAndDirection[i].first(),
+                    zoneAndDirection[i].second(),
+                    refDir,
+                    faceZoneName,
+                    faceID,
+                    facePatchID,
+                    faceSign
+                );
+            }
+            break;
+        }
+        case mdCellZoneAndDirection:
+        {
+            List<Tuple2<word, vector> >
+                zoneAndDirection(dict.lookup("cellZoneAndDirection"));
+
+            forAll(zoneAndDirection, i)
+            {
+                initialiseCellZoneAndDirection
+                (
+                    zoneAndDirection[i].first(),
+                    zoneAndDirection[i].second(),
+                    refDir,
+                    faceZoneName,
+                    faceID,
+                    facePatchID,
+                    faceSign
+                );
+            }
+            break;
+        }
+        default:
+        {
+            FatalIOErrorInFunction(dict)
+                << "unhandled enumeration " << modeTypeNames_[mode_]
+                << abort(FatalIOError);
+        }
+    }
+
+    faceZoneName_.transfer(faceZoneName);
+    refDir_.transfer(refDir);
+    faceID_.transfer(faceID);
+    facePatchID_.transfer(facePatchID);
+    faceSign_.transfer(faceSign);
+
+    initialiseFaceArea();
+
+    if (writeToFile())
+    {
+        filePtrs_.setSize(faceZoneName_.size());
+
+        forAll(filePtrs_, fileI)
+        {
+            const word& fzName = faceZoneName_[fileI];
+            filePtrs_.set(fileI, createFile(fzName));
+            writeFileHeader
+            (
+                fzName,
+                faceArea_[fileI],
+                refDir_[fileI],
+                filePtrs_[fileI]
+            );
+        }
+    }
+
+    // Provide some output
+    if (log_)
+    {
+        Info<< type() << " " << name_ << " output:" << nl;
+
+        forAll(faceZoneName_, zoneI)
+        {
+            const word& zoneName = faceZoneName_[zoneI];
+            scalar zoneArea = faceArea_[zoneI];
+
+            Info<< "    Zone: " << zoneName << ", area: " << zoneArea << nl;
+        }
+
+        Info<< endl;
+    }
+}
+
+
+void Foam::fluxSummary::writeFileHeader
+(
+    const word& fzName,
+    const scalar area,
+    const vector& refDir,
+    Ostream& os
+) const
+{
+    writeHeader(os, "Flux summary");
+    writeHeaderValue(os, "Face zone", fzName);
+    writeHeaderValue(os, "Total area", area);
+
+    switch (mode_)
+    {
+        case mdFaceZoneAndDirection:
+        case mdCellZoneAndDirection:
+        {
+            writeHeaderValue(os, "Reference direction", refDir);
+            break;
+        }
+        default:
+        {}
+    }
+
+    writeHeaderValue(os, "Scale factor", scaleFactor_);
+
+    writeCommented(os, "Time");
+    os  << tab << "positive"
+        << tab << "negative"
+        << tab << "net"
+        << tab << "absolute"
+        << endl;
+}
+
+
+void Foam::fluxSummary::execute()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::fluxSummary::end()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::fluxSummary::timeSet()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::fluxSummary::write()
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    const surfaceScalarField& phi =
+        obr_.lookupObject<surfaceScalarField>(phiName_);
+
+    word flowType = "";
+    if (phi.dimensions() == dimVolume/dimTime)
+    {
+        flowType = "volumetric";
+    }
+    else if (phi.dimensions() == dimMass/dimTime)
+    {
+        flowType = "mass";
+    }
+    else
+    {
+        FatalErrorInFunction
+            << "Unsupported flux field " << phi.name() << " with dimensions "
+            << phi.dimensions() << ".  Expected eithe mass flow or volumetric "
+            << "flow rate" << abort(FatalError);
+    }
+
+    if (log_)
+    {
+        Info<< type() << " " << name_ << ' ' << flowType << " flux output:"
+            << nl;
+    }
+
+    forAll(faceZoneName_, zoneI)
+    {
+        const labelList& faceID = faceID_[zoneI];
+        const labelList& facePatchID = facePatchID_[zoneI];
+        const scalarList& faceSign = faceSign_[zoneI];
+
+        scalar phiPos = scalar(0);
+        scalar phiNeg = scalar(0);
+        scalar phif = scalar(0);
+
+        forAll(faceID, i)
+        {
+            label faceI = faceID[i];
+            label patchI = facePatchID[i];
+
+            if (patchI != -1)
+            {
+                phif = phi.boundaryField()[patchI][faceI];
+            }
+            else
+            {
+                phif = phi[faceI];
+            }
+
+            phif *= faceSign[i];
+
+            if (phif > 0)
+            {
+                phiPos += phif;
+            }
+            else
+            {
+                phiNeg += phif;
+            }
+        }
+
+        reduce(phiPos, sumOp<scalar>());
+        reduce(phiNeg, sumOp<scalar>());
+
+        phiPos *= scaleFactor_;
+        phiNeg *= scaleFactor_;
+
+        scalar netFlux = phiPos + phiNeg;
+        scalar absoluteFlux = phiPos - phiNeg;
+
+        if (log_)
+        {
+            Info<< "    faceZone " << faceZoneName_[zoneI] << ':' << nl
+                << "        positive : " << phiPos << nl
+                << "        negative : " << phiNeg << nl
+                << "        net      : " << netFlux << nl
+                << "        absolute : " << absoluteFlux
+                << nl << endl;
+        }
+
+        if (writeToFile())
+        {
+            filePtrs_[zoneI]
+                << obr_.time().value() << token::TAB
+                << phiPos << token::TAB
+                << phiNeg << token::TAB
+                << netFlux << token::TAB
+                << absoluteFlux
+                << endl;
+        }
+    }
+
+    if (log_) Info<< endl;
+}
+
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.H b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.H
new file mode 100644
index 0000000000..777167b171
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummary.H
@@ -0,0 +1,302 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fluxSummary
+
+Group
+    grpUtilityFunctionObjects
+
+Description
+    This function object calculates the flux across selections of faces.
+
+    Output comprises, per set of faces, the:
+    - positive
+    - negative
+    - net
+    - absolute
+    fluxes
+
+    Example of function object specification:
+    \verbatim
+    fluxSummary1
+    {
+        type        fluxSummary;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+        write       yes;
+        log         yes;
+        mode        cellZoneAndDirection;
+        cellZoneAndDirection
+        (
+            (porosity (1 0 0))
+        );
+        scaleFactor 1.2;
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | type name: fluxSummary  | yes         |
+        write        | write flux data to file |  no  | yes
+        log          | write flux data to standard output | no | yes
+        mode         | mode to generate faces to test | yes |
+        scaleFactor  | optional factor to scale result | no | 1
+    \endtable
+
+    The mode is one of:
+    - faceZone
+    - faceZoneAndDirection
+    - cellZoneAndDirection
+
+    Output data is written to files of the form \<timeDir\>/<faceZoneName>.dat
+
+SeeAlso
+    Foam::functionObject
+    Foam::OutputFilterFunctionObject
+
+SourceFiles
+    fluxSummary.C
+    IOfluxSummary.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fluxSummary_H
+#define fluxSummary_H
+
+#include "functionObjectFile.H"
+#include "Switch.H"
+#include "vector.H"
+#include "DynamicList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                    Class fluxSummary Declaration
+\*---------------------------------------------------------------------------*/
+
+class fluxSummary
+:
+    public functionObjectFile
+{
+public:
+
+    // Public enumerations
+
+        //- Face mode type
+        enum modeType
+        {
+            mdFaceZone,
+            mdFaceZoneAndDirection,
+            mdCellZoneAndDirection
+        };
+
+        //- Mode type names
+        static const NamedEnum<modeType, 3> modeTypeNames_;
+
+
+protected:
+
+    // Protected data
+
+        //- Name of function object
+        //  Also used as the name of the output directory
+        word name_;
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+        //- Switch to send output to Info as well
+        Switch log_;
+
+        //- Mode for face determination
+        modeType mode_;
+
+        //- Scale factor
+        scalar scaleFactor_;
+
+        //- Name of flux field, default = phi
+        word phiName_;
+
+
+        // Per-faceZone information
+
+            //- Region names
+            List<word> faceZoneName_;
+
+            //- Reference direction
+            List<vector> refDir_;
+
+            //- Face IDs
+            List<List<label> > faceID_;
+
+            //- Face patch IDs
+            List<List<label> > facePatchID_;
+
+            //- Face flip map signs
+            List<List<scalar> > faceSign_;
+
+            //- Sum of face areas
+            List<scalar> faceArea_;
+
+            //- Output file per face zone
+            PtrList<OFstream> filePtrs_;
+
+
+        //- Tolerance applied when matching face normals
+        scalar tolerance_;
+
+
+    // Private Member Functions
+
+        //- Initialise face set from face zone
+        void initialiseFaceZone
+        (
+            const word& faceZoneName,
+            DynamicList<word>& faceZoneNames,
+            DynamicList<List<label> >& faceID,
+            DynamicList<List<label> >& facePatchID,
+            DynamicList<List<scalar> >& faceSign
+        ) const;
+
+        //- Initialise face set from face zone and direction
+        void initialiseFaceZoneAndDirection
+        (
+            const word& faceZoneName,
+            const vector& refDir,
+            DynamicList<vector>& dir,
+            DynamicList<word>& faceZoneNames,
+            DynamicList<List<label> >& faceID,
+            DynamicList<List<label> >& facePatchID,
+            DynamicList<List<scalar> >& faceSign
+        ) const;
+
+        //- Initialise face set from cell zone and direction
+        void initialiseCellZoneAndDirection
+        (
+            const word& cellZoneName,
+            const vector& refDir,
+            DynamicList<vector>& dir,
+            DynamicList<word>& faceZoneNames,
+            DynamicList<List<label> >& faceID,
+            DynamicList<List<label> >& facePatchID,
+            DynamicList<List<scalar> >& faceSign
+        ) const;
+
+        //- Initialise the total area per derived faceZone
+        void initialiseFaceArea();
+
+        //- Output file header information
+        virtual void writeFileHeader
+        (
+            const word& fzName,
+            const scalar area,
+            const vector& refDir,
+            Ostream& os
+        ) const;
+
+        //- Disallow default bitwise copy construct
+        fluxSummary(const fluxSummary&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const fluxSummary&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fluxSummary");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        fluxSummary
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~fluxSummary();
+
+
+    // Member Functions
+
+        //- Return name of the set of field min/max
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the field min/max data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Write the fluxSummary
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.C b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.C
new file mode 100644
index 0000000000..32c61e2df3
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fluxSummaryFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(fluxSummaryFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        fluxSummaryFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.H b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.H
new file mode 100644
index 0000000000..b0b4380bff
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::fluxSummaryFunctionObject
+
+Description
+    FunctionObject wrapper around fluxSummary to allow them to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    fluxSummaryFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fluxSummaryFunctionObject_H
+#define fluxSummaryFunctionObject_H
+
+#include "fluxSummary.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<fluxSummary> fluxSummaryFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index e760f43107..4e023d924c 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,28 +37,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::word Foam::pressureTools::pName() const
-{
-    word fieldName = pName_;
-
-    if (calcTotal_)
-    {
-        fieldName = "total(" + fieldName + ")";
-    }
-    else
-    {
-        fieldName = "static(" + fieldName + ")";
-    }
-
-    if (calcCoeff_)
-    {
-        fieldName = fieldName + "_coeff";
-    }
-
-    return fieldName;
-}
-
-
 Foam::dimensionedScalar Foam::pressureTools::rhoScale
 (
     const volScalarField& p
@@ -86,7 +64,17 @@ Foam::tmp<Foam::volScalarField> Foam::pressureTools::rho
     }
     else
     {
-        return
+        if (!rhoInfInitialised_)
+        {
+            FatalErrorInFunction
+                << type() << " " << name_ << ": "
+                << "pressure identified as incompressible, but reference "
+                << "density is not set.  Please set rhoName to rhoInf, and "
+                << "set an appropriate value for rhoInf"
+                << exit(FatalError);
+        }
+
+       return
             tmp<volScalarField>
             (
                 new volScalarField
@@ -193,27 +181,22 @@ Foam::pressureTools::pressureTools
     pName_("p"),
     UName_("U"),
     rhoName_("rho"),
+    resultName_(word::null),
+    log_(true),
     calcTotal_(false),
     pRef_(0.0),
     calcCoeff_(false),
     pInf_(0.0),
     UInf_(vector::zero),
-    rhoInf_(0.0)
+    rhoInf_(0.0),
+    rhoInfInitialised_(false)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "pressureTools::pressureTools"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -236,7 +219,7 @@ Foam::pressureTools::pressureTools
             (
                 IOobject
                 (
-                    pName(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -264,13 +247,18 @@ void Foam::pressureTools::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_.readIfPresent("log", dict);
+
         dict.readIfPresent("pName", pName_);
         dict.readIfPresent("UName", UName_);
         dict.readIfPresent("rhoName", rhoName_);
 
+        rhoInfInitialised_ = false;
+
         if (rhoName_ == "rhoInf")
         {
             dict.lookup("rhoInf") >> rhoInf_;
+            rhoInfInitialised_ = true;
         }
 
         dict.lookup("calcTotal") >> calcTotal_;
@@ -290,12 +278,33 @@ void Foam::pressureTools::read(const dictionary& dict)
 
             if (mag(zeroCheck) < ROOTVSMALL)
             {
-                WarningIn("void Foam::pressureTools::read(const dictionary&)")
+                WarningInFunction
                     << type() << " " << name_ << ": "
                     << "Coefficient calculation requested, but reference "
                     << "pressure level is zero.  Please check the supplied "
                     << "values of pInf, UInf and rhoInf" << endl;
             }
+
+            rhoInfInitialised_ = true;
+        }
+
+        if (!dict.readIfPresent("resultName", resultName_))
+        {
+            resultName_ = pName_;
+
+            if (calcTotal_)
+            {
+                resultName_ = "total(" + resultName_ + ")";
+            }
+            else
+            {
+                resultName_ = "static(" + resultName_ + ")";
+            }
+
+            if (calcCoeff_)
+            {
+                resultName_ = resultName_ + "_coeff";
+            }
         }
     }
 }
@@ -310,7 +319,7 @@ void Foam::pressureTools::execute()
         volScalarField& pResult =
             const_cast<volScalarField&>
             (
-                obr_.lookupObject<volScalarField>(pName())
+                obr_.lookupObject<volScalarField>(resultName_)
             );
 
         pResult == convertToCoeff(rhoScale(p)*p + pDyn(p) + pRef());
@@ -320,10 +329,7 @@ void Foam::pressureTools::execute()
 
 void Foam::pressureTools::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -338,9 +344,10 @@ void Foam::pressureTools::write()
     if (active_)
     {
         const volScalarField& pResult =
-            obr_.lookupObject<volScalarField>(pName());
+            obr_.lookupObject<volScalarField>(resultName_);
 
-        Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << pResult.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
index 6d80b388d1..0c70fe94d2 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -93,11 +93,16 @@ Description
         Property     | Description             | Required    | Default value
         type         | type name: pressureTools| yes         |
         calcTotal    | Calculate total coefficient | yes     |
+        pName        | Name of pressure field  | no          | p
+        UName        | Name of velocity field  | no          | U
+        rhoName      | Name of density field   | no          | rho
         pRef         | Reference pressure for total pressure | no | 0.0
         calcCoeff    | Calculate pressure coefficient | yes  |
         pInf         | Freestream pressure for coefficient calculation | no |
         UInf         | Freestream velocity for coefficient calculation | no |
         rhoInf       | Freestream density for coefficient calculation | no |
+        resultName   | Name of derived pressure field | no   | auto generated
+        log          | log to standard output  | no          | yes
     \endtable
 
 SourceFiles
@@ -111,6 +116,7 @@ SourceFiles
 
 #include "volFieldsFwd.H"
 #include "dimensionedScalar.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -149,6 +155,12 @@ class pressureTools
         //- Name of density field, default is "rho"
         word rhoName_;
 
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
         // Total pressure calculation
 
@@ -173,13 +185,13 @@ class pressureTools
             //- Freestream density
             scalar rhoInf_;
 
+            //- Flag to show whether rhoInf has been initialised
+            bool rhoInfInitialised_;
+
 
     // Private Member Functions
 
-        //- Return the name of the derived pressure field
-        word pName() const;
-
-        //- Return the density scaling if supplied with kinematic pressure
+        //- Return the density scale
         dimensionedScalar rhoScale(const volScalarField& p) const;
 
         //- Return the density field
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.C b/src/postProcessing/functionObjects/utilities/residuals/residuals.C
index 64ac3690b6..f33d1db06d 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.C
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,6 +35,23 @@ namespace Foam
     defineTypeNameAndDebug(residuals, 0);
 }
 
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+void Foam::residuals::writeFileHeader(Ostream& os) const
+{
+    writeHeader(os, "Residuals");
+    writeCommented(os, "Time");
+
+    forAll(fieldSet_, fieldI)
+    {
+        writeTabbed(os, fieldSet_[fieldI]);
+    }
+
+    os << endl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::residuals::residuals
@@ -45,7 +62,7 @@ Foam::residuals::residuals
     const bool loadFromFiles
 )
 :
-    functionObjectFile(obr, name, typeName),
+    functionObjectFile(obr, name, typeName, dict),
     name_(name),
     obr_(obr),
     active_(true),
@@ -55,20 +72,16 @@ Foam::residuals::residuals
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "residuals::residuals"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 
-    read(dict);
+    if (active_)
+    {
+        read(dict);
+        writeFileHeader(file());
+    }
 }
 
 
@@ -84,55 +97,34 @@ void Foam::residuals::read(const dictionary& dict)
 {
     if (active_)
     {
-        dict.lookup("fields") >> fieldSet_;
-    }
-}
+        functionObjectFile::read(dict);
 
-
-void Foam::residuals::writeFileHeader(const label i)
-{
-    if (Pstream::master())
-    {
-        writeHeader(file(), "Residuals");
-        writeCommented(file(), "Time");
-
-        forAll(fieldSet_, fieldI)
-        {
-            writeTabbed(file(), fieldSet_[fieldI]);
-        }
-
-        file() << endl;
+        wordList allFields(dict.lookup("fields"));
+        wordHashSet uniqueFields(allFields);
+        fieldSet_ = uniqueFields.toc();
     }
 }
 
 
 void Foam::residuals::execute()
-{
-    // Do nothing - only valid on write
-}
+{}
 
 
 void Foam::residuals::end()
-{
-    // Do nothing - only valid on write
-}
+{}
 
 
 void Foam::residuals::timeSet()
-{
-    // Do nothing - only valid on write
-}
+{}
 
 
 void Foam::residuals::write()
 {
     if (active_)
     {
-        functionObjectFile::write();
-
         if (Pstream::master())
         {
-            file()<< obr_.time().value();
+            writeTime(file());
 
             forAll(fieldSet_, fieldI)
             {
@@ -150,4 +142,5 @@ void Foam::residuals::write()
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.H b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
index cb3d69cabd..c0b392880a 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.H
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,7 +83,7 @@ class polyMesh;
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                       Class residuals Declaration
+                          Class residuals Declaration
 \*---------------------------------------------------------------------------*/
 
 class residuals
@@ -115,8 +115,12 @@ protected:
         //- Disallow default bitwise assignment
         void operator=(const residuals&);
 
+        //- Output field header information
+        template<class Type>
+        void writeFileHeader(const word& fieldName);
+
         //- Output file header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
 
 public:
@@ -150,7 +154,7 @@ public:
             return name_;
         }
 
-        //- Read the field min/max data
+        //- Read the field residuals data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -162,7 +166,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the field min/max
+        //- Calculate the field residuals
         template<class Type>
         void writeResidual(const word& fieldName);
 
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C b/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
index 4d7c0c032e..28f017a846 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,16 +26,11 @@ License
 #include "residuals.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "Time.H"
-#include "ListOps.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::residuals::writeResidual
-(
-    const word& fieldName
-)
+void Foam::residuals::writeResidual(const word& fieldName)
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
 
@@ -47,9 +42,25 @@ void Foam::residuals::writeResidual
 
         if (solverDict.found(fieldName))
         {
-            const List<solverPerformance> sp(solverDict.lookup(fieldName));
-            const scalar residual = sp.first().initialResidual();
-            file() << token::TAB << residual;
+            const List<SolverPerformance<Type> > sp
+            (
+                solverDict.lookup(fieldName)
+            );
+
+            const Type& residual = sp.first().initialResidual();
+
+            typename pTraits<Type>::labelType validComponents
+            (
+                mesh.validComponents<Type>()
+            );
+
+            for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+            {
+                if (component(validComponents, cmpt) != -1)
+                {
+                    file() << token::TAB << component(residual, cmpt);
+                }
+            }
         }
     }
 }
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index 97dde67611..2cc155904b 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,6 +70,34 @@ Foam::wordList Foam::scalarTransport::boundaryTypes() const
 }
 
 
+Foam::volScalarField& Foam::scalarTransport::transportedField()
+{
+    if (!mesh_.foundObject<volScalarField>(name()))
+    {
+        volScalarField* fldPtr = new volScalarField
+        (
+            IOobject
+            (
+                name(),
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::READ_IF_PRESENT,
+                IOobject::AUTO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("zero", dimless, 0.0),
+            boundaryTypes()
+        );
+        fldPtr->store();
+    }
+
+    return const_cast<volScalarField&>
+    (
+        mesh_.lookupObject<volScalarField>(name())
+    );
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::scalarTransport::DT
 (
     const surfaceScalarField& phi
@@ -159,26 +187,17 @@ Foam::scalarTransport::scalarTransport
     nCorr_(0),
     autoSchemes_(false),
     fvOptions_(mesh_),
-    T_
-    (
-        IOobject
-        (
-            name,
-            mesh_.time().timeName(),
-            mesh_,
-            IOobject::READ_IF_PRESENT,
-            IOobject::AUTO_WRITE
-        ),
-        mesh_,
-        dimensionedScalar("zero", dimless, 0.0),
-        boundaryTypes()
-    )
+    log_(true)
 {
     read(dict);
 
+    // Force creation of transported field so any bcs using it can look it
+    // up
+    volScalarField& T = transportedField();
+
     if (resetOnStartUp_)
     {
-        T_ == dimensionedScalar("zero", dimless, 0.0);
+        T == dimensionedScalar("zero", dimless, 0.0);
     }
 }
 
@@ -195,11 +214,13 @@ void Foam::scalarTransport::read(const dictionary& dict)
 {
     if (active_)
     {
-        Info<< type() << ":" << nl;
+        log_.readIfPresent("log", dict);
 
-        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
-        UName_ = dict.lookupOrDefault<word>("UName", "U");
-        rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+        if (log_) Info<< type() << " " << name_ << " output:" << nl;
+
+        dict.readIfPresent("phiName", phiName_);
+        dict.readIfPresent("UName", UName_);
+        dict.readIfPresent("rhoName", rhoName_);
 
         userDT_ = false;
         if (dict.readIfPresent("DT", DT_))
@@ -207,10 +228,8 @@ void Foam::scalarTransport::read(const dictionary& dict)
             userDT_ = true;
         }
 
-        dict.lookup("resetOnStartUp") >> resetOnStartUp_;
-
         dict.readIfPresent("nCorr", nCorr_);
-
+        dict.lookup("resetOnStartUp") >> resetOnStartUp_;
         dict.lookup("autoSchemes") >> autoSchemes_;
 
         fvOptions_.reset(dict.subDict("fvOptions"));
@@ -222,16 +241,18 @@ void Foam::scalarTransport::execute()
 {
     if (active_)
     {
-        Info<< type() << " output:" << endl;
+        if (log_) Info<< type() << " " << name_ << " output:" << nl;
 
         const surfaceScalarField& phi =
             mesh_.lookupObject<surfaceScalarField>(phiName_);
 
+        volScalarField& T = transportedField();
+
         // calculate the diffusivity
         volScalarField DT(this->DT(phi));
 
         // set schemes
-        word schemeVar = T_.name();
+        word schemeVar = T.name();
         if (autoSchemes_)
         {
             schemeVar = UName_;
@@ -257,11 +278,11 @@ void Foam::scalarTransport::execute()
             {
                 fvScalarMatrix TEqn
                 (
-                    fvm::ddt(rho, T_)
-                  + fvm::div(phi, T_, divScheme)
-                  - fvm::laplacian(DT, T_, laplacianScheme)
+                    fvm::ddt(rho, T)
+                  + fvm::div(phi, T, divScheme)
+                  - fvm::laplacian(DT, T, laplacianScheme)
                  ==
-                    fvOptions_(rho, T_)
+                    fvOptions_(rho, T)
                 );
 
                 TEqn.relax(relaxCoeff);
@@ -278,11 +299,11 @@ void Foam::scalarTransport::execute()
             {
                 fvScalarMatrix TEqn
                 (
-                    fvm::ddt(T_)
-                  + fvm::div(phi, T_, divScheme)
-                  - fvm::laplacian(DT, T_, laplacianScheme)
+                    fvm::ddt(T)
+                  + fvm::div(phi, T, divScheme)
+                  - fvm::laplacian(DT, T, laplacianScheme)
                  ==
-                    fvOptions_(T_)
+                    fvOptions_(T)
                 );
 
                 TEqn.relax(relaxCoeff);
@@ -294,23 +315,20 @@ void Foam::scalarTransport::execute()
         }
         else
         {
-            FatalErrorIn("void Foam::scalarTransport::execute()")
+            FatalErrorInFunction
                 << "Incompatible dimensions for phi: " << phi.dimensions() << nl
                 << "Dimensions should be " << dimMass/dimTime << " or "
                 << dimVolume/dimTime << endl;
         }
 
-        Info<< endl;
+        if (log_) Info<< endl;
     }
 }
 
 
 void Foam::scalarTransport::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
index 3006ca197d..c541c925a3 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,9 +29,10 @@ Group
 
 Description
     This function object evolves a passive scalar transport equation.  The
-    field in ininitially zero, to which sources are added.  The field name
+    field is initially zero, to which sources are added.  The field name
     is assigned the name of the function object.  Boundary conditions are
-    automatically applied, based on the velocity boundary conditions.
+    read from file if the field file is available, or automatically applied
+    based on the velocity boundary conditions.
 
     - the field can be zeroed on start-up using the resetOnStartUp flag
     - to employ the same numerical schemes as the flow velocity, use the
@@ -39,10 +40,51 @@ Description
     - the diffusivity can be set manually using the DT entry, or retrieved
       from the turbulence model (if applicable)
 
+    Example of function object specification to solve a scalar transport
+    equation:
+    \verbatim
+    functions
+    {
+        scalar1                                     // <--- NOTE: SCALAR NAME
+        {
+            type            scalarTransport;
+            functionObjectLibs ("libutilityFunctionObjects.so");
+            resetOnStartUp  no;
+
+            autoSchemes     yes;
+
+            fvOptions
+            {
+                ...
+            }
+        }
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: scalarTransport | yes      |
+        phiName      | Name of flux field      | no          | phi
+        UName        | Name of velocity field  | no          | U
+        rhoName      | Name of density field   | no          | rho
+        nCorr        | Number of correctors    | no          | 0
+        DT           | Diffision coefficient   | no          | auto generated
+        resetOnStartUp | Reset source to zero on start-up | no | no
+        autoSchemes  | Use U schemes to evolve scalar | no   | yes
+        fvOptions    | List of scalar sources  | yes         |
+        log          | Log to standard output  | no          | yes
+    \endtable
+
+SeeAlso
+    fvOption.H
+    fvOptionList.H
+
 SourceFiles
     scalarTransport.C
     IOscalarTransport.H
 
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef scalarTransport_H
@@ -108,8 +150,8 @@ class scalarTransport
         //- Run-time selectable finite volume options, e.g. sources, constraints
         fv::optionList fvOptions_;
 
-        //- The scalar field
-        volScalarField T_;
+        //- Switch to send output to Info as well as to file
+        Switch log_;
 
 
     // Private Member Functions
@@ -117,6 +159,9 @@ class scalarTransport
         //- Return the boundary types for the scalar field
         wordList boundaryTypes() const;
 
+        //- Return reference to registered transported field
+        volScalarField& transportedField();
+
         //- Return the diffusivity field
         tmp<volScalarField> DT(const surfaceScalarField& phi) const;
 
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index a8d540771b..345791cd2d 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ bool Foam::setTimeStepFunctionObject::adjustTimeStep()
 
 bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
 {
-    enabled_ = dict.lookupOrDefault("enabled", true);
+    enabled_.readIfPresent("enabled", dict);
 
     if (enabled_)
     {
@@ -132,7 +132,7 @@ bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
          || !adjust
         )
         {
-            FatalIOErrorIn("setTimeStep::read(const dictionary&)", dict)
+            FatalIOErrorInFunction(dict)
                 << "Need to have 'adjustTimeStep' true to enable external"
                 << " timestep control" << exit(FatalIOError);
         }
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 3f03f3ddcc..10bd6fec3c 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,12 +28,30 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    Overrides the timeStep. Can only be used with
-    solvers with adjustTimeStep control (e.g. pimpleFoam). Makes no attempt
-    to cooperate with other timeStep 'controllers' (maxCo, other
-    functionObjects). Supports 'enabled' flag but none of othe other ones
+    This function object overrides the calculation time step. Can only be used
+    with solvers with adjustTimeStep control (e.g. pimpleFoam).  It makes no
+    attempt to co-operate with other time step 'controllers', e.g. maxCo, other
+    functionObjects. Supports 'enabled' flag but none of the other options
     'timeStart', 'timeEnd', 'outputControl' etc.
 
+
+    Example of function object specification to manipulate the time step:
+    \verbatim
+    setTimeStep1
+    {
+        type        setTimeStep;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: setTimeStep  | yes         |
+        enabled      | On/off switch           | no          | yes
+    \endtable
+
 SourceFiles
     setTimeStepFunctionObject.C
 
@@ -45,6 +63,7 @@ SourceFiles
 #include "functionObject.H"
 #include "dictionary.H"
 #include "DataEntry.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +87,7 @@ class setTimeStepFunctionObject
         // Optional user inputs
 
             //- Switch for the execution - defaults to 'yes/on'
-            bool enabled_;
+            Switch enabled_;
 
             //- Time step
             autoPtr<DataEntry<scalar> > timeStepPtr_;
@@ -82,6 +101,7 @@ class setTimeStepFunctionObject
 
 
 public:
+
     //- Runtime type information
     TypeName("setTimeStep");
 
@@ -121,7 +141,6 @@ public:
             //- Switch the function object off
             virtual void off();
 
-
             //- Called at the start of the time-loop
             virtual bool start();
 
@@ -145,7 +164,6 @@ public:
 
             //- Update for changes of mesh
             virtual void movePoints(const polyMesh& mesh);
-
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index 08345371eb..80377cb856 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 91d5f381f6..c20ca7a145 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
+    defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
 }
 
 
@@ -52,7 +52,8 @@ void Foam::timeActivatedFileUpdate::updateFile()
 
     if (i > lastIndex_)
     {
-        Info<< nl << type() << ": copying file" << nl << timeVsFile_[i].second()
+        if (log_) Info
+            << nl << type() << ": copying file" << nl << timeVsFile_[i].second()
             << nl << "to:" << nl << fileToUpdate_ << nl << endl;
 
         cp(timeVsFile_[i].second(), fileToUpdate_);
@@ -74,9 +75,10 @@ Foam::timeActivatedFileUpdate::timeActivatedFileUpdate
     name_(name),
     obr_(obr),
     active_(true),
-    fileToUpdate_(dict.lookup("fileToUpdate")),
+    fileToUpdate_("unknown-fileToUpdate"),
     timeVsFile_(),
-    lastIndex_(-1)
+    lastIndex_(-1),
+    log_(true)
 {
     read(dict);
 }
@@ -94,27 +96,33 @@ void Foam::timeActivatedFileUpdate::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_.readIfPresent("log", dict);
+
         dict.lookup("fileToUpdate") >> fileToUpdate_;
         dict.lookup("timeVsFile") >> timeVsFile_;
 
         lastIndex_ = -1;
         fileToUpdate_.expand();
 
-        Info<< type() << ": time vs file list:" << nl;
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
+            << "    time vs file list:" << endl;
+
         forAll(timeVsFile_, i)
         {
             timeVsFile_[i].second() = timeVsFile_[i].second().expand();
             if (!isFile(timeVsFile_[i].second()))
             {
-                FatalErrorIn("timeActivatedFileUpdate::read(const dictionary&)")
+                FatalErrorInFunction
                     << "File: " << timeVsFile_[i].second() << " not found"
                     << nl << exit(FatalError);
             }
 
-            Info<< "    " << timeVsFile_[i].first() << tab
+            if (log_) Info
+                << "    " << timeVsFile_[i].first() << tab
                 << timeVsFile_[i].second() << endl;
         }
-        Info<< endl;
+        if (log_) Info<< endl;
 
         updateFile();
     }
@@ -132,10 +140,7 @@ void Foam::timeActivatedFileUpdate::execute()
 
 void Foam::timeActivatedFileUpdate::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index e2f168eaf2..927f88a609 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,18 +28,16 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    Performs a file copy/replacement once a specified time has been reached.
+    This function object performs a file copy/replacement once a specified
+    time has been reached.
 
     Example usage to update the fvSolution dictionary at various times
     throughout the calculation:
-
     \verbatim
     fileUpdate1
     {
         type              timeActivatedFileUpdate;
         functionObjectLibs ("libutilityFunctionObjects.so");
-        outputControl     timeStep;
-        outputInterval    1;
         fileToUpdate      "$FOAM_CASE/system/fvSolution";
         timeVsFile
         (
@@ -48,9 +46,20 @@ Description
             (0.20 "$FOAM_CASE/system/fvSolution.20")
             (0.35 "$FOAM_CASE/system/fvSolution.35")
         );
+        ...
     }
     \endverbatim
 
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: timeActivatedFileUpdate | yes |
+        fileToUpdate | Name of file to update  | yes         |
+        timeVsFile   | List of time vs file    | yes         |
+        log          | Log to standard output  | no          | yes
+    \endtable
+
+
 SourceFiles
     timeActivatedFileUpdate.C
     IOtimeActivatedFileUpdate.H
@@ -61,6 +70,7 @@ SourceFiles
 #define timeActivatedFileUpdate_H
 
 #include "Tuple2.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -99,6 +109,9 @@ class timeActivatedFileUpdate
         //- Index of last file copied
         label lastIndex_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
index 3c1d013bc1..7f4b900416 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
index 6a16f35c13..a620430e77 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,7 +80,7 @@ bool Foam::turbulenceFields::compressible()
     }
     else
     {
-        WarningIn("Foam::word& Foam::turbulenceFields::compressible() const")
+        WarningInFunction
             << "Turbulence model not found in database, deactivating";
         active_ = false;
     }
@@ -102,7 +102,8 @@ Foam::turbulenceFields::turbulenceFields
     name_(name),
     obr_(obr),
     active_(true),
-    fieldSet_()
+    fieldSet_(),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (isA<fvMesh>(obr_))
@@ -112,16 +113,8 @@ Foam::turbulenceFields::turbulenceFields
     else
     {
         active_ = false;
-        WarningIn
-        (
-            "turbulenceFields::turbulenceFields"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_
             << endl;
     }
 }
@@ -139,21 +132,26 @@ void Foam::turbulenceFields::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_.readIfPresent("log", dict);
         fieldSet_.insert(wordList(dict.lookup("fields")));
 
         Info<< type() << " " << name_ << ": ";
-        if (fieldSet_.size())
+        if (log_)
         {
-            Info<< "storing fields:" << nl;
-            forAllConstIter(wordHashSet, fieldSet_, iter)
+            Info<< type() << " " << name_ << " output:" << nl;
+            if (fieldSet_.size())
             {
-                Info<< "    " << modelName << ':' << iter.key() << nl;
+                Info<< "storing fields:" << nl;
+                forAllConstIter(wordHashSet, fieldSet_, iter)
+                {
+                    Info<< "    " << modelName << ':' << iter.key() << nl;
+                }
+                Info<< endl;
+            }
+            else
+            {
+                Info<< "no fields requested to be stored" << nl << endl;
             }
-            Info<< endl;
-        }
-        else
-        {
-            Info<< "no fields requested to be stored" << nl << endl;
         }
     }
 }
@@ -220,7 +218,7 @@ void Foam::turbulenceFields::execute()
                 }
                 default:
                 {
-                    FatalErrorIn("void Foam::turbulenceFields::execute()")
+                    FatalErrorInFunction
                         << "Invalid field selection" << abort(FatalError);
                 }
             }
@@ -268,7 +266,7 @@ void Foam::turbulenceFields::execute()
                 }
                 default:
                 {
-                    FatalErrorIn("void Foam::turbulenceFields::execute()")
+                    FatalErrorInFunction
                         << "Invalid field selection" << abort(FatalError);
                 }
             }
@@ -278,12 +276,7 @@ void Foam::turbulenceFields::execute()
 
 
 void Foam::turbulenceFields::end()
-{
-    if (active_)
-    {
-        execute();
-    }
-}
+{}
 
 
 void Foam::turbulenceFields::timeSet()
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index af412a9711..e7b39a7d96 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,7 @@ Class
     Foam::turbulenceFields
 
 Group
-    grpFieldFunctionObjects
+    grpUtilitiesFunctionObjects
 
 Description
     This function object stores turbulence fields on the mesh database for
@@ -89,6 +89,7 @@ SourceFiles
 #include "IOobject.H"
 #include "NamedEnum.H"
 #include "volFieldsFwd.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -151,6 +152,9 @@ protected:
         //- Fields to load
         wordHashSet fieldSet_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Protected Member Functions
 
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
index 0d067cc168..e5746b6b4b 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,14 +46,8 @@ void Foam::turbulenceFields::processField
     }
     else if (obr_.found(scopedName))
     {
-        WarningIn
-        (
-            "void Foam::turbulenceFields::processField"
-            "("
-                "const word&, "
-                "const tmp<GeometricField<Type, fvPatchField, volMesh> >&"
-            ")"
-        )   << "Cannot store turbulence field " << scopedName
+        WarningInFunction
+            << "Cannot store turbulence field " << scopedName
             << " since an object with that name already exists"
             << nl << endl;
     }
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
index ac9c5e392c..135fc00540 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,22 +50,15 @@ Foam::vorticity::vorticity
     obr_(obr),
     active_(true),
     UName_("U"),
-    outputName_(typeName)
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "vorticity::vorticity"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
@@ -81,7 +74,7 @@ Foam::vorticity::vorticity
             (
                 IOobject
                 (
-                    outputName_,
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -109,10 +102,16 @@ void Foam::vorticity::read(const dictionary& dict)
 {
     if (active_)
     {
-        UName_ = dict.lookupOrDefault<word>("UName", "U");
-        if (UName_ != "U")
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("UName", UName_);
+
+        if (!dict.readIfPresent("resultName", resultName_))
         {
-            outputName_ = typeName + "(" + UName_ + ")";
+            resultName_ = name_;
+            if (UName_ != "U")
+            {
+                resultName_ = resultName_ + "(" + UName_ + ")";
+            }
         }
     }
 }
@@ -127,7 +126,7 @@ void Foam::vorticity::execute()
         volVectorField& vorticity =
             const_cast<volVectorField&>
             (
-                obr_.lookupObject<volVectorField>(outputName_)
+                obr_.lookupObject<volVectorField>(resultName_)
             );
 
         vorticity = fvc::curl(U);
@@ -137,10 +136,7 @@ void Foam::vorticity::execute()
 
 void Foam::vorticity::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -155,9 +151,10 @@ void Foam::vorticity::write()
     if (active_)
     {
         const volVectorField& vorticity =
-            obr_.lookupObject<volVectorField>(outputName_);
+            obr_.lookupObject<volVectorField>(resultName_);
 
-        Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << vorticity.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
index bce5d943eb..87209915cf 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
@@ -28,7 +28,29 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    This function object calculates the vorticity, the curl of the velocity.
+    This function object calculates and outputs the vorticity, the curl of
+    the velocity as a volvectorField.  The field is stored on the mesh
+    database so that it can be retrieved and used for other applications.
+
+    Example of function object specification to calculate the vorticity:
+    \verbatim
+    vorticity1
+    {
+        type        vorticity;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: vorticity    | yes         |
+        UName        | Name of velocity field  | no          | U
+        resultName   | Name of Courant number field | no    | \<function name\>
+        log          | Log to standard output  | no          | yes
+    \endtable
+
 
 SourceFiles
     vorticity.C
@@ -40,6 +62,7 @@ SourceFiles
 #define vorticity_H
 
 #include "volFieldsFwd.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,7 +96,10 @@ class vorticity
         word UName_;
 
         //- Name of vorticity field
-        word outputName_;
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
 
 
     // Private Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index 4271fa5394..eb26149339 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,15 +40,15 @@ namespace Foam
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
-void Foam::wallShearStress::writeFileHeader(const label i)
+void Foam::wallShearStress::writeFileHeader(Ostream& os) const
 {
     // Add headers to output data
-    writeHeader(file(), "Wall shear stress");
-    writeCommented(file(), "Time");
-    writeTabbed(file(), "patch");
-    writeTabbed(file(), "min");
-    writeTabbed(file(), "max");
-    file() << endl;
+    writeHeader(os, "Wall shear stress");
+    writeCommented(os, "Time");
+    writeTabbed(os, "patch");
+    writeTabbed(os, "min");
+    writeTabbed(os, "max");
+    os << endl;
 }
 
 
@@ -74,16 +74,14 @@ void Foam::wallShearStress::calcShearStress
         vector minSsp = gMin(ssp);
         vector maxSsp = gMax(ssp);
 
-        if (Pstream::master())
-        {
-            file() << mesh.time().value()
-                << token::TAB << pp.name()
-                << token::TAB << minSsp
-                << token::TAB << maxSsp
-                << endl;
-        }
+        file() << mesh.time().value()
+            << token::TAB << pp.name()
+            << token::TAB << minSsp
+            << token::TAB << maxSsp
+            << endl;
 
-        if (log_) Info<< "    min/max(" << pp.name() << ") = "
+        if (log_) Info
+            << "    min/max(" << pp.name() << ") = "
             << minSsp << ", " << maxSsp << endl;
     }
 }
@@ -99,10 +97,11 @@ Foam::wallShearStress::wallShearStress
     const bool loadFromFiles
 )
 :
-    functionObjectFile(obr, name, typeName),
+    functionObjectFile(obr, name, typeName, dict),
     name_(name),
     obr_(obr),
     active_(true),
+    resultName_(name),
     log_(true),
     patchSet_()
 {
@@ -110,19 +109,13 @@ Foam::wallShearStress::wallShearStress
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "wallShearStress::wallShearStress"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
+    read(dict);
+
     if (active_)
     {
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
@@ -133,7 +126,7 @@ Foam::wallShearStress::wallShearStress
             (
                 IOobject
                 (
-                    type(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -150,9 +143,9 @@ Foam::wallShearStress::wallShearStress
         );
 
         mesh.objectRegistry::store(wallShearStressPtr);
-    }
 
-    read(dict);
+        writeFileHeader(file());
+    }
 }
 
 
@@ -168,7 +161,10 @@ void Foam::wallShearStress::read(const dictionary& dict)
 {
     if (active_)
     {
-        log_ = dict.lookupOrDefault<Switch>("log", true);
+        functionObjectFile::read(dict);
+
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("resultName", resultName_);
 
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
         const polyBoundaryMesh& pbm = mesh.boundaryMesh();
@@ -179,7 +175,7 @@ void Foam::wallShearStress::read(const dictionary& dict)
                 wordReList(dict.lookupOrDefault("patches", wordReList()))
             );
 
-        Info<< type() << " " << name_ << ":" << nl;
+        if (log_) Info << type() << " " << name_ << " output:" << nl;
 
         if (patchSet_.empty())
         {
@@ -191,11 +187,11 @@ void Foam::wallShearStress::read(const dictionary& dict)
                 }
             }
 
-            Info<< "    processing all wall patches" << nl << endl;
+            if (log_) Info << "    processing all wall patches" << nl << endl;
         }
         else
         {
-            Info<< "    processing wall patches: " << nl;
+            if (log_) Info << "    processing wall patches: " << nl;
             labelHashSet filteredPatchSet;
             forAllConstIter(labelHashSet, patchSet_, iter)
             {
@@ -203,17 +199,17 @@ void Foam::wallShearStress::read(const dictionary& dict)
                 if (isA<wallPolyPatch>(pbm[patchI]))
                 {
                     filteredPatchSet.insert(patchI);
-                    Info<< "        " << pbm[patchI].name() << endl;
+                    if (log_) Info << "        " << pbm[patchI].name() << endl;
                 }
                 else
                 {
-                    WarningIn("void wallShearStress::read(const dictionary&)")
+                    WarningInFunction
                         << "Requested wall shear stress on non-wall boundary "
                         << "type patch: " << pbm[patchI].name() << endl;
                 }
             }
 
-            Info<< endl;
+            if (log_) Info << endl;
 
             patchSet_ = filteredPatchSet;
         }
@@ -228,17 +224,15 @@ void Foam::wallShearStress::execute()
 
     if (active_)
     {
-        functionObjectFile::write();
-
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         volVectorField& wallShearStress =
             const_cast<volVectorField&>
             (
-                mesh.lookupObject<volVectorField>(type())
+                mesh.lookupObject<volVectorField>(resultName_)
             );
 
-        if (log_) Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info << type() << " " << name_ << " output:" << nl;
 
 
         tmp<volSymmTensorField> Reff;
@@ -258,22 +252,21 @@ void Foam::wallShearStress::execute()
         }
         else
         {
-            FatalErrorIn("void Foam::wallShearStress::execute()")
+            FatalErrorInFunction
                 << "Unable to find turbulence model in the "
                 << "database" << exit(FatalError);
         }
 
         calcShearStress(mesh, Reff(), wallShearStress);
+
+        if (log_) Info << endl;
     }
 }
 
 
 void Foam::wallShearStress::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -287,12 +280,11 @@ void Foam::wallShearStress::write()
 {
     if (active_)
     {
-        functionObjectFile::write();
-
         const volVectorField& wallShearStress =
-            obr_.lookupObject<volVectorField>(type());
+            obr_.lookupObject<volVectorField>(resultName_);
 
-        if (log_) Info<< type() << " " << name_ << " output:" << nl
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
             << "    writing field " << wallShearStress.name() << nl
             << endl;
 
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
index b2171a1d67..f0890d09e5 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,9 +59,11 @@ Description
 
     \heading Function object usage
     \table
-        Property | Description               | Required    | Default value
+        Property | Description                | Required   | Default value
         type     | type name: wallShearStress | yes        |
+        resultName | Name of wall shear stress field | no  | \<function name\>
         patches  | list of patches to process | no         | all wall patches
+        log      | Log to standard output     | no         | yes
     \endtable
 
 SourceFiles
@@ -105,11 +107,15 @@ protected:
         //- Name of this set of wallShearStress object
         word name_;
 
+        //- Refefence to the database
         const objectRegistry& obr_;
 
         //- on/off switch
         bool active_;
 
+        //- Result name
+        word resultName_;
+
         //- Switch to send output to Info as well as to file
         Switch log_;
 
@@ -120,7 +126,7 @@ protected:
     // Protected Member Functions
 
         //- File header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
         //- Calculate the shear stress
         void calcShearStress
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
index 119a0f895d..f7671475b3 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,16 +38,15 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::yPlus::writeFileHeader(const label i)
+void Foam::yPlus::writeFileHeader(Ostream& os) const
 {
-    writeHeader(file(), "y+ ()");
-
-    writeCommented(file(), "Time");
-    writeTabbed(file(), "patch");
-    writeTabbed(file(), "min");
-    writeTabbed(file(), "max");
-    writeTabbed(file(), "average");
-    file() << endl;
+    writeHeader(os, "y+");
+    writeCommented(os, "Time");
+    writeTabbed(os, "patch");
+    writeTabbed(os, "min");
+    writeTabbed(os, "max");
+    writeTabbed(os, "average");
+    os << endl;
 }
 
 
@@ -61,32 +60,27 @@ Foam::yPlus::yPlus
     const bool loadFromFiles
 )
 :
-    functionObjectFile(obr, name, typeName),
+    functionObjectFile(obr, name, typeName, dict),
     name_(name),
     obr_(obr),
     active_(true),
-    log_(true),
-    phiName_("phi")
+    phiName_("phi"),
+    resultName_(name),
+    log_(true)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
     {
         active_ = false;
-        WarningIn
-        (
-            "yPlus::yPlus"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating " << name_ << nl
+        WarningInFunction
+            << "No fvMesh available, deactivating " << name_ << nl
             << endl;
     }
 
     if (active_)
     {
+        read(dict);
+
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         volScalarField* yPlusPtr
@@ -95,7 +89,7 @@ Foam::yPlus::yPlus
             (
                 IOobject
                 (
-                    type(),
+                    resultName_,
                     mesh.time().timeName(),
                     mesh,
                     IOobject::NO_READ,
@@ -107,6 +101,8 @@ Foam::yPlus::yPlus
         );
 
         mesh.objectRegistry::store(yPlusPtr);
+
+        writeFileHeader(file());
     }
 }
 
@@ -123,51 +119,82 @@ void Foam::yPlus::read(const dictionary& dict)
 {
     if (active_)
     {
-        log_ = dict.lookupOrDefault<Switch>("log", true);
-        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
+        functionObjectFile::read(dict);
+
+        log_.readIfPresent("log", dict);
+        dict.readIfPresent("resultName", resultName_);
+        dict.readIfPresent("phiName", phiName_);
     }
 }
 
 
 void Foam::yPlus::execute()
 {
-    typedef compressible::turbulenceModel cmpModel;
-    typedef incompressible::turbulenceModel icoModel;
+    typedef compressible::turbulenceModel cmpTurbModel;
+    typedef incompressible::turbulenceModel icoTurbModel;
 
     if (active_)
     {
-        functionObjectFile::write();
+        const surfaceScalarField& phi =
+            obr_.lookupObject<surfaceScalarField>(phiName_);
 
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         volScalarField& yPlus =
             const_cast<volScalarField&>
             (
-                mesh.lookupObject<volScalarField>(type())
+                mesh.lookupObject<volScalarField>(resultName_)
             );
 
-        if (log_) Info<< type() << " " << name_ << " output:" << nl;
+        if (log_) Info << type() << " " << name_ << " output:" << nl;
 
-        tmp<volSymmTensorField> Reff;
-        if (mesh.foundObject<cmpModel>(turbulenceModel::propertiesName))
+        if (phi.dimensions() == dimMass/dimTime)
         {
-            const cmpModel& model =
-                mesh.lookupObject<cmpModel>(turbulenceModel::propertiesName);
+            if (mesh.foundObject<cmpTurbModel>(turbulenceModel::propertiesName))
+            {
+                const cmpTurbModel& model =
+                    mesh.lookupObject<cmpTurbModel>
+                    (
+                        turbulenceModel::propertiesName
+                    );
 
-            calcYPlus(model, mesh, yPlus);
+                calcYPlus(model, mesh, yPlus);
+            }
+            else
+            {
+                WarningInFunction
+                    << "Unable to find compressible turbulence model in the "
+                    << "database: yPlus will not be calculated" << endl;
+            }
         }
-        else if (mesh.foundObject<icoModel>(turbulenceModel::propertiesName))
+        else if (phi.dimensions() == dimVolume/dimTime)
         {
-            const icoModel& model =
-                mesh.lookupObject<icoModel>(turbulenceModel::propertiesName);
+            if (mesh.foundObject<icoTurbModel>(turbulenceModel::propertiesName))
+            {
+                const icoTurbModel& model =
+                    mesh.lookupObject<icoTurbModel>
+                    (
+                        turbulenceModel::propertiesName
+                    );
 
-            calcYPlus(model, mesh, yPlus);
+                calcYPlus(model, mesh, yPlus);
+            }
+            else
+            {
+                WarningInFunction
+                    << "Unable to find incompressible turbulence model in the "
+                    << "database: yPlus will not be calculated" << endl;
+            }
         }
         else
         {
-            FatalErrorIn("void Foam::yPlus::write()")
-                << "Unable to find turbulence model in the "
-                << "database" << exit(FatalError);
+            WarningInFunction
+                << "Unknown " << phiName_ << " dimensions: "
+                << phi.dimensions() << nl
+                << "Expected either " << dimMass/dimTime << " or "
+                << dimVolume/dimTime << nl
+                << "Unable to determine turbulence model type. "
+                << "yPlus will not be calculated" << endl;
         }
     }
 }
@@ -175,10 +202,7 @@ void Foam::yPlus::execute()
 
 void Foam::yPlus::end()
 {
-    if (active_)
-    {
-        execute();
-    }
+    // Do nothing
 }
 
 
@@ -192,12 +216,13 @@ void Foam::yPlus::write()
 {
     if (active_)
     {
-        functionObjectFile::write();
-
         const volScalarField& yPlus =
-            obr_.lookupObject<volScalarField>(type());
+            obr_.lookupObject<volScalarField>(resultName_);
 
-        if (log_) Info<< "    writing field " << yPlus.name() << nl << endl;
+        if (log_) Info
+            << type() << " " << name_ << " output:" << nl
+            << "    writing field " << yPlus.name() << nl
+            << endl;
 
         yPlus.write();
     }
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
index a2a27bf022..9852cd45af 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,29 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    Evaluates and outputs turbulence y+ for  models.  Values written to
-    time directories as field 'yPlus'
+    This function object evaluates and outputs turbulence y+ for turbulence
+    models. The field is stored on the mesh database so that it can be
+    retrieved and used for other applications.
+
+    Example of function object specification to calculate the y+ (LES):
+    \verbatim
+    yPlus1
+    {
+        type        yPlus;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        ...
+    }
+    \endverbatim
+
+    \heading Function object usage
+    \table
+        Property     | Description             | Required    | Default value
+        type         | Type name: yPlus        | yes         |
+        phiName      | Name of flux field      | no          | phi
+        resultName   | Name of y+ field        | no          | \<function name\>
+        log          | Log to standard output  | no          | yes
+    \endtable
+
 
 SourceFiles
     yPlus.C
@@ -44,6 +65,7 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "Switch.H"
 #include "OFstream.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,7 +80,7 @@ class mapPolyMesh;
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
-                          Class yPlus Declaration
+                            Class yPlus Declaration
 \*---------------------------------------------------------------------------*/
 
 class yPlus
@@ -75,17 +97,20 @@ class yPlus
         //- on/off switch
         bool active_;
 
-        //- Switch to send output to Info as well as to file
-        Switch log_;
-
         //- Name of mass/volume flux field (optional, default = phi)
         word phiName_;
 
+        //- Result name
+        word resultName_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
 
     // Private Member Functions
 
         //- File header information
-        virtual void writeFileHeader(const label i);
+        virtual void writeFileHeader(Ostream& os) const;
 
         //- Calculate y+
         template<class TurbulenceModel>
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C b/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C
index 818610cfe5..6459039949 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlusTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,10 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "yPlus.H"
+#include "wallFvPatch.H"
 #include "nutWallFunctionFvPatchScalarField.H"
 #include "nearWallDist.H"
-#include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -70,20 +69,17 @@ void Foam::yPlus::calcYPlus
             const scalar maxYplus = gMax(yPlusp);
             const scalar avgYplus = gAverage(yPlusp);
 
-            if (Pstream::master())
-            {
-                if (log_) Info
-                    << "    patch " << patch.name()
-                    << " y+ : min = " << minYplus << ", max = " << maxYplus
-                    << ", average = " << avgYplus << nl;
+            if (log_) Info<< "    patch " << patch.name()
+                << " y+ : min = " << minYplus << ", max = " << maxYplus
+                << ", average = " << avgYplus << nl;
 
-                file() << obr_.time().value()
-                    << token::TAB << patch.name()
-                    << token::TAB << minYplus
-                    << token::TAB << maxYplus
-                    << token::TAB << avgYplus
-                    << endl;
-            }
+            writeTime(file());
+            file()
+                << token::TAB << patch.name()
+                << token::TAB << minYplus
+                << token::TAB << maxYplus
+                << token::TAB << avgYplus
+                << endl;
         }
         else if (isA<wallFvPatch>(patch))
         {
@@ -100,20 +96,18 @@ void Foam::yPlus::calcYPlus
             const scalar maxYplus = gMax(yPlusp);
             const scalar avgYplus = gAverage(yPlusp);
 
-            if (Pstream::master())
-            {
-                if (log_) Info
-                    << "    patch " << patch.name()
-                    << " y+ : min = " << minYplus << ", max = " << maxYplus
-                    << ", average = " << avgYplus << nl;
+            if (log_) Info
+                << "    patch " << patch.name()
+                << " y+ : min = " << minYplus << ", max = " << maxYplus
+                << ", average = " << avgYplus << nl;
 
-                file() << obr_.time().value()
-                    << token::TAB << patch.name()
-                    << token::TAB << minYplus
-                    << token::TAB << maxYplus
-                    << token::TAB << avgYplus
-                    << endl;
-            }
+            writeTime(file());
+            file()
+                << token::TAB << patch.name()
+                << token::TAB << minYplus
+                << token::TAB << maxYplus
+                << token::TAB << avgYplus
+                << endl;
         }
     }
 }
diff --git a/src/randomProcesses/Kmesh/Kmesh.C b/src/randomProcesses/Kmesh/Kmesh.C
index a251459de0..5bc6ad1de3 100644
--- a/src/randomProcesses/Kmesh/Kmesh.C
+++ b/src/randomProcesses/Kmesh/Kmesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ Foam::Kmesh::Kmesh(const fvMesh& mesh)
 
     if (nTot != mesh.nCells())
     {
-        FatalErrorIn("Kmesh::Kmesh(const fvMesh& mesh)")
+        FatalErrorInFunction
             << "calculated number of cells is incorrect"
             << abort(FatalError);
     }
diff --git a/src/randomProcesses/fft/fft.C b/src/randomProcesses/fft/fft.C
index a438bd3357..fdc5e856ed 100644
--- a/src/randomProcesses/fft/fft.C
+++ b/src/randomProcesses/fft/fft.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,11 +51,8 @@ void fft::transform
         unsigned int dimCount = nn[idim];
         if (!dimCount || (dimCount & (dimCount - 1)))
         {
-            FatalErrorIn
-            (
-                 "fft::transform(complexField&, const labelList&, "
-                 "transformDirection)"
-            )   << "number of elements in direction " << idim
+            FatalErrorInFunction
+                << "number of elements in direction " << idim
                 << " is not a power of 2" << endl
                 << "    Number of elements in each direction = " << nn
                 << abort(FatalError);
diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C
index a262125121..88cbe3c5ba 100644
--- a/src/randomProcesses/noise/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
     // Check pFile stream is OK
     if (!pFile.good())
     {
-        FatalErrorIn("noiseFFT::noiseFFT(const scalar, const scalarField&)")
+        FatalErrorInFunction
             << "Cannot read file " << pFileName
             << exit(FatalError);
     }
@@ -74,10 +74,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
 
             if (!pFile.good() || pFile.eof())
             {
-                FatalErrorIn
-                (
-                    "noiseFFT::noiseFFT(const scalar, const scalarField&)"
-                )
+                FatalErrorInFunction
                     << "Number of points in file " << pFileName
                     << " is less than the number to be skipped = " << skip
                     << exit(FatalError);
@@ -134,7 +131,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
 
     if ((N + ni*windowOffset) > size())
     {
-        FatalErrorIn("noiseFFT::window(const label, const label) const")
+        FatalErrorInFunction
             << "Requested window is outside set of data" << endl
             << "number of data = " << size() << endl
             << "size of window = " << N << endl
@@ -213,7 +210,7 @@ Foam::graph Foam::noiseFFT::meanPf
 {
     if (N > size())
     {
-        FatalErrorIn("noiseFFT::meanPf(const label, const label) const")
+        FatalErrorInFunction
             << "Requested window is outside set of data" << nl
             << "number of data = " << size() << nl
             << "size of window = " << N << nl
@@ -259,7 +256,7 @@ Foam::graph Foam::noiseFFT::RMSmeanPf
 {
     if (N > size())
     {
-        FatalErrorIn("noiseFFT::RMSmeanPf(const label, const label) const")
+        FatalErrorInFunction
             << "Requested window is outside set of data" << endl
             << "number of data = " << size() << endl
             << "size of window = " << N << endl
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 4be6eb0649..89973ded9c 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -130,7 +130,7 @@ kappa() const
 
         case UNDEFINED:
         {
-            FatalErrorIn("energyRegionCoupledFvPatchScalarField::kappa() const")
+            FatalErrorInFunction
                     << " on mesh " << this->db().name() << " patch "
                     << patch().name()
                     << " could not find a method in. Methods are:  "
@@ -255,16 +255,7 @@ energyRegionCoupledFvPatchScalarField
 
     if (!isA<regionCoupledBase>(this->patch().patch()))
     {
-        FatalErrorIn
-        (
-            "energyRegionCoupledFvPatchScalarField::"
-            "energyRegionCoupledFvPatchScalarField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<scalar, volMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not type '" << regionCoupledBase::typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
@@ -463,15 +454,7 @@ void Foam::energyRegionCoupledFvPatchScalarField::updateInterfaceMatrix
     const Pstream::commsTypes
 ) const
 {
-    notImplemented
-    (
-        "energyRegionCoupledFvPatchScalarField::updateInterfaceMatrix()"
-        "("
-        "Field<scalar>& "
-        "const Field<scalar>&"
-        "const scalarField& "
-        "const Pstream::commsTypes"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
index 62916c61a6..5534767806 100644
--- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
+++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ tmp<volScalarField> noPyrolysis::kappa() const
 
 const surfaceScalarField& noPyrolysis::phiGas() const
 {
-    FatalErrorIn("const volScalarField& noPyrolysis::phiGas() const")
+    FatalErrorInFunction
         << "phiGas field not available for " << type() << abort(FatalError);
     return surfaceScalarField::null();
 }
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
index 7b577189d5..669c7bfdb6 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ public:
         //- Return clone
         autoPtr<pyrolysisModel> clone() const
         {
-            notImplemented("autoPtr<pyrolysisModel> clone() const");
+            NotImplemented;
             return autoPtr<pyrolysisModel>(NULL);
         }
 
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C
index afca8c6614..db59153cb0 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelCollection.C
@@ -124,7 +124,7 @@ void pyrolysisModelCollection::evolve()
         {
             if (pyrolysis.primaryMesh().changing())
             {
-                FatalErrorIn("pyrolysisModelCollection::evolve()")
+                FatalErrorInFunction
                     << "Currently not possible to apply "
                     << pyrolysis.modelName()
                     << " model to moving mesh cases" << nl<< abort(FatalError);
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
index 958dafdef1..ea38a60f47 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ autoPtr<pyrolysisModel> pyrolysisModel::New
 
     if (cstrIter == meshConstructorTablePtr_->end())
     {
-        FatalErrorIn("pyrolysisModel::New(const fvMesh&, const word&)")
+        FatalErrorInFunction
             << "Unknown pyrolysisModel type " << modelType
             << nl << nl << "Valid pyrolisisModel types are:" << nl
             << meshConstructorTablePtr_->sortedToc()
@@ -96,15 +96,7 @@ autoPtr<pyrolysisModel> pyrolysisModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "pyrolysisModel::New"
-            "("
-                "const fvMesh&, "
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Unknown pyrolysisModel type " << modelType
             << nl << nl << "Valid pyrolisisModel types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index 565130dee5..dca7846ca6 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,7 @@ filmModel() const
         modelNames.append(iter()->regionMesh().name());
     }
 
-    FatalErrorIn
-    (
-        "const filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::"
-        "filmModelType& "
-        "filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::"
-        "filmModel() const"
-    )
+    FatalErrorInFunction
         << "Unable to locate film region " << filmRegionName_
         << ".  Available regions include: " << modelNames
         << abort(FatalError);
@@ -93,13 +87,7 @@ pyrModel() const
     }
 
 
-    FatalErrorIn
-    (
-        "const filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::"
-        "pyrolysisModelType& "
-        "filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::"
-        "pyrModel() const"
-    )
+    FatalErrorInFunction
         << "Unable to locate pyrolysis region " << pyrolysisRegionName_
         << ".  Available regions include: " << modelNames
         << abort(FatalError);
@@ -180,16 +168,7 @@ filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
-        FatalErrorIn
-        (
-            "filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::"
-            "filmPyrolysisRadiativeCoupledMixedFvPatchScalarField\n"
-            "(\n"
-            "    const fvPatch& p,\n"
-            "    const DimensionedField<scalar, volMesh>& iF,\n"
-            "    const dictionary& dict\n"
-            ")\n"
-        )   << "\n    patch type '" << p.type()
+        FatalErrorInFunction
             << "' not type '" << mappedPatchBase::typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << dimensionedInternalField().name()
@@ -312,11 +291,7 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::"
-            "updateCoeffs()"
-        )
+        FatalErrorInFunction
             << type() << " condition is intended to be applied to either the "
             << "primary or pyrolysis regions only"
             << exit(FatalError);
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 4b7bdef10b..0547612288 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,10 +185,8 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
     }
     else
     {
-        FatalErrorIn
-        (
-            "filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()"
-        )   << "Unable to process flux field phi with dimensions "
+        FatalErrorInFunction
+            << "Unable to process flux field phi with dimensions "
             << phi.dimensions() << nl
             << "    on patch " << patch().name()
             << " of field " << dimensionedInternalField().name()
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 4ee88f0c8a..b1d516ce03 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,7 +138,7 @@ void Foam::regionModels::regionModel::initialise()
 
     if (returnReduce(nBoundaryFaces, sumOp<label>()) == 0)
     {
-        WarningIn("regionModel::initialise()")
+        WarningInFunction
             << "Region model has no mapped boundary conditions - transfer "
             << "between regions will not be possible" << endl;
     }
@@ -317,14 +317,7 @@ Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID
 
     if (regionPatchI > pbm.size() - 1)
     {
-        FatalErrorIn
-        (
-            "Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID"
-            "("
-                "const regionModel&, "
-                "const label"
-            ") const"
-        )
+        FatalErrorInFunction
             << "region patch index out of bounds: "
             << "region patch index = " << regionPatchI
             << ", maximum index = " << pbm.size() - 1
@@ -335,14 +328,7 @@ Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID
 
     if (!isA<mappedPatchBase>(pp))
     {
-        FatalErrorIn
-        (
-            "Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID"
-            "("
-                "const regionModel&, "
-                "const label"
-            ") const"
-        )
+        FatalErrorInFunction
             << "Expected a " << mappedPatchBase::typeName
             << " patch, but found a " << pp.type() << abort(FatalError);
     }
@@ -371,14 +357,7 @@ Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID
     {
         const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
 
-        FatalErrorIn
-        (
-            "Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID"
-            "("
-                "const regionModel&, "
-                "const label"
-            ") const"
-        )
+        FatalErrorInFunction
             << "Unable to find patch pair for local patch "
             << p.name() << " and region " << nbrRegion.name()
             << abort(FatalError);
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index 95defc744e..e04513125a 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,11 +66,8 @@ inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
     }
     else if (!regionMeshPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::fvMesh&"
-            "Foam::regionModels::regionModel::regionMesh() const"
-        )<< "Region mesh not available" << abort(FatalError);
+        FatalErrorInFunction
+         << "Region mesh not available" << abort(FatalError);
     }
 
     return regionMeshPtr_();
@@ -88,11 +85,8 @@ inline Foam::fvMesh& Foam::regionModels::regionModel::regionMesh()
     }
     else if (!regionMeshPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline Foam::fvMesh&"
-            "Foam::regionModels::regionModel::regionMesh()"
-        )<< "Region mesh not available" << abort(FatalError);
+        FatalErrorInFunction
+         << "Region mesh not available" << abort(FatalError);
     }
 
     return regionMeshPtr_();
@@ -117,11 +111,7 @@ Foam::regionModels::regionModel::outputProperties() const
 {
     if (!outputPropertiesPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::IOdictionary& "
-            "Foam::regionModels::regionModel::outputProperties() const"
-        )
+        FatalErrorInFunction
             << "outputProperties dictionary not available"
             << abort(FatalError);
     }
@@ -135,11 +125,7 @@ Foam::regionModels::regionModel::outputProperties()
 {
     if (!outputPropertiesPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline Foam::IOdictionary& "
-            "Foam::regionModels::regionModel::outputProperties()"
-        )
+        FatalErrorInFunction
             << "outputProperties dictionary not available"
             << abort(FatalError);
     }
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index dad46878ab..c100552632 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ void Foam::regionModels::regionModel::toPrimary
         }
     }
 
-    FatalErrorIn("const void toPrimary(const label, List<Type>&) const")
+    FatalErrorInFunction
         << "Region patch ID " << regionPatchI << " not found in region mesh"
         << abort(FatalError);
 }
@@ -204,7 +204,7 @@ void Foam::regionModels::regionModel::toRegion
         }
     }
 
-    FatalErrorIn("const void toRegion(const label, List<Type>&) const")
+    FatalErrorInFunction
         << "Region patch ID " << regionPatchI << " not found in region mesh"
         << abort(FatalError);
 }
@@ -232,15 +232,8 @@ void Foam::regionModels::regionModel::toPrimary
         }
     }
 
-    FatalErrorIn
-    (
-        "const void toPrimary"
-        "("
-            "const label, "
-            "List<Type>&, "
-            "const CombineOp&"
-        ") const"
-    )   << "Region patch ID " << regionPatchI << " not found in region mesh"
+    FatalErrorInFunction
+        << "Region patch ID " << regionPatchI << " not found in region mesh"
         << abort(FatalError);
 }
 
@@ -267,10 +260,8 @@ void Foam::regionModels::regionModel::toRegion
         }
     }
 
-    FatalErrorIn
-    (
-        "const void toRegion(const label, List<Type>&, const CombineOp&) const"
-    )   << "Region patch ID " << regionPatchI << " not found in region mesh"
+    FatalErrorInFunction
+        << "Region patch ID " << regionPatchI << " not found in region mesh"
         << abort(FatalError);
 }
 
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
index 27530828a7..fcc918fb64 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,11 +53,8 @@ Foam::regionModels::regionModel1D::nMagSf() const
 {
     if (!nMagSfPtr_.valid())
     {
-        FatalErrorIn
-        (
-            "inline const Foam::surfaceScalarField&"
-            "Foam::regionModel1Ds::regionModel1D::nMagSf() const"
-        )<< "Face normal areas not available" << abort(FatalError);
+        FatalErrorInFunction
+         << "Face normal areas not available" << abort(FatalError);
     }
 
     return nMagSfPtr_();
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
index 11371b1f79..3b41bc8d3b 100644
--- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,15 +44,8 @@ Foam::regionModels::regionModelFunctionObject::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "regionModelFunctionObject::New"
-            "("
-                "const dictionary&, "
-                "regionModel&, "
-                "const word&"
-            ")"
-        )   << "Unknown region model function type "
+        FatalErrorInFunction
+            << "Unknown region model function type "
             << modelType << nl << nl
             << "Valid region model function types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index 35dce8b879..aba31e75dd 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ void Foam::regionModels::singleLayerRegion::initialise()
 
     if (nBoundaryFaces != regionMesh().nCells())
     {
-        FatalErrorIn("singleLayerRegion::initialise()")
+        FatalErrorInFunction
             << "Number of primary region coupled boundary faces not equal to "
             << "the number of cells in the local region" << nl << nl
             << "Number of cells = " << regionMesh().nCells() << nl
@@ -208,7 +208,7 @@ const Foam::volVectorField& Foam::regionModels::singleLayerRegion::nHat() const
 {
     if (!nHatPtr_.valid())
     {
-        FatalErrorIn("const fvMesh& singleLayerRegion::nHat() const")
+        FatalErrorInFunction
             << "Region patch normal vectors not available"
             << abort(FatalError);
     }
@@ -221,7 +221,7 @@ const Foam::volScalarField& Foam::regionModels::singleLayerRegion::magSf() const
 {
     if (!magSfPtr_.valid())
     {
-        FatalErrorIn("const fvMesh& singleLayerRegion::magSf() const")
+        FatalErrorInFunction
             << "Region patch areas not available"
             << abort(FatalError);
     }
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index 65c389e037..8bf37add3a 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,12 +139,7 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
 
     if (patch().size() && (max(mag(gTan)) < SMALL))
     {
-        WarningIn
-        (
-            "void Foam::inclinedFilmNusseltHeightFvPatchScalarField::"
-            "updateCoeffs()"
-        )
-            << "Tangential gravity component is zero.  This boundary condition "
+        WarningInFunction
             << "is designed to operate on patches inclined with respect to "
             << "gravity"
             << endl;
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 67374b7b47..a49c093b38 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,12 +138,7 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs()
 
     if (patch().size() && (max(mag(gTan)) < SMALL))
     {
-        WarningIn
-        (
-            "void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::"
-            "updateCoeffs()"
-        )
-            << "Tangential gravity component is zero.  This boundary condition "
+        WarningInFunction
             << "is designed to operate on patches inclined with respect to "
             << "gravity"
             << endl;
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index ec9b1df769..b881553f5c 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -988,10 +988,8 @@ const volScalarField& kinematicSingleLayer::rho() const
 
 const volScalarField& kinematicSingleLayer::T() const
 {
-    FatalErrorIn
-    (
-        "const volScalarField& kinematicSingleLayer::T() const"
-    )   << "T field not available for " << type() << abort(FatalError);
+    FatalErrorInFunction
+        << "T field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
 }
@@ -999,10 +997,8 @@ const volScalarField& kinematicSingleLayer::T() const
 
 const volScalarField& kinematicSingleLayer::Ts() const
 {
-    FatalErrorIn
-    (
-        "const volScalarField& kinematicSingleLayer::Ts() const"
-    )   << "Ts field not available for " << type() << abort(FatalError);
+    FatalErrorInFunction
+        << "Ts field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
 }
@@ -1010,10 +1006,8 @@ const volScalarField& kinematicSingleLayer::Ts() const
 
 const volScalarField& kinematicSingleLayer::Tw() const
 {
-    FatalErrorIn
-    (
-        "const volScalarField& kinematicSingleLayer::Tw() const"
-    )   << "Tw field not available for " << type() << abort(FatalError);
+    FatalErrorInFunction
+        << "Tw field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
 }
@@ -1021,10 +1015,8 @@ const volScalarField& kinematicSingleLayer::Tw() const
 
 const volScalarField& kinematicSingleLayer::Cp() const
 {
-    FatalErrorIn
-    (
-        "const volScalarField& kinematicSingleLayer::Cp() const"
-    )   << "Cp field not available for " << type() << abort(FatalError);
+    FatalErrorInFunction
+        << "Cp field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
 }
@@ -1032,10 +1024,8 @@ const volScalarField& kinematicSingleLayer::Cp() const
 
 const volScalarField& kinematicSingleLayer::kappa() const
 {
-    FatalErrorIn
-    (
-        "const volScalarField& kinematicSingleLayer::kappa() const"
-    )   << "kappa field not available for " << type() << abort(FatalError);
+    FatalErrorInFunction
+        << "kappa field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
 }
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
index b3d4827d70..30affb2af9 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ void noFilm::addSources
 
 const volScalarField& noFilm::delta() const
 {
-    FatalErrorIn("const volScalarField& noFilm::delta() const")
+    FatalErrorInFunction
         << "delta field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -105,7 +105,7 @@ const volScalarField& noFilm::delta() const
 
 const volScalarField& noFilm::alpha() const
 {
-    FatalErrorIn("const volScalarField& noFilm::alpha() const")
+    FatalErrorInFunction
         << "alpha field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -114,7 +114,7 @@ const volScalarField& noFilm::alpha() const
 
 const volVectorField& noFilm::U() const
 {
-    FatalErrorIn("const volVectorField& noFilm::U() const")
+    FatalErrorInFunction
         << "U field not available for " << type() << abort(FatalError);
 
     return volVectorField::null();
@@ -123,7 +123,7 @@ const volVectorField& noFilm::U() const
 
 const volVectorField& noFilm::Us() const
 {
-    FatalErrorIn("const volVectorField& noFilm::Us() const")
+    FatalErrorInFunction
         << "Us field not available for " << type() << abort(FatalError);
 
     return volVectorField::null();
@@ -132,7 +132,7 @@ const volVectorField& noFilm::Us() const
 
 const volVectorField& noFilm::Uw() const
 {
-    FatalErrorIn("const volVectorField& noFilm::Uw() const")
+    FatalErrorInFunction
         << "Uw field not available for " << type() << abort(FatalError);
 
     return volVectorField::null();
@@ -141,7 +141,7 @@ const volVectorField& noFilm::Uw() const
 
 const volScalarField& noFilm::rho() const
 {
-    FatalErrorIn("const volScalarField& noFilm::rho() const")
+    FatalErrorInFunction
         << "rho field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -150,7 +150,7 @@ const volScalarField& noFilm::rho() const
 
 const volScalarField& noFilm::T() const
 {
-    FatalErrorIn("const volScalarField& noFilm::T() const")
+    FatalErrorInFunction
         << "T field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -159,7 +159,7 @@ const volScalarField& noFilm::T() const
 
 const volScalarField& noFilm::Ts() const
 {
-    FatalErrorIn("const volScalarField& noFilm::Ts() const")
+    FatalErrorInFunction
         << "Ts field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -168,7 +168,7 @@ const volScalarField& noFilm::Ts() const
 
 const volScalarField& noFilm::Tw() const
 {
-    FatalErrorIn("const volScalarField& noFilm::Tw() const")
+    FatalErrorInFunction
         << "Tw field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -177,7 +177,7 @@ const volScalarField& noFilm::Tw() const
 
 const volScalarField& noFilm::Cp() const
 {
-    FatalErrorIn("const volScalarField& noFilm::Cp() const")
+    FatalErrorInFunction
         << "Cp field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -186,7 +186,7 @@ const volScalarField& noFilm::Cp() const
 
 const volScalarField& noFilm::kappa() const
 {
-    FatalErrorIn("const volScalarField& noFilm::kappa() const")
+    FatalErrorInFunction
         << "kappa field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -195,7 +195,7 @@ const volScalarField& noFilm::kappa() const
 
 const volScalarField& noFilm::sigma() const
 {
-    FatalErrorIn("const volScalarField& noFilm::sigma() const")
+    FatalErrorInFunction
         << "sigma field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
@@ -226,7 +226,7 @@ tmp<volScalarField> noFilm::primaryMassTrans() const
 
 const volScalarField& noFilm::cloudMassTrans() const
 {
-    FatalErrorIn("const volScalarField& noFilm::cloudMassTrans() const")
+    FatalErrorInFunction
         << "cloudMassTrans field not available for " << type()
         << abort(FatalError);
 
@@ -236,7 +236,7 @@ const volScalarField& noFilm::cloudMassTrans() const
 
 const volScalarField& noFilm::cloudDiameterTrans() const
 {
-    FatalErrorIn("const volScalarField& noFilm::cloudDiameterTrans() const")
+    FatalErrorInFunction
         << "cloudDiameterTrans field not available for " << type()
         << abort(FatalError);
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C
index e7a7e98bee..c9e8aa719b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C
+++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ const FilmType& filmSubModelBase::filmType() const
 {
     if (!isA<FilmType>(owner_))
     {
-        FatalErrorIn("FilmType& surfaceFilmModel::film() const")
+        FatalErrorInFunction
             << "Model " << this->modelType() << " requested film type "
             << FilmType::typeName << " but film is type " << owner_.type()
             << abort(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
index b2622dde86..f177c506ac 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,10 +51,8 @@ autoPtr<filmThermoModel> filmThermoModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "filmThermoModel::New(surfaceFilmModel&, const dictionary&)"
-        )   << "Unknown filmThermoModel type " << modelType << nl << nl
+        FatalErrorInFunction
+            << "Unknown filmThermoModel type " << modelType << nl << nl
             << "Valid filmThermoModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index cb18596cbe..c846a98d58 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,7 @@ const thermoSingleLayer& liquidFilmThermo::thermoFilm() const
 {
     if (!isA<thermoSingleLayer>(owner_))
     {
-        FatalErrorIn
-        (
-            "const thermoSingleLayer& liquidFilmThermo::thermoFilm() const"
-        )
+        FatalErrorInFunction
             << "Thermo model requires a " << thermoSingleLayer::typeName
             << " film to supply the pressure and temperature, but "
             << owner_.type() << " film model selected.  "
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
index e5153a12be..4485b6c87b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,14 +51,8 @@ autoPtr<filmTurbulenceModel> filmTurbulenceModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "filmTurbulenceModel::New"
-            "("
-                "surfaceFilmModel&, "
-                "const dictionary&"
-            ")"
-        )   << "Unknown filmTurbulenceModel type " << modelType
+        FatalErrorInFunction
+            << "Unknown filmTurbulenceModel type " << modelType
             << nl << nl << "Valid filmTurbulenceModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
index 54504590e2..c8c71f5888 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,15 +50,8 @@ autoPtr<force> force::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "force::New"
-            "("
-                "const surfaceFilmModel&, "
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )   << "Unknown force type " << modelType
+        FatalErrorInFunction
+            << "Unknown force type " << modelType
             << nl << nl << "Valid force types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 47f8411900..8121a2ce5d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -233,14 +233,7 @@ curvatureSeparation::curvatureSeparation
 {
     if (magG_ < ROOTVSMALL)
     {
-        FatalErrorIn
-        (
-            "curvatureSeparation::curvatureSeparation"
-            "("
-                "const surfaceFilmModel&, "
-                "const dictionary&"
-            ")"
-        )
+        FatalErrorInFunction
             << "Acceleration due to gravity must be non-zero"
             << exit(FatalError);
     }
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
index 98ec969ae8..dcb17eec8d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,15 +50,8 @@ autoPtr<injectionModel> injectionModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "injectionModel::New"
-            "("
-                "surfaceFilmModel&, "
-                "const dictionary&, "
-                "const word&"
-            ")"
-        )   << "Unknown injectionModel type " << modelType
+        FatalErrorInFunction
+            << "Unknown injectionModel type " << modelType
             << nl << nl << "Valid injectionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
index 8ad13750c9..0cc15d2954 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
@@ -85,7 +85,7 @@ patchInjection::patchInjection
 
     if (!patchIDs_.size())
     {
-        FatalErrorIn("patchInjection::patchInjection")
+        FatalErrorInFunction
             << "No patches selected"
             << exit(FatalError);
     }
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
index 1f5644fe24..7167b32e49 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,14 +51,8 @@ autoPtr<filmRadiationModel> filmRadiationModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "filmRadiationModel::New"
-            "("
-                "surfaceFilmModel&, "
-                "const dictionary&"
-            ")"
-        )   << "Unknown radiationModel type " << modelType << nl << nl
+        FatalErrorInFunction
+            << "Unknown radiationModel type " << modelType << nl << nl
             << "Valid filmRadiationModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
index 6998028f41..daba92d47c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,15 +52,8 @@ autoPtr<filmViscosityModel> filmViscosityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "filmViscosityModel::New"
-            "("
-                "surfaceFilmModel&, "
-                "const dictionary&, "
-                "volScalarField&"
-            ")"
-        )   << "Unknown filmViscosityModel type " << modelType
+        FatalErrorInFunction
+            << "Unknown filmViscosityModel type " << modelType
             << nl << nl << "Valid filmViscosityModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
index 33d01843f5..41df73789c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,10 +51,8 @@ autoPtr<heatTransferModel> heatTransferModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "heatTransferModel::New(surfaceFilmModel&, const dictionary&)"
-        )   << "Unknown heatTransferModel type " << modelType << nl << nl
+        FatalErrorInFunction
+            << "Unknown heatTransferModel type " << modelType << nl << nl
             << "Valid heatTransferModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
index 03a35f8811..e673ca36b2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,10 +51,8 @@ autoPtr<phaseChangeModel> phaseChangeModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "phaseChangeModel::New(surfaceFilmModel&, const dictionary&)"
-        )   << "Unknown phaseChangeModel type " << modelType
+        FatalErrorInFunction
+            << "Unknown phaseChangeModel type " << modelType
             << nl << nl << "Valid phaseChangeModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
index eb7f333b6d..f007b3d043 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,10 +91,7 @@ Foam::scalar surfaceFilmModel::CourantNumber() const
 
 tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Srho() const
 {
-    notImplemented
-    (
-        "tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Srho() const"
-    )
+    NotImplemented;
 
     return tmp<DimensionedField<scalar, volMesh> >(NULL);
 }
@@ -103,11 +100,7 @@ tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Srho() const
 tmp<DimensionedField<scalar, volMesh> >
 surfaceFilmModel::Srho(const label) const
 {
-    notImplemented
-    (
-        "tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Srho"
-        "(const label) const"
-    )
+    NotImplemented;
 
     return tmp<DimensionedField<scalar, volMesh> >(NULL);
 }
@@ -115,10 +108,7 @@ surfaceFilmModel::Srho(const label) const
 
 tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Sh() const
 {
-    notImplemented
-    (
-        "tmp<DimensionedField<scalar, volMesh> > surfaceFilmModel::Sh() const"
-    )
+    NotImplemented;
 
     return tmp<DimensionedField<scalar, volMesh> >(NULL);
 }
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
index b199374864..cfd451d459 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,10 +71,8 @@ autoPtr<surfaceFilmModel> surfaceFilmModel::New
 
     if (cstrIter == meshConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "surfaceFilmModel::New(const fvMesh&, const dimensionedVector&)"
-        )   << "Unknown surfaceFilmModel type " << modelType
+        FatalErrorInFunction
+            << "Unknown surfaceFilmModel type " << modelType
             << nl << nl << "Valid surfaceFilmModel types are:" << nl
             << meshConstructorTablePtr_->toc()
             << exit(FatalError);
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index aa3195cc6c..2231b42999 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -238,10 +238,8 @@ void thermalBaffleFvPatchScalarField::createPatchMesh()
 
     if (extrudeMeshPtr_.empty())
     {
-        WarningIn
-        (
-            "thermalBaffleFvPatchScalarField::createPatchMesh()\n"
-        )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+        WarningInFunction
+            << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
             << " patchMeshPtr not set."
             << endl;
     }
diff --git a/src/regionModels/thermalBaffleModels/noThermo/noThermo.C b/src/regionModels/thermalBaffleModels/noThermo/noThermo.C
index d603203fbf..5e982fb62c 100644
--- a/src/regionModels/thermalBaffleModels/noThermo/noThermo.C
+++ b/src/regionModels/thermalBaffleModels/noThermo/noThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ void noThermo::evolveRegion()
 
 const tmp<volScalarField> noThermo::Cp() const
 {
-    FatalErrorIn("const tmp<volScalarField>& noThermo::Cp() const")
+    FatalErrorInFunction
         << "Cp field not available for " << type()
         << abort(FatalError);
 
@@ -112,7 +112,7 @@ const tmp<volScalarField> noThermo::Cp() const
 
 const volScalarField& noThermo::kappaRad() const
 {
-    FatalErrorIn("const volScalarField& noThermo::kappaRad() const")
+    FatalErrorInFunction
         << "kappa field not available for " << type()
         << abort(FatalError);
     return volScalarField::null();
@@ -121,7 +121,7 @@ const volScalarField& noThermo::kappaRad() const
 
 const volScalarField& noThermo::rho() const
 {
-    FatalErrorIn("const volScalarField& noThermo::rho() const")
+    FatalErrorInFunction
         << "rho field not available for " << type()
         << abort(FatalError);
     return volScalarField::null();
@@ -130,7 +130,7 @@ const volScalarField& noThermo::rho() const
 
 const volScalarField& noThermo::kappa() const
 {
-   FatalErrorIn("const volScalarField& noThermo::kappa() const")
+   FatalErrorInFunction
         << "K field not available for " << type()
         << abort(FatalError);
     return volScalarField::null();
@@ -139,7 +139,7 @@ const volScalarField& noThermo::kappa() const
 
 const volScalarField& noThermo::T() const
 {
-    FatalErrorIn("const volScalarField& noThermo::T() const")
+    FatalErrorInFunction
         << "T field not available for " << type()
         << abort(FatalError);
     return volScalarField::null();
@@ -148,7 +148,7 @@ const volScalarField& noThermo::T() const
 
 const solidThermo& noThermo::thermo() const
 {
-    FatalErrorIn("const volScalarField& noThermo::T() const")
+    FatalErrorInFunction
         << "T field not available for " << type()
         << abort(FatalError);
     return NullObjectRef<solidThermo>();
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index bd6c507c23..f63ccde238 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -293,7 +293,7 @@ void thermalBaffle::init()
 
         if (Qsb!= thickness_.size())
         {
-            FatalErrorIn("thermalBaffle::init()")
+            FatalErrorInFunction
                 << "the boundary field of Qs is "
                 << Qsb << " and " << nl
                 << "the field 'thickness' is " << thickness_.size() << nl
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
index 5e9f2e620d..c432d922a8 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,14 +114,7 @@ void thermalBaffleModel::init()
              && !constantThickness_
             )
             {
-                FatalErrorIn
-                (
-                    "thermalBaffleModel::thermalBaffleModel"
-                    "("
-                    "   const word&,"
-                    "   const fvMesh&"
-                    ")"
-                )   << "\n    patch type '" << pp.type()
+                FatalErrorInFunction
                     << "' not type '"
                     << mappedVariableThicknessWallPolyPatch::typeName
                     << "'. This is necessary for 1D solution "
@@ -131,14 +124,7 @@ void thermalBaffleModel::init()
             }
             else if (!isA<mappedWallPolyPatch>(pp))
             {
-                FatalErrorIn
-                (
-                    "thermalBaffleModel::thermalBaffleModel"
-                    "("
-                    "   const word&,"
-                    "   const fvMesh&"
-                    ")"
-                )   << "\n    patch type '" << pp.type()
+                FatalErrorInFunction
                     << "' not type '"
                     << mappedWallPolyPatch::typeName
                     << "'. This is necessary for 3D solution"
@@ -162,14 +148,8 @@ void thermalBaffleModel::init()
             // Check that thickness has the right size
             if (thickness_.size() != pp.size())
             {
-                FatalErrorIn
-                (
-                    "thermalBaffleModel::thermalBaffleModel"
-                    "("
-                    "   const word&,"
-                    "   const fvMesh&"
-                    ")"
-                )   << " coupled patches in thermalBaffle are " << nl
+                FatalErrorInFunction
+                    << " coupled patches in thermalBaffle are " << nl
                     << " different sizes from list thickness" << nl
                     << exit(FatalError);
             }
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
index 9b77f067cf..30703d258f 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New(const fvMesh& mesh)
     if (cstrIter == meshConstructorTablePtr_->end())
     {
 
-        FatalErrorIn("thermalBaffleModel::New(const fvMesh&)")
+        FatalErrorInFunction
             << "Unknown thermalBaffleModel type " << modelType
             << nl << nl
             <<  "Valid thermalBaffleModel types are:" << nl
@@ -94,10 +94,8 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
 
-        FatalErrorIn
-        (
-            "thermalBaffleModel::New(const fvMesh&, const dictionary&)"
-        )   << "Unknown thermalBaffleModel type " << modelType
+        FatalErrorInFunction
+            << "Unknown thermalBaffleModel type " << modelType
             << nl << nl
             <<  "Valid thermalBaffleModel types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/renumber/SloanRenumber/SloanRenumber.H b/src/renumber/SloanRenumber/SloanRenumber.H
index ddd42f70fc..6e1bf0159d 100644
--- a/src/renumber/SloanRenumber/SloanRenumber.H
+++ b/src/renumber/SloanRenumber/SloanRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented("SloanRenumber::renumber(const pointField&)");
+            NotImplemented;
             return labelList(0);
         }
 
diff --git a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
index 25484a82f2..c2dc057d98 100644
--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented("CuthillMcKeeRenumber::renumber(const pointField&)");
+            NotImplemented;
             return labelList(0);
         }
 
diff --git a/src/renumber/renumberMethods/Make/options b/src/renumber/renumberMethods/Make/options
index cc28bc2f00..35bbb2cc5c 100644
--- a/src/renumber/renumberMethods/Make/options
+++ b/src/renumber/renumberMethods/Make/options
@@ -1,9 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -ldecompositionMethods \
     -lfiniteVolume \
+    -ldynamicMesh \
     -lmeshTools
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
index 99ac60b666..c530b78847 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,10 +80,8 @@ Foam::labelList Foam::manualRenumber::renumber
 
     if (newToOld.size() != points.size())
     {
-        FatalErrorIn
-        (
-            "manualRenumber::renumber(const pointField&, const scalarField&)"
-        )   << "Size of renumber list does not correspond "
+        FatalErrorInFunction
+            << "Size of renumber list does not correspond "
             << "to the number of points.  Size: "
             << newToOld.size() << " Number of points: "
             << points.size()
@@ -100,11 +98,8 @@ Foam::labelList Foam::manualRenumber::renumber
 
         if (origCellI < 0 || origCellI >= points.size())
         {
-            FatalErrorIn
-            (
-                "manualRenumber::renumber(const pointField&"
-                ", const scalarField&)"
-            )   << "Renumbering is not one-to-one. Index "
+            FatalErrorInFunction
+                << "Renumbering is not one-to-one. Index "
                 << i << " maps onto original cell " << origCellI
                 << ".\n" << "Manual renumbering data read from file "
                 << dataFile_ << "." << endl
@@ -117,11 +112,8 @@ Foam::labelList Foam::manualRenumber::renumber
         }
         else
         {
-            FatalErrorIn
-            (
-                "manualRenumber::renumber(const pointField&"
-                ", const scalarField&)"
-            )   << "Renumbering is not one-to-one. Both index "
+            FatalErrorInFunction
+                << "Renumbering is not one-to-one. Both index "
                 << oldToNew[origCellI]
                 << " and " << i << " map onto " << origCellI
                 << ".\n" << "Manual renumbering data read from file "
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.H b/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
index 7419754369..7a8e5f1ebe 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented("manualRenumber::renumber(const pointField&)");
+            NotImplemented;
             return labelList(0);
         }
 
@@ -107,11 +107,7 @@ public:
             const pointField& cc
         ) const
         {
-            notImplemented
-            (
-                "manualRenumber::renumber"
-                "(const labelListList&, const pointField&)"
-            );
+            NotImplemented;
             return labelList(0);
         }
 };
diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
index ea12a22519..ab9980287a 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,11 +53,8 @@ Foam::autoPtr<Foam::renumberMethod> Foam::renumberMethod::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "renumberMethod::New"
-            "(const dictionary& renumberDict)"
-        )   << "Unknown renumberMethod "
+        FatalErrorInFunction
+            << "Unknown renumberMethod "
             << methodType << nl << nl
             << "Valid renumberMethods are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
@@ -96,15 +93,7 @@ Foam::labelList Foam::renumberMethod::renumber
     const pointField& cc
 ) const
 {
-    notImplemented
-    (
-        "renumberMethod::renumber\n"
-        "(\n"
-        "    const labelList&,\n"
-        "    const labelList&,\n"
-        "    const pointField&\n"
-        ") const"
-    );
+    NotImplemented;
     return labelList();
 }
 
diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.H b/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
index 7808e53f49..deb11ce1d7 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,10 +114,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented
-            (
-                "renumberMethod:renumber(const pointField&)"
-            );
+            NotImplemented;
             return labelList(0);
         }
 
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.H b/src/renumber/renumberMethods/springRenumber/springRenumber.H
index c58bcf21d0..5e39437257 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.H
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented("springRenumber::renumber(const pointField&)");
+            NotImplemented;
             return labelList(0);
         }
 
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
index 289adba5c9..03830bd1ea 100644
--- a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,10 +71,8 @@ Foam::labelList Foam::structuredRenumber::renumber
 {
     if (points.size() != mesh.nCells())
     {
-        FatalErrorIn
-        (
-            "structuredDecomp::renumber(const polyMesh&, const pointField&)"
-        )   << "Number of points " << points.size()
+        FatalErrorInFunction
+            << "Number of points " << points.size()
             << " should equal the number of cells " << mesh.nCells()
             << exit(FatalError);
     }
@@ -188,7 +186,7 @@ Foam::labelList Foam::structuredRenumber::renumber
         {
             if (!haveWarned)
             {
-                WarningIn("structuredDecomp::renumber(..)")
+                WarningInFunction
                     << "Did not visit some cells, e.g. cell " << cellI
                     << " at " << mesh.cellCentres()[cellI] << endl
                     << "Assigning these cells to domain 0." << endl;
diff --git a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
index be638e307b..b95f7d7036 100644
--- a/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
+++ b/src/renumber/renumberMethods/structuredRenumber/structuredRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,10 +98,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented
-            (
-                "structuredRenumber::renumber(const pointField&)"
-            );
+            NotImplemented;
             return labelList(0);
         }
 
@@ -124,11 +121,7 @@ public:
             const pointField& cc
         ) const
         {
-            notImplemented
-            (
-                "structuredRenumber::renumber"
-                "(const labelListList&, const pointField&)"
-            );
+            NotImplemented;
             return labelList(0);
         }
 };
diff --git a/src/renumber/zoltanRenumber/zoltanRenumber.C b/src/renumber/zoltanRenumber/zoltanRenumber.C
index 5118f0b82f..ffd318fd70 100644
--- a/src/renumber/zoltanRenumber/zoltanRenumber.C
+++ b/src/renumber/zoltanRenumber/zoltanRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -290,7 +290,7 @@ Foam::labelList Foam::zoltanRenumber::renumber
 
     if (rc != ZOLTAN_OK)
     {
-        FatalErrorIn("zoltanRenumber::renumber(..)")
+        FatalErrorInFunction
             << "Failed initialising Zoltan" << exit(FatalError);
     }
 
@@ -350,7 +350,7 @@ Foam::labelList Foam::zoltanRenumber::renumber
 
     if (err != ZOLTAN_OK)
     {
-        FatalErrorIn("zoltanRenumber::renumber(..)")
+        FatalErrorInFunction
             << "Failed Zoltan_Order" << exit(FatalError);
     }
 
diff --git a/src/renumber/zoltanRenumber/zoltanRenumber.H b/src/renumber/zoltanRenumber/zoltanRenumber.H
index a4d317cef9..4baffafe72 100644
--- a/src/renumber/zoltanRenumber/zoltanRenumber.H
+++ b/src/renumber/zoltanRenumber/zoltanRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
-            notImplemented("zoltanRenumber::renumber(const pointField&)");
+            NotImplemented;
             return labelList(0);
         }
 
@@ -108,11 +108,7 @@ public:
             const pointField& cc
         ) const
         {
-            notImplemented
-            (
-                "zoltanRenumber::renumber"
-                "(const labelListList& cellCellsconst pointField&)"
-            );
+            NotImplemented;
             return labelList(0);
         }
 
diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 8bbc898dda..03fab92a74 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -43,13 +43,13 @@ surfWriters = sampledSurface/writers
 $(surfWriters)/surfaceWriter.C
 $(surfWriters)/dx/dxSurfaceWriter.C
 $(surfWriters)/ensight/ensightSurfaceWriter.C
-$(surfWriters)/ensight/ensightPTraits.C
 $(surfWriters)/foamFile/foamFileSurfaceWriter.C
 $(surfWriters)/nastran/nastranSurfaceWriter.C
 $(surfWriters)/proxy/proxySurfaceWriter.C
 $(surfWriters)/raw/rawSurfaceWriter.C
 $(surfWriters)/starcd/starcdSurfaceWriter.C
 $(surfWriters)/vtk/vtkSurfaceWriter.C
+$(surfWriters)/boundaryData/boundaryDataSurfaceWriter.C
 
 graphField/writePatchGraph.C
 graphField/writeCellGraph.C
@@ -61,6 +61,7 @@ meshToMeshMethods = meshToMesh/calcMethod
 $(meshToMeshMethods)/meshToMeshMethod/meshToMeshMethod.C
 $(meshToMeshMethods)/meshToMeshMethod/meshToMeshMethodNew.C
 $(meshToMeshMethods)/cellVolumeWeight/cellVolumeWeightMethod.C
+$(meshToMeshMethods)/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
 $(meshToMeshMethods)/direct/directMethod.C
 $(meshToMeshMethods)/mapNearest/mapNearestMethod.C
 
diff --git a/src/sampling/Make/options b/src/sampling/Make/options
index 23e6bc81a7..8e006e099c 100644
--- a/src/sampling/Make/options
+++ b/src/sampling/Make/options
@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/conversion/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
@@ -14,4 +15,5 @@ LIB_LIBS = \
     -lfileFormats \
     -ltriSurface \
     -llagrangian \
+    -ldynamicMesh \
     -lconversion
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index f1d3b5c5ee..b20ffd6688 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.C
+++ b/src/sampling/cuttingPlane/cuttingPlane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -203,7 +203,7 @@ bool Foam::cuttingPlane::walkCell
         if (nextEdgeI == -1)
         {
             // Did not find another cut edge on faceI. Do what?
-            WarningIn("Foam::cuttingPlane::walkCell")
+            WarningInFunction
                 << "Did not find closed walk along surface of cell " << cellI
                 << " starting from edge " << startEdgeI
                 << " in " << nIter << " iterations." << nl
@@ -219,7 +219,7 @@ bool Foam::cuttingPlane::walkCell
 
         if (nIter > 1000)
         {
-            WarningIn("Foam::cuttingPlane::walkCell")
+            WarningInFunction
                 << "Did not find closed walk along surface of cell " << cellI
                 << " starting from edge " << startEdgeI
                 << " in " << nIter << " iterations." << nl
@@ -237,7 +237,7 @@ bool Foam::cuttingPlane::walkCell
     }
     else
     {
-        WarningIn("Foam::cuttingPlane::walkCell")
+        WarningInFunction
             << "Did not find closed walk along surface of cell " << cellI
             << " starting from edge " << startEdgeI << nl
             << "Collected cutPoints so far:" << faceVerts
@@ -287,7 +287,7 @@ void Foam::cuttingPlane::walkCellCuts
         // Check for the unexpected ...
         if (startEdgeI == -1)
         {
-            FatalErrorIn("Foam::cuttingPlane::walkCellCuts(..)")
+            FatalErrorInFunction
                 << "Cannot find cut edge for cut cell " << cellI
                 << abort(FatalError);
         }
@@ -413,7 +413,7 @@ void Foam::cuttingPlane::operator=(const cuttingPlane& rhs)
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn ("Foam::cuttingPlane::operator=(const cuttingPlane&)")
+        FatalErrorInFunction
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index 863301bbce..ba2f2b3922 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -186,6 +186,44 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
         tgtToSrcCellAddr[i].transfer(tgtToSrcAddr[i]);
         tgtToSrcCellWght[i].transfer(tgtToSrcWght[i]);
     }
+
+
+    if (debug%2)
+    {
+        // At this point the overlaps are still in volume so we could
+        // get out the relative error
+        forAll(srcToTgtCellAddr, cellI)
+        {
+            scalar srcVol = src_.cellVolumes()[cellI];
+            scalar tgtVol = sum(srcToTgtCellWght[cellI]);
+
+            if (mag(srcVol) > ROOTVSMALL && mag((tgtVol-srcVol)/srcVol) > 1e-6)
+            {
+                WarningInFunction
+                    << "At cell " << cellI << " cc:"
+                    << src_.cellCentres()[cellI]
+                    << " vol:" << srcVol
+                    << " total overlap volume:" << tgtVol
+                    << endl;
+            }
+        }
+
+        forAll(tgtToSrcCellAddr, cellI)
+        {
+            scalar tgtVol = tgt_.cellVolumes()[cellI];
+            scalar srcVol = sum(tgtToSrcCellWght[cellI]);
+
+            if (mag(tgtVol) > ROOTVSMALL && mag((srcVol-tgtVol)/tgtVol) > 1e-6)
+            {
+                WarningInFunction
+                    << "At cell " << cellI << " cc:"
+                    << tgt_.cellCentres()[cellI]
+                    << " vol:" << tgtVol
+                    << " total overlap volume:" << srcVol
+                    << endl;
+            }
+        }
+    }
 }
 
 
@@ -315,8 +353,10 @@ void Foam::cellVolumeWeightMethod::calculate
 (
     labelListList& srcToTgtAddr,
     scalarListList& srcToTgtWght,
+    pointListList& srcToTgtVec,
     labelListList& tgtToSrcAddr,
-    scalarListList& tgtToSrcWght
+    scalarListList& tgtToSrcWght,
+    pointListList& tgtToSrcVec
 )
 {
     bool ok = initialise
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
index 9e81715722..c10946a1e7 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -116,13 +116,15 @@ public:
 
         // Evaluate
 
-            //- Calculate addressing and weights
+            //- Calculate addressing and weights and optionally offset vectors
             virtual void calculate
             (
                 labelListList& srcToTgtAddr,
                 scalarListList& srcToTgtWght,
-                labelListList& tgtToTgtAddr,
-                scalarListList& tgtToTgtWght
+                pointListList& srcToTgtVec,
+                labelListList& tgtToSrcAddr,
+                scalarListList& tgtToSrcWght,
+                pointListList& tgtToSrcVec
             );
 };
 
diff --git a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
new file mode 100644
index 0000000000..db7d034b25
--- /dev/null
+++ b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
@@ -0,0 +1,292 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "correctedCellVolumeWeightMethod.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(correctedCellVolumeWeightMethod, 0);
+    addToRunTimeSelectionTable
+    (
+        meshToMeshMethod,
+        correctedCellVolumeWeightMethod,
+        components
+    );
+}
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::correctedCellVolumeWeightMethod::calculateAddressing
+(
+    labelListList& srcToTgtCellAddr,
+    scalarListList& srcToTgtCellWght,
+    pointListList& srcToTgtCellVec,
+    labelListList& tgtToSrcCellAddr,
+    scalarListList& tgtToSrcCellWght,
+    pointListList& tgtToSrcCellVec,
+    const label srcSeedI,
+    const label tgtSeedI,
+    const labelList& srcCellIDs,
+    boolList& mapFlag,
+    label& startSeedI
+)
+{
+    label srcCellI = srcSeedI;
+    label tgtCellI = tgtSeedI;
+
+    List<DynamicList<label> > srcToTgtAddr(src_.nCells());
+    List<DynamicList<scalar> > srcToTgtWght(src_.nCells());
+    List<DynamicList<point> > srcToTgtVec(src_.nCells());
+
+    List<DynamicList<label> > tgtToSrcAddr(tgt_.nCells());
+    List<DynamicList<scalar> > tgtToSrcWght(tgt_.nCells());
+    List<DynamicList<point> > tgtToSrcVec(tgt_.nCells());
+
+    // list of tgt cell neighbour cells
+    DynamicList<label> nbrTgtCells(10);
+
+    // list of tgt cells currently visited for srcCellI to avoid multiple hits
+    DynamicList<label> visitedTgtCells(10);
+
+    // list to keep track of tgt cells used to seed src cells
+    labelList seedCells(src_.nCells(), -1);
+    seedCells[srcCellI] = tgtCellI;
+
+    const scalarField& srcVol = src_.cellVolumes();
+    const pointField& srcCc = src_.cellCentres();
+    const pointField& tgtCc = tgt_.cellCentres();
+
+    do
+    {
+        nbrTgtCells.clear();
+        visitedTgtCells.clear();
+
+        // append initial target cell and neighbours
+        nbrTgtCells.append(tgtCellI);
+        appendNbrCells(tgtCellI, tgt_, visitedTgtCells, nbrTgtCells);
+
+        do
+        {
+            tgtCellI = nbrTgtCells.remove();
+            visitedTgtCells.append(tgtCellI);
+
+            Tuple2<scalar, point> vol = interVolAndCentroid
+            (
+                srcCellI,
+                tgtCellI
+            );
+
+            // accumulate addressing and weights for valid intersection
+            if (vol.first()/srcVol[srcCellI] > tolerance_)
+            {
+                // store src/tgt cell pair
+                srcToTgtAddr[srcCellI].append(tgtCellI);
+                srcToTgtWght[srcCellI].append(vol.first());
+                srcToTgtVec[srcCellI].append(vol.second()-tgtCc[tgtCellI]);
+
+                tgtToSrcAddr[tgtCellI].append(srcCellI);
+                tgtToSrcWght[tgtCellI].append(vol.first());
+                tgtToSrcVec[tgtCellI].append(vol.second()-srcCc[srcCellI]);
+
+                appendNbrCells(tgtCellI, tgt_, visitedTgtCells, nbrTgtCells);
+
+                // accumulate intersection volume
+                V_ += vol.first();
+            }
+        }
+        while (!nbrTgtCells.empty());
+
+        mapFlag[srcCellI] = false;
+
+        // find new source seed cell
+        setNextCells
+        (
+            startSeedI,
+            srcCellI,
+            tgtCellI,
+            srcCellIDs,
+            mapFlag,
+            visitedTgtCells,
+            seedCells
+        );
+    }
+    while (srcCellI != -1);
+
+    // transfer addressing into persistent storage
+    forAll(srcToTgtCellAddr, i)
+    {
+        srcToTgtCellAddr[i].transfer(srcToTgtAddr[i]);
+        srcToTgtCellWght[i].transfer(srcToTgtWght[i]);
+        srcToTgtCellVec[i].transfer(srcToTgtVec[i]);
+    }
+
+    forAll(tgtToSrcCellAddr, i)
+    {
+        tgtToSrcCellAddr[i].transfer(tgtToSrcAddr[i]);
+        tgtToSrcCellWght[i].transfer(tgtToSrcWght[i]);
+        tgtToSrcCellVec[i].transfer(tgtToSrcVec[i]);
+    }
+
+
+    if (debug%2)
+    {
+        // At this point the overlaps are still in volume so we could
+        // get out the relative error
+        forAll(srcToTgtCellAddr, cellI)
+        {
+            scalar srcVol = src_.cellVolumes()[cellI];
+            scalar tgtVol = sum(srcToTgtCellWght[cellI]);
+
+            if (mag(srcVol) > ROOTVSMALL && mag((tgtVol-srcVol)/srcVol) > 1e-6)
+            {
+                WarningInFunction
+                    << "At cell " << cellI << " cc:"
+                    << src_.cellCentres()[cellI]
+                    << " vol:" << srcVol
+                    << " total overlap volume:" << tgtVol
+                    << endl;
+            }
+        }
+
+        forAll(tgtToSrcCellAddr, cellI)
+        {
+            scalar tgtVol = tgt_.cellVolumes()[cellI];
+            scalar srcVol = sum(tgtToSrcCellWght[cellI]);
+
+            if (mag(tgtVol) > ROOTVSMALL && mag((srcVol-tgtVol)/tgtVol) > 1e-6)
+            {
+                WarningInFunction
+                    << "At cell " << cellI << " cc:"
+                    << tgt_.cellCentres()[cellI]
+                    << " vol:" << tgtVol
+                    << " total overlap volume:" << srcVol
+                    << endl;
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::correctedCellVolumeWeightMethod::correctedCellVolumeWeightMethod
+(
+    const polyMesh& src,
+    const polyMesh& tgt
+)
+:
+    cellVolumeWeightMethod(src, tgt)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::correctedCellVolumeWeightMethod::~correctedCellVolumeWeightMethod()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::correctedCellVolumeWeightMethod::calculate
+(
+    labelListList&  srcToTgtAddr,
+    scalarListList& srcToTgtWght,
+    pointListList&  srcToTgtVec,
+
+    labelListList&  tgtToSrcAddr,
+    scalarListList& tgtToSrcWght,
+    pointListList&  tgtToSrcVec
+)
+{
+    bool ok = initialise
+    (
+        srcToTgtAddr,
+        srcToTgtWght,
+        tgtToSrcAddr,
+        tgtToSrcWght
+    );
+
+    if (!ok)
+    {
+        return;
+    }
+
+    srcToTgtVec.setSize(srcToTgtAddr.size());
+    tgtToSrcVec.setSize(tgtToSrcAddr.size());
+
+
+    // (potentially) participating source mesh cells
+    const labelList srcCellIDs(maskCells());
+
+    // list to keep track of whether src cell can be mapped
+    boolList mapFlag(src_.nCells(), false);
+    UIndirectList<bool>(mapFlag, srcCellIDs) = true;
+
+    // find initial point in tgt mesh
+    label srcSeedI = -1;
+    label tgtSeedI = -1;
+    label startSeedI = 0;
+
+    bool startWalk =
+        findInitialSeeds
+        (
+            srcCellIDs,
+            mapFlag,
+            startSeedI,
+            srcSeedI,
+            tgtSeedI
+        );
+
+    if (startWalk)
+    {
+        calculateAddressing
+        (
+            srcToTgtAddr,
+            srcToTgtWght,
+            srcToTgtVec,
+            tgtToSrcAddr,
+            tgtToSrcWght,
+            tgtToSrcVec,
+            srcSeedI,
+            tgtSeedI,
+            srcCellIDs,
+            mapFlag,
+            startSeedI
+        );
+    }
+    else
+    {
+        // if meshes are collocated, after inflating the source mesh bounding
+        // box tgt mesh cells may be transferred, but may still not overlap
+        // with the source mesh
+        return;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H
new file mode 100644
index 0000000000..b6b99d8923
--- /dev/null
+++ b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.H
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::correctedCellVolumeWeightMethod
+
+Description
+    Cell-volume-weighted mesh-to-mesh interpolation class
+
+    Volume conservative with calculated offset vectors
+
+SourceFiles
+    correctedCellVolumeWeightMethod.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef correctedCellVolumeWeightMethod_H
+#define correctedCellVolumeWeightMethod_H
+
+#include "cellVolumeWeightMethod.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class correctedCellVolumeWeightMethod Declaration
+\*---------------------------------------------------------------------------*/
+
+class correctedCellVolumeWeightMethod
+:
+    public cellVolumeWeightMethod
+{
+protected:
+
+    // Protected Member Functions
+
+        //- Calculate the mesh-to-mesh addressing and weights
+        void calculateAddressing
+        (
+            labelListList& srcToTgtCellAddr,
+            scalarListList& srcToTgtCellWght,
+            pointListList& srcToTgtCellVec,
+            labelListList& tgtToSrcCellAddr,
+            scalarListList& tgtToSrcCellWght,
+            pointListList& tgtToSrcCellVec,
+            const label srcSeedI,
+            const label tgtSeedI,
+            const labelList& srcCellIDs,
+            boolList& mapFlag,
+            label& startSeedI
+        );
+
+        //- Disallow default bitwise copy construct
+        correctedCellVolumeWeightMethod(const correctedCellVolumeWeightMethod&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const correctedCellVolumeWeightMethod&);
+
+
+public:
+
+    //- Run-time type information
+    TypeName("correctedCellVolumeWeight");
+
+    //- Construct from source and target meshes
+    correctedCellVolumeWeightMethod(const polyMesh& src, const polyMesh& tgt);
+
+    //- Destructor
+    virtual ~correctedCellVolumeWeightMethod();
+
+
+    // Member Functions
+
+        // Evaluate
+
+            //- Calculate addressing and weights and optionally offset vectors
+            virtual void calculate
+            (
+                labelListList& srcToTgtAddr,
+                scalarListList& srcToTgtWght,
+                pointListList& srcToTgtVec,
+                labelListList& tgtToSrcAddr,
+                scalarListList& tgtToSrcWght,
+                pointListList& tgtToSrcVec
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
index 7468fd4fd0..0b9a634881 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,21 +72,15 @@ bool Foam::directMethod::findInitialSeeds
 
         if (mapFlag[srcI])
         {
-            const pointField
-                pts(srcCells[srcI].points(srcFaces, srcPts).xfer());
+            const point srcCtr(srcCells[srcI].centre(srcPts, srcFaces));
+            label tgtI = tgt_.cellTree().findInside(srcCtr);
 
-            forAll(pts, ptI)
+            if (tgtI != -1 && intersect(srcI, tgtI))
             {
-                const point& pt = pts[ptI];
-                label tgtI = tgt_.cellTree().findInside(pt);
+                srcSeedI = srcI;
+                tgtSeedI = tgtI;
 
-                if (tgtI != -1 && intersect(srcI, tgtI))
-                {
-                    srcSeedI = srcI;
-                    tgtSeedI = tgtI;
-
-                    return true;
-                }
+                return true;
             }
         }
     }
@@ -178,8 +172,6 @@ void Foam::directMethod::appendToDirectSeeds
     const labelList& srcNbr = src_.cellCells()[srcSeedI];
     const labelList& tgtNbr = tgt_.cellCells()[tgtSeedI];
 
-    const vectorField& srcCentre = src_.cellCentres();
-
     forAll(srcNbr, i)
     {
         label srcI = srcNbr[i];
@@ -194,15 +186,7 @@ void Foam::directMethod::appendToDirectSeeds
             {
                 label tgtI = tgtNbr[j];
 
-                if
-                (
-                    tgt_.pointInCell
-                    (
-                        srcCentre[srcI],
-                        tgtI,
-                        polyMesh::FACE_PLANES
-                    )
-                )
+                if (intersect(srcI, tgtI))
                 {
                     // new match - append to lists
                     found = true;
@@ -251,14 +235,17 @@ Foam::directMethod::directMethod
 Foam::directMethod::~directMethod()
 {}
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::directMethod::calculate
 (
     labelListList& srcToTgtAddr,
     scalarListList& srcToTgtWght,
+    pointListList& srcToTgtVec,
     labelListList& tgtToSrcAddr,
-    scalarListList& tgtToSrcWght
+    scalarListList& tgtToSrcWght,
+    pointListList& tgtToSrcVec
 )
 {
     bool ok = initialise
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.H b/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
index ddbb2c208c..8209c8153e 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -121,13 +121,15 @@ public:
 
         // Evaluate
 
-            //- Calculate addressing and weights
+            //- Calculate addressing and weights and optionally offset vectors
             virtual void calculate
             (
                 labelListList& srcToTgtAddr,
                 scalarListList& srcToTgtWght,
-                labelListList& tgtToTgtAddr,
-                scalarListList& tgtToTgtWght
+                pointListList& srcToTgtVec,
+                labelListList& tgtToSrcAddr,
+                scalarListList& tgtToSrcWght,
+                pointListList& tgtToSrcVec
             );
 };
 
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
index 27f1610d5c..950f02f61b 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -69,17 +69,7 @@ bool Foam::mapNearestMethod::findInitialSeeds
             }
             else
             {
-                FatalErrorIn
-                (
-                    "bool Foam::mapNearestMethod::findInitialSeeds"
-                    "("
-                        "const labelList&, "
-                        "const boolList&, "
-                        "const label, "
-                        "label&, "
-                        "label&"
-                    ") const"
-                )
+                FatalErrorInFunction
                     << "Unable to find nearest target cell"
                     << " for source cell " << srcI
                     << " with centre " << srcCc
@@ -359,8 +349,10 @@ void Foam::mapNearestMethod::calculate
 (
     labelListList& srcToTgtAddr,
     scalarListList& srcToTgtWght,
+    pointListList& srcToTgtVec,
     labelListList& tgtToSrcAddr,
-    scalarListList& tgtToSrcWght
+    scalarListList& tgtToSrcWght,
+    pointListList& tgtToSrcVec
 )
 {
     bool ok = initialise
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
index b26bc645ac..53ce116e32 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -134,13 +134,15 @@ public:
 
         // Evaluate
 
-            //- Calculate addressing and weights
+            //- Calculate addressing and weights and optionally offset vectors
             virtual void calculate
             (
                 labelListList& srcToTgtAddr,
                 scalarListList& srcToTgtWght,
-                labelListList& tgtToTgtAddr,
-                scalarListList& tgtToTgtWght
+                pointListList& srcToTgtVec,
+                labelListList& tgtToSrcAddr,
+                scalarListList& tgtToSrcWght,
+                pointListList& tgtToSrcVec
             );
 };
 
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C
index 11b0a5d592..4c34ebe43c 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -121,6 +121,42 @@ Foam::scalar Foam::meshToMeshMethod::interVol
 }
 
 
+Foam::Tuple2<Foam::scalar, Foam::point>
+Foam::meshToMeshMethod::interVolAndCentroid
+(
+    const label srcCellI,
+    const label tgtCellI
+)
+{
+    tetOverlapVolume overlapEngine;
+
+    treeBoundBox bbTgtCell(tgt_.points(), tgt_.cellPoints()[tgtCellI]);
+
+    Tuple2<scalar, point> volAndInertia =
+    overlapEngine.cellCellOverlapMomentMinDecomp
+    (
+        src_,
+        srcCellI,
+        tgt_,
+        tgtCellI,
+        bbTgtCell
+    );
+
+    // Convert from inertia to centroid
+    if (volAndInertia.first() <= ROOTVSMALL)
+    {
+        volAndInertia.first() = 0.0;
+        volAndInertia.second() = vector::zero;
+    }
+    else
+    {
+        volAndInertia.second() /= volAndInertia.first();
+    }
+
+    return volAndInertia;
+}
+
+
 void Foam::meshToMeshMethod::appendNbrCells
 (
     const label cellI,
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
index 7397673d54..4c906a993b 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethod.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,8 +36,8 @@ SourceFiles
 #define meshToMeshMethod_H
 
 #include "polyMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "pointList.H"
+#include "Tuple2.H"
 
 namespace Foam
 {
@@ -85,6 +85,13 @@ protected:
             const label tgtCellI
         ) const;
 
+        //- Return the intersection volume and centroid between two cells
+        virtual Tuple2<scalar, point> interVolAndCentroid
+        (
+            const label srcCellI,
+            const label tgtCellI
+        );
+
         //- Append target cell neihgbour cells to cellIDs list
         virtual void appendNbrCells
         (
@@ -147,13 +154,15 @@ public:
 
         // Evaluate
 
-            //- Calculate addressing and weights
+            //- Calculate addressing and weights and optionally offset vectors
             virtual void calculate
             (
                 labelListList& srcToTgtAddr,
                 scalarListList& srcToTgtWght,
-                labelListList& tgtToTgtAddr,
-                scalarListList& tgtToTgtWght
+                pointListList& srcToTgtVec,
+                labelListList& tgtToSrcAddr,
+                scalarListList& tgtToSrcWght,
+                pointListList& tgtToSrcVec
             ) = 0;
 
 
diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
index 6b3abcf2e3..5eaf5e3d3b 100644
--- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
+++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C
@@ -44,15 +44,8 @@ Foam::autoPtr<Foam::meshToMeshMethod> Foam::meshToMeshMethod::New
 
     if (cstrIter == componentsConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "Foam::autoPtr<Foam::meshToMeshMethod> Foam::meshToMeshMethod::New"
-            "("
-                "const word&, "
-                "const polyMesh&, "
-                "const polyMesh&"
-            ")"
-        )   << "Unknown meshToMesh type "
+        FatalErrorInFunction
+            << "Unknown meshToMesh type "
             << methodName << nl << nl
             << "Valid meshToMesh types are:" << nl
             << componentsConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/sampling/meshToMesh/weightedFvPatchFieldMapper.H b/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
similarity index 60%
rename from src/sampling/meshToMesh/weightedFvPatchFieldMapper.H
rename to src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
index c14b5500fd..adaaa5fb1a 100644
--- a/src/sampling/meshToMesh/weightedFvPatchFieldMapper.H
+++ b/src/sampling/meshToMesh/distributedWeightedFvPatchFieldMapper.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,17 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::weightedFvPatchFieldMapper
+    Foam::distributedWeightedFvPatchFieldMapper
 
 Description
-    FieldMapper with weighted mapping.
+    FieldMapper with weighted mapping from (optionally remote) quantities.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef weightedFvPatchFieldMapper_H
-#define weightedFvPatchFieldMapper_H
+#ifndef distributedWeightedFvPatchFieldMapper_H
+#define distributedWeightedFvPatchFieldMapper_H
 
 #include "fvPatchFieldMapper.H"
+#include "mapDistributeBase.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,13 +41,17 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                 Class weightedFvPatchFieldMapper Declaration
+           Class distributedWeightedFvPatchFieldMapper Declaration
 \*---------------------------------------------------------------------------*/
 
-class weightedFvPatchFieldMapper
+class distributedWeightedFvPatchFieldMapper
 :
     public fvPatchFieldMapper
 {
+    const label singlePatchProc_;
+
+    const mapDistributeBase* distMapPtr_;
+
     const labelListList& addressing_;
 
     const scalarListList& weights_;
@@ -58,12 +63,16 @@ public:
     // Constructors
 
         //- Construct given addressing
-        weightedFvPatchFieldMapper
+        distributedWeightedFvPatchFieldMapper
         (
+            const label singlePatchProc,
+            const mapDistributeBase* distMapPtr,
             const labelListList& addressing,
             const scalarListList& weights
         )
         :
+            singlePatchProc_(singlePatchProc),
+            distMapPtr_(distMapPtr),
             addressing_(addressing),
             weights_(weights),
             hasUnmapped_(false)
@@ -75,10 +84,20 @@ public:
                     hasUnmapped_ = true;
                 }
             }
+
+            if ((singlePatchProc_ == -1) != (distMapPtr_ != NULL))
+            {
+                FatalErrorInFunction
+                    << "Supply a mapDistributeBase if and only if "
+                    << "singlePatchProc is -1"
+                    << " singlePatchProc_:" << singlePatchProc_
+                    << " distMapPtr_:" << (distMapPtr_ != NULL)
+                    << exit(FatalError);
+            }
         }
 
     //- Destructor
-    virtual ~weightedFvPatchFieldMapper()
+    virtual ~distributedWeightedFvPatchFieldMapper()
     {}
 
 
@@ -86,7 +105,14 @@ public:
 
         virtual label size() const
         {
-            return addressing().size();
+            if (distributed())
+            {
+                return distributeMap().constructSize();
+            }
+            else
+            {
+                return addressing().size();
+            }
         }
 
         virtual bool direct() const
@@ -94,6 +120,22 @@ public:
             return false;
         }
 
+        virtual bool distributed() const
+        {
+            return singlePatchProc_ == -1;
+        }
+
+        virtual const mapDistributeBase& distributeMap() const
+        {
+            if (!distMapPtr_)
+            {
+                FatalErrorInFunction
+                    << "Cannot ask for distributeMap on a non-distributed"
+                    << " mapper" << exit(FatalError);
+            }
+            return *distMapPtr_;
+        }
+
         virtual bool hasUnmapped() const
         {
             return hasUnmapped_;
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index c03c3789d2..47c1403db3 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,21 +38,288 @@ namespace Foam
     const char* Foam::NamedEnum
     <
         Foam::meshToMesh::interpolationMethod,
-        3
+        4
     >::names[] =
     {
         "direct",
         "mapNearest",
-        "cellVolumeWeight"
+        "cellVolumeWeight",
+        "correctedCellVolumeWeight"
     };
 
-    const NamedEnum<meshToMesh::interpolationMethod, 3>
+    const NamedEnum<meshToMesh::interpolationMethod, 4>
         meshToMesh::interpolationMethodNames_;
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+template<>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>& field,
+    const plusEqOp<sphericalTensor>& cop,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>& field,
+    const minusEqOp<sphericalTensor>& cop,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>& field,
+    const plusEqOp<symmTensor>& cop,
+    GeometricField<symmTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>& field,
+    const minusEqOp<symmTensor>& cop,
+    GeometricField<symmTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<tensor, fvPatchField, volMesh>& field,
+    const plusEqOp<tensor>& cop,
+    GeometricField<tensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<tensor, fvPatchField, volMesh>& field,
+    const minusEqOp<tensor>& cop,
+    GeometricField<tensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>& field,
+    const plusEqOp<sphericalTensor>& cop,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>& field,
+    const minusEqOp<sphericalTensor>& cop,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>& field,
+    const plusEqOp<symmTensor>& cop,
+    GeometricField<symmTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>& field,
+    const minusEqOp<symmTensor>& cop,
+    GeometricField<symmTensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<tensor, fvPatchField, volMesh>& field,
+    const plusEqOp<tensor>& cop,
+    GeometricField<tensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<tensor, fvPatchField, volMesh>& field,
+    const minusEqOp<tensor>& cop,
+    GeometricField<tensor, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    mapSrcToTgt(field, cop, result.internalField());
+}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<scalar>& srcField,
+    Field<scalar>& tgtField,
+    const plusEqOp<scalar>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<vector>& srcField,
+    Field<vector>& tgtField,
+    const plusEqOp<vector>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<sphericalTensor>& srcField,
+    Field<sphericalTensor>& tgtField,
+    const plusEqOp<sphericalTensor>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<symmTensor>& srcField,
+    Field<symmTensor>& tgtField,
+    const plusEqOp<symmTensor>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<tensor>& srcField,
+    Field<tensor>& tgtField,
+    const plusEqOp<tensor>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<scalar>& srcField,
+    const Field<scalar>& tgtField,
+    const plusEqOp<scalar>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<vector>& srcField,
+    const Field<vector>& tgtField,
+    const plusEqOp<vector>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<sphericalTensor>& srcField,
+    const Field<sphericalTensor>& tgtField,
+    const plusEqOp<sphericalTensor>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<symmTensor>& srcField,
+    const Field<symmTensor>& tgtField,
+    const plusEqOp<symmTensor>& cop
+) const
+{}
+
+
+template<>
+void Foam::meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<tensor>& srcField,
+    const Field<tensor>& tgtField,
+    const plusEqOp<tensor>& cop
+) const
+{}
+
+
 Foam::labelList Foam::meshToMesh::maskCells
 (
     const polyMesh& src,
@@ -138,8 +405,10 @@ void Foam::meshToMesh::calcAddressing
     (
         srcToTgtCellAddr_,
         srcToTgtCellWght_,
+        srcToTgtCellVec_,
         tgtToSrcCellAddr_,
-        tgtToSrcCellWght_
+        tgtToSrcCellWght_,
+        tgtToSrcCellVec_
     );
 
     V_ = methodPtr->V();
@@ -265,28 +534,34 @@ void Foam::meshToMesh::calculate(const word& methodName)
         }
 
         // set up as a reverse distribute
-        mapDistribute::distribute
+        mapDistributeBase::distribute
         (
             Pstream::nonBlocking,
             List<labelPair>(),
             tgtRegion_.nCells(),
             map.constructMap(),
+            false,
             map.subMap(),
+            false,
             tgtToSrcCellAddr_,
             ListPlusEqOp<label>(),
+            flipOp(),
             labelList()
         );
 
         // set up as a reverse distribute
-        mapDistribute::distribute
+        mapDistributeBase::distribute
         (
             Pstream::nonBlocking,
             List<labelPair>(),
             tgtRegion_.nCells(),
             map.constructMap(),
+            false,
             map.subMap(),
+            false,
             tgtToSrcCellWght_,
             ListPlusEqOp<scalar>(),
+            flipOp(),
             scalarList()
         );
 
@@ -358,20 +633,14 @@ Foam::meshToMesh::interpolationMethodAMI(const interpolationMethod method)
             break;
         }
         case imCellVolumeWeight:
+        case imCorrectedCellVolumeWeight:
         {
             return AMIPatchToPatchInterpolation::imFaceAreaWeight;
             break;
         }
         default:
         {
-            FatalErrorIn
-            (
-                "Foam::AMIPatchToPatchInterpolation::interpolationMethod"
-                "Foam::meshToMesh::interpolationMethodAMI"
-                "("
-                    "const interpolationMethod method"
-                ") const"
-            )
+            FatalErrorInFunction
                 << "Unhandled enumeration " << method
                 << abort(FatalError);
         }
@@ -385,7 +654,7 @@ void Foam::meshToMesh::calculatePatchAMIs(const word& AMIMethodName)
 {
     if (!patchAMIs_.empty())
     {
-        FatalErrorIn("meshToMesh::calculatePatchAMIs()")
+        FatalErrorInFunction
             << "patch AMI already calculated"
             << exit(FatalError);
     }
@@ -456,16 +725,8 @@ void Foam::meshToMesh::constructNoCuttingPatches
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "Foam::meshToMesh::meshToMesh"
-                        "("
-                            "const polyMesh&, "
-                            "const polyMesh&, "
-                            "const interpolationMethod&, "
-                            "bool"
-                        ")"
-                    )   << "Source patch " << pp.name()
+                    FatalErrorInFunction
+                        << "Source patch " << pp.name()
                         << " not found in target mesh. "
                         << "Available target patches are " << tgtBM.names()
                         << exit(FatalError);
@@ -493,23 +754,28 @@ void Foam::meshToMesh::constructFromCuttingPatches
     const wordList& cuttingPatches
 )
 {
-    srcPatchID_.setSize(patchMap.size());
-    tgtPatchID_.setSize(patchMap.size());
+    DynamicList<label> srcIDs(patchMap.size());
+    DynamicList<label> tgtIDs(patchMap.size());
 
-    label i = 0;
     forAllConstIter(HashTable<word>, patchMap, iter)
     {
         const word& tgtPatchName = iter.key();
         const word& srcPatchName = iter();
 
         const polyPatch& srcPatch = srcRegion_.boundaryMesh()[srcPatchName];
-        const polyPatch& tgtPatch = tgtRegion_.boundaryMesh()[tgtPatchName];
 
-        srcPatchID_[i] = srcPatch.index();
-        tgtPatchID_[i] = tgtPatch.index();
-        i++;
+        if (!polyPatch::constraintType(srcPatch.type()))
+        {
+            const polyPatch& tgtPatch = tgtRegion_.boundaryMesh()[tgtPatchName];
+
+            srcIDs.append(srcPatch.index());
+            tgtIDs.append(tgtPatch.index());
+        }
     }
 
+    srcPatchID_.transfer(srcIDs);
+    tgtPatchID_.transfer(tgtIDs);
+
     // calculate volume addressing and weights
     calculate(methodName);
 
@@ -546,6 +812,8 @@ Foam::meshToMesh::meshToMesh
     tgtToSrcCellAddr_(),
     srcToTgtCellWght_(),
     tgtToSrcCellWght_(),
+    srcToTgtCellVec_(),
+    tgtToSrcCellVec_(),
     V_(0.0),
     singleMeshProc_(-1),
     srcMapPtr_(NULL),
@@ -582,6 +850,8 @@ Foam::meshToMesh::meshToMesh
     tgtToSrcCellAddr_(),
     srcToTgtCellWght_(),
     tgtToSrcCellWght_(),
+    srcToTgtCellVec_(),
+    tgtToSrcCellVec_(),
     V_(0.0),
     singleMeshProc_(-1),
     srcMapPtr_(NULL),
diff --git a/src/sampling/meshToMesh/meshToMesh.H b/src/sampling/meshToMesh/meshToMesh.H
index 718270e4f5..0e3e6259a5 100644
--- a/src/sampling/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMesh/meshToMesh.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,11 +43,12 @@ SourceFiles
 #define meshToMesh_H
 
 #include "polyMesh.H"
-#include "boundBox.H"
+#include "treeBoundBox.H"
 #include "mapDistribute.H"
 #include "volFieldsFwd.H"
 #include "NamedEnum.H"
 #include "AMIPatchToPatchInterpolation.H"
+#include "pointList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,10 +70,11 @@ public:
         {
             imDirect,
             imMapNearest,
-            imCellVolumeWeight
+            imCellVolumeWeight,
+            imCorrectedCellVolumeWeight
         };
 
-        static const NamedEnum<interpolationMethod, 3>
+        static const NamedEnum<interpolationMethod, 4>
             interpolationMethodNames_;
 
 private:
@@ -109,6 +111,15 @@ private:
         //- Target to source cell interpolation weights
         scalarListList tgtToSrcCellWght_;
 
+        // Vectors from cell centre to overlap volume for 2nd order correction
+        // (only set for corrected methods)
+
+            //- Source to target cell offset vectors
+            pointListList srcToTgtCellVec_;
+
+            //- Target to source cell offset vectors
+            pointListList tgtToSrcCellVec_;
+
         //- Cell total volume in overlap region [m3]
         scalar V_;
 
@@ -129,6 +140,50 @@ private:
         template<class Type>
         void add(UList<Type>& fld, const label offset) const;
 
+        //- Helper function to interpolate internal field. Optionally uses
+        //  gradient. Template specialisations for tensor types below
+        template<class Type, class CombineOp>
+        void mapInternalSrcToTgt
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& field,
+            const CombineOp& cop,
+            GeometricField<Type, fvPatchField, volMesh>& result,
+            const bool secondOrder
+        ) const;
+
+        //- Helper function to interpolate internal field. Optionally uses
+        //  gradient. Template specialisations for tensor types below
+        template<class Type, class CombineOp>
+        void mapInternalTgtToSrc
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& field,
+            const CombineOp& cop,
+            GeometricField<Type, fvPatchField, volMesh>& result,
+            const bool secondOrder
+        ) const;
+
+        //- Helper function to interpolate patch field. Template
+        //  specialisations  below
+        template<class Type, class CombineOp>
+        void mapAndOpSrcToTgt
+        (
+            const AMIPatchToPatchInterpolation& AMI,
+            const Field<Type>& srcField,
+            Field<Type>& tgtField,
+            const CombineOp& cop
+        ) const;
+
+        //- Helper function to interpolate patch field. Template
+        //  specialisations  below
+        template<class Type, class CombineOp>
+        void mapAndOpTgtToSrc
+        (
+            const AMIPatchToPatchInterpolation& AMI,
+            Field<Type>& srcField,
+            const Field<Type>& tgtField,
+            const CombineOp& cop
+        ) const;
+
         //- Return src cell IDs for the overlap region
         labelList maskCells(const polyMesh& src, const polyMesh& tgt) const;
 
@@ -172,11 +227,6 @@ private:
             const wordList& cuttingPatches
         );
 
-        //- Return the list of AMIs between source and target patches
-        inline const PtrList<AMIPatchToPatchInterpolation>&
-        patchAMIs() const;
-
-
         // Parallel operations
 
             //- Determine whether the meshes are split across multiple pocessors
@@ -189,7 +239,7 @@ private:
             //- Determine which processor bounding-boxes overlap
             label calcOverlappingProcs
             (
-                const List<boundBox>& procBb,
+                const List<treeBoundBoxList>& procBb,
                 const boundBox& bb,
                 boolList& overlaps
             ) const;
@@ -312,6 +362,12 @@ public:
             //- Return const access to the target to source cell weights
             inline const scalarListList& tgtToSrcCellWght() const;
 
+            //- Return const access to the source to target offset vectors
+            inline const pointListList& srcToTgtCellVec() const;
+
+            //- Return const access to the target to source offset vectors
+            inline const pointListList& tgtToSrcCellVec() const;
+
             //- Return const access to the overlap volume
             inline scalar V() const;
 
@@ -322,12 +378,16 @@ public:
                 const interpolationMethod method
             );
 
+            //- Return the list of AMIs between source and target patches
+            inline const PtrList<AMIPatchToPatchInterpolation>&
+            patchAMIs() const;
+
 
         // Evaluation
 
             // Source-to-target field mapping
 
-                //- Map field from src to tgt mesh with defined operation
+                //- Map field from src to tgt mesh with defined operation.
                 //  Values passed in via 'result' are used to initialise the
                 //  return value
                 template<class Type, class CombineOp>
@@ -338,8 +398,23 @@ public:
                     List<Type>& result
                 ) const;
 
+                //- Map extrapolated field (using gradient) from src to tgt
+                //  mesh with defined operation. Falls back to non-extrapolated
+                //  mapping (above) if not constructed with method that supports
+                //  getting offset vectors. Extrapolation only for internal
+                //  values. Values passed in via 'result' are used to
+                //  initialise the return value.
+                template<class Type, class CombineOp>
+                void mapSrcToTgt
+                (
+                    const UList<Type>& srcField,
+                    const UList<typename outerProduct<vector, Type>::type>&,
+                    const CombineOp& cop,
+                    List<Type>& result
+                ) const;
+
                 //- Return the src field mapped to the tgt mesh with a defined
-                //  operation.  Initial values of the result are set to zero
+                //  operation. Initial values of the result are set to zero
                 template<class Type, class CombineOp>
                 tmp<Field<Type> > mapSrcToTgt
                 (
@@ -386,8 +461,23 @@ public:
                     List<Type>& result
                 ) const;
 
+                //- Map extrapolated field (using gradient) from tgt to src
+                //  mesh with defined operation. Falls back to non-extrapolated
+                //  mapping (above) if not constructed with method that supports
+                //  getting offset vectors. Extrapolation only for internal
+                //  values. Values passed in via 'result' are used to
+                //  initialise the return value
+                template<class Type, class CombineOp>
+                void mapTgtToSrc
+                (
+                    const UList<Type>& srcField,
+                    const UList<typename outerProduct<vector, Type>::type>&,
+                    const CombineOp& cop,
+                    List<Type>& result
+                ) const;
+
                 //- Return the tgt field mapped to the src mesh with a defined
-                //  operation.  Initial values of the result are set to zero
+                //  operation. Initial values of the result are set to zero
                 template<class Type, class CombineOp>
                 tmp<Field<Type> > mapTgtToSrc
                 (
@@ -425,13 +515,15 @@ public:
 
                 //- Interpolate a field with a defined operation.  Values
                 //  passed in via 'result' are used to initialise the return
-                //  value
+                //  value. Optionallly uses gradient correction (internal
+                //  field only) if interpolationMethod supports it
                 template<class Type, class CombineOp>
                 void mapSrcToTgt
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field,
                     const CombineOp& cop,
-                    GeometricField<Type, fvPatchField, volMesh>& result
+                    GeometricField<Type, fvPatchField, volMesh>& result,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Interpolate a field with a defined operation.  The initial
@@ -440,7 +532,8 @@ public:
                 tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field,
-                    const CombineOp& cop
+                    const CombineOp& cop,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Interpolate a tmp field with a defined operation.  The
@@ -450,7 +543,8 @@ public:
                 (
                     const tmp<GeometricField<Type, fvPatchField, volMesh> >&
                         tfield,
-                    const CombineOp& cop
+                    const CombineOp& cop,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Convenience function to map a field with a default
@@ -458,7 +552,8 @@ public:
                 template<class Type>
                 tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field
+                    const GeometricField<Type, fvPatchField, volMesh>& field,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Convenience function to map a tmp field with a default
@@ -467,7 +562,8 @@ public:
                 tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
                 (
                     const tmp<GeometricField<Type, fvPatchField, volMesh> >&
-                        tfield
+                        tfield,
+                    const bool secondOrder = true
                 ) const;
 
 
@@ -475,13 +571,15 @@ public:
 
                 //- Interpolate a field with a defined operation.  Values
                 //  passed in via 'result' are used to initialise the return
-                //  value
+                //  value. Optionallly uses gradient correction (internal
+                //  field only) if interpolationMethod supports it
                 template<class Type, class CombineOp>
                 void mapTgtToSrc
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field,
                     const CombineOp& cop,
-                    GeometricField<Type, fvPatchField, volMesh>& result
+                    GeometricField<Type, fvPatchField, volMesh>& result,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Interpolate a field with a defined operation.  The initial
@@ -490,7 +588,8 @@ public:
                 tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
                 (
                     const GeometricField<Type, fvPatchField, volMesh>& field,
-                    const CombineOp& cop
+                    const CombineOp& cop,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Interpolate a tmp field with a defined operation.  The
@@ -500,7 +599,8 @@ public:
                 (
                     const tmp<GeometricField<Type, fvPatchField, volMesh> >&
                         tfield,
-                    const CombineOp& cop
+                    const CombineOp& cop,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Convenience function to map a field with a default
@@ -508,7 +608,8 @@ public:
                 template<class Type>
                 tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
                 (
-                    const GeometricField<Type, fvPatchField, volMesh>& field
+                    const GeometricField<Type, fvPatchField, volMesh>& field,
+                    const bool secondOrder = true
                 ) const;
 
                 //- Convenience function to map a tmp field with a default
@@ -517,13 +618,200 @@ public:
                 tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
                 (
                     const tmp<GeometricField<Type, fvPatchField, volMesh> >&
-                        tfield
+                        tfield,
+                    const bool secondOrder = true
                 ) const;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Disable gradient 2nd order correction for tensor types
+
+template<>
+void meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const plusEqOp<sphericalTensor>&,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const minusEqOp<sphericalTensor>&,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const plusEqOp<symmTensor>&,
+    GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const minusEqOp<symmTensor>&,
+    GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<tensor, fvPatchField, volMesh>&,
+    const plusEqOp<tensor>&,
+    GeometricField<tensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<tensor, fvPatchField, volMesh>&,
+    const minusEqOp<tensor>&,
+    GeometricField<tensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const plusEqOp<sphericalTensor>&,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const minusEqOp<sphericalTensor>&,
+    GeometricField<sphericalTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const plusEqOp<symmTensor>&,
+    GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const minusEqOp<symmTensor>&,
+    GeometricField<symmTensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<tensor, fvPatchField, volMesh>&,
+    const plusEqOp<tensor>&,
+    GeometricField<tensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+template<>
+void meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<tensor, fvPatchField, volMesh>&,
+    const minusEqOp<tensor>&,
+    GeometricField<tensor, fvPatchField, volMesh>&,
+    const bool
+) const;
+
+
+// Disable fvPatchField value override after rmap
+
+template<>
+void meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<scalar>& srcField,
+    Field<scalar>& tgtField,
+    const plusEqOp<scalar>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<vector>& srcField,
+    Field<vector>& tgtField,
+    const plusEqOp<vector>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<sphericalTensor>& srcField,
+    Field<sphericalTensor>& tgtField,
+    const plusEqOp<sphericalTensor>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<symmTensor>& srcField,
+    Field<symmTensor>& tgtField,
+    const plusEqOp<symmTensor>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<tensor>& srcField,
+    Field<tensor>& tgtField,
+    const plusEqOp<tensor>& cop
+) const;
+
+
+template<>
+void meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<scalar>& srcField,
+    const Field<scalar>& tgtField,
+    const plusEqOp<scalar>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<vector>& srcField,
+    const Field<vector>& tgtField,
+    const plusEqOp<vector>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<sphericalTensor>& srcField,
+    const Field<sphericalTensor>& tgtField,
+    const plusEqOp<sphericalTensor>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<symmTensor>& srcField,
+    const Field<symmTensor>& tgtField,
+    const plusEqOp<symmTensor>& cop
+) const;
+template<>
+void meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<tensor>& srcField,
+    const Field<tensor>& tgtField,
+    const plusEqOp<tensor>& cop
+) const;
+
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/meshToMesh/meshToMeshI.H b/src/sampling/meshToMesh/meshToMeshI.H
index a3d6267549..8804956d65 100644
--- a/src/sampling/meshToMesh/meshToMeshI.H
+++ b/src/sampling/meshToMesh/meshToMeshI.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,34 +39,42 @@ inline const Foam::polyMesh& Foam::meshToMesh::tgtRegion() const
 }
 
 
-inline const Foam::labelListList&
-Foam::meshToMesh::srcToTgtCellAddr() const
+inline const Foam::labelListList& Foam::meshToMesh::srcToTgtCellAddr() const
 {
     return srcToTgtCellAddr_;
 }
 
 
-inline const Foam::labelListList&
-Foam::meshToMesh::tgtToSrcCellAddr() const
+inline const Foam::labelListList& Foam::meshToMesh::tgtToSrcCellAddr() const
 {
     return tgtToSrcCellAddr_;
 }
 
 
-inline const Foam::scalarListList&
-Foam::meshToMesh::srcToTgtCellWght() const
+inline const Foam::scalarListList& Foam::meshToMesh::srcToTgtCellWght() const
 {
     return srcToTgtCellWght_;
 }
 
 
-inline const Foam::scalarListList&
-Foam::meshToMesh::tgtToSrcCellWght() const
+inline const Foam::scalarListList& Foam::meshToMesh::tgtToSrcCellWght() const
 {
     return tgtToSrcCellWght_;
 }
 
 
+inline const Foam::pointListList& Foam::meshToMesh::srcToTgtCellVec() const
+{
+    return srcToTgtCellVec_;
+}
+
+
+inline const Foam::pointListList& Foam::meshToMesh::tgtToSrcCellVec() const
+{
+    return tgtToSrcCellVec_;
+}
+
+
 inline Foam::scalar Foam::meshToMesh::V() const
 {
     return V_;
diff --git a/src/sampling/meshToMesh/meshToMeshParallelOps.C b/src/sampling/meshToMesh/meshToMeshParallelOps.C
index ce3fcc428c..004b3bcce6 100644
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +30,7 @@ License
 #include "mergePoints.H"
 #include "processorPolyPatch.H"
 #include "SubField.H"
+#include "AABBTree.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -84,7 +85,7 @@ Foam::label Foam::meshToMesh::calcDistribution
 
 Foam::label Foam::meshToMesh::calcOverlappingProcs
 (
-    const List<boundBox>& procBb,
+    const List<treeBoundBoxList>& procBb,
     const boundBox& bb,
     boolList& overlaps
 ) const
@@ -95,12 +96,16 @@ Foam::label Foam::meshToMesh::calcOverlappingProcs
 
     forAll(procBb, procI)
     {
-        const boundBox& bbp = procBb[procI];
+        const treeBoundBoxList& bbp = procBb[procI];
 
-        if (bbp.overlaps(bb))
+        forAll(bbp, bbI)
         {
-            overlaps[procI] = true;
-            nOverlaps++;
+            if (bbp[bbI].overlaps(bb))
+            {
+                overlaps[procI] = true;
+                nOverlaps++;
+                break;
+            }
         }
     }
 
@@ -115,20 +120,20 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
 ) const
 {
     // get decomposition of cells on src mesh
-    List<boundBox> procBb(Pstream::nProcs());
+    List<treeBoundBoxList> procBb(Pstream::nProcs());
 
     if (src.nCells() > 0)
     {
-        // bounding box for my mesh - do not parallel reduce
-        procBb[Pstream::myProcNo()] = boundBox(src.points(), false);
-
-        // slightly increase size of bounding boxes to allow for cases where
-        // bounding boxes are perfectly alligned
-        procBb[Pstream::myProcNo()].inflate(0.01);
+        procBb[Pstream::myProcNo()] = AABBTree<labelList>
+        (
+            src.cellPoints(),
+            src.points(),
+            false
+        ).boundBoxes();
     }
     else
     {
-        procBb[Pstream::myProcNo()] = boundBox();
+        procBb[Pstream::myProcNo()] = treeBoundBoxList();
     }
 
 
@@ -417,7 +422,7 @@ void Foam::meshToMesh::distributeCells
             labelList globalElems(sendElems.size());
             forAll(sendElems, i)
             {
-                if (debug)
+                if (debug > 1)
                 {
                     Pout<< "tgtProc:" << Pstream::myProcNo()
                         << " sending tgt cell " << sendElems[i]
@@ -605,7 +610,7 @@ void Foam::meshToMesh::distributeAndMergeCells
                 }
                 else
                 {
-                    if (debug)
+                    if (debug > 1)
                     {
                         Pout<< "Additional internal face between procs:"
                             << key[0] << " and " << key[1]
@@ -732,7 +737,7 @@ void Foam::meshToMesh::distributeAndMergeCells
                         label newNbr = fnd();
                         label tgtFaceI = internalFaceOffset[procI]++;
 
-                        if (debug)
+                        if (debug > 1)
                         {
                             Pout<< "    proc " << procI
                                 << "\tinserting face:" << tgtFaceI
@@ -789,21 +794,7 @@ void Foam::meshToMesh::distributeAndMergeCells
 
                 if (tgtFaceI == -1)
                 {
-                    FatalErrorIn
-                    (
-                        "void Foam::meshToMesh::"
-                        "distributeAndMergeCells"
-                        "("
-                            "const mapDistribute&, "
-                            "const polyMesh&, "
-                            "const globalIndex&, "
-                            "pointField&, "
-                            "faceList&, "
-                            "labelList&, "
-                            "labelList&, "
-                            "labelList&"
-                        ") const"
-                    )
+                    FatalErrorInFunction
                         << "Unvisited " << key
                         << abort(FatalError);
                 }
@@ -812,7 +803,7 @@ void Foam::meshToMesh::distributeAndMergeCells
                     label newOwn = cellOffset[procI] + faceOs[i];
                     label tgtFaceI = nIntFaces++;
 
-                    if (debug)
+                    if (debug > 1)
                     {
                         Pout<< "    proc " << procI
                             << "\tinserting boundary face:" << tgtFaceI
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 9ed88a8ae5..3e5c097b35 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,8 @@ License
 #include "volFields.H"
 #include "directFvPatchFieldMapper.H"
 #include "calculatedFvPatchField.H"
-#include "weightedFvPatchFieldMapper.H"
+#include "fvcGrad.H"
+#include "distributedWeightedFvPatchFieldMapper.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -87,15 +88,8 @@ void Foam::meshToMesh::mapSrcToTgt
 {
     if (result.size() != tgtToSrcCellAddr_.size())
     {
-        FatalErrorIn
-        (
-            "void Foam::meshToMesh::mapSrcToTgt"
-            "("
-                "const UList<Type>&, "
-                "const CombineOp&, "
-                "List<Type>&"
-            ") const"
-        )   << "Supplied field size is not equal to target mesh size" << nl
+        FatalErrorInFunction
+            << "Supplied field size is not equal to target mesh size" << nl
             << "    source mesh    = " << srcToTgtCellAddr_.size() << nl
             << "    target mesh    = " << tgtToSrcCellAddr_.size() << nl
             << "    supplied field = " << result.size()
@@ -118,7 +112,6 @@ void Foam::meshToMesh::mapSrcToTgt
 
             if (srcAddress.size())
             {
-//                result[cellI] = pTraits<Type>::zero;
                 result[cellI] *= (1.0 - sum(srcWeight));
                 forAll(srcAddress, i)
                 {
@@ -138,7 +131,6 @@ void Foam::meshToMesh::mapSrcToTgt
 
             if (srcAddress.size())
             {
-//                result[cellI] = pTraits<Type>::zero;
                 result[cellI] *= (1.0 - sum(srcWeight));
                 forAll(srcAddress, i)
                 {
@@ -152,6 +144,100 @@ void Foam::meshToMesh::mapSrcToTgt
 }
 
 
+template<class Type, class CombineOp>
+void Foam::meshToMesh::mapSrcToTgt
+(
+    const UList<Type>& srcField,
+    const UList<typename outerProduct<vector, Type>::type>& srcGradField,
+    const CombineOp& cop,
+    List<Type>& result
+) const
+{
+    if (result.size() != tgtToSrcCellAddr_.size())
+    {
+        FatalErrorInFunction
+            << "Supplied field size is not equal to target mesh size" << nl
+            << "    source mesh    = " << srcToTgtCellAddr_.size() << nl
+            << "    target mesh    = " << tgtToSrcCellAddr_.size() << nl
+            << "    supplied field = " << result.size()
+            << abort(FatalError);
+    }
+
+    multiplyWeightedOp<Type, CombineOp> cbop(cop);
+
+    if (singleMeshProc_ == -1)
+    {
+        if (returnReduce(tgtToSrcCellVec_.size(), sumOp<label>()) == 0)
+        {
+            // No correction vectors calculated. Fall back to first order.
+            mapSrcToTgt(srcField, cop, result);
+            return;
+        }
+
+        const mapDistribute& map = srcMapPtr_();
+
+        List<Type> work(srcField);
+        map.distribute(work);
+
+        List<typename outerProduct<vector, Type>::type> workGrad
+        (
+            srcGradField
+        );
+        map.distribute(workGrad);
+
+        forAll(result, cellI)
+        {
+            const labelList& srcAddress = tgtToSrcCellAddr_[cellI];
+            const scalarList& srcWeight = tgtToSrcCellWght_[cellI];
+            const pointList& srcVec = tgtToSrcCellVec_[cellI];
+
+            if (srcAddress.size())
+            {
+                result[cellI] *= (1.0 - sum(srcWeight));
+                forAll(srcAddress, i)
+                {
+                    label srcI = srcAddress[i];
+                    scalar w = srcWeight[i];
+                    const vector& v = srcVec[i];
+                    const Type srcVal = work[srcI]+(workGrad[srcI]&v);
+                    cbop(result[cellI], cellI, srcVal, w);
+                }
+            }
+        }
+    }
+    else
+    {
+        if (tgtToSrcCellVec_.empty())
+        {
+            // No correction vectors calculated. Fall back to first order.
+            mapSrcToTgt(srcField, cop, result);
+            return;
+        }
+
+        forAll(result, cellI)
+        {
+            const labelList& srcAddress = tgtToSrcCellAddr_[cellI];
+            const scalarList& srcWeight = tgtToSrcCellWght_[cellI];
+            const pointList& srcVec = tgtToSrcCellVec_[cellI];
+
+            if (srcAddress.size())
+            {
+                // Do non-conservative interpolation
+                result[cellI] *= (1.0 - sum(srcWeight));
+                forAll(srcAddress, i)
+                {
+                    label srcI = srcAddress[i];
+                    scalar w = srcWeight[i];
+                    const vector& v = srcVec[i];
+                    const Type srcVal = srcField[srcI]+(srcGradField[srcI]&v);
+                    cbop(result[cellI], cellI, srcVal, w);
+                }
+            }
+        }
+    }
+}
+
+
 template<class Type, class CombineOp>
 Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
 (
@@ -215,15 +301,8 @@ void Foam::meshToMesh::mapTgtToSrc
 {
     if (result.size() != srcToTgtCellAddr_.size())
     {
-        FatalErrorIn
-        (
-            "void Foam::meshToMesh::mapTgtToSrc"
-            "("
-                "const UList<Type>&, "
-                "const CombineOp&, "
-                "List<Type>&"
-            ") const"
-        )   << "Supplied field size is not equal to source mesh size" << nl
+        FatalErrorInFunction
+            << "Supplied field size is not equal to source mesh size" << nl
             << "    source mesh    = " << srcToTgtCellAddr_.size() << nl
             << "    target mesh    = " << tgtToSrcCellAddr_.size() << nl
             << "    supplied field = " << result.size()
@@ -278,6 +357,92 @@ void Foam::meshToMesh::mapTgtToSrc
 }
 
 
+template<class Type, class CombineOp>
+void Foam::meshToMesh::mapTgtToSrc
+(
+    const UList<Type>& tgtField,
+    const UList<typename outerProduct<vector, Type>::type>& tgtGradField,
+    const CombineOp& cop,
+    List<Type>& result
+) const
+{
+    if (result.size() != srcToTgtCellAddr_.size())
+    {
+        FatalErrorInFunction
+            << "Supplied field size is not equal to source mesh size" << nl
+            << "    source mesh    = " << srcToTgtCellAddr_.size() << nl
+            << "    target mesh    = " << tgtToSrcCellAddr_.size() << nl
+            << "    supplied field = " << result.size()
+            << abort(FatalError);
+    }
+
+    multiplyWeightedOp<Type, CombineOp> cbop(cop);
+
+    if (singleMeshProc_ == -1)
+    {
+        if (returnReduce(srcToTgtCellVec_.size(), sumOp<label>()) == 0)
+        {
+            // No correction vectors calculated. Fall back to first order.
+            mapTgtToSrc(tgtField, cop, result);
+            return;
+        }
+
+        const mapDistribute& map = tgtMapPtr_();
+
+        List<Type> work(tgtField);
+        map.distribute(work);
+
+        List<typename outerProduct<vector, Type>::type> workGrad
+        (
+            tgtGradField
+        );
+        map.distribute(workGrad);
+
+        forAll(result, cellI)
+        {
+            const labelList& tgtAddress = srcToTgtCellAddr_[cellI];
+            const scalarList& tgtWeight = srcToTgtCellWght_[cellI];
+            const pointList& tgtVec = srcToTgtCellVec_[cellI];
+
+            if (tgtAddress.size())
+            {
+                result[cellI] *= (1.0 - sum(tgtWeight));
+                forAll(tgtAddress, i)
+                {
+                    label tgtI = tgtAddress[i];
+                    scalar w = tgtWeight[i];
+                    const vector& v = tgtVec[i];
+                    const Type tgtVal = work[tgtI]+(workGrad[tgtI]&v);
+                    cbop(result[cellI], cellI, tgtVal, w);
+                }
+            }
+        }
+    }
+    else
+    {
+        forAll(result, cellI)
+        {
+            const labelList& tgtAddress = srcToTgtCellAddr_[cellI];
+            const scalarList& tgtWeight = srcToTgtCellWght_[cellI];
+            const pointList& tgtVec = srcToTgtCellVec_[cellI];
+
+            if (tgtAddress.size())
+            {
+                result[cellI] *= (1.0 - sum(tgtWeight));
+                forAll(tgtAddress, i)
+                {
+                    label tgtI = tgtAddress[i];
+                    scalar w = tgtWeight[i];
+                    const vector& v = tgtVec[i];
+                    const Type tgtVal = tgtField[tgtI]+(tgtGradField[tgtI]&v);
+                    cbop(result[cellI], cellI, tgtVal, w);
+                }
+            }
+        }
+    }
+}
+
+
 template<class Type, class CombineOp>
 Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
 (
@@ -331,15 +496,64 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
 }
 
 
+template<class Type, class CombineOp>
+void Foam::meshToMesh::mapInternalSrcToTgt
+(
+    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const CombineOp& cop,
+    GeometricField<Type, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    if (secondOrder && returnReduce(tgtToSrcCellVec_.size(), sumOp<label>()))
+    {
+        mapSrcToTgt
+        (
+            field,
+            fvc::grad(field)().internalField(),
+            cop,
+            result.internalField()
+        );
+    }
+    else
+    {
+        mapSrcToTgt(field, cop, result.internalField());
+    }
+}
+
+
+template<class Type, class CombineOp>
+void Foam::meshToMesh::mapAndOpSrcToTgt
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    const Field<Type>& srcField,
+    Field<Type>& tgtField,
+    const CombineOp& cop
+) const
+{
+    tgtField = pTraits<Type>::zero;
+
+    AMI.interpolateToTarget
+    (
+        srcField,
+        multiplyWeightedOp<Type, CombineOp>(cop),
+        tgtField,
+        UList<Type>::null()
+    );
+}
+
+
 template<class Type, class CombineOp>
 void Foam::meshToMesh::mapSrcToTgt
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
     const CombineOp& cop,
-    GeometricField<Type, fvPatchField, volMesh>& result
+    GeometricField<Type, fvPatchField, volMesh>& result,
+    const bool secondOrder
 ) const
 {
-    mapSrcToTgt(field, cop, result.internalField());
+    mapInternalSrcToTgt(field, cop, result, secondOrder);
+
 
     const PtrList<AMIPatchToPatchInterpolation>& AMIList = patchAMIs();
 
@@ -351,40 +565,37 @@ void Foam::meshToMesh::mapSrcToTgt
         const fvPatchField<Type>& srcField = field.boundaryField()[srcPatchI];
         fvPatchField<Type>& tgtField = result.boundaryField()[tgtPatchI];
 
-        // 2.3 does not do distributed mapping yet so only do if
-        // running on single processor
-        if (AMIList[i].singlePatchProc() != -1)
-        {
-            // Clone and map (since rmap does not do general mapping)
-            tmp<fvPatchField<Type> > tnewTgt
-            (
-                fvPatchField<Type>::New
-                (
-                    srcField,
-                    tgtField.patch(),
-                    result.dimensionedInternalField(),
-                    weightedFvPatchFieldMapper
-                    (
-                        AMIList[i].tgtAddress(),
-                        AMIList[i].tgtWeights()
-                    )
-                )
-            );
 
-            // Transfer all mapped quantities (value and e.g. gradient) onto
-            // tgtField. Value will get overwritten below.
-            tgtField.rmap(tnewTgt(), identity(tgtField.size()));
-        }
-
-        tgtField == pTraits<Type>::zero;
-
-        AMIList[i].interpolateToTarget
+        // Clone and map (since rmap does not do general mapping)
+        tmp<fvPatchField<Type> > tnewTgt
         (
-            srcField,
-            multiplyWeightedOp<Type, CombineOp>(cop),
-            tgtField,
-            UList<Type>::null()
+            fvPatchField<Type>::New
+            (
+                srcField,
+                tgtField.patch(),
+                result.dimensionedInternalField(),
+                distributedWeightedFvPatchFieldMapper
+                (
+                    AMIList[i].singlePatchProc(),
+                    (
+                        AMIList[i].singlePatchProc() == -1
+                      ? &AMIList[i].srcMap()
+                      : NULL
+                    ),
+                    AMIList[i].tgtAddress(),
+                    AMIList[i].tgtWeights()
+                )
+            )
         );
+
+        // Transfer all mapped quantities (value and e.g. gradient) onto
+        // tgtField
+        tgtField.rmap(tnewTgt(), identity(tgtField.size()));
+
+
+        // Override value to account for CombineOp (note: is dummy template
+        // specialisation for plusEqOp)
+        mapAndOpSrcToTgt(AMIList[i], srcField, tgtField, cop);
     }
 
     forAll(cuttingPatches_, i)
@@ -401,7 +612,8 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh::mapSrcToTgt
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
-    const CombineOp& cop
+    const CombineOp& cop,
+    const bool secondOrder
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
@@ -480,7 +692,7 @@ Foam::meshToMesh::mapSrcToTgt
         )
     );
 
-    mapSrcToTgt(field, cop, tresult());
+    mapSrcToTgt(field, cop, tresult(), secondOrder);
 
     return tresult;
 }
@@ -491,32 +703,82 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh::mapSrcToTgt
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
+    const CombineOp& cop,
+    const bool secondOrder
+) const
+{
+    return mapSrcToTgt(tfield(), cop, secondOrder);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::meshToMesh::mapSrcToTgt
+(
+    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const bool secondOrder
+) const
+{
+    return mapSrcToTgt(field, plusEqOp<Type>(), secondOrder);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::meshToMesh::mapSrcToTgt
+(
+    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
+    const bool secondOrder
+) const
+{
+    return mapSrcToTgt(tfield(), plusEqOp<Type>(), secondOrder);
+}
+
+
+template<class Type, class CombineOp>
+void Foam::meshToMesh::mapInternalTgtToSrc
+(
+    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const CombineOp& cop,
+    GeometricField<Type, fvPatchField, volMesh>& result,
+    const bool secondOrder
+) const
+{
+    if (secondOrder && returnReduce(srcToTgtCellVec_.size(), sumOp<label>()))
+    {
+        mapTgtToSrc
+        (
+            field,
+            fvc::grad(field)().internalField(),
+            cop,
+            result.internalField()
+        );
+    }
+    else
+    {
+        mapTgtToSrc(field, cop, result.internalField());
+    }
+}
+
+
+template<class Type, class CombineOp>
+void Foam::meshToMesh::mapAndOpTgtToSrc
+(
+    const AMIPatchToPatchInterpolation& AMI,
+    Field<Type>& srcField,
+    const Field<Type>& tgtField,
     const CombineOp& cop
 ) const
 {
-    return mapSrcToTgt(tfield(), cop);
-}
+    srcField = pTraits<Type>::zero;
 
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
-Foam::meshToMesh::mapSrcToTgt
-(
-    const GeometricField<Type, fvPatchField, volMesh>& field
-) const
-{
-    return mapSrcToTgt(field, plusEqOp<Type>());
-}
-
-
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
-Foam::meshToMesh::mapSrcToTgt
-(
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield
-) const
-{
-    return mapSrcToTgt(tfield(), plusEqOp<Type>());
+    AMI.interpolateToSource
+    (
+        tgtField,
+        multiplyWeightedOp<Type, CombineOp>(cop),
+        srcField,
+        UList<Type>::null()
+    );
 }
 
 
@@ -525,10 +787,12 @@ void Foam::meshToMesh::mapTgtToSrc
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
     const CombineOp& cop,
-    GeometricField<Type, fvPatchField, volMesh>& result
+    GeometricField<Type, fvPatchField, volMesh>& result,
+    const bool secondOrder
 ) const
 {
-    mapTgtToSrc(field, cop, result.internalField());
+    mapInternalTgtToSrc(field, cop, result, secondOrder);
+
 
     const PtrList<AMIPatchToPatchInterpolation>& AMIList = patchAMIs();
 
@@ -540,40 +804,37 @@ void Foam::meshToMesh::mapTgtToSrc
         fvPatchField<Type>& srcField = result.boundaryField()[srcPatchI];
         const fvPatchField<Type>& tgtField = field.boundaryField()[tgtPatchI];
 
-        // 2.3 does not do distributed mapping yet so only do if
-        // running on single processor
-        if (AMIList[i].singlePatchProc() != -1)
-        {
-            // Clone and map (since rmap does not do general mapping)
-            tmp<fvPatchField<Type> > tnewSrc
-            (
-                fvPatchField<Type>::New
-                (
-                    tgtField,
-                    srcField.patch(),
-                    result.dimensionedInternalField(),
-                    weightedFvPatchFieldMapper
-                    (
-                        AMIList[i].srcAddress(),
-                        AMIList[i].srcWeights()
-                    )
-                )
-            );
 
-            // Transfer all mapped quantities (value and e.g. gradient) onto
-            // srcField. Value will get overwritten below
-            srcField.rmap(tnewSrc(), identity(srcField.size()));
-        }
-
-        srcField == pTraits<Type>::zero;
-
-        AMIList[i].interpolateToSource
+        // Clone and map (since rmap does not do general mapping)
+        tmp<fvPatchField<Type> > tnewSrc
         (
-            tgtField,
-            multiplyWeightedOp<Type, CombineOp>(cop),
-            srcField,
-            UList<Type>::null()
+            fvPatchField<Type>::New
+            (
+                tgtField,
+                srcField.patch(),
+                result.dimensionedInternalField(),
+                distributedWeightedFvPatchFieldMapper
+                (
+                    AMIList[i].singlePatchProc(),
+                    (
+                        AMIList[i].singlePatchProc() == -1
+                      ? &AMIList[i].tgtMap()
+                      : NULL
+                    ),
+                    AMIList[i].srcAddress(),
+                    AMIList[i].srcWeights()
+                )
+            )
         );
+
+        // Transfer all mapped quantities (value and e.g. gradient) onto
+        // tgtField
+        srcField.rmap(tnewSrc(), identity(srcField.size()));
+
+
+        // Override value to account for CombineOp (could be dummy for
+        // plusEqOp)
+        mapAndOpTgtToSrc(AMIList[i], srcField, tgtField, cop);
     }
 
     forAll(cuttingPatches_, i)
@@ -590,7 +851,8 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh::mapTgtToSrc
 (
     const GeometricField<Type, fvPatchField, volMesh>& field,
-    const CombineOp& cop
+    const CombineOp& cop,
+    const bool secondOrder
 ) const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
@@ -669,7 +931,7 @@ Foam::meshToMesh::mapTgtToSrc
         )
     );
 
-    mapTgtToSrc(field, cop, tresult());
+    mapTgtToSrc(field, cop, tresult(), secondOrder);
 
     return tresult;
 }
@@ -680,10 +942,11 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh::mapTgtToSrc
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
-    const CombineOp& cop
+    const CombineOp& cop,
+    const bool secondOrder
 ) const
 {
-    return mapTgtToSrc(tfield(), cop);
+    return mapTgtToSrc(tfield(), cop, secondOrder);
 }
 
 
@@ -691,10 +954,11 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh::mapTgtToSrc
 (
-    const GeometricField<Type, fvPatchField, volMesh>& field
+    const GeometricField<Type, fvPatchField, volMesh>& field,
+    const bool secondOrder
 ) const
 {
-    return mapTgtToSrc(field, plusEqOp<Type>());
+    return mapTgtToSrc(field, plusEqOp<Type>(), secondOrder);
 }
 
 
@@ -702,10 +966,11 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
 Foam::meshToMesh::mapTgtToSrc
 (
-    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield
+    const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
+    const bool secondOrder
 ) const
 {
-    return mapTgtToSrc(tfield(), plusEqOp<Type>());
+    return mapTgtToSrc(tfield(), plusEqOp<Type>(), secondOrder);
 }
 
 
diff --git a/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C b/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
index a24c99de29..a3ca751858 100644
--- a/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
+++ b/src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
@@ -153,7 +153,7 @@ void Foam::meshToMesh0::calcAddressing()
 
             if (fromPatch.empty())
             {
-                WarningIn("meshToMesh0::calcAddressing()")
+                WarningInFunction
                     << "Source patch " << fromPatch.name()
                     << " has no faces. Not performing mapping for it."
                     << endl;
diff --git a/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C b/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
index 30d3c37f89..7cf00f9895 100644
--- a/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
+++ b/src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
@@ -38,7 +38,7 @@ void Foam::meshToMesh0::calculateInverseDistanceWeights() const
 
     if (inverseDistanceWeightsPtr_)
     {
-        FatalErrorIn("meshToMesh0::calculateInverseDistanceWeights()")
+        FatalErrorInFunction
             << "weighting factors already calculated"
             << exit(FatalError);
     }
@@ -140,7 +140,7 @@ void Foam::meshToMesh0::calculateInverseVolumeWeights() const
 
     if (inverseVolumeWeightsPtr_)
     {
-        FatalErrorIn("meshToMesh0::calculateInverseVolumeWeights()")
+        FatalErrorInFunction
             << "weighting factors already calculated"
             << exit(FatalError);
     }
@@ -203,7 +203,7 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
 
     if (cellToCellAddressingPtr_)
     {
-        FatalErrorIn("meshToMesh0::calculateCellToCellAddressing()")
+        FatalErrorInFunction
             << "addressing already calculated"
             << exit(FatalError);
     }
diff --git a/src/sampling/meshToMesh0/meshToMesh0.C b/src/sampling/meshToMesh0/meshToMesh0.C
index 164d749cd4..73991b8b72 100644
--- a/src/sampling/meshToMesh0/meshToMesh0.C
+++ b/src/sampling/meshToMesh0/meshToMesh0.C
@@ -87,13 +87,8 @@ Foam::meshToMesh0::meshToMesh0
         }
         else
         {
-            WarningIn
-            (
-                "meshToMesh0::meshToMesh0"
-                "(const fvMesh& meshFrom, const fvMesh& meshTo,"
-                "const HashTable<word>& patchMap,"
-                "const wordList& cuttingPatchNames)"
-            )   << "Cannot find cutting-patch " << cuttingPatchNames[i]
+            WarningInFunction
+                << "Cannot find cutting-patch " << cuttingPatchNames[i]
                 << " in destination mesh" << endl;
         }
     }
@@ -134,11 +129,8 @@ Foam::meshToMesh0::meshToMesh0
     // of boundary patches
     if (fromMesh_.boundary().size() != toMesh_.boundary().size())
     {
-        FatalErrorIn
-        (
-            "meshToMesh0::meshToMesh0"
-            "(const fvMesh& meshFrom, const fvMesh& meshTo)"
-        )   << "Incompatible meshes: different number of patches, "
+        FatalErrorInFunction
+            << "Incompatible meshes: different number of patches, "
             << "fromMesh = " << fromMesh_.boundary().size()
             << ", toMesh = " << toMesh_.boundary().size()
             << exit(FatalError);
@@ -152,11 +144,8 @@ Foam::meshToMesh0::meshToMesh0
          != toMesh_.boundaryMesh()[patchi].name()
         )
         {
-            FatalErrorIn
-            (
-                "meshToMesh0::meshToMesh0"
-                "(const fvMesh& meshFrom, const fvMesh& meshTo)"
-            )   << "Incompatible meshes: different patch names for patch "
+            FatalErrorInFunction
+                << "Incompatible meshes: different patch names for patch "
                 << patchi
                 << ", fromMesh = " << fromMesh_.boundary()[patchi].name()
                 << ", toMesh = " << toMesh_.boundary()[patchi].name()
@@ -169,11 +158,8 @@ Foam::meshToMesh0::meshToMesh0
          != toMesh_.boundaryMesh()[patchi].type()
         )
         {
-            FatalErrorIn
-            (
-                "meshToMesh0::meshToMesh0"
-                "(const fvMesh& meshFrom, const fvMesh& meshTo)"
-            )   << "Incompatible meshes: different patch types for patch "
+            FatalErrorInFunction
+                << "Incompatible meshes: different patch types for patch "
                 << patchi
                 << ", fromMesh = " << fromMesh_.boundary()[patchi].type()
                 << ", toMesh = " << toMesh_.boundary()[patchi].type()
diff --git a/src/sampling/meshToMesh0/meshToMesh0Templates.C b/src/sampling/meshToMesh0/meshToMesh0Templates.C
index 9d3bff6807..9595399bd2 100644
--- a/src/sampling/meshToMesh0/meshToMesh0Templates.C
+++ b/src/sampling/meshToMesh0/meshToMesh0Templates.C
@@ -158,12 +158,8 @@ void Foam::meshToMesh0::interpolateInternalField
 {
     if (fromVf.mesh() != fromMesh_)
     {
-        FatalErrorIn
-        (
-            "meshToMesh0::interpolateInternalField(Field<Type>&, "
-            "const GeometricField<Type, fvPatchField, volMesh>&, "
-            "meshToMesh0::order, const CombineOp&) const"
-        )   << "the argument field does not correspond to the right mesh. "
+        FatalErrorInFunction
+            << "the argument field does not correspond to the right mesh. "
             << "Field size: " << fromVf.size()
             << " mesh size: " << fromMesh_.nCells()
             << exit(FatalError);
@@ -171,12 +167,8 @@ void Foam::meshToMesh0::interpolateInternalField
 
     if (toF.size() != toMesh_.nCells())
     {
-        FatalErrorIn
-        (
-            "meshToMesh0::interpolateInternalField(Field<Type>&, "
-            "const GeometricField<Type, fvPatchField, volMesh>&, "
-            "meshToMesh0::order, const CombineOp&) const"
-        )   << "the argument field does not correspond to the right mesh. "
+        FatalErrorInFunction
+            << "the argument field does not correspond to the right mesh. "
             << "Field size: " << toF.size()
             << " mesh size: " << toMesh_.nCells()
             << exit(FatalError);
@@ -229,12 +221,8 @@ void Foam::meshToMesh0::interpolateInternalField
             break;
         }
         default:
-            FatalErrorIn
-            (
-                "meshToMesh0::interpolateInternalField(Field<Type>&, "
-                "const GeometricField<Type, fvPatchField, volMesh>&, "
-                "meshToMesh0::order, const CombineOp&) const"
-            )   << "unknown interpolation scheme " << ord
+            FatalErrorInFunction
+                << "unknown interpolation scheme " << ord
                 << exit(FatalError);
     }
 }
@@ -317,13 +305,8 @@ void Foam::meshToMesh0::interpolate
                 }
 
                 default:
-                    FatalErrorIn
-                    (
-                        "meshToMesh0::interpolate("
-                        "GeometricField<Type, fvPatchField, volMesh>&, "
-                        "const GeometricField<Type, fvPatchField, volMesh>&, "
-                        "meshToMesh0::order, const CombineOp&) const"
-                    )   << "unknown interpolation scheme " << ord
+                    FatalErrorInFunction
+                        << "unknown interpolation scheme " << ord
                         << exit(FatalError);
             }
 
@@ -398,12 +381,8 @@ Foam::meshToMesh0::interpolate
     // of boundary patches
     if (fromMesh_.boundary().size() != toMesh_.boundary().size())
     {
-        FatalErrorIn
-        (
-            "meshToMesh0::interpolate"
-            "(const GeometricField<Type, fvPatchField, volMesh>&,"
-            "meshToMesh0::order, const CombineOp&) const"
-        )   << "Incompatible meshes: different number of boundaries, "
+        FatalErrorInFunction
+            << "Incompatible meshes: different number of boundaries, "
                "only internal field may be interpolated"
             << exit(FatalError);
     }
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index b6792ea08c..23868f5f8d 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,32 +46,40 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
     const polyBoundaryMesh& bm = mesh.boundaryMesh();
 
-    label patchI = bm.findPatchID(patchName_);
-
-    if (patchI == -1)
-    {
-        FatalErrorIn
-        (
-            " Foam::patchProbes::findElements(const fvMesh&)"
-        )   << " Unknown patch name "
-            << patchName_ << endl
-            << exit(FatalError);
-    }
-
-     // All the info for nearest. Construct to miss
+    // All the info for nearest. Construct to miss
     List<mappedPatchBase::nearInfo> nearest(this->size());
 
-    const polyPatch& pp = bm[patchI];
+    const labelList patchIDs(bm.patchSet(patchNames_).sortedToc());
 
-    if (pp.size() > 0)
+    label nFaces = 0;
+    forAll(patchIDs, i)
     {
-        labelList bndFaces(pp.size());
-        forAll(bndFaces, i)
+        nFaces += bm[patchIDs[i]].size();
+    }
+
+    if (nFaces > 0)
+    {
+        // Collect mesh faces and bounding box
+        labelList bndFaces(nFaces);
+        treeBoundBox overallBb(treeBoundBox::invertedBox);
+
+        nFaces = 0;
+        forAll(patchIDs, i)
         {
-            bndFaces[i] =  pp.start() + i;
+            const polyPatch& pp = bm[patchIDs[i]];
+            forAll(pp, i)
+            {
+                bndFaces[nFaces++] = pp.start()+i;
+                const face& f = pp[i];
+                forAll(f, fp)
+                {
+                    const point& pt = pp.points()[f[fp]];
+                    overallBb.min() = min(overallBb.min(), pt);
+                    overallBb.max() = max(overallBb.max(), pt);
+                }
+            }
         }
 
-        treeBoundBox overallBb(pp.points());
         Random rndGen(123456);
         overallBb = overallBb.extend(rndGen, 1e-4);
         overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
@@ -106,11 +114,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
             if (!info.hit())
             {
-                info = boundaryTree.findNearest
-                (
-                    sample,
-                    Foam::sqr(GREAT)
-                );
+                info = boundaryTree.findNearest(sample, Foam::sqr(GREAT));
             }
 
             label faceI = boundaryTree.shapes().faceLabels()[info.index()];
@@ -119,30 +123,33 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
             if (isA<emptyPolyPatch>(bm[patchi]))
             {
-                WarningIn
-                (
-                    " Foam::patchProbes::findElements(const fvMesh&)"
-                )
+                WarningInFunction
                 << " The sample point: " << sample
                 << " belongs to " << patchi
                 << " which is an empty patch. This is not permitted. "
                 << " This sample will not be included "
                 << endl;
             }
-            else
+            else if (info.hit())
             {
-                const point& fc = mesh.faceCentres()[faceI];
+                // Note: do we store the face centre or the actual nearest?
+                // We interpolate using the faceI only though (no
+                // interpolation) so it does not actually matter much, just for
+                // the location written to the header.
+
+                //const point& facePt = mesh.faceCentres()[faceI];
+                const point& facePt = info.hitPoint();
 
                 mappedPatchBase::nearInfo sampleInfo;
 
                 sampleInfo.first() = pointIndexHit
                 (
                     true,
-                    fc,
+                    facePt,
                     faceI
                 );
 
-                sampleInfo.second().first() = magSqr(fc-sample);
+                sampleInfo.second().first() = magSqr(facePt-sample);
                 sampleInfo.second().second() = Pstream::myProcNo();
 
                 nearest[probeI]= sampleInfo;
@@ -155,6 +162,14 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
     Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
     Pstream::listCombineScatter(nearest);
 
+
+    // Update actual probe locations
+    forAll(nearest, sampleI)
+    {
+        operator[](sampleI) = nearest[sampleI].first().rawPoint();
+    }
+
+
     if (debug)
     {
         Info<< "patchProbes::findElements" << " : " << endl;
@@ -165,26 +180,41 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
             Info<< "    " << sampleI << " coord:"<< operator[](sampleI)
                 << " found on processor:" << procI
-                << " in local cell/face:" << localI
-                << " with fc:" << nearest[sampleI].first().rawPoint() << endl;
+                << " in local face:" << localI
+                << " with location:" << nearest[sampleI].first().rawPoint()
+                << endl;
         }
     }
 
 
     // Extract any local faces to sample
-    elementList_.setSize(nearest.size(), -1);
+    elementList_.setSize(nearest.size());
+    elementList_ = -1;
+    faceList_.setSize(nearest.size());
+    faceList_ = -1;
 
     forAll(nearest, sampleI)
     {
         if (nearest[sampleI].second().second() == Pstream::myProcNo())
         {
             // Store the face to sample
-            elementList_[sampleI] = nearest[sampleI].first().index();
+            faceList_[sampleI] = nearest[sampleI].first().index();
         }
     }
 }
 
 
+void Foam::patchProbes::readDict(const dictionary& dict)
+{
+    if (!dict.readIfPresent("patches", patchNames_))
+    {
+        word patchName(dict.lookup("patchName"));
+        patchNames_ = wordReList(1, wordRe(patchName));
+    }
+    probes::readDict(dict);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::patchProbes::patchProbes
@@ -192,19 +222,22 @@ Foam::patchProbes::patchProbes
     const word& name,
     const objectRegistry& obr,
     const dictionary& dict,
-    const bool loadFromFiles
+    const bool loadFromFiles,
+    const bool doFindElements
 )
 :
-    probes(name, obr, dict, loadFromFiles)
+    probes(name, obr, dict, loadFromFiles, false)
 {
-    // When constructing probes above it will have called the
-    // probes::findElements (since the virtual mechanism not yet operating).
-    // Not easy to workaround (apart from feeding through flag into constructor)
-    // so clear out any cells found for now.
-    elementList_.clear();
-    faceList_.clear();
+    readDict(dict);
 
-    read(dict);
+    if (doFindElements)
+    {
+        // Find the elements
+        findElements(mesh_);
+
+        // Open the probe streams
+        prepare();
+    }
 }
 
 
@@ -232,10 +265,16 @@ void Foam::patchProbes::write()
     }
 }
 
+
 void Foam::patchProbes::read(const dictionary& dict)
 {
-    dict.lookup("patchName") >> patchName_;
-    probes::read(dict);
+    readDict(dict);
+
+    // Find the elements
+    findElements(mesh_);
+
+    // Open the probe streams
+    prepare();
 }
 
 
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 2425b67f77..e24b05efce 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -25,9 +25,45 @@ Class
     Foam::patchProbes
 
 Description
-    Set of locations to sample.at patches
+    Set of locations to sample at patches
 
     Call write() to sample and write files.
+    - find nearest location on nearest face
+    - update *this with location (so header contains 'snapped' locations
+    - use *this as the sampling location
+
+    Example of function object specification:
+    \verbatim
+    patchProbes
+    {
+        type            patchProbes;
+        functionObjectLibs ( "libsampling.so" );
+
+        // Name of the directory for probe data
+        name            patchProbes;
+
+        // Patches to sample (wildcards allowed)
+        patches         (".*inl.*");
+
+        // Write at same frequency as fields
+        outputControl   outputTime;
+        outputInterval  1;
+
+        // Fields to be probed
+        fields
+        (
+            p U
+        );
+
+        // Locations to probe. These get snapped onto the nearest point
+        // on the selected patches
+        probeLocations
+        (
+            ( -100 0 0.01 )      // at inlet
+        );
+    }
+    \endverbatim
+
 
 SourceFiles
     patchProbes.C
@@ -58,13 +94,15 @@ class patchProbes
 :
     public probes
 {
-    // Private data
+protected:
 
-        //- Patch name
-        word patchName_;
+    // Protected data
+
+        //- Patches to sample
+        wordReList patchNames_;
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
         //- Sample and write a particular volume field
         template<class Type>
@@ -73,7 +111,6 @@ class patchProbes
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
-
         //- Sample and write a particular surface field
         template<class Type>
         void sampleAndWrite
@@ -81,17 +118,14 @@ class patchProbes
             const GeometricField<Type, fvsPatchField, surfaceMesh>&
         );
 
-
         //- Sample and write all the fields of the given type
         template<class Type>
         void sampleAndWrite(const fieldGroup<Type>&);
 
-
          //- Sample and write all the surface fields of the given type
         template<class Type>
         void sampleAndWriteSurfaceFields(const fieldGroup<Type>&);
 
-
         //- Sample a volume field at all locations
         template<class Type>
         tmp<Field<Type> > sample
@@ -99,7 +133,6 @@ class patchProbes
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-
         //- Sample a surface field at all locations
         template<class Type>
         tmp<Field<Type> > sample
@@ -107,11 +140,18 @@ class patchProbes
             const GeometricField<Type, fvsPatchField, surfaceMesh>&
         ) const;
 
-
         //- Sample a single field on all sample locations
         template<class Type>
         tmp<Field<Type> > sample(const word& fieldName) const;
 
+        //- Find elements containing patchProbes
+        virtual void findElements(const fvMesh&);
+
+        //- Read dictionary settings
+        void readDict(const dictionary& dict);
+
+
+private:
 
         //- Disallow default bitwise copy construct
         patchProbes(const patchProbes&);
@@ -135,7 +175,8 @@ public:
             const word& name,
             const objectRegistry&,
             const dictionary&,
-            const bool loadFromFiles = false
+            const bool loadFromFiles = false,
+            const bool findElements = true
         );
 
 
@@ -149,9 +190,6 @@ public:
 
         //- Read
         virtual void read(const dictionary&);
-
-        //- Find elements containing patchProbes
-        virtual void findElements(const fvMesh&);
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index 7e8ddd74b4..e0ff2206e7 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -208,7 +208,7 @@ Foam::patchProbes::sample
 
     forAll(*this, probeI)
     {
-        label faceI = elementList_[probeI];
+        label faceI = faceList_[probeI];
 
         if (faceI >= 0)
         {
@@ -259,7 +259,7 @@ Foam::patchProbes::sample
 
     forAll(*this, probeI)
     {
-        label faceI = elementList_[probeI];
+        label faceI = faceList_[probeI];
 
         if (faceI >= 0)
         {
@@ -274,4 +274,6 @@ Foam::patchProbes::sample
 
     return tValues;
 }
+
+
 // ************************************************************************* //
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 38ef3a63b4..862d487063 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -108,7 +108,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
         {
             if (Pstream::master())
             {
-                WarningIn("findElements::findElements(const fvMesh&)")
+                WarningInFunction
                     << "Did not find location " << location
                     << " in any cell. Skipping location." << endl;
             }
@@ -117,7 +117,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
         {
             if (Pstream::master())
             {
-                WarningIn("probes::findElements(const fvMesh&)")
+                WarningInFunction
                     << "Did not find location " << location
                     << " in any face. Skipping location." << endl;
             }
@@ -127,7 +127,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
             // Make sure location not on two domains.
             if (elementList_[probeI] != -1 && elementList_[probeI] != cellI)
             {
-                WarningIn("probes::findElements(const fvMesh&)")
+                WarningInFunction
                     << "Location " << location
                     << " seems to be on multiple domains:"
                     << " cell " << elementList_[probeI]
@@ -141,7 +141,7 @@ void Foam::probes::findElements(const fvMesh& mesh)
 
             if (faceList_[probeI] != -1 && faceList_[probeI] != faceI)
             {
-                WarningIn("probes::findElements(const fvMesh&)")
+                WarningInFunction
                     << "Location " << location
                     << " seems to be on multiple domains:"
                     << " cell " << faceList_[probeI]
@@ -265,6 +265,25 @@ Foam::label Foam::probes::prepare()
 }
 
 
+void Foam::probes::readDict(const dictionary& dict)
+{
+    dict.lookup("probeLocations") >> *this;
+    dict.lookup("fields") >> fieldSelection_;
+
+    dict.readIfPresent("fixedLocations", fixedLocations_);
+    if (dict.readIfPresent("interpolationScheme", interpolationScheme_))
+    {
+        if (!fixedLocations_ && interpolationScheme_ != "cell")
+        {
+            WarningInFunction
+                << "Only cell interpolation can be applied when "
+                << "not using fixedLocations. InterpolationScheme "
+                << "entry will be ignored";
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::probes::probes
@@ -272,7 +291,8 @@ Foam::probes::probes
     const word& name,
     const objectRegistry& obr,
     const dictionary& dict,
-    const bool loadFromFiles
+    const bool loadFromFiles,
+    const bool doFindElements
 )
 :
     pointField(0),
@@ -283,7 +303,18 @@ Foam::probes::probes
     fixedLocations_(true),
     interpolationScheme_("cell")
 {
-    read(dict);
+    // Read dictionary (but do not search for elements)
+    readDict(dict);
+
+    // Optionally find elements in constructor
+    if (doFindElements)
+    {
+        // Find the elements
+        findElements(mesh_);
+
+        // Open the probe streams
+        prepare();
+    }
 }
 
 
@@ -334,15 +365,15 @@ void Foam::probes::write()
 
 void Foam::probes::read(const dictionary& dict)
 {
-    dict.lookup("probeLocations") >> *this;
-    dict.lookup("fields") >> fieldSelection_;
+    readDict(dict);
 
+    // Find the elements
     dict.readIfPresent("fixedLocations", fixedLocations_);
     if (dict.readIfPresent("interpolationScheme", interpolationScheme_))
     {
         if (!fixedLocations_ && interpolationScheme_ != "cell")
         {
-            WarningIn("void Foam::probes::read(const dictionary&)")
+            WarningInFunction
                 << "Only cell interpolation can be applied when "
                 << "not using fixedLocations.  InterpolationScheme "
                 << "entry will be ignored";
@@ -352,6 +383,7 @@ void Foam::probes::read(const dictionary& dict)
     // Initialise cells to sample from supplied locations
     findElements(mesh_);
 
+    // Open the probe streams
     prepare();
 }
 
@@ -382,20 +414,28 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
             forAll(elementList_, i)
             {
                 label cellI = elementList_[i];
-                label newCellI = reverseMap[cellI];
-                if (newCellI == -1)
+                if (cellI != -1)
                 {
-                    // cell removed
-                }
-                else if (newCellI < -1)
-                {
-                    // cell merged
-                    elems.append(-newCellI - 2);
+                    label newCellI = reverseMap[cellI];
+                    if (newCellI == -1)
+                    {
+                        // cell removed
+                    }
+                    else if (newCellI < -1)
+                    {
+                        // cell merged
+                        elems.append(-newCellI - 2);
+                    }
+                    else
+                    {
+                        // valid new cell
+                        elems.append(newCellI);
+                    }
                 }
                 else
                 {
-                    // valid new cell
-                    elems.append(newCellI);
+                    // Keep -1 elements so the size stays the same
+                    elems.append(-1);
                 }
             }
 
@@ -410,20 +450,28 @@ void Foam::probes::updateMesh(const mapPolyMesh& mpm)
             forAll(faceList_, i)
             {
                 label faceI = faceList_[i];
-                label newFaceI = reverseMap[faceI];
-                if (newFaceI == -1)
+                if (faceI != -1)
                 {
-                    // face removed
-                }
-                else if (newFaceI < -1)
-                {
-                    // face merged
-                    elems.append(-newFaceI - 2);
+                    label newFaceI = reverseMap[faceI];
+                    if (newFaceI == -1)
+                    {
+                        // face removed
+                    }
+                    else if (newFaceI < -1)
+                    {
+                        // face merged
+                        elems.append(-newFaceI - 2);
+                    }
+                    else
+                    {
+                        // valid new face
+                        elems.append(newFaceI);
+                    }
                 }
                 else
                 {
-                    // valid new face
-                    elems.append(newFaceI);
+                    // Keep -1 elements
+                    elems.append(-1);
                 }
             }
 
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 5cc8c9f50c..ec759f1113 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -32,6 +32,42 @@ Description
 
     Call write() to sample and write files.
 
+    Example of function object specification:
+    \verbatim
+    probes
+    {
+        type            probes;
+        functionObjectLibs ( "libsampling.so" );
+
+        // Name of the directory for probe data
+        name            probes;
+
+        // Write at same frequency as fields
+        outputControl   outputTime;
+        outputInterval  1;
+
+        // Fields to be probed
+        fields
+        (
+            p U
+        );
+
+        // Optional: do not recalculate cells if mesh moves
+        fixedLocations  false;
+
+        // Optional: interpolation scheme to use (default is cell)
+        interpolationScheme cellPoint;
+
+        probeLocations
+        (
+            ( 1e-06 0 0.01 )      // at inlet
+            (0.21 -0.20999 0.01)  // at outlet1
+            (0.21 0.20999 0.01)   // at outlet2
+            (0.21 0 0.01)         // at central block
+        );
+    }
+    \endverbatim
+
 SourceFiles
     probes.C
 
@@ -91,13 +127,13 @@ protected:
 
         //- Name of this set of probes,
         //  Also used as the name of the probes directory.
-        word name_;
+        const word name_;
 
         //- Const reference to fvMesh
         const fvMesh& mesh_;
 
         //- Load fields from files (not from objectRegistry)
-        bool loadFromFiles_;
+        const bool loadFromFiles_;
 
 
         // Read from dictonary
@@ -106,7 +142,7 @@ protected:
             wordReList fieldSelection_;
 
             //- Fixed locations, default = yes
-            //  Note: set to false for moving mesh calations where locations
+            //  Note: set to false for moving mesh calculations where locations
             //        should move with the mesh
             bool fixedLocations_;
 
@@ -141,7 +177,7 @@ protected:
             HashPtrTable<OFstream> probeFilePtrs_;
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
         //- Clear old field groups
         void clearFieldGroups();
@@ -159,6 +195,8 @@ protected:
         //  returns number of fields to sample
         label prepare();
 
+        //- Read dictionary settings
+        void readDict(const dictionary& dict);
 
 private:
 
@@ -207,7 +245,8 @@ public:
             const word& name,
             const objectRegistry&,
             const dictionary&,
-            const bool loadFromFiles = false
+            const bool loadFromFiles = false,
+            const bool findElements = true
         );
 
 
diff --git a/src/sampling/probes/probesDict b/src/sampling/probes/probesDict
index b9c5eedc6d..af047efe7a 100644
--- a/src/sampling/probes/probesDict
+++ b/src/sampling/probes/probesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/src/sampling/sampledSet/circle/circleSet.C b/src/sampling/sampledSet/circle/circleSet.C
index b94e4962f2..cc525f2805 100644
--- a/src/sampling/sampledSet/circle/circleSet.C
+++ b/src/sampling/sampledSet/circle/circleSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ void Foam::circleSet::calcSamples
     }
     else
     {
-        WarningIn(funcName)
+        WarningInFunction
             << "Unable to find cell at point id " << 0
             << " at location " << startPoint_ << endl;
     }
@@ -92,7 +92,7 @@ void Foam::circleSet::calcSamples
 
     if (mag(axis1 & circleAxis_) > SMALL)
     {
-        WarningIn(funcName)
+        WarningInFunction
             << "Vector defined by (startPoint - origin) not orthogonal to "
             << "circleAxis:" << nl
             << "    startPoint - origin = " << axis1 << nl
@@ -118,13 +118,16 @@ void Foam::circleSet::calcSamples
             samplingCells.append(cellI);
             samplingFaces.append(-1);
             samplingSegments.append(nPoint);
-            samplingCurveDist.append(mag(pt - startPoint_));
+            samplingCurveDist.append
+            (
+                radius*constant::mathematical::pi/180.0*theta
+            );
 
             nPoint++;
         }
         else
         {
-            WarningIn(funcName)
+            WarningInFunction
                 << "Unable to find cell at point id " << nPoint
                 << " at location " << pt << endl;
         }
diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index 85fb7bc74b..d3e1ff847e 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ void Foam::faceOnlySet::calcSamples
     // distance vector between sampling points
     if (mag(end_ - start_) < SMALL)
     {
-        FatalErrorIn("faceOnlySet::calcSamples()")
+        FatalErrorInFunction
             << "Incorrect sample specification :"
             << " start equals end point." << endl
             << "  start:" << start_
@@ -169,6 +169,7 @@ void Foam::faceOnlySet::calcSamples
         // Set points and cell/face labels to empty lists
         //Info<< "calcSamples : Both start_ and end_ outside domain"
         //    << endl;
+        const_cast<polyMesh&>(mesh()).moving(oldMoving);
 
         return;
     }
diff --git a/src/sampling/sampledSet/midPoint/midPointSet.C b/src/sampling/sampledSet/midPoint/midPointSet.C
index 168d0bbc98..d0ea99108c 100644
--- a/src/sampling/sampledSet/midPoint/midPointSet.C
+++ b/src/sampling/sampledSet/midPoint/midPointSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,8 +68,7 @@ void Foam::midPointSet::genSamples()
 
             if (cell1 != cell2)
             {
-                FatalErrorIn("midPointSet::genSamples()")
-                    << "  sampleI:" << sampleI
+                FatalErrorInFunction
                     << "  midI:" << midI
                     << "  sampleI:" << sampleI
                     << "  pts[sampleI]:" << operator[](sampleI)
diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
index 601171f950..7a57549855 100644
--- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
+++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,8 +81,7 @@ void Foam::midPointAndFaceSet::genSamples()
 
             if (cell1 != cell2)
             {
-                FatalErrorIn("midPointAndFaceSet::genSamples()")
-                    << "  sampleI:" << sampleI
+                FatalErrorInFunction
                     << "  newSampleI:" << newSampleI
                     << "  pts[sampleI]:" << operator[](sampleI)
                     << "  face[sampleI]:" << faces_[sampleI]
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
index 3560fe4204..9cdcc7d230 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
@@ -30,9 +30,8 @@ License
 #include "treeDataFace.H"
 #include "Time.H"
 #include "meshTools.H"
-//#include "Random.H"
-// For 'facePoint' helper function only
 #include "mappedPatchBase.H"
+#include "indirectPrimitivePatch.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -85,19 +84,145 @@ void Foam::patchSeedSet::calcSamples
     }
 
 
-    label totalSize = returnReduce(sz, sumOp<label>());
+    if (!rndGenPtr_.valid())
+    {
+        rndGenPtr_.reset(new Random(0));
+    }
+    Random& rndGen = rndGenPtr_();
+
+
+    if (selectedLocations_.size())
+    {
+        DynamicList<label> newPatchFaces(patchFaces.size());
+
+        // Find the nearest patch face
+        {
+            // 1. All processors find nearest local patch face for all
+            //    selectedLocations
+
+            // All the info for nearest. Construct to miss
+            List<mappedPatchBase::nearInfo> nearest(selectedLocations_.size());
+
+            const indirectPrimitivePatch pp
+            (
+                IndirectList<face>(mesh().faces(), patchFaces),
+                mesh().points()
+            );
+
+            treeBoundBox patchBb
+            (
+                treeBoundBox(pp.points(), pp.meshPoints()).extend
+                (
+                    rndGen,
+                    1e-4
+                )
+            );
+            patchBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+            patchBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+
+            indexedOctree<treeDataFace> boundaryTree
+            (
+                treeDataFace    // all information needed to search faces
+                (
+                    false,      // do not cache bb
+                    mesh(),
+                    patchFaces  // boundary faces only
+                ),
+                patchBb,        // overall search domain
+                8,              // maxLevel
+                10,             // leafsize
+                3.0             // duplicity
+            );
+
+            // Get some global dimension so all points are equally likely
+            // to be found
+            const scalar globalDistSqr
+            (
+                //magSqr
+                //(
+                //    boundBox
+                //    (
+                //        pp.points(),
+                //        pp.meshPoints(),
+                //        true
+                //    ).span()
+                //)
+                GREAT
+            );
+
+            forAll(selectedLocations_, sampleI)
+            {
+                const point& sample = selectedLocations_[sampleI];
+
+                pointIndexHit& nearInfo = nearest[sampleI].first();
+                nearInfo = boundaryTree.findNearest
+                (
+                    sample,
+                    globalDistSqr
+                );
+
+                if (!nearInfo.hit())
+                {
+                    nearest[sampleI].second().first() = Foam::sqr(GREAT);
+                    nearest[sampleI].second().second() =
+                        Pstream::myProcNo();
+                }
+                else
+                {
+                    point fc(pp[nearInfo.index()].centre(pp.points()));
+                    nearInfo.setPoint(fc);
+                    nearest[sampleI].second().first() = magSqr(fc-sample);
+                    nearest[sampleI].second().second() =
+                        Pstream::myProcNo();
+                }
+            }
+
+
+            // 2. Reduce on master. Select nearest processor.
+
+            // Find nearest. Combine on master.
+            Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
+            Pstream::listCombineScatter(nearest);
+
+
+            // 3. Pick up my local faces that have won
+
+            forAll(nearest, sampleI)
+            {
+                if (nearest[sampleI].first().hit())
+                {
+                    label procI = nearest[sampleI].second().second();
+                    label index = nearest[sampleI].first().index();
+
+                    if (procI == Pstream::myProcNo())
+                    {
+                        newPatchFaces.append(pp.addressing()[index]);
+                    }
+                }
+            }
+        }
+
+        if (debug)
+        {
+            Pout<< "Found " << newPatchFaces.size()
+                << " out of " << selectedLocations_.size()
+                << " on local processor" << endl;
+        }
+
+        patchFaces.transfer(newPatchFaces);
+    }
 
 
     // Shuffle and truncate if in random mode
+    label totalSize = returnReduce(patchFaces.size(), sumOp<label>());
+
     if (maxPoints_ < totalSize)
     {
         // Check what fraction of maxPoints_ I need to generate locally.
-        label myMaxPoints = label(scalar(sz)/totalSize*maxPoints_);
+        label myMaxPoints =
+            label(scalar(patchFaces.size())/totalSize*maxPoints_);
 
-        rndGenPtr_.reset(new Random(123456));
-        Random& rndGen = rndGenPtr_();
-
-        labelList subset = identity(sz);
+        labelList subset = identity(patchFaces.size());
         for (label iter = 0; iter < 4; iter++)
         {
             forAll(subset, i)
@@ -115,7 +240,7 @@ void Foam::patchSeedSet::calcSamples
         if (debug)
         {
             Pout<< "In random mode : selected " << patchFaces.size()
-                << " faces out of " << sz << endl;
+                << " faces out of " << patchFaces.size() << endl;
         }
     }
 
@@ -135,6 +260,9 @@ void Foam::patchSeedSet::calcSamples
     forAll(patchFaces, i)
     {
         label faceI = patchFaces[i];
+
+        // Slightly shift point in since on warped face face-diagonal
+        // decomposition might be outside cell for face-centre decomposition!
         pointIndexHit info = mappedPatchBase::facePoint
         (
             mesh(),
@@ -217,9 +345,15 @@ Foam::patchSeedSet::patchSeedSet
             wordReList(dict.lookup("patches"))
         )
     ),
-    //searchDist_(readScalar(dict.lookup("maxDistance"))),
-    //offsetDist_(readScalar(dict.lookup("offsetDist"))),
-    maxPoints_(readLabel(dict.lookup("maxPoints")))
+    maxPoints_(readLabel(dict.lookup("maxPoints"))),
+    selectedLocations_
+    (
+        dict.lookupOrDefault<pointField>
+        (
+            "points",
+            pointField(0)
+        )
+    )
 {
     genSamples();
 
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.H b/src/sampling/sampledSet/patchSeed/patchSeedSet.H
index a6e795ad2b..c2143a2098 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.H
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,18 +58,15 @@ class patchSeedSet
         //- Patches to sample
         const labelHashSet patchSet_;
 
-//        //- Maximum distance to look for nearest
-//        const scalar searchDist_;
-//
-//        //- Offset distance
-//        const scalar offsetDist_;
-
-        //- Maximum number of patch faces to seed
+        //- Maximum number of patch faces to seed (if in random subset mode)
         const label maxPoints_;
 
         //- Random number generator (if maxPoints < num patch faces)
         autoPtr<Random> rndGenPtr_;
 
+        //- Patch faces to seed selected based on nearness to supplied points
+        const pointField selectedLocations_;
+
 
     // Private Member Functions
 
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.C b/src/sampling/sampledSet/polyLine/polyLineSet.C
index 023acc1dce..7ce2e3fdc2 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.C
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ void Foam::polyLineSet::calcSamples
     // Check sampling points
     if (sampleCoords_.size() < 2)
     {
-        FatalErrorIn("polyLineSet::calcSamples()")
+        FatalErrorInFunction
             << "Incorrect sample specification. Too few points:"
             << sampleCoords_ << exit(FatalError);
     }
@@ -146,7 +146,7 @@ void Foam::polyLineSet::calcSamples
     {
         if (mag(sampleCoords_[sampleI] - oldPoint) < SMALL)
         {
-            FatalErrorIn("polyLineSet::calcSamples()")
+            FatalErrorInFunction
                 << "Incorrect sample specification."
                 << " Point " << sampleCoords_[sampleI-1]
                 << " at position " << sampleI-1
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 1442ca31f9..4be25ac3e1 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,10 +57,8 @@ Foam::label Foam::sampledSet::getCell
 {
     if (faceI == -1)
     {
-        FatalErrorIn
-        (
-            "sampledSet::getCell(const label, const point&)"
-        )   << "Illegal face label " << faceI
+        FatalErrorInFunction
+            << "Illegal face label " << faceI
             << abort(FatalError);
     }
 
@@ -70,10 +68,8 @@ Foam::label Foam::sampledSet::getCell
 
         if (!mesh().pointInCell(sample, cellI, searchEngine_.decompMode()))
         {
-            FatalErrorIn
-            (
-                "sampledSet::getCell(const label, const point&)"
-            )   << "Found cell " << cellI << " using face " << faceI
+            FatalErrorInFunction
+                << "Found cell " << cellI << " using face " << faceI
                 << ". But cell does not contain point " << sample
                 << abort(FatalError);
         }
@@ -99,10 +95,8 @@ Foam::label Foam::sampledSet::getCell
             }
             else
             {
-                FatalErrorIn
-                (
-                    "sampledSet::getCell(const label, const point&)"
-                )   << "None of the neighbours of face "
+                FatalErrorInFunction
+                    << "None of the neighbours of face "
                     << faceI << " contains point " << sample
                     << abort(FatalError);
 
@@ -220,10 +214,8 @@ Foam::point Foam::sampledSet::pushIn
 
     if (tetFaceI == -1)
     {
-        FatalErrorIn
-        (
-            "sampledSet::pushIn(const point&, const label)"
-        )   << "After pushing " << facePt << " to " << newPosition
+        FatalErrorInFunction
+            << "After pushing " << facePt << " to " << newPosition
             << " it is still outside face " << faceI
             << " at " << mesh().faceCentres()[faceI]
             << " of cell " << cellI
@@ -378,7 +370,7 @@ void Foam::sampledSet::setSamples
      || (curveDist_.size() != size())
     )
     {
-        FatalErrorIn("sampledSet::setSamples()")
+        FatalErrorInFunction
             << "sizes not equal : "
             << "  points:" << size()
             << "  cells:" << cells_.size()
@@ -459,12 +451,8 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "sampledSet::New"
-            "(const word&, const polyMesh&, const meshSearch&"
-            ", const dictionary&)"
-        )   << "Unknown sample type "
+        FatalErrorInFunction
+            << "Unknown sample type "
             << sampleType << nl << nl
             << "Valid sample types : " << endl
             << wordConstructorTablePtr_->sortedToc()
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index 51905951f9..810d4565ed 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -223,7 +223,7 @@ public:
         //- Clone
         autoPtr<sampledSet> clone() const
         {
-            notImplemented("autoPtr<sampledSet> clone() const");
+            NotImplemented;
             return autoPtr<sampledSet>(NULL);
         }
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 0286e54877..e4dfaa638c 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +35,8 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(sampledSets, 0);
-bool sampledSets::verbose_ = false;
+    defineTypeNameAndDebug(sampledSets, 0);
+    bool sampledSets::verbose_ = false;
 }
 
 
@@ -102,7 +102,7 @@ void Foam::sampledSets::combineSampledSets
 
         if (Pstream::master() && allCurveDist.size() == 0)
         {
-            WarningIn("sampledSets::combineSampledSets(..)")
+            WarningInFunction
                 << "Sample set " << samplePts.name()
                 << " has zero points." << endl;
         }
@@ -136,8 +136,8 @@ Foam::sampledSets::sampledSets
     const bool loadFromFiles
 )
 :
+    functionObjectState(obr, name),
     PtrList<sampledSet>(),
-    name_(name),
     mesh_(refCast<const fvMesh>(obr)),
     loadFromFiles_(loadFromFiles),
     outputPath_(fileName::null),
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 430039a2ce..168eee9c39 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,6 +36,7 @@ SourceFiles
 #ifndef sampledSets_H
 #define sampledSets_H
 
+#include "functionObjectState.H"
 #include "sampledSet.H"
 #include "volFieldsFwd.H"
 #include "meshSearch.H"
@@ -59,6 +60,7 @@ class fvMesh;
 
 class sampledSets
 :
+    public functionObjectState,
     public PtrList<sampledSet>
 {
     // Private classes
@@ -153,10 +155,6 @@ class sampledSets
 
     // Private data
 
-        //- Name of this set of sets,
-        //  Also used as the name of the sampledSets directory.
-        word name_;
-
         //- Const reference to fvMesh
         const fvMesh& mesh_;
 
@@ -273,12 +271,6 @@ public:
 
     // Member Functions
 
-        //- Return name of the set of probes
-        virtual const word& name() const
-        {
-            return name_;
-        }
-
         //- Set verbosity level
         void verbose(const bool verbosity = true);
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C b/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
index c57a604e40..b2092a5915 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
@@ -106,7 +106,7 @@ Foam::label Foam::sampledSets::classifyFields()
             }
             else
             {
-                WarningIn("sampledSets::classifyFields()")
+                WarningInFunction
                     << "Cannot find field file matching "
                     << fieldSelection_[i] << endl;
             }
@@ -137,7 +137,7 @@ Foam::label Foam::sampledSets::classifyFields()
             }
             else
             {
-                WarningIn("sampledSets::classifyFields()")
+                WarningInFunction
                     << "Cannot find registered field matching "
                     << fieldSelection_[i] << endl;
             }
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index a646a8c7c3..778e273953 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,20 +155,19 @@ void Foam::sampledSets::writeSampleFile
             valueSets,
             ofs
         );
+
+        forAll(masterFields, fieldi)
+        {
+            dictionary propsDict;
+            propsDict.add("file", fName);
+            const word& fieldName = masterFields[fieldi].name();
+            setProperty(fieldName, propsDict);
+        }
     }
     else
     {
-        WarningIn
-        (
-            "void Foam::sampledSets::writeSampleFile"
-            "("
-                "const coordSet&, "
-                "const PtrList<volFieldSampler<Type> >&, "
-                "const label, "
-                "const fileName&, "
-                "const writer<Type>&"
-            ")"
-        )   << "File " << ofs.name() << " could not be opened. "
+        WarningInFunction
+            << "File " << ofs.name() << " could not be opened. "
             << "No data will be written" << endl;
     }
 }
@@ -226,10 +225,7 @@ void Foam::sampledSets::combineSampledValues
 
 
 template<class Type>
-void Foam::sampledSets::sampleAndWrite
-(
-    fieldGroup<Type>& fields
-)
+void Foam::sampledSets::sampleAndWrite(fieldGroup<Type>& fields)
 {
     if (fields.size())
     {
diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C
index 9689218ae5..650a094eb2 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,7 +217,7 @@ void Foam::uniformSet::calcSamples
     // distance vector between sampling points
     if ((nPoints_ < 2) || (mag(end_ - start_) < SMALL))
     {
-        FatalErrorIn("uniformSet::calcSamples()")
+        FatalErrorInFunction
             << "Incorrect sample specification. Either too few points or"
             << " start equals end point." << endl
             << "nPoints:" << nPoints_
@@ -276,6 +276,8 @@ void Foam::uniformSet::calcSamples
         // (or is along edge)
         // Set points and cell/face labels to empty lists
 
+        const_cast<polyMesh&>(mesh()).moving(oldMoving);
+
         return;
     }
 
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
index 2dafe3e98a..7729e3617a 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,10 +113,8 @@ void Foam::distanceSurface::createGeometry()
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "void Foam::distanceSurface::createGeometry()"
-                    )   << "getVolumeType failure, neither INSIDE or OUTSIDE"
+                    FatalErrorInFunction
+                        << "getVolumeType failure, neither INSIDE or OUTSIDE"
                         << exit(FatalError);
                 }
             }
@@ -165,10 +163,8 @@ void Foam::distanceSurface::createGeometry()
                     }
                     else
                     {
-                        FatalErrorIn
-                        (
-                            "void Foam::distanceSurface::createGeometry()"
-                        )   << "getVolumeType failure, "
+                        FatalErrorInFunction
+                            << "getVolumeType failure, "
                             << "neither INSIDE or OUTSIDE"
                             << exit(FatalError);
                     }
@@ -224,10 +220,8 @@ void Foam::distanceSurface::createGeometry()
                 }
                 else
                 {
-                    FatalErrorIn
-                    (
-                        "void Foam::distanceSurface::createGeometry()"
-                    )   << "getVolumeType failure, neither INSIDE or OUTSIDE"
+                    FatalErrorInFunction
+                        << "getVolumeType failure, neither INSIDE or OUTSIDE"
                         << exit(FatalError);
                 }
             }
@@ -278,7 +272,8 @@ void Foam::distanceSurface::createGeometry()
                 cellDistance,
                 pointDistance_,
                 distance_,
-                regularise_
+                regularise_,
+                bounds_
             )
         );
     }
@@ -291,7 +286,8 @@ void Foam::distanceSurface::createGeometry()
                 cellDistance,
                 pointDistance_,
                 distance_,
-                regularise_
+                regularise_,
+                bounds_
             )
         );
     }
@@ -336,6 +332,7 @@ Foam::distanceSurface::distanceSurface
     cell_(dict.lookupOrDefault("cell", true)),
     regularise_(dict.lookupOrDefault("regularise", true)),
     average_(dict.lookupOrDefault("average", false)),
+    bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)),
     zoneKey_(keyType::null),
     needsUpdate_(true),
     isoSurfCellPtr_(NULL),
@@ -364,7 +361,8 @@ Foam::distanceSurface::distanceSurface
     const bool signedDistance,
     const bool cell,
     const Switch regularise,
-    const Switch average
+    const Switch average,
+    const boundBox& bounds
 )
 :
     sampledSurface(name, mesh, interpolate),
@@ -390,6 +388,7 @@ Foam::distanceSurface::distanceSurface
     cell_(cell),
     regularise_(regularise),
     average_(average),
+    bounds_(bounds),
     zoneKey_(keyType::null),
     needsUpdate_(true),
     isoSurfCellPtr_(NULL),
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 73cd555e05..aa3f632511 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -75,6 +75,9 @@ class distanceSurface
         //- Whether to recalculate cell values as average of point values
         const Switch average_;
 
+        //- Optional bounding box to trim triangles against
+        const boundBox bounds_;
+
         //- If restricted to zones, name of this zone or a regular expression
         keyType zoneKey_;
 
@@ -144,7 +147,8 @@ public:
             const bool signedDistance,
             const bool cell,
             const Switch regularise,
-            const Switch average
+            const Switch average,
+            const boundBox& bounds = boundBox::greatBox
         );
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index e3105b35a5..f14b84e419 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,12 +32,36 @@ License
 #include "surfaceFields.H"
 #include "OFstream.H"
 #include "meshTools.H"
+#include "triSurfaceSearch.H"
+#include "surfaceIntersection.H"
+#include "intersectedSurface.H"
+#include "searchableBox.H"
+#include "triSurfaceMesh.H"
+#include "triPoints.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
 defineTypeNameAndDebug(isoSurface, 0);
+
+// Helper class for slicing triangles
+class storeOp
+{
+public:
+    DynamicList<triPoints>& tris_;
+
+    inline storeOp(DynamicList<triPoints>& tris)
+    :
+        tris_(tris)
+    {}
+
+    inline void operator()(const triPoints& tri)
+    {
+        tris_.append(tri);
+    }
+};
+
 }
 
 
@@ -97,10 +121,8 @@ Foam::PackedBoolList Foam::isoSurface::collocatedFaces
     }
     else
     {
-        FatalErrorIn
-        (
-            "isoSurface::collocatedFaces(const coupledPolyPatch&) const"
-        )   << "Unhandled coupledPolyPatch type " << pp.type()
+        FatalErrorInFunction
+            << "Unhandled coupledPolyPatch type " << pp.type()
             << abort(FatalError);
     }
     return collocated;
@@ -473,43 +495,6 @@ void Foam::isoSurface::calcCutTypes
 }
 
 
-// Return the two common points between two triangles
-Foam::labelPair Foam::isoSurface::findCommonPoints
-(
-    const labelledTri& tri0,
-    const labelledTri& tri1
-)
-{
-    labelPair common(-1, -1);
-
-    label fp0 = 0;
-    label fp1 = findIndex(tri1, tri0[fp0]);
-
-    if (fp1 == -1)
-    {
-        fp0 = 1;
-        fp1 = findIndex(tri1, tri0[fp0]);
-    }
-
-    if (fp1 != -1)
-    {
-        // So tri0[fp0] is tri1[fp1]
-
-        // Find next common point
-        label fp0p1 = tri0.fcIndex(fp0);
-        label fp1p1 = tri1.fcIndex(fp1);
-        label fp1m1 = tri1.rcIndex(fp1);
-
-        if (tri0[fp0p1] == tri1[fp1p1] || tri0[fp0p1] == tri1[fp1m1])
-        {
-            common[0] = tri0[fp0];
-            common[1] = tri0[fp0p1];
-        }
-    }
-    return common;
-}
-
-
 // Caculate centre of surface.
 Foam::point Foam::isoSurface::calcCentre(const triSurface& s)
 {
@@ -523,73 +508,6 @@ Foam::point Foam::isoSurface::calcCentre(const triSurface& s)
 }
 
 
-// Replace surface (localPoints, localTris) with single point. Returns
-// point. Destructs arguments.
-Foam::pointIndexHit Foam::isoSurface::collapseSurface
-(
-    pointField& localPoints,
-    DynamicList<labelledTri, 64>& localTris
-)
-{
-    pointIndexHit info(false, vector::zero, localTris.size());
-
-    if (localTris.size() == 1)
-    {
-        const labelledTri& tri = localTris[0];
-        info.setPoint(tri.centre(localPoints));
-        info.setHit();
-    }
-    else if (localTris.size() == 2)
-    {
-        // Check if the two triangles share an edge.
-        const labelledTri& tri0 = localTris[0];
-        const labelledTri& tri1 = localTris[0];
-
-        labelPair shared = findCommonPoints(tri0, tri1);
-
-        if (shared[0] != -1)
-        {
-            info.setPoint
-            (
-                0.5
-              * (
-                    tri0.centre(localPoints)
-                  + tri1.centre(localPoints)
-                )
-            );
-            info.setHit();
-        }
-    }
-    else if (localTris.size())
-    {
-        // Check if single region. Rare situation.
-        triSurface surf
-        (
-            localTris,
-            geometricSurfacePatchList(0),
-            localPoints,
-            true
-        );
-        localTris.clearStorage();
-
-        labelList faceZone;
-        label nZones = surf.markZones
-        (
-            boolList(surf.nEdges(), false),
-            faceZone
-        );
-
-        if (nZones == 1)
-        {
-            info.setPoint(calcCentre(surf));
-            info.setHit();
-        }
-    }
-
-    return info;
-}
-
-
 // Determine per cell centre whether all the intersections get collapsed
 // to a single point
 void Foam::isoSurface::calcSnappedCc
@@ -967,7 +885,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
 
     if ((triPoints.size() % 3) != 0)
     {
-        FatalErrorIn("isoSurface::stitchTriPoints(..)")
+        FatalErrorInFunction
             << "Problem: number of points " << triPoints.size()
             << " not a multiple of 3." << abort(FatalError);
     }
@@ -998,7 +916,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
 
         if (hasMerged)
         {
-            FatalErrorIn("isoSurface::stitchTriPoints(..)")
+            FatalErrorInFunction
                 << "Merged points contain duplicates"
                 << " when merging with distance " << mergeDistance_ << endl
                 << "merged:" << newPoints.size() << " re-merged:"
@@ -1115,7 +1033,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
 
                     if (f == nbrF)
                     {
-                        FatalErrorIn("validTri(const triSurface&, const label)")
+                        FatalErrorInFunction
                             << "Check : "
                             << " triangle " << faceI << " vertices " << f
                             << " fc:" << f.centre(surf.points())
@@ -1133,6 +1051,220 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
 }
 
 
+void Foam::isoSurface::trimToPlanes
+(
+    const PtrList<plane>& planes,
+    const triPointRef& tri,
+    DynamicList<point>& newTriPoints
+)
+{
+    // Buffer for generated triangles
+    DynamicList<triPoints> insideTrisA;
+    storeOp insideOpA(insideTrisA);
+
+    // Buffer for generated triangles
+    DynamicList<triPoints> insideTrisB;
+    storeOp insideOpB(insideTrisB);
+
+    triPointRef::dummyOp dop;
+
+    // Store starting triangle in insideTrisA
+    insideOpA(triPoints(tri.a(), tri.b(), tri.c()));
+
+
+    bool useA = true;
+
+    forAll(planes, faceI)
+    {
+        const plane& pl = planes[faceI];
+
+        if (useA)
+        {
+            insideOpB.tris_.clear();
+            forAll(insideOpA.tris_, i)
+            {
+                const triPoints& tri = insideOpA.tris_[i];
+                triPointRef(tri).sliceWithPlane(pl, insideOpB, dop);
+            }
+        }
+        else
+        {
+            insideOpA.tris_.clear();
+            forAll(insideOpB.tris_, i)
+            {
+                const triPoints& tri = insideOpB.tris_[i];
+                triPointRef(tri).sliceWithPlane(pl, insideOpA, dop);
+            }
+        }
+        useA = !useA;
+    }
+
+
+    // Transfer
+    if (useA)
+    {
+        forAll(insideOpA.tris_, i)
+        {
+            const triPoints& tri = insideOpA.tris_[i];
+            newTriPoints.append(tri[0]);
+            newTriPoints.append(tri[1]);
+            newTriPoints.append(tri[2]);
+        }
+    }
+    else
+    {
+        forAll(insideOpB.tris_, i)
+        {
+            const triPoints& tri = insideOpB.tris_[i];
+            newTriPoints.append(tri[0]);
+            newTriPoints.append(tri[1]);
+            newTriPoints.append(tri[2]);
+        }
+    }
+}
+
+
+void Foam::isoSurface::trimToBox
+(
+    const treeBoundBox& bb,
+    DynamicList<point>& triPoints,
+    DynamicList<label>& triMap      // trimmed to original tris
+)
+{
+    if (debug)
+    {
+        Pout<< "isoSurface : trimming to " << bb << endl;
+    }
+
+    // Generate inwards pointing planes
+    PtrList<plane> planes(6);
+    const pointField pts(bb.treeBoundBox::points());
+    forAll(treeBoundBox::faces, faceI)
+    {
+        const face& f = treeBoundBox::faces[faceI];
+        const vector& n = treeBoundBox::faceNormals[faceI];
+        planes.set(faceI, new plane(pts[f[0]], -n));
+    }
+
+    label nTris = triPoints.size()/3;
+
+    DynamicList<point> newTriPoints(triPoints.size()/16);
+    triMap.setCapacity(nTris/16);
+
+    label vertI = 0;
+    for (label triI = 0; triI < nTris; triI++)
+    {
+        const point& p0 = triPoints[vertI++];
+        const point& p1 = triPoints[vertI++];
+        const point& p2 = triPoints[vertI++];
+
+        label oldNPoints = newTriPoints.size();
+        trimToPlanes
+        (
+            planes,
+            triPointRef(p0, p1, p2),
+            newTriPoints
+        );
+
+        label nCells = (newTriPoints.size()-oldNPoints)/3;
+        for (label i = 0; i < nCells; i++)
+        {
+            triMap.append(triI);
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< "isoSurface : trimmed from " << nTris
+            << " down to " << triMap.size()
+            << " triangles." << endl;
+    }
+
+    triPoints.transfer(newTriPoints);
+}
+
+
+void Foam::isoSurface::trimToBox
+(
+    const treeBoundBox& bb,
+    DynamicList<point>& triPoints,  // new points
+    DynamicList<label>& triMap,     // map from (new) triangle to original
+    labelList& triPointMap,         // map from (new) point to original
+    labelList& interpolatedPoints,  // labels of newly introduced points
+    List<FixedList<label, 3> >& interpolatedOldPoints,// and their interpolation
+    List<FixedList<scalar, 3> >& interpolationWeights
+)
+{
+    const List<point> oldTriPoints(triPoints);
+
+    // Trim triPoints, return map
+    trimToBox(bb, triPoints, triMap);
+
+
+    // Find point correspondence:
+    // - one-to-one for preserved original points (triPointMap)
+    // - interpolation for newly introduced points
+    //   (interpolatedOldPoints)
+    label sz = oldTriPoints.size()/100;
+    DynamicList<label> dynInterpolatedPoints(sz);
+    DynamicList<FixedList<label, 3> > dynInterpolatedOldPoints(sz);
+    DynamicList<FixedList<scalar, 3> > dynInterpolationWeights(sz);
+
+
+    triPointMap.setSize(triPoints.size());
+    forAll(triMap, triI)
+    {
+        label oldTriI = triMap[triI];
+
+        // Find point correspondence. Assumes coordinate is bit-copy.
+        for (label i = 0; i < 3; i++)
+        {
+            label pointI = 3*triI+i;
+            const point& pt = triPoints[pointI];
+
+            // Compare to old-triangle's points
+            label matchPointI = -1;
+            for (label j = 0; j < 3; j++)
+            {
+                label oldPointI = 3*oldTriI+j;
+                if (pt == oldTriPoints[oldPointI])
+                {
+                    matchPointI = oldPointI;
+                    break;
+                }
+            }
+
+            triPointMap[pointI] = matchPointI;
+
+            // If new point: calculate and store interpolation
+            if (matchPointI == -1)
+            {
+                dynInterpolatedPoints.append(pointI);
+
+                FixedList<label, 3> oldPoints;
+                oldPoints[0] = 3*oldTriI;
+                oldPoints[1] = 3*oldTriI+1;
+                oldPoints[2] = 3*oldTriI+2;
+                dynInterpolatedOldPoints.append(oldPoints);
+
+                triPointRef tri(oldTriPoints, oldPoints);
+                scalarList bary;
+                tri.barycentric(pt, bary);
+                FixedList<scalar, 3> weights;
+                weights[0] = bary[0];
+                weights[1] = bary[1];
+                weights[2] = bary[2];
+                dynInterpolationWeights.append(weights);
+            }
+        }
+    }
+
+    interpolatedPoints.transfer(dynInterpolatedPoints);
+    interpolatedOldPoints.transfer(dynInterpolatedOldPoints);
+    interpolationWeights.transfer(dynInterpolationWeights);
+}
+
+
 // Does face use valid vertices?
 bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
 {
@@ -1147,7 +1279,7 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
      || (f[2] < 0) || (f[2] >= surf.points().size())
     )
     {
-        WarningIn("validTri(const triSurface&, const label)")
+        WarningInFunction
             << "triangle " << faceI << " vertices " << f
             << " uses point indices outside point range 0.."
             << surf.points().size()-1 << endl;
@@ -1157,7 +1289,7 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
 
     if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
     {
-        WarningIn("validTri(const triSurface&, const label)")
+        WarningInFunction
             << "triangle " << faceI
             << " uses non-unique vertices " << f
             << endl;
@@ -1189,7 +1321,7 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
          && ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
         )
         {
-            WarningIn("validTri(const triSurface&, const label)")
+            WarningInFunction
                 << "triangle " << faceI << " vertices " << f
                 << " fc:" << f.centre(surf.points())
                 << " has the same vertices as triangle " << nbrFaceI
@@ -1204,437 +1336,6 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
 }
 
 
-void Foam::isoSurface::calcAddressing
-(
-    const triSurface& surf,
-    List<FixedList<label, 3> >& faceEdges,
-    labelList& edgeFace0,
-    labelList& edgeFace1,
-    Map<labelList>& edgeFacesRest
-) const
-{
-    const pointField& points = surf.points();
-
-    pointField edgeCentres(3*surf.size());
-    label edgeI = 0;
-    forAll(surf, triI)
-    {
-        const labelledTri& tri = surf[triI];
-        edgeCentres[edgeI++] = 0.5*(points[tri[0]]+points[tri[1]]);
-        edgeCentres[edgeI++] = 0.5*(points[tri[1]]+points[tri[2]]);
-        edgeCentres[edgeI++] = 0.5*(points[tri[2]]+points[tri[0]]);
-    }
-
-    pointField mergedCentres;
-    labelList oldToMerged;
-    bool hasMerged = mergePoints
-    (
-        edgeCentres,
-        mergeDistance_,
-        false,
-        oldToMerged,
-        mergedCentres
-    );
-
-    if (debug)
-    {
-        Pout<< "isoSurface : detected "
-            << mergedCentres.size()
-            << " geometric edges on " << surf.size() << " triangles." << endl;
-    }
-
-    if (!hasMerged)
-    {
-        return;
-    }
-
-
-    // Determine faceEdges
-    faceEdges.setSize(surf.size());
-    edgeI = 0;
-    forAll(surf, triI)
-    {
-        faceEdges[triI][0] = oldToMerged[edgeI++];
-        faceEdges[triI][1] = oldToMerged[edgeI++];
-        faceEdges[triI][2] = oldToMerged[edgeI++];
-    }
-
-
-    // Determine edgeFaces
-    edgeFace0.setSize(mergedCentres.size());
-    edgeFace0 = -1;
-    edgeFace1.setSize(mergedCentres.size());
-    edgeFace1 = -1;
-    edgeFacesRest.clear();
-
-    // Overflow edge faces for geometric shared edges that turned
-    // out to be different anyway.
-    EdgeMap<labelList> extraEdgeFaces(mergedCentres.size()/100);
-
-    forAll(oldToMerged, oldEdgeI)
-    {
-        label triI = oldEdgeI / 3;
-        label edgeI = oldToMerged[oldEdgeI];
-
-        if (edgeFace0[edgeI] == -1)
-        {
-            // First triangle for edge
-            edgeFace0[edgeI] = triI;
-        }
-        else
-        {
-            //- Check that the two triangles actually topologically
-            //  share an edge
-            const labelledTri& prevTri = surf[edgeFace0[edgeI]];
-            const labelledTri& tri = surf[triI];
-
-            label fp = oldEdgeI % 3;
-
-            edge e(tri[fp], tri[tri.fcIndex(fp)]);
-
-            label prevTriIndex = -1;
-
-            forAll(prevTri, i)
-            {
-                if (edge(prevTri[i], prevTri[prevTri.fcIndex(i)]) == e)
-                {
-                    prevTriIndex = i;
-                    break;
-                }
-            }
-
-            if (prevTriIndex == -1)
-            {
-                // Different edge. Store for later.
-                EdgeMap<labelList>::iterator iter = extraEdgeFaces.find(e);
-
-                if (iter != extraEdgeFaces.end())
-                {
-                    labelList& eFaces = iter();
-                    label sz = eFaces.size();
-                    eFaces.setSize(sz+1);
-                    eFaces[sz] = triI;
-                }
-                else
-                {
-                    extraEdgeFaces.insert(e, labelList(1, triI));
-                }
-            }
-            else if (edgeFace1[edgeI] == -1)
-            {
-                edgeFace1[edgeI] = triI;
-            }
-            else
-            {
-                //WarningIn("orientSurface(triSurface&)")
-                //    << "Edge " << edgeI << " with centre "
-                //    << mergedCentres[edgeI]
-                //    << " used by more than two triangles: "
-                //    << edgeFace0[edgeI] << ", "
-                //    << edgeFace1[edgeI] << " and " << triI << endl;
-                Map<labelList>::iterator iter = edgeFacesRest.find(edgeI);
-
-                if (iter != edgeFacesRest.end())
-                {
-                    labelList& eFaces = iter();
-                    label sz = eFaces.size();
-                    eFaces.setSize(sz+1);
-                    eFaces[sz] = triI;
-                }
-                else
-                {
-                    edgeFacesRest.insert(edgeI, labelList(1, triI));
-                }
-            }
-        }
-    }
-
-    // Add extraEdgeFaces
-    edgeI = edgeFace0.size();
-
-    edgeFace0.setSize(edgeI + extraEdgeFaces.size());
-    edgeFace1.setSize(edgeI + extraEdgeFaces.size(), -1);
-
-    forAllConstIter(EdgeMap<labelList>, extraEdgeFaces, iter)
-    {
-        const labelList& eFaces = iter();
-
-        // The current edge will become edgeI. Replace all occurrences in
-        // faceEdges
-        forAll(eFaces, i)
-        {
-            label triI = eFaces[i];
-            const labelledTri& tri = surf[triI];
-
-            FixedList<label, 3>& fEdges = faceEdges[triI];
-            forAll(tri, fp)
-            {
-                edge e(tri[fp], tri[tri.fcIndex(fp)]);
-
-                if (e == iter.key())
-                {
-                    fEdges[fp] = edgeI;
-                    break;
-                }
-            }
-        }
-
-
-        // Add face to edgeFaces
-
-        edgeFace0[edgeI] = eFaces[0];
-
-        if (eFaces.size() >= 2)
-        {
-            edgeFace1[edgeI] = eFaces[1];
-
-            if (eFaces.size() > 2)
-            {
-                edgeFacesRest.insert
-                (
-                    edgeI,
-                    SubList<label>(eFaces, eFaces.size()-2, 2)
-                );
-            }
-        }
-
-        edgeI++;
-    }
-}
-
-
-void Foam::isoSurface::walkOrientation
-(
-    const triSurface& surf,
-    const List<FixedList<label, 3> >& faceEdges,
-    const labelList& edgeFace0,
-    const labelList& edgeFace1,
-    const label seedTriI,
-    labelList& flipState
-)
-{
-    // Do walk for consistent orientation.
-    DynamicList<label> changedFaces(surf.size());
-
-    changedFaces.append(seedTriI);
-
-    while (changedFaces.size())
-    {
-        DynamicList<label> newChangedFaces(changedFaces.size());
-
-        forAll(changedFaces, i)
-        {
-            label triI = changedFaces[i];
-            const labelledTri& tri = surf[triI];
-            const FixedList<label, 3>& fEdges = faceEdges[triI];
-
-            forAll(fEdges, fp)
-            {
-                label edgeI = fEdges[fp];
-
-                // my points:
-                label p0 = tri[fp];
-                label p1 = tri[tri.fcIndex(fp)];
-
-                label nbrI =
-                (
-                    edgeFace0[edgeI] != triI
-                  ? edgeFace0[edgeI]
-                  : edgeFace1[edgeI]
-                );
-
-                if (nbrI != -1 && flipState[nbrI] == -1)
-                {
-                    const labelledTri& nbrTri = surf[nbrI];
-
-                    // nbr points
-                    label nbrFp = findIndex(nbrTri, p0);
-
-                    if (nbrFp == -1)
-                    {
-                        FatalErrorIn("isoSurface::walkOrientation(..)")
-                            << "triI:" << triI
-                            << " tri:" << tri
-                            << " p0:" << p0
-                            << " p1:" << p1
-                            << " fEdges:" << fEdges
-                            << " edgeI:" << edgeI
-                            << " edgeFace0:" << edgeFace0[edgeI]
-                            << " edgeFace1:" << edgeFace1[edgeI]
-                            << " nbrI:" << nbrI
-                            << " nbrTri:" << nbrTri
-                            << abort(FatalError);
-                    }
-
-
-                    label nbrP1 = nbrTri[nbrTri.rcIndex(nbrFp)];
-
-                    bool sameOrientation = (p1 == nbrP1);
-
-                    if (flipState[triI] == 0)
-                    {
-                        flipState[nbrI] = (sameOrientation ? 0 : 1);
-                    }
-                    else
-                    {
-                        flipState[nbrI] = (sameOrientation ? 1 : 0);
-                    }
-                    newChangedFaces.append(nbrI);
-                }
-            }
-        }
-
-        changedFaces.transfer(newChangedFaces);
-    }
-}
-
-
-void Foam::isoSurface::orientSurface
-(
-    triSurface& surf,
-    const List<FixedList<label, 3> >& faceEdges,
-    const labelList& edgeFace0,
-    const labelList& edgeFace1,
-    const Map<labelList>& edgeFacesRest
-)
-{
-    // -1 : unvisited
-    //  0 : leave as is
-    //  1 : flip
-    labelList flipState(surf.size(), -1);
-
-    label seedTriI = 0;
-
-    while (true)
-    {
-        // Find first unvisited triangle
-        for
-        (
-            ;
-            seedTriI < surf.size() && flipState[seedTriI] != -1;
-            seedTriI++
-        )
-        {}
-
-        if (seedTriI == surf.size())
-        {
-            break;
-        }
-
-        // Note: Determine orientation of seedTriI?
-        // for now assume it is ok
-        flipState[seedTriI] = 0;
-
-        walkOrientation
-        (
-            surf,
-            faceEdges,
-            edgeFace0,
-            edgeFace1,
-            seedTriI,
-            flipState
-        );
-    }
-
-    // Do actual flipping
-    surf.clearOut();
-    forAll(surf, triI)
-    {
-        if (flipState[triI] == 1)
-        {
-            labelledTri tri(surf[triI]);
-
-            surf[triI][0] = tri[0];
-            surf[triI][1] = tri[2];
-            surf[triI][2] = tri[1];
-        }
-        else if (flipState[triI] == -1)
-        {
-            FatalErrorIn
-            (
-                "isoSurface::orientSurface(triSurface&, const label)"
-            )   << "problem" << abort(FatalError);
-        }
-    }
-}
-
-
-// Checks if triangle is connected through edgeI only.
-bool Foam::isoSurface::danglingTriangle
-(
-    const FixedList<label, 3>& fEdges,
-    const labelList& edgeFace1
-)
-{
-    label nOpen = 0;
-    forAll(fEdges, i)
-    {
-        if (edgeFace1[fEdges[i]] == -1)
-        {
-            nOpen++;
-        }
-    }
-
-    if (nOpen == 1 || nOpen == 2 || nOpen == 3)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-// Mark triangles to keep. Returns number of dangling triangles.
-Foam::label Foam::isoSurface::markDanglingTriangles
-(
-    const List<FixedList<label, 3> >& faceEdges,
-    const labelList& edgeFace0,
-    const labelList& edgeFace1,
-    const Map<labelList>& edgeFacesRest,
-    boolList& keepTriangles
-)
-{
-    keepTriangles.setSize(faceEdges.size());
-    keepTriangles = true;
-
-    label nDangling = 0;
-
-    // Remove any dangling triangles
-    forAllConstIter(Map<labelList>,  edgeFacesRest, iter)
-    {
-        // These are all the non-manifold edges. Filter out all triangles
-        // with only one connected edge (= this edge)
-
-        label edgeI = iter.key();
-        const labelList& otherEdgeFaces = iter();
-
-        // Remove all dangling triangles
-        if (danglingTriangle(faceEdges[edgeFace0[edgeI]], edgeFace1))
-        {
-            keepTriangles[edgeFace0[edgeI]] = false;
-            nDangling++;
-        }
-        if (danglingTriangle(faceEdges[edgeFace1[edgeI]], edgeFace1))
-        {
-            keepTriangles[edgeFace1[edgeI]] = false;
-            nDangling++;
-        }
-        forAll(otherEdgeFaces, i)
-        {
-            label triI = otherEdgeFaces[i];
-            if (danglingTriangle(faceEdges[triI], edgeFace1))
-            {
-                keepTriangles[triI] = false;
-                nDangling++;
-            }
-        }
-    }
-    return nDangling;
-}
-
-
 Foam::triSurface Foam::isoSurface::subsetMesh
 (
     const triSurface& s,
@@ -1715,6 +1416,7 @@ Foam::isoSurface::isoSurface
     const scalarField& pVals,
     const scalar iso,
     const bool regularise,
+    const boundBox& bounds,
     const scalar mergeTol
 )
 :
@@ -1722,6 +1424,7 @@ Foam::isoSurface::isoSurface
     pVals_(pVals),
     iso_(iso),
     regularise_(regularise),
+    bounds_(bounds),
     mergeDistance_(mergeTol*mesh_.bounds().mag())
 {
     if (debug)
@@ -1957,57 +1660,102 @@ Foam::isoSurface::isoSurface
     }
 
 
-
-    DynamicList<point> triPoints(nCutCells_);
-    DynamicList<label> triMeshCells(nCutCells_);
-
-    generateTriPoints
-    (
-        cValsPtr_(),
-        pVals_,
-
-        meshC,
-        mesh_.points(),
-
-        snappedPoints,
-        snappedCc,
-        snappedPoint,
-
-        triPoints,
-        triMeshCells
-    );
-
-    if (debug)
     {
-        Pout<< "isoSurface : generated " << triMeshCells.size()
-            << " unmerged triangles from " << triPoints.size()
-            << " unmerged points." << endl;
-    }
+        DynamicList<point> triPoints(3*nCutCells_);
+        DynamicList<label> triMeshCells(nCutCells_);
 
-
-    // Merge points and compact out non-valid triangles
-    labelList triMap;           // merged to unmerged triangle
-    triSurface::operator=
-    (
-        stitchTriPoints
+        generateTriPoints
         (
-            true,               // check for duplicate tris
-            triPoints,
-            triPointMergeMap_,  // unmerged to merged point
-            triMap
-        )
-    );
+            cValsPtr_(),
+            pVals_,
 
-    if (debug)
-    {
-        Pout<< "isoSurface : generated " << triMap.size()
-            << " merged triangles." << endl;
-    }
+            meshC,
+            mesh_.points(),
 
-    meshCells_.setSize(triMap.size());
-    forAll(triMap, i)
-    {
-        meshCells_[i] = triMeshCells[triMap[i]];
+            snappedPoints,
+            snappedCc,
+            snappedPoint,
+
+            triPoints,      // 3 points of the triangle
+            triMeshCells    // per triangle the originating cell
+        );
+
+        if (debug)
+        {
+            Pout<< "isoSurface : generated " << triMeshCells.size()
+                << " unmerged triangles from " << triPoints.size()
+                << " unmerged points." << endl;
+        }
+
+        label nOldPoints = triPoints.size();
+
+        // Trimmed to original triangle
+        DynamicList<label> trimTriMap;
+        // Trimmed to original point
+        labelList trimTriPointMap;
+        if (bounds_ != boundBox::greatBox)
+        {
+            trimToBox
+            (
+                treeBoundBox(bounds_),
+                triPoints,              // new points
+                trimTriMap,             // map from (new) triangle to original
+                trimTriPointMap,        // map from (new) point to original
+                interpolatedPoints_,    // labels of newly introduced points
+                interpolatedOldPoints_, // and their interpolation
+                interpolationWeights_
+            );
+            triMeshCells = labelField(triMeshCells, trimTriMap);
+        }
+
+
+        // Merge points and compact out non-valid triangles
+        labelList triMap;           // merged to unmerged triangle
+        triSurface::operator=
+        (
+            stitchTriPoints
+            (
+                true,               // check for duplicate tris
+                triPoints,
+                triPointMergeMap_,  // unmerged to merged point
+                triMap
+            )
+        );
+
+        if (debug)
+        {
+            Pout<< "isoSurface : generated " << triMap.size()
+                << " merged triangles." << endl;
+        }
+
+
+        if (bounds_ != boundBox::greatBox)
+        {
+            // Adjust interpolatedPoints_
+            inplaceRenumber(triPointMergeMap_, interpolatedPoints_);
+
+            // Adjust triPointMergeMap_
+            labelList newTriPointMergeMap(nOldPoints, -1);
+            forAll(trimTriPointMap, trimPointI)
+            {
+                label oldPointI = trimTriPointMap[trimPointI];
+                if (oldPointI >= 0)
+                {
+                    label pointI = triPointMergeMap_[trimPointI];
+                    if (pointI >= 0)
+                    {
+                        newTriPointMergeMap[oldPointI] = pointI;
+                    }
+                }
+            }
+            triPointMergeMap_.transfer(newTriPointMergeMap);
+        }
+
+        meshCells_.setSize(triMap.size());
+        forAll(triMap, i)
+        {
+            meshCells_[i] = triMeshCells[triMap[i]];
+        }
     }
 
     if (debug)
@@ -2020,75 +1768,7 @@ Foam::isoSurface::isoSurface
             // Copied from surfaceCheck
             validTri(*this, triI);
         }
-    }
 
-
-    if (false)
-    {
-        List<FixedList<label, 3> > faceEdges;
-        labelList edgeFace0, edgeFace1;
-        Map<labelList> edgeFacesRest;
-
-
-        while (true)
-        {
-            // Calculate addressing
-            calcAddressing
-            (
-                *this,
-                faceEdges,
-                edgeFace0,
-                edgeFace1,
-                edgeFacesRest
-            );
-
-            // See if any dangling triangles
-            boolList keepTriangles;
-            label nDangling = markDanglingTriangles
-            (
-                faceEdges,
-                edgeFace0,
-                edgeFace1,
-                edgeFacesRest,
-                keepTriangles
-            );
-
-            if (debug)
-            {
-                Pout<< "isoSurface : detected " << nDangling
-                    << " dangling triangles." << endl;
-            }
-
-            if (nDangling == 0)
-            {
-                break;
-            }
-
-            // Create face map (new to old)
-            labelList subsetTriMap(findIndices(keepTriangles, true));
-
-            labelList subsetPointMap;
-            labelList reversePointMap;
-            triSurface::operator=
-            (
-                subsetMesh
-                (
-                    *this,
-                    subsetTriMap,
-                    reversePointMap,
-                    subsetPointMap
-                )
-            );
-            meshCells_ = labelField(meshCells_, subsetTriMap);
-            inplaceRenumber(reversePointMap, triPointMergeMap_);
-        }
-
-        orientSurface(*this, faceEdges, edgeFace0, edgeFace1, edgeFacesRest);
-    }
-
-
-    if (debug)
-    {
         fileName stlFile = mesh_.time().path() + ".stl";
         Pout<< "Dumping surface to " << stlFile << endl;
         triSurface::write(stlFile);
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 9f6dc7d76e..c74586a2ce 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,8 @@ namespace Foam
 {
 
 class fvMesh;
+class plane;
+class treeBoundBox;
 
 /*---------------------------------------------------------------------------*\
                        Class isoSurface Declaration
@@ -116,10 +118,12 @@ class isoSurface
         //- Regularise?
         const Switch regularise_;
 
+        //- Optional bounds
+        const boundBox bounds_;
+
         //- When to merge points
         const scalar mergeDistance_;
 
-
         //- Whether face might be cut
         List<cellCutType> faceCutType_;
 
@@ -135,6 +139,15 @@ class isoSurface
         //- For every unmerged triangle point the point in the triSurface
         labelList triPointMergeMap_;
 
+        //- triSurface points that have weighted interpolation
+        DynamicList<label> interpolatedPoints_;
+
+        //- corresponding original, unmerged points
+        DynamicList<FixedList<label, 3> > interpolatedOldPoints_;
+
+        //- corresponding weights
+        DynamicList<FixedList<scalar, 3> > interpolationWeights_;
+
 
     // Private Member Functions
 
@@ -193,20 +206,8 @@ class isoSurface
             const scalarField& pVals
         );
 
-        static labelPair findCommonPoints
-        (
-            const labelledTri&,
-            const labelledTri&
-        );
-
         static point calcCentre(const triSurface&);
 
-        static pointIndexHit collapseSurface
-        (
-            pointField& localPoints,
-            DynamicList<labelledTri, 64>& localTris
-        );
-
         //- Determine per cc whether all near cuts can be snapped to single
         //  point.
         void calcSnappedCc
@@ -323,6 +324,17 @@ class isoSurface
             DynamicList<label>& triMeshCells
         ) const;
 
+        template<class Type>
+        static tmp<Field<Type> > interpolate
+        (
+            const label nPoints,
+            const labelList& triPointMergeMap,
+            const labelList& interpolatedPoints,
+            const List<FixedList<label, 3> >& interpolatedOldPoints,
+            const List<FixedList<scalar, 3> >& interpolationWeights,
+            const DynamicList<Type>& unmergedValues
+        );
+
         triSurface stitchTriPoints
         (
             const bool checkDuplicates,
@@ -331,57 +343,38 @@ class isoSurface
             labelList& triMap               // merged to unmerged triangle
         ) const;
 
+        //- Trim triangle to planes
+        static void trimToPlanes
+        (
+            const PtrList<plane>& planes,
+            const triPointRef& tri,
+            DynamicList<point>& newTriPoints
+        );
+
+        //- Trim all triangles to box
+        static void trimToBox
+        (
+            const treeBoundBox& bb,
+            DynamicList<point>& triPoints,
+            DynamicList<label>& triMeshCells
+        );
+
+        //- Trim all triangles to box. Determine interpolation
+        //  for existing and new points
+        static void trimToBox
+        (
+            const treeBoundBox& bb,
+            DynamicList<point>& triPoints,
+            DynamicList<label>& triMap,
+            labelList& triPointMap,
+            labelList& interpolatedPoints,
+            List<FixedList<label, 3> >& interpolatedOldPoints,
+            List<FixedList<scalar, 3> >& interpolationWeights
+        );
+
         //- Check single triangle for (topological) validity
         static bool validTri(const triSurface&, const label);
 
-        //- Determine edge-face addressing
-        void calcAddressing
-        (
-            const triSurface& surf,
-            List<FixedList<label, 3> >& faceEdges,
-            labelList& edgeFace0,
-            labelList& edgeFace1,
-            Map<labelList>& edgeFacesRest
-        ) const;
-
-        //- Determine orientation
-        static void walkOrientation
-        (
-            const triSurface& surf,
-            const List<FixedList<label, 3> >& faceEdges,
-            const labelList& edgeFace0,
-            const labelList& edgeFace1,
-            const label seedTriI,
-            labelList& flipState
-        );
-
-        //- Orient surface
-        static void orientSurface
-        (
-            triSurface&,
-            const List<FixedList<label, 3> >& faceEdges,
-            const labelList& edgeFace0,
-            const labelList& edgeFace1,
-            const Map<labelList>& edgeFacesRest
-        );
-
-        //- Is triangle (given by 3 edges) not fully connected?
-        static bool danglingTriangle
-        (
-            const FixedList<label, 3>& fEdges,
-            const labelList& edgeFace1
-        );
-
-        //- Mark all non-fully connected triangles
-        static label markDanglingTriangles
-        (
-            const List<FixedList<label, 3> >& faceEdges,
-            const labelList& edgeFace0,
-            const labelList& edgeFace1,
-            const Map<labelList>& edgeFacesRest,
-            boolList& keepTriangles
-        );
-
         static triSurface subsetMesh
         (
             const triSurface& s,
@@ -392,6 +385,10 @@ class isoSurface
 
 public:
 
+    //- Declare friendship with isoSurfaceCell to share some functionality
+    friend class isoSurfaceCell;
+
+
     //- Runtime type information
     TypeName("isoSurface");
 
@@ -407,24 +404,19 @@ public:
             const scalarField& pointIsoVals,
             const scalar iso,
             const bool regularise,
+            const boundBox& bounds = boundBox::greatBox,
             const scalar mergeTol = 1e-6    // fraction of bounding box
         );
 
 
     // Member Functions
 
-        //- For every face original cell in mesh
+        //- For every triangle the original cell in mesh
         const labelList& meshCells() const
         {
             return meshCells_;
         }
 
-        //- For every unmerged triangle point the point in the triSurface
-        const labelList& triPointMergeMap() const
-        {
-            return triPointMergeMap_;
-        }
-
         //- Interpolates cCoords,pCoords. Uses the references to the original
         //  fields used to create the iso surface.
         template<class Type>
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 8123541ebe..0ce6bbf78b 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,6 +30,9 @@ License
 #include "tetMatcher.H"
 #include "syncTools.H"
 #include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+#include "triPoints.H"
+#include "isoSurface.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -917,7 +920,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
 
     if ((triPoints.size() % 3) != 0)
     {
-        FatalErrorIn("isoSurfaceCell::stitchTriPoints(..)")
+        FatalErrorInFunction
             << "Problem: number of points " << triPoints.size()
             << " not a multiple of 3." << abort(FatalError);
     }
@@ -951,7 +954,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
 
         if (hasMerged)
         {
-            FatalErrorIn("isoSurfaceCell::stitchTriPoints(..)")
+            FatalErrorInFunction
                 << "Merged points contain duplicates"
                 << " when merging with distance " << mergeDistance_ << endl
                 << "merged:" << newPoints.size() << " re-merged:"
@@ -1064,7 +1067,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
     {
         if (f[fp] < 0 || f[fp] >= surf.points().size())
         {
-            WarningIn("validTri(const triSurface&, const label)")
+            WarningInFunction
                 << "triangle " << faceI << " vertices " << f
                 << " uses point indices outside point range 0.."
                 << surf.points().size()-1 << endl;
@@ -1075,7 +1078,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
 
     if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
     {
-        WarningIn("validTri(const triSurface&, const label)")
+        WarningInFunction
             << "triangle " << faceI
             << " uses non-unique vertices " << f
             << endl;
@@ -1107,7 +1110,7 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
          && ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
         )
         {
-            WarningIn("validTri(const triSurface&, const label)")
+            WarningInFunction
                 << "triangle " << faceI << " vertices " << f
                 << " coords:" << f.points(surf.points())
                 << " has the same vertices as triangle " << nbrFaceI
@@ -1199,7 +1202,7 @@ void Foam::isoSurfaceCell::calcAddressing
         }
         else
         {
-            //WarningIn("orientSurface(triSurface&)")
+            //WarningInFunction
             //    << "Edge " << edgeI << " with centre " << mergedCentres[edgeI]
             //    << " used by more than two triangles: " << edgeFace0[edgeI]
             //    << ", "
@@ -1222,144 +1225,6 @@ void Foam::isoSurfaceCell::calcAddressing
 }
 
 
-//void Foam::isoSurfaceCell::walkOrientation
-//(
-//    const triSurface& surf,
-//    const List<FixedList<label, 3> >& faceEdges,
-//    const labelList& edgeFace0,
-//    const labelList& edgeFace1,
-//    const label seedTriI,
-//    labelList& flipState
-//)
-//{
-//    // Do walk for consistent orientation.
-//    DynamicList<label> changedFaces(surf.size());
-//
-//    changedFaces.append(seedTriI);
-//
-//    while (changedFaces.size())
-//    {
-//        DynamicList<label> newChangedFaces(changedFaces.size());
-//
-//        forAll(changedFaces, i)
-//        {
-//            label triI = changedFaces[i];
-//            const labelledTri& tri = surf[triI];
-//            const FixedList<label, 3>& fEdges = faceEdges[triI];
-//
-//            forAll(fEdges, fp)
-//            {
-//                label edgeI = fEdges[fp];
-//
-//                // my points:
-//                label p0 = tri[fp];
-//                label p1 = tri[tri.fcIndex(fp)];
-//
-//                label nbrI =
-//                (
-//                    edgeFace0[edgeI] != triI
-//                  ? edgeFace0[edgeI]
-//                  : edgeFace1[edgeI]
-//                );
-//
-//                if (nbrI != -1 && flipState[nbrI] == -1)
-//                {
-//                    const labelledTri& nbrTri = surf[nbrI];
-//
-//                    // nbr points
-//                    label nbrFp = findIndex(nbrTri, p0);
-//                    label nbrP1 = nbrTri[nbrTri.rcIndex(nbrFp)];
-//
-//                    bool sameOrientation = (p1 == nbrP1);
-//
-//                    if (flipState[triI] == 0)
-//                    {
-//                        flipState[nbrI] = (sameOrientation ? 0 : 1);
-//                    }
-//                    else
-//                    {
-//                        flipState[nbrI] = (sameOrientation ? 1 : 0);
-//                    }
-//                    newChangedFaces.append(nbrI);
-//                }
-//            }
-//        }
-//
-//        changedFaces.transfer(newChangedFaces);
-//    }
-//}
-//
-//
-//void Foam::isoSurfaceCell::orientSurface
-//(
-//    triSurface& surf,
-//    const List<FixedList<label, 3> >& faceEdges,
-//    const labelList& edgeFace0,
-//    const labelList& edgeFace1,
-//    const Map<labelList>& edgeFacesRest
-//)
-//{
-//    // -1 : unvisited
-//    //  0 : leave as is
-//    //  1 : flip
-//    labelList flipState(surf.size(), -1);
-//
-//    label seedTriI = 0;
-//
-//    while (true)
-//    {
-//        // Find first unvisited triangle
-//        for
-//        (
-//            ;
-//            seedTriI < surf.size() && flipState[seedTriI] != -1;
-//            seedTriI++
-//        )
-//        {}
-//
-//        if (seedTriI == surf.size())
-//        {
-//            break;
-//        }
-//
-//        // Note: Determine orientation of seedTriI?
-//        // for now assume it is ok
-//        flipState[seedTriI] = 0;
-//
-//        walkOrientation
-//        (
-//            surf,
-//            faceEdges,
-//            edgeFace0,
-//            edgeFace1,
-//            seedTriI,
-//            flipState
-//        );
-//    }
-//
-//    // Do actual flipping
-//    surf.clearOut();
-//    forAll(surf, triI)
-//    {
-//        if (flipState[triI] == 1)
-//        {
-//            labelledTri tri(surf[triI]);
-//
-//            surf[triI][0] = tri[0];
-//            surf[triI][1] = tri[2];
-//            surf[triI][2] = tri[1];
-//        }
-//        else if (flipState[triI] == -1)
-//        {
-//            FatalErrorIn
-//            (
-//                "isoSurfaceCell::orientSurface(triSurface&, const label)"
-//            )   << "problem" << abort(FatalError);
-//        }
-//    }
-//}
-
-
 // Checks if triangle is connected through edgeI only.
 bool Foam::isoSurfaceCell::danglingTriangle
 (
@@ -1517,6 +1382,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
     const scalarField& pVals,
     const scalar iso,
     const bool regularise,
+    const boundBox& bounds,
     const scalar mergeTol
 )
 :
@@ -1524,6 +1390,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
     cVals_(cVals),
     pVals_(pVals),
     iso_(iso),
+    bounds_(bounds),
     mergeDistance_(mergeTol*mesh.bounds().mag())
 {
     if (debug)
@@ -1607,56 +1474,104 @@ Foam::isoSurfaceCell::isoSurfaceCell
     }
 
 
-
-    DynamicList<point> triPoints(nCutCells_);
-    DynamicList<label> triMeshCells(nCutCells_);
-
-    generateTriPoints
-    (
-        cVals,
-        pVals,
-
-        mesh_.cellCentres(),
-        mesh_.points(),
-
-        snappedPoints,
-        snappedCc,
-        snappedPoint,
-
-        triPoints,
-        triMeshCells
-    );
-
-    if (debug)
     {
-        Pout<< "isoSurfaceCell : generated " << triMeshCells.size()
-            << " unmerged triangles." << endl;
-    }
+        DynamicList<point> triPoints(nCutCells_);
+        DynamicList<label> triMeshCells(nCutCells_);
 
-    // Merge points and compact out non-valid triangles
-    labelList triMap;           // merged to unmerged triangle
-    triSurface::operator=
-    (
-        stitchTriPoints
+        generateTriPoints
         (
-            regularise,         // check for duplicate tris
+            cVals,
+            pVals,
+
+            mesh_.cellCentres(),
+            mesh_.points(),
+
+            snappedPoints,
+            snappedCc,
+            snappedPoint,
+
             triPoints,
-            triPointMergeMap_,  // unmerged to merged point
-            triMap
-        )
-    );
+            triMeshCells
+        );
 
-    if (debug)
-    {
-        Pout<< "isoSurfaceCell : generated " << triMap.size()
-            << " merged triangles." << endl;
+        if (debug)
+        {
+            Pout<< "isoSurfaceCell : generated " << triMeshCells.size()
+                << " unmerged triangles." << endl;
+        }
+
+
+        label nOldPoints = triPoints.size();
+
+        // Trimmed to original triangle
+        DynamicList<label> trimTriMap;
+        // Trimmed to original point
+        labelList trimTriPointMap;
+        if (bounds_ != boundBox::greatBox)
+        {
+            isoSurface::trimToBox
+            (
+                treeBoundBox(bounds_),
+                triPoints,              // new points
+                trimTriMap,             // map from (new) triangle to original
+                trimTriPointMap,        // map from (new) point to original
+                interpolatedPoints_,    // labels of newly introduced points
+                interpolatedOldPoints_, // and their interpolation
+                interpolationWeights_
+            );
+            triMeshCells = labelField(triMeshCells, trimTriMap);
+        }
+
+
+
+        // Merge points and compact out non-valid triangles
+        labelList triMap;
+        triSurface::operator=
+        (
+            stitchTriPoints
+            (
+                regularise,         // check for duplicate tris
+                triPoints,
+                triPointMergeMap_,  // unmerged to merged point
+                triMap              // merged to unmerged triangle
+            )
+        );
+
+        if (debug)
+        {
+            Pout<< "isoSurfaceCell : generated " << triMap.size()
+                << " merged triangles." << endl;
+        }
+
+        if (bounds_ != boundBox::greatBox)
+        {
+            // Adjust interpolatedPoints_
+            inplaceRenumber(triPointMergeMap_, interpolatedPoints_);
+
+            // Adjust triPointMergeMap_
+            labelList newTriPointMergeMap(nOldPoints, -1);
+            forAll(trimTriPointMap, trimPointI)
+            {
+                label oldPointI = trimTriPointMap[trimPointI];
+                if (oldPointI >= 0)
+                {
+                    label pointI = triPointMergeMap_[trimPointI];
+                    if (pointI >= 0)
+                    {
+                        newTriPointMergeMap[oldPointI] = pointI;
+                    }
+                }
+            }
+            triPointMergeMap_.transfer(newTriPointMergeMap);
+        }
+
+        meshCells_.setSize(triMap.size());
+        forAll(triMap, i)
+        {
+            meshCells_[i] = triMeshCells[triMap[i]];
+        }
     }
 
-    meshCells_.setSize(triMap.size());
-    forAll(triMap, i)
-    {
-        meshCells_[i] = triMeshCells[triMap[i]];
-    }
 
     if (debug)
     {
@@ -1730,8 +1645,6 @@ Foam::isoSurfaceCell::isoSurfaceCell
             meshCells_ = labelField(meshCells_, subsetTriMap);
             inplaceRenumber(reversePointMap, triPointMergeMap_);
         }
-
-        //orientSurface(*this, faceEdges, edgeFace0, edgeFace1, edgeFacesRest);
     }
 }
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 7e12efc7bb..910f3fe46e 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,7 @@ SourceFiles
 #include "labelPair.H"
 #include "pointIndexHit.H"
 #include "PackedBoolList.H"
+#include "boundBox.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,6 +56,7 @@ namespace Foam
 {
 
 class polyMesh;
+class plane;
 
 /*---------------------------------------------------------------------------*\
                        Class isoSurfaceCell Declaration
@@ -91,6 +93,9 @@ class isoSurfaceCell
         //- isoSurfaceCell value
         const scalar iso_;
 
+        //- Optional bounds
+        const boundBox bounds_;
+
         //- When to merge points
         const scalar mergeDistance_;
 
@@ -106,6 +111,15 @@ class isoSurfaceCell
         //- For every unmerged triangle point the point in the triSurface
         labelList triPointMergeMap_;
 
+        //- triSurface points that have weighted interpolation
+        DynamicList<label> interpolatedPoints_;
+
+        //- corresponding original, unmerged points
+        DynamicList<FixedList<label, 3> > interpolatedOldPoints_;
+
+        //- corresponding weights
+        DynamicList<FixedList<scalar, 3> > interpolationWeights_;
+
 
     // Private Member Functions
 
@@ -214,19 +228,15 @@ class isoSurfaceCell
         void generateTriPoints
         (
             const DynamicList<Type>& snapped,
-            const scalar isoVal0,
             const scalar s0,
             const Type& p0,
             const label p0Index,
-            const scalar isoVal1,
             const scalar s1,
             const Type& p1,
             const label p1Index,
-            const scalar isoVal2,
             const scalar s2,
             const Type& p2,
             const label p2Index,
-            const scalar isoVal3,
             const scalar s3,
             const Type& p3,
             const label p3Index,
@@ -271,27 +281,6 @@ class isoSurfaceCell
             Map<labelList>& edgeFacesRest
         ) const;
 
-        ////- Determine orientation
-        //static void walkOrientation
-        //(
-        //    const triSurface& surf,
-        //    const List<FixedList<label, 3> >& faceEdges,
-        //    const labelList& edgeFace0,
-        //    const labelList& edgeFace1,
-        //    const label seedTriI,
-        //    labelList& flipState
-        //);
-
-        ////- Orient surface
-        //static void orientSurface
-        //(
-        //    triSurface&,
-        //    const List<FixedList<label, 3> >& faceEdges,
-        //    const labelList& edgeFace0,
-        //    const labelList& edgeFace1,
-        //    const Map<labelList>& edgeFacesRest
-        //);
-
         //- Is triangle (given by 3 edges) not fully connected?
         static bool danglingTriangle
         (
@@ -317,8 +306,6 @@ class isoSurfaceCell
             labelList& newToOldPoints
         );
 
-        //- Combine all triangles inside a cell into a minimal triangulation
-        void combineCellTriangles();
 
 public:
 
@@ -336,6 +323,7 @@ public:
             const scalarField& pointValues,
             const scalar iso,
             const bool regularise,
+            const boundBox& bounds = boundBox::greatBox,
             const scalar mergeTol = 1e-6    // fraction of bounding box
         );
 
@@ -348,24 +336,6 @@ public:
             return meshCells_;
         }
 
-        //- For every unmerged triangle point the point in the triSurface
-        const labelList triPointMergeMap() const
-        {
-            return triPointMergeMap_;
-        }
-
-
-        //- Interpolates cCoords,pCoords. Takes the original fields
-        //  used to create the iso surface.
-        template<class Type>
-        tmp<Field<Type> > interpolate
-        (
-            const scalarField& cVals,
-            const scalarField& pVals,
-            const Field<Type>& cCoords,
-            const Field<Type>& pCoords
-        ) const;
-
         //- Interpolates cCoords,pCoords.
         template<class Type>
         tmp<Field<Type> > interpolate
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
index c78aafeee5..a59f44022a 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
@@ -26,6 +26,7 @@ License
 #include "isoSurfaceCell.H"
 #include "polyMesh.H"
 #include "tetMatcher.H"
+#include "isoSurface.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -76,22 +77,18 @@ void Foam::isoSurfaceCell::generateTriPoints
 (
     const DynamicList<Type>& snapped,
 
-    const scalar isoVal0,
     const scalar s0,
     const Type& p0,
     const label p0Index,
 
-    const scalar isoVal1,
     const scalar s1,
     const Type& p1,
     const label p1Index,
 
-    const scalar isoVal2,
     const scalar s2,
     const Type& p2,
     const label p2Index,
 
-    const scalar isoVal3,
     const scalar s3,
     const Type& p3,
     const label p3Index,
@@ -124,160 +121,196 @@ void Foam::isoSurfaceCell::generateTriPoints
         case 0x0F:
         break;
 
-        case 0x0E:
         case 0x01:
+        case 0x0E:
         {
-            // 0 is common point. Orient such that normal points in positive
-            // gradient direction
-            if (isoVal0 >= isoVal1)
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index)
+            );
+            if (triIndex == 0x0E)
             {
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0D:
         case 0x02:
+        case 0x0D:
         {
-            // 1 is common point
-            if (isoVal1 >= isoVal0)
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s0,p0,p0Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index)
+            );
+
+            if (triIndex == 0x0D)
             {
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0C:
         case 0x03:
+        case 0x0C:
         {
-            Type s02 = generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index);
-            Type s13 = generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index);
+            Type p0p2 =
+                generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index);
+            Type p1p3 =
+                generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index);
 
-            if (isoVal0 >= isoVal3)
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index)
+            );
+            pts.append(p1p3);
+            pts.append(p0p2);
+
+            pts.append(p1p3);
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index)
+            );
+            pts.append(p0p2);
+
+            if (triIndex == 0x0C)
             {
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(s02);
-                pts.append(s13);
-                pts.append(s13);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s02);
-            }
-            else
-            {
-                pts.append(s02);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(s13);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s13);
-                pts.append(s02);
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-5], pts[sz-4]);
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0B:
         case 0x04:
+        case 0x0B:
         {
-            // 2 is common point
-            if (isoVal2 >= isoVal0)
+            pts.append
+            (
+                generatePoint(snapped,s2,p2,p2Index,s0,p0,p0Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s2,p2,p2Index,s1,p1,p1Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index)
+            );
+
+            if (triIndex == 0x0B)
             {
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s1,p1,p1Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x0A:
         case 0x05:
+        case 0x0A:
         {
-            Type s01 = generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
-            Type s23 = generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
+            Type p0p1 =
+                generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
+            Type p2p3 =
+                generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
 
-            if (isoVal3 >= isoVal0)
+            pts.append(p0p1);
+            pts.append(p2p3);
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index)
+            );
+
+            pts.append(p0p1);
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index)
+            );
+            pts.append(p2p3);
+
+            if (triIndex == 0x0A)
             {
-                pts.append(s01);
-                pts.append(s23);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s23);
-            }
-            else
-            {
-                pts.append(s23);
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s3,p3,p3Index));
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s2,p2,p2Index));
-                pts.append(s01);
-                pts.append(s23);
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-5], pts[sz-4]);
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x09:
         case 0x06:
+        case 0x09:
         {
-            Type s01 = generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
-            Type s23 = generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
+            Type p0p1 =
+                generatePoint(snapped,s0,p0,p0Index,s1,p1,p1Index);
+            Type p2p3 =
+                generatePoint(snapped,s2,p2,p2Index,s3,p3,p3Index);
 
-            if (isoVal3 >= isoVal1)
+            pts.append(p0p1);
+            pts.append
+            (
+                generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index)
+            );
+            pts.append(p2p3);
+
+            pts.append(p0p1);
+            pts.append(p2p3);
+            pts.append
+            (
+                generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index)
+            );
+
+            if (triIndex == 0x09)
             {
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(s23);
-                pts.append(s01);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(s23);
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s1,p1,p1Index,s3,p3,p3Index));
-                pts.append(s01);
-                pts.append(s23);
-                pts.append(generatePoint(snapped,s0,p0,p0Index,s2,p2,p2Index));
-                pts.append(s01);
-                pts.append(s23);
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-5], pts[sz-4]);
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
 
-        case 0x07:
         case 0x08:
+        case 0x07:
         {
-            // 3 is common point
-            if (isoVal3 >= isoVal0)
+            pts.append
+            (
+                generatePoint(snapped,s3,p3,p3Index,s0,p0,p0Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s3,p3,p3Index,s2,p2,p2Index)
+            );
+            pts.append
+            (
+                generatePoint(snapped,s3,p3,p3Index,s1,p1,p1Index)
+            );
+            if (triIndex == 0x07)
             {
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s1,p1,p1Index));
-            }
-            else
-            {
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s2,p2,p2Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s0,p0,p0Index));
-                pts.append(generatePoint(snapped,s3,p3,p3Index,s1,p1,p1Index));
+                // Flip normals
+                label sz = pts.size();
+                Swap(pts[sz-2], pts[sz-1]);
             }
         }
         break;
@@ -341,22 +374,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                     (
                         snappedPoints,
 
-                        pVals_[f0[1]],
                         pVals[f0[1]],
                         pCoords[f0[1]],
                         snappedPoint[f0[1]],
 
-                        pVals_[f0[0]],
                         pVals[f0[0]],
                         pCoords[f0[0]],
                         snappedPoint[f0[0]],
 
-                        pVals_[f0[2]],
                         pVals[f0[2]],
                         pCoords[f0[2]],
                         snappedPoint[f0[2]],
 
-                        pVals_[oppositeI],
                         pVals[oppositeI],
                         pCoords[oppositeI],
                         snappedPoint[oppositeI],
@@ -370,22 +399,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                     (
                         snappedPoints,
 
-                        pVals_[f0[0]],
                         pVals[f0[0]],
                         pCoords[f0[0]],
                         snappedPoint[f0[0]],
 
-                        pVals_[f0[1]],
                         pVals[f0[1]],
                         pCoords[f0[1]],
                         snappedPoint[f0[1]],
 
-                        pVals_[f0[2]],
                         pVals[f0[2]],
                         pCoords[f0[2]],
                         snappedPoint[f0[2]],
 
-                        pVals_[oppositeI],
                         pVals[oppositeI],
                         pCoords[oppositeI],
                         snappedPoint[oppositeI],
@@ -411,7 +436,6 @@ void Foam::isoSurfaceCell::generateTriPoints
                     }
 
                     label fp = f.fcIndex(fp0);
-
                     for (label i = 2; i < f.size(); i++)
                     {
                         label nextFp = f.fcIndex(fp);
@@ -425,22 +449,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                             (
                                 snappedPoints,
 
-                                pVals_[tri[1]],
                                 pVals[tri[1]],
                                 pCoords[tri[1]],
                                 snappedPoint[tri[1]],
 
-                                pVals_[tri[0]],
                                 pVals[tri[0]],
                                 pCoords[tri[0]],
                                 snappedPoint[tri[0]],
 
-                                pVals_[tri[2]],
                                 pVals[tri[2]],
                                 pCoords[tri[2]],
                                 snappedPoint[tri[2]],
 
-                                cVals_[cellI],
                                 cVals[cellI],
                                 cCoords[cellI],
                                 snappedCc[cellI],
@@ -454,22 +474,18 @@ void Foam::isoSurfaceCell::generateTriPoints
                             (
                                 snappedPoints,
 
-                                pVals_[tri[0]],
                                 pVals[tri[0]],
                                 pCoords[tri[0]],
                                 snappedPoint[tri[0]],
 
-                                pVals_[tri[1]],
                                 pVals[tri[1]],
                                 pCoords[tri[1]],
                                 snappedPoint[tri[1]],
 
-                                pVals_[tri[2]],
                                 pVals[tri[2]],
                                 pCoords[tri[2]],
                                 snappedPoint[tri[2]],
 
-                                cVals_[cellI],
                                 cVals[cellI],
                                 cCoords[cellI],
                                 snappedCc[cellI],
@@ -495,7 +511,7 @@ void Foam::isoSurfaceCell::generateTriPoints
 
     if (countNotFoundTets > 0)
     {
-        WarningIn("Foam::isoSurfaceCell::generateTriPoints")
+        WarningInFunction
             << "Could not find " << countNotFoundTets
             << " tet base points, which may lead to inverted triangles."
             << endl;
@@ -510,13 +526,11 @@ template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::isoSurfaceCell::interpolate
 (
-    const scalarField& cVals,
-    const scalarField& pVals,
     const Field<Type>& cCoords,
     const Field<Type>& pCoords
 ) const
 {
-    DynamicList<Type> triPoints(nCutCells_);
+    DynamicList<Type> triPoints(3*nCutCells_);
     DynamicList<label> triMeshCells(nCutCells_);
 
     // Dummy snap data
@@ -524,59 +538,6 @@ Foam::isoSurfaceCell::interpolate
     labelList snappedCc(mesh_.nCells(), -1);
     labelList snappedPoint(mesh_.nPoints(), -1);
 
-
-    generateTriPoints
-    (
-        cVals,
-        pVals,
-
-        cCoords,
-        pCoords,
-
-        snappedPoints,
-        snappedCc,
-        snappedPoint,
-
-        triPoints,
-        triMeshCells
-    );
-
-
-    // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
-
-    forAll(triPoints, i)
-    {
-        label mergedPointI = triPointMergeMap_[i];
-
-        if (mergedPointI >= 0)
-        {
-            values[mergedPointI] = triPoints[i];
-        }
-    }
-
-    return tvalues;
-}
-
-
-template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::isoSurfaceCell::interpolate
-(
-    const Field<Type>& cCoords,
-    const Field<Type>& pCoords
-) const
-{
-    DynamicList<Type> triPoints(nCutCells_);
-    DynamicList<label> triMeshCells(nCutCells_);
-
-    // Dummy snap data
-    DynamicList<Type> snappedPoints;
-    labelList snappedCc(mesh_.nCells(), -1);
-    labelList snappedPoint(mesh_.nPoints(), -1);
-
-
     generateTriPoints
     (
         cVals_,
@@ -593,22 +554,15 @@ Foam::isoSurfaceCell::interpolate
         triMeshCells
     );
 
-
-    // One value per point
-    tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
-    Field<Type>& values = tvalues();
-
-    forAll(triPoints, i)
-    {
-        label mergedPointI = triPointMergeMap_[i];
-
-        if (mergedPointI >= 0)
-        {
-            values[mergedPointI] = triPoints[i];
-        }
-    }
-
-    return tvalues;
+    return isoSurface::interpolate
+    (
+        points().size(),
+        triPointMergeMap_,
+        interpolatedPoints_,
+        interpolatedOldPoints_,
+        interpolationWeights_,
+        triPoints
+    );
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 6f64c9fe54..2db94efe54 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,7 +120,7 @@ Foam::isoSurface::adaptPatchFields
         {
             fvPatchField<Type>& pfld = const_cast<fvPatchField<Type>&>
             (
-                fld.boundaryField()[patchI]
+                sliceFld.boundaryField()[patchI]
             );
 
             const scalarField& w = mesh.weights().boundaryField()[patchI];
@@ -189,6 +189,8 @@ Type Foam::isoSurface::generatePoint
 }
 
 
+// Note: cannot use simpler isoSurfaceCell::generateTriPoints since
+//       the need here to sometimes pass in remote 'snappedPoints'
 template<class Type>
 void Foam::isoSurface::generateTriPoints
 (
@@ -240,8 +242,8 @@ void Foam::isoSurface::generateTriPoints
         case 0x0F:
         break;
 
-        case 0x0E:
         case 0x01:
+        case 0x0E:
             points.append
             (
                 generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1)
@@ -254,10 +256,16 @@ void Foam::isoSurface::generateTriPoints
             (
                 generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
             );
+            if (triIndex == 0x0E)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0D:
         case 0x02:
+        case 0x0D:
             points.append
             (
                 generatePoint(s1,p1,hasSnap1,snapP1,s0,p0,hasSnap0,snapP0)
@@ -270,97 +278,133 @@ void Foam::isoSurface::generateTriPoints
             (
                 generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
             );
+            if (triIndex == 0x0D)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0C:
         case 0x03:
-        {
-            Type tp1 =
-                generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2);
-            Type tp2 =
-                generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3);
+        case 0x0C:
+            {
+                Type p0p2 =
+                    generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2);
+                Type p1p3 =
+                    generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3);
 
-            points.append
-            (
-                generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
-            );
-            points.append(tp1);
-            points.append(tp2);
-            points.append(tp2);
-            points.append
-            (
-                generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
-            );
-            points.append(tp1);
-        }
+                points.append
+                (
+                    generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
+                );
+                points.append(p1p3);
+                points.append(p0p2);
+
+                points.append(p1p3);
+                points.append
+                (
+                    generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
+                );
+                points.append(p0p2);
+            }
+            if (triIndex == 0x0C)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-5], points[sz-4]);
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0B:
         case 0x04:
-        {
-            points.append
-            (
-                generatePoint(s2,p2,hasSnap2,snapP2,s0,p0,hasSnap0,snapP0)
-            );
-            points.append
-            (
-                generatePoint(s2,p2,hasSnap2,snapP2,s1,p1,hasSnap1,snapP1)
-            );
-            points.append
-            (
-                generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3)
-            );
-        }
+        case 0x0B:
+            {
+                points.append
+                (
+                    generatePoint(s2,p2,hasSnap2,snapP2,s0,p0,hasSnap0,snapP0)
+                );
+                points.append
+                (
+                    generatePoint(s2,p2,hasSnap2,snapP2,s1,p1,hasSnap1,snapP1)
+                );
+                points.append
+                (
+                    generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3)
+                );
+            }
+            if (triIndex == 0x0B)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x0A:
         case 0x05:
-        {
-            Type tp0 =
-                generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
-            Type tp1 =
-                generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
+        case 0x0A:
+            {
+                Type p0p1 =
+                    generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
+                Type p2p3 =
+                    generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
 
-            points.append(tp0);
-            points.append(tp1);
-            points.append
-            (
-                generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
-            );
-            points.append(tp0);
-            points.append
-            (
-                generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
-            );
-            points.append(tp1);
-        }
+                points.append(p0p1);
+                points.append(p2p3);
+                points.append
+                (
+                    generatePoint(s0,p0,hasSnap0,snapP0,s3,p3,hasSnap3,snapP3)
+                );
+
+                points.append(p0p1);
+                points.append
+                (
+                    generatePoint(s1,p1,hasSnap1,snapP1,s2,p2,hasSnap2,snapP2)
+                );
+                points.append(p2p3);
+            }
+            if (triIndex == 0x0A)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-5], points[sz-4]);
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x09:
         case 0x06:
-        {
-            Type tp0 =
-                generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
-            Type tp1 =
-                generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
+        case 0x09:
+            {
+                Type p0p1 =
+                    generatePoint(s0,p0,hasSnap0,snapP0,s1,p1,hasSnap1,snapP1);
+                Type p2p3 =
+                    generatePoint(s2,p2,hasSnap2,snapP2,s3,p3,hasSnap3,snapP3);
 
-            points.append(tp0);
-            points.append
-            (
-                generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3)
-            );
-            points.append(tp1);
-            points.append(tp0);
-            points.append
-            (
-                generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2)
-            );
-            points.append(tp1);
-        }
+                points.append(p0p1);
+                points.append
+                (
+                    generatePoint(s1,p1,hasSnap1,snapP1,s3,p3,hasSnap3,snapP3)
+                );
+                points.append(p2p3);
+
+                points.append(p0p1);
+                points.append(p2p3);
+                points.append
+                (
+                    generatePoint(s0,p0,hasSnap0,snapP0,s2,p2,hasSnap2,snapP2)
+                );
+            }
+            if (triIndex == 0x09)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-5], points[sz-4]);
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
 
-        case 0x07:
         case 0x08:
+        case 0x07:
             points.append
             (
                 generatePoint(s3,p3,hasSnap3,snapP3,s0,p0,hasSnap0,snapP0)
@@ -373,6 +417,12 @@ void Foam::isoSurface::generateTriPoints
             (
                 generatePoint(s3,p3,hasSnap3,snapP3,s1,p1,hasSnap1,snapP1)
             );
+            if (triIndex == 0x07)
+            {
+                // Flip normals
+                label sz = points.size();
+                Swap(points[sz-2], points[sz-1]);
+            }
         break;
     }
 }
@@ -492,7 +542,7 @@ void Foam::isoSurface::generateTriPoints
      || (snappedPoint.size() != mesh_.nPoints())
     )
     {
-        FatalErrorIn("isoSurface::generateTriPoints(..)")
+        FatalErrorInFunction
             << "Incorrect size." << endl
             << "mesh: nCells:" << mesh_.nCells()
             << " points:" << mesh_.nPoints() << endl
@@ -689,6 +739,69 @@ void Foam::isoSurface::generateTriPoints
 //}
 
 
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::isoSurface::interpolate
+(
+    const label nPoints,
+    const labelList& triPointMergeMap,
+    const labelList& interpolatedPoints,
+    const List<FixedList<label, 3> >& interpolatedOldPoints,
+    const List<FixedList<scalar, 3> >& interpolationWeights,
+    const DynamicList<Type>& unmergedValues
+)
+{
+    // One value per point
+    tmp<Field<Type> > tvalues(new Field<Type>(nPoints, pTraits<Type>::zero));
+    Field<Type>& values = tvalues();
+
+
+    // Pass1: unweighted average of merged point values
+    {
+        labelList nValues(values.size(), 0);
+
+        forAll(unmergedValues, i)
+        {
+            label mergedPointI = triPointMergeMap[i];
+
+            if (mergedPointI >= 0)
+            {
+                values[mergedPointI] += unmergedValues[i];
+                nValues[mergedPointI]++;
+            }
+        }
+
+        forAll(values, i)
+        {
+            if (nValues[i] > 0)
+            {
+                values[i] /= scalar(nValues[i]);
+            }
+        }
+    }
+
+
+    // Pass2: weighted average for remaining values (from clipped triangles)
+
+    forAll(interpolatedPoints, i)
+    {
+        label pointI = interpolatedPoints[i];
+        const FixedList<label, 3>& oldPoints = interpolatedOldPoints[i];
+        const FixedList<scalar, 3>& w = interpolationWeights[i];
+
+        // Note: zeroing should not be necessary if interpolation only done
+        //       for newly introduced points (i.e. not in triPointMergeMap)
+        values[pointI] = pTraits<Type>::zero;
+        forAll(oldPoints, j)
+        {
+            values[pointI] = w[j]*unmergedValues[oldPoints[j]];
+        }
+    }
+
+    return tvalues;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type> >
 Foam::isoSurface::interpolate
@@ -707,7 +820,7 @@ Foam::isoSurface::interpolate
     > > c2(adaptPatchFields(cCoords));
 
 
-    DynamicList<Type> triPoints(nCutCells_);
+    DynamicList<Type> triPoints(3*nCutCells_);
     DynamicList<label> triMeshCells(nCutCells_);
 
     // Dummy snap data
@@ -731,52 +844,15 @@ Foam::isoSurface::interpolate
         triMeshCells
     );
 
-
-    // One value per point
-    tmp<Field<Type> > tvalues
+    return interpolate
     (
-        new Field<Type>(points().size(), pTraits<Type>::zero)
+        points().size(),
+        triPointMergeMap_,
+        interpolatedPoints_,
+        interpolatedOldPoints_,
+        interpolationWeights_,
+        triPoints
     );
-    Field<Type>& values = tvalues();
-    labelList nValues(values.size(), 0);
-
-    forAll(triPoints, i)
-    {
-        label mergedPointI = triPointMergeMap_[i];
-
-        if (mergedPointI >= 0)
-        {
-            values[mergedPointI] += triPoints[i];
-            nValues[mergedPointI]++;
-        }
-    }
-
-    if (debug)
-    {
-        Pout<< "nValues:" << values.size() << endl;
-        label nMult = 0;
-        forAll(nValues, i)
-        {
-            if (nValues[i] == 0)
-            {
-                FatalErrorIn("isoSurface::interpolate(..)")
-                    << "point:" << i << " nValues:" << nValues[i]
-                    << abort(FatalError);
-            }
-            else if (nValues[i] > 1)
-            {
-                nMult++;
-            }
-        }
-        Pout<< "Of which mult:" << nMult << endl;
-    }
-
-    forAll(values, i)
-    {
-        values[i] /= scalar(nValues[i]);
-    }
-
-    return tvalues;
 }
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index bb171c2c0e..e6d868fec9 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -110,7 +110,7 @@ void Foam::sampledIsoSurface::getIsoFields() const
             }
             else
             {
-                FatalErrorIn("sampledIsoSurface::getIsoFields()")
+                FatalErrorInFunction
                 << "Cannot find isosurface field " << isoField_
                 << " in database or directory " << vfHeader.path()
                 << exit(FatalError);
@@ -122,18 +122,52 @@ void Foam::sampledIsoSurface::getIsoFields() const
     // Get pointField
     // ~~~~~~~~~~~~~~
 
+    // In case of multiple iso values we don't want to calculate multiple e.g.
+    // "volPointInterpolate(p)" so register it and re-use it. This is the
+    // same as the 'cache' functionality from volPointInterpolate but
+    // unfortunately that one does not guarantee that the field pointer
+    // remain: e.g. some other
+    // functionObject might delete the cached version.
+    // (volPointInterpolation::interpolate with cache=false deletes any
+    //  registered one or if mesh.changing())
+
     if (!subMeshPtr_.valid())
     {
-        word pointFldName = "volPointInterpolate(" + isoField_ + ')';
+        const word pointFldName =
+            "volPointInterpolate_"
+          + type()
+          + "("
+          + isoField_
+          + ')';
 
         if (fvm.foundObject<pointScalarField>(pointFldName))
         {
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() : lookup pointField "
-                    << pointFldName << endl;
+                Info<< "sampledIsoSurface::getIsoFields() :"
+                    << " lookup pointField " << pointFldName << endl;
             }
-            pointFieldPtr_ = &fvm.lookupObject<pointScalarField>(pointFldName);
+            const pointScalarField& pfld = fvm.lookupObject<pointScalarField>
+            (
+                pointFldName
+            );
+
+            if (!pfld.upToDate(*volFieldPtr_))
+            {
+                if (debug)
+                {
+                    Info<< "sampledIsoSurface::getIsoFields() :"
+                        << " updating pointField " << pointFldName << endl;
+                }
+                // Update the interpolated value
+                volPointInterpolation::New(fvm).interpolate
+                (
+                    *volFieldPtr_,
+                    const_cast<pointScalarField&>(pfld)
+                );
+            }
+
+            pointFieldPtr_ = &pfld;
         }
         else
         {
@@ -141,33 +175,23 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
             if (debug)
             {
-                Info<< "sampledIsoSurface::getIsoFields() : "
-                    << "checking pointField " << pointFldName
-                    << " for same time " << fvm.time().timeName()
-                    << endl;
+                Info<< "sampledIsoSurface::getIsoFields() :"
+                    << " creating and storing pointField "
+                    << pointFldName << " for time "
+                    << fvm.time().timeName() << endl;
             }
 
-            if
+            tmp<pointScalarField> tpfld
             (
-                storedPointFieldPtr_.empty()
-             || (fvm.time().timeName() != storedPointFieldPtr_().instance())
-            )
-            {
-                if (debug)
-                {
-                    Info<< "sampledIsoSurface::getIsoFields() :"
-                        << " interpolating volField " << volFieldPtr_->name()
-                        << " to get pointField " << pointFldName << endl;
-                }
-
-                storedPointFieldPtr_.reset
+                volPointInterpolation::New(fvm).interpolate
                 (
-                    volPointInterpolation::New(fvm)
-                    .interpolate(*volFieldPtr_).ptr()
-                );
-                storedPointFieldPtr_->checkOut();
-                pointFieldPtr_ = storedPointFieldPtr_.operator->();
-            }
+                    *volFieldPtr_,
+                    pointFldName,
+                    false
+                )
+            );
+            pointFieldPtr_ = tpfld.ptr();
+            const_cast<pointScalarField*>(pointFieldPtr_)->store();
         }
 
 
@@ -233,8 +257,10 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         // Pointfield on submesh
 
-        word pointFldName =
-            "volPointInterpolate("
+        const word pointFldName =
+            "volPointInterpolate_"
+          + type()
+          + "("
           + volSubFieldPtr_->name()
           + ')';
 
@@ -245,11 +271,28 @@ void Foam::sampledIsoSurface::getIsoFields() const
                 Info<< "sampledIsoSurface::getIsoFields() :"
                     << " submesh lookup pointField " << pointFldName << endl;
             }
-            storedPointSubFieldPtr_.clear();
-            pointSubFieldPtr_ = &subFvm.lookupObject<pointScalarField>
+            const pointScalarField& pfld = subFvm.lookupObject<pointScalarField>
             (
                 pointFldName
             );
+
+            if (!pfld.upToDate(*volSubFieldPtr_))
+            {
+                if (debug)
+                {
+                    Info<< "sampledIsoSurface::getIsoFields() :"
+                        << " updating submesh pointField "
+                        << pointFldName << endl;
+                }
+                // Update the interpolated value
+                volPointInterpolation::New(subFvm).interpolate
+                (
+                    *volSubFieldPtr_,
+                    const_cast<pointScalarField&>(pfld)
+                );
+            }
+
+            pointFieldPtr_ = &pfld;
         }
         else
         {
@@ -260,15 +303,15 @@ void Foam::sampledIsoSurface::getIsoFields() const
                     << volSubFieldPtr_->name()
                     << " to get submesh pointField " << pointFldName << endl;
             }
-            storedPointSubFieldPtr_.reset
+            tmp<pointScalarField> tpfld
             (
                 volPointInterpolation::New
                 (
                     subFvm
-                ).interpolate(*volSubFieldPtr_).ptr()
+                ).interpolate(*volSubFieldPtr_)
             );
-            storedPointSubFieldPtr_->checkOut();
-            pointSubFieldPtr_ = storedPointSubFieldPtr_.operator->();
+            pointSubFieldPtr_ = tpfld.ptr();
+            const_cast<pointScalarField*>(pointSubFieldPtr_)->store();
         }
 
 
@@ -349,28 +392,34 @@ bool Foam::sampledIsoSurface::updateGeometry() const
 
     if (subMeshPtr_.valid())
     {
+        const volScalarField& vfld = *volSubFieldPtr_;
+
         surfPtr_.reset
         (
             new isoSurface
             (
-                *volSubFieldPtr_,
+                vfld,
                 *pointSubFieldPtr_,
                 isoVal_,
                 regularise_,
+                bounds_,
                 mergeTol_
             )
         );
     }
     else
     {
+        const volScalarField& vfld = *volFieldPtr_;
+
         surfPtr_.reset
         (
             new isoSurface
             (
-                *volFieldPtr_,
+                vfld,
                 *pointFieldPtr_,
                 isoVal_,
                 regularise_,
+                bounds_,
                 mergeTol_
             )
         );
@@ -412,6 +461,7 @@ Foam::sampledIsoSurface::sampledIsoSurface
     sampledSurface(name, mesh, dict),
     isoField_(dict.lookup("isoField")),
     isoVal_(readScalar(dict.lookup("isoValue"))),
+    bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)),
     mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
     regularise_(dict.lookupOrDefault("regularise", true)),
     average_(dict.lookupOrDefault("average", false)),
@@ -422,15 +472,12 @@ Foam::sampledIsoSurface::sampledIsoSurface
     prevTimeIndex_(-1),
     storedVolFieldPtr_(NULL),
     volFieldPtr_(NULL),
-    storedPointFieldPtr_(NULL),
     pointFieldPtr_(NULL)
 {
     if (!sampledSurface::interpolate())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "sampledIsoSurface::sampledIsoSurface"
-            "(const word&, const polyMesh&, const dictionary&)",
             dict
         )   << "Non-interpolated iso surface not supported since triangles"
             << " span across cells." << exit(FatalIOError);
@@ -442,10 +489,8 @@ Foam::sampledIsoSurface::sampledIsoSurface
 
         if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "sampledIsoSurface::sampledIsoSurface"
-                "(const word&, const polyMesh&, const dictionary&)",
                 dict
             )   << "Cannot find patch " << exposedPatchName_
                 << " in which to put exposed faces." << endl
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index 8cfd14c3c1..488ba56452 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -63,6 +63,9 @@ class sampledIsoSurface
         //- Iso value
         const scalar isoVal_;
 
+        //- Optional bounding box to trim triangles against
+        const boundBox bounds_;
+
         //- Merge tolerance
         const scalar mergeTol_;
 
@@ -94,7 +97,6 @@ class sampledIsoSurface
             mutable const volScalarField* volFieldPtr_;
 
             //- Cached pointfield
-            mutable autoPtr<pointScalarField> storedPointFieldPtr_;
             mutable const pointScalarField* pointFieldPtr_;
 
             // And on subsetted mesh
@@ -107,7 +109,6 @@ class sampledIsoSurface
                 mutable const volScalarField* volSubFieldPtr_;
 
                 //- Cached pointfield
-                mutable autoPtr<pointScalarField> storedPointSubFieldPtr_;
                 mutable const pointScalarField* pointSubFieldPtr_;
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index 239217a352..4c21257ce7 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,8 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
             cellAvg,
             pointFld().internalField(),
             isoVal_,
-            regularise_
+            regularise_,
+            bounds_
         );
 
         const_cast<sampledIsoSurfaceCell&>
@@ -166,7 +167,8 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
             cellFld.internalField(),
             pointFld().internalField(),
             isoVal_,
-            regularise_
+            regularise_,
+            bounds_
         );
 
         const_cast<sampledIsoSurfaceCell&>
@@ -185,6 +187,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
             << "    average        : " << average_ << nl
             << "    isoField       : " << isoField_ << nl
             << "    isoValue       : " << isoVal_ << nl
+            << "    bounds         : " << bounds_ << nl
             << "    points         : " << points().size() << nl
             << "    tris           : " << triSurface::size() << nl
             << "    cut cells      : " << meshCells_.size() << endl;
@@ -206,6 +209,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell
     sampledSurface(name, mesh, dict),
     isoField_(dict.lookup("isoField")),
     isoVal_(readScalar(dict.lookup("isoValue"))),
+    bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)),
     regularise_(dict.lookupOrDefault("regularise", true)),
     average_(dict.lookupOrDefault("average", true)),
     zoneKey_(keyType::null),
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index 7021bf0b97..0cfa6a7461 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -62,6 +62,9 @@ class sampledIsoSurfaceCell
         //- Iso value
         const scalar isoVal_;
 
+        //- Optional bounding box to trim triangles against
+        const boundBox bounds_;
+
         //- Whether to coarse
         const Switch regularise_;
 
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index 7da10d7a57..aa72aeed08 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -230,6 +230,7 @@ void Foam::sampledCuttingPlane::createGeometry()
             pointDistance_,
             0.0,
             regularise_,
+            bounds_,
             mergeTol_
         )
         //new isoSurfaceCell
@@ -262,6 +263,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
 :
     sampledSurface(name, mesh, dict),
     plane_(dict),
+    bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)),
     mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
     regularise_(dict.lookupOrDefault("regularise", true)),
     average_(dict.lookupOrDefault("average", false)),
@@ -279,11 +281,8 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
 
         if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
         {
-            FatalErrorIn
-            (
-                "sampledCuttingPlane::sampledCuttingPlane"
-                "(const word&, const polyMesh&, const dictionary&)"
-            )   << "Cannot find patch " << exposedPatchName_
+            FatalErrorInFunction
+                << "Cannot find patch " << exposedPatchName_
                 << " in which to put exposed faces." << endl
                 << "Valid patches are " << mesh.boundaryMesh().names()
                 << exit(FatalError);
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index a8aa477407..308bdcd46a 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -60,6 +60,9 @@ class sampledCuttingPlane
         //- Plane
         const plane plane_;
 
+        //- Optional bounding box to trim triangles against
+        const boundBox bounds_;
+
         //- Merge tolerance
         const scalar mergeTol_;
 
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
index d07a6391f1..16acd961a7 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,11 +84,7 @@ const Foam::labelList& Foam::sampledPatch::patchIDs() const
 {
     if (patchIDs_.empty())
     {
-        patchIDs_ = mesh().boundaryMesh().patchSet
-        (
-            patchNames_,
-            false
-        ).sortedToc();
+        patchIDs_ = mesh().boundaryMesh().patchSet(patchNames_).sortedToc();
     }
     return patchIDs_;
 }
@@ -135,7 +131,7 @@ bool Foam::sampledPatch::update()
 
         if (isA<emptyPolyPatch>(pp))
         {
-            FatalErrorIn("sampledPatch::update()")
+            FatalErrorInFunction
                 << "Cannot sample an empty patch. Patch " << pp.name()
                 << exit(FatalError);
         }
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index 6d05af02a4..acf3558bba 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ void Foam::sampledSurface::makeSf() const
     // It is an error to recalculate if the pointer is already set
     if (SfPtr_)
     {
-        FatalErrorIn("Foam::sampledSurface::makeSf()")
+        FatalErrorInFunction
             << "face area vectors already exist"
             << abort(FatalError);
     }
@@ -74,7 +74,7 @@ void Foam::sampledSurface::makeMagSf() const
     // It is an error to recalculate if the pointer is already set
     if (magSfPtr_)
     {
-        FatalErrorIn("Foam::sampledSurface::makeMagSf()")
+        FatalErrorInFunction
             << "mag face areas already exist"
             << abort(FatalError);
     }
@@ -95,7 +95,7 @@ void Foam::sampledSurface::makeCf() const
     // It is an error to recalculate if the pointer is already set
     if (CfPtr_)
     {
-        FatalErrorIn("Foam::sampledSurface::makeCf()")
+        FatalErrorInFunction
             << "face centres already exist"
             << abort(FatalError);
     }
@@ -132,11 +132,8 @@ Foam::autoPtr<Foam::sampledSurface> Foam::sampledSurface::New
 
     if (cstrIter == wordConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "sampledSurface::New"
-            "(const word&, const polyMesh&, const dictionary&)"
-        )   << "Unknown sample type "
+        FatalErrorInFunction
+            << "Unknown sample type "
             << sampleType << nl << nl
             << "Valid sample types : " << endl
             << wordConstructorTablePtr_->sortedToc()
@@ -245,7 +242,7 @@ Foam::tmp<Foam::scalarField> Foam::sampledSurface::sample
     const surfaceScalarField& sField
 ) const
 {
-    notImplemented("tmp<Foam::scalarField> sampledSurface::sample");
+    NotImplemented;
     return tmp<scalarField>(NULL);
 }
 
@@ -255,7 +252,7 @@ Foam::tmp<Foam::vectorField> Foam::sampledSurface::sample
     const surfaceVectorField& sField
 ) const
 {
-    notImplemented("tmp<Foam::vectorField> sampledSurface::sample");
+    NotImplemented;
     return tmp<vectorField>(NULL);
 }
 
@@ -265,7 +262,7 @@ Foam::tmp<Foam::sphericalTensorField> Foam::sampledSurface::sample
     const surfaceSphericalTensorField& sField
 ) const
 {
-    notImplemented("tmp<Foam::sphericalTensorField> sampledSurface::sample");
+    NotImplemented;
     return tmp<sphericalTensorField>(NULL);
 }
 
@@ -275,7 +272,7 @@ Foam::tmp<Foam::symmTensorField> Foam::sampledSurface::sample
     const surfaceSymmTensorField& sField
 ) const
 {
-    notImplemented("tmp<Foam::symmTensorField> sampledSurface::sample");
+    NotImplemented;
     return tmp<symmTensorField>(NULL);
 }
 
@@ -285,7 +282,7 @@ Foam::tmp<Foam::tensorField> Foam::sampledSurface::sample
     const surfaceTensorField& sField
 ) const
 {
-    notImplemented("tmp<Foam::tensorField> sampledSurface::sample");
+    NotImplemented;
     return tmp<tensorField>(NULL);
 }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index bddee49ef9..fca1b028b2 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -217,7 +217,7 @@ public:
         //- Clone
         autoPtr<sampledSurface> clone() const
         {
-            notImplemented("autoPtr<sampledSurface> clone() const");
+            NotImplemented;
             return autoPtr<sampledSurface>(NULL);
         }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index 09fe8b7567..2ad3b90e79 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,10 +35,7 @@ bool Foam::sampledSurface::checkFieldSize(const Field<Type>& field) const
 
     if (field.size() != faces().size())
     {
-        FatalErrorIn
-        (
-            "sampledSurface::checkFieldSize(const Field<Type>&) const"
-        )
+        FatalErrorInFunction
             << "size mismatch: "
             << "field (" << field.size()
             << ") != surface (" << faces().size() << ")"
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 220a61baee..4e12874c25 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ void Foam::sampledSurfaces::writeGeometry() const
     // Write to time directory under outputPath_
     // Skip surface without faces (eg, a failed cut-plane)
 
-    const fileName outputDir = outputPath_/mesh_.time().timeName();
+    const fileName outputDir = outputPath_/obr_.time().timeName();
 
     forAll(*this, surfI)
     {
@@ -92,9 +92,9 @@ Foam::sampledSurfaces::sampledSurfaces
     const bool loadFromFiles
 )
 :
+    functionObjectState(obr, name),
     PtrList<sampledSurface>(),
-    name_(name),
-    mesh_(refCast<const fvMesh>(obr)),
+    obr_(obr),
     loadFromFiles_(loadFromFiles),
     outputPath_(fileName::null),
     fieldSelection_(),
@@ -102,13 +102,19 @@ Foam::sampledSurfaces::sampledSurfaces
     mergeList_(),
     formatter_(NULL)
 {
+    // Only active if a fvMesh is available
+    if (setActive<fvMesh>())
+    {
+        read(dict);
+    }
+
     if (Pstream::parRun())
     {
-        outputPath_ = mesh_.time().path()/".."/"postProcessing"/name_;
+        outputPath_ = obr_.time().path()/".."/"postProcessing"/name_;
     }
     else
     {
-        outputPath_ = mesh_.time().path()/"postProcessing"/name_;
+        outputPath_ = obr_.time().path()/"postProcessing"/name_;
     }
 
     read(dict);
@@ -156,26 +162,14 @@ void Foam::sampledSurfaces::write()
 
         const label nFields = classifyFields();
 
-        if (Pstream::master())
-        {
-            if (debug)
-            {
-                Pout<< "Creating directory "
-                    << outputPath_/mesh_.time().timeName() << nl << endl;
-
-            }
-
-            mkDir(outputPath_/mesh_.time().timeName());
-        }
-
-        // Write geometry first if required,
+        // write geometry first if required,
         // or when no fields would otherwise be written
         if (nFields == 0 || formatter_->separateGeometry())
         {
             writeGeometry();
         }
 
-        const IOobjectList objects(mesh_, mesh_.time().timeName());
+        const IOobjectList objects(obr_, obr_.time().timeName());
 
         sampleAndWrite<volScalarField>(objects);
         sampleAndWrite<volVectorField>(objects);
@@ -211,10 +205,12 @@ void Foam::sampledSurfaces::read(const dictionary& dict)
             dict.subOrEmptyDict("formatOptions").subOrEmptyDict(writeType)
         );
 
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
         PtrList<sampledSurface> newList
         (
             dict.lookup("surfaces"),
-            sampledSurface::iNew(mesh_)
+            sampledSurface::iNew(mesh)
         );
         transfer(newList);
 
@@ -334,8 +330,10 @@ bool Foam::sampledSurfaces::update()
         return updated;
     }
 
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
     // Dimension as fraction of mesh bounding box
-    scalar mergeDim = mergeTol_ * mesh_.bounds().mag();
+    scalar mergeDim = mergeTol_*mesh.bounds().mag();
 
     if (Pstream::master() && debug)
     {
@@ -374,4 +372,18 @@ bool Foam::sampledSurfaces::update()
 }
 
 
+Foam::scalar Foam::sampledSurfaces::mergeTol()
+{
+    return mergeTol_;
+}
+
+
+Foam::scalar Foam::sampledSurfaces::mergeTol(const scalar tol)
+{
+    scalar oldTol = mergeTol_;
+    mergeTol_ = tol;
+    return oldTol;
+}
+
+
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index 5957d1398d..a94b38f0f5 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,7 @@ SourceFiles
 #ifndef sampledSurfaces_H
 #define sampledSurfaces_H
 
+#include "functionObjectState.H"
 #include "sampledSurface.H"
 #include "surfaceWriter.H"
 #include "volFieldsFwd.H"
@@ -58,6 +59,7 @@ class dictionary;
 
 class sampledSurfaces
 :
+    public functionObjectState,
     public PtrList<sampledSurface>
 {
     // Private classes
@@ -92,12 +94,8 @@ class sampledSurfaces
 
     // Private data
 
-        //- Name of this set of surfaces,
-        //  Also used as the name of the sampledSurfaces directory.
-        const word name_;
-
-        //- Const reference to fvMesh
-        const fvMesh& mesh_;
+        //- Const reference to database
+        const objectRegistry& obr_;
 
         //- Load fields from files (not from objectRegistry)
         const bool loadFromFiles_;
@@ -238,6 +236,12 @@ public:
 
         //- Update for changes of mesh due to readUpdate - expires the surfaces
         virtual void readUpdate(const polyMesh::readUpdateState state);
+
+        //- Get merge tolerance
+        static scalar mergeTol();
+
+        //- Set tolerance (and return old tolerance)
+        static scalar mergeTol(const scalar);
 };
 
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C
index 27b4d63d60..4e25d84af0 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C
@@ -37,7 +37,7 @@ Foam::label Foam::sampledSurfaces::classifyFields()
     if (loadFromFiles_)
     {
         // Check files for a particular time
-        IOobjectList objects(mesh_, mesh_.time().timeName());
+        IOobjectList objects(obr_, obr_.time().timeName());
         wordList allFields = objects.sortedNames();
 
         forAll(fieldSelection_, i)
@@ -50,7 +50,7 @@ Foam::label Foam::sampledSurfaces::classifyFields()
             }
             else
             {
-                WarningIn("sampledSurfaces::classifyFields()")
+                WarningInFunction
                     << "Cannot find field file matching "
                     << fieldSelection_[i] << endl;
             }
@@ -59,7 +59,7 @@ Foam::label Foam::sampledSurfaces::classifyFields()
     else
     {
         // Check currently available fields
-        wordList allFields = mesh_.sortedNames();
+        wordList allFields = obr_.sortedNames();
         labelList indices = findStrings(fieldSelection_, allFields);
 
         forAll(fieldSelection_, i)
@@ -72,7 +72,7 @@ Foam::label Foam::sampledSurfaces::classifyFields()
             }
             else
             {
-                WarningIn("sampledSurfaces::classifyFields()")
+                WarningInFunction
                     << "Cannot find registered field matching "
                     << fieldSelection_[i] << endl;
             }
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index 8683e320dc..f43ffdf6ef 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,7 +72,7 @@ void Foam::sampledSurfaces::writeSurface
             // skip surface without faces (eg, a failed cut-plane)
             if (mergeList_[surfI].faces.size())
             {
-                formatter_->write
+                fileName fName = formatter_->write
                 (
                     outputDir,
                     s.name(),
@@ -82,6 +82,10 @@ void Foam::sampledSurfaces::writeSurface
                     allValues,
                     s.interpolate()
                 );
+
+                dictionary propsDict;
+                propsDict.add("file", fName);
+                setProperty(fieldName, propsDict);
             }
         }
     }
@@ -91,7 +95,7 @@ void Foam::sampledSurfaces::writeSurface
         // skip surface without faces (eg, a failed cut-plane)
         if (s.faces().size())
         {
-            formatter_->write
+            fileName fName = formatter_->write
             (
                 outputDir,
                 s.name(),
@@ -101,6 +105,10 @@ void Foam::sampledSurfaces::writeSurface
                 values,
                 s.interpolate()
             );
+
+            dictionary propsDict;
+            propsDict.add("file", fName);
+            setProperty(fieldName, propsDict);
         }
     }
 }
@@ -153,7 +161,7 @@ void Foam::sampledSurfaces::sampleAndWrite
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
 )
 {
-    const word& fieldName   = sField.name();
+    const word& fieldName = sField.name();
     const fileName outputDir = outputPath_/sField.time().timeName();
 
     forAll(*this, surfI)
@@ -169,6 +177,8 @@ template<class GeoField>
 void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
 {
     wordList names;
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
     if (loadFromFiles_)
     {
         IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
@@ -176,7 +186,7 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
     }
     else
     {
-        names = mesh_.thisDb().names<GeoField>();
+        names = mesh.thisDb().names<GeoField>();
     }
 
     labelList nameIDs(findStrings(fieldSelection_, names));
@@ -199,11 +209,11 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
                 IOobject
                 (
                     fieldName,
-                    mesh_.time().timeName(),
-                    mesh_,
+                    mesh.time().timeName(),
+                    mesh,
                     IOobject::MUST_READ
                 ),
-                mesh_
+                mesh
             );
 
             sampleAndWrite(fld);
@@ -212,7 +222,7 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
         {
             sampleAndWrite
             (
-                mesh_.thisDb().lookupObject<GeoField>(fieldName)
+                mesh.thisDb().lookupObject<GeoField>(fieldName)
             );
         }
     }
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 094ae45cfc..654b3d438f 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -644,8 +644,25 @@ bool Foam::sampledTriSurfaceMesh::update()
         return false;
     }
 
+    // Calculate surface and mesh overlap bounding box
+    treeBoundBox bb
+    (
+        surface_.triSurface::points(),
+        surface_.triSurface::meshPoints()
+    );
+    bb.min() = max(bb.min(), mesh().bounds().min());
+    bb.max() = min(bb.max(), mesh().bounds().max());
+
+    // Extend a bit
+    const vector span(bb.span());
+
+    bb.min() -= 0.5*span;
+    bb.max() += 0.5*span;
+
+    bb.inflate(1e-6);
+
     // Mesh search engine, no triangulation of faces.
-    meshSearch meshSearcher(mesh(), polyMesh::FACE_PLANES);
+    meshSearch meshSearcher(mesh(), bb, polyMesh::FACE_PLANES);
 
     return update(meshSearcher);
 }
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
index 89e99055b8..c71c6eba0d 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,10 +163,7 @@ Foam::sampledThresholdCellFaces::sampledThresholdCellFaces
 {
     if (!dict.found("lowerLimit") && !dict.found("upperLimit"))
     {
-        FatalErrorIn
-            (
-                "sampledThresholdCellFaces::sampledThresholdCellFaces(..)"
-            )
+        FatalErrorInFunction
             << "require at least one of 'lowerLimit' or 'upperLimit'" << endl
             << abort(FatalError);
     }
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
index 81f46165c2..26b73b3c60 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -279,8 +279,7 @@ Foam::thresholdCellFaces::thresholdCellFaces
 
     if (lowerThreshold > upperThreshold)
     {
-        WarningIn("thresholdCellFaces::thresholdCellFaces(...)")
-            << "lower > upper limit!  "
+        WarningInFunction
             << lowerThreshold << " > " << upperThreshold << endl;
     }
 
diff --git a/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriter.C b/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriter.C
new file mode 100644
index 0000000000..076a9a4226
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriter.C
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "boundaryDataSurfaceWriter.H"
+#include "makeSurfaceWriterMethods.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeSurfaceWriterType(boundaryDataSurfaceWriter);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::boundaryDataSurfaceWriter::boundaryDataSurfaceWriter()
+:
+    surfaceWriter()
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::boundaryDataSurfaceWriter::~boundaryDataSurfaceWriter()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::fileName Foam::boundaryDataSurfaceWriter::write
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const bool verbose
+) const
+{
+    const fileName baseDir(outputDir.path()/surfaceName);
+    const fileName timeName(outputDir.name());
+
+
+    // Construct dummy time to use as an objectRegistry
+    const fileName caseDir(getEnv("FOAM_CASE"));
+    Time dummyTime
+    (
+        caseDir.path(), //rootPath,
+        caseDir.name(), //caseName,
+        "system",       //systemName,
+        "constant",     //constantName,
+        false           //enableFunctionObjects
+    );
+
+
+    // Write points
+    if (verbose)
+    {
+        Info<< "Writing points to " << baseDir/"points" << endl;
+    }
+
+    pointIOField pts
+    (
+        IOobject
+        (
+            baseDir/"points",
+            dummyTime,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        points
+    );
+
+    {
+        // Do like regIOobject::writeObject but don't do instance() adaptation
+        // since this would write to e.g. 0/ instead of postProcessing/
+
+        // Try opening an OFstream for object
+        mkDir(pts.path());
+        OFstream os(pts.objectPath());
+
+        pts.writeHeader(os);
+        pts.writeData(os);
+        pts.writeEndDivider(os);
+    }
+
+    return baseDir;
+}
+
+
+// create write methods
+defineSurfaceWriterWriteFields(Foam::boundaryDataSurfaceWriter);
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriter.H b/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriter.H
new file mode 100644
index 0000000000..b70b4d47c5
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriter.H
@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::boundaryDataSurfaceWriter
+
+Description
+    A surfaceWriter for outputting to a form useable for the
+    timeVaryingMapped boundary condition. This reads the data from
+    constant/boundaryData/\<patch\> directory
+
+    Typical way of working:
+    - use a sampledSurface of type 'patch' (to sample a patch):
+    \verbatim
+    surfaces
+    {
+        type            surfaces;
+        surfaceFormat   boundaryData;
+        fields          ( p );
+        surfaces
+        (
+            outlet
+            {
+                type            patch;
+                patches         (outlet);
+                interpolate     false;
+            }
+        );
+    }
+    \endverbatim
+
+    - write using this writer.
+    - move postProcessing/surfaces/outlet to constant/boundaryData/outlet
+      in your destination case.
+    - use a timeVaryingMappedFixedValue condition to read and interpolate
+      the profile:
+        type            timeVaryingMappedFixedValue;
+        setAverage      false;  // do not use read average
+        offset          0;      // do not apply offset to values
+
+    Note:
+    - with 'interpolate false' the data is on the face centres of the
+      patch. Take care that a 2D geometry will only have a single row
+      of face centres so might not provide a valid triangulation
+      (this is what timeVaryingMappedFixedValue uses to do interpolation)
+      (Alternatively use timeVaryingMappedFixedValue with mapMethod 'nearest')
+
+
+SourceFiles
+    boundaryDataSurfaceWriter.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef boundaryDataSurfaceWriter_H
+#define boundaryDataSurfaceWriter_H
+
+#include "surfaceWriter.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class boundaryDataSurfaceWriter Declaration
+\*---------------------------------------------------------------------------*/
+
+class boundaryDataSurfaceWriter
+:
+    public surfaceWriter
+{
+    // Private Member Functions
+
+        //- Templated write operation
+        template<class Type>
+        fileName writeTemplate
+        (
+            const fileName& outputDir,
+            const fileName& surfaceName,
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,
+            const Field<Type>& values,
+            const bool isNodeValues,
+            const bool verbose
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("boundaryData");
+
+
+    // Constructors
+
+        //- Construct null
+        boundaryDataSurfaceWriter();
+
+
+    //- Destructor
+    virtual ~boundaryDataSurfaceWriter();
+
+
+    // Member Functions
+
+        //- Write single surface geometry to file.
+        virtual fileName write
+        (
+            const fileName& outputDir,
+            const fileName& surfaceName,
+            const pointField& points,
+            const faceList& faces,
+            const bool verbose = false
+        ) const;
+
+
+        //- Write scalarField for a single surface to file.
+        //  One value per face or vertex (isNodeValues = true)
+        virtual fileName write
+        (
+            const fileName& outputDir,      // <case>/surface/TIME
+            const fileName& surfaceName,    // name of surface
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,          // name of field
+            const Field<scalar>& values,
+            const bool isNodeValues,
+            const bool verbose = false
+        ) const;
+
+        //- Write vectorField for a single surface to file.
+        //  One value per face or vertex (isNodeValues = true)
+        virtual fileName write
+        (
+            const fileName& outputDir,      // <case>/surface/TIME
+            const fileName& surfaceName,    // name of surface
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,          // name of field
+            const Field<vector>& values,
+            const bool isNodeValues,
+            const bool verbose = false
+        ) const;
+
+        //- Write sphericalTensorField for a single surface to file.
+        //  One value per face or vertex (isNodeValues = true)
+        virtual fileName write
+        (
+            const fileName& outputDir,      // <case>/surface/TIME
+            const fileName& surfaceName,    // name of surface
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,          // name of field
+            const Field<sphericalTensor>& values,
+            const bool isNodeValues,
+            const bool verbose = false
+        ) const;
+
+        //- Write symmTensorField for a single surface to file.
+        //  One value per face or vertex (isNodeValues = true)
+        virtual fileName write
+        (
+            const fileName& outputDir,      // <case>/surface/TIME
+            const fileName& surfaceName,    // name of surface
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,          // name of field
+            const Field<symmTensor>& values,
+            const bool isNodeValues,
+            const bool verbose = false
+        ) const;
+
+        //- Write tensorField for a single surface to file.
+        //  One value per face or vertex (isNodeValues = true)
+        virtual fileName write
+        (
+            const fileName& outputDir,      // <case>/surface/TIME
+            const fileName& surfaceName,    // name of surface
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,          // name of field
+            const Field<tensor>& values,
+            const bool isNodeValues,
+            const bool verbose = false
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "boundaryDataSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..dd2edd5d93
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriterTemplates.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify i
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstream.H"
+#include "OSspecific.H"
+#include "IOmanip.H"
+#include "Time.H"
+#include "pointIOField.H"
+#include "AverageIOField.H"
+#include "primitivePatch.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::fileName Foam::boundaryDataSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    const fileName baseDir(outputDir.path()/surfaceName);
+    const fileName timeName(outputDir.name());
+
+
+    // Construct dummy time to use as an objectRegistry
+    const fileName caseDir(getEnv("FOAM_CASE"));
+    Time dummyTime
+    (
+        caseDir.path(), //rootPath,
+        caseDir.name(), //caseName,
+        "system",       //systemName,
+        "constant",     //constantName,
+        false           //enableFunctionObjects
+    );
+
+
+    // Write points
+
+    pointIOField pts
+    (
+        IOobject
+        (
+            baseDir/"points",
+            dummyTime,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        0
+    );
+
+    if (isNodeValues)
+    {
+        if (verbose)
+        {
+            Info<< "Writing points to " << baseDir/"points" << endl;
+        }
+        pts = points;
+    }
+    else
+    {
+        if (verbose)
+        {
+            Info<< "Writing face centres to " << baseDir/"points" << endl;
+        }
+
+        primitivePatch pp(SubList<face>(faces, faces.size()), points);
+
+        pts = pp.faceCentres();
+    }
+
+    {
+        // Do like regIOobject::writeObject but don't do instance() adaptation
+        // since this would write to e.g. 0/ instead of postProcessing/
+
+        // Try opening an OFstream for object
+        mkDir(pts.path());
+        OFstream os(pts.objectPath());
+
+        pts.writeHeader(os);
+        pts.writeData(os);
+        pts.writeEndDivider(os);
+    }
+
+
+    // Write field
+    {
+        AverageIOField<Type> vals
+        (
+            IOobject
+            (
+                baseDir/timeName/fieldName,
+                dummyTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            pTraits<Type>::zero,
+            values
+        );
+
+        // Do like regIOobject::writeObject but don't do instance() adaptation
+        // since this would write to e.g. 0/ instead of postProcessing/
+
+        // Try opening an OFstream for object
+        mkDir(vals.path());
+        OFstream os(vals.objectPath());
+
+        vals.writeHeader(os);
+        vals.writeData(os);
+        vals.writeEndDivider(os);
+    }
+
+    return baseDir;
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
index c95a7aed65..48e57afc25 100644
--- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,10 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dxSurfaceWriter.H"
-
-#include "OFstream.H"
-#include "OSspecific.H"
-
 #include "makeSurfaceWriterMethods.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -73,10 +69,8 @@ void Foam::dxSurfaceWriter::writeGeometry
 
         if (f.size() != 3)
         {
-            FatalErrorIn
-            (
-                "writeGeometry(Ostream&, const pointField&, const faceList&)"
-            )   << "Face " << faceI << " vertices " << f
+            FatalErrorInFunction
+                << "Face " << faceI << " vertices " << f
                 << " is not a triangle."
                 << exit(FatalError);
         }
@@ -215,58 +209,6 @@ namespace Foam
 }
 
 
-// arbitrary field
-template<class Type>
-inline void Foam::dxSurfaceWriter::writeData
-(
-    Ostream& os,
-    const Field<Type>& values
-)
-{
-    os  << "object 3 class array type float rank 0 items "
-        << values.size() << " data follows" << nl;
-
-    forAll(values, elemI)
-    {
-        os << float(0.0) << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::dxSurfaceWriter::writeTemplate
-(
-    const fileName& outputDir,
-    const fileName& surfaceName,
-    const pointField& points,
-    const faceList& faces,
-    const word& fieldName,
-    const Field<Type>& values,
-    const bool isNodeValues,
-    const bool verbose
-) const
-{
-    if (!isDir(outputDir))
-    {
-        mkDir(outputDir);
-    }
-
-    OFstream os
-    (
-        outputDir/fieldName + '_' + surfaceName + ".dx"
-    );
-
-    if (verbose)
-    {
-        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
-    }
-
-    writeGeometry(os, points, faces);
-    writeData(os, values);
-    writeTrailer(os, isNodeValues);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::dxSurfaceWriter::dxSurfaceWriter()
diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
index 3b4f2fd6d1..51eceeda3e 100644
--- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,7 +61,7 @@ class dxSurfaceWriter
 
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -94,7 +94,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -108,7 +108,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -122,7 +122,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -136,7 +136,7 @@ public:
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -150,7 +150,7 @@ public:
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -161,7 +161,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };
 
 
@@ -171,6 +170,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "dxSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..835f2b2b95
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterTemplates.C
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstream.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+inline void Foam::dxSurfaceWriter::writeData
+(
+    Ostream& os,
+    const Field<Type>& values
+)
+{
+    os  << "object 3 class array type float rank 0 items "
+        << values.size() << " data follows" << nl;
+
+    forAll(values, elemI)
+    {
+        os << float(0.0) << nl;
+    }
+}
+
+
+template<class Type>
+Foam::fileName Foam::dxSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    if (!isDir(outputDir))
+    {
+        mkDir(outputDir);
+    }
+
+    OFstream os(outputDir/fieldName + '_' + surfaceName + ".dx");
+
+    if (verbose)
+    {
+        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
+    }
+
+    writeGeometry(os, points, faces);
+    writeData(os, values);
+    writeTrailer(os, isNodeValues);
+
+    return os.name();
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
index 5e2ab17114..89eadae4fe 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,13 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ensightSurfaceWriter.H"
-
-#include "OFstream.H"
-#include "OSspecific.H"
-#include "IOmanip.H"
 #include "ensightPartFaces.H"
-#include "ensightPTraits.H"
-
 #include "makeSurfaceWriterMethods.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -42,83 +36,13 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void Foam::ensightSurfaceWriter::writeTemplate
-(
-    const fileName& outputDir,
-    const fileName& surfaceName,
-    const pointField& points,
-    const faceList& faces,
-    const word& fieldName,
-    const Field<Type>& values,
-    const bool isNodeValues,
-    const bool verbose
-) const
-{
-    if (!isDir(outputDir/fieldName))
-    {
-        mkDir(outputDir/fieldName);
-    }
-
-    // const scalar timeValue = Foam::name(this->mesh().time().timeValue());
-    const scalar timeValue = 0.0;
-
-    OFstream osCase(outputDir/fieldName/surfaceName + ".case");
-    ensightGeoFile osGeom
-    (
-        outputDir/fieldName/surfaceName + ".000.mesh",
-        writeFormat_
-    );
-    ensightFile osField
-    (
-        outputDir/fieldName/surfaceName + ".000." + fieldName,
-        writeFormat_
-    );
-
-    if (verbose)
-    {
-        Info<< "Writing case file to " << osCase.name() << endl;
-    }
-
-    osCase
-        << "FORMAT" << nl
-        << "type: ensight gold" << nl
-        << nl
-        << "GEOMETRY" << nl
-        << "model:        1     " << osGeom.name().name() << nl
-        << nl
-        << "VARIABLE" << nl
-        << ensightPTraits<Type>::typeName << " per "
-        << word(isNodeValues ? "node:" : "element:") << setw(10) << 1
-        << "       " << fieldName
-        << "       " << surfaceName.c_str() << ".***." << fieldName << nl
-        << nl
-        << "TIME" << nl
-        << "time set:                      1" << nl
-        << "number of steps:               1" << nl
-        << "filename start number:         0" << nl
-        << "filename increment:            1" << nl
-        << "time values:" << nl
-        << timeValue << nl
-        << nl;
-
-    ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true);
-    osGeom << ensPart;
-
-    // Write field
-    osField.writeKeyword(ensightPTraits<Type>::typeName);
-    ensPart.writeField(osField, values, isNodeValues);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::ensightSurfaceWriter::ensightSurfaceWriter()
 :
     surfaceWriter(),
-    writeFormat_(IOstream::ASCII)
+    writeFormat_(IOstream::ASCII),
+    collateTimes_(false)
 {}
 
 
@@ -132,6 +56,7 @@ Foam::ensightSurfaceWriter::ensightSurfaceWriter(const dictionary& options)
     {
         writeFormat_ = IOstream::formatEnum(options.lookup("format"));
     }
+    options.readIfPresent("collateTimes", collateTimes_);
 }
 
 
@@ -143,7 +68,7 @@ Foam::ensightSurfaceWriter::~ensightSurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::ensightSurfaceWriter::write
+Foam::fileName Foam::ensightSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -163,7 +88,7 @@ void Foam::ensightSurfaceWriter::write
     OFstream osCase(outputDir/surfaceName + ".case");
     ensightGeoFile osGeom
     (
-        outputDir/surfaceName + ".000.mesh",
+        outputDir/surfaceName + ".0000.mesh",
         writeFormat_
     );
 
@@ -190,6 +115,8 @@ void Foam::ensightSurfaceWriter::write
 
     ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true);
     osGeom << ensPart;
+
+    return osCase.name();
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
index b1cd9d019f..67da74a193 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,12 +55,42 @@ class ensightSurfaceWriter
         //- Write option (default is IOstream::ASCII
         IOstream::streamFormat writeFormat_;
 
+        bool collateTimes_;
+
 
     // Private Member Functions
 
+        //- Templated write operation - one file per timestep
+        template<class Type>
+        fileName writeCollated
+        (
+            const fileName& outputDir,
+            const fileName& surfaceName,
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,
+            const Field<Type>& values,
+            const bool isNodeValues,
+            const bool verbose
+        ) const;
+
+        //- Templated write operation - all time steps in single file
+        template<class Type>
+        fileName writeUncollated
+        (
+            const fileName& outputDir,
+            const fileName& surfaceName,
+            const pointField& points,
+            const faceList& faces,
+            const word& fieldName,
+            const Field<Type>& values,
+            const bool isNodeValues,
+            const bool verbose
+        ) const;
+
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -96,14 +126,14 @@ public:
 
         //- True if the surface format supports geometry in a separate file.
         //  False if geometry and field must be in a single file
-        virtual bool separateGeometry()
+        virtual bool separateGeometry() const
         {
-            return true;
+            return !collateTimes_;
         }
 
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -115,7 +145,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -129,7 +159,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -143,7 +173,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -157,7 +187,7 @@ public:
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -171,7 +201,7 @@ public:
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -182,7 +212,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };
 
 
@@ -192,6 +221,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "ensightSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..1d14ab0196
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterTemplates.C
@@ -0,0 +1,339 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOmanip.H"
+#include "IFstream.H"
+#include "OFstream.H"
+#include "OSspecific.H"
+#include "ensightPartFaces.H"
+#include "ensightPTraits.H"
+#include "OStringStream.H"
+#include "regExp.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::fileName Foam::ensightSurfaceWriter::writeUncollated
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    if (!isDir(outputDir/fieldName))
+    {
+        mkDir(outputDir/fieldName);
+    }
+
+    // const scalar timeValue = Foam::name(this->mesh().time().timeValue());
+    const scalar timeValue = 0.0;
+
+    OFstream osCase(outputDir/fieldName/surfaceName + ".case");
+    ensightGeoFile osGeom
+    (
+        outputDir/fieldName/surfaceName + ".0000.mesh",
+        writeFormat_
+    );
+    ensightFile osField
+    (
+        outputDir/fieldName/surfaceName + ".0000." + fieldName,
+        writeFormat_
+    );
+
+    if (verbose)
+    {
+        Info<< "Writing case file to " << osCase.name() << endl;
+    }
+
+    osCase
+        << "FORMAT" << nl
+        << "type: ensight gold" << nl
+        << nl
+        << "GEOMETRY" << nl
+        << "model:        1     " << osGeom.name().name() << nl
+        << nl
+        << "VARIABLE" << nl
+        << ensightPTraits<Type>::typeName << " per "
+        << word(isNodeValues ? "node:" : "element:") << setw(10) << 1
+        << "       " << fieldName
+        << "       " << surfaceName.c_str() << ".****." << fieldName << nl
+        << nl
+        << "TIME" << nl
+        << "time set:                      1" << nl
+        << "number of steps:               1" << nl
+        << "filename start number:         0" << nl
+        << "filename increment:            1" << nl
+        << "time values:" << nl
+        << timeValue << nl
+        << nl;
+
+    ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true);
+    osGeom << ensPart;
+
+    // Write field
+    osField.writeKeyword(ensightPTraits<Type>::typeName);
+    ensPart.writeField(osField, values, isNodeValues);
+
+    return osCase.name();
+}
+
+
+template<class Type>
+Foam::fileName Foam::ensightSurfaceWriter::writeCollated
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+
+    const fileName baseDir = outputDir.path()/surfaceName;
+    const fileName timeDir = outputDir.name();
+
+    if (!isDir(baseDir))
+    {
+        mkDir(baseDir);
+    }
+
+    const fileName meshFile(baseDir/surfaceName + ".0000.mesh");
+    const scalar timeValue = readScalar(IStringStream(timeDir)());
+    label timeIndex = 0;
+
+
+    // Do case file
+    {
+        dictionary dict;
+        scalarList times;
+        bool stateChanged = false;
+
+        if (isFile(baseDir/"fieldsDict"))
+        {
+            IFstream is(baseDir/"fieldsDict");
+            if (is.good() && dict.read(is))
+            {
+                dict.lookup("times") >> times;
+                const scalar timeValue = readScalar(IStringStream(timeDir)());
+                label index = findLower(times, timeValue);
+                timeIndex = index+1;
+            }
+        }
+
+
+        // Update stored times list
+        times.setSize(timeIndex+1, -1);
+
+        if (times[timeIndex] != timeValue)
+        {
+            stateChanged = true;
+        }
+        times[timeIndex] = timeValue;
+
+
+        // Add my information to dictionary
+        {
+            dict.set("times", times);
+            if (dict.found("fields"))
+            {
+                dictionary& fieldsDict = dict.subDict("fields");
+                if (!fieldsDict.found(fieldName))
+                {
+                    dictionary fieldDict;
+                    fieldDict.set("type", ensightPTraits<Type>::typeName);
+                    fieldsDict.set(fieldName, fieldDict);
+
+                    stateChanged = true;
+                }
+            }
+            else
+            {
+                dictionary fieldDict;
+                fieldDict.set("type", ensightPTraits<Type>::typeName);
+
+                dictionary fieldsDict;
+                fieldsDict.set(fieldName, fieldDict);
+
+                dict.set("fields", fieldsDict);
+
+                stateChanged = true;
+            }
+        }
+
+
+        if (stateChanged)
+        {
+            if (verbose)
+            {
+                Info<< "Writing state file to fieldsDict" << endl;
+            }
+            OFstream os(baseDir/"fieldsDict");
+            os << dict;
+
+
+            OFstream osCase(baseDir/surfaceName + ".case");
+
+            if (verbose)
+            {
+                Info<< "Writing case file to " << osCase.name() << endl;
+            }
+
+            osCase
+                << "FORMAT" << nl
+                << "type: ensight gold" << nl
+                << nl
+                << "GEOMETRY" << nl
+                << "model:        1     " << meshFile.name() << nl
+                << nl
+                << "VARIABLE" << nl;
+            const dictionary& fieldsDict = dict.subDict("fields");
+            forAllConstIter(dictionary, fieldsDict, iter)
+            {
+                const word& fieldName = iter().keyword();
+                const word fieldType(iter().dict().lookup("type"));
+
+                osCase
+                    << fieldType << " per "
+                    << word(isNodeValues ? "node:" : "element:")
+                    << setw(10) << 1
+                    << setw(15) << fieldName
+                    << "       " << surfaceName.c_str() << ".****." << fieldName
+                    << nl;
+            }
+            osCase << nl;
+
+            osCase
+                << "TIME" << nl
+                << "time set:                      1" << nl
+                << "number of steps:               " << timeIndex+1 << nl
+                << "filename start number:         0" << nl
+                << "filename increment:            1" << nl
+                << "time values:" << nl;
+            forAll(times, timeI)
+            {
+                osCase << setw(12) << times[timeI] << " ";
+
+                if (timeI != 0 && (timeI % 6) == 0)
+                {
+                    osCase << nl;
+                }
+            }
+            osCase << nl;
+        }
+    }
+
+
+    // Write geometry
+    ensightPartFaces ensPart(0, meshFile.name(), points, faces, true);
+    if (!exists(meshFile))
+    {
+        if (verbose)
+        {
+            Info<< "Writing mesh file to " << meshFile.name() << endl;
+        }
+        ensightGeoFile osGeom(meshFile, writeFormat_);
+        osGeom << ensPart;
+    }
+
+
+    // Get string representation
+    string timeString;
+    {
+        OStringStream os;
+        os.stdStream().fill('0');
+        os << setw(4) << timeIndex;
+        timeString = os.str();
+    }
+
+    // Write field
+    ensightFile osField
+    (
+        baseDir/surfaceName + "." + timeString + "." + fieldName,
+        writeFormat_
+    );
+    if (verbose)
+    {
+        Info<< "Writing field file to " << osField.name() << endl;
+    }
+    osField.writeKeyword(ensightPTraits<Type>::typeName);
+    ensPart.writeField(osField, values, isNodeValues);
+
+    return baseDir/surfaceName + ".case";
+}
+
+
+template<class Type>
+Foam::fileName Foam::ensightSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    if (collateTimes_)
+    {
+        return writeCollated
+        (
+            outputDir,
+            surfaceName,
+            points,
+            faces,
+            fieldName,
+            values,
+            isNodeValues,
+            verbose
+        );
+    }
+    else
+    {
+        return writeUncollated
+        (
+            outputDir,
+            surfaceName,
+            points,
+            faces,
+            fieldName,
+            values,
+            isNodeValues,
+            verbose
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C
index e85450dce5..e351afd676 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,10 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "foamFileSurfaceWriter.H"
-
-#include "OFstream.H"
-#include "OSspecific.H"
-
 #include "makeSurfaceWriterMethods.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -38,49 +34,6 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void Foam::foamFileSurfaceWriter::writeTemplate
-(
-    const fileName& outputDir,
-    const fileName& surfaceName,
-    const pointField& points,
-    const faceList& faces,
-    const word& fieldName,
-    const Field<Type>& values,
-    const bool isNodeValues,
-    const bool verbose
-) const
-{
-    fileName surfaceDir(outputDir/surfaceName);
-
-    if (!isDir(surfaceDir))
-    {
-        mkDir(surfaceDir);
-    }
-
-    if (verbose)
-    {
-        Info<< "Writing field " << fieldName << " to " << surfaceDir << endl;
-    }
-
-    // geometry should already have been written
-    // Values to separate directory (e.g. "scalarField/p")
-
-    fileName foamName(pTraits<Type>::typeName);
-    fileName valuesDir(surfaceDir  / (foamName + Field<Type>::typeName));
-
-    if (!isDir(valuesDir))
-    {
-        mkDir(valuesDir);
-    }
-
-    // values
-    OFstream(valuesDir/fieldName)()  << values;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::foamFileSurfaceWriter::foamFileSurfaceWriter()
@@ -97,7 +50,7 @@ Foam::foamFileSurfaceWriter::~foamFileSurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::foamFileSurfaceWriter::write
+Foam::fileName Foam::foamFileSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -135,6 +88,8 @@ void Foam::foamFileSurfaceWriter::write
     }
 
     OFstream(surfaceDir/"faceCentres")() << faceCentres;
+
+    return surfaceDir;
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
index 254dadcb44..9407ea7c1b 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ class foamFileSurfaceWriter
 
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -87,13 +87,13 @@ public:
 
         //- True if the surface format supports geometry in a separate file.
         //  False if geometry and field must be in a single file
-        virtual bool separateGeometry()
+        virtual bool separateGeometry() const
         {
             return true;
         }
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -105,7 +105,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -119,7 +119,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -133,7 +133,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -147,7 +147,7 @@ public:
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -161,7 +161,7 @@ public:
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -172,7 +172,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };
 
 
@@ -182,6 +181,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "foamFileSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..2ab563fc10
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterTemplates.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstream.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::fileName Foam::foamFileSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    fileName surfaceDir(outputDir/surfaceName);
+
+    if (!isDir(surfaceDir))
+    {
+        mkDir(surfaceDir);
+    }
+
+    if (verbose)
+    {
+        Info<< "Writing field " << fieldName << " to " << surfaceDir << endl;
+    }
+
+    // geometry should already have been written
+    // Values to separate directory (e.g. "scalarField/p")
+
+    fileName foamName(pTraits<Type>::typeName);
+    fileName valuesDir(surfaceDir/(foamName + Field<Type>::typeName));
+
+    if (!isDir(valuesDir))
+    {
+        mkDir(valuesDir);
+    }
+
+    // values
+    OFstream(valuesDir/fieldName)()  << values;
+
+    return valuesDir/fieldName;
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
index 2f640fc2e0..8fbcce27a9 100644
--- a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
+++ b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ namespace Foam
 
 
 #define defineSurfaceWriterWriteField(ThisClass, FieldType)                   \
-    void ThisClass::write                                                     \
+    Foam::fileName ThisClass::write                                           \
     (                                                                         \
         const fileName& outputDir,                                            \
         const fileName& surfaceName,                                          \
@@ -59,7 +59,7 @@ namespace Foam
         const bool verbose                                                    \
     ) const                                                                   \
     {                                                                         \
-        writeTemplate                                                         \
+        return writeTemplate                                                  \
         (                                                                     \
             outputDir,                                                        \
             surfaceName,                                                      \
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
index eaa16feb6b..dfe2a9f8ce 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,7 +35,7 @@ namespace Foam
     makeSurfaceWriterType(nastranSurfaceWriter);
     addToRunTimeSelectionTable(surfaceWriter, nastranSurfaceWriter, wordDict);
 
-    // create write methods
+    // Create write methods
     defineSurfaceWriterWriteFields(nastranSurfaceWriter);
 
     template<>
@@ -46,8 +46,19 @@ namespace Foam
         "free"
     };
 
+
     const NamedEnum<nastranSurfaceWriter::writeFormat, 3>
         nastranSurfaceWriter::writeFormatNames_;
+
+    template<>
+    const char* NamedEnum<nastranSurfaceWriter::dataFormat, 2>::names[] =
+    {
+        "PLOAD2",
+        "PLOAD4"
+    };
+
+    const NamedEnum<nastranSurfaceWriter::dataFormat, 2>
+        nastranSurfaceWriter::dataFormatNames_;
 }
 
 
@@ -57,7 +68,7 @@ void Foam::nastranSurfaceWriter::formatOS(OFstream& os) const
 {
     os.setf(ios_base::scientific);
 
-    // capitalise the E marker
+    // Capitalise the E marker
     os.setf(ios_base::uppercase);
 
     label prec = 0;
@@ -65,11 +76,11 @@ void Foam::nastranSurfaceWriter::formatOS(OFstream& os) const
     switch (writeFormat_)
     {
         case (wfShort):
-        case (wfFree):
         {
             prec = 8 - offset;
             break;
         }
+        case (wfFree):
         case (wfLong):
         {
             prec = 16 - offset;
@@ -84,6 +95,37 @@ void Foam::nastranSurfaceWriter::formatOS(OFstream& os) const
 }
 
 
+void Foam::nastranSurfaceWriter::writeKeyword
+(
+    const word& keyword,
+    Ostream& os
+) const
+{
+    os.setf(ios_base::left);
+
+    switch (writeFormat_)
+    {
+        case wfShort:
+        {
+            os  << setw(8) << keyword;
+            break;
+        }
+        case wfLong:
+        {
+            os  << setw(8) << word(keyword + '*');
+            break;
+        }
+        case wfFree:
+        {
+            os  << keyword;
+            break;
+        }
+    }
+
+    os.unsetf(ios_base::left);
+}
+
+
 void Foam::nastranSurfaceWriter::writeCoord
 (
     const point& p,
@@ -102,19 +144,27 @@ void Foam::nastranSurfaceWriter::writeCoord
     // 8 PS   : single point constraints             (blank)
     // 9 SEID : super-element ID
 
+
+    writeKeyword("GRID", os);
+
+    os  << separator_;
+
+    os.setf(ios_base::right);
+
+    writeValue(pointI + 1, os);
+    os  << separator_;
+    writeValue("", os);
+    os  << separator_;
+    writeValue(p.x(), os);
+    os  << separator_;
+    writeValue(p.y(), os);
+    os  << separator_;
+
     switch (writeFormat_)
     {
         case wfShort:
         {
-            os.setf(ios_base::left);
-            os  << setw(8) << "GRID";
-            os.unsetf(ios_base::left);
-            os.setf(ios_base::right);
-            os  << setw(8) << pointI + 1
-                << "        " 
-                << setw(8) << p.x()
-                << setw(8) << p.y()
-                << setw(8) << p.z()
+            os  << setw(8) << p.z()
                 << nl;
             os.unsetf(ios_base::right);
 
@@ -122,52 +172,33 @@ void Foam::nastranSurfaceWriter::writeCoord
         }
         case wfLong:
         {
-            os.setf(ios_base::left);
-            os  << setw(8) << "GRID*";
-            os.unsetf(ios_base::left);
-            os.setf(ios_base::right);
-            os  << setw(16) << pointI + 1
-                << "                "
-                << setw(16) << p.x()
-                << setw(16) << p.y()
-                << nl;
+            os  << nl;
             os.unsetf(ios_base::right);
-            os.setf(ios_base::left);
-            os  << setw(8) << "*";
-            os.unsetf(ios_base::left);
+            writeKeyword("", os);
             os.setf(ios_base::right);
-            os  << setw(16) << p.z()
-                << nl;
-            os.unsetf(ios_base::right);
+            writeValue(p.z(), os);
+            os  << nl;
 
             break;
         }
         case wfFree:
         {
-            os  << "GRID"
-                << ',' << pointI + 1
-                << ','
-                << ',' << p.x()
-                << ',' << p.y()
-                << ',' << p.z()
-                << nl;
+            writeValue(p.z(), os);
+            os  << nl;
 
             break;
         }
         default:
         {
-            FatalErrorIn
-            (
-                "void Foam::nastranSurfaceWriter::writeCoord"
-                "("
-                    "Ostream&, "
-                    "const point&"
-                ") const"
-            )   << "Unknown writeFormat enumeration" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown writeFormat enumeration" << abort(FatalError);
         }
     }
+
+    os.unsetf(ios_base::right);
 }
 
+
 void Foam::nastranSurfaceWriter::writeFace
 (
     const word& faceType,
@@ -190,84 +221,66 @@ void Foam::nastranSurfaceWriter::writeFace
 
     // For CTRIA3 elements, cols 7 onwards are not used
 
+    label PID = 1;
+
+    writeKeyword(faceType, os);
+
+    os  << separator_;
+
+    os.setf(ios_base::right);
+
+    writeValue(nFace++, os);
+
+    os  << separator_;
+
+    writeValue(PID, os);
+
     switch (writeFormat_)
     {
         case wfShort:
         {
-            os.setf(ios_base::left);
-            os  << setw(8) << faceType;
-            os.unsetf(ios_base::left);
-            os.setf(ios_base::right);
-            os  << setw(8) << nFace++
-                << "        ";
-
             forAll(facePts, i)
             {
-                os  << setw(8) << facePts[i] + 1;
+                writeValue(facePts[i] + 1, os);
             }
 
-            os  << nl;
-            os.unsetf(ios_base::right);
-
             break;
         }
         case wfLong:
         {
-            os.setf(ios_base::left);
-            os  << setw(8) << word(faceType + "*");
-            os.unsetf(ios_base::left);
-            os.setf(ios_base::right);
-            os  << setw(16) << nFace++
-                << "                ";
-
             forAll(facePts, i)
             {
-                os  << setw(16) << facePts[i] + 1;
+                writeValue(facePts[i] + 1, os);
                 if (i == 1)
                 {
                     os  << nl;
                     os.unsetf(ios_base::right);
-                    os.setf(ios_base::left);
-                    os  << setw(8) << "*";
-                    os.unsetf(ios_base::left);
+                    writeKeyword("", os);
                     os.setf(ios_base::right);
                 }
             }
 
-            os  << nl;
-            os.unsetf(ios_base::right);
-
             break;
         }
         case wfFree:
         {
-            os  << faceType << ','
-                << ++nFace << ',';
-
             forAll(facePts, i)
             {
-                os  << ',' << facePts[i] + 1;
+                os  << separator_;
+                writeValue(facePts[i] + 1, os);
             }
 
-            os  << nl;
-
             break;
         }
         default:
         {
-            FatalErrorIn
-            (
-                "void Foam::nastranSurfaceWriter::writeFace"
-                "("
-                    "const word&"
-                    "const labelList&"
-                    "label&"
-                    "Ostream&, "
-                ") const"
-            )   << "Unknown writeFormat enumeration" << abort(FatalError);
+            FatalErrorInFunction
+                << "Unknown writeFormat enumeration" << abort(FatalError);
         }
     }
 
+    os  << nl;
+    os.unsetf(ios_base::right);
 }
 
 
@@ -279,7 +292,7 @@ void Foam::nastranSurfaceWriter::writeGeometry
     OFstream& os
 ) const
 {
-    // write points
+    // Write points
 
     os  << "$" << nl
         << "$ Points" << nl
@@ -291,7 +304,7 @@ void Foam::nastranSurfaceWriter::writeGeometry
     }
 
 
-    // write faces
+    // Write faces
 
     os  << "$" << nl
         << "$ Faces" << nl
@@ -315,7 +328,7 @@ void Foam::nastranSurfaceWriter::writeGeometry
         }
         else
         {
-            // decompose poly face into tris
+            // Decompose poly face into tris
             label nTri = 0;
             faceList triFaces;
             f.triangles(points, nTri, triFaces);
@@ -330,6 +343,42 @@ void Foam::nastranSurfaceWriter::writeGeometry
 }
 
 
+void Foam::nastranSurfaceWriter::writeFooter(Ostream& os) const
+{
+    label PID = 1;
+
+    writeKeyword("PSHELL", os);
+
+    os  << separator_;
+
+    writeValue(PID, os);
+
+    for (label i = 0; i < 7; i++)
+    {
+        // Dummy values
+        os  << separator_;
+        writeValue(1, os);
+    }
+
+    os  << nl;
+    writeKeyword("MAT1", os);
+    os  << separator_;
+
+    label MID = 1;
+
+    writeValue(MID, os);
+
+    for (label i = 0; i < 7; i++)
+    {
+        // Dummy values
+        os  << separator_;
+        writeValue("", os);
+    }
+
+    os << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::nastranSurfaceWriter::nastranSurfaceWriter()
@@ -346,18 +395,26 @@ Foam::nastranSurfaceWriter::nastranSurfaceWriter(const dictionary& options)
     surfaceWriter(),
     writeFormat_(wfLong),
     fieldMap_(),
-    scale_(options.lookupOrDefault("scale", 1.0))
+    scale_(options.lookupOrDefault("scale", 1.0)),
+    separator_("")
 {
     if (options.found("format"))
     {
         writeFormat_ = writeFormatNames_.read(options.lookup("format"));
     }
 
+    if (writeFormat_ == wfFree)
+    {
+        separator_ = ",";
+    }
+
     List<Tuple2<word, word> > fieldSet(options.lookup("fields"));
 
     forAll(fieldSet, i)
     {
-        fieldMap_.insert(fieldSet[i].first(), fieldSet[i].second());
+        dataFormat format = dataFormatNames_[fieldSet[i].second()];
+
+        fieldMap_.insert(fieldSet[i].first(), format);
     }
 }
 
@@ -370,7 +427,7 @@ Foam::nastranSurfaceWriter::~nastranSurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::nastranSurfaceWriter::write
+Foam::fileName Foam::nastranSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -384,7 +441,7 @@ void Foam::nastranSurfaceWriter::write
         mkDir(outputDir);
     }
 
-    OFstream os(outputDir/surfaceName + ".dat");
+    OFstream os(outputDir/surfaceName + ".nas");
     formatOS(os);
 
     if (verbose)
@@ -405,7 +462,11 @@ void Foam::nastranSurfaceWriter::write
         mkDir(outputDir);
     }
 
+    writeFooter(os);
+
     os  << "ENDDATA" << endl;
+
+    return os.name();
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
index e80383a303..733c1a0d07 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,11 @@ Description
         nastran
         {
             // From OpenFOAM field name to Nastran field name
-            fields ((pMean PLOAD2));
+            fields
+            (
+                (pMean PLOAD2)
+                (p     PLOAD4)
+            );
             // Optional scale
             scale 2.0;
             // Optional format
@@ -52,6 +56,7 @@ SourceFiles
 #include "surfaceWriter.H"
 #include "NamedEnum.H"
 #include "OFstream.H"
+#include "HashTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,6 +82,14 @@ public:
 
     static const NamedEnum<writeFormat, 3> writeFormatNames_;
 
+    enum dataFormat
+    {
+        dfPLOAD2,
+        dfPLOAD4
+    };
+
+    static const NamedEnum<dataFormat, 2> dataFormatNames_;
+
 
 private:
 
@@ -85,12 +98,15 @@ private:
         //- Write option
         writeFormat writeFormat_;
 
-        //- Map of OpenFOAM field name vs nastran field name
-        HashTable<word> fieldMap_;
+        //- Mapping from field name to data format enumeration
+        HashTable<dataFormat, word> fieldMap_;
 
         //- Scale to apply to values (default = 1.0)
         scalar scale_;
 
+        //- Separator used for free format
+        word separator_;
+
 
     // Private Member Functions
 
@@ -123,19 +139,37 @@ private:
             OFstream& os
         ) const;
 
+        //- Write the formatted keyword to the output stream
+        void writeKeyword
+        (
+            const word& keyword,
+            Ostream& os
+        ) const;
+
+        //- Write the footer information
+        void writeFooter(Ostream& os) const;
+
+        //- Write a formatted value to the output stream
+        template<class Type>
+        void writeValue
+        (
+            const Type& value,
+            Ostream& os
+        ) const;
+
         //- Write a face-based value
         template<class Type>
         void writeFaceValue
         (
-            const word& nasFieldName,
+            const dataFormat& format,
             const Type& value,
             const label EID,
-            OFstream& os
+            Ostream& os
         ) const;
 
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -171,13 +205,13 @@ public:
 
         //- True if the surface format supports geometry in a separate file.
         //  False if geometry and field must be in a single file
-        virtual bool separateGeometry()
+        virtual bool separateGeometry() const
         {
             return false;
         }
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -188,7 +222,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -202,7 +236,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -216,7 +250,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -230,7 +264,7 @@ public:
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -244,7 +278,7 @@ public:
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
index fe1e6a998a..9b1815787d 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,92 +30,121 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::nastranSurfaceWriter::writeFaceValue
+void Foam::nastranSurfaceWriter::writeValue
 (
-    const word& nasFieldName,
     const Type& value,
-    const label EID,
-    OFstream& os
+    Ostream& os
 ) const
 {
-    // Fixed short/long formats:
-    // 1 Nastran distributed load type, e.g. PLOAD4
-    // 2 SID  : load set ID
-    // 3 EID  : element ID
-    // 4 onwards: load values
+    switch (writeFormat_)
+    {
+        case wfShort:
+        {
+            os  << setw(8) << value;
+            break;
+        }
+        case wfLong:
+        {
+            os  << setw(16) << value;
+            break;
+        }
+        case wfFree:
+        {
+            os  << value;
+            break;
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::nastranSurfaceWriter::writeFaceValue
+(
+    const dataFormat& format,
+    const Type& value,
+    const label EID,
+    Ostream& os
+) const
+{
+    // Fixed short/long formats supporting PLOAD2 and PLOAD4:
+
+    // PLOAD2:
+    // 1 descriptor : PLOAD2
+    // 2 SID        : load set ID
+    // 3 data value : load value - MUST be singular
+    // 4 EID        : element ID
+
+    // PLOAD4:
+    // 1 descriptor : PLOAD4
+    // 2 SID        : load set ID
+    // 3 EID        : element ID
+    // 4 onwards    : load values
 
     label SID = 1;
 
     Type scaledValue = scale_*value;
 
-    switch (writeFormat_)
+    // Write Keyword
+    writeKeyword(dataFormatNames_[format], os);
+
+    os  << separator_;
+
+    // Write load set ID
+    os.setf(ios_base::right);
+    writeValue(SID, os);
+
+    os  << separator_;
+
+    switch (format)
     {
-        case wfShort:
+        case dfPLOAD2:
         {
-            os.setf(ios_base::left);
-            os  << setw(8) << nasFieldName;
-            os.unsetf(ios_base::left);
-            os.setf(ios_base::right);
-            os  << setw(8) << SID
-                << setw(8) << EID;
-
-            for (direction dirI = 0; dirI < pTraits<Type>::nComponents; dirI++)
+            if (pTraits<Type>::nComponents == 1)
             {
-                os  << setw(8) << component(scaledValue, dirI);
+                writeValue(scaledValue, os);
+            }
+            else
+            {
+                WarningInFunction
+                    << dataFormatNames_[format] << " requires scalar values "
+                    << "and cannot be used for higher rank values"
+                    << endl;
+
+                writeValue(scalar(0), os);
             }
 
-            os.unsetf(ios_base::right);
+            os  << separator_;
+            writeValue(EID, os);
 
             break;
         }
-        case wfLong:
+        case dfPLOAD4:
         {
-            os.setf(ios_base::left);
-            os  << setw(8) << word(nasFieldName + "*");
-            os.unsetf(ios_base::left);
-            os.setf(ios_base::right);
-            os  << setw(16) << SID
-                << setw(16) << EID;
+            writeValue(EID, os);
 
             for (direction dirI = 0; dirI < pTraits<Type>::nComponents; dirI++)
             {
-                os  << setw(16) << component(scaledValue, dirI);
+                os  << separator_;
+                writeValue(component(scaledValue, dirI), os);
             }
-
-            os.unsetf(ios_base::right);
-
-            os  << nl;
-
-            os.setf(ios_base::left);
-            os  << '*';
-            os.unsetf(ios_base::left);
-
-            break;
-        }
-        case wfFree:
-        {
-            os  << nasFieldName << ','
-                << SID << ','
-                << EID;
-
-            for (direction dirI = 0; dirI < pTraits<Type>::nComponents; dirI++)
-            {
-                os  << ',' << component(scaledValue, dirI);
-            }
-
             break;
         }
         default:
         {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << dataFormatNames_[format]
+                << exit(FatalError);
         }
     }
 
+    os.unsetf(ios_base::right);
+
     os << nl;
 }
 
 
 template<class Type>
-void Foam::nastranSurfaceWriter::writeTemplate
+Foam::fileName Foam::nastranSurfaceWriter::writeTemplate
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -129,29 +158,16 @@ void Foam::nastranSurfaceWriter::writeTemplate
 {
     if (!fieldMap_.found(fieldName))
     {
-        WarningIn
-        (
-            "void Foam::nastranSurfaceWriter::writeTemplate"
-            "("
-                "const fileName&, "
-                "const fileName&, "
-                "const pointField&, "
-                "const faceList&, "
-                "const word&, "
-                "const Field<Type>&, "
-                "const bool, "
-                "const bool"
-            ") const"
-        )
+        FatalErrorInFunction
             << "No mapping found between field " << fieldName
             << " and corresponding Nastran field.  Available types are:"
             << fieldMap_
             << exit(FatalError);
 
-        return;
+        return fileName::null;
     }
 
-    const word& nasFieldName(fieldMap_[fieldName]);
+    const dataFormat& format(fieldMap_[fieldName]);
 
     if (!isDir(outputDir/fieldName))
     {
@@ -161,7 +177,7 @@ void Foam::nastranSurfaceWriter::writeTemplate
     // const scalar timeValue = Foam::name(this->mesh().time().timeValue());
     const scalar timeValue = 0.0;
 
-    OFstream os(outputDir/fieldName/surfaceName + ".dat");
+    OFstream os(outputDir/fieldName/surfaceName + ".nas");
     formatOS(os);
 
     if (verbose)
@@ -203,7 +219,7 @@ void Foam::nastranSurfaceWriter::writeTemplate
                 }
                 v /= f.size();
 
-                writeFaceValue(nasFieldName, v, ++n, os);
+                writeFaceValue(format, v, ++n, os);
             }
         }
     }
@@ -217,12 +233,16 @@ void Foam::nastranSurfaceWriter::writeTemplate
 
             forAll(dFaces, faceI)
             {
-                writeFaceValue(nasFieldName, values[faceI], ++n, os);
+                writeFaceValue(format, values[faceI], ++n, os);
             }
         }
     }
 
+    writeFooter(os);
+
     os  << "ENDDATA" << endl;
+
+    return os.name();
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
index 780e25b568..c92c09d8f6 100644
--- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,7 @@ Foam::proxySurfaceWriter::~proxySurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::proxySurfaceWriter::write
+Foam::fileName Foam::proxySurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -68,7 +68,7 @@ void Foam::proxySurfaceWriter::write
     // avoid bad values
     if (ext_.empty())
     {
-        return;
+        return fileName::null;
     }
 
     if (!isDir(outputDir))
@@ -84,6 +84,8 @@ void Foam::proxySurfaceWriter::write
     }
 
     MeshedSurfaceProxy<face>(points, faces).write(outName);
+
+    return outName;
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
index 89ec6429f4..3ace22ea84 100644
--- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,14 +78,14 @@ public:
 
         //- True if the surface format supports geometry in a separate file.
         //  False if geometry and field must be in a single file
-        virtual bool separateGeometry()
+        virtual bool separateGeometry() const
         {
             return true;
         }
 
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -93,7 +93,6 @@ public:
             const faceList& faces,
             const bool verbose = false
         ) const;
-
 };
 
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
index 1899b1212a..0d62326da7 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,11 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "rawSurfaceWriter.H"
-
-#include "OFstream.H"
-#include "OSspecific.H"
-#include "IOmanip.H"
-
 #include "makeSurfaceWriterMethods.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -208,66 +203,6 @@ namespace Foam
 }
 
 
-template<class Type>
-void Foam::rawSurfaceWriter::writeTemplate
-(
-    const fileName& outputDir,
-    const fileName& surfaceName,
-    const pointField& points,
-    const faceList& faces,
-    const word& fieldName,
-    const Field<Type>& values,
-    const bool isNodeValues,
-    const bool verbose
-) const
-{
-    if (!isDir(outputDir))
-    {
-        mkDir(outputDir);
-    }
-
-    OFstream os(outputDir/fieldName + '_' + surfaceName + ".raw");
-
-    if (verbose)
-    {
-        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
-    }
-
-    // header
-    os  << "# " << fieldName;
-    if (isNodeValues)
-    {
-        os  << "  POINT_DATA ";
-    }
-    else
-    {
-        os  << "  FACE_DATA ";
-    }
-
-    // header
-    writeHeader(os, fieldName, values);
-
-    // values
-    if (isNodeValues)
-    {
-        forAll(values, elemI)
-        {
-            writeLocation(os, points, elemI);
-            writeData(os, values[elemI]);
-        }
-    }
-    else
-    {
-        forAll(values, elemI)
-        {
-            writeLocation(os, points, faces, elemI);
-            writeData(os, values[elemI]);
-        }
-    }
-}
-
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::rawSurfaceWriter::rawSurfaceWriter()
@@ -284,7 +219,7 @@ Foam::rawSurfaceWriter::~rawSurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::rawSurfaceWriter::write
+Foam::fileName Foam::rawSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -318,6 +253,8 @@ void Foam::rawSurfaceWriter::write
     }
 
     os  << nl;
+
+    return os.name();
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
index 6a3b3c2ee2..fbfccee75f 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,7 +82,7 @@ class rawSurfaceWriter
 
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -114,7 +114,7 @@ public:
     // Member Functions
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -126,7 +126,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -140,7 +140,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -154,7 +154,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -168,7 +168,7 @@ public:
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -182,7 +182,7 @@ public:
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -193,7 +193,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };
 
 
@@ -203,6 +202,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "rawSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..3341378838
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterTemplates.C
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstream.H"
+#include "OSspecific.H"
+#include "IOmanip.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::fileName Foam::rawSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    if (!isDir(outputDir))
+    {
+        mkDir(outputDir);
+    }
+
+    OFstream os(outputDir/fieldName + '_' + surfaceName + ".raw");
+
+    if (verbose)
+    {
+        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
+    }
+
+    // header
+    os  << "# " << fieldName;
+    if (isNodeValues)
+    {
+        os  << "  POINT_DATA ";
+    }
+    else
+    {
+        os  << "  FACE_DATA ";
+    }
+
+    // header
+    writeHeader(os, fieldName, values);
+
+    // values
+    if (isNodeValues)
+    {
+        forAll(values, elemI)
+        {
+            writeLocation(os, points, elemI);
+            writeData(os, values[elemI]);
+        }
+    }
+    else
+    {
+        forAll(values, elemI)
+        {
+            writeLocation(os, points, faces, elemI);
+            writeData(os, values[elemI]);
+        }
+    }
+
+    return os.name();
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C
index 86fb4b1c17..2b58417a5b 100644
--- a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,11 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "starcdSurfaceWriter.H"
-
 #include "MeshedSurfaceProxy.H"
-#include "OFstream.H"
-#include "OSspecific.H"
-
 #include "makeSurfaceWriterMethods.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -78,50 +74,6 @@ namespace Foam
 }
 
 
-template<class Type>
-inline void Foam::starcdSurfaceWriter::writeData
-(
-    Ostream& os,
-    const Type& v
-)
-{}
-
-
-template<class Type>
-void Foam::starcdSurfaceWriter::writeTemplate
-(
-    const fileName& outputDir,
-    const fileName& surfaceName,
-    const pointField& points,
-    const faceList& faces,
-    const word& fieldName,
-    const Field<Type>& values,
-    const bool isNodeValues,
-    const bool verbose
-) const
-{
-    if (!isDir(outputDir))
-    {
-        mkDir(outputDir);
-    }
-
-    OFstream os(outputDir/fieldName + '_' + surfaceName + ".usr");
-
-    if (verbose)
-    {
-        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
-    }
-
-    // no header, just write values
-    forAll(values, elemI)
-    {
-        os  << elemI+1 << ' ';
-        writeData(os, values[elemI]);
-    }
-}
-
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::starcdSurfaceWriter::starcdSurfaceWriter()
@@ -138,7 +90,7 @@ Foam::starcdSurfaceWriter::~starcdSurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::starcdSurfaceWriter::write
+Foam::fileName Foam::starcdSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -160,6 +112,8 @@ void Foam::starcdSurfaceWriter::write
     }
 
     MeshedSurfaceProxy<face>(points, faces).write(outName);
+
+    return outName;
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H
index 13444367fc..aeaed7d30b 100644
--- a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,7 +77,7 @@ class starcdSurfaceWriter
 
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -110,13 +110,13 @@ public:
 
         //- True if the surface format supports geometry in a separate file.
         //  False if geometry and field must be in a single file
-        virtual bool separateGeometry()
+        virtual bool separateGeometry() const
         {
             return true;
         }
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -127,7 +127,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -141,7 +141,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -155,7 +155,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -166,7 +166,6 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const;
-
 };
 
 
@@ -176,6 +175,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "starcdSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..026b5b7425
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriterTemplates.C
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstream.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+inline void Foam::starcdSurfaceWriter::writeData
+(
+    Ostream& os,
+    const Type& v
+)
+{}
+
+
+template<class Type>
+Foam::fileName Foam::starcdSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    if (!isDir(outputDir))
+    {
+        mkDir(outputDir);
+    }
+
+    OFstream os(outputDir/fieldName + '_' + surfaceName + ".usr");
+
+    if (verbose)
+    {
+        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
+    }
+
+    // no header, just write values
+    forAll(values, elemI)
+    {
+        os  << elemI+1 << ' ';
+        writeData(os, values[elemI]);
+    }
+
+    return os.name();
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C
index 86beeabe19..bba94f1e57 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,10 +68,8 @@ Foam::surfaceWriter::New(const word& writeType)
 
         if (cstrIter == wordConstructorTablePtr_->end())
         {
-            FatalErrorIn
-            (
-                "surfaceWriter::New(const word&)"
-            )   << "Unknown write type \"" << writeType << "\"\n\n"
+            FatalErrorInFunction
+                << "Unknown write type \"" << writeType << "\"\n\n"
                 << "Valid write types : "
                 << wordConstructorTablePtr_->sortedToc() << nl
                 << "Valid proxy types : "
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H
index 84ca3cdf5d..bd4c404203 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -110,13 +110,13 @@ public:
 
         //- True if the surface format supports geometry in a separate file.
         //  False if geometry and field must be in a single file
-        virtual bool separateGeometry()
+        virtual bool separateGeometry() const
         {
             return false;
         }
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -124,11 +124,13 @@ public:
             const faceList& faces,
             const bool verbose = false
         ) const
-        {}
+        {
+            return fileName::null;
+        }
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -139,11 +141,13 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const
-        {}
+        {
+            return fileName::null;
+        }
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -154,11 +158,13 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const
-        {}
+        {
+            return fileName::null;
+        }
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -169,11 +175,13 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const
-        {}
+        {
+            return fileName::null;
+        }
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -184,11 +192,13 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const
-        {}
+        {
+            return fileName::null;
+        }
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -199,7 +209,9 @@ public:
             const bool isNodeValues,
             const bool verbose = false
         ) const
-        {}
+        {
+            return fileName::null;
+        }
 };
 
 
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
index 5e6c38045b..f62f886992 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,10 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "vtkSurfaceWriter.H"
-
-#include "OFstream.H"
-#include "OSspecific.H"
-
 #include "makeSurfaceWriterMethods.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -202,69 +198,6 @@ namespace Foam
 }
 
 
-// Write generic field in vtk format
-template<class Type>
-void Foam::vtkSurfaceWriter::writeData
-(
-    Ostream& os,
-    const Field<Type>& values
-)
-{
-    os  << "1 " << values.size() << " float" << nl;
-
-    forAll(values, elemI)
-    {
-        os  << float(0) << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::vtkSurfaceWriter::writeTemplate
-(
-    const fileName& outputDir,
-    const fileName& surfaceName,
-    const pointField& points,
-    const faceList& faces,
-    const word& fieldName,
-    const Field<Type>& values,
-    const bool isNodeValues,
-    const bool verbose
-) const
-{
-    if (!isDir(outputDir))
-    {
-        mkDir(outputDir);
-    }
-
-    OFstream os(outputDir/fieldName + '_' + surfaceName + ".vtk");
-
-    if (verbose)
-    {
-        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
-    }
-
-    writeGeometry(os, points, faces);
-
-    // start writing data
-    if (isNodeValues)
-    {
-        os  << "POINT_DATA ";
-    }
-    else
-    {
-        os  << "CELL_DATA ";
-    }
-
-    os  << values.size() << nl
-        << "FIELD attributes 1" << nl
-        << fieldName << " ";
-
-    // Write data
-    writeData(os, values);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::vtkSurfaceWriter::vtkSurfaceWriter()
@@ -281,7 +214,7 @@ Foam::vtkSurfaceWriter::~vtkSurfaceWriter()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::vtkSurfaceWriter::write
+Foam::fileName Foam::vtkSurfaceWriter::write
 (
     const fileName& outputDir,
     const fileName& surfaceName,
@@ -303,6 +236,8 @@ void Foam::vtkSurfaceWriter::write
     }
 
     writeGeometry(os, points, faces);
+
+    return os.name();
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
index e6a6a91c01..03d0029727 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ class vtkSurfaceWriter
 
         //- Templated write operation
         template<class Type>
-        void writeTemplate
+        fileName writeTemplate
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -72,6 +72,7 @@ class vtkSurfaceWriter
             const bool verbose
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -91,7 +92,7 @@ public:
     // Member Functions
 
         //- Write single surface geometry to file.
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,
             const fileName& surfaceName,
@@ -103,7 +104,7 @@ public:
 
         //- Write scalarField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -117,7 +118,7 @@ public:
 
         //- Write vectorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -131,7 +132,7 @@ public:
 
         //- Write sphericalTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -145,7 +146,7 @@ public:
 
         //- Write symmTensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -159,7 +160,7 @@ public:
 
         //- Write tensorField for a single surface to file.
         //  One value per face or vertex (isNodeValues = true)
-        virtual void write
+        virtual fileName write
         (
             const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
@@ -180,6 +181,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "vtkSurfaceWriterTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterTemplates.C
new file mode 100644
index 0000000000..aaf17bbfeb
--- /dev/null
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterTemplates.C
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "OFstream.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::vtkSurfaceWriter::writeData
+(
+    Ostream& os,
+    const Field<Type>& values
+)
+{
+    os  << "1 " << values.size() << " float" << nl;
+
+    forAll(values, elemI)
+    {
+        os  << float(0) << nl;
+    }
+}
+
+
+template<class Type>
+Foam::fileName Foam::vtkSurfaceWriter::writeTemplate
+(
+    const fileName& outputDir,
+    const fileName& surfaceName,
+    const pointField& points,
+    const faceList& faces,
+    const word& fieldName,
+    const Field<Type>& values,
+    const bool isNodeValues,
+    const bool verbose
+) const
+{
+    if (!isDir(outputDir))
+    {
+        mkDir(outputDir);
+    }
+
+    OFstream os(outputDir/fieldName + '_' + surfaceName + ".vtk");
+
+    if (verbose)
+    {
+        Info<< "Writing field " << fieldName << " to " << os.name() << endl;
+    }
+
+    writeGeometry(os, points, faces);
+
+    // start writing data
+    if (isNodeValues)
+    {
+        os  << "POINT_DATA ";
+    }
+    else
+    {
+        os  << "CELL_DATA ";
+    }
+
+    os  << values.size() << nl
+        << "FIELD attributes 1" << nl
+        << fieldName << " ";
+
+    // Write data
+    writeData(os, values);
+
+    return os.name();
+}
+
+
+// ************************************************************************* //
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index 7f51b9551d..b69b8065be 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -178,11 +178,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
         {
             if (lookupGravity_ == -2)
             {
-                FatalErrorIn
-                (
-                    "void sixDoFRigidBodyDisplacementPointPatchVectorField"
-                    "::updateCoeffs()"
-                )
+                FatalErrorInFunction
                     << "Specifying the value of g in this boundary condition "
                     << "when g is available from the database is considered "
                     << "a fatal error to avoid the possibility of inconsistency"
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
index a06ca8a799..985d7ae4ca 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C
@@ -102,13 +102,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::axis::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionConstraints::axis::read"
-            "("
-                "const dictionary& sDoFRBMCDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "axis has zero length"
             << abort(FatalError);
     }
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
index 259f35b317..7e7189b0d1 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C
@@ -116,13 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::line::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionConstraints::line::read"
-            "("
-                "const dictionary& sDoFRBMCDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "line direction has zero length"
             << abort(FatalError);
     }
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
index 8893d8e801..9173e2fb81 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,15 +45,8 @@ Foam::sixDoFRigidBodyMotionConstraint::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "sixDoFRigidBodyMotionConstraint::New"
-            "("
-                "const word& name,"
-                "const dictionary& sDoFRBMCDict"
-                "const sixDoFRigidBodyMotion& motion"
-            ")"
-        )   << "Unknown sixDoFRigidBodyMotionConstraint type "
+        FatalErrorInFunction
+            << "Unknown sixDoFRigidBodyMotionConstraint type "
             << constraintType << nl << nl
             << "Valid sixDoFRigidBodyMotionConstraints are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 28a9774d5e..7f0d8ddb01 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -152,14 +152,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::read
 
     if (mag(mag(refQ_) - sqrt(3.0)) > 1e-9)
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::"
-            "read"
-            "("
-                "const dictionary& sDoFRBMRDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "referenceOrientation " << refQ_ << " is not a rotation tensor. "
             << "mag(referenceOrientation) - sqrt(3) = "
             << mag(refQ_) - sqrt(3.0) << nl
@@ -176,14 +169,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::"
-            "read"
-            "("
-                "const dictionary& sDoFRBMCDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "axis has zero length"
             << abort(FatalError);
     }
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
index 1bb047a77d..3398826611 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,13 +44,8 @@ Foam::sixDoFRigidBodyMotionRestraint::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "sixDoFRigidBodyMotionRestraint::New"
-            "("
-                "const dictionary& sDoFRBMRDict"
-            ")"
-        )   << "Unknown sixDoFRigidBodyMotionRestraint type "
+        FatalErrorInFunction
+            << "Unknown sixDoFRigidBodyMotionRestraint type "
             << restraintType << nl << nl
             << "Valid sixDoFRigidBodyMotionRestraint types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
index 5419f9285c..4ae6f217a4 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
@@ -126,14 +126,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::read
 
     if (mag(mag(refQ_) - sqrt(3.0)) > 1e-9)
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::"
-            "read"
-            "("
-                "const dictionary& sDoFRBMRDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "referenceOrientation " << refQ_ << " is not a rotation tensor. "
             << "mag(referenceOrientation) - sqrt(3) = "
             << mag(refQ_) - sqrt(3.0) << nl
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index d9ab2c2713..acaeea98fc 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -153,14 +153,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read
 
     if (mag(mag(refQ_) - sqrt(3.0)) > 1e-9)
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionRestraints::"
-            "tabulatedAxialAngularSpring::read"
-            "("
-                "const dictionary& sDoFRBMRDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "referenceOrientation " << refQ_ << " is not a rotation tensor. "
             << "mag(referenceOrientation) - sqrt(3) = "
             << mag(refQ_) - sqrt(3.0) << nl
@@ -177,14 +170,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionRestraints::"
-            "tabulatedAxialAngularSpring::read"
-            "("
-                "const dictionary& sDoFRBMCDict"
-            ")"
-        )
+        FatalErrorInFunction
             << "axis has zero length"
             << abort(FatalError);
     }
@@ -203,14 +189,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "Foam::sixDoFRigidBodyMotionRestraints::"
-            "tabulatedAxialAngularSpring::read"
-            "("
-                "const dictionary&"
-            ")"
-        )
+        FatalErrorInFunction
             << "angleFormat must be degree, degrees, radian or radians"
             << abort(FatalError);
     }
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index 1d3d01856d..2ca63eb8f3 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -171,10 +171,8 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
 
     if (mesh().nPoints() != points0().size())
     {
-        FatalErrorIn
-        (
-            "sixDoFRigidBodyMotionSolver::curPoints() const"
-        )   << "The number of points in the mesh seems to have changed." << endl
+        FatalErrorInFunction
+            << "The number of points in the mesh seems to have changed." << endl
             << "In constant/polyMesh there are " << points0().size()
             << " points; in the current mesh there are " << mesh().nPoints()
             << " points." << exit(FatalError);
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
index 329a9aaea1..d9d92826c7 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
@@ -42,7 +42,7 @@ Foam::autoPtr<Foam::sixDoFSolver> Foam::sixDoFSolver::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("sixDoFSolver::New")
+        FatalErrorInFunction
             << "Unknown sixDoFSolverType type "
             << sixDoFSolverType << endl << endl
             << "Valid sixDoFSolver types are : " << endl
diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
index 61d94abc7a..bd678d1090 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/symplectic/symplectic.C
@@ -69,7 +69,7 @@ void Foam::sixDoFSolvers::symplectic::solve
 {
     if (!firstIter)
     {
-        FatalErrorIn("sixDoFSolvers::symplectic::solve")
+        FatalErrorInFunction
             << "The symplectic integrator is explicit "
                "and can only be solved once per time-step"
             << exit(FatalError);
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 0fec3ea958..a79dfe0521 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,11 +141,8 @@ void Foam::MeshedSurface<Face>::write
         }
         else
         {
-            FatalErrorIn
-            (
-                "MeshedSurface::write"
-                "(const fileName&, const MeshedSurface&)"
-            )   << "Unknown file extension " << ext << nl << nl
+            FatalErrorInFunction
+                << "Unknown file extension " << ext << nl << nl
                 << "Valid types are :" << endl
                 << (supported | writeTypes())
                 << exit(FatalError);
@@ -692,7 +689,7 @@ bool Foam::MeshedSurface<Face>::checkFaces
             {
                 if (f[fp] < 0 || f[fp] > maxPointI)
                 {
-                    FatalErrorIn("MeshedSurface::checkFaces(bool)")
+                    FatalErrorInFunction
                         << "face " << f
                         << " uses point indices outside point range 0.."
                     << maxPointI
@@ -711,10 +708,8 @@ bool Foam::MeshedSurface<Face>::checkFaces
             changed = true;
             if (verbose)
             {
-                WarningIn
-                (
-                    "MeshedSurface::checkFaces(bool verbose)"
-                )   << "face[" << faceI << "] = " << f
+                WarningInFunction
+                    << "face[" << faceI << "] = " << f
                     << " does not have three unique vertices" << endl;
             }
         }
@@ -759,10 +754,8 @@ bool Foam::MeshedSurface<Face>::checkFaces
 
                 if (verbose)
                 {
-                    WarningIn
-                    (
-                        "MeshedSurface::checkFaces(bool verbose)"
-                    )   << "faces share the same vertices:" << nl
+                    WarningInFunction
+                        << "faces share the same vertices:" << nl
                         << "    face[" << faceI << "] : " << f << nl
                         << "    face[" << neiFaceI << "] : " << nei << endl;
                     // printFace(Warning, "    ", f, points());
@@ -793,10 +786,8 @@ bool Foam::MeshedSurface<Face>::checkFaces
 
         if (verbose)
         {
-            WarningIn
-            (
-                "MeshedSurface::checkFaces(bool verbose)"
-            )   << "Removed " << faceLst.size() - newFaceI
+            WarningInFunction
+                << "Removed " << faceLst.size() - newFaceI
                 << " illegal faces." << endl;
         }
 
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
index f9ae62a4ac..d20c3fc779 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,11 +59,8 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
         // nothing left to try, issue error
         supported += readTypes();
 
-        FatalErrorIn
-        (
-            "MeshedSurface<Face>::New(const fileName&, const word&) : "
-            "constructing MeshedSurface"
-        )   << "Unknown file extension " << ext << nl << nl
+        FatalErrorInFunction
+            << "Unknown file extension " << ext << nl << nl
             << "Valid types are :" << nl
             << supported
             << exit(FatalError);
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index 6e9ca90c63..cea56fc072 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,7 @@ void Foam::MeshedSurface<Face>::checkZones()
 
         if (count < this->size())
         {
-            WarningIn
-            (
-                "MeshedSurface::checkZones()\n"
-            )
+            WarningInFunction
                 << "more faces " << this->size() << " than zones " << count
                 << " ... extending final zone"
                 << endl;
@@ -56,10 +53,7 @@ void Foam::MeshedSurface<Face>::checkZones()
         }
         else if (count > this->size())
         {
-            FatalErrorIn
-            (
-                "MeshedSurface::checkZones()\n"
-            )
+            FatalErrorInFunction
                 << "more zones " << count << " than faces " << this->size()
                 << exit(FatalError);
         }
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index 72cdd6af87..ac75fa52d8 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,10 +75,8 @@ void Foam::MeshedSurfaceProxy<Face>::write
 
     if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "MeshedSurfaceProxy::write(const fileName&)"
-        )   << "Unknown file extension " << ext << nl << nl
+        FatalErrorInFunction
+            << "Unknown file extension " << ext << nl << nl
             << "Valid types are :" << endl
             << writeTypes()
             << exit(FatalError);
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 445ba648ab..16d2ad18eb 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,11 +129,8 @@ void Foam::UnsortedMeshedSurface<Face>::write
         }
         else
         {
-            FatalErrorIn
-            (
-                "UnsortedMeshedSurface::write"
-                "(const fileName&, const UnsortedMeshedSurface&)"
-            )   << "Unknown file extension " << ext << nl << nl
+            FatalErrorInFunction
+                << "Unknown file extension " << ext << nl << nl
                 << "Valid types are :" << endl
                 << (supported | writeTypes())
                 << exit(FatalError);
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 65f47f4ea5..9a2e01992d 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,12 +60,8 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
         // nothing left but to issue an error
         supported += readTypes();
 
-        FatalErrorIn
-        (
-            "UnsortedMeshedSurface<Face>::New"
-            "(const fileName&, const word&) : "
-            "constructing UnsortedMeshedSurface"
-        )   << "Unknown file extension " << ext << nl << nl
+        FatalErrorInFunction
+            << "Unknown file extension " << ext << nl << nl
             << "Valid types are:" << nl
             << supported
             << exit(FatalError);
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index ce3cb0958a..6d234e8e8f 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -369,10 +369,7 @@ void Foam::surfMesh::checkZones()
 
         if (count < nFaces())
         {
-            WarningIn
-            (
-                "surfMesh::checkZones()\n"
-            )
+            WarningInFunction
                 << "more faces " << nFaces() << " than zones " << count
                 << " ... extending final zone"
                 << endl;
@@ -381,10 +378,7 @@ void Foam::surfMesh::checkZones()
         }
         else if (count > size())
         {
-            FatalErrorIn
-            (
-                "surfMesh::checkZones()\n"
-            )
+            FatalErrorInFunction
                 << "more zones " << count << " than faces " << nFaces()
                 << exit(FatalError);
         }
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index d37ce07381..9cf516bebf 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,8 +151,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
 
         if (zonesChanged)
         {
-            WarningIn("surfMesh::readUpdateState surfMesh::readUpdate()")
-                << "Number of zones has changed.  This may have "
+            WarningInFunction
                 << "unexpected consequences.  Proceed with care." << endl;
 
             return surfMesh::TOPO_PATCH_CHANGE;
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H
index 1f670ee037..047bae120e 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.H
+++ b/src/surfMesh/surfZone/surfZone/surfZone.H
@@ -114,7 +114,7 @@ public:
         //- Return clone
         autoPtr<surfZone> clone() const
         {
-            notImplemented("autoPtr<surfZone> clone() const");
+            NotImplemented;
             return autoPtr<surfZone>(NULL);
         }
 
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index 745fec325f..6730b4c8ce 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ Foam::surfZoneIOList::surfZoneIOList
 
             if (startFaceI != faceI)
             {
-                FatalErrorIn(functionName)
+                FatalErrorInFunction
                     << "surfZones are not ordered. Start of zone " << zoneI
                     << " does not correspond to sum of preceding zones." << nl
                     << "while reading " << io.objectPath() << endl
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 151f0fd788..f226acc91d 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,10 +55,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::AC3DsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -71,10 +68,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
     if (version != "b")
     {
-        WarningIn
-        (
-            "fileFormats::AC3DsurfaceFormat::read(const fileName&)"
-        )
+        WarningInFunction
             << "When reading AC3D file " << filename
             << " read header " << line << " with version "
             << version << endl
@@ -85,10 +79,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
     if (!cueTo(is, "OBJECT", args) || (args != "world"))
     {
-        FatalErrorIn
-        (
-            "fileFormats::AC3DsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot find \"OBJECT world\" in file " << filename
             << exit(FatalError);
     }
@@ -123,10 +114,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
             // zone should always end with 'kids' command ?not sure.
             if (!readCmd(is, cmd, args))
             {
-                FatalErrorIn
-                (
-                    "fileFormats::AC3DsurfaceFormat::read(const fileName&)"
-                )
+                FatalErrorInFunction
                     << "Did not read up to \"kids 0\" while reading zone "
                     << zoneI << " from file " << filename
                     << exit(FatalError);
@@ -151,11 +139,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
                 //     >> rotation.yx() >> rotation.yy() >> rotation.yz()
                 //     >> rotation.zx() >> rotation.zy() >> rotation.zz();
 
-                WarningIn
-                (
-                    "fileFormats::AC3DsurfaceFormat::read"
-                    "(const fileName&)"
-                )
+                WarningInFunction
                     << "rot (rotation tensor) command not implemented"
                     << "Line:" << cmd << ' ' << args << endl
                     << "while reading zone " << zoneI << endl;
@@ -245,10 +229,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
                 if (nKids != 0)
                 {
-                    FatalErrorIn
-                    (
-                        "fileFormats::AC3DsurfaceFormat::read(const fileName&)"
-                    )
+                    FatalErrorInFunction
                         << "Can only read objects without kids."
                         << " Encountered " << nKids << " kids when"
                         << " reading zone " << zoneI
@@ -293,11 +274,7 @@ void Foam::fileFormats::AC3DsurfaceFormat<Face>::write
 
     if (useFaceMap)
     {
-        FatalErrorIn
-        (
-            "fileFormats::AC3DsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "output with faceMap is not supported " << filename
             << exit(FatalError);
     }
@@ -306,11 +283,7 @@ void Foam::fileFormats::AC3DsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::AC3DsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -395,11 +368,7 @@ void Foam::fileFormats::AC3DsurfaceFormat<Face>::write
         OFstream os(filename);
         if (!os.good())
         {
-            FatalErrorIn
-            (
-                "fileFormats::AC3DsurfaceFormat::write"
-                "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-            )
+            FatalErrorInFunction
                 << "Cannot open file for writing " << filename
                 << exit(FatalError);
         }
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
index 145d255010..6d1a8d3fc1 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,10 +97,7 @@ Foam::string Foam::fileFormats::AC3DsurfaceFormatCore::cueToOrDie
     string args;
     if (!cueTo(is, cmd, args))
     {
-        FatalErrorIn
-        (
-            "fileFormats::AC3DsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot find command " << cmd
             << " " << errorMsg
             << exit(FatalError);
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
index f8cec7b856..418bcd9ce7 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,10 +52,7 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::FTRsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index 7df9e62edc..bf55ff46e2 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::GTSsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -155,10 +152,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
         label common01 = e0.commonVertex(e1);
         if (common01 == -1)
         {
-            FatalErrorIn
-            (
-                "fileFormats::GTSsurfaceFormat::read(const fileName&)"
-            )
+            FatalErrorInFunction
                 << "Edges 0 and 1 of triangle " << faceI
                 << " do not share a point.\n"
                 << "    edge0:" << e0 << nl
@@ -172,10 +166,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
         label common12 = e1.commonVertex(e2);
         if (common12 == -1)
         {
-            FatalErrorIn
-            (
-                "fileFormats::GTSsurfaceFormat::read(const fileName&)"
-            )
+            FatalErrorInFunction
                 << "Edges 1 and 2 of triangle " << faceI
                 << " do not share a point.\n"
                 << "    edge1:" << e1 << nl
@@ -187,10 +178,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
         // Does edge2 sit between edge1 and 0?
         if (common12 != e1Far || e2Far != e0Far)
         {
-            FatalErrorIn
-            (
-                "fileFormats::GTSsurfaceFormat::read(const fileName&)"
-            )
+            FatalErrorInFunction
                 << "Edges of triangle " << faceI
                 << " reference more than three points.\n"
                 << "    edge0:" << e0 << nl
@@ -253,11 +241,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
 
         if (nNonTris)
         {
-            FatalErrorIn
-            (
-                "fileFormats::GTSsurfaceFormat::write"
-                "(const fileName&, const MeshedSurface<Face>&)"
-            )
+            FatalErrorInFunction
                 << "Surface has " << nNonTris << "/" << faceLst.size()
                 << " non-triangulated faces - not writing!" << endl;
             return;
@@ -268,11 +252,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::GTSsurfaceFormat::write"
-            "(const fileName&, const MeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -363,11 +343,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
 
         if (nNonTris)
         {
-            FatalErrorIn
-            (
-                "fileFormats::GTSsurfaceFormat::write"
-                "(const fileName&, const UnsortedMeshedSurfaces<Face>&)"
-            )
+            FatalErrorInFunction
                 << "Surface has " << nNonTris << "/" << faceLst.size()
                 << " non-triangulated faces - not writing!" << endl;
             return;
@@ -378,11 +354,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::GTSsurfaceFormat::write"
-            "(const fileName&, const UnsortedMeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index d547ce5008..2a7ea0ebc7 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::NASsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -296,10 +293,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
             is.getLine(line);
             if (line[0] != '*')
             {
-                FatalErrorIn
-                (
-                    "fileFormats::NASsurfaceFormat::read(const fileName&)"
-                )
+                FatalErrorInFunction
                     << "Expected continuation symbol '*' when reading GRID*"
                     << " (double precision coordinate) format" << nl
                     << "Read:" << line << nl
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index a4306959a7..fdce18b145 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,10 +57,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OBJsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -234,11 +231,7 @@ void Foam::fileFormats::OBJsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OBJsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 8e753fad16..8157f3ae0e 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,10 +56,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFFsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -68,10 +65,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
     string hdr = this->getLineNoComment(is);
     if (hdr != "OFF")
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFFsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "OFF file " << filename << " does not start with 'OFF'"
             << exit(FatalError);
     }
@@ -162,11 +156,7 @@ void Foam::fileFormats::OFFsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFFsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
index 8568ca3da4..cb8646e7c2 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,7 @@ bool Foam::fileFormats::OFSsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFSsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
@@ -103,11 +100,7 @@ bool Foam::fileFormats::OFSsurfaceFormat<Face>::read
 {
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFSsurfaceFormat::read"
-            "(Istream&, pointField&, List<Face>&, List<surfZone>&)"
-        )
+        FatalErrorInFunction
             << "read error "
             << exit(FatalError);
     }
@@ -155,11 +148,7 @@ bool Foam::fileFormats::OFSsurfaceFormat<Face>::read
 
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFSsurfaceFormat::read"
-            "(Istream&, MeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "read error "
             << exit(FatalError);
     }
@@ -210,11 +199,7 @@ void Foam::fileFormats::OFSsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::OFSsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
index 93ad65350e..99bb93d503 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,11 +62,7 @@ void Foam::fileFormats::SMESHsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::SMESHsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 31e09c8a10..7d8bb709f4 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,10 +121,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
     IFstream is(baseName + ".cel");
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STARCDsurfaceFormat::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << is.name()
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index 4cd1e0340b..349296e21b 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,11 +197,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeAscii
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormat::writeAscii"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -257,11 +253,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
     std::ofstream os(filename.c_str(), std::ios::binary);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormat::writeBinary"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -343,11 +335,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeAscii
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormat::writeAscii"
-            "(const fileName&, const UnsortedMeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -395,11 +383,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
     std::ofstream os(filename.c_str(), std::ios::binary);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormat::writeBinary"
-            "(const fileName&, const UnsortedMeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
index 2699c9510c..e54cca5ebf 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ using namespace Foam;
 //! \cond dummy
 int yyFlexLexer::yylex()
 {
-    FatalErrorIn("yyFlexLexer::yylex()")
+    FatalErrorInFunction
         << "Should not have called this function"
         << abort(FatalError);
     return 0;
@@ -371,10 +371,8 @@ endsolid              {space}("endsolid"|"ENDSOLID")({some_space}{word})*
 
 <stlError>.* {
         yy_pop_state();
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormatCore::readASCII(const fileName&)"
-        )   << "while " << stateNames[YY_START] << " on line " << lineNo_ << nl
+        FatalErrorInFunction
+            << "while " << stateNames[YY_START] << " on line " << lineNo_ << nl
             << "    expected " << stateExpects[YY_START]
             << " but found '" << startError_.c_str() << YYText() << "'"
             << exit(FatalError);
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
index 7fb655dc5b..87c6a11abc 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
@@ -101,10 +101,7 @@ bool Foam::fileFormats::STLsurfaceFormatCore::readBINARY
     // Check that stream is OK, if not this may be an ASCII file
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormatCore::readBINARY(IFstream&)"
-        )
+        FatalErrorInFunction
             << "problem reading header, perhaps file is not binary "
             << exit(FatalError);
     }
@@ -127,10 +124,7 @@ bool Foam::fileFormats::STLsurfaceFormatCore::readBINARY
      || nTris > int(dataFileSize - headerSize)/25
     )
     {
-        FatalErrorIn
-        (
-            "fileFormats::STLsurfaceFormatCore::readBINARY(istream&)"
-        )
+        FatalErrorInFunction
             << "problem reading number of triangles, perhaps file is not binary"
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index 5263116fdb..2335ce3035 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,11 +148,7 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::TRIsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -195,11 +191,7 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::TRIsurfaceFormat::write"
-            "(const fileName&, const UnsortedMeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
index afbbb5d905..87cc04d20e 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
@@ -64,10 +64,7 @@ bool Foam::fileFormats::TRIsurfaceFormatCore::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::TRIsurfaceFormatCore::read(const fileName&)"
-        )
+        FatalErrorInFunction
             << "Cannot read file " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index cc3741da12..a252a4732b 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,10 +75,8 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
     IFstream is(filename);
     if (!is.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::VTKsurfaceFormat::read(const fileName&)"
-        )   << "Cannot read file " << filename
+        FatalErrorInFunction
+            << "Cannot read file " << filename
             << exit(FatalError);
     }
 
@@ -240,11 +238,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::VTKsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
@@ -302,11 +296,7 @@ void Foam::fileFormats::VTKsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::VTKsurfaceFormat::write"
-            "(const fileName&, const UnsortedMeshedSurface<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
index 0cf411381d..c95a0c0e89 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,11 +62,7 @@ void Foam::fileFormats::WRLsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::WRLsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
index 789f5ea6c1..c346bc1632 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,11 +64,7 @@ void Foam::fileFormats::X3DsurfaceFormat<Face>::write
     OFstream os(filename);
     if (!os.good())
     {
-        FatalErrorIn
-        (
-            "fileFormats::X3DsurfaceFormat::write"
-            "(const fileName&, const MeshedSurfaceProxy<Face>&)"
-        )
+        FatalErrorInFunction
             << "Cannot open file for writing " << filename
             << exit(FatalError);
     }
diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
index 724120d790..53c8c6aa76 100644
--- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
+++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C
@@ -109,11 +109,8 @@ const Foam::basicSpecieMixture& Foam::SLGThermo::carrier() const
 {
     if (carrier_ == NULL)
     {
-        FatalErrorIn
-        (
-            "const Foam::basicSpecieMixture& "
-            "Foam::SLGThermo::carrier() const"
-        )   << "carrier requested, but object is not allocated"
+        FatalErrorInFunction
+            << "carrier requested, but object is not allocated"
             << abort(FatalError);
     }
 
@@ -125,11 +122,8 @@ const Foam::liquidMixtureProperties& Foam::SLGThermo::liquids() const
 {
     if (!liquids_.valid())
     {
-        FatalErrorIn
-        (
-            "const Foam::liquidMixtureProperties& "
-            "Foam::SLGThermo::liquids() const"
-        )   << "liquids requested, but object is not allocated"
+        FatalErrorInFunction
+            << "liquids requested, but object is not allocated"
             << abort(FatalError);
     }
 
@@ -141,11 +135,8 @@ const Foam::solidMixtureProperties& Foam::SLGThermo::solids() const
 {
     if (!solids_.valid())
     {
-        FatalErrorIn
-        (
-            "const Foam::solidMixtureProperties& "
-            "Foam::SLGThermo::solids() const"
-        )   << "solids requested, but object is not allocated"
+        FatalErrorInFunction
+            << "solids requested, but object is not allocated"
             << abort(FatalError);
     }
 
@@ -169,10 +160,8 @@ Foam::label Foam::SLGThermo::carrierId
 
     if (!allowNotfound)
     {
-        FatalErrorIn
-        (
-            "Foam::label Foam::SLGThermo::carrierId(const word&, bool) const"
-        )   << "Unknown carrier component " << cmptName
+        FatalErrorInFunction
+            << "Unknown carrier component " << cmptName
             << ". Valid carrier components are:" << nl
             << carrier_->species() << exit(FatalError);
     }
@@ -197,10 +186,8 @@ Foam::label Foam::SLGThermo::liquidId
 
     if (!allowNotfound)
     {
-        FatalErrorIn
-        (
-            "Foam::label Foam::SLGThermo::liquidId(const word&, bool) const"
-        )   << "Unknown liquid component " << cmptName << ". Valid liquids are:"
+        FatalErrorInFunction
+            << "Unknown liquid component " << cmptName << ". Valid liquids are:"
             << nl << liquids_->components() << exit(FatalError);
     }
 
@@ -224,10 +211,8 @@ Foam::label Foam::SLGThermo::solidId
 
     if (!allowNotfound)
     {
-        FatalErrorIn
-        (
-            "Foam::label Foam::SLGThermo::solidId(const word&, bool) const"
-        )   << "Unknown solid component " << cmptName << ". Valid solids are:"
+        FatalErrorInFunction
+            << "Unknown solid component " << cmptName << ". Valid solids are:"
             << nl << solids_->components() << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
index 2ee6ee02cd..c37b8ec033 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,10 +47,8 @@ Foam::barotropicCompressibilityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "barotropicCompressibilityModel::New(const volScalarField&)"
-        )   << "Unknown barotropicCompressibilityModel type "
+        FatalErrorInFunction
+            << "Unknown barotropicCompressibilityModel type "
             << modelType << nl << nl
             << "Valid barotropicCompressibilityModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index e7264b0a1f..b83b6f872c 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -329,7 +329,7 @@ void Foam::basicThermo::validate
 {
     if (!(he().name() == phasePropertyName(a)))
     {
-        FatalErrorIn(app)
+        FatalErrorInFunction
             << "Supported energy type is " << phasePropertyName(a)
             << ", thermodynamics package provides " << he().name()
             << exit(FatalError);
@@ -351,7 +351,7 @@ void Foam::basicThermo::validate
         )
     )
     {
-        FatalErrorIn(app)
+        FatalErrorInFunction
             << "Supported energy types are " << phasePropertyName(a)
             << " and " << phasePropertyName(b)
             << ", thermodynamics package provides " << he().name()
@@ -376,7 +376,7 @@ void Foam::basicThermo::validate
         )
     )
     {
-        FatalErrorIn(app)
+        FatalErrorInFunction
             << "Supported energy types are " << phasePropertyName(a)
             << ", " << phasePropertyName(b)
             << " and " << phasePropertyName(c)
@@ -404,7 +404,7 @@ void Foam::basicThermo::validate
         )
     )
     {
-        FatalErrorIn(app)
+        FatalErrorInFunction
             << "Supported energy types are " << phasePropertyName(a)
             << ", " << phasePropertyName(b)
             << ", " << phasePropertyName(c)
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index 4521750996..c9741c645b 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ typename Table::iterator Foam::basicThermo::lookupThermo
         // Print error message if package not found in the table
         if (cstrIter == tablePtr->end())
         {
-            FatalErrorIn(Thermo::typeName + "::New")
+            FatalErrorInFunction
                 << "Unknown " << Thermo::typeName << " type " << nl
                 << "thermoType" << thermoTypeDict << nl << nl
                 << "Valid " << Thermo::typeName << " types are:" << nl << nl;
@@ -120,7 +120,7 @@ typename Table::iterator Foam::basicThermo::lookupThermo
 
         if (cstrIter == tablePtr->end())
         {
-            FatalErrorIn(Thermo::typeName + "::New")
+            FatalErrorInFunction
                 << "Unknown " << Thermo::typeName << " type "
                 << thermoTypeName << nl << nl
                 << "Valid " << Thermo::typeName << " types are:" << nl
diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
index 965a4ddbed..534c1f6081 100644
--- a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
+++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "specie.H"
 #include "perfectGas.H"
 #include "incompressiblePerfectGas.H"
+#include "Boussinesq.H"
 #include "rhoConst.H"
 #include "perfectFluid.H"
 #include "PengRobinsonGas.H"
@@ -177,6 +178,42 @@ makeThermo
     specie
 );
 
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleEnthalpy,
+    hConstThermo,
+    Boussinesq,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleEnthalpy,
+    hConstThermo,
+    Boussinesq,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleEnthalpy,
+    janafThermo,
+    Boussinesq,
+    specie
+);
+
 makeThermo
 (
     rhoThermo,
@@ -335,6 +372,42 @@ makeThermo
     specie
 );
 
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    Boussinesq,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    Boussinesq,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    Boussinesq,
+    specie
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index 7232e9f807..51dcfd2de8 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -98,12 +98,9 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
         }
         else
         {
-             FatalIOErrorIn
-             (
-                 (ChemistryModel::typeName + "::New(const mesh&)").c_str(),
-                 thermoDict
-             )   << "thermoType is in the old format and must be upgraded"
-                 << exit(FatalIOError);
+            FatalIOErrorInFunction(thermoDict)
+                << "thermoType is in the old format and must be upgraded"
+                << exit(FatalIOError);
         }
 
         // Construct the name of the chemistry type from the components
@@ -117,7 +114,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
 
         if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end())
         {
-            FatalErrorIn(ChemistryModel::typeName + "::New(const mesh&)")
+            FatalErrorInFunction
                 << "Unknown " << ChemistryModel::typeName << " type " << nl
                 << "chemistryType" << chemistryTypeDict << nl << nl
                 << "Valid " << ChemistryModel ::typeName << " types are:"
@@ -173,7 +170,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
 
         if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end())
         {
-            FatalErrorIn(ChemistryModel::typeName + "::New(const mesh&)")
+            FatalErrorInFunction
                 << "Unknown " << ChemistryModel::typeName << " type "
                 << chemistryTypeName << nl << nl
                 << "Valid ChemistryModel types are:" << nl
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index b1fde77c79..aea9440f77 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -876,17 +876,7 @@ void Foam::chemistryModel<CompType, ThermoType>::solve
     scalar& subDeltaT
 ) const
 {
-    notImplemented
-    (
-        "chemistryModel::solve"
-        "("
-            "scalarField&, "
-            "scalar&, "
-            "scalar&, "
-            "scalar&, "
-            "scalar&"
-        ") const"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
index cb0ffc16a7..d3f2fc1aa9 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
@@ -85,13 +85,8 @@ void Foam::laminarFlameSpeedModels::RaviPetersen::checkPointsMonotonicity
     {
         if (x[i] <= x[i-1])
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "laminarFlameSpeedModels::RaviPetersen::checkPointsMonotonicity"
-                "("
-                    "const word&, "
-                    "const List<scalar>&"
-                ") const",
                 coeffsDict_
             )   << "Data points for the " << name
                 << " do not increase monotonically" << endl
@@ -123,13 +118,8 @@ void Foam::laminarFlameSpeedModels::RaviPetersen::checkCoefficientArrayShape
 
     if (!ok)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "laminarFlameSpeedModels::RaviPetersen::checkCoefficientArrayShape"
-            "("
-                "const word&, "
-                "const List<List<List<scalar> > >&"
-            ") const",
             coeffsDict_
         )   << "Inconsistent size of " << name << " coefficients array" << endl
             << exit(FatalIOError);
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
index 1ca2faa3fc..5b31f20d10 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,9 +55,8 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "laminarFlameSpeed::New(const psiuReactionThermo&)",
             propDict
         )   << "Unknown laminarFlameSpeed type "
             << corrType << nl << nl
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
index 51350a54da..84c202b854 100644
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -134,14 +134,8 @@ Foam::scalar Foam::liquidMixtureProperties::pvInvert
     }
     else if (p < pv(p, Tlo, X))
     {
-        WarningIn
-        (
-            "Foam::scalar Foam::liquidMixtureProperties::pvInvert"
-            "("
-            "    const scalar,"
-            "    const scalarField&"
-            ") const"
-        )   << "Pressure below triple point pressure: "
+        WarningInFunction
+            << "Pressure below triple point pressure: "
             << "p = " << p << " < Pt = " << pv(p, Tlo, X) <<  nl << endl;
         return -1;
     }
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index 4a9c99afb1..49ac4ab660 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
 
         if (cstrIter == ConstructorTablePtr_->end())
         {
-            FatalErrorIn("liquidProperties::New(Istream&)")
+            FatalErrorInFunction
                 << "Unknown liquidProperties type "
                 << liquidPropertiesType << nl << nl
                 << "Valid liquidProperties types are:" << nl
@@ -152,7 +152,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
     }
     else
     {
-        FatalErrorIn("liquidProperties::New(Istream&)")
+        FatalErrorInFunction
             << "liquidProperties type " << liquidPropertiesType
             << ", option " << coeffs << " given"
             << ", should be coeffs or defaultCoeffs"
@@ -185,10 +185,8 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 
         if (cstrIter == ConstructorTablePtr_->end())
         {
-            FatalErrorIn
-            (
-                "liquidProperties::New(const dictionary&)"
-            )   << "Unknown liquidProperties type "
+            FatalErrorInFunction
+                << "Unknown liquidProperties type "
                 << liquidPropertiesTypeName << nl << nl
                 << "Valid liquidProperties types are:" << nl
                 << ConstructorTablePtr_->sortedToc()
@@ -204,10 +202,8 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
-            FatalErrorIn
-            (
-                "liquidProperties::New(const dictionary&)"
-            )   << "Unknown liquidProperties type "
+            FatalErrorInFunction
+                << "Unknown liquidProperties type "
                 << liquidPropertiesTypeName << nl << nl
                 << "Valid liquidProperties types are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc()
@@ -226,130 +222,91 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 
 Foam::scalar Foam::liquidProperties::rho(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::rho(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::pv(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::pv(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::hl(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::hl(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::Cp(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::Cp(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::h(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::h(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::Cpg(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::Cpg(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::mu(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::mu(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::mug(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::K(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::K(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::Kg(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::Kg(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::sigma(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::sigms(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::D(scalar p, scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::D(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
 
 Foam::scalar Foam::liquidProperties::D(scalar p, scalar T, scalar Wb) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::liquidProperties::D(scalar, scalar) const"
-    );
+    NotImplemented;
     return 0.0;
 }
 
@@ -365,10 +322,8 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
     {
         if (debug)
         {
-            WarningIn
-            (
-                "Foam::scalar Foam::liquidProperties::pvInvert(scalar) const"
-            )   << "Pressure below triple point pressure: "
+            WarningInFunction
+                << "Pressure below triple point pressure: "
                 << "p = " << p << " < Pt = " << Pt_ <<  nl << endl;
         }
         return -1;
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/Make/files b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/Make/files
new file mode 100644
index 0000000000..b245eb6bd5
--- /dev/null
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/Make/files
@@ -0,0 +1,4 @@
+humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+
+
+LIB = $(FOAM_LIBBIN)/libliquidPropertiesFvPatchFields
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/Make/options b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/Make/options
new file mode 100644
index 0000000000..3718ff0ca0
--- /dev/null
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/Make/options
@@ -0,0 +1,11 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lcompressibleTurbulenceModels \
+    -lliquidProperties
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
new file mode 100644
index 0000000000..4e32aedf59
--- /dev/null
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -0,0 +1,790 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "humidityTemperatureCoupledMixedFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "mappedPatchBase.H"
+#include "fixedGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::
+        humidityTemperatureCoupledMixedFvPatchScalarField::
+        massTransferMode,
+        4
+    >::names[] =
+    {
+        "constantMass",
+        "condensation",
+        "evaporation",
+        "condensationAndEvaporation"
+    };
+}
+
+const Foam::NamedEnum
+<
+    Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massTransferMode,
+    4
+> Foam::humidityTemperatureCoupledMixedFvPatchScalarField::massModeTypeNames_;
+
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+Foam::scalar Foam::humidityTemperatureCoupledMixedFvPatchScalarField::Sh
+(
+    const scalar Re,
+    const scalar Sc
+) const
+{
+    if (Re < 5.0E+05)
+    {
+        return 0.664*sqrt(Re)*cbrt(Sc);
+    }
+    else
+    {
+        return 0.037*pow(Re, 0.8)*cbrt(Sc);
+    }
+}
+
+
+Foam::scalar
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::htcCondensation
+(
+    const scalar Tsat,
+    const scalar Re
+) const
+{
+    if (Tsat > 295 && Tsat < 373)
+    {
+        return 51104 + 2044*Tsat;
+    }
+    else
+    {
+        return 255510;
+    }
+}
+
+
+Foam::volScalarField&
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::thicknessField
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    if (!mesh.foundObject<volScalarField>(fieldName))
+    {
+        tmp<volScalarField> tField
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                mesh,
+                dimensionedScalar("zero", dimLength, 0.0)
+            )
+        );
+
+        tField.ptr()->store();
+    }
+
+    return
+        const_cast<volScalarField&>
+        (
+            mesh.lookupObject<volScalarField>(fieldName)
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::
+humidityTemperatureCoupledMixedFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    temperatureCoupledBase(patch(), "fluidThermo", "undefined", "undefined-K"),
+    mode_(mtConstantMass),
+    pName_("p"),
+    UName_("U"),
+    rhoName_("rho"),
+    muName_("thermo:mu"),
+    TnbrName_("T"),
+    QrNbrName_("none"),
+    QrName_("none"),
+    specieName_("none"),
+    liquid_(NULL),
+    liquidDict_(NULL),
+    mass_(patch().size(), 0.0),
+    Tvap_(0.0),
+    myKDelta_(patch().size(), 0.0),
+    dmHfg_(patch().size(), 0.0),
+    mpCpTp_(patch().size(), 0.0),
+    Mcomp_(0.0),
+    L_(0.0),
+    fluid_(false),
+    cp_(patch().size(), 0.0),
+    thickness_(patch().size(), 0.0),
+    rho_(patch().size(), 0.0)
+{
+    this->refValue() = 0.0;
+    this->refGrad() = 0.0;
+    this->valueFraction() = 1.0;
+}
+
+
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::
+humidityTemperatureCoupledMixedFvPatchScalarField
+(
+    const humidityTemperatureCoupledMixedFvPatchScalarField& psf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(psf, p, iF, mapper),
+    temperatureCoupledBase(patch(), psf),
+    mode_(psf.mode_),
+    pName_(psf.pName_),
+    UName_(psf.UName_),
+    rhoName_(psf.rhoName_),
+    muName_(psf.muName_),
+    TnbrName_(psf.TnbrName_),
+    QrNbrName_(psf.QrNbrName_),
+    QrName_(psf.QrName_),
+    specieName_(psf.specieName_),
+    liquid_(psf.liquid_),
+    liquidDict_(psf.liquidDict_),
+    mass_(psf.mass_, mapper),
+    Tvap_(psf.Tvap_),
+    myKDelta_(psf.myKDelta_, mapper),
+    dmHfg_(psf.dmHfg_, mapper),
+    mpCpTp_(psf.mpCpTp_, mapper),
+    Mcomp_(psf.Mcomp_),
+    L_(psf.L_),
+    fluid_(psf.fluid_),
+    cp_(psf.cp_, mapper),
+    thickness_(psf.thickness_, mapper),
+    rho_(psf.rho_, mapper)
+{}
+
+
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::
+humidityTemperatureCoupledMixedFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    temperatureCoupledBase(patch(), dict),
+    mode_(mtCondensationAndEvaporation),
+    pName_(dict.lookupOrDefault<word>("p", "p")),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
+    TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
+    QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")),
+    QrName_(dict.lookupOrDefault<word>("Qr", "none")),
+    specieName_(dict.lookupOrDefault<word>("specieName", "none")),
+    liquid_(NULL),
+    liquidDict_(),
+    mass_(patch().size(), 0.0),
+    Tvap_(0.0),
+    myKDelta_(patch().size(), 0.0),
+    dmHfg_(patch().size(), 0.0),
+    mpCpTp_(patch().size(), 0.0),
+    Mcomp_(0.0),
+    L_(0.0),
+    fluid_(false),
+    cp_(patch().size(), 0.0),
+    thickness_(patch().size(), 0.0),
+    rho_(patch().size(), 0.0)
+{
+    if (!isA<mappedPatchBase>(this->patch().patch()))
+    {
+        FatalIOErrorInFunction(dict)
+            << "\n    patch type '" << p.type()
+            << "' not type '" << mappedPatchBase::typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << dimensionedInternalField().name()
+            << " in file " << dimensionedInternalField().objectPath()
+            << exit(FatalIOError);
+    }
+
+    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+    if (dict.found("mode"))
+    {
+        mode_ = massModeTypeNames_.read(dict.lookup("mode"));
+        fluid_ = true;
+    }
+
+    if (fluid_)
+    {
+        switch(mode_)
+        {
+            case mtConstantMass:
+            {
+                thickness_ = scalarField("thickness", dict, p.size());
+                cp_ = scalarField("cp", dict, p.size());
+                rho_ = scalarField("rho", dict, p.size());
+
+                break;
+            }
+            case mtCondensation:
+            case mtEvaporation:
+            case mtCondensationAndEvaporation:
+            {
+                Mcomp_ = readScalar(dict.lookup("carrierMolWeight"));
+                L_ = readScalar(dict.lookup("L"));
+                Tvap_ = readScalar(dict.lookup("Tvap"));
+                liquidDict_ = dict.subDict("liquid");
+                liquid_ =
+                    liquidProperties::New(liquidDict_.subDict(specieName_));
+
+                if (dict.found("thickness"))
+                {
+                    scalarField& Tp = *this;
+                    const scalarField& magSf = patch().magSf();
+
+                    // Assume initially standard pressure for rho calculation
+                    scalar pf = 1e5;
+                    thickness_ = scalarField("thickness", dict, p.size());
+                    forAll(thickness_, i)
+                    {
+                        mass_[i] =
+                            thickness_[i]*liquid_->rho(pf, Tp[i])*magSf[i];
+                    }
+                }
+                fluid_ = true;
+
+                break;
+            }
+            default:
+            {
+                FatalIOErrorInFunction(dict)
+                    << "Did not find mode " << mode_
+                    << " on  patch " << patch().name()
+                    << nl
+                    << "Please set 'mode' to one of "
+                    << massModeTypeNames_.sortedToc()
+                    << exit(FatalIOError);
+            }
+        }
+    }
+
+
+
+    if (dict.found("refValue"))
+    {
+        // Full restart
+        refValue() = scalarField("refValue", dict, p.size());
+        refGrad() = scalarField("refGradient", dict, p.size());
+        valueFraction() = scalarField("valueFraction", dict, p.size());
+    }
+    else
+    {
+        // Start from user entered data. Assume fixedValue.
+        refValue() = *this;
+        refGrad() = 0.0;
+        valueFraction() = 1.0;
+    }
+}
+
+
+Foam::humidityTemperatureCoupledMixedFvPatchScalarField::
+humidityTemperatureCoupledMixedFvPatchScalarField
+(
+    const humidityTemperatureCoupledMixedFvPatchScalarField& psf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(psf, iF),
+    temperatureCoupledBase(patch(), psf),
+    mode_(psf.mode_),
+    pName_(psf.pName_),
+    UName_(psf.UName_),
+    rhoName_(psf.rhoName_),
+    muName_(psf.muName_),
+    TnbrName_(psf.TnbrName_),
+    QrNbrName_(psf.QrNbrName_),
+    QrName_(psf.QrName_),
+    specieName_(psf.specieName_),
+    liquid_(psf.liquid_),
+    liquidDict_(psf.liquidDict_),
+    mass_(psf.mass_),
+    Tvap_(psf.Tvap_),
+    myKDelta_(psf.myKDelta_),
+    dmHfg_(psf.dmHfg_),
+    mpCpTp_(psf.mpCpTp_),
+    Mcomp_(psf.Mcomp_),
+    L_(psf.L_),
+    fluid_(psf.fluid_),
+    cp_(psf.cp_),
+    thickness_(psf.thickness_),
+    rho_(psf.rho_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    mixedFvPatchScalarField::autoMap(m);
+
+    if (fluid_)
+    {
+        mass_.autoMap(m);
+        myKDelta_.autoMap(m);
+        dmHfg_.autoMap(m);
+        mpCpTp_.autoMap(m);
+        cp_.autoMap(m);
+        thickness_.autoMap(m);
+        rho_.autoMap(m);
+    }
+}
+
+
+void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    mixedFvPatchScalarField::rmap(ptf, addr);
+
+    const humidityTemperatureCoupledMixedFvPatchScalarField& tiptf =
+        refCast<const humidityTemperatureCoupledMixedFvPatchScalarField>
+        (
+            ptf
+        );
+
+    if (fluid_)
+    {
+        mass_.rmap(tiptf.mass_, addr);
+        myKDelta_.rmap(tiptf.myKDelta_, addr);
+        dmHfg_.rmap(tiptf.dmHfg_, addr);
+        mpCpTp_.rmap(tiptf.mpCpTp_, addr);
+        cp_.rmap(tiptf.cp_, addr);
+        thickness_.rmap(tiptf.thickness_, addr);
+        rho_.rmap(tiptf.rho_, addr);
+    }
+}
+
+
+void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Get the coupling information from the mappedPatchBase
+    const mappedPatchBase& mpp =
+        refCast<const mappedPatchBase>(patch().patch());
+
+    const scalarField& magSf = patch().magSf();
+
+    const label nbrPatchI = mpp.samplePolyPatch().index();
+    const polyMesh& mesh = patch().boundaryMesh().mesh();
+    const polyMesh& nbrMesh = mpp.sampleMesh();
+    const fvPatch& nbrPatch =
+        refCast<const fvMesh>(nbrMesh).boundary()[nbrPatchI];
+
+    const humidityTemperatureCoupledMixedFvPatchScalarField&
+        nbrField =
+        refCast
+        <
+            const humidityTemperatureCoupledMixedFvPatchScalarField
+        >
+        (
+            nbrPatch.lookupPatchField<volScalarField, scalar>(TnbrName_)
+        );
+
+    // Swap to obtain full local values of neighbour internal field
+    scalarField nbrIntFld(nbrField.patchInternalField());
+    mpp.distribute(nbrIntFld);
+
+    scalarField& Tp = *this;
+    scalarField Tin(patchInternalField());
+
+    const scalarField K(this->kappa(*this));
+
+    // Neighbour kappa done separately because we need kappa solid for the
+    // htc correlation
+    scalarField nbrK(nbrField.kappa(*this));
+    mpp.distribute(nbrK);
+
+    scalarField nrbDeltaCoeffs(nbrPatch.deltaCoeffs());
+    mpp.distribute(nrbDeltaCoeffs);
+
+    scalarField KDeltaNbr(nbrK*nrbDeltaCoeffs);
+
+    myKDelta_ = K*patch().deltaCoeffs();
+
+    scalarField dm(patch().size(), 0.0);
+
+    // Fluid Side
+    if (fluid_)
+    {
+        scalarField Yvp(patch().size(), 0.0);
+        const scalar dt = mesh.time().deltaTValue();
+
+        const scalarField myDelta(patch().deltaCoeffs());
+
+        if (mode_ != mtConstantMass)
+        {
+            scalarField cp(patch().size(), 0.0);
+            scalarField hfg(patch().size(), 0.0);
+            scalarField htc(patch().size(), GREAT);
+            scalarField liquidRho(patch().size(), 0.0);
+
+            fixedGradientFvPatchField<scalar>& Yp =
+                const_cast<fixedGradientFvPatchField<scalar>& >
+                (
+                    refCast
+                    <
+                        const fixedGradientFvPatchField<scalar>
+                    >
+                    (
+                        patch().lookupPatchField<volScalarField, scalar>
+                        (
+                            specieName_
+                        )
+                    )
+                );
+
+            const fvPatchScalarField& pp =
+                patch().lookupPatchField<volScalarField, scalar>(pName_);
+
+            const fvPatchVectorField& Up =
+                patch().lookupPatchField<volVectorField, vector>(UName_);
+
+            const fvPatchScalarField& rhop =
+                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+            const fvPatchScalarField& mup =
+                patch().lookupPatchField<volScalarField, scalar>(muName_);
+
+            const vectorField Ui(Up.patchInternalField());
+            const scalarField Yi(Yp.patchInternalField());
+
+            forAll(Tp, faceI)
+            {
+                const scalar Tf = Tp[faceI];
+                const scalar Tint = Tin[faceI];
+                const vector Uf = Ui[faceI];
+                const scalar pf = pp[faceI];
+
+                const scalar muf = mup[faceI];
+                const scalar rhof = rhop[faceI];
+                const scalar nuf = muf/rhof;
+                const scalar pSat = liquid_->pv(pf, Tint);
+                const scalar Mv = liquid_->W();
+                const scalar TSat = liquid_->pvInvert(pSat);
+                const scalar Re = mag(Uf)*L_/nuf;
+
+                cp[faceI] = liquid_->Cp(pf, Tf);
+                hfg[faceI] = liquid_->hl(pf, Tf);
+
+                // Calculate relative humidity
+                const scalar invMwmean =
+                        Yi[faceI]/Mv + (1.0 - Yi[faceI])/Mcomp_;
+                const scalar Xv = Yi[faceI]/invMwmean/Mv;
+                const scalar RH = min(Xv*pf/pSat, 1.0);
+
+                scalar RHmin = 0.01;
+                scalar Tdew = -GREAT;
+
+                if (RH > RHmin)
+                {
+                    scalar b = 243.5;
+                    scalar c = 17.65;
+                    scalar TintDeg = Tint - 273;
+                    Tdew =
+                        b*(log(RH) + (c*TintDeg)/(b + TintDeg))
+                       /(c - log(RH) - ((c*TintDeg)/(b + TintDeg))) + 273;
+                }
+
+                if
+                (
+                    Tf < Tdew
+                 && RH > RHmin
+                 && (
+                        mode_ == mtCondensation
+                     || mode_ == mtCondensationAndEvaporation
+                    )
+                )
+                {
+                    htc[faceI] = htcCondensation(TSat, Re)*nbrK[faceI]/L_;
+
+                    scalar htcTotal =
+                        1.0/((1.0/myKDelta_[faceI]) + (1.0/htc[faceI]));
+
+                    // Heat flux [W] (>0 heat is converted into mass)
+                    const scalar q = (Tint - Tf)*htcTotal*magSf[faceI];
+
+                    // Mass flux rate [Kg/s/m2]
+                    dm[faceI] = q/hfg[faceI]/magSf[faceI];
+
+                    mass_[faceI] += q/hfg[faceI]*dt;
+
+                    // -dYp/dn = q/Dab (fixedGradient)
+                    const scalar Dab = liquid_->D(pf, Tf);
+                    Yvp[faceI] =
+                        -min(dm[faceI]/Dab/rhof, Yi[faceI]*myDelta[faceI]);
+                }
+                else if
+                (
+                    Tf > Tvap_
+                 && mass_[faceI] > 0.0
+                 && (
+                        mode_ == mtEvaporation
+                     || mode_ == mtCondensationAndEvaporation
+                    )
+                )
+                {
+                    const scalar Dab = liquid_->D(pf, Tf);
+
+                    const scalar Sc = nuf/Dab;
+                    const scalar Sh = this->Sh(Re, Sc);
+
+                    const scalar Ys = Mv*pSat/(Mv*pSat + Mcomp_*(pf - pSat));
+
+                    // Mass transfer coefficient [m/s]
+                    const scalar hm = Dab*Sh/L_;
+
+                    const scalar Yinf = max(Yi[faceI], 0.0);
+
+                    // Mass flux rate [Kg/s/m2]
+                    dm[faceI] = -rhof*hm*max((Ys - Yinf), 0.0)/(1.0 - Ys);
+
+                    // Set fixedGradient for carrier species.
+                    Yvp[faceI] = -dm[faceI]/Dab/rhof;
+
+                    // Total mass accumulated [Kg]
+                    mass_[faceI] += dm[faceI]*magSf[faceI]*dt;
+
+                    htc[faceI] = htcCondensation(TSat, Re)*nbrK[faceI]/L_;
+                }
+                else if (Tf > Tdew && Tf < Tvap_ && mass_[faceI] > 0.0)
+                {
+                    htc[faceI] = htcCondensation(TSat, Re)*nbrK[faceI]/L_;
+                }
+                else if (mass_[faceI] == 0.0)
+                {
+                    // Do nothing
+                }
+
+                liquidRho[faceI] = liquid_->rho(pf, Tf);
+            }
+
+            mass_ = max(mass_, scalar(0));
+
+            Yp.gradient() = Yvp;
+
+            // Output film delta (e.g. H2OThickness) [m]
+            const word fieldName(specieName_ + "Thickness");
+
+            scalarField& pDelta =
+                thicknessField
+                (
+                    fieldName,
+                    refCast<const fvMesh>(mesh)
+                ).boundaryField()[patch().index()];
+
+
+            pDelta = mass_/liquidRho/magSf;
+
+            // Weight myKDelta and htc
+            myKDelta_ = 1.0/((1.0/myKDelta_) + (1.0/htc));
+
+            mpCpTp_ = mass_*cp/dt/magSf;
+
+            // Heat flux due to change of phase [W/m2]
+            dmHfg_ = dm*hfg;
+        }
+        else
+        {
+            // Inertia term [W/K/m2]
+            mpCpTp_ = thickness_*rho_*cp_/dt;
+        }
+    }
+
+    scalarField myKDeltaNbr(patch().size(), 0.0);
+    scalarField mpCpTpNbr(patch().size(), 0.0);
+    scalarField dmHfgNbr(patch().size(), 0.0);
+
+    if (!fluid_)
+    {
+        myKDeltaNbr = nbrField.myKDelta();
+        mpp.distribute(myKDeltaNbr);
+
+        mpCpTpNbr = nbrField.mpCpTp();
+        mpp.distribute(mpCpTpNbr);
+
+        dmHfgNbr = nbrField.dmHfg();
+        mpp.distribute(dmHfgNbr);
+    }
+
+    // Obtain Rad heat (Qr)
+    scalarField Qr(Tp.size(), 0.0);
+    if (QrName_ != "none")
+    {
+        Qr = patch().lookupPatchField<volScalarField, scalar>(QrName_);
+    }
+
+    scalarField QrNbr(Tp.size(), 0.0);
+    if (QrNbrName_ != "none")
+    {
+        QrNbr = nbrPatch.lookupPatchField<volScalarField, scalar>(QrNbrName_);
+        mpp.distribute(QrNbr);
+    }
+
+    const scalarField dmHfg(dmHfgNbr + dmHfg_);
+
+    const scalarField mpCpdt(mpCpTpNbr + mpCpTp_);
+
+    // Qr > 0 (heat up the wall)
+    scalarField alpha(KDeltaNbr + mpCpdt - (Qr + QrNbr + dmHfg)/Tp);
+
+    valueFraction() = alpha/(alpha + myKDelta_);
+
+    refValue() = (KDeltaNbr*nbrIntFld + mpCpdt*Tp)/alpha;
+
+    mixedFvPatchScalarField::updateCoeffs();
+
+
+    if (debug)
+    {
+        if (fluid_)
+        {
+            scalar Qdm = gSum(dm);
+            scalar QMass = gSum(mass_);
+            scalar Qt = gSum(myKDelta_*(Tp - Tin)*magSf);
+            scalar QtSolid = gSum(KDeltaNbr*(Tp - nbrIntFld)*magSf);
+
+            Info<< mesh.name() << ':'
+                << patch().name() << ':'
+                << dimensionedInternalField().name() << " <- "
+                << nbrMesh.name() << ':'
+                << nbrPatch.name() << ':'
+                << dimensionedInternalField().name() << " :" << nl
+                << "    Total mass flux   [Kg/s] : " << Qdm << nl
+                << "    Total mass on the wall [Kg] : " << QMass << nl
+                << "    Total heat (>0 leaving the wall to the fluid) [W] : "
+                << Qt << nl
+                << "     Total heat (>0 leaving the wall to the solid) [W] : "
+                << QtSolid << nl
+                << "     wall temperature "
+                << " min:" << gMin(*this)
+                << " max:" << gMax(*this)
+                << " avg:" << gAverage(*this)
+                << endl;
+        }
+    }
+}
+
+
+void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    mixedFvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "p", "p", pName_);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_);
+    writeEntryIfDifferent<word>(os, "Tnbr", "T", TnbrName_);
+    writeEntryIfDifferent<word>(os, "QrNbr", "none", QrNbrName_);
+    writeEntryIfDifferent<word>(os, "Qr", "none", QrName_);
+
+    if (fluid_)
+    {
+        os.writeKeyword("mode")<< massModeTypeNames_[mode_]
+            << token::END_STATEMENT <<nl;
+
+        writeEntryIfDifferent<word>(os, "specieName", "none", specieName_);
+
+        os.writeKeyword("carrierMolWeight")<< Mcomp_
+            << token::END_STATEMENT <<nl;
+
+        os.writeKeyword("L")<< L_ << token::END_STATEMENT << nl;
+        os.writeKeyword("Tvap")<< Tvap_ << token::END_STATEMENT << nl;
+        os.writeKeyword("fluid")<< fluid_ << token::END_STATEMENT << nl;
+        mass_.writeEntry("mass", os);
+
+        if (mode_ == mtConstantMass)
+        {
+            cp_.writeEntry("cp", os);
+            rho_.writeEntry("rho", os);
+        }
+
+        thickness_.writeEntry("thickness", os);
+        word liq = "liquid";
+        os << token::TAB << token::TAB << liq;
+        liquidDict_.write(os);
+    }
+
+    temperatureCoupledBase::write(os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        humidityTemperatureCoupledMixedFvPatchScalarField
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
new file mode 100644
index 0000000000..11fc5abcb0
--- /dev/null
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
@@ -0,0 +1,400 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+
+    Foam::
+    compressible::
+    humidityTemperatureCoupledMixedFvPatchScalarField
+
+Description
+    Mixed boundary condition for temperature to be used at the coupling
+    interface between fluid solid regions.
+
+    This boundary condition can operate in four modes:
+    - \c constantMass: thermal inertia only
+      - requires \c rho, \c thickness and \cp
+    - \c condensation: condensation only
+      - when the wall temperature (Tw) is below the dew temperature (Tdew)
+        condesation takes place and the resulting condensed mass is stored
+        on the wall
+    - \c evaporation: evaporation only
+      - initial mass is vaporized when Tw is above the input vaporization
+        temperature (Tvap).
+    - \c condensationAndEvaporation : condensation and evaporation take place
+      simultaneously.
+
+    There is no mass flow on the wall, i.e. the mass condensed on a face
+    remains on that face. It uses a 'lumped mass' model to include thermal
+    inertia effects.
+
+    It assumes a drop-wise type of condensation, whereby its heat transfer
+    Nusselt number is calculated using:
+    \f{eqnarray*}{
+        51104 + 2044 T   & T > 295 & T < 373 \\
+        255510           & T > 373 &
+    \f}
+
+    Reference:
+    - T. Bergam, A.Lavine, F. Incropera and D. Dewitt. Heat and Mass Transfer.
+      7th Edition. Chapter 10.
+
+    The mass transfer correlation used is:
+
+    \f[ h_m = D_{ab} \frac{Sc}{L} \f]
+
+    where:
+    \vartable
+        D_{ab} | mass vapour difussivity
+        L      | characteristic length
+        Sc     | Schmidt number
+    \endvartable
+
+    The Schmidt number is calculated using:
+
+    \f{eqnarray*}{
+            0.664 Re^\frac{1}{2} Sc^\frac{1}{3} & Re < 5.0E+05 \\
+            0.037 Re^\frac{4}{5} Sc^\frac{1}{3} & Re > 5.0E+05
+    \f}
+
+    NOTE:
+    - The correlation used to calculate Tdew is for water vapour.
+    - A scalar transport equation for the carrier specie is required, e.g.
+      supplied via a function object or in the main solver. This specie
+      transports the vapour phase in the main ragion.
+    - The boundary condition of this specie on the coupled wall must be 
+      fixedGradient in order to allow condensation or evaporation of the
+      vapour in or out of this wall
+
+
+    Example usage:
+
+    On the fluid side
+    \verbatim
+    myInterfacePatchName
+    {
+        type            thermalHumidityCoupledMixed;
+        kappa           fluidThermo;
+        kappaName       none;
+
+        // Modes of operation: inert, condensation, vaporization, condEvap
+        mode            condEvap;
+
+        // Carrier species name
+        specieName      H2O;
+
+        // Carrier molecular weight
+        carrierMolWeight           28.9;
+
+        // Characteristic lenght of the wall
+        L               0.1;
+
+        // Vaporasation temperature
+        Tvap            273;
+
+        // Liquid properties for the condensed mass
+        liquid
+        {
+            H2O
+            {
+                defaultCoeffs       yes;
+            }
+        }
+
+        // thickness, density and cp required for inert and condensation
+        // modes
+
+        //thickness       uniform 0;
+        //cp              uniform 0;
+        //rho             uniform 0;
+
+        value           $internalField;
+    }
+    \endverbatim
+
+    On the solid side:
+    \verbatim
+    myInterfacePatchName
+    {
+        type            thermalInertiaMassTransferCoupledMixed;
+        kappa           solidThermo;
+        kappaName       none;
+        value           uniform 260;
+    }
+    \endverbatim
+
+
+SourceFiles
+    humidityTemperatureCoupledMixedFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef humidityTemperatureCoupledMixedFvPatchScalarField_H
+#define humidityTemperatureCoupledMixedFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+#include "temperatureCoupledBase.H"
+#include "liquidProperties.H"
+#include "autoPtr.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+      Class humidityTemperatureCoupledMixedFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class humidityTemperatureCoupledMixedFvPatchScalarField
+:
+    public mixedFvPatchScalarField,
+    public temperatureCoupledBase
+{
+public:
+
+    //  Public enumeration
+
+        //- Modes of mass transfer
+        enum massTransferMode
+        {
+            mtConstantMass,
+            mtCondensation,
+            mtEvaporation,
+            mtCondensationAndEvaporation
+        };
+
+
+private:
+
+    // Private data
+
+        static const NamedEnum<massTransferMode, 4> massModeTypeNames_;
+
+        //- Operating mode
+        massTransferMode mode_;
+
+
+        // Field names
+
+            //- Name of the pressure field
+            const word pName_;
+
+            //- Name of the velocity field
+            const word UName_;
+
+            //- Name of the density field
+            const word rhoName_;
+
+            //- Name of the dynamic viscosity field
+            const word muName_;
+
+            //- Name of temperature field on the neighbour region
+            const word TnbrName_;
+
+            //- Name of the radiative heat flux in the neighbout region
+            const word QrNbrName_;
+
+            //- Name of the radiative heat flux field
+            const word QrName_;
+
+            //- Name of the species on which the mass transfered (default H2O)
+            const word specieName_;
+
+
+        //- Liquid properties
+        autoPtr<liquidProperties> liquid_;
+
+        //- Liquid dictionary
+        dictionary liquidDict_;
+
+        //- Mass accumulated on faces
+        scalarField mass_;
+
+        //- Vaporization temperature
+        scalar Tvap_;
+
+        //- Cache myDelta
+        scalarField myKDelta_;
+
+        //- Phase change energy
+        scalarField dmHfg_;
+
+        //- Thermal inertia
+        scalarField mpCpTp_;
+
+        //- Average molecular weight for the carrier mixture in the gas phase
+        scalar Mcomp_;
+
+        //- Characteristic length scale
+        scalar L_;
+
+        //- Fluid side
+        bool fluid_;
+
+        //- Cp field for inert mode
+        scalarField cp_;
+
+        //- Thickness field for inert mode
+        scalarField thickness_;
+
+        //- Density field for inert mode
+        scalarField rho_;
+
+
+    // Private members
+
+        //- Calculation of Sh
+        scalar Sh(const scalar Re, const scalar Sc) const;
+
+        //- Calculation of htc from the condensed surface
+        scalar htcCondensation(const scalar TSat, const scalar Re) const;
+
+        //- Lookup (or create) thickness field for output
+        volScalarField& thicknessField(const word&, const fvMesh&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("humidityTemperatureCoupledMixed");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        humidityTemperatureCoupledMixedFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        humidityTemperatureCoupledMixedFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  turbulentTemperatureCoupledBaffleMixedFvPatchScalarField onto a
+        //  new patch
+        humidityTemperatureCoupledMixedFvPatchScalarField
+        (
+            const
+            humidityTemperatureCoupledMixedFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new humidityTemperatureCoupledMixedFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        humidityTemperatureCoupledMixedFvPatchScalarField
+        (
+            const humidityTemperatureCoupledMixedFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new humidityTemperatureCoupledMixedFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+            // Mapping functions
+
+                //- Map (and resize as needed) from self given a mapping object
+                virtual void autoMap
+                (
+                    const fvPatchFieldMapper&
+                );
+
+                //- Reverse map the given fvPatchField onto this fvPatchField
+                virtual void rmap
+                (
+                    const fvPatchScalarField&,
+                    const labelList&
+                );
+
+
+        //- Return myKDelta
+        const scalarField myKDelta() const
+        {
+            return myKDelta_;
+        }
+
+        //- Return mpCpTp
+        const scalarField mpCpTp() const
+        {
+            return mpCpTp_;
+        }
+
+        //- Return dmHfg
+        const scalarField dmHfg() const
+        {
+            return dmHfg_;
+        }
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C
index 2baeadaa91..2f8dfa9acb 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.C
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::C::C()
 {
     if (debug)
     {
-        WarningIn("C::C()")
+        WarningInFunction
             << "Properties of graphite need to be checked!!!"
             << endl;
     }
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
index 72516736e0..a7dbb8bff4 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::CaCO3::CaCO3()
 {
     if (debug)
     {
-        WarningIn("CaCO3::CaCO3()")
+        WarningInFunction
             << "Properties of CaCO3 need to be checked!!!"
             << endl;
     }
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
index 199bde39e9..381191f89e 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.C
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::ash::ash()
 {
     if (debug)
     {
-        WarningIn("ash::ash()")
+        WarningInFunction
             << "Properties of ash need to be checked!!!"
             << endl;
     }
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index ead56293d7..a913aa71d3 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
 
         if (cstrIter == ConstructorTablePtr_->end())
         {
-            FatalErrorIn("solidProperties::New(Istream&)")
+            FatalErrorInFunction
                 << "Unknown solidProperties type " << solidType << nl << nl
                 << "Valid solidProperties types are :" << endl
                 << ConstructorTablePtr_->sortedToc()
@@ -61,7 +61,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
     }
     else
     {
-        FatalErrorIn("solidProperties::New(Istream&)")
+        FatalErrorInFunction
             << "solidProperties type " << solidType
             << ", option " << coeffs << " given"
             << ", should be coeffs or defaultCoeffs"
@@ -93,7 +93,7 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
 
         if (cstrIter == ConstructorTablePtr_->end())
         {
-            FatalErrorIn("solidProperties::New(const dictionary&)")
+            FatalErrorInFunction
                 << "Unknown solidProperties type " << solidType << nl << nl
                 << "Valid solidProperties types are :" << endl
                 << ConstructorTablePtr_->sortedToc()
diff --git a/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H b/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H
index ab7466d0a7..8179b67553 100644
--- a/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H
+++ b/src/thermophysicalModels/radiation/include/createIncompressibleRadiationModel.H
@@ -21,12 +21,23 @@
                 runTime,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false  // do not register!
+                false // Do not register
             )
         );
 
-        dimensionedScalar rhoRef(transportProperties.lookup("rhoRef"));
-        dimensionedScalar CpRef(transportProperties.lookup("CpRef"));
+        dimensionedScalar rhoRef
+        (
+            "rhoRef",
+            dimDensity,
+            transportProperties
+        );
+
+        dimensionedScalar CpRef
+        (
+            "CpRef",
+            dimSpecificHeatCapacity,
+            transportProperties
+        );
 
         rhoCpRef = rhoRef*CpRef;
     }
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
index 3a8782d0e3..68c7422580 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
@@ -286,7 +286,7 @@ Foam::radiation::P1::Ru() const
     const DimensionedField<scalar, volMesh> a =
         absorptionEmission_->aCont()().dimensionedInternalField();
 
-    return a*G - 4.0*E;
+    return a*G - E;
 }
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
index a97cc591f7..c3bc3ef327 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
@@ -59,10 +59,8 @@ void Foam::radiation::absorptionCoeffs::checkT(const scalar T) const
 {
     if (T < Tlow_ || T > Thigh_)
     {
-        WarningIn
-        (
-            "absorptionCoeffs::checkT(const scalar T) const"
-        )   << "usinf absCoeff out of temperature range:" << nl
+        WarningInFunction
+            << "usinf absCoeff out of temperature range:" << nl
             << "    " << Tlow_ << " -> " << Thigh_ << ";  T = " << T
             << nl << endl;
     }
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index bbafadda84..3de54c8c6e 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -30,7 +30,6 @@ License
 
 using namespace Foam::constant;
 
-
 const Foam::word
 Foam::radiation::radiativeIntensityRay::intensityPrefix("ILambda");
 
@@ -275,7 +274,6 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
               * (
                     (k - absorptionEmission_.aDisp(lambdaI))
                     *blackBody_.bLambda(lambdaI)
-
                   + absorptionEmission_.ECont(lambdaI)
                   + absorptionEmission_.EDisp(lambdaI)
                 )
@@ -292,7 +290,6 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
              * (
                     (k - absorptionEmission_.aDisp(lambdaI))
                    *blackBody_.bLambda(lambdaI)
-
                  + absorptionEmission_.E(lambdaI)/4
                )
             );
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index afd85ffcb2..9ef90cd5ee 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -73,7 +73,7 @@ void Foam::radiation::viewFactor::initialise()
 
     if (debug && Pstream::master())
     {
-        InfoIn("radiation::viewFactor::initialise()")
+        InfoInFunction
             << "Total number of clusters : " << totalNCoarseFaces_ << endl;
     }
 
@@ -138,7 +138,7 @@ void Foam::radiation::viewFactor::initialise()
 
         if (debug)
         {
-            InfoIn("radiation::viewFactor::initialise()")
+            InfoInFunction
                 << "Insert elements in the matrix..." << endl;
         }
 
@@ -160,7 +160,7 @@ void Foam::radiation::viewFactor::initialise()
         {
             if (debug)
             {
-                InfoIn("radiation::viewFactor::initialise()")
+                InfoInFunction
                     << "Smoothing the matrix..." << endl;
             }
 
@@ -579,7 +579,7 @@ void Foam::radiation::viewFactor::calculate()
 
                 if (debug)
                 {
-                    InfoIn("radiation::viewFactor::initialise()")
+                    InfoInFunction
                         << "\nDecomposing C matrix..." << endl;
                 }
 
@@ -607,7 +607,7 @@ void Foam::radiation::viewFactor::calculate()
 
             if (debug)
             {
-                InfoIn("radiation::viewFactor::initialise()")
+                InfoInFunction
                     << "\nLU Back substitute C matrix.." << endl;
             }
 
@@ -665,7 +665,7 @@ void Foam::radiation::viewFactor::calculate()
             const scalarField& magSf = mesh_.magSf().boundaryField()[patchID];
             scalar heatFlux = gSum(Qrp*magSf);
 
-            InfoIn("radiation::viewFactor::initialise()")
+            InfoInFunction
                 << "Total heat transfer rate at patch: "
                 << patchID << " "
                 << heatFlux << endl;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 9b00735ac9..d697bfa914 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -309,28 +309,15 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
         {
             if (debug)
             {
-                WarningIn
-                (
-                    "tmp<volScalarField>"
-                    "radiation::greyMeanAbsorptionEmission::ECont"
-                    "("
-                        "const label"
-                    ") const"
-                )
+                WarningInFunction
                     << "Incompatible dimensions for dQ field" << endl;
             }
         }
     }
     else
     {
-        WarningIn
-        (
-            "tmp<volScalarField>"
-            "radiation::greyMeanAbsorptionEmission::ECont"
-            "("
-                "const label"
-            ") const"
-        ) << "dQ field not found in mesh" << endl;
+        WarningInFunction
+          << "dQ field not found in mesh" << endl;
     }
 
     return E;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index 00acfa12d6..32d5c52114 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -114,15 +114,8 @@ greyMeanSolidAbsorptionEmission
         const word& key = iter().keyword();
         if (!mixture_.contains(key))
         {
-            WarningIn
-            (
-                "greyMeanSolidAbsorptionEmission::"
-                "greyMeanSolidAbsorptionEmission "
-                "("
-                "   const dictionary& dict,"
-                "   const fvMesh& mesh"
-                ")"
-            )   << " specie: " << key << " is not found in the solid mixture"
+            WarningInFunction
+                << " specie: " << key << " is not found in the solid mixture"
                 << nl
                 << " specie is the mixture are:" << mixture_.species() << nl
                 << nl << endl;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index f3a957b612..7147a96065 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -132,11 +132,8 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
         }
         else
         {
-            FatalErrorIn
-            (
-                "radiation::wideBandAbsorptionEmission(const"
-                "dictionary& dict, const fvMesh& mesh)"
-            )   << "specie: " << iter.key()
+            FatalErrorInFunction
+                << "specie: " << iter.key()
                 << " is neither in look-up table : "
                 << lookUpTable_.tableName() << " nor is being solved"
                 << exit(FatalError);
@@ -275,14 +272,7 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandI) const
         }
         else
         {
-            WarningIn
-            (
-                "tmp<volScalarField>"
-                "radiation::wideBandAbsorptionEmission::ECont"
-                "("
-                    "const label"
-                ") const"
-            )
+            WarningInFunction
                 << "Incompatible dimensions for dQ field" << endl;
         }
     }
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C
index 451fa559dd..7b621ac7e3 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/noSoot/noSoot.C
@@ -67,10 +67,7 @@ void Foam::radiation::noSoot::correct()
 
 const Foam::volScalarField& Foam::radiation::noSoot::soot() const
 {
-    notImplemented
-    (
-        "Foam::volScalarField& Foam::radiation::noSoot::soot() const"
-    );
+    NotImplemented;
     return tmp<volScalarField>(NULL);
 }
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
index 75a21a1690..54ac871cf8 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,10 +49,8 @@ Foam::chemistryReader<ThermoType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "chemistryReader::New(const dictionary&, speciesTable&)"
-        )   << "Unknown chemistryReader type "
+        FatalErrorInFunction
+            << "Unknown chemistryReader type "
             << chemistryReaderTypeName << nl << nl
             << "Valid chemistryReader types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 98a7bbd29c..1c8af0b123 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ int Foam::chemkinReader::yyBufSize = YY_BUF_SIZE;
 //! \cond dummy
 int yyFlexLexer::yylex()
 {
-    FatalErrorIn("yyFlexLexer::yylex()")
+    FatalErrorInFunction
         << "should not have called this function"
         << abort(Foam::FatalError);
 
@@ -357,7 +357,7 @@ bool finishReaction = false;
         }
         else
         {
-            WarningIn("chemkinReader::lex()")
+            WarningInFunction
                 << "element " << currentElementName
                 << " already in table." << endl;
         }
@@ -412,7 +412,7 @@ bool finishReaction = false;
             }
             else
             {
-                WarningIn("chemkinReader::lex()")
+                WarningInFunction
                     << "specie " << specieName
                     << " already in table." << endl;
             }
@@ -645,8 +645,7 @@ bool finishReaction = false;
                     highCpCoeffs,
                     lowCpCoeffs
                 ),
-                1.67212e-6,
-                170.672
+                transportDict_.subDict(currentSpecieName)
             )
         );
 
@@ -719,7 +718,7 @@ bool finishReaction = false;
                 {
                     if (rrType != Arrhenius && rrType != thirdBodyArrhenius)
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set reaction rate type to"
                                " thirdBodyArrhenius when it is already set to "
                             << reactionRateTypeNames[rrType]
@@ -729,7 +728,7 @@ bool finishReaction = false;
 
                     if (pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "A non-pressure dependent third-body appears in"
                                " the pressure dependent reaction on line "
                             << lineNo_
@@ -753,7 +752,7 @@ bool finishReaction = false;
 
                 case plasmaMomentumTransfer:
                 {
-                    FatalErrorIn("chemkinReader::lex()")
+                    FatalErrorInFunction
                         << "Plasma momentum-transfer in reaction on line "
                         << lineNo_ << "not yet supported"
                         << exit(FatalError);
@@ -764,7 +763,7 @@ bool finishReaction = false;
 
                 case collisionCrossSection:
                 {
-                    FatalErrorIn("chemkinReader::lex()")
+                    FatalErrorInFunction
                         << "Collision cross-section in reaction on line "
                         << lineNo_ << "not yet supported"
                         << exit(FatalError);
@@ -800,7 +799,7 @@ bool finishReaction = false;
 
                 default:
                 {
-                    FatalErrorIn("chemkinReader::lex()")
+                    FatalErrorInFunction
                         << "keyword " << keyword
                         << " should be followed by parameters"
                         << " on line " << lineNo_
@@ -871,7 +870,7 @@ bool finishReaction = false;
                 {
                     if (!pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "LOW keyword given for a unimolecular fall-off"
                                " reaction which does not contain a pressure"
                                " dependent specie" << " on line " << lineNo_
@@ -884,7 +883,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set reaction rate type to"
                                " unimolecularFallOff when it is already set to "
                             << reactionRateTypeNames[rrType]
@@ -906,7 +905,7 @@ bool finishReaction = false;
                 {
                     if (!pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "HIGH keyword given for a chemically"
                                " activated bimolecular reaction which does not"
                                " contain a pressure dependent specie"
@@ -920,7 +919,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set reaction rate type to"
                                " chemicallyActivatedBimolecular when it is"
                                " already set to "
@@ -943,7 +942,7 @@ bool finishReaction = false;
                 {
                     if (!pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "TROE keyword given for a"
                                " reaction which does not contain a pressure"
                                " dependent specie" << " on line " << lineNo_
@@ -960,7 +959,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set fall-off function type to Troe"
                                " when it is already set to "
                             << fallOffFunctionNames[fofType]
@@ -977,7 +976,7 @@ bool finishReaction = false;
                 {
                     if (!pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "SRI keyword given for a"
                                " reaction which does not contain a pressure"
                                " dependent specie" << " on line " << lineNo_
@@ -994,7 +993,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set fall-off function type to SRI"
                                " when it is already set to "
                             << fallOffFunctionNames[fofType]
@@ -1011,7 +1010,7 @@ bool finishReaction = false;
                 {
                     if (pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Landau-Teller reaction rate cannot be used"
                                " for the pressure-dependent reaction on line "
                             << lineNo_
@@ -1024,7 +1023,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set reaction rate type to"
                                " LandauTeller when it is already set to "
                             << reactionRateTypeNames[rrType]
@@ -1042,7 +1041,7 @@ bool finishReaction = false;
                 {
                     if (pDependentSpecieName.size())
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Non-equilibrium Landau-Teller reaction rate"
                                " cannot be used"
                                " for the pressure-dependent reaction on line "
@@ -1052,7 +1051,7 @@ bool finishReaction = false;
 
                     if (rType != nonEquilibriumReversible)
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Reverse reaction Arrhenius coefficients not"
                                " given for reverse LandauTeller reaction."
                                " Please reorder 'REV' keyword to preceed 'RLT'"
@@ -1076,7 +1075,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set reaction rate type to"
                                " Janev when it is already set to "
                             << reactionRateTypeNames[rrType]
@@ -1097,7 +1096,7 @@ bool finishReaction = false;
                     }
                     else
                     {
-                        FatalErrorIn("chemkinReader::lex()")
+                        FatalErrorInFunction
                             << "Attempt to set reaction rate type to"
                                " powerSeries when it is already set to "
                             << reactionRateTypeNames[rrType]
@@ -1112,7 +1111,7 @@ bool finishReaction = false;
 
                 case radiationActivatedReactionType:
                 {
-                    FatalErrorIn("chemkinReader::lex()")
+                    FatalErrorInFunction
                         << "Radiation activated reaction on line "
                         << lineNo_ << "not yet supported"
                         << exit(FatalError);
@@ -1123,7 +1122,7 @@ bool finishReaction = false;
 
                 case energyLossReactionType:
                 {
-                    FatalErrorIn("chemkinReader::lex()")
+                    FatalErrorInFunction
                         << "Energy loss in reaction on line "
                         << lineNo_ << "not yet supported"
                         << exit(FatalError);
@@ -1162,7 +1161,7 @@ bool finishReaction = false;
 
                 default:
                 {
-                    FatalErrorIn("chemkinReader::lex()")
+                    FatalErrorInFunction
                         << "unknown reaction keyword " << keyword
                         << " on line " << lineNo_
                         << exit(FatalError);
@@ -1182,7 +1181,7 @@ bool finishReaction = false;
             }
             else
             {
-                FatalErrorIn("chemkinReader::lex()")
+                FatalErrorInFunction
                     << "unknown third-body specie " << keyword
                     << " on line " << lineNo_ << nl
                     << "Valid species are : " << nl
@@ -1234,7 +1233,7 @@ bool finishReaction = false;
         }
         else
         {
-            FatalErrorIn("chemkinReader::lex()")
+            FatalErrorInFunction
                 << "unknown specie " << currentSpecieName
                 << " on line " << lineNo_ << nl
                 << "Valid species are : " << nl
@@ -1289,7 +1288,7 @@ bool finishReaction = false;
         {
             if (!lhsThirdBodyCounter || !rhsThirdBodyCounter)
             {
-                FatalErrorIn("chemkinReader::lex()")
+                FatalErrorInFunction
                     << "Third body not present on both sides of reaction"
                        " on line " << lineNo_
                 << exit(FatalError);
@@ -1297,7 +1296,7 @@ bool finishReaction = false;
 
             if (lhsThirdBodyCounter != 1)
             {
-                FatalErrorIn("chemkinReader::lex()")
+                FatalErrorInFunction
                     << "More than 1 third body present on l.h.s. side"
                        " of reaction on line " << lineNo_
                     << exit(FatalError);
@@ -1305,7 +1304,7 @@ bool finishReaction = false;
 
             if (rhsThirdBodyCounter != 1)
             {
-                FatalErrorIn("chemkinReader::lex()")
+                FatalErrorInFunction
                     << "More than 1 third body present on r.h.s. side"
                        " of reaction on line " << lineNo_
                     << exit(FatalError);
@@ -1338,7 +1337,7 @@ bool finishReaction = false;
 
         if (rrType == thirdBodyArrhenius)
         {
-            FatalErrorIn("chemkinReader::lex()")
+            FatalErrorInFunction
                 << "The pressure-dependent third-body '"
                 << pDependentSpecieName
                 << "' is given in non-pressure-dependent third-body reaction"
@@ -1354,7 +1353,7 @@ bool finishReaction = false;
         {
             if (pDependentSpecieName != rhsPDependentSpecieName)
             {
-                FatalErrorIn("chemkinReader::lex()")
+                FatalErrorInFunction
                     << "The third-body reactant '"
                     << pDependentSpecieName
                     << "' is not the same as the third-body product '"
@@ -1380,7 +1379,7 @@ bool finishReaction = false;
             }
             else
             {
-                FatalErrorIn("chemkinReader::lex()")
+                FatalErrorInFunction
                     << "unknown third-body specie " << pDependentSpecieName
                     << " on line " << lineNo_ << nl
                     << "Valid species are : " << nl
@@ -1404,7 +1403,7 @@ bool finishReaction = false;
 
 <readTdepSpecie>{specieName} {
         word specieName(foamName(foamSpecieString(YYText())));
-        FatalErrorIn("chemkinReader::lex()")
+        FatalErrorInFunction
             << "Temperature-dependent reaction on line "
             << lineNo_ << "not yet supported"
             << exit(FatalError);
@@ -1426,7 +1425,7 @@ bool finishReaction = false;
         }
         else
         {
-            FatalErrorIn("chemkinReader::lex()")
+            FatalErrorInFunction
                 << "unknown specie " << currentSpecieName
                 << " given in reaction-order specification"
                 << " on line " << lineNo_ << nl
@@ -1463,7 +1462,7 @@ bool finishReaction = false;
                 side = "r.h.s.";
             }
 
-            FatalErrorIn("chemkinReader::lex()")
+            FatalErrorInFunction
                 << "Specie " << currentSpecieName
                 << " on line " << lineNo_
                 << " not present in " << side << " of reaction " << nl << lrhs
@@ -1514,7 +1513,7 @@ bool finishReaction = false;
 
 <CHEMKINError>.* {
         yy_pop_state();
-        FatalErrorIn("chemkinReader::lex()")
+        FatalErrorInFunction
             << "while " << stateNames[YY_START] << " on line " << lineNo_ << nl
             << "    expected " << stateExpects[YY_START]
             << " but found '" << startError << YYText() << "'"
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 2334241940..eef9f3a4dd 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -132,7 +132,7 @@ Foam::scalar Foam::chemkinReader::molecularWeight
         }
         else
         {
-            FatalErrorIn("chemkinReader::lex()")
+            FatalErrorInFunction
                 << "Unknown element " << elementName
                 << " on line " << lineNo_-1 << nl
                 << "    specieComposition: " << specieComposition
@@ -153,7 +153,7 @@ void Foam::chemkinReader::checkCoeffs
 {
     if (reactionCoeffs.size() != nCoeffs)
     {
-        FatalErrorIn("chemkinReader::checkCoeffs")
+        FatalErrorInFunction
             << "Wrong number of coefficients for the " << reactionRateName
             << " rate expression on line "
             << lineNo_-1 << ", should be "
@@ -219,7 +219,7 @@ void Foam::chemkinReader::addReactionType
 
             if (rType < 3)
             {
-                FatalErrorIn("chemkinReader::addReactionType")
+                FatalErrorInFunction
                     << "Reaction type " << reactionTypeNames[rType]
                     << " on line " << lineNo_-1
                     << " not handled by this function"
@@ -227,7 +227,7 @@ void Foam::chemkinReader::addReactionType
             }
             else
             {
-                FatalErrorIn("chemkinReader::addReactionType")
+                FatalErrorInFunction
                     << "Unknown reaction type " << rType
                     << " on line " << lineNo_-1
                     << exit(FatalError);
@@ -292,7 +292,7 @@ void Foam::chemkinReader::addPressureDependentReaction
 
             if (TroeCoeffs.size() != 4 && TroeCoeffs.size() != 3)
             {
-                FatalErrorIn("chemkinReader::addPressureDependentReaction")
+                FatalErrorInFunction
                     << "Wrong number of coefficients for Troe rate expression"
                        " on line " << lineNo_-1 << ", should be 3 or 4 but "
                     << TroeCoeffs.size() << " supplied." << nl
@@ -347,7 +347,7 @@ void Foam::chemkinReader::addPressureDependentReaction
 
             if (SRICoeffs.size() != 5 && SRICoeffs.size() != 3)
             {
-                FatalErrorIn("chemkinReader::addPressureDependentReaction")
+                FatalErrorInFunction
                     << "Wrong number of coefficients for SRI rate expression"
                        " on line " << lineNo_-1 << ", should be 3 or 5 but "
                     << SRICoeffs.size() << " supplied." << nl
@@ -397,7 +397,7 @@ void Foam::chemkinReader::addPressureDependentReaction
         }
         default:
         {
-            FatalErrorIn("chemkinReader::addPressureDependentReaction")
+            FatalErrorInFunction
                 << "Fall-off function type "
                 << fallOffFunctionNames[fofType]
                 << " on line " << lineNo_-1
@@ -734,7 +734,7 @@ void Foam::chemkinReader::addReaction
         }
         case unknownReactionRateType:
         {
-            FatalErrorIn("chemkinReader::addReaction")
+            FatalErrorInFunction
                 << "Internal error on line " << lineNo_-1
                 << ": reaction rate type has not been set"
                 << exit(FatalError);
@@ -742,7 +742,7 @@ void Foam::chemkinReader::addReaction
         }
         default:
         {
-            FatalErrorIn("chemkinReader::addReaction")
+            FatalErrorInFunction
                 << "Reaction rate type " << reactionRateTypeNames[rrType]
                 << " on line " << lineNo_-1
                 << " not implemented"
@@ -755,7 +755,7 @@ void Foam::chemkinReader::addReaction
     {
         if (mag(nAtoms[i]) > imbalanceTol_)
         {
-            FatalErrorIn("chemkinReader::addReaction")
+            FatalErrorInFunction
                 << "Elemental imbalance of " << mag(nAtoms[i])
                 << " in " << elementNames_[i]
                 << " in reaction" << nl
@@ -774,20 +774,20 @@ void Foam::chemkinReader::addReaction
 void Foam::chemkinReader::read
 (
     const fileName& CHEMKINFileName,
-    const fileName& thermoFileName
+    const fileName& thermoFileName,
+    const fileName& transportFileName
 )
 {
+    transportDict_.read(IFstream(transportFileName)());
+
     if (thermoFileName != fileName::null)
     {
         std::ifstream thermoStream(thermoFileName.c_str());
 
         if (!thermoStream)
         {
-            FatalErrorIn
-            (
-                "chemkin::chemkin(const fileName& CHEMKINFileName, "
-                "const fileName& thermoFileName)"
-            )   << "file " << thermoFileName << " not found"
+            FatalErrorInFunction
+                << "file " << thermoFileName << " not found"
                 << exit(FatalError);
         }
 
@@ -806,11 +806,8 @@ void Foam::chemkinReader::read
 
     if (!CHEMKINStream)
     {
-        FatalErrorIn
-        (
-            "chemkin::chemkin(const fileName& CHEMKINFileName, "
-            "const fileName& thermoFileName)"
-        )   << "file " << CHEMKINFileName << " not found"
+        FatalErrorInFunction
+            << "file " << CHEMKINFileName << " not found"
             << exit(FatalError);
     }
 
@@ -830,8 +827,9 @@ void Foam::chemkinReader::read
 
 Foam::chemkinReader::chemkinReader
 (
-    const fileName& CHEMKINFileName,
     speciesTable& species,
+    const fileName& CHEMKINFileName,
+    const fileName& transportFileName,
     const fileName& thermoFileName,
     const bool newFormat
 )
@@ -843,7 +841,7 @@ Foam::chemkinReader::chemkinReader
     newFormat_(newFormat),
     imbalanceTol_(ROOTSMALL)
 {
-    read(CHEMKINFileName, thermoFileName);
+    read(CHEMKINFileName, thermoFileName, transportFileName);
 }
 
 
@@ -874,6 +872,11 @@ Foam::chemkinReader::chemkinReader
         thermoFile = fileName(thermoDict.lookup("CHEMKINThermoFile")).expand();
     }
 
+    fileName transportFile
+    (
+        fileName(thermoDict.lookup("CHEMKINTransportFile")).expand()
+    );
+
     // allow relative file names
     fileName relPath = thermoDict.name().path();
     if (relPath.size())
@@ -883,13 +886,18 @@ Foam::chemkinReader::chemkinReader
             chemkinFile = relPath/chemkinFile;
         }
 
-        if (!thermoFile.isAbsolute())
+        if (thermoFile != fileName::null && !thermoFile.isAbsolute())
         {
             thermoFile = relPath/thermoFile;
         }
+
+        if (!transportFile.isAbsolute())
+        {
+            transportFile = relPath/transportFile;
+        }
     }
 
-    read(chemkinFile, thermoFile);
+    read(chemkinFile, thermoFile, transportFile);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index ee1986f60b..74ee5512da 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -208,6 +208,9 @@ private:
         //- List of the reactions
         ReactionList<gasHThermoPhysics> reactions_;
 
+        //- Transport properties dictionary
+        dictionary transportDict_;
+
         //- Flag to indicate that file is in new format
         Switch newFormat_;
 
@@ -302,10 +305,10 @@ private:
         void read
         (
             const fileName& CHEMKINFileName,
-            const fileName& thermoFileName
+            const fileName& thermoFileName,
+            const fileName& transportFileName
         );
 
-
         //- Disallow default bitwise copy construct
         chemkinReader(const chemkinReader&);
 
@@ -324,8 +327,9 @@ public:
         //- Construct from CHEMKIN III file name
         chemkinReader
         (
-            const fileName& chemkinFile,
             speciesTable& species,
+            const fileName& CHEMKINFileName,
+            const fileName& transportFileName,
             const fileName& thermoFileName = fileName::null,
             const bool newFormat = false
         );
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
index 1b19ccdd32..7c52bea5d0 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
@@ -129,13 +129,8 @@ const ThermoType& Foam::egrMixture<ThermoType>::getLocalThermo
     }
     else
     {
-        FatalErrorIn
-        (
-            "const ThermoType& Foam::egrMixture<ThermoType>::getLocalThermo"
-            "("
-                "const label "
-            ") const"
-        )   << "Unknown specie index " << speciei << ". Valid indices are 0..2"
+        FatalErrorInFunction
+            << "Unknown specie index " << speciei << ". Valid indices are 0..2"
             << abort(FatalError);
 
         return fuel_;
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
index 7a65990782..7bf2f11abd 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
@@ -107,14 +107,8 @@ const ThermoType& Foam::homogeneousMixture<ThermoType>::getLocalThermo
     }
     else
     {
-        FatalErrorIn
-        (
-            "const ThermoType& Foam::homogeneousMixture<ThermoType>::"
-            "getLocalThermo"
-            "("
-                "const label "
-            ") const"
-        )   << "Unknown specie index " << speciei << ". Valid indices are 0..1"
+        FatalErrorInFunction
+            << "Unknown specie index " << speciei << ". Valid indices are 0..1"
             << abort(FatalError);
 
         return reactants_;
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
index 3c51b1f225..15220cab18 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
@@ -126,14 +126,8 @@ const ThermoType& Foam::inhomogeneousMixture<ThermoType>::getLocalThermo
     }
     else
     {
-        FatalErrorIn
-        (
-            "const ThermoType& Foam::inhomogeneousMixture<ThermoType>::"
-            "getLocalThermo"
-            "("
-                "const label "
-            ") const"
-        )   << "Unknown specie index " << speciei << ". Valid indices are 0..2"
+        FatalErrorInFunction
+            << "Unknown specie index " << speciei << ". Valid indices are 0..2"
             << abort(FatalError);
 
         return fuel_;
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 02a651ef20..ba651a2b51 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -59,11 +59,7 @@ void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
 
     if (mag(max(Yt).value()) < ROOTVSMALL)
     {
-        FatalErrorIn
-        (
-            "void Foam::multiComponentMixture<ThermoType>::"
-            "correctMassFractions()"
-        )
+        FatalErrorInFunction
             << "Sum of mass fractions is zero for species " << this->species()
             << exit(FatalError);
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
index f4449d9afd..f090b17b5e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
@@ -241,14 +241,8 @@ Foam::singleStepReactingMixture<ThermoType>::singleStepReactingMixture
     }
     else
     {
-        FatalErrorIn
-        (
-            "singleStepReactingMixture::<ThermoType>::singleStepReactingMixture"
-            "("
-                "const dictionary&, "
-                "const fvMesh&"
-            ")"
-        )   << "Only one reaction required for single step reaction"
+        FatalErrorInFunction
+            << "Only one reaction required for single step reaction"
             << exit(FatalError);
     }
 }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
index afbb79e43f..663b79ce68 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
@@ -128,14 +128,8 @@ const ThermoType& Foam::veryInhomogeneousMixture<ThermoType>::getLocalThermo
     }
     else
     {
-        FatalErrorIn
-        (
-            "const ThermoType& Foam::veryInhomogeneousMixture<ThermoType>::"
-            "getLocalThermo"
-            "("
-                "const label "
-            ") const"
-        )   << "Unknown specie index " << speciei << ". Valid indices are 0..2"
+        FatalErrorInFunction
+            << "Unknown specie index " << speciei << ". Valid indices are 0..2"
             << abort(FatalError);
 
         return fuel_;
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
index 275a931e95..fb397d9b9d 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
@@ -57,11 +57,7 @@ Foam::basicSolidChemistryModel::~basicSolidChemistryModel()
 const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::basicSolidChemistryModel::RR(const label i) const
 {
-    notImplemented
-    (
-        "const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&"
-        "basicSolidChemistryModel::RR(const label)"
-    );
+    NotImplemented;
     return (DimensionedField<scalar, volMesh>::null());
 }
 
@@ -69,11 +65,7 @@ Foam::basicSolidChemistryModel::RR(const label i) const
 Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::basicSolidChemistryModel::RR(const label i)
 {
-    notImplemented
-    (
-        "Foam::DimensionedField<Foam::scalar, Foam::volMesh>&"
-        "basicSolidChemistryModel::RR(const label)"
-    );
+    NotImplemented;
 
     return dynamic_cast<DimensionedField<scalar, volMesh>&>
     (
@@ -92,11 +84,7 @@ Foam::basicSolidChemistryModel::calculateRR
     const label speciei
 ) const
 {
-    notImplemented
-    (
-        "Foam::DimensionedField<Foam::scalar, Foam::volMesh>&"
-        "basicSolidChemistryModel::calculateRR(const label)"
-    );
+    NotImplemented;
 
     return dynamic_cast<tmp<DimensionedField<scalar, volMesh> >&>
     (
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
index 19f585e026..12a5d39fa3 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C
@@ -121,7 +121,7 @@ New
 
     if (cstrIter == fvMeshConstructorTablePtr_->end())
     {
-        FatalErrorIn(typeName + "::New(const mesh&)")
+        FatalErrorInFunction
             << "Unknown " << typeName << " type " << nl
             << "chemistryType" << chemistryTypeDict << nl << nl
             << "Valid " << typeName << " types are:"
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index 342f4f2686..1973259531 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -662,16 +662,6 @@ void Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::solve
     scalar& subDeltaT
 ) const
 {
-    notImplemented
-    (
-        "pyrolysisChemistryModel::solve"
-        "("
-            "scalarField&, "
-            "scalar&, "
-            "scalar&, "
-            "scalar&, "
-            "scalar&  "
-        ") const"
-    );
+    NotImplemented;
 }
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 855d9e920e..e39f1f6352 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -99,10 +99,7 @@ Foam::scalar Foam::solidChemistryModel<CompType, SolidThermo>::solve
     const scalarField& deltaT
 )
 {
-    notImplemented
-    (
-        "solidChemistryModel::solve(const scalarField& deltaT)"
-    );
+    NotImplemented;
     return 0;
 }
 
@@ -111,10 +108,7 @@ template<class CompType, class SolidThermo>
 Foam::tmp<Foam::volScalarField>
 Foam::solidChemistryModel<CompType, SolidThermo>::tc() const
 {
-    notImplemented
-    (
-        "solidChemistryModel::tc()"
-    );
+    NotImplemented;
     return volScalarField::null();
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
index f16d029352..b5a4cfde96 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,16 +72,7 @@ Foam::solidReaction<ReactionThermo>::solidReaction
     glhs_(),
     grhs_()
 {
-    notImplemented
-    (
-        "template<class ReactionThermo>"
-        "Foam::solidReaction<ReactionThermo>::solidReaction"
-        "("
-        "    const speciesTable& species,"
-        "    const HashPtrTable<ReactionThermo>& thermoDatabase,"
-        "    Istream& is"
-        ")"
-    );
+    NotImplemented;
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
index ff90fe1d26..5c66f0406c 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,13 +83,7 @@ template<class Thermo>
 inline Foam::scalar Foam::constAnIsoSolidTransport<Thermo>::
 mu(const scalar p, const scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::constAnIsoSolidTransport<Thermo>mu::"
-        "("
-        "    const scalar p, const scalar T"
-        ") const"
-    );
+    NotImplemented;
     return scalar(0);
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
index fdd766a8e4..b7a2181491 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,13 +83,7 @@ template<class thermo>
 inline Foam::scalar Foam::constIsoSolidTransport<thermo>::
 mu(const scalar p, const scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::constIsoSolidTransport<thermo>mu::"
-        "("
-        "    const scalar p, const scalar T"
-        ") const"
-    );
+    NotImplemented;
     return scalar(0);
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
index 36105ceb44..4b2c6ff5b4 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,13 +95,7 @@ template<class Thermo>
 inline Foam::scalar Foam::exponentialSolidTransport<Thermo>::
 mu(const scalar p, const scalar T) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::exponentialSolidTransport<Thermo>mu::"
-        "("
-        "    const scalar p, const scalar T"
-        ") const"
-    );
+    NotImplemented;
     return scalar(0);
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
index 51dda6ba57..76f55d57a2 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,13 +107,7 @@ inline Foam::scalar Foam::polynomialSolidTransport<Thermo, PolySize>::mu
     const scalar T
 ) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::polynomialSolidTransport<thermo, PolySize>mu::"
-        "("
-        "    const scalar p, const scalar T"
-        ") const"
-    );
+    NotImplemented;
     return scalar(0);
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
new file mode 100644
index 0000000000..b37ec2f9d0
--- /dev/null
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Boussinesq.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Specie>
+Foam::Boussinesq<Specie>::Boussinesq(Istream& is)
+:
+    Specie(is),
+    rho0_(readScalar(is)),
+    T0_(readScalar(is)),
+    beta_(readScalar(is))
+{
+    is.check
+    (
+        "Boussinesq<Specie>::"
+        "Boussinesq(Istream& is)"
+    );
+}
+
+
+template<class Specie>
+Foam::Boussinesq<Specie>::Boussinesq
+(
+    const dictionary& dict
+)
+:
+    Specie(dict),
+    rho0_(readScalar(dict.subDict("equationOfState").lookup("rho0"))),
+    T0_(readScalar(dict.subDict("equationOfState").lookup("T0"))),
+    beta_(readScalar(dict.subDict("equationOfState").lookup("beta")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Specie>
+void Foam::Boussinesq<Specie>::write(Ostream& os) const
+{
+    Specie::write(os);
+    dictionary dict("equationOfState");
+    dict.add("rho0", rho0_);
+    dict.add("T0", T0_);
+    dict.add("beta", beta_);
+
+    os  << indent << dict.dictName() << dict;
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+template<class Specie>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Boussinesq<Specie>& b
+)
+{
+    os  << static_cast<const Specie&>(b)
+        << token::SPACE << b.rho0_
+        << token::SPACE << b.T0_
+        << token::SPACE << b.beta_;
+
+    os.check
+    (
+        "Ostream& operator<<"
+        "(Ostream& os, const Boussinesq<Specie>& st)"
+    );
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
new file mode 100644
index 0000000000..fd64b7fcdb
--- /dev/null
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::Boussinesq
+
+Description
+    Incompressible gas equation of state using the Boussinesq approximation for
+    the density as a function of temperature only:
+
+    \verbatim
+        rho = rho0*(1 - beta*(T - T0))
+    \endverbatim
+
+SourceFiles
+    BoussinesqI.H
+    Boussinesq.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Boussinesq_H
+#define Boussinesq_H
+
+#include "autoPtr.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class Specie> class Boussinesq;
+
+template<class Specie>
+inline Boussinesq<Specie> operator+
+(
+    const Boussinesq<Specie>&,
+    const Boussinesq<Specie>&
+);
+
+template<class Specie>
+inline Boussinesq<Specie> operator-
+(
+    const Boussinesq<Specie>&,
+    const Boussinesq<Specie>&
+);
+
+template<class Specie>
+inline Boussinesq<Specie> operator*
+(
+    const scalar,
+    const Boussinesq<Specie>&
+);
+
+template<class Specie>
+inline Boussinesq<Specie> operator==
+(
+    const Boussinesq<Specie>&,
+    const Boussinesq<Specie>&
+);
+
+template<class Specie>
+Ostream& operator<<
+(
+    Ostream&,
+    const Boussinesq<Specie>&
+);
+
+
+/*---------------------------------------------------------------------------*\
+                    Class Boussinesq Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Specie>
+class Boussinesq
+:
+    public Specie
+{
+    // Private data
+
+        //- Reference density
+        scalar rho0_;
+
+        //- Reference temperature
+        scalar T0_;
+
+        //- Thermal expansion coefficient
+        scalar beta_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        inline Boussinesq
+        (
+            const Specie& sp,
+            const scalar rho0,
+            const scalar T0,
+            const scalar beta
+        );
+
+        //- Construct from Boussinesq
+        inline Boussinesq(const Boussinesq& sp);
+
+        //- Construct from Istream
+        Boussinesq(Istream&);
+
+        //- Construct from dictionary
+        Boussinesq(const dictionary& dict);
+
+        //- Construct as named copy
+        inline Boussinesq
+        (
+            const word& name,
+            const Boussinesq&
+        );
+
+        //- Construct and return a clone
+        inline autoPtr<Boussinesq> clone() const;
+
+        // Selector from Istream
+        inline static autoPtr<Boussinesq> New(Istream& is);
+
+        // Selector from dictionary
+        inline static autoPtr<Boussinesq> New
+        (
+            const dictionary& dict
+        );
+
+
+    // Member functions
+
+        //- Return the instantiated type name
+        static word typeName()
+        {
+            return
+                "Boussinesq<"
+              + word(Specie::typeName_()) + '>';
+        }
+
+
+        // Fundamental properties
+
+            //- Is the equation of state is incompressible i.e. rho != f(p)
+            static const bool incompressible = true;
+
+            //- Is the equation of state is isochoric i.e. rho = const
+            static const bool isochoric = false;
+
+            //- Return density [kg/m^3]
+            inline scalar rho(scalar p, scalar T) const;
+
+            //- Return entropy [J/(kmol K)]
+            inline scalar s(const scalar p, const scalar T) const;
+
+            //- Return compressibility rho/p [s^2/m^2]
+            inline scalar psi(scalar p, scalar T) const;
+
+            //- Return compression factor []
+            inline scalar Z(scalar p, scalar T) const;
+
+            //- Return (cp - cv) [J/(kmol K]
+            inline scalar cpMcv(scalar p, scalar T) const;
+
+
+        // IO
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
+    // Member operators
+
+        inline Boussinesq& operator=
+        (
+            const Boussinesq&
+        );
+        inline void operator+=(const Boussinesq&);
+        inline void operator-=(const Boussinesq&);
+
+        inline void operator*=(const scalar);
+
+
+    // Friend operators
+
+        friend Boussinesq operator+ <Specie>
+        (
+            const Boussinesq&,
+            const Boussinesq&
+        );
+
+        friend Boussinesq operator- <Specie>
+        (
+            const Boussinesq&,
+            const Boussinesq&
+        );
+
+        friend Boussinesq operator* <Specie>
+        (
+            const scalar s,
+            const Boussinesq&
+        );
+
+        friend Boussinesq operator== <Specie>
+        (
+            const Boussinesq&,
+            const Boussinesq&
+        );
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <Specie>
+        (
+            Ostream&,
+            const Boussinesq&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "BoussinesqI.H"
+
+#ifdef NoRepository
+#   include "Boussinesq.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
new file mode 100644
index 0000000000..4183d00e12
--- /dev/null
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -0,0 +1,292 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Boussinesq.H"
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Specie>
+inline Foam::Boussinesq<Specie>::Boussinesq
+(
+    const Specie& sp, const scalar rho0, const scalar T0, const scalar beta
+)
+:
+    Specie(sp),
+    rho0_(rho0),
+    T0_(T0),
+    beta_(beta)
+{}
+
+
+template<class Specie>
+inline Foam::Boussinesq<Specie>::Boussinesq
+(
+    const Boussinesq& b
+)
+:
+    Specie(b),
+    rho0_(b.rho0_),
+    T0_(b.T0_),
+    beta_(b.beta_)
+{}
+
+
+template<class Specie>
+inline Foam::Boussinesq<Specie>::Boussinesq
+(
+    const word& name,
+    const Boussinesq<Specie>& b
+)
+:
+    Specie(name, b),
+    rho0_(b.rho0_),
+    T0_(b.T0_),
+    beta_(b.beta_)
+{}
+
+
+template<class Specie>
+inline Foam::autoPtr<Foam::Boussinesq<Specie> >
+Foam::Boussinesq<Specie>::clone() const
+{
+    return autoPtr<Boussinesq<Specie> >
+    (
+        new Boussinesq<Specie>(*this)
+    );
+}
+
+
+template<class Specie>
+inline Foam::autoPtr<Foam::Boussinesq<Specie> >
+Foam::Boussinesq<Specie>::New
+(
+    Istream& is
+)
+{
+    return autoPtr<Boussinesq<Specie> >
+    (
+        new Boussinesq<Specie>(is)
+    );
+}
+
+
+template<class Specie>
+inline Foam::autoPtr<Foam::Boussinesq<Specie> >
+Foam::Boussinesq<Specie>::New
+(
+    const dictionary& dict
+)
+{
+    return autoPtr<Boussinesq<Specie> >
+    (
+        new Boussinesq<Specie>(dict)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::rho
+(
+    scalar p,
+    scalar T
+) const
+{
+    return rho0_*(1.0 - beta_*(T - T0_));
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::s
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::psi
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::Z
+(
+    scalar p,
+    scalar T
+) const
+{
+    return 0;
+}
+
+
+template<class Specie>
+inline Foam::scalar Foam::Boussinesq<Specie>::cpMcv
+(
+    scalar p,
+    scalar T
+) const
+{
+    return RR;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Specie>
+inline Foam::Boussinesq<Specie>&
+Foam::Boussinesq<Specie>::operator=
+(
+    const Boussinesq<Specie>& b
+)
+{
+    Specie::operator=(b);
+
+    rho0_ = b.rho0_;
+    T0_ = b.T0_;
+    beta_ = b.beta_;
+
+    return *this;
+}
+
+template<class Specie>
+inline void Foam::Boussinesq<Specie>::operator+=
+(
+    const Boussinesq<Specie>& b
+)
+{
+    scalar molr1 = this->nMoles();
+    Specie::operator+=(b);
+    molr1 /= this->nMoles();
+    scalar molr2 = b.nMoles()/this->nMoles();
+
+    rho0_ = molr1*rho0_ + molr2*b.rho0_;
+    T0_ = molr1*T0_ + molr2*b.T0_;
+    beta_ = molr1*beta_ + molr2*b.beta_;
+}
+
+
+template<class Specie>
+inline void Foam::Boussinesq<Specie>::operator-=
+(
+    const Boussinesq<Specie>& b
+)
+{
+    Specie::operator-=(b);
+    rho0_ = b.rho0_;
+    T0_ = b.T0_;
+    beta_ = b.beta_;
+}
+
+
+template<class Specie>
+inline void Foam::Boussinesq<Specie>::operator*=(const scalar s)
+{
+    Specie::operator*=(s);
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+template<class Specie>
+inline Foam::Boussinesq<Specie> Foam::operator+
+(
+    const Boussinesq<Specie>& b1,
+    const Boussinesq<Specie>& b2
+)
+{
+    scalar nMoles = b1.nMoles() + b2.nMoles();
+    scalar molr1 = b1.nMoles()/nMoles;
+    scalar molr2 = b2.nMoles()/nMoles;
+
+    return Boussinesq<Specie>
+    (
+        static_cast<const Specie&>(b1)
+      + static_cast<const Specie&>(b2),
+        molr1*b1.rho0_ + molr2*b2.rho0_,
+        molr1*b1.T0_ + molr2*b2.T0_,
+        molr1*b1.beta_ + molr2*b2.beta_
+    );
+}
+
+
+template<class Specie>
+inline Foam::Boussinesq<Specie> Foam::operator-
+(
+    const Boussinesq<Specie>& b1,
+    const Boussinesq<Specie>& b2
+)
+{
+    return Boussinesq<Specie>
+    (
+        static_cast<const Specie&>(b1)
+      - static_cast<const Specie&>(b2),
+        b1.rho0_ - b2.rho0_,
+        b1.T0_ - b2.T0_,
+        b1.beta_ - b2.beta_
+    );
+}
+
+
+template<class Specie>
+inline Foam::Boussinesq<Specie> Foam::operator*
+(
+    const scalar s,
+    const Boussinesq<Specie>& b
+)
+{
+    return Boussinesq<Specie>
+    (
+        s*static_cast<const Specie&>(b),
+        b.rho0_,
+        b.T0_,
+        b.beta_
+    );
+}
+
+
+template<class Specie>
+inline Foam::Boussinesq<Specie> Foam::operator==
+(
+    const Boussinesq<Specie>& pg1,
+    const Boussinesq<Specie>& pg2
+)
+{
+    return pg2 - pg1;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 2d74e45069..2de276bf3c 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -222,7 +222,7 @@ Foam::Reaction<ReactionThermo>::specieCoeffs::specieCoeffs
     }
     else
     {
-        FatalIOErrorIn("Reaction<ReactionThermo>::lrhs(Istream& is)", is)
+        FatalIOErrorInFunction(is)
             << "Expected a word but found " << t.info()
             << exit(FatalIOError);
     }
@@ -306,7 +306,7 @@ void Foam::Reaction<ReactionThermo>::setLRhs
         }
     }
 
-    FatalIOErrorIn("Reaction<ReactionThermo>::setLRhs(Istream& is)", is)
+    FatalIOErrorInFunction(is)
         << "Cannot continue reading reaction data from stream"
         << exit(FatalIOError);
 }
@@ -365,10 +365,8 @@ Foam::Reaction<ReactionThermo>::New
 {
     if (is.eof())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "Reaction<ReactionThermo>::New(const speciesTable&, "
-            " const HashPtrTable<ReactionThermo>&, Istream&)",
             is
         )   << "Reaction type not specified" << nl << nl
             << "Valid Reaction types are :" << nl
@@ -383,10 +381,8 @@ Foam::Reaction<ReactionThermo>::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "Reaction<ReactionThermo>::New(const speciesTable&, "
-            " const HashPtrTable<ReactionThermo>&, Istream&)",
             is
         )   << "Unknown reaction type "
             << reactionTypeName << nl << nl
@@ -418,15 +414,8 @@ Foam::Reaction<ReactionThermo>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "Reaction<ReactionThermo>::New"
-            "("
-                "const speciesTable&, "
-                "const HashPtrTable<ReactionThermo>&, "
-                "const dictionary&"
-            ")"
-        )   << "Unknown reaction type "
+        FatalErrorInFunction
+            << "Unknown reaction type "
             << reactionTypeName << nl << nl
             << "Valid reaction types are :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
@@ -498,11 +487,7 @@ const Foam::speciesTable& Foam::Reaction<ReactionThermo>::species() const
 template<class ReactionThermo>
 const Foam::speciesTable& Foam::Reaction<ReactionThermo>::gasSpecies() const
 {
-    notImplemented
-    (
-        "const speciesTable& gasSpecies() const"
-        " for this reaction"
-    );
+    NotImplemented;
     return NullObjectRef<speciesTable>();
 }
 
@@ -511,11 +496,7 @@ template<class ReactionThermo>
 const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
 Foam::Reaction<ReactionThermo>::glhs() const
 {
-    notImplemented
-    (
-        "inline const List<typename Reaction<ReactionThermo>::specieCoeffs>&"
-        "Reaction<ReactionThermo>::glhs()"
-    );
+    NotImplemented;
     return NullObjectRef<List<specieCoeffs> >();
 }
 
@@ -524,11 +505,7 @@ template<class ReactionThermo>
 const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
 Foam::Reaction<ReactionThermo>::grhs() const
 {
-    notImplemented
-    (
-        "inline const List<typename Reaction<ReactionThermo>::specieCoeffs>&"
-        "Reaction<ReactionThermo>::grhs()"
-    );
+    NotImplemented;
     return NullObjectRef<List<specieCoeffs> >();
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index a2942277d7..66a9ab3655 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,11 +38,8 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 {
     if (size() != species_.size())
     {
-        FatalErrorIn
-        (
-            "thirdBodyEfficiencies::thirdBodyEfficiencies"
-            "(const speciesTable& species, const scalarList& efficiencies)"
-        )   << "number of efficiencies = " << size()
+        FatalErrorInFunction
+            << "number of efficiencies = " << size()
             << " is not equal to the number of species " << species_.size()
             << exit(FatalError);
     }
@@ -76,10 +73,8 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
         }
         else
         {
-            FatalIOErrorIn
+            FatalIOErrorInFunction
             (
-                "thirdBodyEfficiencies::thirdBodyEfficiencies"
-                "(const speciesTable& species, Istream& is)",
                 is
             )   << "expected <word>, found " << t.info()
                 << exit(FatalIOError);
@@ -88,10 +83,8 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 
     if (t.pToken() != token::END_LIST)
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "thirdBodyEfficiencies::thirdBodyEfficiencies"
-            "(const speciesTable& species, Istream& is)",
             is
         )   << "expected ')', found " << t.info()
             << exit(FatalIOError);
@@ -99,10 +92,8 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 
     if (size() != species_.size())
     {
-        FatalIOErrorIn
+        FatalIOErrorInFunction
         (
-            "thirdBodyEfficiencies::thirdBodyEfficiencies"
-            "(const speciesTable& species, Istream& is)",
             is
         )   << "number of efficiencies = " << size()
             << " is not equal to the number of species " << species_.size()
@@ -125,11 +116,8 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
         List<Tuple2<word, scalar> > coeffs(dict.lookup("coeffs"));
         if (coeffs.size() != species_.size())
         {
-            FatalErrorIn
-            (
-                "thirdBodyEfficiencies::thirdBodyEfficiencies"
-                "(const speciesTable&, const dictionary&)"
-            )   << "number of efficiencies = " << coeffs.size()
+            FatalErrorInFunction
+                << "number of efficiencies = " << coeffs.size()
                 << " is not equat to the number of species " << species_.size()
                 << exit(FatalIOError);
         }
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
index 371394fd14..e46dbf7398 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
@@ -36,10 +36,8 @@ inline void Foam::hPowerThermo<EquationOfState>::checkT
 {
     if (T < 0)
     {
-        FatalErrorIn
-        (
-            "hPowerThermo<EquationOfState>::checkT(const scalar T) const"
-        )   << "attempt to evaluate hPowerThermo<EquationOfState>"
+        FatalErrorInFunction
+            << "attempt to evaluate hPowerThermo<EquationOfState>"
                " for negative temperature " << T
             << abort(FatalError);
     }
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index bd002e58fc..63c379825d 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,21 +33,21 @@ void Foam::janafThermo<EquationOfState>::checkInputData() const
 {
     if (Tlow_ >= Thigh_)
     {
-        FatalErrorIn("janafThermo<EquationOfState>::check()")
+        FatalErrorInFunction
             << "Tlow(" << Tlow_ << ") >= Thigh(" << Thigh_ << ')'
             << exit(FatalError);
     }
 
     if (Tcommon_ <= Tlow_)
     {
-        FatalErrorIn("janafThermo<EquationOfState>::check()")
+        FatalErrorInFunction
             << "Tcommon(" << Tcommon_ << ") <= Tlow(" << Tlow_ << ')'
             << exit(FatalError);
     }
 
     if (Tcommon_ > Thigh_)
     {
-        FatalErrorIn("janafThermo<EquationOfState>::check()")
+        FatalErrorInFunction
             << "Tcommon(" << Tcommon_ << ") > Thigh(" << Thigh_ << ')'
             << exit(FatalError);
     }
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index eeb915ab03..18f9d7cc73 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -102,10 +102,8 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::limit
 {
     if (T < Tlow_ || T > Thigh_)
     {
-        WarningIn
-        (
-            "janafThermo<EquationOfState>::limit(const scalar T) const"
-        )   << "attempt to use janafThermo<EquationOfState>"
+        WarningInFunction
+            << "attempt to use janafThermo<EquationOfState>"
                " out of temperature range "
             << Tlow_ << " -> " << Thigh_ << ";  T = " << T
             << endl;
@@ -247,11 +245,8 @@ inline void Foam::janafThermo<EquationOfState>::operator+=
 
     if (janafThermo<EquationOfState>::debug && notEqual(Tcommon_, jt.Tcommon_))
     {
-        FatalErrorIn
-        (
-            "janafThermo<EquationOfState>::operator+="
-            "(const janafThermo<EquationOfState>& jt) const"
-        )   << "Tcommon " << Tcommon_ << " for "
+        FatalErrorInFunction
+            << "Tcommon " << Tcommon_ << " for "
             << (this->name().size() ? this->name() : "others")
             << " != " << jt.Tcommon_ << " for "
             << (jt.name().size() ? jt.name() : "others")
@@ -294,11 +289,8 @@ inline void Foam::janafThermo<EquationOfState>::operator-=
 
     if (janafThermo<EquationOfState>::debug && notEqual(Tcommon_, jt.Tcommon_))
     {
-        FatalErrorIn
-        (
-            "janafThermo<EquationOfState>::operator-="
-            "(const janafThermo<EquationOfState>& jt) const"
-        )   << "Tcommon " << Tcommon_ << " for "
+        FatalErrorInFunction
+            << "Tcommon " << Tcommon_ << " for "
             << (this->name().size() ? this->name() : "others")
             << " != " << jt.Tcommon_ << " for "
             << (jt.name().size() ? jt.name() : "others")
@@ -363,12 +355,8 @@ inline Foam::janafThermo<EquationOfState> Foam::operator+
      && notEqual(jt1.Tcommon_, jt2.Tcommon_)
     )
     {
-        FatalErrorIn
-        (
-            "operator+"
-            "(const janafThermo<EquationOfState>& jt1,"
-            " const janafThermo<EquationOfState>& jt2)"
-        )   << "Tcommon " << jt1.Tcommon_ << " for "
+        FatalErrorInFunction
+            << "Tcommon " << jt1.Tcommon_ << " for "
             << (jt1.name().size() ? jt1.name() : "others")
             << " != " << jt2.Tcommon_ << " for "
             << (jt2.name().size() ? jt2.name() : "others")
@@ -425,12 +413,8 @@ inline Foam::janafThermo<EquationOfState> Foam::operator-
      && notEqual(jt1.Tcommon_, jt2.Tcommon_)
     )
     {
-        FatalErrorIn
-        (
-            "operator-"
-            "(const janafThermo<EquationOfState>& jt1,"
-            " const janafThermo<EquationOfState>& jt2)"
-        )   << "Tcommon " << jt1.Tcommon_ << " for "
+        FatalErrorInFunction
+            << "Tcommon " << jt1.Tcommon_ << " for "
             << (jt1.name().size() ? jt1.name() : "others")
             << " != " << jt2.Tcommon_ << " for "
             << (jt2.name().size() ? jt2.name() : "others")
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index d897968d12..9b8eb30777 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -63,17 +63,8 @@ inline Foam::scalar Foam::species::thermo<Thermo, Type>::T
 
         if (iter++ > maxIter_)
         {
-            FatalErrorIn
-            (
-                "thermo<Thermo, Type>::T(scalar f, scalar T0, "
-                "scalar (thermo<Thermo, Type>::*F)"
-                "(const scalar) const, "
-                "scalar (thermo<Thermo, Type>::*dFdT)"
-                "(const scalar) const, "
-                "scalar (thermo<Thermo, Type>::*limit)"
-                "(const scalar) const"
-                ") const"
-            )   << "Maximum number of iterations exceeded"
+            FatalErrorInFunction
+                << "Maximum number of iterations exceeded"
                 << abort(FatalError);
         }
 
@@ -290,7 +281,7 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::K(const scalar p, const scalar T) const
 {
-    scalar arg = -this->nMoles()*this->g(p, T)/(RR*T);
+    scalar arg = -this->nMoles()*this->g(Pstd, T)/(RR*T);
 
     if (arg < 600.0)
     {
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index d23f60472e..db8cc73026 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,19 @@ License
 #include "sutherlandTransport.H"
 #include "IOstreams.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Thermo>
+Foam::scalar Foam::sutherlandTransport<Thermo>::readCoeff
+(
+    const word& coeffName,
+    const dictionary& dict
+)
+{
+    return readScalar(dict.subDict("transport").lookup(coeffName));
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Thermo>
@@ -43,8 +56,21 @@ template<class Thermo>
 Foam::sutherlandTransport<Thermo>::sutherlandTransport(const dictionary& dict)
 :
     Thermo(dict),
-    As_(readScalar(dict.subDict("transport").lookup("As"))),
-    Ts_(readScalar(dict.subDict("transport").lookup("Ts")))
+    As_(readCoeff("As", dict)),
+    Ts_(readCoeff("Ts", dict))
+{}
+
+
+template<class Thermo>
+Foam::sutherlandTransport<Thermo>::sutherlandTransport
+(
+    const Thermo& t,
+    const dictionary& dict
+)
+:
+    Thermo(t),
+    As_(readCoeff("As", dict)),
+    Ts_(readCoeff("Ts", dict))
 {}
 
 
@@ -53,19 +79,20 @@ Foam::sutherlandTransport<Thermo>::sutherlandTransport(const dictionary& dict)
 template<class Thermo>
 void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const
 {
-    os  << this->specie::name() << endl;
-    os  << token::BEGIN_BLOCK  << incrIndent << nl;
+    os  << this->specie::name() << endl
+        << token::BEGIN_BLOCK  << incrIndent << nl;
 
     Thermo::write(os);
 
     dictionary dict("transport");
     dict.add("As", As_);
     dict.add("Ts", Ts_);
-    os  << indent << dict.dictName() << dict;
 
-    os  << decrIndent << token::END_BLOCK << nl;
+    os  << indent << dict.dictName() << dict
+        << decrIndent << token::END_BLOCK << nl;
 }
 
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Thermo>
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 25973ac1da..e7da7b9a5f 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,6 +114,9 @@ class sutherlandTransport
             const scalar mu2, const scalar T2
         );
 
+        //- Read coefficient from dictionary
+        scalar readCoeff(const word& coeffName, const dictionary& dict);
+
 
 public:
 
@@ -144,6 +147,9 @@ public:
         //- Construct from dictionary
         sutherlandTransport(const dictionary& dict);
 
+        //- Construct from base thermo and dictionary
+        sutherlandTransport(const Thermo& t,const dictionary& dict);
+
         //- Construct and return a clone
         inline autoPtr<sutherlandTransport> clone() const;
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 12253ca03e..e7698de7f8 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalErrorIn("thermophysicalFunction::New(Istream&)")
+        FatalErrorInFunction
             << "Unknown thermophysicalFunction type "
             << thermophysicalFunctionType
             << nl << nl
@@ -91,7 +91,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 
     if (cstrIter == IstreamConstructorTablePtr_->end())
     {
-        FatalErrorIn("thermophysicalFunction::New(const dictionary&)")
+        FatalErrorInFunction
             << "Unknown thermophysicalFunction type "
             << thermophysicalFunctionType
             << nl << nl
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 19cac53913..d3befc22e7 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ void Foam::linearValveFvMesh::makeSlidersDead()
         }
         else
         {
-            FatalErrorIn("void Foam::linearValveFvMesh::makeSlidersDead()")
+            FatalErrorInFunction
                 << "Don't know what to do with mesh modifier "
                 << modI << " of type " << topoChanges[modI].type()
                 << abort(FatalError);
@@ -200,7 +200,7 @@ void Foam::linearValveFvMesh::makeSlidersLive()
         }
         else
         {
-            FatalErrorIn("void Foam::linearValveFvMesh::makeLayersLive()")
+            FatalErrorInFunction
                 << "Don't know what to do with mesh modifier "
                 << modI << " of type " << topoChanges[modI].type()
                 << abort(FatalError);
@@ -236,7 +236,7 @@ bool Foam::linearValveFvMesh::attached() const
              != refCast<const slidingInterface>(topoChanges[modI]).attached()
             )
             {
-                FatalErrorIn("bool linearValveFvMesh::attached() const")
+                FatalErrorInFunction
                     << "Slider " << modI
                     << " named " << topoChanges[modI].name()
                     << " out of sync: Should be" << result
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 90243b27d7..094e09006f 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -229,7 +229,7 @@ void Foam::linearValveLayersFvMesh::makeLayersLive()
         }
         else
         {
-            FatalErrorIn("void linearValveLayersFvMesh::makeLayersLive()")
+            FatalErrorInFunction
                 << "Don't know what to do with mesh modifier "
                 << modI << " of type " << topoChanges[modI].type()
                 << abort(FatalError);
@@ -255,7 +255,7 @@ void Foam::linearValveLayersFvMesh::makeSlidersLive()
         }
         else
         {
-            FatalErrorIn("void linearValveLayersFvMesh::makeLayersLive()")
+            FatalErrorInFunction
                 << "Don't know what to do with mesh modifier "
                 << modI << " of type " << topoChanges[modI].type()
                 << abort(FatalError);
@@ -291,7 +291,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
              != refCast<const slidingInterface>(topoChanges[modI]).attached()
             )
             {
-                FatalErrorIn("bool linearValveLayersFvMesh::attached() const")
+                FatalErrorInFunction
                     << "Slider " << modI << " named "
                     << topoChanges[modI].name()
                     << " out of sync: Should be" << result
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 21660c406d..9d329ba083 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -203,7 +203,7 @@ void Foam::mixerFvMesh::calcMovingMasks() const
 
     if (movingPointsMaskPtr_)
     {
-        FatalErrorIn("void mixerFvMesh::calcMovingMasks() const")
+        FatalErrorInFunction
             << "point mask already calculated"
             << abort(FatalError);
     }
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
index 16f3332818..23377cd692 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,11 +46,8 @@ Foam::autoPtr<Foam::viscosityModel> Foam::viscosityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "viscosityModel::New(const volVectorField&, "
-            "const surfaceScalarField&)"
-        )   << "Unknown viscosityModel type "
+        FatalErrorInFunction
+            << "Unknown viscosityModel type "
             << modelType << nl << nl
             << "Valid viscosityModels are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/triSurface/faceTriangulation/faceTriangulation.C
index ea4482a13c..ddf905f06b 100644
--- a/src/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/triSurface/faceTriangulation/faceTriangulation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -169,7 +169,7 @@ bool Foam::faceTriangulation::triangleContainsPoint
     }
     else if ((area01Pt < 0) && (area12Pt < 0) && (area20Pt < 0))
     {
-        FatalErrorIn("triangleContainsPoint") << abort(FatalError);
+        FatalErrorInFunction << abort(FatalError);
         return false;
     }
     else
@@ -249,7 +249,7 @@ void Foam::faceTriangulation::findDiagonal
 
     if (minIndex == -1)
     {
-        //WarningIn("faceTriangulation::findDiagonal")
+        //WarningInFunction
         //    << "Could not find intersection starting from " << f[startIndex]
         //    << " for face " << f << endl;
 
@@ -416,11 +416,8 @@ bool Foam::faceTriangulation::split
 
     if (size <= 2)
     {
-        WarningIn
-        (
-            "split(const bool, const pointField&, const face&"
-            ", const vector&, label&)"
-        )   << "Illegal face:" << f
+        WarningInFunction
+            << "Illegal face:" << f
             << " with points " << UIndirectList<point>(points, f)()
             << endl;
 
@@ -495,11 +492,8 @@ bool Foam::faceTriangulation::split
                     }
                 }
 
-                WarningIn
-                (
-                    "split(const bool, const pointField&, const face&"
-                    ", const vector&, label&)"
-                )   << "Cannot find valid diagonal on face " << f
+                WarningInFunction
+                    << "Cannot find valid diagonal on face " << f
                     << " with points " << UIndirectList<point>(points, f)()
                     << nl
                     << "Returning naive triangulation starting from "
@@ -525,11 +519,8 @@ bool Foam::faceTriangulation::split
             }
             else
             {
-                WarningIn
-                (
-                    "split(const bool, const pointField&, const face&"
-                    ", const vector&, label&)"
-                )   << "Cannot find valid diagonal on face " << f
+                WarningInFunction
+                    << "Cannot find valid diagonal on face " << f
                     << " with points " << UIndirectList<point>(points, f)()
                     << nl
                     << "Returning empty triFaceList" << endl;
@@ -560,11 +551,8 @@ bool Foam::faceTriangulation::split
 
         if (nPoints1 == size || nPoints2 == size)
         {
-            FatalErrorIn
-            (
-                "split(const bool, const pointField&, const face&"
-                ", const vector&, label&)"
-            )   << "Illegal split of face:" << f
+            FatalErrorInFunction
+                << "Illegal split of face:" << f
                 << " with points " << UIndirectList<point>(points, f)()
                 << " at indices " << index1 << " and " << index2
                 << abort(FatalError);
diff --git a/src/triSurface/meshTriangulation/meshTriangulation.C b/src/triSurface/meshTriangulation/meshTriangulation.C
index 4231c3d16f..f8efd181bd 100644
--- a/src/triSurface/meshTriangulation/meshTriangulation.C
+++ b/src/triSurface/meshTriangulation/meshTriangulation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -365,7 +365,7 @@ Foam::meshTriangulation::meshTriangulation
 
                 if (faceTris.empty())
                 {
-                    WarningIn("meshTriangulation::meshTriangulation")
+                    WarningInFunction
                         << "Could not find triangulation for face " << faceI
                         << " vertices " << faces[faceI] << " coords "
                         << IndirectList<point>(points, faces[faceI])() << endl;
@@ -428,7 +428,7 @@ Foam::meshTriangulation::meshTriangulation
 
                 if (faceTris.empty())
                 {
-                    WarningIn("meshTriangulation::meshTriangulation")
+                    WarningInFunction
                         << "Could not find triangulation for face " << faceI
                         << " vertices " << faces[faceI] << " coords "
                         << IndirectList<point>(points, faces[faceI])() << endl;
diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
index 2e122c936c..2ff59bfb07 100644
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,7 +111,7 @@ static void readUpto
 {
     if (!readUpto(cmd, ACfile, args))
     {
-        FatalErrorIn("triSurface::readAC(const fileName&)")
+        FatalErrorInFunction
             << "Cannot find command " << cmd
             << errorMsg << exit(FatalError);
     }
@@ -126,7 +126,7 @@ bool triSurface::readAC(const fileName& ACfileName)
 
     if (!ACfile.good())
     {
-        FatalErrorIn("triSurface::readAC(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << ACfileName
             << exit(FatalError);
     }
@@ -138,7 +138,7 @@ bool triSurface::readAC(const fileName& ACfileName)
 
     if (version != "b")
     {
-        WarningIn("bool triSurface::readAC(const fileName& ACfileName)")
+        WarningInFunction
             << "When reading AC3D file " << ACfileName
             << " read header " << line << " with version " << version
             << endl << "Only tested reading with version 'b'."
@@ -151,7 +151,7 @@ bool triSurface::readAC(const fileName& ACfileName)
 
     if (!readUpto("OBJECT", ACfile, args) || (args != "world"))
     {
-        FatalErrorIn("bool triSurface::readAC(const fileName& ACfileName)")
+        FatalErrorInFunction
             << "Cannot find \"OBJECT world\" in file " << ACfileName
             << exit(FatalError);
     }
@@ -195,7 +195,7 @@ bool triSurface::readAC(const fileName& ACfileName)
             // patch should always end with 'kids' command ?not sure.
             if (!readCmd(ACfile, cmd, args))
             {
-                FatalErrorIn("triSurface::readAC(const fileName&)")
+                FatalErrorInFunction
                     << "Did not read up to \"kids 0\" while reading patch "
                     << patchI << " from file " << ACfileName
                     << exit(FatalError);
@@ -217,7 +217,7 @@ bool triSurface::readAC(const fileName& ACfileName)
                     >> rot.yx() >> rot.yy() >> rot.yz()
                     >> rot.zx() >> rot.zy() >> rot.zz();
 
-                WarningIn("triSurface::readAC(const fileName&)")
+                WarningInFunction
                     << "rot (rotation tensor) command not implemented"
                     << "Line:" << cmd << ' ' << args << endl
                     << "while reading patch " << patchI << endl;
@@ -265,7 +265,7 @@ bool triSurface::readAC(const fileName& ACfileName)
 
                     if (size != 3)
                     {
-                        FatalErrorIn("triSurface::readAC(const fileName&)")
+                        FatalErrorInFunction
                             << "Can only read surfaces with 3 vertices."
                             << endl
                             << "Detected " << size << " when reading triangle "
@@ -309,7 +309,7 @@ bool triSurface::readAC(const fileName& ACfileName)
 
                 if (nKids != 0)
                 {
-                    FatalErrorIn("triSurface::readAC(const fileName&)")
+                    FatalErrorInFunction
                         << "Can only read objects without kids."
                         << " Encountered " << nKids << " kids when"
                         << " reading patch " << patchI
diff --git a/src/triSurface/triSurface/interfaces/DX/writeDX.C b/src/triSurface/triSurface/interfaces/DX/writeDX.C
index 402fa262ca..d5087a629d 100644
--- a/src/triSurface/triSurface/interfaces/DX/writeDX.C
+++ b/src/triSurface/triSurface/interfaces/DX/writeDX.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -191,10 +191,8 @@ void triSurface::writeDX(const scalarField& field, Ostream& os) const
     }
     else
     {
-        FatalErrorIn
-        (
-            "writeDX(const scalarField&, Ostream&)"
-        )   << "Illegal field size " << field.size() << " is not equal "
+        FatalErrorInFunction
+            << "Illegal field size " << field.size() << " is not equal "
             << " to number of faces " << size() << " or to number "
             << " of points " << nPoints() << exit(FatalError);
     }
@@ -240,10 +238,8 @@ void triSurface::writeDX(const vectorField& field, Ostream& os) const
     }
     else
     {
-        FatalErrorIn
-        (
-            "writeDX(const vectorField&, Ostream&)"
-        )   << "Illegal field size " << field.size() << " is not equal "
+        FatalErrorInFunction
+            << "Illegal field size " << field.size() << " is not equal "
             << " to number of faces " << size() << " or to number "
             << " of points " << nPoints() << exit(FatalError);
     }
diff --git a/src/triSurface/triSurface/interfaces/GTS/readGTS.C b/src/triSurface/triSurface/interfaces/GTS/readGTS.C
index cba235c4be..d7394e2e0f 100644
--- a/src/triSurface/triSurface/interfaces/GTS/readGTS.C
+++ b/src/triSurface/triSurface/interfaces/GTS/readGTS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ bool Foam::triSurface::readGTS(const fileName& GTSfileName)
 
     if (!GTSfile.good())
     {
-        FatalErrorIn("triSurface::readGTS(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << GTSfileName
             << exit(FatalError);
     }
@@ -113,7 +113,7 @@ bool Foam::triSurface::readGTS(const fileName& GTSfileName)
         label common01 = e0.commonVertex(e1);
         if (common01 == -1)
         {
-            FatalErrorIn("triSurface::readGTS(const fileName&)")
+            FatalErrorInFunction
                 << "Edges 0 and 1 of triangle " << trianglei
                 << " do not share a point.\n"
                 << "    edge0:" << e0 << endl
@@ -127,7 +127,7 @@ bool Foam::triSurface::readGTS(const fileName& GTSfileName)
         label common12 = e1.commonVertex(e2);
         if (common12 == -1)
         {
-            FatalErrorIn("triSurface::readGTS(const fileName&)")
+            FatalErrorInFunction
                 << "Edges 1 and 2 of triangle " << trianglei
                 << " do not share a point.\n"
                 << "    edge1:" << e1 << endl
@@ -139,7 +139,7 @@ bool Foam::triSurface::readGTS(const fileName& GTSfileName)
         // Does edge2 sit between edge1 and 0?
         if ((common12 != e1Far) || (e2Far != e0Far))
         {
-            FatalErrorIn("triSurface::readGTS(const fileName&)")
+            FatalErrorInFunction
                 << "Edges of triangle " << trianglei
                 << " reference more than three points.\n"
                 << "    edge0:" << e0 << endl
diff --git a/src/triSurface/triSurface/interfaces/NAS/readNAS.C b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
index 3e39579d05..805c2f124e 100644
--- a/src/triSurface/triSurface/interfaces/NAS/readNAS.C
+++ b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ Description
 
     - Uses the Ansa "$ANSA_NAME" or the Hypermesh "$HMNAME COMP" extensions
       to obtain patch names.
-    - Handles Nastran short and long formats, but not free format.
+    - Handles Nastran short, long, and comma-separated free formats.
     - Properly handles the Nastran compact floating point notation: \n
     \verbatim
         GRID          28        10.20269-.030265-2.358-8
@@ -69,13 +69,39 @@ static scalar parseNASCoord(const string& s)
 }
 
 
+// Read a column of a given width from either a fixed-format NAS file, or a
+// comma-separated free-format NAS file
+static std::string readNASToken
+(
+    const string& line,
+    const size_t& width,
+    size_t& index
+)
+{
+    size_t indexStart, indexEnd;
+
+    indexStart = index;
+
+    indexEnd = line.find(',', indexStart);
+    index = indexEnd + 1;
+
+    if (indexEnd == std::string::npos)
+    {
+        indexEnd = indexStart + width;
+        index = indexEnd;
+    }
+
+    return line.substr(indexStart, indexEnd - indexStart);
+}
+
+
 bool triSurface::readNAS(const fileName& fName)
 {
     IFstream is(fName);
 
     if (!is.good())
     {
-        FatalErrorIn("triSurface::readNAS(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << fName
             << exit(FatalError);
     }
@@ -104,6 +130,7 @@ bool triSurface::readNAS(const fileName& fName)
 
     while (is.good())
     {
+        size_t linei = 0;
         string line;
         is.getLine(line);
 
@@ -197,17 +224,16 @@ bool triSurface::readNAS(const fileName& fName)
         }
 
         // Read first word
-        IStringStream lineStream(line);
-        word cmd;
-        lineStream >> cmd;
+        word cmd(IStringStream(readNASToken(line, 8, linei))());
 
         if (cmd == "CTRIA3")
         {
-            label groupId = readLabel(IStringStream(line.substr(16,8))());
-            label a = readLabel(IStringStream(line.substr(24,8))());
-            label b = readLabel(IStringStream(line.substr(32,8))());
-            label c = readLabel(IStringStream(line.substr(40,8))());
-
+            readNASToken(line, 8, linei);
+            label groupId =
+                readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label a = readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label b = readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label c = readLabel(IStringStream(readNASToken(line, 8, linei))());
 
             // Convert group into patch
             Map<label>::const_iterator iter = groupToPatch.find(groupId);
@@ -228,11 +254,13 @@ bool triSurface::readNAS(const fileName& fName)
         }
         else if (cmd == "CQUAD4")
         {
-            label groupId = readLabel(IStringStream(line.substr(16,8))());
-            label a = readLabel(IStringStream(line.substr(24,8))());
-            label b = readLabel(IStringStream(line.substr(32,8))());
-            label c = readLabel(IStringStream(line.substr(40,8))());
-            label d = readLabel(IStringStream(line.substr(48,8))());
+            readNASToken(line, 8, linei);
+            label groupId =
+                readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label a = readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label b = readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label c = readLabel(IStringStream(readNASToken(line, 8, linei))());
+            label d = readLabel(IStringStream(readNASToken(line, 8, linei))());
 
             // Convert group into patch
             Map<label>::const_iterator iter = groupToPatch.find(groupId);
@@ -255,7 +283,8 @@ bool triSurface::readNAS(const fileName& fName)
         else if (cmd == "PSHELL")
         {
             // Read shell type since group gives patchnames
-            label groupId = readLabel(IStringStream(line.substr(8,8))());
+            label groupId =
+                readLabel(IStringStream(readNASToken(line, 8, linei))());
             if (groupId == ansaId && ansaType == "PSHELL")
             {
                 groupToName.insert(groupId, string::validate<word>(ansaName));
@@ -264,10 +293,12 @@ bool triSurface::readNAS(const fileName& fName)
         }
         else if (cmd == "GRID")
         {
-            label index = readLabel(IStringStream(line.substr(8,8))());
-            scalar x = parseNASCoord(line.substr(24, 8));
-            scalar y = parseNASCoord(line.substr(32, 8));
-            scalar z = parseNASCoord(line.substr(40, 8));
+            label index =
+                readLabel(IStringStream(readNASToken(line, 8, linei))());
+            readNASToken(line, 8, linei);
+            scalar x = parseNASCoord(readNASToken(line, 8, linei));
+            scalar y = parseNASCoord(readNASToken(line, 8, linei));
+            scalar z = parseNASCoord(readNASToken(line, 8, linei));
 
             indices.append(index);
             points.append(point(x, y, z));
@@ -279,15 +310,17 @@ bool triSurface::readNAS(const fileName& fName)
             // Typical line (spaces compacted)
             // GRID*      126   0 -5.55999875E+02 -5.68730474E+02
             // *         2.14897901E+02
+            label index =
+                readLabel(IStringStream(readNASToken(line, 8, linei))());
+            readNASToken(line, 8, linei);
+            scalar x = parseNASCoord(readNASToken(line, 16, linei));
+            scalar y = parseNASCoord(readNASToken(line, 16, linei));
 
-            label index = readLabel(IStringStream(line.substr(8,16))());
-            scalar x = parseNASCoord(line.substr(40, 16));
-            scalar y = parseNASCoord(line.substr(56, 16));
-
+            linei = 0;
             is.getLine(line);
             if (line[0] != '*')
             {
-                FatalErrorIn("triSurface::readNAS(const fileName&)")
+                FatalErrorInFunction
                     << "Expected continuation symbol '*' when reading GRID*"
                     << " (double precision coordinate) output" << nl
                     << "Read:" << line << nl
@@ -295,7 +328,8 @@ bool triSurface::readNAS(const fileName& fName)
                     << " line:" << is.lineNumber()
                     << exit(FatalError);
             }
-            scalar z = parseNASCoord(line.substr(8, 16));
+            readNASToken(line, 8, linei);
+            scalar z = parseNASCoord(readNASToken(line, 16, linei));
 
             indices.append(index);
             points.append(point(x, y, z));
diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
index 004661ab3c..907669961b 100644
--- a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
@@ -1,8 +1,9 @@
+
 /*---------------------------------------------------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +36,7 @@ bool Foam::triSurface::readOBJ(const fileName& OBJfileName)
 
     if (!OBJfile.good())
     {
-        FatalErrorIn("triSurface::readOBJ(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << OBJfileName
             << exit(FatalError);
     }
@@ -53,105 +54,112 @@ bool Foam::triSurface::readOBJ(const fileName& OBJfileName)
 
         label sz = line.size();
 
-        if (sz && line[sz-1] == '\\')
+        if (sz)
         {
-            line.substr(0, sz-1);
-            line += getLineNoComment(OBJfile);
-        }
-
-        // Read first word
-        IStringStream lineStream(line);
-        word cmd;
-        lineStream >> cmd;
-
-        if (cmd == "v")
-        {
-            scalar x, y, z;
-
-            lineStream >> x >> y >> z;
-
-            points.append(point(x, y, z));
-        }
-        else if (cmd == "g")
-        {
-            word group;
-
-            lineStream >> group;
-
-            HashTable<label>::const_iterator findGroup =
-                groupToPatch.find(group);
-
-            if (findGroup != groupToPatch.end())
+            if (line[sz-1] == '\\')
             {
-                groupID = findGroup();
+                line.substr(0, sz-1);
+                line += getLineNoComment(OBJfile);
             }
-            else
+
+            // Read first word
+            IStringStream lineStream(line);
+            word cmd;
+            lineStream >> cmd;
+
+            if (cmd == "v")
             {
-                groupID = maxGroupID;
+                scalar x, y, z;
 
-                groupToPatch.insert(group, groupID);
+                lineStream >> x >> y >> z;
 
-                maxGroupID++;
+                points.append(point(x, y, z));
             }
-        }
-        else if (cmd == "f")
-        {
-            DynamicList<label> verts;
-
-            // Assume 'f' is followed by space.
-            string::size_type endNum = 1;
-
-            while (true)
+            else if (cmd == "g")
             {
-                string::size_type startNum =
-                    line.find_first_not_of(" \r", endNum);
+                word group;
 
-                if (startNum == string::npos)
+                lineStream >> group;
+
+                HashTable<label>::const_iterator findGroup =
+                    groupToPatch.find(group);
+
+                if (findGroup != groupToPatch.end())
                 {
-                    break;
-                }
-
-                endNum = line.find(' ', startNum);
-
-                string vertexSpec;
-                if (endNum != string::npos)
-                {
-                    vertexSpec = line.substr(startNum, endNum-startNum);
+                    groupID = findGroup();
                 }
                 else
                 {
-                    vertexSpec = line.substr(startNum, line.size() - startNum);
+                    groupID = maxGroupID;
+
+                    groupToPatch.insert(group, groupID);
+
+                    maxGroupID++;
                 }
-
-                string::size_type slashPos = vertexSpec.find('/');
-
-                label vertI = 0;
-                if (slashPos != string::npos)
-                {
-                    IStringStream intStream(vertexSpec.substr(0, slashPos));
-
-                    intStream >> vertI;
-                }
-                else
-                {
-                    IStringStream intStream(vertexSpec);
-
-                    intStream >> vertI;
-                }
-                verts.append(vertI - 1);
             }
-
-            verts.shrink();
-
-            // Do simple face triangulation around f[0].
-            // Cannot use face::triangulation since no complete points yet.
-            for (label fp = 1; fp < verts.size() - 1; fp++)
+            else if (cmd == "f")
             {
-                label fp1 = verts.fcIndex(fp);
+                DynamicList<label> verts;
 
-                labelledTri tri(verts[0], verts[fp], verts[fp1], groupID);
+                // Assume 'f' is followed by space.
+                string::size_type endNum = 1;
 
-                faces.append(tri);
+                while (true)
+                {
+                    string::size_type startNum =
+                        line.find_first_not_of(" \r", endNum);
+
+                    if (startNum == string::npos)
+                    {
+                        break;
+                    }
+
+                    endNum = line.find(' ', startNum);
+
+                    string vertexSpec;
+                    if (endNum != string::npos)
+                    {
+                        vertexSpec = line.substr(startNum, endNum-startNum);
+                    }
+                    else
+                    {
+                        vertexSpec = line.substr
+                        (
+                            startNum,
+                            line.size() - startNum
+                        );
+                    }
+
+                    string::size_type slashPos = vertexSpec.find('/');
+
+                    label vertI = 0;
+                    if (slashPos != string::npos)
+                    {
+                        IStringStream intStream(vertexSpec.substr(0, slashPos));
+
+                        intStream >> vertI;
+                    }
+                    else
+                    {
+                        IStringStream intStream(vertexSpec);
+
+                        intStream >> vertI;
+                    }
+                    verts.append(vertI - 1);
+                }
+
+                verts.shrink();
+
+                // Do simple face triangulation around f[0].
+                // Cannot use face::triangulation since no complete points yet.
+                for (label fp = 1; fp < verts.size() - 1; fp++)
+                {
+                    label fp1 = verts.fcIndex(fp);
+
+                    labelledTri tri(verts[0], verts[fp], verts[fp1], groupID);
+
+                    faces.append(tri);
+                }
             }
         }
     }
diff --git a/src/triSurface/triSurface/interfaces/OFF/readOFF.C b/src/triSurface/triSurface/interfaces/OFF/readOFF.C
index 8fc4dff00b..232c1a7aec 100644
--- a/src/triSurface/triSurface/interfaces/OFF/readOFF.C
+++ b/src/triSurface/triSurface/interfaces/OFF/readOFF.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ bool Foam::triSurface::readOFF(const fileName& OFFfileName)
 
     if (!OFFfile.good())
     {
-        FatalErrorIn("triSurface::readOFF(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << OFFfileName
             << exit(FatalError);
     }
@@ -47,7 +47,7 @@ bool Foam::triSurface::readOFF(const fileName& OFFfileName)
     string hdr = getLineNoComment(OFFfile);
     if (hdr != "OFF")
     {
-        FatalErrorIn("triSurface::readOFF(const fileName&)")
+        FatalErrorInFunction
             << "OFF file " << OFFfileName
             << " does not start with 'OFF'"
             << exit(FatalError);
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index 3c732c1a8d..6c41d5db82 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ using namespace Foam;
 //! \cond dummy
 int yyFlexLexer::yylex()
 {
-    FatalErrorIn("yyFlexLexer::yylex()")
+    FatalErrorInFunction
         << "Should not have called this function"
         << abort(FatalError);
     return 0;
@@ -356,10 +356,8 @@ endsolid              {space}("endsolid"|"ENDSOLID")({some_space}{word})*
 
 <stlerror>.* {
         yy_pop_state();
-        FatalErrorIn
-        (
-            "triSurface::readSTLASCII(const fileName& STLfileName)"
-        )   << "while " << stateNames[YY_START] << " on line " << lineNo_ << nl
+        FatalErrorInFunction
+            << "while " << stateNames[YY_START] << " on line " << lineNo_ << nl
             << "    expected " << stateExpects[YY_START]
             << " but found '" << startError_.c_str() << YYText() << "'"
             << exit(FatalError);
@@ -382,10 +380,8 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
 
     if (!STLstream)
     {
-        FatalErrorIn
-        (
-            "triSurface::readSTLASCII(const fileName&)"
-        )   << "file " << STLfileName << " not found"
+        FatalErrorInFunction
+            << "file " << STLfileName << " not found"
             << exit(FatalError);
     }
 
@@ -411,10 +407,8 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
 
     if (STLpoints.size() != 3*STLnormals.size())
     {
-        FatalErrorIn
-        (
-            "triSurface::readSTLASCII(const fileName& STLfileName)"
-        )   << "in file " << STLfileName << endl
+        FatalErrorInFunction
+            << "in file " << STLfileName << endl
             << "Problem: read " << STLnormals.size() << " normals"
             << " but " << STLpoints.size() << " points"
             << exit(FatalError);
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
index c0e06649ba..5c860006c0 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
@@ -52,7 +52,7 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
 
     if (!STLfile.good())
     {
-        FatalErrorIn("triSurface::readSTLBINARY(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << STLfileName
             << " or file " << STLfileName + ".gz"
             << exit(FatalError);
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index 6c4d6e8b87..438847d7a9 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ bool Foam::triSurface::readTRI(const fileName& TRIfileName)
 
     if (!TRIfile.good())
     {
-        FatalErrorIn("triSurface::readTRI(const fileName&)")
+        FatalErrorInFunction
             << "Cannot read file " << TRIfileName
             << exit(FatalError);
     }
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
index 1eb6176193..c404a38640 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,8 @@ Foam::surfacePatchIOList::surfacePatchIOList
     {
         if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
         {
-            WarningIn
-            (
-                "surfacePatchIOList::surfacePatchIOList\n"
-                "(\n"
-                "    const IOobject&\n"
-                ")"
-            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+            WarningInFunction
+                << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
                 << " does not support automatic rereading."
                 << endl;
         }
@@ -99,7 +94,7 @@ Foam::surfacePatchIOList::surfacePatchIOList
 
             if (startFaceI != faceI)
             {
-                FatalErrorIn(functionName)
+                FatalErrorInFunction
                     << "Patches are not ordered. Start of patch " << patchI
                     << " does not correspond to sum of preceding patches."
                     << endl
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 8f80c21617..5bb5139aac 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,11 +104,8 @@ Foam::List<Foam::labelledTri> Foam::triSurface::convertToTri
 
         if (f.size() != 3)
         {
-            FatalErrorIn
-            (
-                "triSurface::convertToTri"
-                "(const faceList&, const label)"
-            )   << "Face at position " << faceI
+            FatalErrorInFunction
+                << "Face at position " << faceI
                 << " does not have three vertices:" << f
                 << abort(FatalError);
         }
@@ -196,7 +193,7 @@ void Foam::triSurface::checkTriangles(const bool verbose)
         {
             if (f[fp] < 0 || f[fp] > maxPointI)
             {
-                FatalErrorIn("triSurface::checkTriangles(bool)")
+                FatalErrorInFunction
                     << "triangle " << f
                     << " uses point indices outside point range 0.."
                     << maxPointI
@@ -226,10 +223,8 @@ void Foam::triSurface::checkTriangles(const bool verbose)
 
             if (verbose)
             {
-                WarningIn
-                (
-                    "triSurface::checkTriangles(bool verbose)"
-                )   << "triangle " << faceI
+                WarningInFunction
+                    << "triangle " << faceI
                     << " does not have three unique vertices:\n";
                 printTriangle(Warning, "    ", f, points());
             }
@@ -267,10 +262,8 @@ void Foam::triSurface::checkTriangles(const bool verbose)
 
                             if (verbose)
                             {
-                                WarningIn
-                                (
-                                    "triSurface::checkTriangles(bool verbose)"
-                                )   << "triangles share the same vertices:\n"
+                                WarningInFunction
+                                    << "triangles share the same vertices:\n"
                                     << "    face 1 :" << faceI << endl;
                                 printTriangle(Warning, "    ", f, points());
 
@@ -304,10 +297,8 @@ void Foam::triSurface::checkTriangles(const bool verbose)
 
         if (verbose)
         {
-            WarningIn
-            (
-                "triSurface::checkTriangles(bool verbose)"
-            )   << "Removing " << size() - newFaceI
+            WarningInFunction
+                << "Removing " << size() - newFaceI
                 << " illegal faces." << endl;
         }
         (*this).setSize(newFaceI);
@@ -329,17 +320,15 @@ void Foam::triSurface::checkEdges(const bool verbose)
 
         if (myFaces.empty())
         {
-            FatalErrorIn("triSurface::checkEdges(bool verbose)")
+            FatalErrorInFunction
                 << "Edge " << edgeI << " with vertices " << edges()[edgeI]
                 << " has no edgeFaces"
                 << exit(FatalError);
         }
         else if (myFaces.size() > 2 && verbose)
         {
-            WarningIn
-            (
-                "triSurface::checkEdges(bool verbose)"
-            )   << "Edge " << edgeI << " with vertices " << edges()[edgeI]
+            WarningInFunction
+                << "Edge " << edgeI << " with vertices " << edges()[edgeI]
                 << " has more than 2 faces connected to it : " << myFaces
                 << endl;
         }
@@ -366,10 +355,8 @@ bool Foam::triSurface::read
 {
     if (check && !exists(name))
     {
-        FatalErrorIn
-        (
-            "triSurface::read(const fileName&, const word&, const bool)"
-        )   << "Cannnot read " << name << exit(FatalError);
+        FatalErrorInFunction
+            << "Cannnot read " << name << exit(FatalError);
     }
 
     if (ext == "gz")
@@ -421,10 +408,8 @@ bool Foam::triSurface::read
     }
     else
     {
-        FatalErrorIn
-        (
-            "triSurface::read(const fileName&, const word&)"
-        )   << "unknown file extension " << ext
+        FatalErrorInFunction
+            << "unknown file extension " << ext
             << ". Supported extensions are '.ftr', '.stl', '.stlb', '.gts'"
             << ", '.obj', '.ac', '.off', '.nas', '.tri' and '.vtk'"
             << exit(FatalError);
@@ -490,10 +475,8 @@ void Foam::triSurface::write
     }
     else
     {
-        FatalErrorIn
-        (
-            "triSurface::write(const fileName&, const word&, const bool)"
-        )   << "unknown file extension " << ext
+        FatalErrorInFunction
+            << "unknown file extension " << ext
             << " for file " << name
             << ". Supported extensions are '.ftr', '.stl', '.stlb', "
             << "'.gts', '.obj', '.vtk'"
@@ -889,11 +872,7 @@ void Foam::triSurface::markZone
                         }
                         else if (faceZone[nbrFaceI] != currentZone)
                         {
-                            FatalErrorIn
-                            (
-                                "triSurface::markZone(const boolList&,"
-                                "const label, const label, labelList&) const"
-                            )
+                            FatalErrorInFunction
                                 << "Zones " << faceZone[nbrFaceI]
                                 << " at face " << nbrFaceI
                                 << " connects to zone " << currentZone
@@ -928,11 +907,7 @@ Foam::label Foam::triSurface::markZones
 
     if (borderEdge.size() != nEdges())
     {
-        FatalErrorIn
-        (
-            "triSurface::markZones"
-            "(const boolList&, labelList&)"
-        )
+        FatalErrorInFunction
             << "borderEdge boolList not same size as number of edges" << endl
             << "borderEdge:" << borderEdge.size() << endl
             << "nEdges    :" << nEdges()
diff --git a/src/triSurface/triSurface/triSurfaceAddressing.C b/src/triSurface/triSurface/triSurfaceAddressing.C
index f1a8b8a2fd..9aa9dae918 100644
--- a/src/triSurface/triSurface/triSurfaceAddressing.C
+++ b/src/triSurface/triSurface/triSurfaceAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ void Foam::triSurface::calcSortedEdgeFaces() const
 {
     if (sortedEdgeFacesPtr_)
     {
-        FatalErrorIn("triSurface::calcSortedEdgeFaces()")
+        FatalErrorInFunction
             << "sortedEdgeFacesPtr_ already set"
             << abort(FatalError);
     }
@@ -57,7 +57,7 @@ void Foam::triSurface::calcEdgeOwner() const
 {
     if (edgeOwnerPtr_)
     {
-        FatalErrorIn("triSurface::calcEdgeOwner()")
+        FatalErrorInFunction
             << "edgeOwnerPtr_ already set"
             << abort(FatalError);
     }
@@ -101,7 +101,7 @@ void Foam::triSurface::calcEdgeOwner() const
 
             if (edgeOwner[edgeI] == -1)
             {
-                FatalErrorIn("triSurface::calcEdgeOwner()")
+                FatalErrorInFunction
                     << "Edge " << edgeI << " vertices:" << e
                     << " is used by faces " << myFaces
                     << " vertices:"
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/U b/tutorials/DNS/dnsFoam/boxTurb16/0/U
index 6153271c3c..06e10a1d3a 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/U
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/p b/tutorials/DNS/dnsFoam/boxTurb16/0/p
index 9d7f24f8de..144c596908 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/p
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
index 433ef4128d..592dd6e155 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
index 1a7e14495a..4c0e7aa879 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
index 6cf7f2b74a..7509b51945 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
index e3ea964a76..26f096a711 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
index 7ef52f6888..806936f5f8 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
index fcde7de79f..2aa53d535c 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
index 06aba48225..7fd054c805 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/0/T b/tutorials/basic/laplacianFoam/flange/0/T
index 3d6830cbb6..84586a5373 100644
--- a/tutorials/basic/laplacianFoam/flange/0/T
+++ b/tutorials/basic/laplacianFoam/flange/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean
index b8da3681d1..e6ee925bad 100755
--- a/tutorials/basic/laplacianFoam/flange/Allclean
+++ b/tutorials/basic/laplacianFoam/flange/Allclean
@@ -6,5 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 rm -rf EnSight Ensight Fieldview > /dev/null 2>&1
+rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
deleted file mode 100644
index c97383b613..0000000000
--- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    patch1
-    {
-        type            patch;
-        nFaces          2440;
-        startFace       15316;
-    }
-    patch2
-    {
-        type            patch;
-        nFaces          348;
-        startFace       17756;
-    }
-    patch3
-    {
-        type            patch;
-        nFaces          96;
-        startFace       18104;
-    }
-    patch4
-    {
-        type            patch;
-        nFaces          384;
-        startFace       18200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
deleted file mode 100644
index 52a48b950a..0000000000
--- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    patch1
-    {
-        type            patch;
-        physicalType    adiabatic;
-        startFace       15316;
-        nFaces          2440;
-    }
-
-    patch2
-    {
-        type            patch;
-        physicalType    fixedTemp;
-        startFace       17756;
-        nFaces          348;
-    }
-
-    patch3
-    {
-        type            patch;
-        physicalType    adiabatic;
-        startFace       18104;
-        nFaces          96;
-    }
-
-    patch4
-    {
-        type            patch;
-        physicalType    fixedTemp;
-        startFace       18200;
-        nFaces          384;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/basic/laplacianFoam/flange/constant/transportProperties b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
index 2a2806fb24..dc8dafe569 100644
--- a/tutorials/basic/laplacianFoam/flange/constant/transportProperties
+++ b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict
index 1dbf016cfe..e305488c44 100644
--- a/tutorials/basic/laplacianFoam/flange/system/controlDict
+++ b/tutorials/basic/laplacianFoam/flange/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
index fe2e5854ec..b2bfb2b9c3 100644
--- a/tutorials/basic/laplacianFoam/flange/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/laplacianFoam/flange/system/fvSolution b/tutorials/basic/laplacianFoam/flange/system/fvSolution
index 668bb4770e..61f440cd6d 100644
--- a/tutorials/basic/laplacianFoam/flange/system/fvSolution
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0.org/U b/tutorials/basic/potentialFoam/cylinder/0.org/U
index d6116b31aa..abbfe89d56 100644
--- a/tutorials/basic/potentialFoam/cylinder/0.org/U
+++ b/tutorials/basic/potentialFoam/cylinder/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/0.org/p b/tutorials/basic/potentialFoam/cylinder/0.org/p
index 6f49804a73..b63443a5b4 100644
--- a/tutorials/basic/potentialFoam/cylinder/0.org/p
+++ b/tutorials/basic/potentialFoam/cylinder/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
deleted file mode 100644
index 0acbcb386b..0000000000
--- a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    down
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          60;
-        startFace       3890;
-    }
-    right
-    {
-        type            patch;
-        nFaces          30;
-        startFace       3950;
-    }
-    up
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          60;
-        startFace       3980;
-    }
-    left
-    {
-        type            patch;
-        nFaces          30;
-        startFace       4040;
-    }
-    cylinder
-    {
-        type            symmetry;
-        inGroups        1(symmetry);
-        nFaces          40;
-        startFace       4070;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4000;
-        startFace       4110;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
index 7bfe080d73..aad4b0f7d7 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index 8bfa888ba1..4a49b58424 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
index b3cb517e41..6f9b44de74 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
index 41a58da20e..7aff545e40 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSolution
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/U b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
index 885c5b9de4..5bf56cda86 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.org/U
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.org/p b/tutorials/basic/potentialFoam/pitzDaily/0.org/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/0.org/p
+++ b/tutorials/basic/potentialFoam/pitzDaily/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index 581ceffc70..0000000000
--- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
index a3cb4ff929..36da837b26 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
index e3bb950787..d0665543de 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
index 4682f4cc86..6a0493f126 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
index 7d1676b709..e113d6eeda 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
index bd853af1ab..70b373f30e 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
index ee7c5e45e7..2ca01d7001 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
index f8dc941138..9b6c2455b0 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
index e9c860c19d..e9d49e3bb7 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
index 245dcb70fe..67faf6fbfb 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw
index 9e587306db..75e044eba9 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B
index bd2e44ecb3..43ce7374cd 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR
index 9076af2173..331274436e 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT
index fcb9f43e11..3ad0cab63f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs
index 82ef44f36b..1971c0ea8e 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv
index d1b228459a..575cd1ab43 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su
index e7ac33c7fe..0f301501e4 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T
index a508662b3f..c75860c927 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu
index c72df6e214..32d2db5602 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
index e8f7c714a7..c0b52fd54d 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi
index 53d36f4c5b..d22e685d7f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/alphat b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/alphat
index f45b90603d..d0863127ba 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/alphat
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b
index 43ad33228e..3873006b1f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav
index 4a719759e6..a90f9f42ce 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
index b5c06f18c3..66772f3222 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft
index af3c6a8bb5..d9bbf9abe3 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
index e6c8fe0ee9..8c6c583629 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
index e6c8fe0ee9..8c6c583629 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv
index f46f287c67..8d1ffbe258 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut
index 50a3a27e9d..5893ea725e 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p
index 5d0efb0b2c..4ea15e3589 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties
index 8f02b2126d..d3fb0b2ad7 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
index 6234ec106e..75a298a718 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
index cf9a03199e..1b6098e9fc 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g
index c6097c4c1e..af13d41ad2 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index f2bfd9fb9b..3a78497894 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
index 3cf4138c41..81c8f225c8 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
index 14cf48efae..8b7b332dc8 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
index 5c0aaf0d2f..cfcde8b5ce 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
index 75ebdc085a..66abc2d006 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
index c7732fbc51..329f871bfe 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict
index b6aa7923e7..f200641c1a 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
index 654bdb3d19..cdfb06cef4 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
index 58314bd626..4d5e08fe94 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
index f7af93bab3..1f5c1af74f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Su b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Su
new file mode 100644
index 0000000000..8a985a8c93
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Su
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      Su;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform 0.135;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/T b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/T
new file mode 100644
index 0000000000..808e946efc
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/T
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+inletField      uniform 573;
+internalField   uniform 2400;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $inletField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Tu b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Tu
new file mode 100644
index 0000000000..91a582f9b2
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Tu
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      Tu;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 573;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/U b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/U
new file mode 100644
index 0000000000..030e730425
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/U
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (4 0 0);
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            cylindricalInletVelocity;
+        centre          (-0.64 0.5 0);
+        axis            (1 0 0);
+        axialVelocity   40;
+        radialVelocity  20;
+        rpm             12732; // ut=40,r=3e-2,omega=ut/r,rpm=omega*60/(2*pi)
+        value           uniform (0 0 0);
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        inletValue      (0 0 0);
+        value           $internalField;
+    }
+    wall
+    {
+        type            movingWallVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Xi b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Xi
new file mode 100644
index 0000000000..2c82712ead
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/Xi
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      Xi;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/alphat b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/alphat
new file mode 100644
index 0000000000..9761014149
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/alphat
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            calculated;
+    }
+    outlet
+    {
+        type            calculated;
+    }
+    wall
+    {
+        //type            compressible::alphatWallFunction;
+        //mut             mut;
+        //value           $internalField;
+
+        type            calculated;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/b b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/b
new file mode 100644
index 0000000000..2be4bf9c23
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/b
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      b;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/ft b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/ft
new file mode 100644
index 0000000000..60d897a688
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/ft
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      ft;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0834168596800118;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/k b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/k
new file mode 100644
index 0000000000..f1af4c8133
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/k
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 6;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            turbulentIntensityKineticEnergyInlet;
+        intensity       0.05;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/nut b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/nut
new file mode 100644
index 0000000000..59650fd3d9
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/nut
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -1 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            calculated;
+    }
+    outlet
+    {
+        type            calculated;
+    }
+    wall
+    {
+        //type            nutUSpaldingWallFunction;
+        //value           $internalField;
+
+        type            calculated;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/p b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/p
new file mode 100644
index 0000000000..23b4717001
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/p
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 10e5;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            waveTransmissive;
+        gamma           1.28;
+        fieldInf        10e5;
+        lInf            0.2;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/pPotential b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/pPotential
new file mode 100644
index 0000000000..a23520366e
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/0.org/pPotential
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      pPotential;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
new file mode 100755
index 0000000000..137b566fe2
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cd ${0%/*} || exit 1
+
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+./Allrun.mesh
+
+rm -rf 0 && cp -r 0.org 0
+
+runApplication decomposePar -force
+
+n=$(echo processor* | wc -w)
+
+runParallel potentialFoam $n -pName pPotential -initialiseUBCs
+
+rm -f processor*/0/phi
+
+runParallel XiDyMFoam $n
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh
new file mode 100755
index 0000000000..43192922b4
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+cd ${0%/*} || exit 1
+
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+rm -f log.* constant/polyMesh/*Level
+
+runApplication blockMesh
+
+runApplication -log log.createPatch.cyclic \
+    createPatch -dict system/createPatchDict.cyclic -overwrite
+
+runApplication snappyHexMesh -overwrite
+
+rm -rf 0
+
+runApplication -log log.createPatch.ami \
+    createPatch -dict system/createPatchDict.ami -overwrite
+
+runApplication transformPoints -scale '(0.01 0.01 0.01)'
+
+runApplication mergeOrSplitBaffles -split -overwrite
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties
new file mode 100644
index 0000000000..c4b75887e4
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/combustionProperties
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      combustionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+laminarFlameSpeedCorrelation Gulders;
+
+fuel            Methane;
+
+Su              Su [ 0 1 -1 0 0 0 0 ] 0.434;
+
+SuModel         unstrained;
+
+equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.7;
+
+sigmaExt        sigmaExt [ 0 0 -1 0 0 0 0 ] 100000;
+
+XiModel         transport;
+
+XiCoef          XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
+
+XiShapeCoef     XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
+
+uPrimeCoef      uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
+
+GuldersCoeffs
+{
+    Methane
+    {
+        W               0.422;
+        eta             0.15;
+        xi              5.18;
+        alpha           2;
+        beta            -0.5;
+        f               2.3;
+    }
+}
+
+ignite          yes;
+
+ignitionProperties
+{
+    diameter        0.03;
+    start           0;
+    duration        1;
+    strength        20;
+}
+
+noIgnitionProperties
+{
+    diameter        0;
+    start           0;
+    duration        1e-30;
+    strength        0;
+}
+
+ignitionSites
+(
+    {
+        location        (-0.28 0.55 0);
+        $noIgnitionProperties;
+    }
+);
+
+ignitionSphereFraction 1;
+
+ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0.001;
+
+ignitionCircleFraction 0.5;
+
+ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0.001;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict
new file mode 100644
index 0000000000..bf61676a55
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/dynamicMeshDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh   solidBodyMotionFvMesh;
+
+motionSolverLibs ( "libfvMotionSolvers.so" );
+
+solidBodyMotionFvMeshCoeffs
+{
+    cellZone        rotating;
+
+    solidBodyMotionFunction  rotatingMotion;
+    rotatingMotionCoeffs
+    {
+        origin        (0 0 0);
+        axis          (1 0 0);
+        omega         10;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/g b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g
similarity index 83%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/g
rename to tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g
index 508d658494..a52376e2b3 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/g
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 0);
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..b6392eac92
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/polyMesh/blockMeshDict
@@ -0,0 +1,208 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: Uhe Open Source CFD Uoolbox           |
+|  \\    /   O peration     | Tersion:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertUoMeters 1;
+
+r0 34;
+r1 39;
+r2 61;
+r3 66;
+
+t -10;
+u 10;
+o 10;
+
+d2r #calc "constant::mathematical::pi/180";
+
+r0CosT  #calc "$r0*cos($d2r*($t   ))";
+r0CosTO #calc "$r0*cos($d2r*($t+$o))";
+r0CosU  #calc "$r0*cos($d2r*($u   ))";
+r0CosUO #calc "$r0*cos($d2r*($u+$o))";
+r0SinT  #calc "$r0*sin($d2r*($t   ))";
+r0SinTO #calc "$r0*sin($d2r*($t+$o))";
+r0SinU  #calc "$r0*sin($d2r*($u   ))";
+r0SinUO #calc "$r0*sin($d2r*($u+$o))";
+
+r1CosT  #calc "$r1*cos($d2r*($t   ))";
+r1CosTO #calc "$r1*cos($d2r*($t+$o))";
+r1CosU  #calc "$r1*cos($d2r*($u   ))";
+r1CosUO #calc "$r1*cos($d2r*($u+$o))";
+r1SinT  #calc "$r1*sin($d2r*($t   ))";
+r1SinTO #calc "$r1*sin($d2r*($t+$o))";
+r1SinU  #calc "$r1*sin($d2r*($u   ))";
+r1SinUO #calc "$r1*sin($d2r*($u+$o))";
+
+r2CosT  #calc "$r2*cos($d2r*($t   ))";
+r2CosTO #calc "$r2*cos($d2r*($t+$o))";
+r2CosU  #calc "$r2*cos($d2r*($u   ))";
+r2CosUO #calc "$r2*cos($d2r*($u+$o))";
+r2SinT  #calc "$r2*sin($d2r*($t   ))";
+r2SinTO #calc "$r2*sin($d2r*($t+$o))";
+r2SinU  #calc "$r2*sin($d2r*($u   ))";
+r2SinUO #calc "$r2*sin($d2r*($u+$o))";
+
+r3CosT  #calc "$r3*cos($d2r*($t   ))";
+r3CosTO #calc "$r3*cos($d2r*($t+$o))";
+r3CosU  #calc "$r3*cos($d2r*($u   ))";
+r3CosUO #calc "$r3*cos($d2r*($u+$o))";
+r3SinT  #calc "$r3*sin($d2r*($t   ))";
+r3SinTO #calc "$r3*sin($d2r*($t+$o))";
+r3SinU  #calc "$r3*sin($d2r*($u   ))";
+r3SinUO #calc "$r3*sin($d2r*($u+$o))";
+
+vertices
+(
+    (-34 $r1CosT  $r1SinT )
+    (-34 $r1CosTO $r1SinTO)
+    (-34 $r1CosU  $r1SinU )
+
+    (-30 $r1CosT  $r1SinT )
+    (-30 $r1CosTO $r1SinTO)
+    (-30 $r1CosU  $r1SinU )
+
+    (-15 $r0CosT  $r0SinT )
+    (-15 $r0CosTO $r0SinTO)
+    (-15 $r0CosU  $r0SinU )
+
+    (  0 $r1CosT  $r1SinT )
+    (  0 $r1CosTO $r1SinTO)
+    (  0 $r1CosU  $r1SinU )
+
+    ( 12 $r1CosT  $r1SinT )
+    ( 12 $r1CosTO $r1SinTO)
+    ( 12 $r1CosU  $r1SinU )
+    ( 12 $r1CosUO $r1SinUO)
+
+    ( 28 $r1CosT  $r1SinT )
+    ( 28 $r1CosTO $r1SinTO)
+    ( 28 $r1CosU  $r1SinU )
+    ( 28 $r1CosUO $r1SinUO)
+
+    ( 40 $r1CosT  $r1SinT )
+    ( 40 $r1CosTO $r1SinTO)
+    ( 40 $r1CosU  $r1SinU )
+
+
+    (-34 $r2CosT  $r2SinT )
+    (-34 $r2CosTO $r2SinTO)
+    (-34 $r2CosU  $r2SinU )
+
+    (-30 $r2CosT  $r2SinT )
+    (-30 $r2CosTO $r2SinTO)
+    (-30 $r2CosU  $r2SinU )
+
+    (-15 $r3CosT  $r3SinT )
+    (-15 $r3CosTO $r3SinTO)
+    (-15 $r3CosU  $r3SinU )
+
+    (  0 $r2CosT  $r2SinT )
+    (  0 $r2CosTO $r2SinTO)
+    (  0 $r2CosU  $r2SinU )
+
+    ( 12 $r2CosT  $r2SinT )
+    ( 12 $r2CosTO $r2SinTO)
+    ( 12 $r2CosU  $r2SinU )
+    ( 12 $r2CosUO $r2SinUO)
+
+    ( 28 $r2CosT  $r2SinT )
+    ( 28 $r2CosTO $r2SinTO)
+    ( 28 $r2CosU  $r2SinU )
+    ( 28 $r2CosUO $r2SinUO)
+
+    ( 40 $r2CosT  $r2SinT )
+    ( 40 $r2CosTO $r2SinTO)
+    ( 40 $r2CosU  $r2SinU )
+);
+
+blocks
+(
+    hex ( 0    1    4    3   23   24   27   26) (8  4 22) simpleGrading (1 1 1)
+    hex ( 1    2    5    4   24   25   28   27) (8  4 22) simpleGrading (1 1 1)
+    hex ( 3    4    7    6   26   27   30   29) (8 15 22) simpleGrading (1 1 1)
+    hex ( 4    5    8    7   27   28   31   30) (8 15 22) simpleGrading (1 1 1)
+    hex ( 6    7   10    9   29   30   33   32) (8 15 22) simpleGrading (1 1 1)
+    hex ( 7    8   11   10   30   31   34   33) (8 15 22) simpleGrading (1 1 1)
+    hex ( 9   10   13   12   32   33   36   35) (8 12 22) simpleGrading (1 1 1)
+    hex (10   11   14   13   33   34   37   36) (8 12 22) simpleGrading (1 1 1)
+    hex (13   14   18   17   36   37   41   40) (8 16 22) simpleGrading (1 1 1)
+    hex (14   15   19   18   37   38   42   41) (8 16 22) simpleGrading (1 1 1)
+    hex (16   17   21   20   39   40   44   43) (8 12 22) simpleGrading (1 1 1)
+    hex (17   18   22   21   40   41   45   44) (8 12 22) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+defaultPatch
+{
+    name    walls;
+    type    wall;
+}
+
+boundary
+(
+    coupled0
+    {
+        type patch;
+        faces
+        (
+            ( 0  3 26 23)
+            ( 3  6 29 26)
+            ( 6  9 32 29)
+            ( 9 12 35 32)
+            (12 13 36 35)
+            (13 17 40 36)
+            (17 16 39 40)
+            (16 20 43 39)
+        );
+    }
+    coupled1
+    {
+        type patch;
+        faces
+        (
+            ( 2  5 28 25)
+            ( 5  8 31 28)
+            ( 8 11 34 31)
+            (11 14 37 34)
+            (14 15 38 37)
+            (15 19 42 38)
+            (19 18 41 42)
+            (18 22 45 41)
+        );
+    }
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 1 24 23)
+            (1 2 25 24)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (20 21 44 43)
+            (21 22 45 44)
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties
new file mode 100644
index 0000000000..29a6fead53
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/thermophysicalProperties
@@ -0,0 +1,111 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heheuPsiThermo;
+    mixture         inhomogeneousMixture;
+    transport       sutherland;
+    thermo          janaf;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          absoluteEnthalpy;
+}
+
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 17.1256917852272;
+
+fuel
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 1.68347900000000e+00   1.02372400000000e-02  -3.87512900000000e-06
+                          6.78558500000000e-10  -4.50342300000000e-14  -1.00807900000000e+04
+                          9.62339500000000e+00 );
+        lowCpCoeffs     ( 7.78741500000000e-01   1.74766800000000e-02  -2.78340900000000e-05
+                          3.04970800000000e-08  -1.22393100000000e-11  -9.82522900000000e+03
+                          1.37221900000000e+01);
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+oxidant
+{
+    specie
+    {
+        nMoles          1; //9.52305854241338;
+        molWeight       28.8504;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.10621870999231e+00   1.28428498601527e-03  -4.65380802511688e-07
+                          8.15860818565581e-11  -5.44497272650050e-15  -9.95271410040158e+02
+                         -3.84458215280579e+00 );
+        lowCpCoeffs     ( 3.27870489047439e+00   1.34284246978981e-03  -3.17412859038611e-06
+                          4.63345514388486e-09  -2.07961247020324e-12  -1.01725432889533e+03
+                          4.43589451598939e+00 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+burntProducts
+{
+    specie
+    {
+        nMoles          1; //10.5230585424134;
+        molWeight       27.6333203887463;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.12621199152579e+00   1.93235833404466e-03  -7.13659150075058e-07
+                          1.24291624549546e-10  -8.21247028136899e-15  -1.17845644935839e+04
+                         -3.62860244355855e+00 );
+        lowCpCoeffs     ( 3.15477967054864e+00   2.95287447890381e-03  -5.23511418470824e-06
+                          5.99137516254551e-09  -2.40292638317596e-12  -1.18040651744366e+04
+                          4.72596689098416e+00 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/ami.obj b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/ami.obj
new file mode 100644
index 0000000000..01fde08819
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/ami.obj
@@ -0,0 +1,6 @@
+v 20 -70 -70
+v 20  70 -70
+v 20  70  70
+v 20 -70  70
+f 1 2 3
+f 1 3 4
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/blade1.obj b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/blade1.obj
new file mode 100644
index 0000000000..4cb4c243e4
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/blade1.obj
@@ -0,0 +1,4 @@
+v 12.000000 0.000000 0.000000
+v 20.000000 77.274066 20.705524
+v 4.000000 79.695576 -6.972459
+f 1 2 3
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/blade2.obj b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/blade2.obj
new file mode 100644
index 0000000000..4bedc6ab01
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/blade2.obj
@@ -0,0 +1,4 @@
+v 28.000000 0.000000 0.000000
+v 20.000000 77.274066 20.705524
+v 36.000000 79.695576 -6.972459
+f 1 2 3
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/inlet.stl b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/inlet.stl
new file mode 100644
index 0000000000..43427ce550
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/inlet.stl
@@ -0,0 +1,310 @@
+solid
+  facet normal -1 -0 -0
+    outer loop
+       vertex -34 52.7032 4.20627
+       vertex -34 53.7787 3.2743
+       vertex -34 51.4087 4.79746
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 53.7787 3.2743
+       vertex -34 54.5482 2.07707
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 54.5482 2.07707
+       vertex -34 54.9491 0.711574
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 54.9491 0.711574
+       vertex -34 54.9491 -0.711574
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 54.9491 -0.711574
+       vertex -34 54.5482 -2.07707
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 54.5482 -2.07707
+       vertex -34 53.7787 -3.2743
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 53.7787 -3.2743
+       vertex -34 52.7032 -4.20627
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 52.7032 -4.20627
+       vertex -34 51.4087 -4.79746
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -34 50.7557 -0.654861
+       vertex -34 51.4087 -4.79746
+       vertex -34 50 -5
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -34 50 -1
+       vertex -34 50 -5
+       vertex -34 48.5913 -4.79746
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 49.0904 -0.415415
+       vertex -34 48.5913 -4.79746
+       vertex -34 47.2968 -4.20627
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 49.0102 0.142315
+       vertex -34 47.2968 -4.20627
+       vertex -34 46.2213 -3.2743
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 46.2213 -3.2743
+       vertex -34 45.4518 -2.07707
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 45.4518 -2.07707
+       vertex -34 45.0509 -0.711574
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 45.0509 -0.711574
+       vertex -34 45.0509 0.711574
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 45.0509 0.711574
+       vertex -34 45.4518 2.07707
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 45.4518 2.07707
+       vertex -34 46.2213 3.2743
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 46.2213 3.2743
+       vertex -34 47.2968 4.20627
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 47.2968 4.20627
+       vertex -34 48.5913 4.79746
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 48.5913 4.79746
+       vertex -34 50 5
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 50 -1
+       vertex -34 48.5913 -4.79746
+       vertex -34 49.7183 -0.959493
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 49.0102 0.142315
+       vertex -34 46.2213 -3.2743
+       vertex -34 49.0904 0.415415
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 49.4594 0.841254
+       vertex -34 49.2442 0.654861
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 49.2442 0.654861
+       vertex -34 46.2213 -3.2743
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 49.2442 0.654861
+       vertex -34 49.0904 0.415415
+       vertex -34 46.2213 -3.2743
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 49.0102 -0.142315
+       vertex -34 47.2968 -4.20627
+       vertex -34 49.0102 0.142315
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 49.0904 -0.415415
+       vertex -34 47.2968 -4.20627
+       vertex -34 49.0102 -0.142315
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 49.2442 -0.654861
+       vertex -34 48.5913 -4.79746
+       vertex -34 49.0904 -0.415415
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 49.4594 -0.841254
+       vertex -34 48.5913 -4.79746
+       vertex -34 49.2442 -0.654861
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -34 49.7183 -0.959493
+       vertex -34 48.5913 -4.79746
+       vertex -34 49.4594 -0.841254
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.2817 -0.959493
+       vertex -34 50 -5
+       vertex -34 50 -1
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.7557 -0.654861
+       vertex -34 50 -5
+       vertex -34 50.5406 -0.841254
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.5406 -0.841254
+       vertex -34 50 -5
+       vertex -34 50.2817 -0.959493
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -34 50.9096 -0.415415
+       vertex -34 51.4087 -4.79746
+       vertex -34 50.7557 -0.654861
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.9096 0.415415
+       vertex -34 51.4087 4.79746
+       vertex -34 50.9898 0.142315
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -34 50.9898 -0.142315
+       vertex -34 51.4087 -4.79746
+       vertex -34 50.9096 -0.415415
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 51.4087 -4.79746
+       vertex -34 50.9898 -0.142315
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 50.9898 -0.142315
+       vertex -34 50.9898 0.142315
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.7557 0.654861
+       vertex -34 51.4087 4.79746
+       vertex -34 50.9096 0.415415
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.5406 0.841254
+       vertex -34 51.4087 4.79746
+       vertex -34 50.7557 0.654861
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50.2817 0.959493
+       vertex -34 51.4087 4.79746
+       vertex -34 50.5406 0.841254
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 50 1
+       vertex -34 51.4087 4.79746
+       vertex -34 50.2817 0.959493
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -34 50 1
+       vertex -34 49.7183 0.959493
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -34 49.4594 0.841254
+       vertex -34 51.4087 4.79746
+       vertex -34 49.7183 0.959493
+    endloop
+  endfacet
+endsolid
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/outlet.stl b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/outlet.stl
new file mode 100644
index 0000000000..d7a2d6bf52
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/outlet.stl
@@ -0,0 +1,2872 @@
+solid
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -2.7575 59.9366
+       vertex 40 -4.59295 59.8239
+       vertex 40 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -10.0666 59.1495
+       vertex 40 -2.7575 59.9366
+       vertex 40 -8.2492 59.4302
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -8.2492 59.4302
+       vertex 40 -2.7575 59.9366
+       vertex 40 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -11.8745 58.8132
+       vertex 40 -2.7575 59.9366
+       vertex 40 -10.0666 59.1495
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -13.6712 58.4217
+       vertex 40 -2.7575 59.9366
+       vertex 40 -11.8745 58.8132
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -15.4551 57.9753
+       vertex 40 -2.7575 59.9366
+       vertex 40 -13.6712 58.4217
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -17.2245 57.4745
+       vertex 40 -2.7575 59.9366
+       vertex 40 -15.4551 57.9753
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -18.9777 56.9196
+       vertex 40 -2.7575 59.9366
+       vertex 40 -17.2245 57.4745
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -20.7131 56.3113
+       vertex 40 -2.7575 59.9366
+       vertex 40 -18.9777 56.9196
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -22.429 55.6501
+       vertex 40 -2.7575 59.9366
+       vertex 40 -20.7131 56.3113
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -24.1239 54.9367
+       vertex 40 -2.7575 59.9366
+       vertex 40 -22.429 55.6501
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -25.7961 54.1716
+       vertex 40 -2.7575 59.9366
+       vertex 40 -24.1239 54.9367
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -27.444 53.3556
+       vertex 40 -2.7575 59.9366
+       vertex 40 -25.7961 54.1716
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -29.0662 52.4896
+       vertex 40 -2.7575 59.9366
+       vertex 40 -27.444 53.3556
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -30.6611 51.5742
+       vertex 40 -2.7575 59.9366
+       vertex 40 -29.0662 52.4896
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -32.2272 50.6103
+       vertex 40 -2.7575 59.9366
+       vertex 40 -30.6611 51.5742
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -33.763 49.599
+       vertex 40 -2.7575 59.9366
+       vertex 40 -32.2272 50.6103
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -35.2671 48.541
+       vertex 40 -2.7575 59.9366
+       vertex 40 -33.763 49.599
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -36.7381 47.4375
+       vertex 40 -2.7575 59.9366
+       vertex 40 -35.2671 48.541
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -38.1745 46.2894
+       vertex 40 -2.7575 59.9366
+       vertex 40 -36.7381 47.4375
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.5751 45.0978
+       vertex 40 -2.7575 59.9366
+       vertex 40 -38.1745 46.2894
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -40.9386 43.8638
+       vertex 40 -2.7575 59.9366
+       vertex 40 -39.5751 45.0978
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -42.2636 42.5886
+       vertex 40 -2.7575 59.9366
+       vertex 40 -40.9386 43.8638
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -43.5488 41.2735
+       vertex 40 -2.7575 59.9366
+       vertex 40 -42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -44.7932 39.9195
+       vertex 40 -2.7575 59.9366
+       vertex 40 -43.5488 41.2735
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -45.9955 38.5281
+       vertex 40 -2.7575 59.9366
+       vertex 40 -44.7932 39.9195
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -47.1546 37.1005
+       vertex 40 -2.7575 59.9366
+       vertex 40 -45.9955 38.5281
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -48.2694 35.638
+       vertex 40 -2.7575 59.9366
+       vertex 40 -47.1546 37.1005
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -49.3388 34.1421
+       vertex 40 -2.7575 59.9366
+       vertex 40 -48.2694 35.638
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -50.3619 32.6141
+       vertex 40 -2.7575 59.9366
+       vertex 40 -49.3388 34.1421
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -51.3377 31.0554
+       vertex 40 -2.7575 59.9366
+       vertex 40 -50.3619 32.6141
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -52.2653 29.4676
+       vertex 40 -2.7575 59.9366
+       vertex 40 -51.3377 31.0554
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -53.1438 27.8521
+       vertex 40 -2.7575 59.9366
+       vertex 40 -52.2653 29.4676
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -53.9724 26.2104
+       vertex 40 -2.7575 59.9366
+       vertex 40 -53.1438 27.8521
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -54.7502 24.5441
+       vertex 40 -2.7575 59.9366
+       vertex 40 -53.9724 26.2104
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -55.4767 22.8548
+       vertex 40 -2.7575 59.9366
+       vertex 40 -54.7502 24.5441
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -56.151 21.144
+       vertex 40 -2.7575 59.9366
+       vertex 40 -55.4767 22.8548
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -56.7726 19.4133
+       vertex 40 -2.7575 59.9366
+       vertex 40 -56.151 21.144
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -57.3408 17.6644
+       vertex 40 -2.7575 59.9366
+       vertex 40 -56.7726 19.4133
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -57.8552 15.8989
+       vertex 40 -2.7575 59.9366
+       vertex 40 -57.3408 17.6644
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -58.3153 14.1185
+       vertex 40 -2.7575 59.9366
+       vertex 40 -57.8552 15.8989
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -58.7205 12.3248
+       vertex 40 -2.7575 59.9366
+       vertex 40 -58.3153 14.1185
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.0706 10.5195
+       vertex 40 -2.7575 59.9366
+       vertex 40 -58.7205 12.3248
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.3653 8.70434
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.0706 10.5195
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.6041 6.88101
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.3653 8.70434
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.787 5.05121
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.6041 6.88101
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.9137 3.21667
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.787 5.05121
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.9841 1.37911
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.9137 3.21667
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -59.9982 -0.459741
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.9841 1.37911
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -59.956 -2.29816
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -59.8574 -4.13443
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -59.7026 -5.96681
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -59.4917 -7.79359
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -30.6637 25.6854
+       vertex 40 -2.7575 59.9366
+       vertex 40 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -30.6637 25.6854
+       vertex 40 -29.8621 26.613
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -32.8925 22.7614
+       vertex 40 -32.1796 23.7587
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -35.9816 17.4736
+       vertex 40 -35.4292 18.568
+       vertex 40 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -37.434 14.096
+       vertex 40 -36.9844 15.2365
+       vertex 40 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -38.2272 11.7763
+       vertex 40 -37.8484 12.9422
+       vertex 40 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -38.8768 9.4123
+       vertex 40 -38.5701 10.5993
+       vertex 40 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.5768 5.80289
+       vertex 40 -39.3804 7.01299
+       vertex 40 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.7361 4.58734
+       vertex 40 -39.5768 5.80289
+       vertex 40 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.9425 2.14445
+       vertex 40 -39.858 3.36748
+       vertex 40 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.9988 -0.306494
+       vertex 40 -39.9894 0.91941
+       vertex 40 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.9049 -2.75629
+       vertex 40 -39.9706 -1.53211
+       vertex 40 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.8017 -3.97787
+       vertex 40 -39.9049 -2.75629
+       vertex 40 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.4833 -6.40869
+       vertex 40 -39.6611 -5.19572
+       vertex 40 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.2683 -7.61564
+       vertex 40 -39.4833 -6.40869
+       vertex 40 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -38.728 -10.007
+       vertex 40 -39.0165 -8.81544
+       vertex 40 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -38.4032 -11.1891
+       vertex 40 -38.728 -10.007
+       vertex 40 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -37.6456 -13.5207
+       vertex 40 -38.0423 -12.3607
+       vertex 40 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -37.2136 -14.668
+       vertex 40 -37.6456 -13.5207
+       vertex 40 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -36.2451 -16.9202
+       vertex 40 -36.7466 -15.8015
+       vertex 40 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -35.7096 -18.0229
+       vertex 40 -36.2451 -16.9202
+       vertex 40 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -35.1405 -19.1088
+       vertex 40 -35.7096 -18.0229
+       vertex 40 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -33.9039 -21.2256
+       vertex 40 -34.5384 -20.1767
+       vertex 40 -42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -33.2375 -22.2547
+       vertex 40 -33.9039 -21.2256
+       vertex 40 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -32.5399 -23.2628
+       vertex 40 -33.2375 -22.2547
+       vertex 40 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -31.0537 -25.2125
+       vertex 40 -31.8117 -24.249
+       vertex 40 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -30.2664 -26.1523
+       vertex 40 -31.0537 -25.2125
+       vertex 40 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -29.4508 -27.0675
+       vertex 40 -30.2664 -26.1523
+       vertex 40 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -27.7373 -28.8209
+       vertex 40 -28.6075 -27.9573
+       vertex 40 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -26.8411 -29.6573
+       vertex 40 -27.7373 -28.8209
+       vertex 40 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -25.9196 -30.4659
+       vertex 40 -26.8411 -29.6573
+       vertex 40 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -24.0046 -31.9966
+       vertex 40 -24.9738 -31.2459
+       vertex 40 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -23.0127 -32.7172
+       vertex 40 -24.0046 -31.9966
+       vertex 40 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -21.9993 -33.407
+       vertex 40 -23.0127 -32.7172
+       vertex 40 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -20.9652 -34.0655
+       vertex 40 -21.9993 -33.407
+       vertex 40 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -18.839 -35.2859
+       vertex 40 -19.9115 -34.692
+       vertex 40 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -17.7488 -35.8466
+       vertex 40 -18.839 -35.2859
+       vertex 40 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -16.6419 -36.3737
+       vertex 40 -17.7488 -35.8466
+       vertex 40 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -14.3824 -37.3249
+       vertex 40 -15.5195 -36.8666
+       vertex 40 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -13.2318 -37.7481
+       vertex 40 -14.3824 -37.3249
+       vertex 40 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -12.0688 -38.1359
+       vertex 40 -13.2318 -37.7481
+       vertex 40 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -10.8945 -38.4878
+       vertex 40 -12.0688 -38.1359
+       vertex 40 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -8.51622 -39.0829
+       vertex 40 -9.70992 -38.8036
+       vertex 40 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -7.31453 -39.3255
+       vertex 40 -8.51622 -39.0829
+       vertex 40 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -6.10597 -39.5312
+       vertex 40 -7.31453 -39.3255
+       vertex 40 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -4.89167 -39.6998
+       vertex 40 -6.10597 -39.5312
+       vertex 40 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -2.45044 -39.9249
+       vertex 40 -3.67278 -39.831
+       vertex 40 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -1.22579 -39.9812
+       vertex 40 -2.45044 -39.9249
+       vertex 40 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 0 -40
+       vertex 40 -1.22579 -39.9812
+       vertex 40 0 -60
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 1.22579 -39.9812
+       vertex 40 0 -40
+       vertex 40 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 3.67278 -39.831
+       vertex 40 2.45044 -39.9249
+       vertex 40 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 4.89167 -39.6998
+       vertex 40 3.67278 -39.831
+       vertex 40 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 6.10597 -39.5312
+       vertex 40 4.89167 -39.6998
+       vertex 40 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 13.2318 -37.7481
+       vertex 40 12.0688 -38.1359
+       vertex 40 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 23.0127 -32.7172
+       vertex 40 21.9993 -33.407
+       vertex 40 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 18.839 -35.2859
+       vertex 40 17.7488 -35.8466
+       vertex 40 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 27.7373 -28.8209
+       vertex 40 26.8411 -29.6573
+       vertex 40 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 31.0537 -25.2125
+       vertex 40 30.2664 -26.1523
+       vertex 40 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 33.9039 -21.2256
+       vertex 40 33.2375 -22.2547
+       vertex 40 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 36.2451 -16.9202
+       vertex 40 35.7096 -18.0229
+       vertex 40 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -12.6518 37.9464
+       vertex 40 -11.483 38.3163
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.0423 -12.3607
+       vertex 40 37.6456 -13.5207
+       vertex 40 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.0165 -8.81544
+       vertex 40 38.728 -10.007
+       vertex 40 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.6611 -5.19572
+       vertex 40 39.4833 -6.40869
+       vertex 40 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.9706 -1.53211
+       vertex 40 39.9049 -2.75629
+       vertex 40 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.9425 2.14445
+       vertex 40 39.9894 0.91941
+       vertex 40 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 29.8621 26.613
+       vertex 40 30.6637 25.6854
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 37.8484 12.9422
+       vertex 40 38.2272 11.7763
+       vertex 40 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 34.2252 20.7036
+       vertex 40 34.8435 19.6451
+       vertex 40 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 30.6637 25.6854
+       vertex 40 31.4364 24.7337
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.9982 -0.459741
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.9841 1.37911
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.9137 3.21667
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.9841 1.37911
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.787 5.05121
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.9137 3.21667
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.6041 6.88101
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.787 5.05121
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.3653 8.70434
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.6041 6.88101
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.0706 10.5195
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.3653 8.70434
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 58.7205 12.3248
+       vertex 40 -2.7575 59.9366
+       vertex 40 59.0706 10.5195
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 58.3153 14.1185
+       vertex 40 -2.7575 59.9366
+       vertex 40 58.7205 12.3248
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 57.8552 15.8989
+       vertex 40 -2.7575 59.9366
+       vertex 40 58.3153 14.1185
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 57.3408 17.6644
+       vertex 40 -2.7575 59.9366
+       vertex 40 57.8552 15.8989
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 56.7726 19.4133
+       vertex 40 -2.7575 59.9366
+       vertex 40 57.3408 17.6644
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 56.151 21.144
+       vertex 40 -2.7575 59.9366
+       vertex 40 56.7726 19.4133
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 55.4767 22.8548
+       vertex 40 -2.7575 59.9366
+       vertex 40 56.151 21.144
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 54.7502 24.5441
+       vertex 40 -2.7575 59.9366
+       vertex 40 55.4767 22.8548
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 53.9724 26.2104
+       vertex 40 -2.7575 59.9366
+       vertex 40 54.7502 24.5441
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 53.1438 27.8521
+       vertex 40 -2.7575 59.9366
+       vertex 40 53.9724 26.2104
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 52.2653 29.4676
+       vertex 40 -2.7575 59.9366
+       vertex 40 53.1438 27.8521
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 51.3377 31.0554
+       vertex 40 -2.7575 59.9366
+       vertex 40 52.2653 29.4676
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 50.3619 32.6141
+       vertex 40 -2.7575 59.9366
+       vertex 40 51.3377 31.0554
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 49.3388 34.1421
+       vertex 40 -2.7575 59.9366
+       vertex 40 50.3619 32.6141
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 48.2694 35.638
+       vertex 40 -2.7575 59.9366
+       vertex 40 49.3388 34.1421
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 47.1546 37.1005
+       vertex 40 -2.7575 59.9366
+       vertex 40 48.2694 35.638
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 45.9955 38.5281
+       vertex 40 -2.7575 59.9366
+       vertex 40 47.1546 37.1005
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 44.7932 39.9195
+       vertex 40 -2.7575 59.9366
+       vertex 40 45.9955 38.5281
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 43.5488 41.2735
+       vertex 40 -2.7575 59.9366
+       vertex 40 44.7932 39.9195
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 42.2636 42.5886
+       vertex 40 -2.7575 59.9366
+       vertex 40 43.5488 41.2735
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 40.9386 43.8638
+       vertex 40 -2.7575 59.9366
+       vertex 40 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.5751 45.0978
+       vertex 40 -2.7575 59.9366
+       vertex 40 40.9386 43.8638
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.1745 46.2894
+       vertex 40 -2.7575 59.9366
+       vertex 40 39.5751 45.0978
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 36.7381 47.4375
+       vertex 40 -2.7575 59.9366
+       vertex 40 38.1745 46.2894
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 35.2671 48.541
+       vertex 40 -2.7575 59.9366
+       vertex 40 36.7381 47.4375
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 33.763 49.599
+       vertex 40 -2.7575 59.9366
+       vertex 40 35.2671 48.541
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 32.2272 50.6103
+       vertex 40 -2.7575 59.9366
+       vertex 40 33.763 49.599
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 30.6611 51.5742
+       vertex 40 -2.7575 59.9366
+       vertex 40 32.2272 50.6103
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 29.0662 52.4896
+       vertex 40 -2.7575 59.9366
+       vertex 40 30.6611 51.5742
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 27.444 53.3556
+       vertex 40 -2.7575 59.9366
+       vertex 40 29.0662 52.4896
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 25.7961 54.1716
+       vertex 40 -2.7575 59.9366
+       vertex 40 27.444 53.3556
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 24.1239 54.9367
+       vertex 40 -2.7575 59.9366
+       vertex 40 25.7961 54.1716
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 22.429 55.6501
+       vertex 40 -2.7575 59.9366
+       vertex 40 24.1239 54.9367
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 20.7131 56.3113
+       vertex 40 -2.7575 59.9366
+       vertex 40 22.429 55.6501
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 18.9777 56.9196
+       vertex 40 -2.7575 59.9366
+       vertex 40 20.7131 56.3113
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 17.2245 57.4745
+       vertex 40 -2.7575 59.9366
+       vertex 40 18.9777 56.9196
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 15.4551 57.9753
+       vertex 40 -2.7575 59.9366
+       vertex 40 17.2245 57.4745
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 13.6712 58.4217
+       vertex 40 -2.7575 59.9366
+       vertex 40 15.4551 57.9753
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 11.8745 58.8132
+       vertex 40 -2.7575 59.9366
+       vertex 40 13.6712 58.4217
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 10.0666 59.1495
+       vertex 40 -2.7575 59.9366
+       vertex 40 11.8745 58.8132
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 8.2492 59.4302
+       vertex 40 -2.7575 59.9366
+       vertex 40 10.0666 59.1495
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 6.4241 59.6551
+       vertex 40 -2.7575 59.9366
+       vertex 40 8.2492 59.4302
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 4.59295 59.8239
+       vertex 40 -2.7575 59.9366
+       vertex 40 6.4241 59.6551
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 2.7575 59.9366
+       vertex 40 -2.7575 59.9366
+       vertex 40 4.59295 59.8239
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 0.919455 59.993
+       vertex 40 -2.7575 59.9366
+       vertex 40 2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 40 -0.919455 59.993
+       vertex 40 -2.7575 59.9366
+       vertex 40 0.919455 59.993
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 12.0688 -38.1359
+       vertex 40 10.8945 -38.4878
+       vertex 40 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 3.06197 39.8826
+       vertex 40 4.28273 39.7701
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 17.7488 -35.8466
+       vertex 40 16.6419 -36.3737
+       vertex 40 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 20.9652 -34.0655
+       vertex 40 19.9115 -34.692
+       vertex 40 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 21.9993 -33.407
+       vertex 40 20.9652 -34.0655
+       vertex 40 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 26.8411 -29.6573
+       vertex 40 25.9196 -30.4659
+       vertex 40 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 5.49947 39.6201
+       vertex 40 6.71104 39.433
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 30.2664 -26.1523
+       vertex 40 29.4508 -27.0675
+       vertex 40 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 6.71104 39.433
+       vertex 40 7.91631 39.2088
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 33.2375 -22.2547
+       vertex 40 32.5399 -23.2628
+       vertex 40 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 7.91631 39.2088
+       vertex 40 9.11414 38.9478
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 35.7096 -18.0229
+       vertex 40 35.1405 -19.1088
+       vertex 40 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -7.91631 39.2088
+       vertex 40 -6.71104 39.433
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 37.6456 -13.5207
+       vertex 40 37.2136 -14.668
+       vertex 40 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 10.3034 38.6502
+       vertex 40 11.483 38.3163
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 11.483 38.3163
+       vertex 40 12.6518 37.9464
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 12.6518 37.9464
+       vertex 40 13.8087 37.5409
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 16.0826 36.6245
+       vertex 40 17.1974 36.1144
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 14.9527 37.1001
+       vertex 40 16.0826 36.6245
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.9894 0.91941
+       vertex 40 39.9988 -0.306494
+       vertex 40 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.3804 7.01299
+       vertex 40 39.5768 5.80289
+       vertex 40 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.7361 4.58734
+       vertex 40 39.858 3.36748
+       vertex 40 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -20.4407 34.3828
+       vertex 40 -19.3775 34.993
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 18.296 35.5704
+       vertex 40 -2.7575 59.9366
+       vertex 40 17.1974 36.1144
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 19.3775 34.993
+       vertex 40 20.4407 34.3828
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.8768 9.4123
+       vertex 40 39.147 8.21651
+       vertex 40 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 20.4407 34.3828
+       vertex 40 21.4848 33.7402
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 37.434 14.096
+       vertex 40 37.8484 12.9422
+       vertex 40 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 22.5087 33.066
+       vertex 40 23.5114 32.3607
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 36.5001 16.3627
+       vertex 40 36.9844 15.2365
+       vertex 40 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 22.5087 33.066
+       vertex 40 -2.7575 59.9366
+       vertex 40 21.4848 33.7402
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 26.3834 30.0652
+       vertex 40 27.2924 29.2425
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 35.4292 18.568
+       vertex 40 35.9816 17.4736
+       vertex 40 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 24.4921 31.625
+       vertex 40 -2.7575 59.9366
+       vertex 40 23.5114 32.3607
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 25.4497 30.8596
+       vertex 40 -2.7575 59.9366
+       vertex 40 24.4921 31.625
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 26.3834 30.0652
+       vertex 40 -2.7575 59.9366
+       vertex 40 25.4497 30.8596
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 28.1757 28.3924
+       vertex 40 29.0325 27.5157
+       vertex 40 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 33.5746 21.7427
+       vertex 40 34.2252 20.7036
+       vertex 40 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 28.1757 28.3924
+       vertex 40 -2.7575 59.9366
+       vertex 40 27.2924 29.2425
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.956 -2.29816
+       vertex 40 -2.7575 59.9366
+       vertex 40 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.956 -2.29816
+       vertex 40 29.0325 27.5157
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 29.0325 27.5157
+       vertex 40 29.8621 26.613
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 31.4364 24.7337
+       vertex 40 32.1796 23.7587
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 32.1796 23.7587
+       vertex 40 32.8925 22.7614
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.8574 -4.13443
+       vertex 40 32.8925 22.7614
+       vertex 40 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 32.8925 22.7614
+       vertex 40 33.5746 21.7427
+       vertex 40 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.7026 -5.96681
+       vertex 40 34.8435 19.6451
+       vertex 40 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 34.8435 19.6451
+       vertex 40 35.4292 18.568
+       vertex 40 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.4917 -7.79359
+       vertex 40 35.9816 17.4736
+       vertex 40 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 35.9816 17.4736
+       vertex 40 36.5001 16.3627
+       vertex 40 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 59.2249 -9.61304
+       vertex 40 36.9844 15.2365
+       vertex 40 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 36.9844 15.2365
+       vertex 40 37.434 14.096
+       vertex 40 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.5701 10.5993
+       vertex 40 38.8768 9.4123
+       vertex 40 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 58.9025 -11.4235
+       vertex 40 38.2272 11.7763
+       vertex 40 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.2272 11.7763
+       vertex 40 38.5701 10.5993
+       vertex 40 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 58.5248 -13.2232
+       vertex 40 38.8768 9.4123
+       vertex 40 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 18.296 35.5704
+       vertex 40 19.3775 34.993
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 58.0921 -15.0104
+       vertex 40 39.147 8.21651
+       vertex 40 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.147 8.21651
+       vertex 40 39.3804 7.01299
+       vertex 40 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 57.6048 -16.7836
+       vertex 40 39.5768 5.80289
+       vertex 40 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.5768 5.80289
+       vertex 40 39.7361 4.58734
+       vertex 40 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 57.0634 -18.541
+       vertex 40 39.858 3.36748
+       vertex 40 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.858 3.36748
+       vertex 40 39.9425 2.14445
+       vertex 40 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 56.4684 -20.281
+       vertex 40 39.9894 0.91941
+       vertex 40 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 13.8087 37.5409
+       vertex 40 14.9527 37.1001
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 55.8204 -22.002
+       vertex 40 39.9988 -0.306494
+       vertex 40 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.9988 -0.306494
+       vertex 40 39.9706 -1.53211
+       vertex 40 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 55.1199 -23.7022
+       vertex 40 39.9049 -2.75629
+       vertex 40 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.9049 -2.75629
+       vertex 40 39.8017 -3.97787
+       vertex 40 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 54.3677 -25.3802
+       vertex 40 39.8017 -3.97787
+       vertex 40 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.8017 -3.97787
+       vertex 40 39.6611 -5.19572
+       vertex 40 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 53.5644 -27.0344
+       vertex 40 39.4833 -6.40869
+       vertex 40 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.4833 -6.40869
+       vertex 40 39.2683 -7.61564
+       vertex 40 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 52.7107 -28.6632
+       vertex 40 39.2683 -7.61564
+       vertex 40 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 39.2683 -7.61564
+       vertex 40 39.0165 -8.81544
+       vertex 40 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 51.8076 -30.265
+       vertex 40 38.728 -10.007
+       vertex 40 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.728 -10.007
+       vertex 40 38.4032 -11.1891
+       vertex 40 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 50.8558 -31.8385
+       vertex 40 38.4032 -11.1891
+       vertex 40 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.4032 -11.1891
+       vertex 40 38.0423 -12.3607
+       vertex 40 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 49.8562 -33.382
+       vertex 40 37.6456 -13.5207
+       vertex 40 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 37.2136 -14.668
+       vertex 40 36.7466 -15.8015
+       vertex 40 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 48.8098 -34.8941
+       vertex 40 37.2136 -14.668
+       vertex 40 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 9.11414 38.9478
+       vertex 40 10.3034 38.6502
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 47.7176 -36.3735
+       vertex 40 36.7466 -15.8015
+       vertex 40 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 36.7466 -15.8015
+       vertex 40 36.2451 -16.9202
+       vertex 40 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 46.5805 -37.8187
+       vertex 40 35.7096 -18.0229
+       vertex 40 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 45.3997 -39.2284
+       vertex 40 35.1405 -19.1088
+       vertex 40 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 35.1405 -19.1088
+       vertex 40 34.5384 -20.1767
+       vertex 40 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 44.1762 -40.6013
+       vertex 40 34.5384 -20.1767
+       vertex 40 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 34.5384 -20.1767
+       vertex 40 33.9039 -21.2256
+       vertex 40 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 42.9112 -41.936
+       vertex 40 33.2375 -22.2547
+       vertex 40 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 41.6059 -43.2313
+       vertex 40 32.5399 -23.2628
+       vertex 40 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 32.5399 -23.2628
+       vertex 40 31.8117 -24.249
+       vertex 40 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 40.2616 -44.486
+       vertex 40 31.8117 -24.249
+       vertex 40 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 31.8117 -24.249
+       vertex 40 31.0537 -25.2125
+       vertex 40 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 38.8794 -45.6989
+       vertex 40 30.2664 -26.1523
+       vertex 40 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 37.4607 -46.8689
+       vertex 40 29.4508 -27.0675
+       vertex 40 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 29.4508 -27.0675
+       vertex 40 28.6075 -27.9573
+       vertex 40 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 36.0068 -47.9949
+       vertex 40 28.6075 -27.9573
+       vertex 40 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 28.6075 -27.9573
+       vertex 40 27.7373 -28.8209
+       vertex 40 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 34.5191 -49.0758
+       vertex 40 26.8411 -29.6573
+       vertex 40 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 32.999 -50.1105
+       vertex 40 25.9196 -30.4659
+       vertex 40 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 24.9738 -31.2459
+       vertex 40 24.0046 -31.9966
+       vertex 40 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 31.4479 -51.0983
+       vertex 40 24.9738 -31.2459
+       vertex 40 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 4.28273 39.7701
+       vertex 40 5.49947 39.6201
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 29.8672 -52.038
+       vertex 40 24.0046 -31.9966
+       vertex 40 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 24.0046 -31.9966
+       vertex 40 23.0127 -32.7172
+       vertex 40 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 28.2585 -52.9288
+       vertex 40 21.9993 -33.407
+       vertex 40 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 25.9196 -30.4659
+       vertex 40 24.9738 -31.2459
+       vertex 40 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 26.6232 -53.7699
+       vertex 40 20.9652 -34.0655
+       vertex 40 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 24.9629 -54.5605
+       vertex 40 19.9115 -34.692
+       vertex 40 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 19.9115 -34.692
+       vertex 40 18.839 -35.2859
+       vertex 40 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 23.2792 -55.2999
+       vertex 40 17.7488 -35.8466
+       vertex 40 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 21.5736 -55.9873
+       vertex 40 16.6419 -36.3737
+       vertex 40 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 15.5195 -36.8666
+       vertex 40 14.3824 -37.3249
+       vertex 40 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 19.8477 -56.6221
+       vertex 40 15.5195 -36.8666
+       vertex 40 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 1.83833 39.9577
+       vertex 40 3.06197 39.8826
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 18.1032 -57.2038
+       vertex 40 14.3824 -37.3249
+       vertex 40 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 14.3824 -37.3249
+       vertex 40 13.2318 -37.7481
+       vertex 40 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 16.3417 -57.7317
+       vertex 40 12.0688 -38.1359
+       vertex 40 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 16.6419 -36.3737
+       vertex 40 15.5195 -36.8666
+       vertex 40 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 14.5649 -58.2054
+       vertex 40 10.8945 -38.4878
+       vertex 40 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 12.7743 -58.6244
+       vertex 40 9.70992 -38.8036
+       vertex 40 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -29.8621 26.613
+       vertex 40 -29.0325 27.5157
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 10.9718 -58.9883
+       vertex 40 8.51622 -39.0829
+       vertex 40 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 1 -0 -0
+    outer loop
+       vertex 40 0.61297 39.9953
+       vertex 40 1.83833 39.9577
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 8.51622 -39.0829
+       vertex 40 7.31453 -39.3255
+       vertex 40 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 9.15896 -59.2968
+       vertex 40 6.10597 -39.5312
+       vertex 40 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 7.33751 -59.5497
+       vertex 40 4.89167 -39.6998
+       vertex 40 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 5.50917 -59.7465
+       vertex 40 3.67278 -39.831
+       vertex 40 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 3.67566 -59.8873
+       vertex 40 2.45044 -39.9249
+       vertex 40 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 2.45044 -39.9249
+       vertex 40 1.22579 -39.9812
+       vertex 40 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 1.83869 -59.9718
+       vertex 40 0 -40
+       vertex 40 0 -60
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 0 -60
+       vertex 40 -1.22579 -39.9812
+       vertex 40 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -1.83869 -59.9718
+       vertex 40 -2.45044 -39.9249
+       vertex 40 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -3.67566 -59.8873
+       vertex 40 -3.67278 -39.831
+       vertex 40 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -3.67278 -39.831
+       vertex 40 -4.89167 -39.6998
+       vertex 40 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -5.50917 -59.7465
+       vertex 40 -6.10597 -39.5312
+       vertex 40 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -7.33751 -59.5497
+       vertex 40 -7.31453 -39.3255
+       vertex 40 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -9.15896 -59.2968
+       vertex 40 -8.51622 -39.0829
+       vertex 40 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -10.9718 -58.9883
+       vertex 40 -9.70992 -38.8036
+       vertex 40 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -9.70992 -38.8036
+       vertex 40 -10.8945 -38.4878
+       vertex 40 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -12.7743 -58.6244
+       vertex 40 -12.0688 -38.1359
+       vertex 40 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -14.5649 -58.2054
+       vertex 40 -13.2318 -37.7481
+       vertex 40 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -16.3417 -57.7317
+       vertex 40 -14.3824 -37.3249
+       vertex 40 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -18.1032 -57.2038
+       vertex 40 -15.5195 -36.8666
+       vertex 40 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -15.5195 -36.8666
+       vertex 40 -16.6419 -36.3737
+       vertex 40 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -19.8477 -56.6221
+       vertex 40 -17.7488 -35.8466
+       vertex 40 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -21.5736 -55.9873
+       vertex 40 -18.839 -35.2859
+       vertex 40 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -23.2792 -55.2999
+       vertex 40 -19.9115 -34.692
+       vertex 40 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -19.9115 -34.692
+       vertex 40 -20.9652 -34.0655
+       vertex 40 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -24.9629 -54.5605
+       vertex 40 -21.9993 -33.407
+       vertex 40 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -26.6232 -53.7699
+       vertex 40 -23.0127 -32.7172
+       vertex 40 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -28.2585 -52.9288
+       vertex 40 -24.0046 -31.9966
+       vertex 40 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -6.71104 39.433
+       vertex 40 -5.49947 39.6201
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -29.8672 -52.038
+       vertex 40 -24.9738 -31.2459
+       vertex 40 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -24.9738 -31.2459
+       vertex 40 -25.9196 -30.4659
+       vertex 40 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -31.4479 -51.0983
+       vertex 40 -26.8411 -29.6573
+       vertex 40 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -32.999 -50.1105
+       vertex 40 -27.7373 -28.8209
+       vertex 40 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -34.5191 -49.0758
+       vertex 40 -28.6075 -27.9573
+       vertex 40 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -28.6075 -27.9573
+       vertex 40 -29.4508 -27.0675
+       vertex 40 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -36.0068 -47.9949
+       vertex 40 -30.2664 -26.1523
+       vertex 40 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -37.4607 -46.8689
+       vertex 40 -31.0537 -25.2125
+       vertex 40 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -38.8794 -45.6989
+       vertex 40 -31.8117 -24.249
+       vertex 40 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -31.8117 -24.249
+       vertex 40 -32.5399 -23.2628
+       vertex 40 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -40.2616 -44.486
+       vertex 40 -33.2375 -22.2547
+       vertex 40 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -41.6059 -43.2313
+       vertex 40 -33.9039 -21.2256
+       vertex 40 -42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -42.9112 -41.936
+       vertex 40 -34.5384 -20.1767
+       vertex 40 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -34.5384 -20.1767
+       vertex 40 -35.1405 -19.1088
+       vertex 40 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -44.1762 -40.6013
+       vertex 40 -35.7096 -18.0229
+       vertex 40 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -45.3997 -39.2284
+       vertex 40 -36.2451 -16.9202
+       vertex 40 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -46.5805 -37.8187
+       vertex 40 -36.7466 -15.8015
+       vertex 40 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -36.7466 -15.8015
+       vertex 40 -37.2136 -14.668
+       vertex 40 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -47.7176 -36.3735
+       vertex 40 -37.6456 -13.5207
+       vertex 40 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -48.8098 -34.8941
+       vertex 40 -38.0423 -12.3607
+       vertex 40 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -38.0423 -12.3607
+       vertex 40 -38.4032 -11.1891
+       vertex 40 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -49.8562 -33.382
+       vertex 40 -38.728 -10.007
+       vertex 40 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -50.8558 -31.8385
+       vertex 40 -39.0165 -8.81544
+       vertex 40 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.0165 -8.81544
+       vertex 40 -39.2683 -7.61564
+       vertex 40 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -51.8076 -30.265
+       vertex 40 -39.4833 -6.40869
+       vertex 40 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -52.7107 -28.6632
+       vertex 40 -39.6611 -5.19572
+       vertex 40 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.6611 -5.19572
+       vertex 40 -39.8017 -3.97787
+       vertex 40 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -53.5644 -27.0344
+       vertex 40 -39.9049 -2.75629
+       vertex 40 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -54.3677 -25.3802
+       vertex 40 -39.9706 -1.53211
+       vertex 40 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -39.9706 -1.53211
+       vertex 40 -39.9988 -0.306494
+       vertex 40 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -55.1199 -23.7022
+       vertex 40 -39.9894 0.91941
+       vertex 40 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.9894 0.91941
+       vertex 40 -39.9425 2.14445
+       vertex 40 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -55.8204 -22.002
+       vertex 40 -39.858 3.36748
+       vertex 40 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.858 3.36748
+       vertex 40 -39.7361 4.58734
+       vertex 40 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -56.4684 -20.281
+       vertex 40 -39.5768 5.80289
+       vertex 40 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -19.3775 34.993
+       vertex 40 -18.296 35.5704
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -57.0634 -18.541
+       vertex 40 -39.3804 7.01299
+       vertex 40 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -21.4848 33.7402
+       vertex 40 -20.4407 34.3828
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.3804 7.01299
+       vertex 40 -39.147 8.21651
+       vertex 40 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -39.147 8.21651
+       vertex 40 -38.8768 9.4123
+       vertex 40 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -57.6048 -16.7836
+       vertex 40 -38.5701 10.5993
+       vertex 40 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -38.5701 10.5993
+       vertex 40 -38.2272 11.7763
+       vertex 40 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -58.0921 -15.0104
+       vertex 40 -37.8484 12.9422
+       vertex 40 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -37.8484 12.9422
+       vertex 40 -37.434 14.096
+       vertex 40 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -58.5248 -13.2232
+       vertex 40 -36.9844 15.2365
+       vertex 40 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -25.4497 30.8596
+       vertex 40 -24.4921 31.625
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -36.9844 15.2365
+       vertex 40 -36.5001 16.3627
+       vertex 40 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -36.5001 16.3627
+       vertex 40 -35.9816 17.4736
+       vertex 40 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -58.9025 -11.4235
+       vertex 40 -35.4292 18.568
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -29.0325 27.5157
+       vertex 40 -28.1757 28.3924
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -35.4292 18.568
+       vertex 40 -34.8435 19.6451
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -34.8435 19.6451
+       vertex 40 -34.2252 20.7036
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -34.2252 20.7036
+       vertex 40 -33.5746 21.7427
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -33.5746 21.7427
+       vertex 40 -32.8925 22.7614
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -59.2249 -9.61304
+       vertex 40 -32.1796 23.7587
+       vertex 40 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -32.1796 23.7587
+       vertex 40 -31.4364 24.7337
+       vertex 40 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -31.4364 24.7337
+       vertex 40 -30.6637 25.6854
+       vertex 40 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -26.3834 30.0652
+       vertex 40 -25.4497 30.8596
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -28.1757 28.3924
+       vertex 40 -27.2924 29.2425
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -27.2924 29.2425
+       vertex 40 -26.3834 30.0652
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -24.4921 31.625
+       vertex 40 -23.5114 32.3607
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -23.5114 32.3607
+       vertex 40 -22.5087 33.066
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -22.5087 33.066
+       vertex 40 -21.4848 33.7402
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -17.1974 36.1144
+       vertex 40 -16.0826 36.6245
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -18.296 35.5704
+       vertex 40 -17.1974 36.1144
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -16.0826 36.6245
+       vertex 40 -14.9527 37.1001
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -14.9527 37.1001
+       vertex 40 -13.8087 37.5409
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -13.8087 37.5409
+       vertex 40 -12.6518 37.9464
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -11.483 38.3163
+       vertex 40 -10.3034 38.6502
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -10.3034 38.6502
+       vertex 40 -9.11414 38.9478
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -9.11414 38.9478
+       vertex 40 -7.91631 39.2088
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -5.49947 39.6201
+       vertex 40 -4.28273 39.7701
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -4.28273 39.7701
+       vertex 40 -3.06197 39.8826
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 -3.06197 39.8826
+       vertex 40 -1.83833 39.9577
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -1.83833 39.9577
+       vertex 40 -0.61297 39.9953
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 10.8945 -38.4878
+       vertex 40 9.70992 -38.8036
+       vertex 40 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 9.70992 -38.8036
+       vertex 40 8.51622 -39.0829
+       vertex 40 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 40 7.31453 -39.3255
+       vertex 40 6.10597 -39.5312
+       vertex 40 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 40 -0.61297 39.9953
+       vertex 40 0.61297 39.9953
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+endsolid
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/walls.stl b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/walls.stl
new file mode 100644
index 0000000000..a8ebceddaa
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/triSurface/walls.stl
@@ -0,0 +1,21016 @@
+solid
+  facet normal -0.443561 0.127549 0.887122
+    outer loop
+       vertex -34 50 5
+       vertex -30 50 7
+       vertex -34 51.4087 4.79746
+    endloop
+  endfacet
+  facet normal -0.443561 -0.127551 0.887122
+    outer loop
+       vertex -30 48.0279 6.71645
+       vertex -30 50 7
+       vertex -34 50 5
+    endloop
+  endfacet
+  facet normal -0.44356 -0.127549 0.887122
+    outer loop
+       vertex -34 50 5
+       vertex -34 48.5913 4.79746
+       vertex -30 48.0279 6.71645
+    endloop
+  endfacet
+  facet normal -0.443556 0.37232 0.815252
+    outer loop
+       vertex -34 51.4087 4.79746
+       vertex -30 51.9721 6.71645
+       vertex -34 52.7032 4.20627
+    endloop
+  endfacet
+  facet normal -0.44356 0.127551 0.887122
+    outer loop
+       vertex -30 50 7
+       vertex -30 51.9721 6.71645
+       vertex -34 51.4087 4.79746
+    endloop
+  endfacet
+  facet normal -0.443557 -0.372308 0.815257
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 48.0279 6.71645
+       vertex -34 48.5913 4.79746
+    endloop
+  endfacet
+  facet normal -0.443561 -0.372319 0.81525
+    outer loop
+       vertex -34 48.5913 4.79746
+       vertex -34 47.2968 4.20627
+       vertex -30 46.2155 5.88877
+    endloop
+  endfacet
+  facet normal -0.443561 -0.586929 0.677324
+    outer loop
+       vertex -30 44.7098 4.58402
+       vertex -30 46.2155 5.88877
+       vertex -34 47.2968 4.20627
+    endloop
+  endfacet
+  facet normal -0.443562 -0.586931 0.677322
+    outer loop
+       vertex -34 47.2968 4.20627
+       vertex -34 46.2213 3.2743
+       vertex -30 44.7098 4.58402
+    endloop
+  endfacet
+  facet normal -0.443561 -0.753962 0.484556
+    outer loop
+       vertex -30 43.6326 2.90791
+       vertex -30 44.7098 4.58402
+       vertex -34 46.2213 3.2743
+    endloop
+  endfacet
+  facet normal -0.44355 -0.753949 0.484587
+    outer loop
+       vertex -34 46.2213 3.2743
+       vertex -34 45.4518 2.07707
+       vertex -30 43.6326 2.90791
+    endloop
+  endfacet
+  facet normal -0.443552 -0.859936 0.252531
+    outer loop
+       vertex -30 43.0712 0.996204
+       vertex -30 43.6326 2.90791
+       vertex -34 45.4518 2.07707
+    endloop
+  endfacet
+  facet normal -0.443572 -0.859942 0.252474
+    outer loop
+       vertex -34 45.4518 2.07707
+       vertex -34 45.0509 0.711574
+       vertex -30 43.0712 0.996204
+    endloop
+  endfacet
+  facet normal -0.443571 -0.896239 0
+    outer loop
+       vertex -34 45.0509 -0.711574
+       vertex -30 43.0712 -0.996204
+       vertex -30 43.0712 0.996204
+    endloop
+  endfacet
+  facet normal -0.443571 -0.896239 -0
+    outer loop
+       vertex -34 45.0509 0.711574
+       vertex -34 45.0509 -0.711574
+       vertex -30 43.0712 0.996204
+    endloop
+  endfacet
+  facet normal -0.443569 -0.859927 -0.25253
+    outer loop
+       vertex -30 43.6326 -2.9079
+       vertex -30 43.0712 -0.996204
+       vertex -34 45.0509 -0.711574
+    endloop
+  endfacet
+  facet normal -0.443549 -0.859953 -0.252477
+    outer loop
+       vertex -34 45.0509 -0.711574
+       vertex -34 45.4518 -2.07707
+       vertex -30 43.6326 -2.9079
+    endloop
+  endfacet
+  facet normal -0.443551 -0.753968 -0.484557
+    outer loop
+       vertex -30 44.7098 -4.58402
+       vertex -30 43.6326 -2.9079
+       vertex -34 45.4518 -2.07707
+    endloop
+  endfacet
+  facet normal -0.443563 -0.753944 -0.484583
+    outer loop
+       vertex -34 45.4518 -2.07707
+       vertex -34 46.2213 -3.2743
+       vertex -30 44.7098 -4.58402
+    endloop
+  endfacet
+  facet normal -0.443562 -0.586929 -0.677324
+    outer loop
+       vertex -30 46.2155 -5.88877
+       vertex -30 44.7098 -4.58402
+       vertex -34 46.2213 -3.2743
+    endloop
+  endfacet
+  facet normal -0.443561 -0.586931 -0.677323
+    outer loop
+       vertex -34 47.2968 -4.20627
+       vertex -30 46.2155 -5.88877
+       vertex -34 46.2213 -3.2743
+    endloop
+  endfacet
+  facet normal -0.443561 -0.372308 -0.815255
+    outer loop
+       vertex -30 48.0279 -6.71645
+       vertex -30 46.2155 -5.88877
+       vertex -34 47.2968 -4.20627
+    endloop
+  endfacet
+  facet normal -0.443556 -0.37232 -0.815252
+    outer loop
+       vertex -34 48.5913 -4.79746
+       vertex -30 48.0279 -6.71645
+       vertex -34 47.2968 -4.20627
+    endloop
+  endfacet
+  facet normal -0.44356 -0.127551 -0.887122
+    outer loop
+       vertex -30 50 -7
+       vertex -30 48.0279 -6.71645
+       vertex -34 48.5913 -4.79746
+    endloop
+  endfacet
+  facet normal -0.443561 -0.127549 -0.887122
+    outer loop
+       vertex -34 50 -5
+       vertex -30 50 -7
+       vertex -34 48.5913 -4.79746
+    endloop
+  endfacet
+  facet normal -0.443561 0.127551 -0.887122
+    outer loop
+       vertex -30 51.9721 -6.71645
+       vertex -30 50 -7
+       vertex -34 50 -5
+    endloop
+  endfacet
+  facet normal -0.44356 0.127549 -0.887122
+    outer loop
+       vertex -30 51.9721 -6.71645
+       vertex -34 50 -5
+       vertex -34 51.4087 -4.79746
+    endloop
+  endfacet
+  facet normal -0.443557 0.372308 -0.815257
+    outer loop
+       vertex -30 53.7845 -5.88877
+       vertex -30 51.9721 -6.71645
+       vertex -34 51.4087 -4.79746
+    endloop
+  endfacet
+  facet normal -0.443561 0.372319 -0.81525
+    outer loop
+       vertex -30 53.7845 -5.88877
+       vertex -34 51.4087 -4.79746
+       vertex -34 52.7032 -4.20627
+    endloop
+  endfacet
+  facet normal -0.443561 0.586929 -0.677324
+    outer loop
+       vertex -30 55.2902 -4.58402
+       vertex -30 53.7845 -5.88877
+       vertex -34 52.7032 -4.20627
+    endloop
+  endfacet
+  facet normal -0.443562 0.586931 -0.677322
+    outer loop
+       vertex -30 55.2902 -4.58402
+       vertex -34 52.7032 -4.20627
+       vertex -34 53.7787 -3.2743
+    endloop
+  endfacet
+  facet normal -0.443561 0.753963 -0.484554
+    outer loop
+       vertex -30 56.3674 -2.9079
+       vertex -30 55.2902 -4.58402
+       vertex -34 53.7787 -3.2743
+    endloop
+  endfacet
+  facet normal -0.443549 0.75395 -0.484587
+    outer loop
+       vertex -30 56.3674 -2.9079
+       vertex -34 53.7787 -3.2743
+       vertex -34 54.5482 -2.07707
+    endloop
+  endfacet
+  facet normal -0.44355 0.859949 -0.252492
+    outer loop
+       vertex -30 56.9287 -0.996204
+       vertex -30 56.3674 -2.9079
+       vertex -34 54.5482 -2.07707
+    endloop
+  endfacet
+  facet normal -0.443555 0.85995 -0.252477
+    outer loop
+       vertex -30 56.9287 -0.996204
+       vertex -34 54.5482 -2.07707
+       vertex -34 54.9491 -0.711574
+    endloop
+  endfacet
+  facet normal -0.443553 0.896248 0
+    outer loop
+       vertex -30 56.9287 -0.996204
+       vertex -34 54.9491 -0.711574
+       vertex -30 56.9287 0.996204
+    endloop
+  endfacet
+  facet normal -0.443553 0.896248 0
+    outer loop
+       vertex -30 56.9287 0.996204
+       vertex -34 54.9491 -0.711574
+       vertex -34 54.9491 0.711574
+    endloop
+  endfacet
+  facet normal -0.443554 0.859947 0.25249
+    outer loop
+       vertex -30 56.3674 2.90791
+       vertex -30 56.9287 0.996204
+       vertex -34 54.9491 0.711574
+    endloop
+  endfacet
+  facet normal -0.443549 0.859953 0.252477
+    outer loop
+       vertex -30 56.3674 2.90791
+       vertex -34 54.9491 0.711574
+       vertex -34 54.5482 2.07707
+    endloop
+  endfacet
+  facet normal -0.443552 0.753966 0.484559
+    outer loop
+       vertex -30 55.2902 4.58402
+       vertex -30 56.3674 2.90791
+       vertex -34 54.5482 2.07707
+    endloop
+  endfacet
+  facet normal -0.443563 0.753944 0.484583
+    outer loop
+       vertex -30 55.2902 4.58402
+       vertex -34 54.5482 2.07707
+       vertex -34 53.7787 3.2743
+    endloop
+  endfacet
+  facet normal -0.443562 0.586929 0.677324
+    outer loop
+       vertex -30 53.7845 5.88877
+       vertex -30 55.2902 4.58402
+       vertex -34 53.7787 3.2743
+    endloop
+  endfacet
+  facet normal -0.443561 0.586931 0.677323
+    outer loop
+       vertex -34 52.7032 4.20627
+       vertex -30 53.7845 5.88877
+       vertex -34 53.7787 3.2743
+    endloop
+  endfacet
+  facet normal -0.443561 0.372308 0.815255
+    outer loop
+       vertex -30 51.9721 6.71645
+       vertex -30 53.7845 5.88877
+       vertex -34 52.7032 4.20627
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+       vertex -30 2.7575 59.9366
+       vertex -30 4.59295 59.8239
+       vertex -30 0.919455 59.993
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 4.59295 59.8239
+       vertex -30 6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 6.4241 59.6551
+       vertex -30 8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 8.2492 59.4302
+       vertex -30 10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 10.0666 59.1495
+       vertex -30 11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 11.8745 58.8132
+       vertex -30 13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 13.6712 58.4217
+       vertex -30 15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 15.4551 57.9753
+       vertex -30 17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 17.2245 57.4745
+       vertex -30 18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 18.9777 56.9196
+       vertex -30 20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 20.7131 56.3113
+       vertex -30 22.429 55.6501
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 22.429 55.6501
+       vertex -30 24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 24.1239 54.9367
+       vertex -30 25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 25.7961 54.1716
+       vertex -30 27.444 53.3556
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 27.444 53.3556
+       vertex -30 29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 29.0662 52.4896
+       vertex -30 30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 30.6611 51.5742
+       vertex -30 32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 32.2272 50.6103
+       vertex -30 33.763 49.599
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 33.763 49.599
+       vertex -30 35.2671 48.541
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 35.2671 48.541
+       vertex -30 36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 36.7381 47.4375
+       vertex -30 38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 38.1745 46.2894
+       vertex -30 39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 39.5751 45.0978
+       vertex -30 40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 40.9386 43.8638
+       vertex -30 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 42.2636 42.5886
+       vertex -30 43.5488 41.2735
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 43.5488 41.2735
+       vertex -30 44.7932 39.9195
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 44.7932 39.9195
+       vertex -30 45.9955 38.5281
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 45.9955 38.5281
+       vertex -30 47.1546 37.1005
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 47.1546 37.1005
+       vertex -30 48.2694 35.638
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 48.2694 35.638
+       vertex -30 49.3388 34.1421
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 49.3388 34.1421
+       vertex -30 50.3619 32.6141
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 50.3619 32.6141
+       vertex -30 51.3377 31.0554
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 51.3377 31.0554
+       vertex -30 52.2653 29.4676
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 52.2653 29.4676
+       vertex -30 53.1438 27.8521
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 53.1438 27.8521
+       vertex -30 53.9724 26.2104
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 53.9724 26.2104
+       vertex -30 54.7502 24.5441
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 54.7502 24.5441
+       vertex -30 55.4767 22.8548
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 55.4767 22.8548
+       vertex -30 56.151 21.144
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 56.151 21.144
+       vertex -30 56.7726 19.4133
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 56.7726 19.4133
+       vertex -30 57.3408 17.6644
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 57.3408 17.6644
+       vertex -30 57.8552 15.8989
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 57.8552 15.8989
+       vertex -30 58.3153 14.1185
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 58.3153 14.1185
+       vertex -30 58.7205 12.3248
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 58.7205 12.3248
+       vertex -30 59.0706 10.5195
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 59.0706 10.5195
+       vertex -30 59.3653 8.70433
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 59.3653 8.70433
+       vertex -30 59.6041 6.88101
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 59.6041 6.88101
+       vertex -30 59.787 5.05121
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 59.787 5.05121
+       vertex -30 59.9137 3.21667
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 59.9137 3.21667
+       vertex -30 59.9841 1.37911
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 55.2902 4.58402
+       vertex -30 59.9841 1.37911
+       vertex -30 59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 56.9287 0.996204
+       vertex -30 59.9982 -0.459741
+       vertex -30 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 56.9287 -0.996204
+       vertex -30 59.8574 -4.13443
+       vertex -30 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 56.3674 -2.9079
+       vertex -30 59.7026 -5.96681
+       vertex -30 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 55.2902 -4.58402
+       vertex -30 59.4917 -7.79359
+       vertex -30 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 53.7845 -5.88877
+       vertex -30 58.5248 -13.2232
+       vertex -30 51.9721 -6.71645
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 53.7845 -5.88877
+       vertex -30 58.9025 -11.4235
+       vertex -30 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 51.9721 -6.71645
+       vertex -30 58.5248 -13.2232
+       vertex -30 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50 -7
+       vertex -30 57.6048 -16.7836
+       vertex -30 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 48.0279 -6.71645
+       vertex -30 57.0634 -18.541
+       vertex -30 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 44.7098 -4.58402
+       vertex -30 56.4684 -20.281
+       vertex -30 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.9988 -0.306494
+       vertex -30 55.8204 -22.002
+       vertex -30 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.9706 -1.53211
+       vertex -30 55.1199 -23.7022
+       vertex -30 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.8017 -3.97787
+       vertex -30 54.3677 -25.3802
+       vertex -30 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.6611 -5.19572
+       vertex -30 53.5644 -27.0344
+       vertex -30 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.2683 -7.61564
+       vertex -30 52.7107 -28.6632
+       vertex -30 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.0165 -8.81544
+       vertex -30 51.8076 -30.265
+       vertex -30 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 38.4032 -11.1891
+       vertex -30 50.8558 -31.8385
+       vertex -30 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 38.0423 -12.3607
+       vertex -30 49.8562 -33.382
+       vertex -30 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 37.2136 -14.668
+       vertex -30 48.8098 -34.8941
+       vertex -30 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 36.7466 -15.8015
+       vertex -30 47.7176 -36.3735
+       vertex -30 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 36.2451 -16.9202
+       vertex -30 46.5805 -37.8187
+       vertex -30 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 35.1405 -19.1088
+       vertex -30 45.3997 -39.2284
+       vertex -30 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 34.5384 -20.1767
+       vertex -30 44.1762 -40.6013
+       vertex -30 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 33.9039 -21.2256
+       vertex -30 42.9112 -41.936
+       vertex -30 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 32.5399 -23.2628
+       vertex -30 41.6059 -43.2313
+       vertex -30 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 31.8117 -24.249
+       vertex -30 40.2616 -44.486
+       vertex -30 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 31.0537 -25.2125
+       vertex -30 38.8794 -45.6989
+       vertex -30 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 29.4508 -27.0675
+       vertex -30 37.4607 -46.8689
+       vertex -30 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 28.6075 -27.9573
+       vertex -30 36.0068 -47.9949
+       vertex -30 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 27.7373 -28.8209
+       vertex -30 34.5191 -49.0758
+       vertex -30 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 25.9196 -30.4659
+       vertex -30 32.999 -50.1105
+       vertex -30 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 24.9738 -31.2459
+       vertex -30 31.4479 -51.0983
+       vertex -30 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 24.0046 -31.9966
+       vertex -30 29.8672 -52.038
+       vertex -30 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 23.0127 -32.7172
+       vertex -30 28.2585 -52.9288
+       vertex -30 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 20.9652 -34.0655
+       vertex -30 26.6232 -53.7699
+       vertex -30 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 19.9115 -34.692
+       vertex -30 24.9629 -54.5605
+       vertex -30 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 18.839 -35.2859
+       vertex -30 23.2792 -55.2999
+       vertex -30 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 16.6419 -36.3737
+       vertex -30 21.5736 -55.9873
+       vertex -30 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 15.5195 -36.8666
+       vertex -30 19.8477 -56.6221
+       vertex -30 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 14.3824 -37.3249
+       vertex -30 18.1032 -57.2038
+       vertex -30 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 13.2318 -37.7481
+       vertex -30 16.3417 -57.7317
+       vertex -30 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 10.8945 -38.4878
+       vertex -30 14.5649 -58.2054
+       vertex -30 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 9.70992 -38.8036
+       vertex -30 12.7743 -58.6244
+       vertex -30 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 8.51622 -39.0829
+       vertex -30 10.9718 -58.9883
+       vertex -30 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 7.31453 -39.3255
+       vertex -30 9.15896 -59.2968
+       vertex -30 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 4.89167 -39.6998
+       vertex -30 7.33751 -59.5497
+       vertex -30 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 3.67278 -39.831
+       vertex -30 5.50917 -59.7465
+       vertex -30 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 2.45044 -39.9249
+       vertex -30 3.67566 -59.8873
+       vertex -30 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 1.22579 -39.9812
+       vertex -30 1.83869 -59.9718
+       vertex -30 0 -60
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 -1.22579 -39.9812
+       vertex -30 0 -60
+       vertex -30 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 -2.45044 -39.9249
+       vertex -30 -1.83869 -59.9718
+       vertex -30 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -3.67278 -39.831
+       vertex -30 -3.67566 -59.8873
+       vertex -30 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -4.89167 -39.6998
+       vertex -30 -5.50917 -59.7465
+       vertex -30 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -7.31453 -39.3255
+       vertex -30 -7.33751 -59.5497
+       vertex -30 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -8.51622 -39.0829
+       vertex -30 -9.15896 -59.2968
+       vertex -30 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -9.70992 -38.8036
+       vertex -30 -10.9718 -58.9883
+       vertex -30 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -10.8945 -38.4878
+       vertex -30 -12.7743 -58.6244
+       vertex -30 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -13.2318 -37.7481
+       vertex -30 -14.5649 -58.2054
+       vertex -30 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -14.3824 -37.3249
+       vertex -30 -16.3417 -57.7317
+       vertex -30 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -15.5195 -36.8666
+       vertex -30 -18.1032 -57.2038
+       vertex -30 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -16.6419 -36.3737
+       vertex -30 -19.8477 -56.6221
+       vertex -30 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -18.839 -35.2859
+       vertex -30 -21.5736 -55.9873
+       vertex -30 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -19.9115 -34.692
+       vertex -30 -23.2792 -55.2999
+       vertex -30 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -20.9652 -34.0655
+       vertex -30 -24.9629 -54.5605
+       vertex -30 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -23.0127 -32.7172
+       vertex -30 -26.6232 -53.7699
+       vertex -30 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -24.0046 -31.9966
+       vertex -30 -28.2585 -52.9288
+       vertex -30 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -24.9738 -31.2459
+       vertex -30 -29.8672 -52.038
+       vertex -30 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -25.9196 -30.4659
+       vertex -30 -31.4479 -51.0983
+       vertex -30 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -27.7373 -28.8209
+       vertex -30 -32.999 -50.1105
+       vertex -30 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -28.6075 -27.9573
+       vertex -30 -34.5191 -49.0758
+       vertex -30 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -29.4508 -27.0675
+       vertex -30 -36.0068 -47.9949
+       vertex -30 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -31.0537 -25.2125
+       vertex -30 -37.4607 -46.8689
+       vertex -30 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -31.8117 -24.249
+       vertex -30 -38.8794 -45.6989
+       vertex -30 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -32.5399 -23.2628
+       vertex -30 -40.2616 -44.486
+       vertex -30 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -33.9039 -21.2256
+       vertex -30 -41.6059 -43.2313
+       vertex -30 -42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -34.5384 -20.1767
+       vertex -30 -42.9112 -41.936
+       vertex -30 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -35.1405 -19.1088
+       vertex -30 -44.1762 -40.6013
+       vertex -30 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -36.2451 -16.9202
+       vertex -30 -45.3997 -39.2284
+       vertex -30 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -36.7466 -15.8015
+       vertex -30 -46.5805 -37.8187
+       vertex -30 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -37.2136 -14.668
+       vertex -30 -47.7176 -36.3735
+       vertex -30 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -38.0423 -12.3607
+       vertex -30 -48.8098 -34.8941
+       vertex -30 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -38.4032 -11.1891
+       vertex -30 -49.8562 -33.382
+       vertex -30 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.0165 -8.81544
+       vertex -30 -50.8558 -31.8385
+       vertex -30 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.2683 -7.61564
+       vertex -30 -51.8076 -30.265
+       vertex -30 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.6611 -5.19572
+       vertex -30 -52.7107 -28.6632
+       vertex -30 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.8017 -3.97787
+       vertex -30 -53.5644 -27.0344
+       vertex -30 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.9706 -1.53211
+       vertex -30 -54.3677 -25.3802
+       vertex -30 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.9988 -0.306494
+       vertex -30 -55.1199 -23.7022
+       vertex -30 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.9425 2.14445
+       vertex -30 -55.8204 -22.002
+       vertex -30 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.7361 4.58734
+       vertex -30 -56.4684 -20.281
+       vertex -30 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.3804 7.01299
+       vertex -30 -57.0634 -18.541
+       vertex -30 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -39.147 8.21651
+       vertex -30 -57.6048 -16.7836
+       vertex -30 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -38.5701 10.5993
+       vertex -30 -58.0921 -15.0104
+       vertex -30 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -37.434 14.096
+       vertex -30 -58.5248 -13.2232
+       vertex -30 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -36.5001 16.3627
+       vertex -30 -58.9025 -11.4235
+       vertex -30 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -35.4292 18.568
+       vertex -30 -59.2249 -9.61304
+       vertex -30 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -33.5746 21.7427
+       vertex -30 -59.4917 -7.79359
+       vertex -30 -59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -29.8621 26.613
+       vertex -30 -59.7026 -5.96681
+       vertex -30 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.8574 -4.13443
+       vertex -30 -59.956 -2.29816
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.956 -2.29816
+       vertex -30 -59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.9982 -0.459741
+       vertex -30 -59.9841 1.37911
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.9841 1.37911
+       vertex -30 -59.9137 3.21667
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.9137 3.21667
+       vertex -30 -59.787 5.05121
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.787 5.05121
+       vertex -30 -59.6041 6.88101
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.6041 6.88101
+       vertex -30 -59.3653 8.70433
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.3653 8.70433
+       vertex -30 -59.0706 10.5195
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -59.0706 10.5195
+       vertex -30 -58.7205 12.3248
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -58.7205 12.3248
+       vertex -30 -58.3153 14.1185
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -58.3153 14.1185
+       vertex -30 -57.8552 15.8989
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -57.8552 15.8989
+       vertex -30 -57.3408 17.6644
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -57.3408 17.6644
+       vertex -30 -56.7726 19.4133
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -56.7726 19.4133
+       vertex -30 -56.151 21.144
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -56.151 21.144
+       vertex -30 -55.4767 22.8548
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -55.4767 22.8548
+       vertex -30 -54.7502 24.5441
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -54.7502 24.5441
+       vertex -30 -53.9724 26.2104
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -53.9724 26.2104
+       vertex -30 -53.1438 27.8521
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -53.1438 27.8521
+       vertex -30 -52.2653 29.4676
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -52.2653 29.4676
+       vertex -30 -51.3377 31.0554
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -51.3377 31.0554
+       vertex -30 -50.3619 32.6141
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -50.3619 32.6141
+       vertex -30 -49.3388 34.1421
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -49.3388 34.1421
+       vertex -30 -48.2694 35.638
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -48.2694 35.638
+       vertex -30 -47.1546 37.1005
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -47.1546 37.1005
+       vertex -30 -45.9955 38.5281
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -45.9955 38.5281
+       vertex -30 -44.7932 39.9195
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -44.7932 39.9195
+       vertex -30 -43.5488 41.2735
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -43.5488 41.2735
+       vertex -30 -42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -42.2636 42.5886
+       vertex -30 -40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -40.9386 43.8638
+       vertex -30 -39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -39.5751 45.0978
+       vertex -30 -38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -38.1745 46.2894
+       vertex -30 -36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -36.7381 47.4375
+       vertex -30 -35.2671 48.541
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -35.2671 48.541
+       vertex -30 -33.763 49.599
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -33.763 49.599
+       vertex -30 -32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -32.2272 50.6103
+       vertex -30 -30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -30.6611 51.5742
+       vertex -30 -29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -29.0662 52.4896
+       vertex -30 -27.444 53.3556
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -27.444 53.3556
+       vertex -30 -25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -25.7961 54.1716
+       vertex -30 -24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -24.1239 54.9367
+       vertex -30 -22.429 55.6501
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -22.429 55.6501
+       vertex -30 -20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -20.7131 56.3113
+       vertex -30 -18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -18.9777 56.9196
+       vertex -30 -17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -17.2245 57.4745
+       vertex -30 -15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -15.4551 57.9753
+       vertex -30 -13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -13.6712 58.4217
+       vertex -30 -11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -11.8745 58.8132
+       vertex -30 -10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -10.0666 59.1495
+       vertex -30 -8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -8.2492 59.4302
+       vertex -30 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -6.4241 59.6551
+       vertex -30 -4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -4.59295 59.8239
+       vertex -30 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -2.7575 59.9366
+       vertex -30 -0.919455 59.993
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -1.83833 39.9577
+       vertex -30 0.919455 59.993
+       vertex -30 -0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -3.06197 39.8826
+       vertex -30 0.919455 59.993
+       vertex -30 -1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -4.28273 39.7701
+       vertex -30 0.919455 59.993
+       vertex -30 -3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -5.49947 39.6201
+       vertex -30 0.919455 59.993
+       vertex -30 -4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -6.71104 39.433
+       vertex -30 0.919455 59.993
+       vertex -30 -5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -7.91631 39.2088
+       vertex -30 0.919455 59.993
+       vertex -30 -6.71104 39.433
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -9.11414 38.9478
+       vertex -30 0.919455 59.993
+       vertex -30 -7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -10.3034 38.6502
+       vertex -30 0.919455 59.993
+       vertex -30 -9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -11.483 38.3163
+       vertex -30 0.919455 59.993
+       vertex -30 -10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -12.6518 37.9464
+       vertex -30 0.919455 59.993
+       vertex -30 -11.483 38.3163
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -13.8087 37.5409
+       vertex -30 0.919455 59.993
+       vertex -30 -12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -14.9527 37.1001
+       vertex -30 0.919455 59.993
+       vertex -30 -13.8087 37.5409
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -16.0826 36.6244
+       vertex -30 0.919455 59.993
+       vertex -30 -14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -17.1974 36.1144
+       vertex -30 0.919455 59.993
+       vertex -30 -16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -18.296 35.5704
+       vertex -30 0.919455 59.993
+       vertex -30 -17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -20.4407 34.3828
+       vertex -30 0.919455 59.993
+       vertex -30 -19.3775 34.993
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -18.296 35.5704
+       vertex -30 -19.3775 34.993
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -21.4848 33.7402
+       vertex -30 0.919455 59.993
+       vertex -30 -20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -22.5087 33.066
+       vertex -30 0.919455 59.993
+       vertex -30 -21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -24.4921 31.625
+       vertex -30 0.919455 59.993
+       vertex -30 -23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -22.5087 33.066
+       vertex -30 -23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -28.1757 28.3924
+       vertex -30 0.919455 59.993
+       vertex -30 -27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -24.4921 31.625
+       vertex -30 -25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -25.4497 30.8596
+       vertex -30 -26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -26.3834 30.0652
+       vertex -30 -27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -29.8621 26.613
+       vertex -30 -59.8574 -4.13443
+       vertex -30 -29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -28.1757 28.3924
+       vertex -30 -29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 -29.0325 27.5156
+       vertex -30 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -30.6637 25.6854
+       vertex -30 -59.7026 -5.96681
+       vertex -30 -29.8621 26.613
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -31.4364 24.7337
+       vertex -30 -59.7026 -5.96681
+       vertex -30 -30.6637 25.6854
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -32.1796 23.7587
+       vertex -30 -59.7026 -5.96681
+       vertex -30 -31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -32.8925 22.7614
+       vertex -30 -59.7026 -5.96681
+       vertex -30 -32.1796 23.7587
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -33.5746 21.7427
+       vertex -30 -59.7026 -5.96681
+       vertex -30 -32.8925 22.7614
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -34.2252 20.7036
+       vertex -30 -59.4917 -7.79359
+       vertex -30 -33.5746 21.7427
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -34.8435 19.645
+       vertex -30 -59.4917 -7.79359
+       vertex -30 -34.2252 20.7036
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -35.4292 18.568
+       vertex -30 -59.4917 -7.79359
+       vertex -30 -34.8435 19.645
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -35.9816 17.4736
+       vertex -30 -59.2249 -9.61304
+       vertex -30 -35.4292 18.568
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -36.5001 16.3627
+       vertex -30 -59.2249 -9.61304
+       vertex -30 -35.9816 17.4736
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -36.9844 15.2365
+       vertex -30 -58.9025 -11.4235
+       vertex -30 -36.5001 16.3627
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -37.434 14.096
+       vertex -30 -58.9025 -11.4235
+       vertex -30 -36.9844 15.2365
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -37.8484 12.9422
+       vertex -30 -58.5248 -13.2232
+       vertex -30 -37.434 14.096
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -38.2272 11.7763
+       vertex -30 -58.5248 -13.2232
+       vertex -30 -37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -38.5701 10.5993
+       vertex -30 -58.5248 -13.2232
+       vertex -30 -38.2272 11.7763
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -38.8768 9.4123
+       vertex -30 -58.0921 -15.0104
+       vertex -30 -38.5701 10.5993
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.147 8.21651
+       vertex -30 -58.0921 -15.0104
+       vertex -30 -38.8768 9.4123
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.5768 5.80289
+       vertex -30 -57.0634 -18.541
+       vertex -30 -39.3804 7.01299
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.7361 4.58734
+       vertex -30 -57.0634 -18.541
+       vertex -30 -39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.858 3.36747
+       vertex -30 -56.4684 -20.281
+       vertex -30 -39.7361 4.58734
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.9425 2.14445
+       vertex -30 -56.4684 -20.281
+       vertex -30 -39.858 3.36747
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.9894 0.91941
+       vertex -30 -55.8204 -22.002
+       vertex -30 -39.9425 2.14445
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.9988 -0.306494
+       vertex -30 -55.8204 -22.002
+       vertex -30 -39.9894 0.91941
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.3804 7.01299
+       vertex -30 -57.6048 -16.7836
+       vertex -30 -39.147 8.21651
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.9049 -2.75629
+       vertex -30 -54.3677 -25.3802
+       vertex -30 -39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.8017 -3.97787
+       vertex -30 -54.3677 -25.3802
+       vertex -30 -39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.9706 -1.53211
+       vertex -30 -55.1199 -23.7022
+       vertex -30 -39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.4833 -6.40869
+       vertex -30 -52.7107 -28.6632
+       vertex -30 -39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.2683 -7.61564
+       vertex -30 -52.7107 -28.6632
+       vertex -30 -39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.6611 -5.19572
+       vertex -30 -53.5644 -27.0344
+       vertex -30 -39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -38.728 -10.007
+       vertex -30 -50.8558 -31.8385
+       vertex -30 -39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -38.4032 -11.1891
+       vertex -30 -50.8558 -31.8385
+       vertex -30 -38.728 -10.007
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -39.0165 -8.81544
+       vertex -30 -51.8076 -30.265
+       vertex -30 -39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -37.6456 -13.5207
+       vertex -30 -48.8098 -34.8941
+       vertex -30 -38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -37.2136 -14.668
+       vertex -30 -48.8098 -34.8941
+       vertex -30 -37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -38.0423 -12.3607
+       vertex -30 -49.8562 -33.382
+       vertex -30 -38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -35.7096 -18.0229
+       vertex -30 -45.3997 -39.2284
+       vertex -30 -36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -35.1405 -19.1088
+       vertex -30 -45.3997 -39.2284
+       vertex -30 -35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -36.2451 -16.9202
+       vertex -30 -46.5805 -37.8187
+       vertex -30 -36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -36.7466 -15.8015
+       vertex -30 -47.7176 -36.3735
+       vertex -30 -37.2136 -14.668
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -33.2375 -22.2547
+       vertex -30 -41.6059 -43.2313
+       vertex -30 -33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -32.5399 -23.2628
+       vertex -30 -41.6059 -43.2313
+       vertex -30 -33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -33.9039 -21.2256
+       vertex -30 -42.9112 -41.936
+       vertex -30 -34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -34.5384 -20.1767
+       vertex -30 -44.1762 -40.6013
+       vertex -30 -35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -30.2664 -26.1523
+       vertex -30 -37.4607 -46.8689
+       vertex -30 -31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -29.4508 -27.0675
+       vertex -30 -37.4607 -46.8689
+       vertex -30 -30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -31.0537 -25.2125
+       vertex -30 -38.8794 -45.6989
+       vertex -30 -31.8117 -24.249
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -31.8117 -24.249
+       vertex -30 -40.2616 -44.486
+       vertex -30 -32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -26.8411 -29.6573
+       vertex -30 -32.999 -50.1105
+       vertex -30 -27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -25.9196 -30.4659
+       vertex -30 -32.999 -50.1105
+       vertex -30 -26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -27.7373 -28.8209
+       vertex -30 -34.5191 -49.0758
+       vertex -30 -28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -28.6075 -27.9573
+       vertex -30 -36.0068 -47.9949
+       vertex -30 -29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 56.9287 0.996204
+       vertex -30 59.8574 -4.13443
+       vertex -30 56.9287 -0.996204
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -21.9993 -33.407
+       vertex -30 -26.6232 -53.7699
+       vertex -30 -23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -20.9652 -34.0655
+       vertex -30 -26.6232 -53.7699
+       vertex -30 -21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -23.0127 -32.7172
+       vertex -30 -28.2585 -52.9288
+       vertex -30 -24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -24.0046 -31.9966
+       vertex -30 -29.8672 -52.038
+       vertex -30 -24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -17.7488 -35.8466
+       vertex -30 -21.5736 -55.9873
+       vertex -30 -18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -16.6419 -36.3737
+       vertex -30 -21.5736 -55.9873
+       vertex -30 -17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -18.839 -35.2859
+       vertex -30 -23.2792 -55.2999
+       vertex -30 -19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -19.9115 -34.692
+       vertex -30 -24.9629 -54.5605
+       vertex -30 -20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -24.9738 -31.2459
+       vertex -30 -31.4479 -51.0983
+       vertex -30 -25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -12.0688 -38.1359
+       vertex -30 -14.5649 -58.2054
+       vertex -30 -13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -10.8945 -38.4878
+       vertex -30 -14.5649 -58.2054
+       vertex -30 -12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -13.2318 -37.7481
+       vertex -30 -16.3417 -57.7317
+       vertex -30 -14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -14.3824 -37.3249
+       vertex -30 -18.1032 -57.2038
+       vertex -30 -15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -15.5195 -36.8666
+       vertex -30 -19.8477 -56.6221
+       vertex -30 -16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -6.10597 -39.5312
+       vertex -30 -7.33751 -59.5497
+       vertex -30 -7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -4.89167 -39.6998
+       vertex -30 -7.33751 -59.5497
+       vertex -30 -6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -7.31453 -39.3255
+       vertex -30 -9.15896 -59.2968
+       vertex -30 -8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -8.51622 -39.0829
+       vertex -30 -10.9718 -58.9883
+       vertex -30 -9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -9.70992 -38.8036
+       vertex -30 -12.7743 -58.6244
+       vertex -30 -10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+       vertex -30 0 -40
+       vertex -30 0 -60
+       vertex -30 -1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 48.0279 6.71645
+       vertex -30 0.919455 59.993
+       vertex -30 50 7
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 2.45044 -39.9249
+       vertex -30 1.83869 -59.9718
+       vertex -30 1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 3.67278 -39.831
+       vertex -30 3.67566 -59.8873
+       vertex -30 2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 4.89167 -39.6998
+       vertex -30 5.50917 -59.7465
+       vertex -30 3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 6.10597 -39.5312
+       vertex -30 7.33751 -59.5497
+       vertex -30 4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 7.31453 -39.3255
+       vertex -30 7.33751 -59.5497
+       vertex -30 6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 8.51622 -39.0829
+       vertex -30 9.15896 -59.2968
+       vertex -30 7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 9.70992 -38.8036
+       vertex -30 10.9718 -58.9883
+       vertex -30 8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 10.8945 -38.4878
+       vertex -30 12.7743 -58.6244
+       vertex -30 9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 12.0688 -38.1359
+       vertex -30 14.5649 -58.2054
+       vertex -30 10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 13.2318 -37.7481
+       vertex -30 14.5649 -58.2054
+       vertex -30 12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 14.3824 -37.3249
+       vertex -30 16.3417 -57.7317
+       vertex -30 13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 15.5195 -36.8666
+       vertex -30 18.1032 -57.2038
+       vertex -30 14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 16.6419 -36.3737
+       vertex -30 19.8477 -56.6221
+       vertex -30 15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 17.7488 -35.8466
+       vertex -30 21.5736 -55.9873
+       vertex -30 16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 18.839 -35.2859
+       vertex -30 21.5736 -55.9873
+       vertex -30 17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 19.9115 -34.692
+       vertex -30 23.2792 -55.2999
+       vertex -30 18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 20.9652 -34.0655
+       vertex -30 24.9629 -54.5605
+       vertex -30 19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 21.9993 -33.407
+       vertex -30 26.6232 -53.7699
+       vertex -30 20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 23.0127 -32.7172
+       vertex -30 26.6232 -53.7699
+       vertex -30 21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 24.0046 -31.9966
+       vertex -30 28.2585 -52.9288
+       vertex -30 23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 24.9738 -31.2459
+       vertex -30 29.8672 -52.038
+       vertex -30 24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 25.9196 -30.4659
+       vertex -30 31.4479 -51.0983
+       vertex -30 24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 26.8411 -29.6573
+       vertex -30 32.999 -50.1105
+       vertex -30 25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 27.7373 -28.8209
+       vertex -30 32.999 -50.1105
+       vertex -30 26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 28.6075 -27.9573
+       vertex -30 34.5191 -49.0758
+       vertex -30 27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 29.4508 -27.0675
+       vertex -30 36.0068 -47.9949
+       vertex -30 28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 30.2664 -26.1523
+       vertex -30 37.4607 -46.8689
+       vertex -30 29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 31.0537 -25.2125
+       vertex -30 37.4607 -46.8689
+       vertex -30 30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 31.8117 -24.249
+       vertex -30 38.8794 -45.6989
+       vertex -30 31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 32.5399 -23.2628
+       vertex -30 40.2616 -44.486
+       vertex -30 31.8117 -24.249
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 33.2375 -22.2547
+       vertex -30 41.6059 -43.2313
+       vertex -30 32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 33.9039 -21.2256
+       vertex -30 41.6059 -43.2313
+       vertex -30 33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 34.5384 -20.1767
+       vertex -30 42.9112 -41.936
+       vertex -30 33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 35.1405 -19.1088
+       vertex -30 44.1762 -40.6013
+       vertex -30 34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 35.7096 -18.0229
+       vertex -30 45.3997 -39.2284
+       vertex -30 35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 36.2451 -16.9202
+       vertex -30 45.3997 -39.2284
+       vertex -30 35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 36.7466 -15.8015
+       vertex -30 46.5805 -37.8187
+       vertex -30 36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 37.2136 -14.668
+       vertex -30 47.7176 -36.3735
+       vertex -30 36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 37.6456 -13.5207
+       vertex -30 48.8098 -34.8941
+       vertex -30 37.2136 -14.668
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 38.0423 -12.3607
+       vertex -30 48.8098 -34.8941
+       vertex -30 37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 38.4032 -11.1891
+       vertex -30 49.8562 -33.382
+       vertex -30 38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 38.728 -10.007
+       vertex -30 50.8558 -31.8385
+       vertex -30 38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.0165 -8.81544
+       vertex -30 50.8558 -31.8385
+       vertex -30 38.728 -10.007
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.2683 -7.61564
+       vertex -30 51.8076 -30.265
+       vertex -30 39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.4833 -6.40869
+       vertex -30 52.7107 -28.6632
+       vertex -30 39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.6611 -5.19572
+       vertex -30 52.7107 -28.6632
+       vertex -30 39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.8017 -3.97787
+       vertex -30 53.5644 -27.0344
+       vertex -30 39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.9049 -2.75629
+       vertex -30 54.3677 -25.3802
+       vertex -30 39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.9706 -1.53211
+       vertex -30 54.3677 -25.3802
+       vertex -30 39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 39.9988 -0.306494
+       vertex -30 55.1199 -23.7022
+       vertex -30 39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.9894 0.91941
+       vertex -30 55.8204 -22.002
+       vertex -30 39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.9425 2.14445
+       vertex -30 55.8204 -22.002
+       vertex -30 39.9894 0.91941
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.7361 4.58734
+       vertex -30 43.0712 -0.996204
+       vertex -30 39.858 3.36747
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.6326 -2.9079
+       vertex -30 39.9425 2.14445
+       vertex -30 39.858 3.36747
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+       vertex -30 48.0279 -6.71645
+       vertex -30 56.4684 -20.281
+       vertex -30 46.2155 -5.88877
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.0712 -0.996204
+       vertex -30 39.7361 4.58734
+       vertex -30 39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+       vertex -30 50 -7
+       vertex -30 57.0634 -18.541
+       vertex -30 48.0279 -6.71645
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.0712 0.996204
+       vertex -30 39.147 8.21651
+       vertex -30 43.6326 2.90791
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 51.9721 -6.71645
+       vertex -30 57.6048 -16.7836
+       vertex -30 50 -7
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.6326 2.90791
+       vertex -30 38.8768 9.4123
+       vertex -30 38.5701 10.5993
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 34.8435 19.645
+       vertex -30 46.2155 5.88877
+       vertex -30 35.4292 18.568
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 44.7098 4.58402
+       vertex -30 37.434 14.096
+       vertex -30 36.9844 15.2365
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 44.7098 4.58402
+       vertex -30 35.4292 18.568
+       vertex -30 46.2155 5.88877
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 55.2902 -4.58402
+       vertex -30 59.2249 -9.61304
+       vertex -30 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 29.0325 27.5156
+       vertex -30 0.919455 59.993
+       vertex -30 29.8621 26.613
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 34.2252 20.7036
+       vertex -30 33.5746 21.7427
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 33.5746 21.7427
+       vertex -30 32.8925 22.7614
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 28.1757 28.3924
+       vertex -30 0.919455 59.993
+       vertex -30 29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 27.2924 29.2425
+       vertex -30 0.919455 59.993
+       vertex -30 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 26.3834 30.0652
+       vertex -30 0.919455 59.993
+       vertex -30 27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 25.4497 30.8596
+       vertex -30 0.919455 59.993
+       vertex -30 26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 24.4921 31.625
+       vertex -30 0.919455 59.993
+       vertex -30 25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 23.5114 32.3607
+       vertex -30 0.919455 59.993
+       vertex -30 24.4921 31.625
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 22.5087 33.066
+       vertex -30 0.919455 59.993
+       vertex -30 23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 21.4848 33.7402
+       vertex -30 0.919455 59.993
+       vertex -30 22.5087 33.066
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 20.4407 34.3828
+       vertex -30 0.919455 59.993
+       vertex -30 21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 19.3775 34.993
+       vertex -30 0.919455 59.993
+       vertex -30 20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 18.296 35.5704
+       vertex -30 0.919455 59.993
+       vertex -30 19.3775 34.993
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 17.1974 36.1144
+       vertex -30 0.919455 59.993
+       vertex -30 18.296 35.5704
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 16.0826 36.6244
+       vertex -30 0.919455 59.993
+       vertex -30 17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 14.9527 37.1001
+       vertex -30 0.919455 59.993
+       vertex -30 16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 13.8087 37.5409
+       vertex -30 0.919455 59.993
+       vertex -30 14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 12.6518 37.9464
+       vertex -30 0.919455 59.993
+       vertex -30 13.8087 37.5409
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 11.483 38.3163
+       vertex -30 0.919455 59.993
+       vertex -30 12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 10.3034 38.6502
+       vertex -30 0.919455 59.993
+       vertex -30 11.483 38.3163
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 9.11414 38.9478
+       vertex -30 0.919455 59.993
+       vertex -30 10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 7.91631 39.2088
+       vertex -30 0.919455 59.993
+       vertex -30 9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 6.71104 39.433
+       vertex -30 0.919455 59.993
+       vertex -30 7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 5.49947 39.6201
+       vertex -30 0.919455 59.993
+       vertex -30 6.71104 39.433
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 4.28273 39.7701
+       vertex -30 0.919455 59.993
+       vertex -30 5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 3.06197 39.8826
+       vertex -30 0.919455 59.993
+       vertex -30 4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 1.83833 39.9577
+       vertex -30 0.919455 59.993
+       vertex -30 3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.61297 39.9953
+       vertex -30 0.919455 59.993
+       vertex -30 1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 56.9287 0.996204
+       vertex -30 59.956 -2.29816
+       vertex -30 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 48.0279 6.71645
+       vertex -30 30.6637 25.6854
+       vertex -30 29.8621 26.613
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 56.9287 -0.996204
+       vertex -30 59.7026 -5.96681
+       vertex -30 56.3674 -2.9079
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 34.8435 19.645
+       vertex -30 34.2252 20.7036
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 30.6637 25.6854
+       vertex -30 48.0279 6.71645
+       vertex -30 31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 55.2902 -4.58402
+       vertex -30 58.9025 -11.4235
+       vertex -30 53.7845 -5.88877
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.0712 0.996204
+       vertex -30 39.3804 7.01299
+       vertex -30 39.147 8.21651
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 38.8768 9.4123
+       vertex -30 43.6326 2.90791
+       vertex -30 39.147 8.21651
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 37.434 14.096
+       vertex -30 44.7098 4.58402
+       vertex -30 37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.3804 7.01299
+       vertex -30 43.0712 0.996204
+       vertex -30 39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+       vertex -30 44.7098 -4.58402
+       vertex -30 55.8204 -22.002
+       vertex -30 43.6326 -2.9079
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 39.9425 2.14445
+       vertex -30 43.6326 -2.9079
+       vertex -30 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+       vertex -30 46.2155 -5.88877
+       vertex -30 56.4684 -20.281
+       vertex -30 44.7098 -4.58402
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.6326 -2.9079
+       vertex -30 39.858 3.36747
+       vertex -30 43.0712 -0.996204
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.0712 -0.996204
+       vertex -30 39.5768 5.80289
+       vertex -30 43.0712 0.996204
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 51.9721 -6.71645
+       vertex -30 58.0921 -15.0104
+       vertex -30 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.6326 2.90791
+       vertex -30 38.5701 10.5993
+       vertex -30 38.2272 11.7763
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.6326 2.90791
+       vertex -30 37.8484 12.9422
+       vertex -30 44.7098 4.58402
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 43.6326 2.90791
+       vertex -30 38.2272 11.7763
+       vertex -30 37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 44.7098 4.58402
+       vertex -30 36.9844 15.2365
+       vertex -30 36.5001 16.3627
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 44.7098 4.58402
+       vertex -30 35.9816 17.4736
+       vertex -30 35.4292 18.568
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 44.7098 4.58402
+       vertex -30 36.5001 16.3627
+       vertex -30 35.9816 17.4736
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 32.8925 22.7614
+       vertex -30 32.1796 23.7587
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 31.4364 24.7337
+       vertex -30 48.0279 6.71645
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 46.2155 5.88877
+       vertex -30 32.1796 23.7587
+       vertex -30 31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 56.3674 2.90791
+       vertex -30 59.9982 -0.459741
+       vertex -30 56.9287 0.996204
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 55.2902 4.58402
+       vertex -30 59.9982 -0.459741
+       vertex -30 56.3674 2.90791
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 53.7845 5.88877
+       vertex -30 0.919455 59.993
+       vertex -30 55.2902 4.58402
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 0.919455 59.993
+       vertex -30 59.9841 1.37911
+       vertex -30 55.2902 4.58402
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50 7
+       vertex -30 0.919455 59.993
+       vertex -30 51.9721 6.71645
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 51.9721 6.71645
+       vertex -30 0.919455 59.993
+       vertex -30 53.7845 5.88877
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 -0.61297 39.9953
+       vertex -30 0.919455 59.993
+       vertex -30 0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 1.22579 -39.9812
+       vertex -30 0 -60
+       vertex -30 0 -40
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 48.0279 6.71645
+       vertex -30 29.8621 26.613
+       vertex -30 0.919455 59.993
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -1.22579 -39.9812
+       vertex -30 -1.83869 -59.9718
+       vertex -30 -2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -2.45044 -39.9249
+       vertex -30 -3.67566 -59.8873
+       vertex -30 -3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 -3.67278 -39.831
+       vertex -30 -5.50917 -59.7465
+       vertex -30 -4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 56.3674 -2.9079
+       vertex -30 59.4917 -7.79359
+       vertex -30 55.2902 -4.58402
+    endloop
+  endfacet
+  facet normal 0.443563 0.372322 -0.815247
+    outer loop
+       vertex -30 49.1548 2.87848
+       vertex -34 49.4594 0.841254
+       vertex -34 49.7183 0.959493
+    endloop
+  endfacet
+  facet normal 0.443562 0.127547 -0.887121
+    outer loop
+       vertex -30 50 3
+       vertex -30 49.1548 2.87848
+       vertex -34 49.7183 0.959493
+    endloop
+  endfacet
+  facet normal 0.44356 0.127563 -0.88712
+    outer loop
+       vertex -30 50 3
+       vertex -34 49.7183 0.959493
+       vertex -34 50 1
+    endloop
+  endfacet
+  facet normal 0.443561 -0.127547 -0.887122
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 50 3
+       vertex -34 50 1
+    endloop
+  endfacet
+  facet normal 0.443563 -0.127563 -0.887119
+    outer loop
+       vertex -34 50.2817 0.959493
+       vertex -30 50.8452 2.87848
+       vertex -34 50 1
+    endloop
+  endfacet
+  facet normal 0.443563 -0.372322 -0.815248
+    outer loop
+       vertex -34 50.5406 0.841254
+       vertex -30 51.6219 2.52376
+       vertex -34 50.2817 0.959493
+    endloop
+  endfacet
+  facet normal 0.443563 -0.372324 -0.815246
+    outer loop
+       vertex -30 51.6219 2.52376
+       vertex -30 50.8452 2.87848
+       vertex -34 50.2817 0.959493
+    endloop
+  endfacet
+  facet normal 0.443562 -0.586929 -0.677324
+    outer loop
+       vertex -30 52.2672 1.96458
+       vertex -30 51.6219 2.52376
+       vertex -34 50.5406 0.841254
+    endloop
+  endfacet
+  facet normal 0.443562 -0.58693 -0.677323
+    outer loop
+       vertex -34 50.7557 0.654861
+       vertex -30 52.2672 1.96458
+       vertex -34 50.5406 0.841254
+    endloop
+  endfacet
+  facet normal 0.443564 -0.753942 -0.484584
+    outer loop
+       vertex -34 50.7557 0.654861
+       vertex -34 50.9096 0.415415
+       vertex -30 52.7289 1.24625
+    endloop
+  endfacet
+  facet normal 0.443564 -0.75394 -0.484588
+    outer loop
+       vertex -30 52.7289 1.24625
+       vertex -30 52.2672 1.96458
+       vertex -34 50.7557 0.654861
+    endloop
+  endfacet
+  facet normal 0.443569 -0.859927 -0.25253
+    outer loop
+       vertex -30 52.9695 0.426945
+       vertex -30 52.7289 1.24625
+       vertex -34 50.9096 0.415415
+    endloop
+  endfacet
+  facet normal 0.443569 -0.859927 -0.252531
+    outer loop
+       vertex -34 50.9096 0.415415
+       vertex -34 50.9898 0.142315
+       vertex -30 52.9695 0.426945
+    endloop
+  endfacet
+  facet normal 0.443572 -0.896239 0
+    outer loop
+       vertex -34 50.9898 -0.142315
+       vertex -30 52.9695 -0.426945
+       vertex -30 52.9695 0.426945
+    endloop
+  endfacet
+  facet normal 0.443572 -0.896239 0
+    outer loop
+       vertex -34 50.9898 0.142315
+       vertex -34 50.9898 -0.142315
+       vertex -30 52.9695 0.426945
+    endloop
+  endfacet
+  facet normal 0.443569 -0.859927 0.252533
+    outer loop
+       vertex -30 52.7289 -1.24624
+       vertex -30 52.9695 -0.426945
+       vertex -34 50.9898 -0.142315
+    endloop
+  endfacet
+  facet normal 0.443569 -0.859927 0.252531
+    outer loop
+       vertex -34 50.9898 -0.142315
+       vertex -34 50.9096 -0.415415
+       vertex -30 52.7289 -1.24624
+    endloop
+  endfacet
+  facet normal 0.443564 -0.753942 0.484585
+    outer loop
+       vertex -34 50.9096 -0.415415
+       vertex -34 50.7557 -0.654861
+       vertex -30 52.2672 -1.96458
+    endloop
+  endfacet
+  facet normal 0.443564 -0.753943 0.484584
+    outer loop
+       vertex -30 52.2672 -1.96458
+       vertex -30 52.7289 -1.24624
+       vertex -34 50.9096 -0.415415
+    endloop
+  endfacet
+  facet normal 0.443562 -0.586929 0.677324
+    outer loop
+       vertex -30 51.6219 -2.52376
+       vertex -30 52.2672 -1.96458
+       vertex -34 50.7557 -0.654861
+    endloop
+  endfacet
+  facet normal 0.443562 -0.58693 0.677323
+    outer loop
+       vertex -34 50.7557 -0.654861
+       vertex -34 50.5406 -0.841254
+       vertex -30 51.6219 -2.52376
+    endloop
+  endfacet
+  facet normal 0.443563 -0.372322 0.815247
+    outer loop
+       vertex -34 50.5406 -0.841254
+       vertex -34 50.2817 -0.959493
+       vertex -30 50.8452 -2.87848
+    endloop
+  endfacet
+  facet normal 0.443563 -0.372324 0.815246
+    outer loop
+       vertex -30 50.8452 -2.87848
+       vertex -30 51.6219 -2.52376
+       vertex -34 50.5406 -0.841254
+    endloop
+  endfacet
+  facet normal 0.443562 -0.127547 0.887121
+    outer loop
+       vertex -30 50 -3
+       vertex -30 50.8452 -2.87848
+       vertex -34 50.2817 -0.959493
+    endloop
+  endfacet
+  facet normal 0.44356 -0.127563 0.88712
+    outer loop
+       vertex -34 50.2817 -0.959493
+       vertex -34 50 -1
+       vertex -30 50 -3
+    endloop
+  endfacet
+  facet normal 0.443563 0.127563 0.887119
+    outer loop
+       vertex -34 49.7183 -0.959493
+       vertex -30 49.1548 -2.87848
+       vertex -34 50 -1
+    endloop
+  endfacet
+  facet normal 0.443561 0.127547 0.887122
+    outer loop
+       vertex -30 49.1548 -2.87848
+       vertex -30 50 -3
+       vertex -34 50 -1
+    endloop
+  endfacet
+  facet normal 0.443563 0.372322 0.815248
+    outer loop
+       vertex -34 49.4594 -0.841254
+       vertex -30 48.3781 -2.52376
+       vertex -34 49.7183 -0.959493
+    endloop
+  endfacet
+  facet normal 0.443563 0.372324 0.815246
+    outer loop
+       vertex -30 48.3781 -2.52376
+       vertex -30 49.1548 -2.87848
+       vertex -34 49.7183 -0.959493
+    endloop
+  endfacet
+  facet normal 0.443539 0.586783 0.677465
+    outer loop
+       vertex -34 49.2442 -0.654861
+       vertex -30 47.7328 -1.96458
+       vertex -34 49.4594 -0.841254
+    endloop
+  endfacet
+  facet normal 0.443562 0.586929 0.677324
+    outer loop
+       vertex -30 47.7328 -1.96458
+       vertex -30 48.3781 -2.52376
+       vertex -34 49.4594 -0.841254
+    endloop
+  endfacet
+  facet normal 0.443549 0.753949 0.484588
+    outer loop
+       vertex -30 47.2711 -1.24624
+       vertex -30 47.7328 -1.96458
+       vertex -34 49.2442 -0.654861
+    endloop
+  endfacet
+  facet normal 0.443578 0.754078 0.48436
+    outer loop
+       vertex -30 47.2711 -1.24624
+       vertex -34 49.2442 -0.654861
+       vertex -34 49.0904 -0.415415
+    endloop
+  endfacet
+  facet normal 0.443569 0.859927 0.252533
+    outer loop
+       vertex -30 47.0305 -0.426945
+       vertex -30 47.2711 -1.24624
+       vertex -34 49.0904 -0.415415
+    endloop
+  endfacet
+  facet normal 0.443569 0.859927 0.252531
+    outer loop
+       vertex -30 47.0305 -0.426945
+       vertex -34 49.0904 -0.415415
+       vertex -34 49.0102 -0.142315
+    endloop
+  endfacet
+  facet normal 0.443572 0.896239 -0
+    outer loop
+       vertex -30 47.0305 -0.426945
+       vertex -34 49.0102 -0.142315
+       vertex -30 47.0305 0.426945
+    endloop
+  endfacet
+  facet normal 0.443572 0.896239 0
+    outer loop
+       vertex -30 47.0305 0.426945
+       vertex -34 49.0102 -0.142315
+       vertex -34 49.0102 0.142315
+    endloop
+  endfacet
+  facet normal 0.443569 0.859927 -0.25253
+    outer loop
+       vertex -30 47.2711 1.24625
+       vertex -30 47.0305 0.426945
+       vertex -34 49.0102 0.142315
+    endloop
+  endfacet
+  facet normal 0.443569 0.859927 -0.252531
+    outer loop
+       vertex -30 47.2711 1.24625
+       vertex -34 49.0102 0.142315
+       vertex -34 49.0904 0.415415
+    endloop
+  endfacet
+  facet normal 0.443534 0.754097 -0.484372
+    outer loop
+       vertex -30 47.7328 1.96458
+       vertex -34 49.0904 0.415415
+       vertex -34 49.2442 0.654861
+    endloop
+  endfacet
+  facet normal 0.443564 0.75394 -0.484588
+    outer loop
+       vertex -30 47.7328 1.96458
+       vertex -30 47.2711 1.24625
+       vertex -34 49.0904 0.415415
+    endloop
+  endfacet
+  facet normal 0.44355 0.586932 -0.677328
+    outer loop
+       vertex -30 48.3781 2.52376
+       vertex -30 47.7328 1.96458
+       vertex -34 49.2442 0.654861
+    endloop
+  endfacet
+  facet normal 0.443573 0.586772 -0.677452
+    outer loop
+       vertex -30 48.3781 2.52376
+       vertex -34 49.2442 0.654861
+       vertex -34 49.4594 0.841254
+    endloop
+  endfacet
+  facet normal 0.443563 0.372324 -0.815246
+    outer loop
+       vertex -30 49.1548 2.87848
+       vertex -30 48.3781 2.52376
+       vertex -34 49.4594 0.841254
+    endloop
+  endfacet
+  facet normal -0.316194 0.0290969 0.948248
+    outer loop
+       vertex -15 0.996076 64.9924
+       vertex -30 2.7575 59.9366
+       vertex -30 0.919455 59.993
+    endloop
+  endfacet
+  facet normal -0.316194 0 0.948695
+    outer loop
+       vertex -15 -0.996076 64.9924
+       vertex -15 0.996076 64.9924
+       vertex -30 0.919455 59.993
+    endloop
+  endfacet
+  facet normal -0.316194 0 0.948695
+    outer loop
+       vertex -30 -0.919455 59.993
+       vertex -15 -0.996076 64.9924
+       vertex -30 0.919455 59.993
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0290986 0.948248
+    outer loop
+       vertex -15 -2.98729 64.9313
+       vertex -15 -0.996076 64.9924
+       vertex -30 -0.919455 59.993
+    endloop
+  endfacet
+  facet normal -0.316193 -0.0290969 0.948248
+    outer loop
+       vertex -30 -2.7575 59.9366
+       vertex -15 -2.98729 64.9313
+       vertex -30 -0.919455 59.993
+    endloop
+  endfacet
+  facet normal -0.316193 -0.0580956 0.946914
+    outer loop
+       vertex -15 -4.9757 64.8093
+       vertex -15 -2.98729 64.9313
+       vertex -30 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal -0.316199 -0.0581427 0.94691
+    outer loop
+       vertex -30 -4.59295 59.8239
+       vertex -15 -4.9757 64.8093
+       vertex -30 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal -0.316199 -0.0870994 0.944686
+    outer loop
+       vertex -15 -6.95944 64.6264
+       vertex -15 -4.9757 64.8093
+       vertex -30 -4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -0.316197 -0.087082 0.944689
+    outer loop
+       vertex -30 -6.4241 59.6551
+       vertex -15 -6.95944 64.6264
+       vertex -30 -4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -0.316197 -0.116056 0.941568
+    outer loop
+       vertex -15 -8.93664 64.3827
+       vertex -15 -6.95944 64.6264
+       vertex -30 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -0.316193 -0.116028 0.941573
+    outer loop
+       vertex -30 -8.2492 59.4302
+       vertex -15 -8.93664 64.3827
+       vertex -30 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -0.316193 -0.144821 0.937576
+    outer loop
+       vertex -15 -10.9054 64.0786
+       vertex -15 -8.93664 64.3827
+       vertex -30 -8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -0.316192 -0.144809 0.937578
+    outer loop
+       vertex -30 -10.0666 59.1495
+       vertex -15 -10.9054 64.0786
+       vertex -30 -8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -0.316192 -0.173482 0.932699
+    outer loop
+       vertex -15 -12.864 63.7143
+       vertex -15 -10.9054 64.0786
+       vertex -30 -10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -0.316194 -0.173497 0.932695
+    outer loop
+       vertex -30 -11.8745 58.8132
+       vertex -15 -12.864 63.7143
+       vertex -30 -10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -0.316194 -0.201961 0.926948
+    outer loop
+       vertex -15 -14.8105 63.2902
+       vertex -15 -12.864 63.7143
+       vertex -30 -11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -0.316196 -0.201982 0.926943
+    outer loop
+       vertex -30 -13.6712 58.4217
+       vertex -15 -14.8105 63.2902
+       vertex -30 -11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -0.316196 -0.230305 0.920315
+    outer loop
+       vertex -15 -16.743 62.8066
+       vertex -15 -14.8105 63.2902
+       vertex -30 -13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -0.316195 -0.230298 0.920317
+    outer loop
+       vertex -30 -15.4551 57.9753
+       vertex -15 -16.743 62.8066
+       vertex -30 -13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -0.316195 -0.258386 0.912829
+    outer loop
+       vertex -15 -18.6599 62.264
+       vertex -15 -16.743 62.8066
+       vertex -30 -15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -0.316192 -0.258364 0.912836
+    outer loop
+       vertex -30 -17.2245 57.4745
+       vertex -15 -18.6599 62.264
+       vertex -30 -15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -0.316193 -0.286211 0.904492
+    outer loop
+       vertex -15 -20.5592 61.663
+       vertex -15 -18.6599 62.264
+       vertex -30 -17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -0.3162 -0.28627 0.904471
+    outer loop
+       vertex -30 -18.9777 56.9196
+       vertex -15 -20.5592 61.663
+       vertex -30 -17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -0.3162 -0.313824 0.895283
+    outer loop
+       vertex -15 -22.4392 61.004
+       vertex -15 -20.5592 61.663
+       vertex -30 -18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -0.316199 -0.31382 0.895285
+    outer loop
+       vertex -30 -20.7131 56.3113
+       vertex -15 -22.4392 61.004
+       vertex -30 -18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -0.316199 -0.341116 0.885244
+    outer loop
+       vertex -15 -24.2981 60.2877
+       vertex -15 -22.4392 61.004
+       vertex -30 -20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -0.316199 -0.341116 0.885244
+    outer loop
+       vertex -30 -22.429 55.6501
+       vertex -15 -24.2981 60.2877
+       vertex -30 -20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -0.316199 -0.368108 0.874365
+    outer loop
+       vertex -15 -26.1342 59.5147
+       vertex -15 -24.2981 60.2877
+       vertex -30 -22.429 55.6501
+    endloop
+  endfacet
+  facet normal -0.316191 -0.368043 0.874396
+    outer loop
+       vertex -30 -24.1239 54.9367
+       vertex -15 -26.1342 59.5147
+       vertex -30 -22.429 55.6501
+    endloop
+  endfacet
+  facet normal -0.316191 -0.394681 0.862699
+    outer loop
+       vertex -15 -27.9458 58.6859
+       vertex -15 -26.1342 59.5147
+       vertex -30 -24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -0.316195 -0.394712 0.862684
+    outer loop
+       vertex -30 -25.7961 54.1716
+       vertex -15 -27.9458 58.6859
+       vertex -30 -24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -0.316195 -0.420972 0.850179
+    outer loop
+       vertex -15 -29.7311 57.8019
+       vertex -15 -27.9458 58.6859
+       vertex -30 -25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -0.316197 -0.420985 0.850171
+    outer loop
+       vertex -30 -27.444 53.3556
+       vertex -15 -29.7311 57.8019
+       vertex -30 -25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -0.316197 -0.446804 0.83689
+    outer loop
+       vertex -15 -31.4884 56.8637
+       vertex -15 -29.7311 57.8019
+       vertex -30 -27.444 53.3556
+    endloop
+  endfacet
+  facet normal -0.316193 -0.446776 0.836907
+    outer loop
+       vertex -30 -29.0662 52.4896
+       vertex -15 -31.4884 56.8637
+       vertex -30 -27.444 53.3556
+    endloop
+  endfacet
+  facet normal -0.316193 -0.472257 0.822797
+    outer loop
+       vertex -15 -33.2162 55.872
+       vertex -15 -31.4884 56.8637
+       vertex -30 -29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -0.316192 -0.472251 0.822801
+    outer loop
+       vertex -30 -30.6611 51.5742
+       vertex -15 -33.2162 55.872
+       vertex -30 -29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -0.316192 -0.497223 0.807955
+    outer loop
+       vertex -15 -34.9128 54.8279
+       vertex -15 -33.2162 55.872
+       vertex -30 -30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -0.316198 -0.497263 0.807928
+    outer loop
+       vertex -30 -32.2272 50.6103
+       vertex -15 -34.9128 54.8279
+       vertex -30 -30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -0.316198 -0.521781 0.792315
+    outer loop
+       vertex -15 -36.5766 53.7322
+       vertex -15 -34.9128 54.8279
+       vertex -30 -32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -0.316192 -0.521744 0.792342
+    outer loop
+       vertex -30 -33.763 49.599
+       vertex -15 -36.5766 53.7322
+       vertex -30 -32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -0.316193 -0.545803 0.775965
+    outer loop
+       vertex -15 -38.206 52.5861
+       vertex -15 -36.5766 53.7322
+       vertex -30 -33.763 49.599
+    endloop
+  endfacet
+  facet normal -0.316194 -0.545815 0.775956
+    outer loop
+       vertex -30 -35.2671 48.541
+       vertex -15 -38.206 52.5861
+       vertex -30 -33.763 49.599
+    endloop
+  endfacet
+  facet normal -0.316194 -0.56931 0.758886
+    outer loop
+       vertex -15 -39.7996 51.3906
+       vertex -15 -38.206 52.5861
+       vertex -30 -35.2671 48.541
+    endloop
+  endfacet
+  facet normal -0.316193 -0.5693 0.758893
+    outer loop
+       vertex -30 -36.7381 47.4375
+       vertex -15 -39.7996 51.3906
+       vertex -30 -35.2671 48.541
+    endloop
+  endfacet
+  facet normal -0.316193 -0.592307 0.741077
+    outer loop
+       vertex -15 -41.3558 50.1468
+       vertex -15 -39.7996 51.3906
+       vertex -30 -36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -0.316196 -0.592324 0.741062
+    outer loop
+       vertex -30 -38.1745 46.2894
+       vertex -15 -41.3558 50.1468
+       vertex -30 -36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -0.316196 -0.614751 0.722566
+    outer loop
+       vertex -15 -42.8731 48.8559
+       vertex -15 -41.3558 50.1468
+       vertex -30 -38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -0.316195 -0.614746 0.722571
+    outer loop
+       vertex -30 -39.5751 45.0978
+       vertex -15 -42.8731 48.8559
+       vertex -30 -38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -0.316195 -0.636613 0.70338
+    outer loop
+       vertex -15 -44.3501 47.5191
+       vertex -15 -42.8731 48.8559
+       vertex -30 -39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -0.316192 -0.636594 0.703399
+    outer loop
+       vertex -30 -40.9386 43.8638
+       vertex -15 -44.3501 47.5191
+       vertex -30 -39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -0.316192 -0.657848 0.683563
+    outer loop
+       vertex -15 -45.7855 46.1377
+       vertex -15 -44.3501 47.5191
+       vertex -30 -40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -0.316194 -0.65786 0.683551
+    outer loop
+       vertex -30 -42.2636 42.5886
+       vertex -15 -45.7855 46.1377
+       vertex -30 -40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -0.316194 -0.678499 0.663069
+    outer loop
+       vertex -15 -47.1779 44.7129
+       vertex -15 -45.7855 46.1377
+       vertex -30 -42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -0.316193 -0.678497 0.663071
+    outer loop
+       vertex -30 -43.5488 41.2735
+       vertex -15 -47.1779 44.7129
+       vertex -30 -42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -0.316194 -0.698473 0.641995
+    outer loop
+       vertex -15 -48.526 43.2462
+       vertex -15 -47.1779 44.7129
+       vertex -30 -43.5488 41.2735
+    endloop
+  endfacet
+  facet normal -0.316199 -0.698502 0.641961
+    outer loop
+       vertex -30 -44.7932 39.9195
+       vertex -15 -48.526 43.2462
+       vertex -30 -43.5488 41.2735
+    endloop
+  endfacet
+  facet normal -0.316198 -0.717863 0.620235
+    outer loop
+       vertex -15 -49.8284 41.7388
+       vertex -15 -48.526 43.2462
+       vertex -30 -44.7932 39.9195
+    endloop
+  endfacet
+  facet normal -0.316193 -0.717832 0.620273
+    outer loop
+       vertex -30 -45.9955 38.5281
+       vertex -15 -49.8284 41.7388
+       vertex -30 -44.7932 39.9195
+    endloop
+  endfacet
+  facet normal -0.316193 -0.736508 0.597978
+    outer loop
+       vertex -15 -51.0841 40.1922
+       vertex -15 -49.8284 41.7388
+       vertex -30 -45.9955 38.5281
+    endloop
+  endfacet
+  facet normal -0.316192 -0.736504 0.597983
+    outer loop
+       vertex -30 -47.1546 37.1005
+       vertex -15 -51.0841 40.1922
+       vertex -30 -45.9955 38.5281
+    endloop
+  endfacet
+  facet normal -0.316192 -0.754481 0.575136
+    outer loop
+       vertex -15 -52.2918 38.6079
+       vertex -15 -51.0841 40.1922
+       vertex -30 -47.1546 37.1005
+    endloop
+  endfacet
+  facet normal -0.316194 -0.754492 0.575119
+    outer loop
+       vertex -30 -48.2694 35.638
+       vertex -15 -52.2918 38.6079
+       vertex -30 -47.1546 37.1005
+    endloop
+  endfacet
+  facet normal -0.316194 -0.771768 0.55172
+    outer loop
+       vertex -15 -53.4504 36.9872
+       vertex -15 -52.2918 38.6079
+       vertex -30 -48.2694 35.638
+    endloop
+  endfacet
+  facet normal -0.316194 -0.771766 0.551724
+    outer loop
+       vertex -30 -49.3388 34.1421
+       vertex -15 -53.4504 36.9872
+       vertex -30 -48.2694 35.638
+    endloop
+  endfacet
+  facet normal -0.316194 -0.788291 0.527844
+    outer loop
+       vertex -15 -54.5588 35.3319
+       vertex -15 -53.4504 36.9872
+       vertex -30 -49.3388 34.1421
+    endloop
+  endfacet
+  facet normal -0.316197 -0.788303 0.527824
+    outer loop
+       vertex -30 -50.3619 32.6141
+       vertex -15 -54.5588 35.3319
+       vertex -30 -49.3388 34.1421
+    endloop
+  endfacet
+  facet normal -0.316197 -0.804122 0.503396
+    outer loop
+       vertex -15 -55.6159 33.6433
+       vertex -15 -54.5588 35.3319
+       vertex -30 -50.3619 32.6141
+    endloop
+  endfacet
+  facet normal -0.316195 -0.804117 0.503405
+    outer loop
+       vertex -30 -51.3377 31.0554
+       vertex -15 -55.6159 33.6433
+       vertex -30 -50.3619 32.6141
+    endloop
+  endfacet
+  facet normal -0.316195 -0.819169 0.478521
+    outer loop
+       vertex -15 -56.6207 31.9232
+       vertex -15 -55.6159 33.6433
+       vertex -30 -51.3377 31.0554
+    endloop
+  endfacet
+  facet normal -0.316191 -0.819152 0.478553
+    outer loop
+       vertex -30 -52.2653 29.4676
+       vertex -15 -56.6207 31.9232
+       vertex -30 -51.3377 31.0554
+    endloop
+  endfacet
+  facet normal -0.316191 -0.833436 0.453219
+    outer loop
+       vertex -15 -57.5724 30.1731
+       vertex -15 -56.6207 31.9232
+       vertex -30 -52.2653 29.4676
+    endloop
+  endfacet
+  facet normal -0.316192 -0.833437 0.453217
+    outer loop
+       vertex -30 -53.1438 27.8521
+       vertex -15 -57.5724 30.1731
+       vertex -30 -52.2653 29.4676
+    endloop
+  endfacet
+  facet normal -0.316192 -0.846942 0.427448
+    outer loop
+       vertex -15 -58.47 28.3946
+       vertex -15 -57.5724 30.1731
+       vertex -30 -53.1438 27.8521
+    endloop
+  endfacet
+  facet normal -0.316189 -0.846934 0.427466
+    outer loop
+       vertex -30 -53.9724 26.2104
+       vertex -15 -58.47 28.3946
+       vertex -30 -53.1438 27.8521
+    endloop
+  endfacet
+  facet normal -0.316189 -0.859634 0.401314
+    outer loop
+       vertex -15 -59.3127 26.5895
+       vertex -15 -58.47 28.3946
+       vertex -30 -53.9724 26.2104
+    endloop
+  endfacet
+  facet normal -0.316195 -0.859653 0.40127
+    outer loop
+       vertex -30 -54.7502 24.5441
+       vertex -15 -59.3127 26.5895
+       vertex -30 -53.9724 26.2104
+    endloop
+  endfacet
+  facet normal -0.316195 -0.871533 0.374767
+    outer loop
+       vertex -15 -60.0997 24.7593
+       vertex -15 -59.3127 26.5895
+       vertex -30 -54.7502 24.5441
+    endloop
+  endfacet
+  facet normal -0.31619 -0.871519 0.374806
+    outer loop
+       vertex -30 -55.4767 22.8548
+       vertex -15 -60.0997 24.7593
+       vertex -30 -54.7502 24.5441
+    endloop
+  endfacet
+  facet normal -0.31619 -0.882608 0.34789
+    outer loop
+       vertex -15 -60.8302 22.906
+       vertex -15 -60.0997 24.7593
+       vertex -30 -55.4767 22.8548
+    endloop
+  endfacet
+  facet normal -0.316192 -0.882613 0.347876
+    outer loop
+       vertex -30 -56.151 21.144
+       vertex -15 -60.8302 22.906
+       vertex -30 -55.4767 22.8548
+    endloop
+  endfacet
+  facet normal -0.316192 -0.892852 0.320682
+    outer loop
+       vertex -15 -61.5036 21.0311
+       vertex -15 -60.8302 22.906
+       vertex -30 -56.151 21.144
+    endloop
+  endfacet
+  facet normal -0.316192 -0.892854 0.320677
+    outer loop
+       vertex -30 -56.7726 19.4133
+       vertex -15 -61.5036 21.0311
+       vertex -30 -56.151 21.144
+    endloop
+  endfacet
+  facet normal -0.316192 -0.902266 0.293152
+    outer loop
+       vertex -15 -62.1192 19.1364
+       vertex -15 -61.5036 21.0311
+       vertex -30 -56.7726 19.4133
+    endloop
+  endfacet
+  facet normal -0.316194 -0.90227 0.29314
+    outer loop
+       vertex -30 -57.3408 17.6644
+       vertex -15 -62.1192 19.1364
+       vertex -30 -56.7726 19.4133
+    endloop
+  endfacet
+  facet normal -0.316194 -0.910817 0.265395
+    outer loop
+       vertex -15 -62.6765 17.2238
+       vertex -15 -62.1192 19.1364
+       vertex -30 -57.3408 17.6644
+    endloop
+  endfacet
+  facet normal -0.316196 -0.910821 0.265379
+    outer loop
+       vertex -30 -57.8552 15.8989
+       vertex -15 -62.6765 17.2238
+       vertex -30 -57.3408 17.6644
+    endloop
+  endfacet
+  facet normal -0.316196 -0.918524 0.237346
+    outer loop
+       vertex -15 -63.1749 15.295
+       vertex -15 -62.6765 17.2238
+       vertex -30 -57.8552 15.8989
+    endloop
+  endfacet
+  facet normal -0.316193 -0.91852 0.237368
+    outer loop
+       vertex -30 -58.3153 14.1185
+       vertex -15 -63.1749 15.295
+       vertex -30 -57.8552 15.8989
+    endloop
+  endfacet
+  facet normal -0.316194 -0.925374 0.209056
+    outer loop
+       vertex -15 -63.6139 13.3518
+       vertex -15 -63.1749 15.295
+       vertex -30 -58.3153 14.1185
+    endloop
+  endfacet
+  facet normal -0.316195 -0.925376 0.209045
+    outer loop
+       vertex -30 -58.7205 12.3248
+       vertex -15 -63.6139 13.3518
+       vertex -30 -58.3153 14.1185
+    endloop
+  endfacet
+  facet normal -0.316195 -0.93134 0.180629
+    outer loop
+       vertex -15 -63.9932 11.3961
+       vertex -15 -63.6139 13.3518
+       vertex -30 -58.7205 12.3248
+    endloop
+  endfacet
+  facet normal -0.316197 -0.931342 0.180613
+    outer loop
+       vertex -30 -59.0706 10.5195
+       vertex -15 -63.9932 11.3961
+       vertex -30 -58.7205 12.3248
+    endloop
+  endfacet
+  facet normal -0.316197 -0.936436 0.15201
+    outer loop
+       vertex -15 -64.3124 9.4297
+       vertex -15 -63.9932 11.3961
+       vertex -30 -59.0706 10.5195
+    endloop
+  endfacet
+  facet normal -0.316194 -0.936433 0.152034
+    outer loop
+       vertex -30 -59.3653 8.70433
+       vertex -15 -64.3124 9.4297
+       vertex -30 -59.0706 10.5195
+    endloop
+  endfacet
+  facet normal -0.316194 -0.940661 0.123196
+    outer loop
+       vertex -15 -64.5711 7.45442
+       vertex -15 -64.3124 9.4297
+       vertex -30 -59.3653 8.70433
+    endloop
+  endfacet
+  facet normal -0.316194 -0.940661 0.123198
+    outer loop
+       vertex -30 -59.6041 6.88101
+       vertex -15 -64.5711 7.45442
+       vertex -30 -59.3653 8.70433
+    endloop
+  endfacet
+  facet normal -0.316194 -0.943992 0.094341
+    outer loop
+       vertex -15 -64.7692 5.47215
+       vertex -15 -64.5711 7.45442
+       vertex -30 -59.6041 6.88101
+    endloop
+  endfacet
+  facet normal -0.316192 -0.943991 0.0943576
+    outer loop
+       vertex -30 -59.787 5.05121
+       vertex -15 -64.7692 5.47215
+       vertex -30 -59.6041 6.88101
+    endloop
+  endfacet
+  facet normal -0.316192 -0.946439 0.0653837
+    outer loop
+       vertex -15 -64.9065 3.48473
+       vertex -15 -64.7692 5.47215
+       vertex -30 -59.787 5.05121
+    endloop
+  endfacet
+  facet normal -0.316194 -0.94644 0.0653653
+    outer loop
+       vertex -30 -59.9137 3.21667
+       vertex -15 -64.9065 3.48473
+       vertex -30 -59.787 5.05121
+    endloop
+  endfacet
+  facet normal -0.316194 -0.947998 0.036336
+    outer loop
+       vertex -15 -64.9828 1.49404
+       vertex -15 -64.9065 3.48473
+       vertex -30 -59.9137 3.21667
+    endloop
+  endfacet
+  facet normal -0.316196 -0.947998 0.0363195
+    outer loop
+       vertex -30 -59.9841 1.37911
+       vertex -15 -64.9828 1.49404
+       vertex -30 -59.9137 3.21667
+    endloop
+  endfacet
+  facet normal -0.316196 -0.948666 0.00728464
+    outer loop
+       vertex -15 -64.9981 -0.498052
+       vertex -15 -64.9828 1.49404
+       vertex -30 -59.9841 1.37911
+    endloop
+  endfacet
+  facet normal -0.316197 -0.948666 0.00727376
+    outer loop
+       vertex -30 -59.9982 -0.459741
+       vertex -15 -64.9981 -0.498052
+       vertex -30 -59.9841 1.37911
+    endloop
+  endfacet
+  facet normal -0.316197 -0.948443 -0.0218103
+    outer loop
+       vertex -15 -64.9523 -2.48968
+       vertex -15 -64.9981 -0.498052
+       vertex -30 -59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal -0.316192 -0.948445 -0.0217702
+    outer loop
+       vertex -30 -59.956 -2.29816
+       vertex -15 -64.9523 -2.48968
+       vertex -30 -59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal -0.316193 -0.947331 -0.0508619
+    outer loop
+       vertex -15 -64.8455 -4.47896
+       vertex -15 -64.9523 -2.48968
+       vertex -30 -59.956 -2.29816
+    endloop
+  endfacet
+  facet normal -0.316193 -0.94733 -0.0508688
+    outer loop
+       vertex -30 -59.8574 -4.13443
+       vertex -15 -64.8455 -4.47896
+       vertex -30 -59.956 -2.29816
+    endloop
+  endfacet
+  facet normal -0.316193 -0.945328 -0.0798587
+    outer loop
+       vertex -15 -64.6778 -6.46404
+       vertex -15 -64.8455 -4.47896
+       vertex -30 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -0.316194 -0.945327 -0.0798617
+    outer loop
+       vertex -30 -59.7026 -5.96681
+       vertex -15 -64.6778 -6.46404
+       vertex -30 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -0.316194 -0.942433 -0.108815
+    outer loop
+       vertex -15 -64.4493 -8.44305
+       vertex -15 -64.6778 -6.46404
+       vertex -30 -59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal -0.316192 -0.942435 -0.108803
+    outer loop
+       vertex -30 -59.4917 -7.79359
+       vertex -15 -64.4493 -8.44305
+       vertex -30 -59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal -0.316192 -0.938659 -0.137629
+    outer loop
+       vertex -15 -64.1603 -10.4141
+       vertex -15 -64.4493 -8.44305
+       vertex -30 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal -0.316194 -0.938657 -0.137642
+    outer loop
+       vertex -30 -59.2249 -9.61304
+       vertex -15 -64.1603 -10.4141
+       vertex -30 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal -0.316194 -0.933998 -0.166342
+    outer loop
+       vertex -15 -63.811 -12.3754
+       vertex -15 -64.1603 -10.4141
+       vertex -30 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal -0.316191 -0.934002 -0.166323
+    outer loop
+       vertex -30 -58.9025 -11.4235
+       vertex -15 -63.811 -12.3754
+       vertex -30 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal -0.316191 -0.928467 -0.194866
+    outer loop
+       vertex -15 -63.4018 -14.3251
+       vertex -15 -63.811 -12.3754
+       vertex -30 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal -0.31619 -0.928469 -0.194857
+    outer loop
+       vertex -30 -58.5248 -13.2232
+       vertex -15 -63.4018 -14.3251
+       vertex -30 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal -0.316191 -0.922065 -0.223205
+    outer loop
+       vertex -15 -62.9331 -16.2613
+       vertex -15 -63.4018 -14.3251
+       vertex -30 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal -0.316195 -0.922055 -0.22324
+    outer loop
+       vertex -30 -58.0921 -15.0104
+       vertex -15 -62.9331 -16.2613
+       vertex -30 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal -0.316195 -0.914778 -0.251399
+    outer loop
+       vertex -15 -62.4052 -18.1822
+       vertex -15 -62.9331 -16.2613
+       vertex -30 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal -0.316194 -0.91478 -0.251393
+    outer loop
+       vertex -30 -57.6048 -16.7836
+       vertex -15 -62.4052 -18.1822
+       vertex -30 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal -0.316194 -0.90665 -0.279296
+    outer loop
+       vertex -15 -61.8187 -20.0861
+       vertex -15 -62.4052 -18.1822
+       vertex -30 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal -0.316195 -0.906646 -0.27931
+    outer loop
+       vertex -30 -57.0634 -18.541
+       vertex -15 -61.8187 -20.0861
+       vertex -30 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal -0.316195 -0.897659 -0.306966
+    outer loop
+       vertex -15 -61.1741 -21.9711
+       vertex -15 -61.8187 -20.0861
+       vertex -30 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal -0.316195 -0.897662 -0.30696
+    outer loop
+       vertex -30 -56.4684 -20.281
+       vertex -15 -61.1741 -21.9711
+       vertex -30 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal -0.316195 -0.887843 -0.334298
+    outer loop
+       vertex -15 -60.4721 -23.8355
+       vertex -15 -61.1741 -21.9711
+       vertex -30 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal -0.316194 -0.887845 -0.334295
+    outer loop
+       vertex -30 -55.8204 -22.002
+       vertex -15 -60.4721 -23.8355
+       vertex -30 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal -0.316194 -0.877158 -0.361407
+    outer loop
+       vertex -15 -59.7132 -25.6774
+       vertex -15 -60.4721 -23.8355
+       vertex -30 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -0.316193 -0.877161 -0.3614
+    outer loop
+       vertex -30 -55.1199 -23.7022
+       vertex -15 -59.7132 -25.6774
+       vertex -30 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -0.316193 -0.865697 -0.388061
+    outer loop
+       vertex -15 -58.8983 -27.4953
+       vertex -15 -59.7132 -25.6774
+       vertex -30 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal -0.316194 -0.865694 -0.388067
+    outer loop
+       vertex -30 -54.3677 -25.3802
+       vertex -15 -58.8983 -27.4953
+       vertex -30 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal -0.316195 -0.853396 -0.414412
+    outer loop
+       vertex -15 -58.0281 -29.2873
+       vertex -15 -58.8983 -27.4953
+       vertex -30 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal -0.316195 -0.853393 -0.414417
+    outer loop
+       vertex -30 -53.5644 -27.0344
+       vertex -15 -58.0281 -29.2873
+       vertex -30 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal -0.316195 -0.840278 -0.440402
+    outer loop
+       vertex -15 -57.1033 -31.0518
+       vertex -15 -58.0281 -29.2873
+       vertex -30 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal -0.316196 -0.840273 -0.44041
+    outer loop
+       vertex -30 -52.7107 -28.6632
+       vertex -15 -57.1033 -31.0518
+       vertex -30 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal -0.316196 -0.826392 -0.465936
+    outer loop
+       vertex -15 -56.1249 -32.7871
+       vertex -15 -57.1033 -31.0518
+       vertex -30 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal -0.316195 -0.826397 -0.465927
+    outer loop
+       vertex -30 -51.8076 -30.265
+       vertex -15 -56.1249 -32.7871
+       vertex -30 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal -0.316195 -0.811741 -0.491017
+    outer loop
+       vertex -15 -55.0938 -34.4917
+       vertex -15 -56.1249 -32.7871
+       vertex -30 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal -0.316195 -0.811741 -0.491016
+    outer loop
+       vertex -30 -50.8558 -31.8385
+       vertex -15 -55.0938 -34.4917
+       vertex -30 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal -0.316195 -0.796288 -0.5157
+    outer loop
+       vertex -15 -54.0109 -36.1638
+       vertex -15 -55.0938 -34.4917
+       vertex -30 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal -0.316194 -0.796292 -0.515694
+    outer loop
+       vertex -30 -49.8562 -33.382
+       vertex -15 -54.0109 -36.1638
+       vertex -30 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal -0.316194 -0.780129 -0.539833
+    outer loop
+       vertex -15 -52.8773 -37.802
+       vertex -15 -54.0109 -36.1638
+       vertex -30 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal -0.316197 -0.780114 -0.539854
+    outer loop
+       vertex -30 -48.8098 -34.8941
+       vertex -15 -52.8773 -37.802
+       vertex -30 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal -0.316197 -0.763214 -0.563493
+    outer loop
+       vertex -15 -51.694 -39.4047
+       vertex -15 -52.8773 -37.802
+       vertex -30 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal -0.316194 -0.763231 -0.563471
+    outer loop
+       vertex -30 -47.7176 -36.3735
+       vertex -15 -51.694 -39.4047
+       vertex -30 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal -0.316194 -0.745585 -0.586621
+    outer loop
+       vertex -15 -50.4622 -40.9703
+       vertex -15 -51.694 -39.4047
+       vertex -30 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal -0.316195 -0.745578 -0.58663
+    outer loop
+       vertex -30 -46.5805 -37.8187
+       vertex -15 -50.4622 -40.9703
+       vertex -30 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal -0.316195 -0.727275 -0.609173
+    outer loop
+       vertex -15 -49.183 -42.4975
+       vertex -15 -50.4622 -40.9703
+       vertex -30 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal -0.316196 -0.72727 -0.609179
+    outer loop
+       vertex -30 -45.3997 -39.2284
+       vertex -15 -49.183 -42.4975
+       vertex -30 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal -0.316196 -0.708223 -0.631221
+    outer loop
+       vertex -15 -47.8575 -43.9847
+       vertex -15 -49.183 -42.4975
+       vertex -30 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal -0.316191 -0.708258 -0.631185
+    outer loop
+       vertex -30 -44.1762 -40.6013
+       vertex -15 -47.8575 -43.9847
+       vertex -30 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal -0.316191 -0.68859 -0.652585
+    outer loop
+       vertex -15 -46.4872 -45.4306
+       vertex -15 -47.8575 -43.9847
+       vertex -30 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -0.316194 -0.688567 -0.652608
+    outer loop
+       vertex -30 -42.9112 -41.936
+       vertex -15 -46.4872 -45.4306
+       vertex -30 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -0.316194 -0.668252 -0.673395
+    outer loop
+       vertex -15 -45.0731 -46.8339
+       vertex -15 -46.4872 -45.4306
+       vertex -30 -42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -0.316196 -0.668243 -0.673403
+    outer loop
+       vertex -30 -41.6059 -43.2313
+       vertex -15 -45.0731 -46.8339
+       vertex -30 -42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -0.316196 -0.647309 -0.69355
+    outer loop
+       vertex -15 -43.6167 -48.1932
+       vertex -15 -45.0731 -46.8339
+       vertex -30 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -0.316194 -0.647317 -0.693543
+    outer loop
+       vertex -30 -40.2616 -44.486
+       vertex -15 -43.6167 -48.1932
+       vertex -30 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -0.316195 -0.625761 -0.713053
+    outer loop
+       vertex -15 -42.1194 -49.5072
+       vertex -15 -43.6167 -48.1932
+       vertex -30 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -0.316199 -0.625732 -0.713076
+    outer loop
+       vertex -30 -38.8794 -45.6989
+       vertex -15 -42.1194 -49.5072
+       vertex -30 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -0.316199 -0.603584 -0.731918
+    outer loop
+       vertex -15 -40.5824 -50.7747
+       vertex -15 -42.1194 -49.5072
+       vertex -30 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -0.316196 -0.603603 -0.731904
+    outer loop
+       vertex -30 -37.4607 -46.8689
+       vertex -15 -40.5824 -50.7747
+       vertex -30 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -0.316196 -0.580897 -0.750052
+    outer loop
+       vertex -15 -39.0074 -51.9945
+       vertex -15 -40.5824 -50.7747
+       vertex -30 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -0.316197 -0.580894 -0.750055
+    outer loop
+       vertex -30 -36.0068 -47.9949
+       vertex -15 -39.0074 -51.9945
+       vertex -30 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -0.316196 -0.557607 -0.767525
+    outer loop
+       vertex -15 -37.3957 -53.1654
+       vertex -15 -39.0074 -51.9945
+       vertex -30 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -0.316192 -0.557637 -0.767505
+    outer loop
+       vertex -30 -34.5191 -49.0758
+       vertex -15 -37.3957 -53.1654
+       vertex -30 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -0.316192 -0.533844 -0.784241
+    outer loop
+       vertex -15 -35.7489 -54.2864
+       vertex -15 -37.3957 -53.1654
+       vertex -30 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -0.316195 -0.533824 -0.784253
+    outer loop
+       vertex -30 -32.999 -50.1105
+       vertex -15 -35.7489 -54.2864
+       vertex -30 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -0.316195 -0.509552 -0.800236
+    outer loop
+       vertex -15 -34.0685 -55.3564
+       vertex -15 -35.7489 -54.2864
+       vertex -30 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -0.316188 -0.509603 -0.800206
+    outer loop
+       vertex -30 -31.4479 -51.0983
+       vertex -15 -34.0685 -55.3564
+       vertex -30 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -0.316188 -0.484826 -0.815456
+    outer loop
+       vertex -15 -32.3561 -56.3745
+       vertex -15 -34.0685 -55.3564
+       vertex -30 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -0.316194 -0.484787 -0.815478
+    outer loop
+       vertex -30 -29.8672 -52.038
+       vertex -15 -32.3561 -56.3745
+       vertex -30 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -0.316193 -0.459554 -0.829959
+    outer loop
+       vertex -15 -30.6133 -57.3395
+       vertex -15 -32.3561 -56.3745
+       vertex -30 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -0.316191 -0.459575 -0.829948
+    outer loop
+       vertex -30 -28.2585 -52.9288
+       vertex -15 -30.6133 -57.3395
+       vertex -30 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -0.316191 -0.433976 -0.843616
+    outer loop
+       vertex -15 -28.8418 -58.2508
+       vertex -15 -30.6133 -57.3395
+       vertex -30 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -0.316198 -0.43392 -0.843642
+    outer loop
+       vertex -30 -26.6232 -53.7699
+       vertex -15 -28.8418 -58.2508
+       vertex -30 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -0.316198 -0.407884 -0.856534
+    outer loop
+       vertex -15 -27.0432 -59.1073
+       vertex -15 -28.8418 -58.2508
+       vertex -30 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -0.3162 -0.407867 -0.856541
+    outer loop
+       vertex -30 -24.9629 -54.5605
+       vertex -15 -27.0432 -59.1073
+       vertex -30 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -0.3162 -0.381395 -0.868651
+    outer loop
+       vertex -15 -25.2191 -59.9082
+       vertex -15 -27.0432 -59.1073
+       vertex -30 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -0.316192 -0.381458 -0.868627
+    outer loop
+       vertex -30 -23.2792 -55.2999
+       vertex -15 -25.2191 -59.9082
+       vertex -30 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -0.316192 -0.354643 -0.879915
+    outer loop
+       vertex -15 -23.3714 -60.6529
+       vertex -15 -25.2191 -59.9082
+       vertex -30 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -0.316194 -0.354631 -0.87992
+    outer loop
+       vertex -30 -21.5736 -55.9873
+       vertex -15 -23.3714 -60.6529
+       vertex -30 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -0.316194 -0.327533 -0.890362
+    outer loop
+       vertex -15 -21.5017 -61.3407
+       vertex -15 -23.3714 -60.6529
+       vertex -30 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -0.316199 -0.327487 -0.890376
+    outer loop
+       vertex -30 -19.8477 -56.6221
+       vertex -15 -21.5017 -61.3407
+       vertex -30 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -0.316199 -0.30006 -0.89999
+    outer loop
+       vertex -15 -19.6118 -61.9708
+       vertex -15 -21.5017 -61.3407
+       vertex -30 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -0.316195 -0.300096 -0.899979
+    outer loop
+       vertex -30 -18.1032 -57.2038
+       vertex -15 -19.6118 -61.9708
+       vertex -30 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -0.316195 -0.272349 -0.908761
+    outer loop
+       vertex -15 -17.7035 -62.5427
+       vertex -15 -19.6118 -61.9708
+       vertex -30 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -0.316196 -0.272345 -0.908762
+    outer loop
+       vertex -30 -16.3417 -57.7317
+       vertex -15 -17.7035 -62.5427
+       vertex -30 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -0.316196 -0.244351 -0.916686
+    outer loop
+       vertex -15 -15.7786 -63.0558
+       vertex -15 -17.7035 -62.5427
+       vertex -30 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -0.316191 -0.244388 -0.916678
+    outer loop
+       vertex -30 -14.5649 -58.2054
+       vertex -15 -15.7786 -63.0558
+       vertex -30 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -0.316191 -0.21616 -0.923741
+    outer loop
+       vertex -15 -13.8389 -63.5097
+       vertex -15 -15.7786 -63.0558
+       vertex -30 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -0.316192 -0.216157 -0.923742
+    outer loop
+       vertex -30 -12.7743 -58.6244
+       vertex -15 -13.8389 -63.5097
+       vertex -30 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -0.316192 -0.187766 -0.929928
+    outer loop
+       vertex -15 -11.8861 -63.904
+       vertex -15 -13.8389 -63.5097
+       vertex -30 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -0.316195 -0.18774 -0.929933
+    outer loop
+       vertex -30 -10.9718 -58.9883
+       vertex -15 -11.8861 -63.904
+       vertex -30 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -0.316195 -0.159152 -0.93525
+    outer loop
+       vertex -15 -9.9222 -64.2382
+       vertex -15 -11.8861 -63.904
+       vertex -30 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -0.316194 -0.159155 -0.935249
+    outer loop
+       vertex -30 -9.15896 -59.2968
+       vertex -15 -9.9222 -64.2382
+       vertex -30 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -0.316194 -0.130437 -0.939685
+    outer loop
+       vertex -15 -7.94897 -64.5121
+       vertex -15 -9.9222 -64.2382
+       vertex -30 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -0.31619 -0.130472 -0.939681
+    outer loop
+       vertex -30 -7.33751 -59.5497
+       vertex -15 -7.94897 -64.5121
+       vertex -30 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -0.31619 -0.101578 -0.943242
+    outer loop
+       vertex -15 -5.96827 -64.7254
+       vertex -15 -7.94897 -64.5121
+       vertex -30 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -0.316196 -0.101528 -0.943246
+    outer loop
+       vertex -30 -5.50917 -59.7465
+       vertex -15 -5.96827 -64.7254
+       vertex -30 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -0.316196 -0.072621 -0.94591
+    outer loop
+       vertex -15 -3.98196 -64.8779
+       vertex -15 -5.96827 -64.7254
+       vertex -30 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0726391 -0.94591
+    outer loop
+       vertex -30 -3.67566 -59.8873
+       vertex -15 -3.98196 -64.8779
+       vertex -30 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0436208 -0.947691
+    outer loop
+       vertex -15 -1.99192 -64.9695
+       vertex -15 -3.98196 -64.8779
+       vertex -30 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -0.316197 -0.0435951 -0.947691
+    outer loop
+       vertex -30 -1.83869 -59.9718
+       vertex -15 -1.99192 -64.9695
+       vertex -30 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -0.316197 -0.0145257 -0.948582
+    outer loop
+       vertex -15 0 -65
+       vertex -15 -1.99192 -64.9695
+       vertex -30 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0145475 -0.948583
+    outer loop
+       vertex -30 0 -60
+       vertex -15 0 -65
+       vertex -30 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal -0.316194 0.0145257 -0.948583
+    outer loop
+       vertex -15 1.99192 -64.9695
+       vertex -15 0 -65
+       vertex -30 0 -60
+    endloop
+  endfacet
+  facet normal -0.316197 0.0145475 -0.948582
+    outer loop
+       vertex -15 1.99192 -64.9695
+       vertex -30 0 -60
+       vertex -30 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal -0.316197 0.0436207 -0.94769
+    outer loop
+       vertex -15 3.98196 -64.8779
+       vertex -15 1.99192 -64.9695
+       vertex -30 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal -0.316194 0.0435952 -0.947692
+    outer loop
+       vertex -15 3.98196 -64.8779
+       vertex -30 1.83869 -59.9718
+       vertex -30 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -0.316194 0.0726211 -0.945911
+    outer loop
+       vertex -15 5.96827 -64.7254
+       vertex -15 3.98196 -64.8779
+       vertex -30 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -0.316196 0.072639 -0.945909
+    outer loop
+       vertex -15 5.96827 -64.7254
+       vertex -30 3.67566 -59.8873
+       vertex -30 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -0.316196 0.101578 -0.94324
+    outer loop
+       vertex -15 7.94897 -64.5121
+       vertex -15 5.96827 -64.7254
+       vertex -30 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -0.31619 0.101528 -0.943248
+    outer loop
+       vertex -15 7.94897 -64.5121
+       vertex -30 5.50917 -59.7465
+       vertex -30 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -0.31619 0.130437 -0.939686
+    outer loop
+       vertex -15 9.9222 -64.2382
+       vertex -15 7.94897 -64.5121
+       vertex -30 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -0.316194 0.130472 -0.93968
+    outer loop
+       vertex -15 9.9222 -64.2382
+       vertex -30 7.33751 -59.5497
+       vertex -30 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -0.316194 0.159152 -0.93525
+    outer loop
+       vertex -15 11.8861 -63.904
+       vertex -15 9.9222 -64.2382
+       vertex -30 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -0.316195 0.159155 -0.935249
+    outer loop
+       vertex -15 11.8861 -63.904
+       vertex -30 9.15896 -59.2968
+       vertex -30 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -0.316195 0.187766 -0.929927
+    outer loop
+       vertex -15 13.8389 -63.5097
+       vertex -15 11.8861 -63.904
+       vertex -30 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -0.316192 0.18774 -0.929934
+    outer loop
+       vertex -15 13.8389 -63.5097
+       vertex -30 10.9718 -58.9883
+       vertex -30 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -0.316192 0.21616 -0.923741
+    outer loop
+       vertex -15 15.7786 -63.0558
+       vertex -15 13.8389 -63.5097
+       vertex -30 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -0.316191 0.216157 -0.923742
+    outer loop
+       vertex -15 15.7786 -63.0558
+       vertex -30 12.7743 -58.6244
+       vertex -30 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -0.316191 0.244351 -0.916687
+    outer loop
+       vertex -15 17.7035 -62.5427
+       vertex -15 15.7786 -63.0558
+       vertex -30 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -0.316196 0.244387 -0.916676
+    outer loop
+       vertex -15 17.7035 -62.5427
+       vertex -30 14.5649 -58.2054
+       vertex -30 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -0.316196 0.272349 -0.908761
+    outer loop
+       vertex -15 19.6118 -61.9708
+       vertex -15 17.7035 -62.5427
+       vertex -30 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -0.316195 0.272345 -0.908762
+    outer loop
+       vertex -15 19.6118 -61.9708
+       vertex -30 16.3417 -57.7317
+       vertex -30 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -0.316195 0.300061 -0.899991
+    outer loop
+       vertex -15 21.5017 -61.3407
+       vertex -15 19.6118 -61.9708
+       vertex -30 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -0.316199 0.300096 -0.899978
+    outer loop
+       vertex -15 21.5017 -61.3407
+       vertex -30 18.1032 -57.2038
+       vertex -30 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -0.316199 0.327532 -0.89036
+    outer loop
+       vertex -15 23.3714 -60.6529
+       vertex -15 21.5017 -61.3407
+       vertex -30 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -0.316194 0.327488 -0.890378
+    outer loop
+       vertex -15 23.3714 -60.6529
+       vertex -30 19.8477 -56.6221
+       vertex -30 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -0.316194 0.354643 -0.879915
+    outer loop
+       vertex -15 25.2191 -59.9082
+       vertex -15 23.3714 -60.6529
+       vertex -30 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -0.316192 0.354631 -0.87992
+    outer loop
+       vertex -15 25.2191 -59.9082
+       vertex -30 21.5736 -55.9873
+       vertex -30 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -0.316192 0.381396 -0.868654
+    outer loop
+       vertex -15 27.0432 -59.1073
+       vertex -15 25.2191 -59.9082
+       vertex -30 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -0.3162 0.381457 -0.868624
+    outer loop
+       vertex -15 27.0432 -59.1073
+       vertex -30 23.2792 -55.2999
+       vertex -30 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -0.3162 0.407883 -0.856533
+    outer loop
+       vertex -15 28.8418 -58.2508
+       vertex -15 27.0432 -59.1073
+       vertex -30 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -0.316198 0.407867 -0.856541
+    outer loop
+       vertex -15 28.8418 -58.2508
+       vertex -30 24.9629 -54.5605
+       vertex -30 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -0.316198 0.433975 -0.843614
+    outer loop
+       vertex -15 30.6133 -57.3395
+       vertex -15 28.8418 -58.2508
+       vertex -30 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -0.316191 0.433921 -0.843644
+    outer loop
+       vertex -15 30.6133 -57.3395
+       vertex -30 26.6232 -53.7699
+       vertex -30 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -0.316191 0.459555 -0.829959
+    outer loop
+       vertex -15 32.3561 -56.3745
+       vertex -15 30.6133 -57.3395
+       vertex -30 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -0.316194 0.459574 -0.829948
+    outer loop
+       vertex -15 32.3561 -56.3745
+       vertex -30 28.2585 -52.9288
+       vertex -30 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -0.316193 0.484825 -0.815455
+    outer loop
+       vertex -15 34.0685 -55.3564
+       vertex -15 32.3561 -56.3745
+       vertex -30 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -0.316188 0.484787 -0.815479
+    outer loop
+       vertex -15 34.0685 -55.3564
+       vertex -30 29.8672 -52.038
+       vertex -30 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -0.316188 0.509553 -0.800238
+    outer loop
+       vertex -15 35.7489 -54.2864
+       vertex -15 34.0685 -55.3564
+       vertex -30 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -0.316195 0.509601 -0.800204
+    outer loop
+       vertex -15 35.7489 -54.2864
+       vertex -30 31.4479 -51.0983
+       vertex -30 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -0.316195 0.533843 -0.78424
+    outer loop
+       vertex -15 37.3957 -53.1654
+       vertex -15 35.7489 -54.2864
+       vertex -30 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -0.316192 0.533824 -0.784254
+    outer loop
+       vertex -15 37.3957 -53.1654
+       vertex -30 32.999 -50.1105
+       vertex -30 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -0.316192 0.557608 -0.767526
+    outer loop
+       vertex -15 39.0074 -51.9945
+       vertex -15 37.3957 -53.1654
+       vertex -30 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -0.316197 0.557636 -0.767503
+    outer loop
+       vertex -15 39.0074 -51.9945
+       vertex -30 34.5191 -49.0758
+       vertex -30 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -0.316197 0.580897 -0.750052
+    outer loop
+       vertex -15 40.5824 -50.7747
+       vertex -15 39.0074 -51.9945
+       vertex -30 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -0.316196 0.580894 -0.750055
+    outer loop
+       vertex -15 40.5824 -50.7747
+       vertex -30 36.0068 -47.9949
+       vertex -30 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -0.316196 0.603585 -0.731919
+    outer loop
+       vertex -15 42.1194 -49.5072
+       vertex -15 40.5824 -50.7747
+       vertex -30 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -0.316199 0.603602 -0.731904
+    outer loop
+       vertex -15 42.1194 -49.5072
+       vertex -30 37.4607 -46.8689
+       vertex -30 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -0.316199 0.62576 -0.713052
+    outer loop
+       vertex -15 43.6167 -48.1932
+       vertex -15 42.1194 -49.5072
+       vertex -30 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -0.316194 0.625733 -0.713077
+    outer loop
+       vertex -15 43.6167 -48.1932
+       vertex -30 38.8794 -45.6989
+       vertex -30 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -0.316194 0.647309 -0.69355
+    outer loop
+       vertex -15 45.0731 -46.8339
+       vertex -15 43.6167 -48.1932
+       vertex -30 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -0.316196 0.647317 -0.693543
+    outer loop
+       vertex -15 45.0731 -46.8339
+       vertex -30 40.2616 -44.486
+       vertex -30 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -0.316196 0.668252 -0.673394
+    outer loop
+       vertex -15 46.4872 -45.4306
+       vertex -15 45.0731 -46.8339
+       vertex -30 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -0.316194 0.668243 -0.673403
+    outer loop
+       vertex -15 46.4872 -45.4306
+       vertex -30 41.6059 -43.2313
+       vertex -30 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -0.316194 0.688589 -0.652584
+    outer loop
+       vertex -15 47.8575 -43.9847
+       vertex -15 46.4872 -45.4306
+       vertex -30 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -0.316191 0.688568 -0.652609
+    outer loop
+       vertex -15 47.8575 -43.9847
+       vertex -30 42.9112 -41.936
+       vertex -30 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -0.316191 0.708225 -0.631222
+    outer loop
+       vertex -15 49.183 -42.4975
+       vertex -15 47.8575 -43.9847
+       vertex -30 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -0.316197 0.708256 -0.631184
+    outer loop
+       vertex -15 49.183 -42.4975
+       vertex -30 44.1762 -40.6013
+       vertex -30 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal -0.316196 0.727274 -0.609173
+    outer loop
+       vertex -15 50.4622 -40.9703
+       vertex -15 49.183 -42.4975
+       vertex -30 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal -0.316195 0.72727 -0.609179
+    outer loop
+       vertex -15 50.4622 -40.9703
+       vertex -30 45.3997 -39.2284
+       vertex -30 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal -0.316195 0.745585 -0.586621
+    outer loop
+       vertex -15 51.694 -39.4047
+       vertex -15 50.4622 -40.9703
+       vertex -30 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal -0.316194 0.745578 -0.58663
+    outer loop
+       vertex -15 51.694 -39.4047
+       vertex -30 46.5805 -37.8187
+       vertex -30 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal -0.316194 0.763215 -0.563493
+    outer loop
+       vertex -15 52.8773 -37.802
+       vertex -15 51.694 -39.4047
+       vertex -30 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal -0.316197 0.76323 -0.56347
+    outer loop
+       vertex -15 52.8773 -37.802
+       vertex -30 47.7176 -36.3735
+       vertex -30 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal -0.316197 0.780129 -0.539832
+    outer loop
+       vertex -15 54.0109 -36.1638
+       vertex -15 52.8773 -37.802
+       vertex -30 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal -0.316194 0.780115 -0.539854
+    outer loop
+       vertex -15 54.0109 -36.1638
+       vertex -30 48.8098 -34.8941
+       vertex -30 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal -0.316194 0.796288 -0.5157
+    outer loop
+       vertex -15 55.0938 -34.4917
+       vertex -15 54.0109 -36.1638
+       vertex -30 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal -0.316195 0.796292 -0.515693
+    outer loop
+       vertex -15 55.0938 -34.4917
+       vertex -30 49.8562 -33.382
+       vertex -30 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal -0.316195 0.811741 -0.491017
+    outer loop
+       vertex -15 56.1249 -32.7871
+       vertex -15 55.0938 -34.4917
+       vertex -30 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal -0.316195 0.811741 -0.491016
+    outer loop
+       vertex -15 56.1249 -32.7871
+       vertex -30 50.8558 -31.8385
+       vertex -30 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal -0.316195 0.826392 -0.465936
+    outer loop
+       vertex -15 57.1033 -31.0518
+       vertex -15 56.1249 -32.7871
+       vertex -30 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal -0.316196 0.826397 -0.465927
+    outer loop
+       vertex -15 57.1033 -31.0518
+       vertex -30 51.8076 -30.265
+       vertex -30 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal -0.316196 0.840277 -0.440402
+    outer loop
+       vertex -15 58.0281 -29.2873
+       vertex -15 57.1033 -31.0518
+       vertex -30 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal -0.316195 0.840273 -0.44041
+    outer loop
+       vertex -15 58.0281 -29.2873
+       vertex -30 52.7107 -28.6632
+       vertex -30 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal -0.316195 0.853395 -0.414412
+    outer loop
+       vertex -15 58.8983 -27.4953
+       vertex -15 58.0281 -29.2873
+       vertex -30 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal -0.316194 0.853393 -0.414417
+    outer loop
+       vertex -15 58.8983 -27.4953
+       vertex -30 53.5644 -27.0344
+       vertex -30 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal -0.316194 0.865696 -0.388061
+    outer loop
+       vertex -15 59.7132 -25.6774
+       vertex -15 58.8983 -27.4953
+       vertex -30 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal -0.316193 0.865694 -0.388067
+    outer loop
+       vertex -15 59.7132 -25.6774
+       vertex -30 54.3677 -25.3802
+       vertex -30 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal -0.316193 0.877158 -0.361407
+    outer loop
+       vertex -15 60.4721 -23.8355
+       vertex -15 59.7132 -25.6774
+       vertex -30 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal -0.316194 0.877161 -0.3614
+    outer loop
+       vertex -15 60.4721 -23.8355
+       vertex -30 55.1199 -23.7022
+       vertex -30 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -0.316194 0.887843 -0.334298
+    outer loop
+       vertex -15 61.1741 -21.9711
+       vertex -15 60.4721 -23.8355
+       vertex -30 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal -0.316195 0.887844 -0.334295
+    outer loop
+       vertex -15 61.1741 -21.9711
+       vertex -30 55.8204 -22.002
+       vertex -30 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal -0.316195 0.89766 -0.306966
+    outer loop
+       vertex -15 61.8187 -20.0861
+       vertex -15 61.1741 -21.9711
+       vertex -30 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal -0.316195 0.897662 -0.30696
+    outer loop
+       vertex -15 61.8187 -20.0861
+       vertex -30 56.4684 -20.281
+       vertex -30 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal -0.316195 0.90665 -0.279296
+    outer loop
+       vertex -15 62.4052 -18.1822
+       vertex -15 61.8187 -20.0861
+       vertex -30 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal -0.316194 0.906646 -0.27931
+    outer loop
+       vertex -15 62.4052 -18.1822
+       vertex -30 57.0634 -18.541
+       vertex -30 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal -0.316194 0.914779 -0.251399
+    outer loop
+       vertex -15 62.9331 -16.2613
+       vertex -15 62.4052 -18.1822
+       vertex -30 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal -0.316195 0.91478 -0.251393
+    outer loop
+       vertex -15 62.9331 -16.2613
+       vertex -30 57.6048 -16.7836
+       vertex -30 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal -0.316195 0.922063 -0.223204
+    outer loop
+       vertex -15 63.4018 -14.3251
+       vertex -15 62.9331 -16.2613
+       vertex -30 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal -0.31619 0.922056 -0.22324
+    outer loop
+       vertex -15 63.4018 -14.3251
+       vertex -30 58.0921 -15.0104
+       vertex -30 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal -0.31619 0.928467 -0.194866
+    outer loop
+       vertex -15 63.811 -12.3754
+       vertex -15 63.4018 -14.3251
+       vertex -30 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal -0.316191 0.928469 -0.194857
+    outer loop
+       vertex -15 63.811 -12.3754
+       vertex -30 58.5248 -13.2232
+       vertex -30 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal -0.316192 0.933999 -0.166342
+    outer loop
+       vertex -15 64.1603 -10.4141
+       vertex -15 63.811 -12.3754
+       vertex -30 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal -0.316194 0.934001 -0.166323
+    outer loop
+       vertex -15 64.1603 -10.4141
+       vertex -30 58.9025 -11.4235
+       vertex -30 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal -0.316194 0.938658 -0.137629
+    outer loop
+       vertex -15 64.4493 -8.44305
+       vertex -15 64.1603 -10.4141
+       vertex -30 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal -0.316192 0.938657 -0.137642
+    outer loop
+       vertex -15 64.4493 -8.44305
+       vertex -30 59.2249 -9.61304
+       vertex -30 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal -0.316192 0.942434 -0.108815
+    outer loop
+       vertex -15 64.6778 -6.46404
+       vertex -15 64.4493 -8.44305
+       vertex -30 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal -0.316194 0.942435 -0.108803
+    outer loop
+       vertex -15 64.6778 -6.46404
+       vertex -30 59.4917 -7.79359
+       vertex -30 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal -0.316194 0.945328 -0.0798587
+    outer loop
+       vertex -15 64.8455 -4.47896
+       vertex -15 64.6778 -6.46404
+       vertex -30 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal -0.316193 0.945327 -0.0798617
+    outer loop
+       vertex -15 64.8455 -4.47896
+       vertex -30 59.7026 -5.96681
+       vertex -30 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -0.316193 0.94733 -0.0508619
+    outer loop
+       vertex -15 64.9523 -2.48968
+       vertex -15 64.8455 -4.47896
+       vertex -30 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal -0.316193 0.94733 -0.0508689
+    outer loop
+       vertex -15 64.9523 -2.48968
+       vertex -30 59.8574 -4.13443
+       vertex -30 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal -0.316193 0.948444 -0.0218103
+    outer loop
+       vertex -15 64.9981 -0.498052
+       vertex -15 64.9523 -2.48968
+       vertex -30 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal -0.316197 0.948444 -0.0217701
+    outer loop
+       vertex -15 64.9981 -0.498052
+       vertex -30 59.956 -2.29816
+       vertex -30 59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal -0.316197 0.948666 0.00728464
+    outer loop
+       vertex -15 64.9828 1.49404
+       vertex -15 64.9981 -0.498052
+       vertex -30 59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal -0.316196 0.948666 0.00727376
+    outer loop
+       vertex -15 64.9828 1.49404
+       vertex -30 59.9982 -0.459741
+       vertex -30 59.9841 1.37911
+    endloop
+  endfacet
+  facet normal -0.316196 0.947998 0.036336
+    outer loop
+       vertex -15 64.9065 3.48473
+       vertex -15 64.9828 1.49404
+       vertex -30 59.9841 1.37911
+    endloop
+  endfacet
+  facet normal -0.316194 0.947999 0.0363196
+    outer loop
+       vertex -15 64.9065 3.48473
+       vertex -30 59.9841 1.37911
+       vertex -30 59.9137 3.21667
+    endloop
+  endfacet
+  facet normal -0.316194 0.946439 0.0653836
+    outer loop
+       vertex -15 64.7692 5.47215
+       vertex -15 64.9065 3.48473
+       vertex -30 59.9137 3.21667
+    endloop
+  endfacet
+  facet normal -0.316192 0.946441 0.0653653
+    outer loop
+       vertex -15 64.7692 5.47215
+       vertex -30 59.9137 3.21667
+       vertex -30 59.787 5.05121
+    endloop
+  endfacet
+  facet normal -0.316192 0.943993 0.0943411
+    outer loop
+       vertex -15 64.5711 7.45442
+       vertex -15 64.7692 5.47215
+       vertex -30 59.787 5.05121
+    endloop
+  endfacet
+  facet normal -0.316194 0.943991 0.0943575
+    outer loop
+       vertex -15 64.5711 7.45442
+       vertex -30 59.787 5.05121
+       vertex -30 59.6041 6.88101
+    endloop
+  endfacet
+  facet normal -0.316194 0.940662 0.123196
+    outer loop
+       vertex -15 64.3124 9.4297
+       vertex -15 64.5711 7.45442
+       vertex -30 59.6041 6.88101
+    endloop
+  endfacet
+  facet normal -0.316194 0.940661 0.123198
+    outer loop
+       vertex -15 64.3124 9.4297
+       vertex -30 59.6041 6.88101
+       vertex -30 59.3653 8.70433
+    endloop
+  endfacet
+  facet normal -0.316194 0.936437 0.15201
+    outer loop
+       vertex -15 63.9932 11.3961
+       vertex -15 64.3124 9.4297
+       vertex -30 59.3653 8.70433
+    endloop
+  endfacet
+  facet normal -0.316197 0.936432 0.152034
+    outer loop
+       vertex -15 63.9932 11.3961
+       vertex -30 59.3653 8.70433
+       vertex -30 59.0706 10.5195
+    endloop
+  endfacet
+  facet normal -0.316197 0.931339 0.180629
+    outer loop
+       vertex -15 63.6139 13.3518
+       vertex -15 63.9932 11.3961
+       vertex -30 59.0706 10.5195
+    endloop
+  endfacet
+  facet normal -0.316195 0.931343 0.180613
+    outer loop
+       vertex -15 63.6139 13.3518
+       vertex -30 59.0706 10.5195
+       vertex -30 58.7205 12.3248
+    endloop
+  endfacet
+  facet normal -0.316195 0.925374 0.209056
+    outer loop
+       vertex -15 63.1749 15.295
+       vertex -15 63.6139 13.3518
+       vertex -30 58.7205 12.3248
+    endloop
+  endfacet
+  facet normal -0.316193 0.925377 0.209045
+    outer loop
+       vertex -15 63.1749 15.295
+       vertex -30 58.7205 12.3248
+       vertex -30 58.3153 14.1185
+    endloop
+  endfacet
+  facet normal -0.316194 0.918525 0.237347
+    outer loop
+       vertex -15 62.6765 17.2238
+       vertex -15 63.1749 15.295
+       vertex -30 58.3153 14.1185
+    endloop
+  endfacet
+  facet normal -0.316196 0.918519 0.237367
+    outer loop
+       vertex -15 62.6765 17.2238
+       vertex -30 58.3153 14.1185
+       vertex -30 57.8552 15.8989
+    endloop
+  endfacet
+  facet normal -0.316196 0.910816 0.265395
+    outer loop
+       vertex -15 62.1192 19.1364
+       vertex -15 62.6765 17.2238
+       vertex -30 57.8552 15.8989
+    endloop
+  endfacet
+  facet normal -0.316194 0.910821 0.265379
+    outer loop
+       vertex -15 62.1192 19.1364
+       vertex -30 57.8552 15.8989
+       vertex -30 57.3408 17.6644
+    endloop
+  endfacet
+  facet normal -0.316194 0.902266 0.293152
+    outer loop
+       vertex -15 61.5036 21.0311
+       vertex -15 62.1192 19.1364
+       vertex -30 57.3408 17.6644
+    endloop
+  endfacet
+  facet normal -0.316192 0.90227 0.29314
+    outer loop
+       vertex -15 61.5036 21.0311
+       vertex -30 57.3408 17.6644
+       vertex -30 56.7726 19.4133
+    endloop
+  endfacet
+  facet normal -0.316192 0.892852 0.320682
+    outer loop
+       vertex -15 60.8302 22.906
+       vertex -15 61.5036 21.0311
+       vertex -30 56.7726 19.4133
+    endloop
+  endfacet
+  facet normal -0.316192 0.892854 0.320677
+    outer loop
+       vertex -15 60.8302 22.906
+       vertex -30 56.7726 19.4133
+       vertex -30 56.151 21.144
+    endloop
+  endfacet
+  facet normal -0.316192 0.882607 0.34789
+    outer loop
+       vertex -15 60.0997 24.7593
+       vertex -15 60.8302 22.906
+       vertex -30 56.151 21.144
+    endloop
+  endfacet
+  facet normal -0.31619 0.882613 0.347876
+    outer loop
+       vertex -15 60.0997 24.7593
+       vertex -30 56.151 21.144
+       vertex -30 55.4767 22.8548
+    endloop
+  endfacet
+  facet normal -0.31619 0.871535 0.374768
+    outer loop
+       vertex -15 59.3127 26.5895
+       vertex -15 60.0997 24.7593
+       vertex -30 55.4767 22.8548
+    endloop
+  endfacet
+  facet normal -0.316195 0.871517 0.374805
+    outer loop
+       vertex -15 59.3127 26.5895
+       vertex -30 55.4767 22.8548
+       vertex -30 54.7502 24.5441
+    endloop
+  endfacet
+  facet normal -0.316195 0.859633 0.401313
+    outer loop
+       vertex -15 58.47 28.3946
+       vertex -15 59.3127 26.5895
+       vertex -30 54.7502 24.5441
+    endloop
+  endfacet
+  facet normal -0.316189 0.859655 0.401271
+    outer loop
+       vertex -15 58.47 28.3946
+       vertex -30 54.7502 24.5441
+       vertex -30 53.9724 26.2104
+    endloop
+  endfacet
+  facet normal -0.31619 0.846943 0.427449
+    outer loop
+       vertex -15 57.5724 30.1731
+       vertex -15 58.47 28.3946
+       vertex -30 53.9724 26.2104
+    endloop
+  endfacet
+  facet normal -0.316192 0.846933 0.427466
+    outer loop
+       vertex -15 57.5724 30.1731
+       vertex -30 53.9724 26.2104
+       vertex -30 53.1438 27.8521
+    endloop
+  endfacet
+  facet normal -0.316192 0.833436 0.453219
+    outer loop
+       vertex -15 56.6207 31.9232
+       vertex -15 57.5724 30.1731
+       vertex -30 53.1438 27.8521
+    endloop
+  endfacet
+  facet normal -0.316191 0.833437 0.453217
+    outer loop
+       vertex -15 56.6207 31.9232
+       vertex -30 53.1438 27.8521
+       vertex -30 52.2653 29.4676
+    endloop
+  endfacet
+  facet normal -0.316191 0.81917 0.478522
+    outer loop
+       vertex -15 55.6159 33.6433
+       vertex -15 56.6207 31.9232
+       vertex -30 52.2653 29.4676
+    endloop
+  endfacet
+  facet normal -0.316196 0.819151 0.478552
+    outer loop
+       vertex -15 55.6159 33.6433
+       vertex -30 52.2653 29.4676
+       vertex -30 51.3377 31.0554
+    endloop
+  endfacet
+  facet normal -0.316196 0.804122 0.503396
+    outer loop
+       vertex -15 54.5588 35.3319
+       vertex -15 55.6159 33.6433
+       vertex -30 51.3377 31.0554
+    endloop
+  endfacet
+  facet normal -0.316197 0.804117 0.503404
+    outer loop
+       vertex -15 54.5588 35.3319
+       vertex -30 51.3377 31.0554
+       vertex -30 50.3619 32.6141
+    endloop
+  endfacet
+  facet normal -0.316196 0.78829 0.527843
+    outer loop
+       vertex -15 53.4504 36.9872
+       vertex -15 54.5588 35.3319
+       vertex -30 50.3619 32.6141
+    endloop
+  endfacet
+  facet normal -0.316194 0.788304 0.527824
+    outer loop
+       vertex -15 53.4504 36.9872
+       vertex -30 50.3619 32.6141
+       vertex -30 49.3388 34.1421
+    endloop
+  endfacet
+  facet normal -0.316194 0.771769 0.55172
+    outer loop
+       vertex -15 52.2918 38.6079
+       vertex -15 53.4504 36.9872
+       vertex -30 49.3388 34.1421
+    endloop
+  endfacet
+  facet normal -0.316194 0.771765 0.551724
+    outer loop
+       vertex -15 52.2918 38.6079
+       vertex -30 49.3388 34.1421
+       vertex -30 48.2694 35.638
+    endloop
+  endfacet
+  facet normal -0.316194 0.75448 0.575135
+    outer loop
+       vertex -15 51.0841 40.1922
+       vertex -15 52.2918 38.6079
+       vertex -30 48.2694 35.638
+    endloop
+  endfacet
+  facet normal -0.316192 0.754493 0.57512
+    outer loop
+       vertex -15 51.0841 40.1922
+       vertex -30 48.2694 35.638
+       vertex -30 47.1546 37.1005
+    endloop
+  endfacet
+  facet normal -0.316192 0.736509 0.597978
+    outer loop
+       vertex -15 49.8284 41.7388
+       vertex -15 51.0841 40.1922
+       vertex -30 47.1546 37.1005
+    endloop
+  endfacet
+  facet normal -0.316193 0.736504 0.597983
+    outer loop
+       vertex -15 49.8284 41.7388
+       vertex -30 47.1546 37.1005
+       vertex -30 45.9955 38.5281
+    endloop
+  endfacet
+  facet normal -0.316193 0.717864 0.620237
+    outer loop
+       vertex -15 48.526 43.2462
+       vertex -15 49.8284 41.7388
+       vertex -30 45.9955 38.5281
+    endloop
+  endfacet
+  facet normal -0.316199 0.717831 0.620272
+    outer loop
+       vertex -15 48.526 43.2462
+       vertex -30 45.9955 38.5281
+       vertex -30 44.7932 39.9195
+    endloop
+  endfacet
+  facet normal -0.316198 0.698471 0.641994
+    outer loop
+       vertex -15 47.1779 44.7129
+       vertex -15 48.526 43.2462
+       vertex -30 44.7932 39.9195
+    endloop
+  endfacet
+  facet normal -0.316193 0.698503 0.641962
+    outer loop
+       vertex -15 47.1779 44.7129
+       vertex -30 44.7932 39.9195
+       vertex -30 43.5488 41.2735
+    endloop
+  endfacet
+  facet normal -0.316193 0.678499 0.663069
+    outer loop
+       vertex -15 45.7855 46.1377
+       vertex -15 47.1779 44.7129
+       vertex -30 43.5488 41.2735
+    endloop
+  endfacet
+  facet normal -0.316194 0.678497 0.663071
+    outer loop
+       vertex -15 45.7855 46.1377
+       vertex -30 43.5488 41.2735
+       vertex -30 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -0.316194 0.657848 0.683562
+    outer loop
+       vertex -15 44.3501 47.5191
+       vertex -15 45.7855 46.1377
+       vertex -30 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -0.316192 0.65786 0.683552
+    outer loop
+       vertex -15 44.3501 47.5191
+       vertex -30 42.2636 42.5886
+       vertex -30 40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -0.316192 0.636614 0.703381
+    outer loop
+       vertex -15 42.8731 48.8559
+       vertex -15 44.3501 47.5191
+       vertex -30 40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -0.316195 0.636594 0.703398
+    outer loop
+       vertex -15 42.8731 48.8559
+       vertex -30 40.9386 43.8638
+       vertex -30 39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -0.316195 0.614751 0.722566
+    outer loop
+       vertex -15 41.3558 50.1468
+       vertex -15 42.8731 48.8559
+       vertex -30 39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -0.316196 0.614746 0.722571
+    outer loop
+       vertex -15 41.3558 50.1468
+       vertex -30 39.5751 45.0978
+       vertex -30 38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -0.316196 0.592306 0.741076
+    outer loop
+       vertex -15 39.7996 51.3906
+       vertex -15 41.3558 50.1468
+       vertex -30 38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -0.316193 0.592324 0.741063
+    outer loop
+       vertex -15 39.7996 51.3906
+       vertex -30 38.1745 46.2894
+       vertex -30 36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -0.316193 0.56931 0.758886
+    outer loop
+       vertex -15 38.206 52.5861
+       vertex -15 39.7996 51.3906
+       vertex -30 36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -0.316194 0.5693 0.758893
+    outer loop
+       vertex -15 38.206 52.5861
+       vertex -30 36.7381 47.4375
+       vertex -30 35.2671 48.541
+    endloop
+  endfacet
+  facet normal -0.316194 0.545803 0.775964
+    outer loop
+       vertex -15 36.5766 53.7322
+       vertex -15 38.206 52.5861
+       vertex -30 35.2671 48.541
+    endloop
+  endfacet
+  facet normal -0.316193 0.545815 0.775956
+    outer loop
+       vertex -15 36.5766 53.7322
+       vertex -30 35.2671 48.541
+       vertex -30 33.763 49.599
+    endloop
+  endfacet
+  facet normal -0.316193 0.521782 0.792317
+    outer loop
+       vertex -15 34.9128 54.8279
+       vertex -15 36.5766 53.7322
+       vertex -30 33.763 49.599
+    endloop
+  endfacet
+  facet normal -0.316198 0.521743 0.79234
+    outer loop
+       vertex -15 34.9128 54.8279
+       vertex -30 33.763 49.599
+       vertex -30 32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -0.316198 0.497222 0.807954
+    outer loop
+       vertex -15 33.2162 55.872
+       vertex -15 34.9128 54.8279
+       vertex -30 32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -0.316192 0.497264 0.80793
+    outer loop
+       vertex -15 33.2162 55.872
+       vertex -30 32.2272 50.6103
+       vertex -30 30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -0.316192 0.472257 0.822797
+    outer loop
+       vertex -15 31.4884 56.8637
+       vertex -15 33.2162 55.872
+       vertex -30 30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -0.316193 0.472251 0.822801
+    outer loop
+       vertex -15 31.4884 56.8637
+       vertex -30 30.6611 51.5742
+       vertex -30 29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -0.316193 0.446805 0.836891
+    outer loop
+       vertex -15 29.7311 57.8019
+       vertex -15 31.4884 56.8637
+       vertex -30 29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -0.316197 0.446775 0.836906
+    outer loop
+       vertex -15 29.7311 57.8019
+       vertex -30 29.0662 52.4896
+       vertex -30 27.444 53.3556
+    endloop
+  endfacet
+  facet normal -0.316197 0.420971 0.850178
+    outer loop
+       vertex -15 27.9458 58.6859
+       vertex -15 29.7311 57.8019
+       vertex -30 27.444 53.3556
+    endloop
+  endfacet
+  facet normal -0.316195 0.420985 0.850172
+    outer loop
+       vertex -15 27.9458 58.6859
+       vertex -30 27.444 53.3556
+       vertex -30 25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -0.316195 0.394681 0.862698
+    outer loop
+       vertex -15 26.1342 59.5147
+       vertex -15 27.9458 58.6859
+       vertex -30 25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -0.316191 0.394713 0.862685
+    outer loop
+       vertex -15 26.1342 59.5147
+       vertex -30 25.7961 54.1716
+       vertex -30 24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -0.316191 0.368109 0.874368
+    outer loop
+       vertex -15 24.2981 60.2877
+       vertex -15 26.1342 59.5147
+       vertex -30 24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -0.316199 0.368042 0.874393
+    outer loop
+       vertex -15 24.2981 60.2877
+       vertex -30 24.1239 54.9367
+       vertex -30 22.429 55.6501
+    endloop
+  endfacet
+  facet normal -0.316199 0.341116 0.885244
+    outer loop
+       vertex -15 22.4392 61.004
+       vertex -15 24.2981 60.2877
+       vertex -30 22.429 55.6501
+    endloop
+  endfacet
+  facet normal -0.316199 0.341116 0.885244
+    outer loop
+       vertex -15 22.4392 61.004
+       vertex -30 22.429 55.6501
+       vertex -30 20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -0.316199 0.313824 0.895283
+    outer loop
+       vertex -15 20.5592 61.663
+       vertex -15 22.4392 61.004
+       vertex -30 20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -0.3162 0.31382 0.895285
+    outer loop
+       vertex -15 20.5592 61.663
+       vertex -30 20.7131 56.3113
+       vertex -30 18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -0.3162 0.286211 0.904489
+    outer loop
+       vertex -15 18.6599 62.264
+       vertex -15 20.5592 61.663
+       vertex -30 18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -0.316192 0.286271 0.904473
+    outer loop
+       vertex -15 18.6599 62.264
+       vertex -30 18.9777 56.9196
+       vertex -30 17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -0.316193 0.258386 0.91283
+    outer loop
+       vertex -15 16.743 62.8066
+       vertex -15 18.6599 62.264
+       vertex -30 17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -0.316195 0.258364 0.912836
+    outer loop
+       vertex -15 16.743 62.8066
+       vertex -30 17.2245 57.4745
+       vertex -30 15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -0.316195 0.230305 0.920315
+    outer loop
+       vertex -15 14.8105 63.2902
+       vertex -15 16.743 62.8066
+       vertex -30 15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -0.316196 0.230298 0.920317
+    outer loop
+       vertex -15 14.8105 63.2902
+       vertex -30 15.4551 57.9753
+       vertex -30 13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -0.316196 0.201961 0.926948
+    outer loop
+       vertex -15 12.864 63.7143
+       vertex -15 14.8105 63.2902
+       vertex -30 13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -0.316193 0.201982 0.926944
+    outer loop
+       vertex -15 12.864 63.7143
+       vertex -30 13.6712 58.4217
+       vertex -30 11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -0.316194 0.173482 0.932698
+    outer loop
+       vertex -15 10.9054 64.0786
+       vertex -15 12.864 63.7143
+       vertex -30 11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -0.316192 0.173497 0.932696
+    outer loop
+       vertex -15 10.9054 64.0786
+       vertex -30 11.8745 58.8132
+       vertex -30 10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -0.316192 0.144821 0.937576
+    outer loop
+       vertex -15 8.93664 64.3827
+       vertex -15 10.9054 64.0786
+       vertex -30 10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -0.316193 0.144809 0.937578
+    outer loop
+       vertex -15 8.93664 64.3827
+       vertex -30 10.0666 59.1495
+       vertex -30 8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -0.316194 0.116056 0.941569
+    outer loop
+       vertex -15 6.95944 64.6264
+       vertex -15 8.93664 64.3827
+       vertex -30 8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -0.316197 0.116028 0.941572
+    outer loop
+       vertex -15 6.95944 64.6264
+       vertex -30 8.2492 59.4302
+       vertex -30 6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -0.316197 0.0870995 0.944687
+    outer loop
+       vertex -15 4.9757 64.8093
+       vertex -15 6.95944 64.6264
+       vertex -30 6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -0.316199 0.0870819 0.944688
+    outer loop
+       vertex -15 4.9757 64.8093
+       vertex -30 6.4241 59.6551
+       vertex -30 4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -0.316199 0.0580955 0.946913
+    outer loop
+       vertex -15 2.98729 64.9313
+       vertex -15 4.9757 64.8093
+       vertex -30 4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -0.316193 0.0581428 0.946911
+    outer loop
+       vertex -15 2.98729 64.9313
+       vertex -30 4.59295 59.8239
+       vertex -30 2.7575 59.9366
+    endloop
+  endfacet
+  facet normal -0.316193 0.0290986 0.948248
+    outer loop
+       vertex -15 0.996076 64.9924
+       vertex -15 2.98729 64.9313
+       vertex -30 2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 0.316194 0.0290986 0.948248
+    outer loop
+       vertex -1.33211e-14 0.919455 59.993
+       vertex -15 2.98729 64.9313
+       vertex -15 0.996076 64.9924
+    endloop
+  endfacet
+  facet normal 0.316194 -0 0.948695
+    outer loop
+       vertex -1.33211e-14 -0.919455 59.993
+       vertex -1.33211e-14 0.919455 59.993
+       vertex -15 0.996076 64.9924
+    endloop
+  endfacet
+  facet normal 0.316194 -0 0.948695
+    outer loop
+       vertex -15 -0.996076 64.9924
+       vertex -1.33211e-14 -0.919455 59.993
+       vertex -15 0.996076 64.9924
+    endloop
+  endfacet
+  facet normal 0.316194 -0.0290969 0.948248
+    outer loop
+       vertex -1.33086e-14 -2.7575 59.9366
+       vertex -1.33211e-14 -0.919455 59.993
+       vertex -15 -0.996076 64.9924
+    endloop
+  endfacet
+  facet normal 0.316193 -0.0290986 0.948248
+    outer loop
+       vertex -15 -2.98729 64.9313
+       vertex -1.33086e-14 -2.7575 59.9366
+       vertex -15 -0.996076 64.9924
+    endloop
+  endfacet
+  facet normal 0.316193 -0.0581428 0.946911
+    outer loop
+       vertex -1.32836e-14 -4.59295 59.8239
+       vertex -1.33086e-14 -2.7575 59.9366
+       vertex -15 -2.98729 64.9313
+    endloop
+  endfacet
+  facet normal 0.316199 -0.0580955 0.946913
+    outer loop
+       vertex -15 -4.9757 64.8093
+       vertex -1.32836e-14 -4.59295 59.8239
+       vertex -15 -2.98729 64.9313
+    endloop
+  endfacet
+  facet normal 0.316199 -0.0870819 0.944688
+    outer loop
+       vertex -1.32461e-14 -6.4241 59.6551
+       vertex -1.32836e-14 -4.59295 59.8239
+       vertex -15 -4.9757 64.8093
+    endloop
+  endfacet
+  facet normal 0.316197 -0.0870995 0.944687
+    outer loop
+       vertex -15 -6.95944 64.6264
+       vertex -1.32461e-14 -6.4241 59.6551
+       vertex -15 -4.9757 64.8093
+    endloop
+  endfacet
+  facet normal 0.316197 -0.116028 0.941572
+    outer loop
+       vertex -1.31962e-14 -8.2492 59.4302
+       vertex -1.32461e-14 -6.4241 59.6551
+       vertex -15 -6.95944 64.6264
+    endloop
+  endfacet
+  facet normal 0.316194 -0.116056 0.941569
+    outer loop
+       vertex -15 -8.93664 64.3827
+       vertex -1.31962e-14 -8.2492 59.4302
+       vertex -15 -6.95944 64.6264
+    endloop
+  endfacet
+  facet normal 0.316193 -0.144809 0.937578
+    outer loop
+       vertex -1.31338e-14 -10.0666 59.1495
+       vertex -1.31962e-14 -8.2492 59.4302
+       vertex -15 -8.93664 64.3827
+    endloop
+  endfacet
+  facet normal 0.316192 -0.144821 0.937576
+    outer loop
+       vertex -15 -10.9054 64.0786
+       vertex -1.31338e-14 -10.0666 59.1495
+       vertex -15 -8.93664 64.3827
+    endloop
+  endfacet
+  facet normal 0.316192 -0.173497 0.932696
+    outer loop
+       vertex -1.30592e-14 -11.8745 58.8132
+       vertex -1.31338e-14 -10.0666 59.1495
+       vertex -15 -10.9054 64.0786
+    endloop
+  endfacet
+  facet normal 0.316194 -0.173482 0.932698
+    outer loop
+       vertex -15 -12.864 63.7143
+       vertex -1.30592e-14 -11.8745 58.8132
+       vertex -15 -10.9054 64.0786
+    endloop
+  endfacet
+  facet normal 0.316193 -0.201982 0.926944
+    outer loop
+       vertex -1.29722e-14 -13.6712 58.4217
+       vertex -1.30592e-14 -11.8745 58.8132
+       vertex -15 -12.864 63.7143
+    endloop
+  endfacet
+  facet normal 0.316196 -0.201961 0.926948
+    outer loop
+       vertex -15 -14.8105 63.2902
+       vertex -1.29722e-14 -13.6712 58.4217
+       vertex -15 -12.864 63.7143
+    endloop
+  endfacet
+  facet normal 0.316196 -0.230298 0.920317
+    outer loop
+       vertex -1.28731e-14 -15.4551 57.9753
+       vertex -1.29722e-14 -13.6712 58.4217
+       vertex -15 -14.8105 63.2902
+    endloop
+  endfacet
+  facet normal 0.316195 -0.230305 0.920315
+    outer loop
+       vertex -15 -16.743 62.8066
+       vertex -1.28731e-14 -15.4551 57.9753
+       vertex -15 -14.8105 63.2902
+    endloop
+  endfacet
+  facet normal 0.316195 -0.258364 0.912836
+    outer loop
+       vertex -1.27619e-14 -17.2245 57.4745
+       vertex -1.28731e-14 -15.4551 57.9753
+       vertex -15 -16.743 62.8066
+    endloop
+  endfacet
+  facet normal 0.316193 -0.258386 0.91283
+    outer loop
+       vertex -15 -18.6599 62.264
+       vertex -1.27619e-14 -17.2245 57.4745
+       vertex -15 -16.743 62.8066
+    endloop
+  endfacet
+  facet normal 0.316192 -0.286271 0.904473
+    outer loop
+       vertex -1.26387e-14 -18.9777 56.9196
+       vertex -1.27619e-14 -17.2245 57.4745
+       vertex -15 -18.6599 62.264
+    endloop
+  endfacet
+  facet normal 0.3162 -0.286211 0.904489
+    outer loop
+       vertex -15 -20.5592 61.663
+       vertex -1.26387e-14 -18.9777 56.9196
+       vertex -15 -18.6599 62.264
+    endloop
+  endfacet
+  facet normal 0.3162 -0.31382 0.895285
+    outer loop
+       vertex -1.25036e-14 -20.7131 56.3113
+       vertex -1.26387e-14 -18.9777 56.9196
+       vertex -15 -20.5592 61.663
+    endloop
+  endfacet
+  facet normal 0.316199 -0.313824 0.895283
+    outer loop
+       vertex -15 -22.4392 61.004
+       vertex -1.25036e-14 -20.7131 56.3113
+       vertex -15 -20.5592 61.663
+    endloop
+  endfacet
+  facet normal 0.316199 -0.341116 0.885244
+    outer loop
+       vertex -1.23568e-14 -22.429 55.6501
+       vertex -1.25036e-14 -20.7131 56.3113
+       vertex -15 -22.4392 61.004
+    endloop
+  endfacet
+  facet normal 0.316199 -0.341116 0.885244
+    outer loop
+       vertex -15 -24.2981 60.2877
+       vertex -1.23568e-14 -22.429 55.6501
+       vertex -15 -22.4392 61.004
+    endloop
+  endfacet
+  facet normal 0.316199 -0.368042 0.874393
+    outer loop
+       vertex -1.21984e-14 -24.1239 54.9367
+       vertex -1.23568e-14 -22.429 55.6501
+       vertex -15 -24.2981 60.2877
+    endloop
+  endfacet
+  facet normal 0.316191 -0.368109 0.874368
+    outer loop
+       vertex -15 -26.1342 59.5147
+       vertex -1.21984e-14 -24.1239 54.9367
+       vertex -15 -24.2981 60.2877
+    endloop
+  endfacet
+  facet normal 0.316191 -0.394713 0.862685
+    outer loop
+       vertex -1.20285e-14 -25.7961 54.1716
+       vertex -1.21984e-14 -24.1239 54.9367
+       vertex -15 -26.1342 59.5147
+    endloop
+  endfacet
+  facet normal 0.316195 -0.394681 0.862698
+    outer loop
+       vertex -15 -27.9458 58.6859
+       vertex -1.20285e-14 -25.7961 54.1716
+       vertex -15 -26.1342 59.5147
+    endloop
+  endfacet
+  facet normal 0.316195 -0.420985 0.850172
+    outer loop
+       vertex -1.18473e-14 -27.444 53.3556
+       vertex -1.20285e-14 -25.7961 54.1716
+       vertex -15 -27.9458 58.6859
+    endloop
+  endfacet
+  facet normal 0.316197 -0.420971 0.850178
+    outer loop
+       vertex -15 -29.7311 57.8019
+       vertex -1.18473e-14 -27.444 53.3556
+       vertex -15 -27.9458 58.6859
+    endloop
+  endfacet
+  facet normal 0.316197 -0.446775 0.836906
+    outer loop
+       vertex -1.1655e-14 -29.0662 52.4896
+       vertex -1.18473e-14 -27.444 53.3556
+       vertex -15 -29.7311 57.8019
+    endloop
+  endfacet
+  facet normal 0.316193 -0.446805 0.836891
+    outer loop
+       vertex -15 -31.4884 56.8637
+       vertex -1.1655e-14 -29.0662 52.4896
+       vertex -15 -29.7311 57.8019
+    endloop
+  endfacet
+  facet normal 0.316193 -0.472251 0.822801
+    outer loop
+       vertex -1.14518e-14 -30.6611 51.5742
+       vertex -1.1655e-14 -29.0662 52.4896
+       vertex -15 -31.4884 56.8637
+    endloop
+  endfacet
+  facet normal 0.316192 -0.472257 0.822797
+    outer loop
+       vertex -15 -33.2162 55.872
+       vertex -1.14518e-14 -30.6611 51.5742
+       vertex -15 -31.4884 56.8637
+    endloop
+  endfacet
+  facet normal 0.316192 -0.497264 0.80793
+    outer loop
+       vertex -1.12378e-14 -32.2272 50.6103
+       vertex -1.14518e-14 -30.6611 51.5742
+       vertex -15 -33.2162 55.872
+    endloop
+  endfacet
+  facet normal 0.316198 -0.497222 0.807954
+    outer loop
+       vertex -15 -34.9128 54.8279
+       vertex -1.12378e-14 -32.2272 50.6103
+       vertex -15 -33.2162 55.872
+    endloop
+  endfacet
+  facet normal 0.316198 -0.521743 0.79234
+    outer loop
+       vertex -1.10132e-14 -33.763 49.599
+       vertex -1.12378e-14 -32.2272 50.6103
+       vertex -15 -34.9128 54.8279
+    endloop
+  endfacet
+  facet normal 0.316193 -0.521782 0.792317
+    outer loop
+       vertex -15 -36.5766 53.7322
+       vertex -1.10132e-14 -33.763 49.599
+       vertex -15 -34.9128 54.8279
+    endloop
+  endfacet
+  facet normal 0.316193 -0.545815 0.775956
+    outer loop
+       vertex -1.07783e-14 -35.2671 48.541
+       vertex -1.10132e-14 -33.763 49.599
+       vertex -15 -36.5766 53.7322
+    endloop
+  endfacet
+  facet normal 0.316194 -0.545803 0.775964
+    outer loop
+       vertex -15 -38.206 52.5861
+       vertex -1.07783e-14 -35.2671 48.541
+       vertex -15 -36.5766 53.7322
+    endloop
+  endfacet
+  facet normal 0.316194 -0.5693 0.758893
+    outer loop
+       vertex -1.05332e-14 -36.7381 47.4375
+       vertex -1.07783e-14 -35.2671 48.541
+       vertex -15 -38.206 52.5861
+    endloop
+  endfacet
+  facet normal 0.316193 -0.56931 0.758886
+    outer loop
+       vertex -15 -39.7996 51.3906
+       vertex -1.05332e-14 -36.7381 47.4375
+       vertex -15 -38.206 52.5861
+    endloop
+  endfacet
+  facet normal 0.316193 -0.592324 0.741063
+    outer loop
+       vertex -1.02783e-14 -38.1745 46.2894
+       vertex -1.05332e-14 -36.7381 47.4375
+       vertex -15 -39.7996 51.3906
+    endloop
+  endfacet
+  facet normal 0.316196 -0.592306 0.741076
+    outer loop
+       vertex -15 -41.3558 50.1468
+       vertex -1.02783e-14 -38.1745 46.2894
+       vertex -15 -39.7996 51.3906
+    endloop
+  endfacet
+  facet normal 0.316196 -0.614746 0.722571
+    outer loop
+       vertex -1.00137e-14 -39.5751 45.0978
+       vertex -1.02783e-14 -38.1745 46.2894
+       vertex -15 -41.3558 50.1468
+    endloop
+  endfacet
+  facet normal 0.316195 -0.614751 0.722566
+    outer loop
+       vertex -15 -42.8731 48.8559
+       vertex -1.00137e-14 -39.5751 45.0978
+       vertex -15 -41.3558 50.1468
+    endloop
+  endfacet
+  facet normal 0.316195 -0.636594 0.703398
+    outer loop
+       vertex -9.73972e-15 -40.9386 43.8638
+       vertex -1.00137e-14 -39.5751 45.0978
+       vertex -15 -42.8731 48.8559
+    endloop
+  endfacet
+  facet normal 0.316192 -0.636614 0.703381
+    outer loop
+       vertex -15 -44.3501 47.5191
+       vertex -9.73972e-15 -40.9386 43.8638
+       vertex -15 -42.8731 48.8559
+    endloop
+  endfacet
+  facet normal 0.316192 -0.65786 0.683552
+    outer loop
+       vertex -9.45658e-15 -42.2636 42.5886
+       vertex -9.73972e-15 -40.9386 43.8638
+       vertex -15 -44.3501 47.5191
+    endloop
+  endfacet
+  facet normal 0.316194 -0.657848 0.683562
+    outer loop
+       vertex -15 -45.7855 46.1377
+       vertex -9.45658e-15 -42.2636 42.5886
+       vertex -15 -44.3501 47.5191
+    endloop
+  endfacet
+  facet normal 0.316194 -0.678497 0.663071
+    outer loop
+       vertex -9.16455e-15 -43.5488 41.2735
+       vertex -9.45658e-15 -42.2636 42.5886
+       vertex -15 -45.7855 46.1377
+    endloop
+  endfacet
+  facet normal 0.316193 -0.678499 0.663069
+    outer loop
+       vertex -15 -47.1779 44.7129
+       vertex -9.16455e-15 -43.5488 41.2735
+       vertex -15 -45.7855 46.1377
+    endloop
+  endfacet
+  facet normal 0.316193 -0.698503 0.641962
+    outer loop
+       vertex -8.86392e-15 -44.7932 39.9195
+       vertex -9.16455e-15 -43.5488 41.2735
+       vertex -15 -47.1779 44.7129
+    endloop
+  endfacet
+  facet normal 0.316198 -0.698471 0.641994
+    outer loop
+       vertex -15 -48.526 43.2462
+       vertex -8.86392e-15 -44.7932 39.9195
+       vertex -15 -47.1779 44.7129
+    endloop
+  endfacet
+  facet normal 0.316199 -0.717831 0.620272
+    outer loop
+       vertex -8.55496e-15 -45.9955 38.5281
+       vertex -8.86392e-15 -44.7932 39.9195
+       vertex -15 -48.526 43.2462
+    endloop
+  endfacet
+  facet normal 0.316193 -0.717864 0.620237
+    outer loop
+       vertex -15 -49.8284 41.7388
+       vertex -8.55496e-15 -45.9955 38.5281
+       vertex -15 -48.526 43.2462
+    endloop
+  endfacet
+  facet normal 0.316193 -0.736504 0.597983
+    outer loop
+       vertex -8.23796e-15 -47.1546 37.1005
+       vertex -8.55496e-15 -45.9955 38.5281
+       vertex -15 -49.8284 41.7388
+    endloop
+  endfacet
+  facet normal 0.316192 -0.736509 0.597978
+    outer loop
+       vertex -15 -51.0841 40.1922
+       vertex -8.23796e-15 -47.1546 37.1005
+       vertex -15 -49.8284 41.7388
+    endloop
+  endfacet
+  facet normal 0.316192 -0.754493 0.57512
+    outer loop
+       vertex -7.91323e-15 -48.2694 35.638
+       vertex -8.23796e-15 -47.1546 37.1005
+       vertex -15 -51.0841 40.1922
+    endloop
+  endfacet
+  facet normal 0.316194 -0.75448 0.575135
+    outer loop
+       vertex -15 -52.2918 38.6079
+       vertex -7.91323e-15 -48.2694 35.638
+       vertex -15 -51.0841 40.1922
+    endloop
+  endfacet
+  facet normal 0.316194 -0.771765 0.551724
+    outer loop
+       vertex -7.58106e-15 -49.3388 34.1421
+       vertex -7.91323e-15 -48.2694 35.638
+       vertex -15 -52.2918 38.6079
+    endloop
+  endfacet
+  facet normal 0.316194 -0.771769 0.55172
+    outer loop
+       vertex -15 -53.4504 36.9872
+       vertex -7.58106e-15 -49.3388 34.1421
+       vertex -15 -52.2918 38.6079
+    endloop
+  endfacet
+  facet normal 0.316194 -0.788304 0.527824
+    outer loop
+       vertex -7.24177e-15 -50.3619 32.6141
+       vertex -7.58106e-15 -49.3388 34.1421
+       vertex -15 -53.4504 36.9872
+    endloop
+  endfacet
+  facet normal 0.316196 -0.78829 0.527843
+    outer loop
+       vertex -15 -54.5588 35.3319
+       vertex -7.24177e-15 -50.3619 32.6141
+       vertex -15 -53.4504 36.9872
+    endloop
+  endfacet
+  facet normal 0.316197 -0.804117 0.503404
+    outer loop
+       vertex -6.89568e-15 -51.3377 31.0554
+       vertex -7.24177e-15 -50.3619 32.6141
+       vertex -15 -54.5588 35.3319
+    endloop
+  endfacet
+  facet normal 0.316196 -0.804122 0.503396
+    outer loop
+       vertex -15 -55.6159 33.6433
+       vertex -6.89568e-15 -51.3377 31.0554
+       vertex -15 -54.5588 35.3319
+    endloop
+  endfacet
+  facet normal 0.316196 -0.819151 0.478552
+    outer loop
+       vertex -6.54312e-15 -52.2653 29.4676
+       vertex -6.89568e-15 -51.3377 31.0554
+       vertex -15 -55.6159 33.6433
+    endloop
+  endfacet
+  facet normal 0.316191 -0.81917 0.478522
+    outer loop
+       vertex -15 -56.6207 31.9232
+       vertex -6.54312e-15 -52.2653 29.4676
+       vertex -15 -55.6159 33.6433
+    endloop
+  endfacet
+  facet normal 0.316191 -0.833437 0.453217
+    outer loop
+       vertex -6.1844e-15 -53.1438 27.8521
+       vertex -6.54312e-15 -52.2653 29.4676
+       vertex -15 -56.6207 31.9232
+    endloop
+  endfacet
+  facet normal 0.316192 -0.833436 0.453219
+    outer loop
+       vertex -15 -57.5724 30.1731
+       vertex -6.1844e-15 -53.1438 27.8521
+       vertex -15 -56.6207 31.9232
+    endloop
+  endfacet
+  facet normal 0.316192 -0.846933 0.427466
+    outer loop
+       vertex -5.81988e-15 -53.9724 26.2104
+       vertex -6.1844e-15 -53.1438 27.8521
+       vertex -15 -57.5724 30.1731
+    endloop
+  endfacet
+  facet normal 0.31619 -0.846943 0.427449
+    outer loop
+       vertex -15 -58.47 28.3946
+       vertex -5.81988e-15 -53.9724 26.2104
+       vertex -15 -57.5724 30.1731
+    endloop
+  endfacet
+  facet normal 0.316189 -0.859655 0.401271
+    outer loop
+       vertex -5.44989e-15 -54.7502 24.5441
+       vertex -5.81988e-15 -53.9724 26.2104
+       vertex -15 -58.47 28.3946
+    endloop
+  endfacet
+  facet normal 0.316195 -0.859633 0.401313
+    outer loop
+       vertex -15 -59.3127 26.5895
+       vertex -5.44989e-15 -54.7502 24.5441
+       vertex -15 -58.47 28.3946
+    endloop
+  endfacet
+  facet normal 0.316195 -0.871517 0.374805
+    outer loop
+       vertex -5.07478e-15 -55.4767 22.8548
+       vertex -5.44989e-15 -54.7502 24.5441
+       vertex -15 -59.3127 26.5895
+    endloop
+  endfacet
+  facet normal 0.31619 -0.871535 0.374768
+    outer loop
+       vertex -15 -60.0997 24.7593
+       vertex -5.07478e-15 -55.4767 22.8548
+       vertex -15 -59.3127 26.5895
+    endloop
+  endfacet
+  facet normal 0.31619 -0.882613 0.347876
+    outer loop
+       vertex -4.6949e-15 -56.151 21.144
+       vertex -5.07478e-15 -55.4767 22.8548
+       vertex -15 -60.0997 24.7593
+    endloop
+  endfacet
+  facet normal 0.316192 -0.882607 0.34789
+    outer loop
+       vertex -15 -60.8302 22.906
+       vertex -4.6949e-15 -56.151 21.144
+       vertex -15 -60.0997 24.7593
+    endloop
+  endfacet
+  facet normal 0.316192 -0.892854 0.320677
+    outer loop
+       vertex -4.31062e-15 -56.7726 19.4133
+       vertex -4.6949e-15 -56.151 21.144
+       vertex -15 -60.8302 22.906
+    endloop
+  endfacet
+  facet normal 0.316192 -0.892852 0.320682
+    outer loop
+       vertex -15 -61.5036 21.0311
+       vertex -4.31062e-15 -56.7726 19.4133
+       vertex -15 -60.8302 22.906
+    endloop
+  endfacet
+  facet normal 0.316192 -0.90227 0.29314
+    outer loop
+       vertex -3.92228e-15 -57.3408 17.6644
+       vertex -4.31062e-15 -56.7726 19.4133
+       vertex -15 -61.5036 21.0311
+    endloop
+  endfacet
+  facet normal 0.316194 -0.902266 0.293152
+    outer loop
+       vertex -15 -62.1192 19.1364
+       vertex -3.92228e-15 -57.3408 17.6644
+       vertex -15 -61.5036 21.0311
+    endloop
+  endfacet
+  facet normal 0.316194 -0.910821 0.265379
+    outer loop
+       vertex -3.53026e-15 -57.8552 15.8989
+       vertex -3.92228e-15 -57.3408 17.6644
+       vertex -15 -62.1192 19.1364
+    endloop
+  endfacet
+  facet normal 0.316196 -0.910816 0.265395
+    outer loop
+       vertex -15 -62.6765 17.2238
+       vertex -3.53026e-15 -57.8552 15.8989
+       vertex -15 -62.1192 19.1364
+    endloop
+  endfacet
+  facet normal 0.316196 -0.918519 0.237367
+    outer loop
+       vertex -3.13493e-15 -58.3153 14.1185
+       vertex -3.53026e-15 -57.8552 15.8989
+       vertex -15 -62.6765 17.2238
+    endloop
+  endfacet
+  facet normal 0.316194 -0.918525 0.237347
+    outer loop
+       vertex -15 -63.1749 15.295
+       vertex -3.13493e-15 -58.3153 14.1185
+       vertex -15 -62.6765 17.2238
+    endloop
+  endfacet
+  facet normal 0.316193 -0.925377 0.209045
+    outer loop
+       vertex -2.73665e-15 -58.7205 12.3248
+       vertex -3.13493e-15 -58.3153 14.1185
+       vertex -15 -63.1749 15.295
+    endloop
+  endfacet
+  facet normal 0.316195 -0.925374 0.209056
+    outer loop
+       vertex -15 -63.6139 13.3518
+       vertex -2.73665e-15 -58.7205 12.3248
+       vertex -15 -63.1749 15.295
+    endloop
+  endfacet
+  facet normal 0.316195 -0.931343 0.180613
+    outer loop
+       vertex -2.3358e-15 -59.0706 10.5195
+       vertex -2.73665e-15 -58.7205 12.3248
+       vertex -15 -63.6139 13.3518
+    endloop
+  endfacet
+  facet normal 0.316197 -0.931339 0.180629
+    outer loop
+       vertex -15 -63.9932 11.3961
+       vertex -2.3358e-15 -59.0706 10.5195
+       vertex -15 -63.6139 13.3518
+    endloop
+  endfacet
+  facet normal 0.316197 -0.936432 0.152035
+    outer loop
+       vertex -1.93275e-15 -59.3653 8.70434
+       vertex -2.3358e-15 -59.0706 10.5195
+       vertex -15 -63.9932 11.3961
+    endloop
+  endfacet
+  facet normal 0.316194 -0.936437 0.15201
+    outer loop
+       vertex -15 -64.3124 9.4297
+       vertex -1.93275e-15 -59.3653 8.70434
+       vertex -15 -63.9932 11.3961
+    endloop
+  endfacet
+  facet normal 0.316194 -0.940661 0.123198
+    outer loop
+       vertex -1.52789e-15 -59.6041 6.88101
+       vertex -1.93275e-15 -59.3653 8.70434
+       vertex -15 -64.3124 9.4297
+    endloop
+  endfacet
+  facet normal 0.316194 -0.940662 0.123196
+    outer loop
+       vertex -15 -64.5711 7.45442
+       vertex -1.52789e-15 -59.6041 6.88101
+       vertex -15 -64.3124 9.4297
+    endloop
+  endfacet
+  facet normal 0.316194 -0.943991 0.0943575
+    outer loop
+       vertex -1.12159e-15 -59.787 5.05121
+       vertex -1.52789e-15 -59.6041 6.88101
+       vertex -15 -64.5711 7.45442
+    endloop
+  endfacet
+  facet normal 0.316192 -0.943993 0.0943411
+    outer loop
+       vertex -15 -64.7692 5.47215
+       vertex -1.12159e-15 -59.787 5.05121
+       vertex -15 -64.5711 7.45442
+    endloop
+  endfacet
+  facet normal 0.316192 -0.946441 0.0653653
+    outer loop
+       vertex -7.14245e-16 -59.9137 3.21667
+       vertex -1.12159e-15 -59.787 5.05121
+       vertex -15 -64.7692 5.47215
+    endloop
+  endfacet
+  facet normal 0.316194 -0.946439 0.0653836
+    outer loop
+       vertex -15 -64.9065 3.48473
+       vertex -7.14245e-16 -59.9137 3.21667
+       vertex -15 -64.7692 5.47215
+    endloop
+  endfacet
+  facet normal 0.316194 -0.947999 0.0363196
+    outer loop
+       vertex -3.06225e-16 -59.9841 1.37911
+       vertex -7.14245e-16 -59.9137 3.21667
+       vertex -15 -64.9065 3.48473
+    endloop
+  endfacet
+  facet normal 0.316196 -0.947998 0.036336
+    outer loop
+       vertex -15 -64.9828 1.49404
+       vertex -3.06225e-16 -59.9841 1.37911
+       vertex -15 -64.9065 3.48473
+    endloop
+  endfacet
+  facet normal 0.316196 -0.948666 0.00727376
+    outer loop
+       vertex 1.02083e-16 -59.9982 -0.459741
+       vertex -3.06225e-16 -59.9841 1.37911
+       vertex -15 -64.9828 1.49404
+    endloop
+  endfacet
+  facet normal 0.316197 -0.948666 0.00728464
+    outer loop
+       vertex -15 -64.9981 -0.498052
+       vertex 1.02083e-16 -59.9982 -0.459741
+       vertex -15 -64.9828 1.49404
+    endloop
+  endfacet
+  facet normal 0.316197 -0.948444 -0.0217701
+    outer loop
+       vertex 5.10295e-16 -59.956 -2.29816
+       vertex 1.02083e-16 -59.9982 -0.459741
+       vertex -15 -64.9981 -0.498052
+    endloop
+  endfacet
+  facet normal 0.316193 -0.948444 -0.0218103
+    outer loop
+       vertex -15 -64.9523 -2.48968
+       vertex 5.10295e-16 -59.956 -2.29816
+       vertex -15 -64.9981 -0.498052
+    endloop
+  endfacet
+  facet normal 0.316193 -0.94733 -0.0508689
+    outer loop
+       vertex 9.18028e-16 -59.8574 -4.13443
+       vertex 5.10295e-16 -59.956 -2.29816
+       vertex -15 -64.9523 -2.48968
+    endloop
+  endfacet
+  facet normal 0.316193 -0.94733 -0.0508619
+    outer loop
+       vertex -15 -64.8455 -4.47896
+       vertex 9.18028e-16 -59.8574 -4.13443
+       vertex -15 -64.9523 -2.48968
+    endloop
+  endfacet
+  facet normal 0.316193 -0.945327 -0.0798617
+    outer loop
+       vertex 1.3249e-15 -59.7026 -5.96681
+       vertex 9.18028e-16 -59.8574 -4.13443
+       vertex -15 -64.8455 -4.47896
+    endloop
+  endfacet
+  facet normal 0.316194 -0.945328 -0.0798587
+    outer loop
+       vertex -15 -64.6778 -6.46404
+       vertex 1.3249e-15 -59.7026 -5.96681
+       vertex -15 -64.8455 -4.47896
+    endloop
+  endfacet
+  facet normal 0.316194 -0.942435 -0.108803
+    outer loop
+       vertex 1.73052e-15 -59.4917 -7.79359
+       vertex 1.3249e-15 -59.7026 -5.96681
+       vertex -15 -64.6778 -6.46404
+    endloop
+  endfacet
+  facet normal 0.316192 -0.942434 -0.108815
+    outer loop
+       vertex -15 -64.4493 -8.44305
+       vertex 1.73052e-15 -59.4917 -7.79359
+       vertex -15 -64.6778 -6.46404
+    endloop
+  endfacet
+  facet normal 0.316192 -0.938657 -0.137642
+    outer loop
+       vertex 2.13452e-15 -59.2249 -9.61304
+       vertex 1.73052e-15 -59.4917 -7.79359
+       vertex -15 -64.4493 -8.44305
+    endloop
+  endfacet
+  facet normal 0.316194 -0.938658 -0.137629
+    outer loop
+       vertex -15 -64.1603 -10.4141
+       vertex 2.13452e-15 -59.2249 -9.61304
+       vertex -15 -64.4493 -8.44305
+    endloop
+  endfacet
+  facet normal 0.316194 -0.934001 -0.166323
+    outer loop
+       vertex 2.53652e-15 -58.9025 -11.4235
+       vertex 2.13452e-15 -59.2249 -9.61304
+       vertex -15 -64.1603 -10.4141
+    endloop
+  endfacet
+  facet normal 0.316192 -0.933999 -0.166342
+    outer loop
+       vertex -15 -63.811 -12.3754
+       vertex 2.53652e-15 -58.9025 -11.4235
+       vertex -15 -64.1603 -10.4141
+    endloop
+  endfacet
+  facet normal 0.316191 -0.928469 -0.194857
+    outer loop
+       vertex 2.93613e-15 -58.5248 -13.2232
+       vertex 2.53652e-15 -58.9025 -11.4235
+       vertex -15 -63.811 -12.3754
+    endloop
+  endfacet
+  facet normal 0.31619 -0.928467 -0.194866
+    outer loop
+       vertex -15 -63.4018 -14.3251
+       vertex 2.93613e-15 -58.5248 -13.2232
+       vertex -15 -63.811 -12.3754
+    endloop
+  endfacet
+  facet normal 0.31619 -0.922056 -0.22324
+    outer loop
+       vertex 3.33299e-15 -58.0921 -15.0104
+       vertex 2.93613e-15 -58.5248 -13.2232
+       vertex -15 -63.4018 -14.3251
+    endloop
+  endfacet
+  facet normal 0.316195 -0.922063 -0.223204
+    outer loop
+       vertex -15 -62.9331 -16.2613
+       vertex 3.33299e-15 -58.0921 -15.0104
+       vertex -15 -63.4018 -14.3251
+    endloop
+  endfacet
+  facet normal 0.316195 -0.91478 -0.251393
+    outer loop
+       vertex 3.72671e-15 -57.6048 -16.7836
+       vertex 3.33299e-15 -58.0921 -15.0104
+       vertex -15 -62.9331 -16.2613
+    endloop
+  endfacet
+  facet normal 0.316194 -0.914779 -0.251399
+    outer loop
+       vertex -15 -62.4052 -18.1822
+       vertex 3.72671e-15 -57.6048 -16.7836
+       vertex -15 -62.9331 -16.2613
+    endloop
+  endfacet
+  facet normal 0.316194 -0.906646 -0.27931
+    outer loop
+       vertex 4.11693e-15 -57.0634 -18.541
+       vertex 3.72671e-15 -57.6048 -16.7836
+       vertex -15 -62.4052 -18.1822
+    endloop
+  endfacet
+  facet normal 0.316195 -0.90665 -0.279296
+    outer loop
+       vertex -15 -61.8187 -20.0861
+       vertex 4.11693e-15 -57.0634 -18.541
+       vertex -15 -62.4052 -18.1822
+    endloop
+  endfacet
+  facet normal 0.316195 -0.897662 -0.30696
+    outer loop
+       vertex 4.50329e-15 -56.4684 -20.281
+       vertex 4.11693e-15 -57.0634 -18.541
+       vertex -15 -61.8187 -20.0861
+    endloop
+  endfacet
+  facet normal 0.316195 -0.89766 -0.306966
+    outer loop
+       vertex -15 -61.1741 -21.9711
+       vertex 4.50329e-15 -56.4684 -20.281
+       vertex -15 -61.8187 -20.0861
+    endloop
+  endfacet
+  facet normal 0.316195 -0.887844 -0.334295
+    outer loop
+       vertex 4.88542e-15 -55.8204 -22.002
+       vertex 4.50329e-15 -56.4684 -20.281
+       vertex -15 -61.1741 -21.9711
+    endloop
+  endfacet
+  facet normal 0.316194 -0.887843 -0.334298
+    outer loop
+       vertex -15 -60.4721 -23.8355
+       vertex 4.88542e-15 -55.8204 -22.002
+       vertex -15 -61.1741 -21.9711
+    endloop
+  endfacet
+  facet normal 0.316194 -0.877161 -0.3614
+    outer loop
+       vertex 5.26295e-15 -55.1199 -23.7022
+       vertex 4.88542e-15 -55.8204 -22.002
+       vertex -15 -60.4721 -23.8355
+    endloop
+  endfacet
+  facet normal 0.316193 -0.877158 -0.361407
+    outer loop
+       vertex -15 -59.7132 -25.6774
+       vertex 5.26295e-15 -55.1199 -23.7022
+       vertex -15 -60.4721 -23.8355
+    endloop
+  endfacet
+  facet normal 0.316193 -0.865694 -0.388067
+    outer loop
+       vertex 5.63555e-15 -54.3677 -25.3802
+       vertex 5.26295e-15 -55.1199 -23.7022
+       vertex -15 -59.7132 -25.6774
+    endloop
+  endfacet
+  facet normal 0.316194 -0.865696 -0.388061
+    outer loop
+       vertex -15 -58.8983 -27.4953
+       vertex 5.63555e-15 -54.3677 -25.3802
+       vertex -15 -59.7132 -25.6774
+    endloop
+  endfacet
+  facet normal 0.316194 -0.853393 -0.414417
+    outer loop
+       vertex 6.00285e-15 -53.5644 -27.0344
+       vertex 5.63555e-15 -54.3677 -25.3802
+       vertex -15 -58.8983 -27.4953
+    endloop
+  endfacet
+  facet normal 0.316195 -0.853395 -0.414412
+    outer loop
+       vertex -15 -58.0281 -29.2873
+       vertex 6.00285e-15 -53.5644 -27.0344
+       vertex -15 -58.8983 -27.4953
+    endloop
+  endfacet
+  facet normal 0.316195 -0.840273 -0.44041
+    outer loop
+       vertex 6.36451e-15 -52.7107 -28.6632
+       vertex 6.00285e-15 -53.5644 -27.0344
+       vertex -15 -58.0281 -29.2873
+    endloop
+  endfacet
+  facet normal 0.316196 -0.840277 -0.440402
+    outer loop
+       vertex -15 -57.1033 -31.0518
+       vertex 6.36451e-15 -52.7107 -28.6632
+       vertex -15 -58.0281 -29.2873
+    endloop
+  endfacet
+  facet normal 0.316196 -0.826397 -0.465927
+    outer loop
+       vertex 6.72019e-15 -51.8076 -30.265
+       vertex 6.36451e-15 -52.7107 -28.6632
+       vertex -15 -57.1033 -31.0518
+    endloop
+  endfacet
+  facet normal 0.316195 -0.826392 -0.465936
+    outer loop
+       vertex -15 -56.1249 -32.7871
+       vertex 6.72019e-15 -51.8076 -30.265
+       vertex -15 -57.1033 -31.0518
+    endloop
+  endfacet
+  facet normal 0.316195 -0.811741 -0.491016
+    outer loop
+       vertex 7.06956e-15 -50.8558 -31.8385
+       vertex 6.72019e-15 -51.8076 -30.265
+       vertex -15 -56.1249 -32.7871
+    endloop
+  endfacet
+  facet normal 0.316195 -0.811741 -0.491017
+    outer loop
+       vertex -15 -55.0938 -34.4917
+       vertex 7.06956e-15 -50.8558 -31.8385
+       vertex -15 -56.1249 -32.7871
+    endloop
+  endfacet
+  facet normal 0.316195 -0.796292 -0.515693
+    outer loop
+       vertex 7.41229e-15 -49.8562 -33.382
+       vertex 7.06956e-15 -50.8558 -31.8385
+       vertex -15 -55.0938 -34.4917
+    endloop
+  endfacet
+  facet normal 0.316194 -0.796288 -0.5157
+    outer loop
+       vertex -15 -54.0109 -36.1638
+       vertex 7.41229e-15 -49.8562 -33.382
+       vertex -15 -55.0938 -34.4917
+    endloop
+  endfacet
+  facet normal 0.316194 -0.780115 -0.539854
+    outer loop
+       vertex 7.74806e-15 -48.8098 -34.8941
+       vertex 7.41229e-15 -49.8562 -33.382
+       vertex -15 -54.0109 -36.1638
+    endloop
+  endfacet
+  facet normal 0.316197 -0.780129 -0.539832
+    outer loop
+       vertex -15 -52.8773 -37.802
+       vertex 7.74806e-15 -48.8098 -34.8941
+       vertex -15 -54.0109 -36.1638
+    endloop
+  endfacet
+  facet normal 0.316197 -0.76323 -0.56347
+    outer loop
+       vertex 8.07654e-15 -47.7176 -36.3735
+       vertex 7.74806e-15 -48.8098 -34.8941
+       vertex -15 -52.8773 -37.802
+    endloop
+  endfacet
+  facet normal 0.316194 -0.763215 -0.563493
+    outer loop
+       vertex -15 -51.694 -39.4047
+       vertex 8.07654e-15 -47.7176 -36.3735
+       vertex -15 -52.8773 -37.802
+    endloop
+  endfacet
+  facet normal 0.316194 -0.745578 -0.58663
+    outer loop
+       vertex 8.39745e-15 -46.5805 -37.8187
+       vertex 8.07654e-15 -47.7176 -36.3735
+       vertex -15 -51.694 -39.4047
+    endloop
+  endfacet
+  facet normal 0.316195 -0.745585 -0.586621
+    outer loop
+       vertex -15 -50.4622 -40.9703
+       vertex 8.39745e-15 -46.5805 -37.8187
+       vertex -15 -51.694 -39.4047
+    endloop
+  endfacet
+  facet normal 0.316195 -0.72727 -0.609179
+    outer loop
+       vertex 8.71046e-15 -45.3997 -39.2284
+       vertex 8.39745e-15 -46.5805 -37.8187
+       vertex -15 -50.4622 -40.9703
+    endloop
+  endfacet
+  facet normal 0.316196 -0.727274 -0.609173
+    outer loop
+       vertex -15 -49.183 -42.4975
+       vertex 8.71046e-15 -45.3997 -39.2284
+       vertex -15 -50.4622 -40.9703
+    endloop
+  endfacet
+  facet normal 0.316197 -0.708256 -0.631184
+    outer loop
+       vertex 9.01529e-15 -44.1762 -40.6013
+       vertex 8.71046e-15 -45.3997 -39.2284
+       vertex -15 -49.183 -42.4975
+    endloop
+  endfacet
+  facet normal 0.316191 -0.708225 -0.631222
+    outer loop
+       vertex -15 -47.8575 -43.9847
+       vertex 9.01529e-15 -44.1762 -40.6013
+       vertex -15 -49.183 -42.4975
+    endloop
+  endfacet
+  facet normal 0.316191 -0.688568 -0.652609
+    outer loop
+       vertex 9.31166e-15 -42.9112 -41.936
+       vertex 9.01529e-15 -44.1762 -40.6013
+       vertex -15 -47.8575 -43.9847
+    endloop
+  endfacet
+  facet normal 0.316194 -0.688589 -0.652584
+    outer loop
+       vertex -15 -46.4872 -45.4306
+       vertex 9.31166e-15 -42.9112 -41.936
+       vertex -15 -47.8575 -43.9847
+    endloop
+  endfacet
+  facet normal 0.316194 -0.668243 -0.673403
+    outer loop
+       vertex 9.59928e-15 -41.6059 -43.2313
+       vertex 9.31166e-15 -42.9112 -41.936
+       vertex -15 -46.4872 -45.4306
+    endloop
+  endfacet
+  facet normal 0.316196 -0.668252 -0.673394
+    outer loop
+       vertex -15 -45.0731 -46.8339
+       vertex 9.59928e-15 -41.6059 -43.2313
+       vertex -15 -46.4872 -45.4306
+    endloop
+  endfacet
+  facet normal 0.316196 -0.647317 -0.693543
+    outer loop
+       vertex 9.87788e-15 -40.2616 -44.486
+       vertex 9.59928e-15 -41.6059 -43.2313
+       vertex -15 -45.0731 -46.8339
+    endloop
+  endfacet
+  facet normal 0.316194 -0.647309 -0.69355
+    outer loop
+       vertex -15 -43.6167 -48.1932
+       vertex 9.87788e-15 -40.2616 -44.486
+       vertex -15 -45.0731 -46.8339
+    endloop
+  endfacet
+  facet normal 0.316194 -0.625733 -0.713077
+    outer loop
+       vertex 1.01472e-14 -38.8794 -45.6989
+       vertex 9.87788e-15 -40.2616 -44.486
+       vertex -15 -43.6167 -48.1932
+    endloop
+  endfacet
+  facet normal 0.316199 -0.62576 -0.713052
+    outer loop
+       vertex -15 -42.1194 -49.5072
+       vertex 1.01472e-14 -38.8794 -45.6989
+       vertex -15 -43.6167 -48.1932
+    endloop
+  endfacet
+  facet normal 0.316199 -0.603602 -0.731904
+    outer loop
+       vertex 1.0407e-14 -37.4607 -46.8689
+       vertex 1.01472e-14 -38.8794 -45.6989
+       vertex -15 -42.1194 -49.5072
+    endloop
+  endfacet
+  facet normal 0.316196 -0.603585 -0.731919
+    outer loop
+       vertex -15 -40.5824 -50.7747
+       vertex 1.0407e-14 -37.4607 -46.8689
+       vertex -15 -42.1194 -49.5072
+    endloop
+  endfacet
+  facet normal 0.316196 -0.580894 -0.750055
+    outer loop
+       vertex 1.0657e-14 -36.0068 -47.9949
+       vertex 1.0407e-14 -37.4607 -46.8689
+       vertex -15 -40.5824 -50.7747
+    endloop
+  endfacet
+  facet normal 0.316197 -0.580897 -0.750052
+    outer loop
+       vertex -15 -39.0074 -51.9945
+       vertex 1.0657e-14 -36.0068 -47.9949
+       vertex -15 -40.5824 -50.7747
+    endloop
+  endfacet
+  facet normal 0.316197 -0.557636 -0.767503
+    outer loop
+       vertex 1.0897e-14 -34.5191 -49.0758
+       vertex 1.0657e-14 -36.0068 -47.9949
+       vertex -15 -39.0074 -51.9945
+    endloop
+  endfacet
+  facet normal 0.316192 -0.557608 -0.767526
+    outer loop
+       vertex -15 -37.3957 -53.1654
+       vertex 1.0897e-14 -34.5191 -49.0758
+       vertex -15 -39.0074 -51.9945
+    endloop
+  endfacet
+  facet normal 0.316192 -0.533824 -0.784254
+    outer loop
+       vertex 1.11268e-14 -32.999 -50.1105
+       vertex 1.0897e-14 -34.5191 -49.0758
+       vertex -15 -37.3957 -53.1654
+    endloop
+  endfacet
+  facet normal 0.316195 -0.533843 -0.78424
+    outer loop
+       vertex -15 -35.7489 -54.2864
+       vertex 1.11268e-14 -32.999 -50.1105
+       vertex -15 -37.3957 -53.1654
+    endloop
+  endfacet
+  facet normal 0.316195 -0.509601 -0.800204
+    outer loop
+       vertex 1.13461e-14 -31.4479 -51.0983
+       vertex 1.11268e-14 -32.999 -50.1105
+       vertex -15 -35.7489 -54.2864
+    endloop
+  endfacet
+  facet normal 0.316188 -0.509553 -0.800238
+    outer loop
+       vertex -15 -34.0685 -55.3564
+       vertex 1.13461e-14 -31.4479 -51.0983
+       vertex -15 -35.7489 -54.2864
+    endloop
+  endfacet
+  facet normal 0.316188 -0.484787 -0.815479
+    outer loop
+       vertex 1.15548e-14 -29.8672 -52.038
+       vertex 1.13461e-14 -31.4479 -51.0983
+       vertex -15 -34.0685 -55.3564
+    endloop
+  endfacet
+  facet normal 0.316193 -0.484825 -0.815455
+    outer loop
+       vertex -15 -32.3561 -56.3745
+       vertex 1.15548e-14 -29.8672 -52.038
+       vertex -15 -34.0685 -55.3564
+    endloop
+  endfacet
+  facet normal 0.316194 -0.459574 -0.829948
+    outer loop
+       vertex 1.17526e-14 -28.2585 -52.9288
+       vertex 1.15548e-14 -29.8672 -52.038
+       vertex -15 -32.3561 -56.3745
+    endloop
+  endfacet
+  facet normal 0.316191 -0.459555 -0.829959
+    outer loop
+       vertex -15 -30.6133 -57.3395
+       vertex 1.17526e-14 -28.2585 -52.9288
+       vertex -15 -32.3561 -56.3745
+    endloop
+  endfacet
+  facet normal 0.316191 -0.433921 -0.843644
+    outer loop
+       vertex 1.19393e-14 -26.6232 -53.7699
+       vertex 1.17526e-14 -28.2585 -52.9288
+       vertex -15 -30.6133 -57.3395
+    endloop
+  endfacet
+  facet normal 0.316198 -0.433975 -0.843614
+    outer loop
+       vertex -15 -28.8418 -58.2508
+       vertex 1.19393e-14 -26.6232 -53.7699
+       vertex -15 -30.6133 -57.3395
+    endloop
+  endfacet
+  facet normal 0.316198 -0.407867 -0.856541
+    outer loop
+       vertex 1.21149e-14 -24.9629 -54.5605
+       vertex 1.19393e-14 -26.6232 -53.7699
+       vertex -15 -28.8418 -58.2508
+    endloop
+  endfacet
+  facet normal 0.3162 -0.407883 -0.856533
+    outer loop
+       vertex -15 -27.0432 -59.1073
+       vertex 1.21149e-14 -24.9629 -54.5605
+       vertex -15 -28.8418 -58.2508
+    endloop
+  endfacet
+  facet normal 0.3162 -0.381457 -0.868624
+    outer loop
+       vertex 1.2279e-14 -23.2792 -55.2999
+       vertex 1.21149e-14 -24.9629 -54.5605
+       vertex -15 -27.0432 -59.1073
+    endloop
+  endfacet
+  facet normal 0.316192 -0.381396 -0.868654
+    outer loop
+       vertex -15 -25.2191 -59.9082
+       vertex 1.2279e-14 -23.2792 -55.2999
+       vertex -15 -27.0432 -59.1073
+    endloop
+  endfacet
+  facet normal 0.316192 -0.354631 -0.87992
+    outer loop
+       vertex 1.24317e-14 -21.5736 -55.9873
+       vertex 1.2279e-14 -23.2792 -55.2999
+       vertex -15 -25.2191 -59.9082
+    endloop
+  endfacet
+  facet normal 0.316194 -0.354643 -0.879915
+    outer loop
+       vertex -15 -23.3714 -60.6529
+       vertex 1.24317e-14 -21.5736 -55.9873
+       vertex -15 -25.2191 -59.9082
+    endloop
+  endfacet
+  facet normal 0.316194 -0.327488 -0.890378
+    outer loop
+       vertex 1.25726e-14 -19.8477 -56.6221
+       vertex 1.24317e-14 -21.5736 -55.9873
+       vertex -15 -23.3714 -60.6529
+    endloop
+  endfacet
+  facet normal 0.316199 -0.327532 -0.89036
+    outer loop
+       vertex -15 -21.5017 -61.3407
+       vertex 1.25726e-14 -19.8477 -56.6221
+       vertex -15 -23.3714 -60.6529
+    endloop
+  endfacet
+  facet normal 0.316199 -0.300096 -0.899978
+    outer loop
+       vertex 1.27018e-14 -18.1032 -57.2038
+       vertex 1.25726e-14 -19.8477 -56.6221
+       vertex -15 -21.5017 -61.3407
+    endloop
+  endfacet
+  facet normal 0.316195 -0.300061 -0.899991
+    outer loop
+       vertex -15 -19.6118 -61.9708
+       vertex 1.27018e-14 -18.1032 -57.2038
+       vertex -15 -21.5017 -61.3407
+    endloop
+  endfacet
+  facet normal 0.316195 -0.272345 -0.908762
+    outer loop
+       vertex 1.2819e-14 -16.3417 -57.7317
+       vertex 1.27018e-14 -18.1032 -57.2038
+       vertex -15 -19.6118 -61.9708
+    endloop
+  endfacet
+  facet normal 0.316196 -0.272349 -0.908761
+    outer loop
+       vertex -15 -17.7035 -62.5427
+       vertex 1.2819e-14 -16.3417 -57.7317
+       vertex -15 -19.6118 -61.9708
+    endloop
+  endfacet
+  facet normal 0.316196 -0.244387 -0.916676
+    outer loop
+       vertex 1.29242e-14 -14.5649 -58.2054
+       vertex 1.2819e-14 -16.3417 -57.7317
+       vertex -15 -17.7035 -62.5427
+    endloop
+  endfacet
+  facet normal 0.316191 -0.244351 -0.916687
+    outer loop
+       vertex -15 -15.7786 -63.0558
+       vertex 1.29242e-14 -14.5649 -58.2054
+       vertex -15 -17.7035 -62.5427
+    endloop
+  endfacet
+  facet normal 0.316191 -0.216157 -0.923742
+    outer loop
+       vertex 1.30172e-14 -12.7743 -58.6244
+       vertex 1.29242e-14 -14.5649 -58.2054
+       vertex -15 -15.7786 -63.0558
+    endloop
+  endfacet
+  facet normal 0.316192 -0.21616 -0.923741
+    outer loop
+       vertex -15 -13.8389 -63.5097
+       vertex 1.30172e-14 -12.7743 -58.6244
+       vertex -15 -15.7786 -63.0558
+    endloop
+  endfacet
+  facet normal 0.316192 -0.18774 -0.929934
+    outer loop
+       vertex 1.3098e-14 -10.9718 -58.9883
+       vertex 1.30172e-14 -12.7743 -58.6244
+       vertex -15 -13.8389 -63.5097
+    endloop
+  endfacet
+  facet normal 0.316195 -0.187766 -0.929927
+    outer loop
+       vertex -15 -11.8861 -63.904
+       vertex 1.3098e-14 -10.9718 -58.9883
+       vertex -15 -13.8389 -63.5097
+    endloop
+  endfacet
+  facet normal 0.316195 -0.159155 -0.935249
+    outer loop
+       vertex 1.31665e-14 -9.15896 -59.2968
+       vertex 1.3098e-14 -10.9718 -58.9883
+       vertex -15 -11.8861 -63.904
+    endloop
+  endfacet
+  facet normal 0.316194 -0.159152 -0.93525
+    outer loop
+       vertex -15 -9.9222 -64.2382
+       vertex 1.31665e-14 -9.15896 -59.2968
+       vertex -15 -11.8861 -63.904
+    endloop
+  endfacet
+  facet normal 0.316194 -0.130472 -0.93968
+    outer loop
+       vertex 1.32227e-14 -7.33751 -59.5497
+       vertex 1.31665e-14 -9.15896 -59.2968
+       vertex -15 -9.9222 -64.2382
+    endloop
+  endfacet
+  facet normal 0.31619 -0.130437 -0.939686
+    outer loop
+       vertex -15 -7.94897 -64.5121
+       vertex 1.32227e-14 -7.33751 -59.5497
+       vertex -15 -9.9222 -64.2382
+    endloop
+  endfacet
+  facet normal 0.31619 -0.101528 -0.943248
+    outer loop
+       vertex 1.32664e-14 -5.50917 -59.7465
+       vertex 1.32227e-14 -7.33751 -59.5497
+       vertex -15 -7.94897 -64.5121
+    endloop
+  endfacet
+  facet normal 0.316196 -0.101578 -0.94324
+    outer loop
+       vertex -15 -5.96827 -64.7254
+       vertex 1.32664e-14 -5.50917 -59.7465
+       vertex -15 -7.94897 -64.5121
+    endloop
+  endfacet
+  facet normal 0.316196 -0.072639 -0.945909
+    outer loop
+       vertex 1.32977e-14 -3.67566 -59.8873
+       vertex 1.32664e-14 -5.50917 -59.7465
+       vertex -15 -5.96827 -64.7254
+    endloop
+  endfacet
+  facet normal 0.316194 -0.0726211 -0.945911
+    outer loop
+       vertex -15 -3.98196 -64.8779
+       vertex 1.32977e-14 -3.67566 -59.8873
+       vertex -15 -5.96827 -64.7254
+    endloop
+  endfacet
+  facet normal 0.316194 -0.0435952 -0.947692
+    outer loop
+       vertex 1.33164e-14 -1.83869 -59.9718
+       vertex 1.32977e-14 -3.67566 -59.8873
+       vertex -15 -3.98196 -64.8779
+    endloop
+  endfacet
+  facet normal 0.316197 -0.0436207 -0.94769
+    outer loop
+       vertex -15 -1.99192 -64.9695
+       vertex 1.33164e-14 -1.83869 -59.9718
+       vertex -15 -3.98196 -64.8779
+    endloop
+  endfacet
+  facet normal 0.316197 -0.0145475 -0.948582
+    outer loop
+       vertex 1.33227e-14 0 -60
+       vertex 1.33164e-14 -1.83869 -59.9718
+       vertex -15 -1.99192 -64.9695
+    endloop
+  endfacet
+  facet normal 0.316194 -0.0145257 -0.948583
+    outer loop
+       vertex -15 0 -65
+       vertex 1.33227e-14 0 -60
+       vertex -15 -1.99192 -64.9695
+    endloop
+  endfacet
+  facet normal 0.316194 0.0145475 -0.948583
+    outer loop
+       vertex 1.33164e-14 1.83869 -59.9718
+       vertex 1.33227e-14 0 -60
+       vertex -15 0 -65
+    endloop
+  endfacet
+  facet normal 0.316197 0.0145257 -0.948582
+    outer loop
+       vertex 1.33164e-14 1.83869 -59.9718
+       vertex -15 0 -65
+       vertex -15 1.99192 -64.9695
+    endloop
+  endfacet
+  facet normal 0.316197 0.0435951 -0.947691
+    outer loop
+       vertex 1.32977e-14 3.67566 -59.8873
+       vertex 1.33164e-14 1.83869 -59.9718
+       vertex -15 1.99192 -64.9695
+    endloop
+  endfacet
+  facet normal 0.316194 0.0436208 -0.947691
+    outer loop
+       vertex 1.32977e-14 3.67566 -59.8873
+       vertex -15 1.99192 -64.9695
+       vertex -15 3.98196 -64.8779
+    endloop
+  endfacet
+  facet normal 0.316194 0.0726391 -0.94591
+    outer loop
+       vertex 1.32664e-14 5.50917 -59.7465
+       vertex 1.32977e-14 3.67566 -59.8873
+       vertex -15 3.98196 -64.8779
+    endloop
+  endfacet
+  facet normal 0.316196 0.072621 -0.94591
+    outer loop
+       vertex 1.32664e-14 5.50917 -59.7465
+       vertex -15 3.98196 -64.8779
+       vertex -15 5.96827 -64.7254
+    endloop
+  endfacet
+  facet normal 0.316196 0.101528 -0.943246
+    outer loop
+       vertex 1.32227e-14 7.33751 -59.5497
+       vertex 1.32664e-14 5.50917 -59.7465
+       vertex -15 5.96827 -64.7254
+    endloop
+  endfacet
+  facet normal 0.31619 0.101578 -0.943242
+    outer loop
+       vertex 1.32227e-14 7.33751 -59.5497
+       vertex -15 5.96827 -64.7254
+       vertex -15 7.94897 -64.5121
+    endloop
+  endfacet
+  facet normal 0.31619 0.130472 -0.939681
+    outer loop
+       vertex 1.31665e-14 9.15896 -59.2968
+       vertex 1.32227e-14 7.33751 -59.5497
+       vertex -15 7.94897 -64.5121
+    endloop
+  endfacet
+  facet normal 0.316194 0.130437 -0.939685
+    outer loop
+       vertex 1.31665e-14 9.15896 -59.2968
+       vertex -15 7.94897 -64.5121
+       vertex -15 9.9222 -64.2382
+    endloop
+  endfacet
+  facet normal 0.316194 0.159155 -0.935249
+    outer loop
+       vertex 1.3098e-14 10.9718 -58.9883
+       vertex 1.31665e-14 9.15896 -59.2968
+       vertex -15 9.9222 -64.2382
+    endloop
+  endfacet
+  facet normal 0.316195 0.159152 -0.93525
+    outer loop
+       vertex 1.3098e-14 10.9718 -58.9883
+       vertex -15 9.9222 -64.2382
+       vertex -15 11.8861 -63.904
+    endloop
+  endfacet
+  facet normal 0.316195 0.18774 -0.929933
+    outer loop
+       vertex 1.30172e-14 12.7743 -58.6244
+       vertex 1.3098e-14 10.9718 -58.9883
+       vertex -15 11.8861 -63.904
+    endloop
+  endfacet
+  facet normal 0.316192 0.187766 -0.929928
+    outer loop
+       vertex 1.30172e-14 12.7743 -58.6244
+       vertex -15 11.8861 -63.904
+       vertex -15 13.8389 -63.5097
+    endloop
+  endfacet
+  facet normal 0.316192 0.216157 -0.923742
+    outer loop
+       vertex 1.29242e-14 14.5649 -58.2054
+       vertex 1.30172e-14 12.7743 -58.6244
+       vertex -15 13.8389 -63.5097
+    endloop
+  endfacet
+  facet normal 0.316191 0.21616 -0.923741
+    outer loop
+       vertex 1.29242e-14 14.5649 -58.2054
+       vertex -15 13.8389 -63.5097
+       vertex -15 15.7786 -63.0558
+    endloop
+  endfacet
+  facet normal 0.316191 0.244388 -0.916678
+    outer loop
+       vertex 1.2819e-14 16.3417 -57.7317
+       vertex 1.29242e-14 14.5649 -58.2054
+       vertex -15 15.7786 -63.0558
+    endloop
+  endfacet
+  facet normal 0.316196 0.244351 -0.916686
+    outer loop
+       vertex 1.2819e-14 16.3417 -57.7317
+       vertex -15 15.7786 -63.0558
+       vertex -15 17.7035 -62.5427
+    endloop
+  endfacet
+  facet normal 0.316196 0.272345 -0.908762
+    outer loop
+       vertex 1.27018e-14 18.1032 -57.2038
+       vertex 1.2819e-14 16.3417 -57.7317
+       vertex -15 17.7035 -62.5427
+    endloop
+  endfacet
+  facet normal 0.316195 0.272349 -0.908761
+    outer loop
+       vertex 1.27018e-14 18.1032 -57.2038
+       vertex -15 17.7035 -62.5427
+       vertex -15 19.6118 -61.9708
+    endloop
+  endfacet
+  facet normal 0.316195 0.300096 -0.899979
+    outer loop
+       vertex 1.25726e-14 19.8477 -56.6221
+       vertex 1.27018e-14 18.1032 -57.2038
+       vertex -15 19.6118 -61.9708
+    endloop
+  endfacet
+  facet normal 0.316199 0.30006 -0.89999
+    outer loop
+       vertex 1.25726e-14 19.8477 -56.6221
+       vertex -15 19.6118 -61.9708
+       vertex -15 21.5017 -61.3407
+    endloop
+  endfacet
+  facet normal 0.316199 0.327487 -0.890376
+    outer loop
+       vertex 1.24317e-14 21.5736 -55.9873
+       vertex 1.25726e-14 19.8477 -56.6221
+       vertex -15 21.5017 -61.3407
+    endloop
+  endfacet
+  facet normal 0.316194 0.327533 -0.890362
+    outer loop
+       vertex 1.24317e-14 21.5736 -55.9873
+       vertex -15 21.5017 -61.3407
+       vertex -15 23.3714 -60.6529
+    endloop
+  endfacet
+  facet normal 0.316194 0.354631 -0.87992
+    outer loop
+       vertex 1.2279e-14 23.2792 -55.2999
+       vertex 1.24317e-14 21.5736 -55.9873
+       vertex -15 23.3714 -60.6529
+    endloop
+  endfacet
+  facet normal 0.316192 0.354643 -0.879915
+    outer loop
+       vertex 1.2279e-14 23.2792 -55.2999
+       vertex -15 23.3714 -60.6529
+       vertex -15 25.2191 -59.9082
+    endloop
+  endfacet
+  facet normal 0.316192 0.381458 -0.868627
+    outer loop
+       vertex 1.21149e-14 24.9629 -54.5605
+       vertex 1.2279e-14 23.2792 -55.2999
+       vertex -15 25.2191 -59.9082
+    endloop
+  endfacet
+  facet normal 0.3162 0.381395 -0.868651
+    outer loop
+       vertex 1.21149e-14 24.9629 -54.5605
+       vertex -15 25.2191 -59.9082
+       vertex -15 27.0432 -59.1073
+    endloop
+  endfacet
+  facet normal 0.3162 0.407867 -0.856541
+    outer loop
+       vertex 1.19393e-14 26.6232 -53.7699
+       vertex 1.21149e-14 24.9629 -54.5605
+       vertex -15 27.0432 -59.1073
+    endloop
+  endfacet
+  facet normal 0.316198 0.407884 -0.856534
+    outer loop
+       vertex 1.19393e-14 26.6232 -53.7699
+       vertex -15 27.0432 -59.1073
+       vertex -15 28.8418 -58.2508
+    endloop
+  endfacet
+  facet normal 0.316198 0.43392 -0.843642
+    outer loop
+       vertex 1.17526e-14 28.2585 -52.9288
+       vertex 1.19393e-14 26.6232 -53.7699
+       vertex -15 28.8418 -58.2508
+    endloop
+  endfacet
+  facet normal 0.316191 0.433976 -0.843616
+    outer loop
+       vertex 1.17526e-14 28.2585 -52.9288
+       vertex -15 28.8418 -58.2508
+       vertex -15 30.6133 -57.3395
+    endloop
+  endfacet
+  facet normal 0.316191 0.459575 -0.829948
+    outer loop
+       vertex 1.15548e-14 29.8672 -52.038
+       vertex 1.17526e-14 28.2585 -52.9288
+       vertex -15 30.6133 -57.3395
+    endloop
+  endfacet
+  facet normal 0.316193 0.459554 -0.829959
+    outer loop
+       vertex 1.15548e-14 29.8672 -52.038
+       vertex -15 30.6133 -57.3395
+       vertex -15 32.3561 -56.3745
+    endloop
+  endfacet
+  facet normal 0.316194 0.484787 -0.815478
+    outer loop
+       vertex 1.13461e-14 31.4479 -51.0983
+       vertex 1.15548e-14 29.8672 -52.038
+       vertex -15 32.3561 -56.3745
+    endloop
+  endfacet
+  facet normal 0.316188 0.484826 -0.815456
+    outer loop
+       vertex 1.13461e-14 31.4479 -51.0983
+       vertex -15 32.3561 -56.3745
+       vertex -15 34.0685 -55.3564
+    endloop
+  endfacet
+  facet normal 0.316188 0.509603 -0.800206
+    outer loop
+       vertex 1.11268e-14 32.999 -50.1105
+       vertex 1.13461e-14 31.4479 -51.0983
+       vertex -15 34.0685 -55.3564
+    endloop
+  endfacet
+  facet normal 0.316195 0.509552 -0.800236
+    outer loop
+       vertex 1.11268e-14 32.999 -50.1105
+       vertex -15 34.0685 -55.3564
+       vertex -15 35.7489 -54.2864
+    endloop
+  endfacet
+  facet normal 0.316195 0.533824 -0.784253
+    outer loop
+       vertex 1.0897e-14 34.5191 -49.0758
+       vertex 1.11268e-14 32.999 -50.1105
+       vertex -15 35.7489 -54.2864
+    endloop
+  endfacet
+  facet normal 0.316192 0.533844 -0.784241
+    outer loop
+       vertex 1.0897e-14 34.5191 -49.0758
+       vertex -15 35.7489 -54.2864
+       vertex -15 37.3957 -53.1654
+    endloop
+  endfacet
+  facet normal 0.316192 0.557637 -0.767505
+    outer loop
+       vertex 1.0657e-14 36.0068 -47.9949
+       vertex 1.0897e-14 34.5191 -49.0758
+       vertex -15 37.3957 -53.1654
+    endloop
+  endfacet
+  facet normal 0.316196 0.557607 -0.767525
+    outer loop
+       vertex 1.0657e-14 36.0068 -47.9949
+       vertex -15 37.3957 -53.1654
+       vertex -15 39.0074 -51.9945
+    endloop
+  endfacet
+  facet normal 0.316197 0.580894 -0.750055
+    outer loop
+       vertex 1.0407e-14 37.4607 -46.8689
+       vertex 1.0657e-14 36.0068 -47.9949
+       vertex -15 39.0074 -51.9945
+    endloop
+  endfacet
+  facet normal 0.316196 0.580897 -0.750052
+    outer loop
+       vertex 1.0407e-14 37.4607 -46.8689
+       vertex -15 39.0074 -51.9945
+       vertex -15 40.5824 -50.7747
+    endloop
+  endfacet
+  facet normal 0.316196 0.603603 -0.731904
+    outer loop
+       vertex 1.01472e-14 38.8794 -45.6989
+       vertex 1.0407e-14 37.4607 -46.8689
+       vertex -15 40.5824 -50.7747
+    endloop
+  endfacet
+  facet normal 0.316199 0.603584 -0.731918
+    outer loop
+       vertex 1.01472e-14 38.8794 -45.6989
+       vertex -15 40.5824 -50.7747
+       vertex -15 42.1194 -49.5072
+    endloop
+  endfacet
+  facet normal 0.316199 0.625732 -0.713076
+    outer loop
+       vertex 9.87788e-15 40.2616 -44.486
+       vertex 1.01472e-14 38.8794 -45.6989
+       vertex -15 42.1194 -49.5072
+    endloop
+  endfacet
+  facet normal 0.316195 0.625761 -0.713053
+    outer loop
+       vertex 9.87788e-15 40.2616 -44.486
+       vertex -15 42.1194 -49.5072
+       vertex -15 43.6167 -48.1932
+    endloop
+  endfacet
+  facet normal 0.316194 0.647317 -0.693543
+    outer loop
+       vertex 9.59928e-15 41.6059 -43.2313
+       vertex 9.87788e-15 40.2616 -44.486
+       vertex -15 43.6167 -48.1932
+    endloop
+  endfacet
+  facet normal 0.316196 0.647309 -0.69355
+    outer loop
+       vertex 9.59928e-15 41.6059 -43.2313
+       vertex -15 43.6167 -48.1932
+       vertex -15 45.0731 -46.8339
+    endloop
+  endfacet
+  facet normal 0.316196 0.668243 -0.673403
+    outer loop
+       vertex 9.31166e-15 42.9112 -41.936
+       vertex 9.59928e-15 41.6059 -43.2313
+       vertex -15 45.0731 -46.8339
+    endloop
+  endfacet
+  facet normal 0.316194 0.668252 -0.673395
+    outer loop
+       vertex 9.31166e-15 42.9112 -41.936
+       vertex -15 45.0731 -46.8339
+       vertex -15 46.4872 -45.4306
+    endloop
+  endfacet
+  facet normal 0.316194 0.688567 -0.652608
+    outer loop
+       vertex 9.01529e-15 44.1762 -40.6013
+       vertex 9.31166e-15 42.9112 -41.936
+       vertex -15 46.4872 -45.4306
+    endloop
+  endfacet
+  facet normal 0.316191 0.68859 -0.652585
+    outer loop
+       vertex 9.01529e-15 44.1762 -40.6013
+       vertex -15 46.4872 -45.4306
+       vertex -15 47.8575 -43.9847
+    endloop
+  endfacet
+  facet normal 0.316191 0.708258 -0.631185
+    outer loop
+       vertex 8.71046e-15 45.3997 -39.2284
+       vertex 9.01529e-15 44.1762 -40.6013
+       vertex -15 47.8575 -43.9847
+    endloop
+  endfacet
+  facet normal 0.316196 0.708223 -0.631221
+    outer loop
+       vertex 8.71046e-15 45.3997 -39.2284
+       vertex -15 47.8575 -43.9847
+       vertex -15 49.183 -42.4975
+    endloop
+  endfacet
+  facet normal 0.316196 0.72727 -0.609179
+    outer loop
+       vertex 8.39745e-15 46.5805 -37.8187
+       vertex 8.71046e-15 45.3997 -39.2284
+       vertex -15 49.183 -42.4975
+    endloop
+  endfacet
+  facet normal 0.316195 0.727275 -0.609173
+    outer loop
+       vertex 8.39745e-15 46.5805 -37.8187
+       vertex -15 49.183 -42.4975
+       vertex -15 50.4622 -40.9703
+    endloop
+  endfacet
+  facet normal 0.316195 0.745578 -0.58663
+    outer loop
+       vertex 8.07654e-15 47.7176 -36.3735
+       vertex 8.39745e-15 46.5805 -37.8187
+       vertex -15 50.4622 -40.9703
+    endloop
+  endfacet
+  facet normal 0.316194 0.745585 -0.586621
+    outer loop
+       vertex 8.07654e-15 47.7176 -36.3735
+       vertex -15 50.4622 -40.9703
+       vertex -15 51.694 -39.4047
+    endloop
+  endfacet
+  facet normal 0.316194 0.763231 -0.563471
+    outer loop
+       vertex 7.74806e-15 48.8098 -34.8941
+       vertex 8.07654e-15 47.7176 -36.3735
+       vertex -15 51.694 -39.4047
+    endloop
+  endfacet
+  facet normal 0.316197 0.763214 -0.563493
+    outer loop
+       vertex 7.74806e-15 48.8098 -34.8941
+       vertex -15 51.694 -39.4047
+       vertex -15 52.8773 -37.802
+    endloop
+  endfacet
+  facet normal 0.316197 0.780114 -0.539854
+    outer loop
+       vertex 7.41229e-15 49.8562 -33.382
+       vertex 7.74806e-15 48.8098 -34.8941
+       vertex -15 52.8773 -37.802
+    endloop
+  endfacet
+  facet normal 0.316194 0.780129 -0.539833
+    outer loop
+       vertex 7.41229e-15 49.8562 -33.382
+       vertex -15 52.8773 -37.802
+       vertex -15 54.0109 -36.1638
+    endloop
+  endfacet
+  facet normal 0.316194 0.796292 -0.515694
+    outer loop
+       vertex 7.06956e-15 50.8558 -31.8385
+       vertex 7.41229e-15 49.8562 -33.382
+       vertex -15 54.0109 -36.1638
+    endloop
+  endfacet
+  facet normal 0.316195 0.796288 -0.5157
+    outer loop
+       vertex 7.06956e-15 50.8558 -31.8385
+       vertex -15 54.0109 -36.1638
+       vertex -15 55.0938 -34.4917
+    endloop
+  endfacet
+  facet normal 0.316195 0.811741 -0.491016
+    outer loop
+       vertex 6.72019e-15 51.8076 -30.265
+       vertex 7.06956e-15 50.8558 -31.8385
+       vertex -15 55.0938 -34.4917
+    endloop
+  endfacet
+  facet normal 0.316195 0.811741 -0.491017
+    outer loop
+       vertex 6.72019e-15 51.8076 -30.265
+       vertex -15 55.0938 -34.4917
+       vertex -15 56.1249 -32.7871
+    endloop
+  endfacet
+  facet normal 0.316195 0.826397 -0.465927
+    outer loop
+       vertex 6.36451e-15 52.7107 -28.6632
+       vertex 6.72019e-15 51.8076 -30.265
+       vertex -15 56.1249 -32.7871
+    endloop
+  endfacet
+  facet normal 0.316196 0.826392 -0.465936
+    outer loop
+       vertex 6.36451e-15 52.7107 -28.6632
+       vertex -15 56.1249 -32.7871
+       vertex -15 57.1033 -31.0518
+    endloop
+  endfacet
+  facet normal 0.316196 0.840273 -0.44041
+    outer loop
+       vertex 6.00285e-15 53.5644 -27.0344
+       vertex 6.36451e-15 52.7107 -28.6632
+       vertex -15 57.1033 -31.0518
+    endloop
+  endfacet
+  facet normal 0.316195 0.840278 -0.440402
+    outer loop
+       vertex 6.00285e-15 53.5644 -27.0344
+       vertex -15 57.1033 -31.0518
+       vertex -15 58.0281 -29.2873
+    endloop
+  endfacet
+  facet normal 0.316195 0.853393 -0.414417
+    outer loop
+       vertex 5.63555e-15 54.3677 -25.3802
+       vertex 6.00285e-15 53.5644 -27.0344
+       vertex -15 58.0281 -29.2873
+    endloop
+  endfacet
+  facet normal 0.316195 0.853396 -0.414412
+    outer loop
+       vertex 5.63555e-15 54.3677 -25.3802
+       vertex -15 58.0281 -29.2873
+       vertex -15 58.8983 -27.4953
+    endloop
+  endfacet
+  facet normal 0.316194 0.865694 -0.388067
+    outer loop
+       vertex 5.26295e-15 55.1199 -23.7022
+       vertex 5.63555e-15 54.3677 -25.3802
+       vertex -15 58.8983 -27.4953
+    endloop
+  endfacet
+  facet normal 0.316193 0.865697 -0.388061
+    outer loop
+       vertex 5.26295e-15 55.1199 -23.7022
+       vertex -15 58.8983 -27.4953
+       vertex -15 59.7132 -25.6774
+    endloop
+  endfacet
+  facet normal 0.316193 0.877161 -0.3614
+    outer loop
+       vertex 4.88542e-15 55.8204 -22.002
+       vertex 5.26295e-15 55.1199 -23.7022
+       vertex -15 59.7132 -25.6774
+    endloop
+  endfacet
+  facet normal 0.316194 0.877158 -0.361407
+    outer loop
+       vertex 4.88542e-15 55.8204 -22.002
+       vertex -15 59.7132 -25.6774
+       vertex -15 60.4721 -23.8355
+    endloop
+  endfacet
+  facet normal 0.316194 0.887845 -0.334295
+    outer loop
+       vertex 4.50329e-15 56.4684 -20.281
+       vertex 4.88542e-15 55.8204 -22.002
+       vertex -15 60.4721 -23.8355
+    endloop
+  endfacet
+  facet normal 0.316195 0.887843 -0.334298
+    outer loop
+       vertex 4.50329e-15 56.4684 -20.281
+       vertex -15 60.4721 -23.8355
+       vertex -15 61.1741 -21.9711
+    endloop
+  endfacet
+  facet normal 0.316195 0.897662 -0.30696
+    outer loop
+       vertex 4.11693e-15 57.0634 -18.541
+       vertex 4.50329e-15 56.4684 -20.281
+       vertex -15 61.1741 -21.9711
+    endloop
+  endfacet
+  facet normal 0.316195 0.897659 -0.306966
+    outer loop
+       vertex 4.11693e-15 57.0634 -18.541
+       vertex -15 61.1741 -21.9711
+       vertex -15 61.8187 -20.0861
+    endloop
+  endfacet
+  facet normal 0.316195 0.906646 -0.27931
+    outer loop
+       vertex 3.72671e-15 57.6048 -16.7836
+       vertex 4.11693e-15 57.0634 -18.541
+       vertex -15 61.8187 -20.0861
+    endloop
+  endfacet
+  facet normal 0.316194 0.90665 -0.279296
+    outer loop
+       vertex 3.72671e-15 57.6048 -16.7836
+       vertex -15 61.8187 -20.0861
+       vertex -15 62.4052 -18.1822
+    endloop
+  endfacet
+  facet normal 0.316194 0.91478 -0.251393
+    outer loop
+       vertex 3.33299e-15 58.0921 -15.0104
+       vertex 3.72671e-15 57.6048 -16.7836
+       vertex -15 62.4052 -18.1822
+    endloop
+  endfacet
+  facet normal 0.316195 0.914778 -0.251399
+    outer loop
+       vertex 3.33299e-15 58.0921 -15.0104
+       vertex -15 62.4052 -18.1822
+       vertex -15 62.9331 -16.2613
+    endloop
+  endfacet
+  facet normal 0.316195 0.922055 -0.22324
+    outer loop
+       vertex 2.93613e-15 58.5248 -13.2232
+       vertex 3.33299e-15 58.0921 -15.0104
+       vertex -15 62.9331 -16.2613
+    endloop
+  endfacet
+  facet normal 0.316191 0.922065 -0.223205
+    outer loop
+       vertex 2.93613e-15 58.5248 -13.2232
+       vertex -15 62.9331 -16.2613
+       vertex -15 63.4018 -14.3251
+    endloop
+  endfacet
+  facet normal 0.31619 0.928469 -0.194857
+    outer loop
+       vertex 2.53652e-15 58.9025 -11.4235
+       vertex 2.93613e-15 58.5248 -13.2232
+       vertex -15 63.4018 -14.3251
+    endloop
+  endfacet
+  facet normal 0.316191 0.928467 -0.194866
+    outer loop
+       vertex 2.53652e-15 58.9025 -11.4235
+       vertex -15 63.4018 -14.3251
+       vertex -15 63.811 -12.3754
+    endloop
+  endfacet
+  facet normal 0.316191 0.934002 -0.166323
+    outer loop
+       vertex 2.13452e-15 59.2249 -9.61304
+       vertex 2.53652e-15 58.9025 -11.4235
+       vertex -15 63.811 -12.3754
+    endloop
+  endfacet
+  facet normal 0.316194 0.933998 -0.166342
+    outer loop
+       vertex 2.13452e-15 59.2249 -9.61304
+       vertex -15 63.811 -12.3754
+       vertex -15 64.1603 -10.4141
+    endloop
+  endfacet
+  facet normal 0.316194 0.938657 -0.137642
+    outer loop
+       vertex 1.73052e-15 59.4917 -7.79359
+       vertex 2.13452e-15 59.2249 -9.61304
+       vertex -15 64.1603 -10.4141
+    endloop
+  endfacet
+  facet normal 0.316192 0.938659 -0.137629
+    outer loop
+       vertex 1.73052e-15 59.4917 -7.79359
+       vertex -15 64.1603 -10.4141
+       vertex -15 64.4493 -8.44305
+    endloop
+  endfacet
+  facet normal 0.316192 0.942435 -0.108803
+    outer loop
+       vertex 1.3249e-15 59.7026 -5.96681
+       vertex 1.73052e-15 59.4917 -7.79359
+       vertex -15 64.4493 -8.44305
+    endloop
+  endfacet
+  facet normal 0.316194 0.942433 -0.108815
+    outer loop
+       vertex 1.3249e-15 59.7026 -5.96681
+       vertex -15 64.4493 -8.44305
+       vertex -15 64.6778 -6.46404
+    endloop
+  endfacet
+  facet normal 0.316194 0.945327 -0.0798617
+    outer loop
+       vertex 9.18028e-16 59.8574 -4.13443
+       vertex 1.3249e-15 59.7026 -5.96681
+       vertex -15 64.6778 -6.46404
+    endloop
+  endfacet
+  facet normal 0.316193 0.945328 -0.0798587
+    outer loop
+       vertex 9.18028e-16 59.8574 -4.13443
+       vertex -15 64.6778 -6.46404
+       vertex -15 64.8455 -4.47896
+    endloop
+  endfacet
+  facet normal 0.316193 0.94733 -0.0508688
+    outer loop
+       vertex 5.10295e-16 59.956 -2.29816
+       vertex 9.18028e-16 59.8574 -4.13443
+       vertex -15 64.8455 -4.47896
+    endloop
+  endfacet
+  facet normal 0.316193 0.947331 -0.0508619
+    outer loop
+       vertex 5.10295e-16 59.956 -2.29816
+       vertex -15 64.8455 -4.47896
+       vertex -15 64.9523 -2.48968
+    endloop
+  endfacet
+  facet normal 0.316192 0.948445 -0.0217702
+    outer loop
+       vertex 1.02083e-16 59.9982 -0.459741
+       vertex 5.10295e-16 59.956 -2.29816
+       vertex -15 64.9523 -2.48968
+    endloop
+  endfacet
+  facet normal 0.316197 0.948443 -0.0218103
+    outer loop
+       vertex 1.02083e-16 59.9982 -0.459741
+       vertex -15 64.9523 -2.48968
+       vertex -15 64.9981 -0.498052
+    endloop
+  endfacet
+  facet normal 0.316197 0.948666 0.00727376
+    outer loop
+       vertex -3.06225e-16 59.9841 1.37911
+       vertex 1.02083e-16 59.9982 -0.459741
+       vertex -15 64.9981 -0.498052
+    endloop
+  endfacet
+  facet normal 0.316196 0.948666 0.00728464
+    outer loop
+       vertex -3.06225e-16 59.9841 1.37911
+       vertex -15 64.9981 -0.498052
+       vertex -15 64.9828 1.49404
+    endloop
+  endfacet
+  facet normal 0.316196 0.947998 0.0363195
+    outer loop
+       vertex -7.14245e-16 59.9137 3.21667
+       vertex -3.06225e-16 59.9841 1.37911
+       vertex -15 64.9828 1.49404
+    endloop
+  endfacet
+  facet normal 0.316194 0.947998 0.036336
+    outer loop
+       vertex -7.14245e-16 59.9137 3.21667
+       vertex -15 64.9828 1.49404
+       vertex -15 64.9065 3.48473
+    endloop
+  endfacet
+  facet normal 0.316194 0.94644 0.0653653
+    outer loop
+       vertex -1.12159e-15 59.787 5.05121
+       vertex -7.14245e-16 59.9137 3.21667
+       vertex -15 64.9065 3.48473
+    endloop
+  endfacet
+  facet normal 0.316192 0.946439 0.0653837
+    outer loop
+       vertex -1.12159e-15 59.787 5.05121
+       vertex -15 64.9065 3.48473
+       vertex -15 64.7692 5.47215
+    endloop
+  endfacet
+  facet normal 0.316192 0.943991 0.0943576
+    outer loop
+       vertex -1.52789e-15 59.6041 6.88101
+       vertex -1.12159e-15 59.787 5.05121
+       vertex -15 64.7692 5.47215
+    endloop
+  endfacet
+  facet normal 0.316194 0.943992 0.094341
+    outer loop
+       vertex -1.52789e-15 59.6041 6.88101
+       vertex -15 64.7692 5.47215
+       vertex -15 64.5711 7.45442
+    endloop
+  endfacet
+  facet normal 0.316194 0.940661 0.123198
+    outer loop
+       vertex -1.93275e-15 59.3653 8.70434
+       vertex -1.52789e-15 59.6041 6.88101
+       vertex -15 64.5711 7.45442
+    endloop
+  endfacet
+  facet normal 0.316194 0.940662 0.123196
+    outer loop
+       vertex -1.93275e-15 59.3653 8.70434
+       vertex -15 64.5711 7.45442
+       vertex -15 64.3124 9.4297
+    endloop
+  endfacet
+  facet normal 0.316194 0.936433 0.152035
+    outer loop
+       vertex -2.3358e-15 59.0706 10.5195
+       vertex -1.93275e-15 59.3653 8.70434
+       vertex -15 64.3124 9.4297
+    endloop
+  endfacet
+  facet normal 0.316197 0.936436 0.15201
+    outer loop
+       vertex -2.3358e-15 59.0706 10.5195
+       vertex -15 64.3124 9.4297
+       vertex -15 63.9932 11.3961
+    endloop
+  endfacet
+  facet normal 0.316197 0.931342 0.180613
+    outer loop
+       vertex -2.73665e-15 58.7205 12.3248
+       vertex -2.3358e-15 59.0706 10.5195
+       vertex -15 63.9932 11.3961
+    endloop
+  endfacet
+  facet normal 0.316195 0.93134 0.180629
+    outer loop
+       vertex -2.73665e-15 58.7205 12.3248
+       vertex -15 63.9932 11.3961
+       vertex -15 63.6139 13.3518
+    endloop
+  endfacet
+  facet normal 0.316195 0.925376 0.209045
+    outer loop
+       vertex -3.13493e-15 58.3153 14.1185
+       vertex -2.73665e-15 58.7205 12.3248
+       vertex -15 63.6139 13.3518
+    endloop
+  endfacet
+  facet normal 0.316194 0.925374 0.209056
+    outer loop
+       vertex -3.13493e-15 58.3153 14.1185
+       vertex -15 63.6139 13.3518
+       vertex -15 63.1749 15.295
+    endloop
+  endfacet
+  facet normal 0.316193 0.91852 0.237368
+    outer loop
+       vertex -3.53026e-15 57.8552 15.8989
+       vertex -3.13493e-15 58.3153 14.1185
+       vertex -15 63.1749 15.295
+    endloop
+  endfacet
+  facet normal 0.316196 0.918524 0.237346
+    outer loop
+       vertex -3.53026e-15 57.8552 15.8989
+       vertex -15 63.1749 15.295
+       vertex -15 62.6765 17.2238
+    endloop
+  endfacet
+  facet normal 0.316196 0.910821 0.265379
+    outer loop
+       vertex -3.92228e-15 57.3408 17.6644
+       vertex -3.53026e-15 57.8552 15.8989
+       vertex -15 62.6765 17.2238
+    endloop
+  endfacet
+  facet normal 0.316194 0.910817 0.265395
+    outer loop
+       vertex -3.92228e-15 57.3408 17.6644
+       vertex -15 62.6765 17.2238
+       vertex -15 62.1192 19.1364
+    endloop
+  endfacet
+  facet normal 0.316194 0.90227 0.29314
+    outer loop
+       vertex -4.31062e-15 56.7726 19.4133
+       vertex -3.92228e-15 57.3408 17.6644
+       vertex -15 62.1192 19.1364
+    endloop
+  endfacet
+  facet normal 0.316192 0.902266 0.293152
+    outer loop
+       vertex -4.31062e-15 56.7726 19.4133
+       vertex -15 62.1192 19.1364
+       vertex -15 61.5036 21.0311
+    endloop
+  endfacet
+  facet normal 0.316192 0.892854 0.320677
+    outer loop
+       vertex -4.6949e-15 56.151 21.144
+       vertex -4.31062e-15 56.7726 19.4133
+       vertex -15 61.5036 21.0311
+    endloop
+  endfacet
+  facet normal 0.316192 0.892852 0.320682
+    outer loop
+       vertex -4.6949e-15 56.151 21.144
+       vertex -15 61.5036 21.0311
+       vertex -15 60.8302 22.906
+    endloop
+  endfacet
+  facet normal 0.316192 0.882613 0.347876
+    outer loop
+       vertex -5.07478e-15 55.4767 22.8548
+       vertex -4.6949e-15 56.151 21.144
+       vertex -15 60.8302 22.906
+    endloop
+  endfacet
+  facet normal 0.31619 0.882608 0.34789
+    outer loop
+       vertex -5.07478e-15 55.4767 22.8548
+       vertex -15 60.8302 22.906
+       vertex -15 60.0997 24.7593
+    endloop
+  endfacet
+  facet normal 0.31619 0.871519 0.374806
+    outer loop
+       vertex -5.44989e-15 54.7502 24.5441
+       vertex -5.07478e-15 55.4767 22.8548
+       vertex -15 60.0997 24.7593
+    endloop
+  endfacet
+  facet normal 0.316195 0.871533 0.374767
+    outer loop
+       vertex -5.44989e-15 54.7502 24.5441
+       vertex -15 60.0997 24.7593
+       vertex -15 59.3127 26.5895
+    endloop
+  endfacet
+  facet normal 0.316195 0.859653 0.40127
+    outer loop
+       vertex -5.81988e-15 53.9724 26.2104
+       vertex -5.44989e-15 54.7502 24.5441
+       vertex -15 59.3127 26.5895
+    endloop
+  endfacet
+  facet normal 0.316189 0.859634 0.401314
+    outer loop
+       vertex -5.81988e-15 53.9724 26.2104
+       vertex -15 59.3127 26.5895
+       vertex -15 58.47 28.3946
+    endloop
+  endfacet
+  facet normal 0.316189 0.846934 0.427466
+    outer loop
+       vertex -6.1844e-15 53.1438 27.8521
+       vertex -5.81988e-15 53.9724 26.2104
+       vertex -15 58.47 28.3946
+    endloop
+  endfacet
+  facet normal 0.316192 0.846942 0.427448
+    outer loop
+       vertex -6.1844e-15 53.1438 27.8521
+       vertex -15 58.47 28.3946
+       vertex -15 57.5724 30.1731
+    endloop
+  endfacet
+  facet normal 0.316192 0.833437 0.453217
+    outer loop
+       vertex -6.54312e-15 52.2653 29.4676
+       vertex -6.1844e-15 53.1438 27.8521
+       vertex -15 57.5724 30.1731
+    endloop
+  endfacet
+  facet normal 0.316191 0.833436 0.453219
+    outer loop
+       vertex -6.54312e-15 52.2653 29.4676
+       vertex -15 57.5724 30.1731
+       vertex -15 56.6207 31.9232
+    endloop
+  endfacet
+  facet normal 0.316191 0.819152 0.478553
+    outer loop
+       vertex -6.89568e-15 51.3377 31.0554
+       vertex -6.54312e-15 52.2653 29.4676
+       vertex -15 56.6207 31.9232
+    endloop
+  endfacet
+  facet normal 0.316195 0.819169 0.478521
+    outer loop
+       vertex -6.89568e-15 51.3377 31.0554
+       vertex -15 56.6207 31.9232
+       vertex -15 55.6159 33.6433
+    endloop
+  endfacet
+  facet normal 0.316195 0.804117 0.503405
+    outer loop
+       vertex -7.24177e-15 50.3619 32.6141
+       vertex -6.89568e-15 51.3377 31.0554
+       vertex -15 55.6159 33.6433
+    endloop
+  endfacet
+  facet normal 0.316197 0.804122 0.503396
+    outer loop
+       vertex -7.24177e-15 50.3619 32.6141
+       vertex -15 55.6159 33.6433
+       vertex -15 54.5588 35.3319
+    endloop
+  endfacet
+  facet normal 0.316197 0.788303 0.527824
+    outer loop
+       vertex -7.58106e-15 49.3388 34.1421
+       vertex -7.24177e-15 50.3619 32.6141
+       vertex -15 54.5588 35.3319
+    endloop
+  endfacet
+  facet normal 0.316194 0.788291 0.527844
+    outer loop
+       vertex -7.58106e-15 49.3388 34.1421
+       vertex -15 54.5588 35.3319
+       vertex -15 53.4504 36.9872
+    endloop
+  endfacet
+  facet normal 0.316194 0.771766 0.551724
+    outer loop
+       vertex -7.91323e-15 48.2694 35.638
+       vertex -7.58106e-15 49.3388 34.1421
+       vertex -15 53.4504 36.9872
+    endloop
+  endfacet
+  facet normal 0.316194 0.771768 0.55172
+    outer loop
+       vertex -7.91323e-15 48.2694 35.638
+       vertex -15 53.4504 36.9872
+       vertex -15 52.2918 38.6079
+    endloop
+  endfacet
+  facet normal 0.316194 0.754492 0.575119
+    outer loop
+       vertex -8.23796e-15 47.1546 37.1005
+       vertex -7.91323e-15 48.2694 35.638
+       vertex -15 52.2918 38.6079
+    endloop
+  endfacet
+  facet normal 0.316192 0.754481 0.575136
+    outer loop
+       vertex -8.23796e-15 47.1546 37.1005
+       vertex -15 52.2918 38.6079
+       vertex -15 51.0841 40.1922
+    endloop
+  endfacet
+  facet normal 0.316192 0.736504 0.597983
+    outer loop
+       vertex -8.55496e-15 45.9955 38.5281
+       vertex -8.23796e-15 47.1546 37.1005
+       vertex -15 51.0841 40.1922
+    endloop
+  endfacet
+  facet normal 0.316193 0.736508 0.597978
+    outer loop
+       vertex -8.55496e-15 45.9955 38.5281
+       vertex -15 51.0841 40.1922
+       vertex -15 49.8284 41.7388
+    endloop
+  endfacet
+  facet normal 0.316193 0.717832 0.620273
+    outer loop
+       vertex -8.86392e-15 44.7932 39.9195
+       vertex -8.55496e-15 45.9955 38.5281
+       vertex -15 49.8284 41.7388
+    endloop
+  endfacet
+  facet normal 0.316198 0.717863 0.620235
+    outer loop
+       vertex -8.86392e-15 44.7932 39.9195
+       vertex -15 49.8284 41.7388
+       vertex -15 48.526 43.2462
+    endloop
+  endfacet
+  facet normal 0.316199 0.698502 0.641961
+    outer loop
+       vertex -9.16455e-15 43.5488 41.2735
+       vertex -8.86392e-15 44.7932 39.9195
+       vertex -15 48.526 43.2462
+    endloop
+  endfacet
+  facet normal 0.316194 0.698473 0.641995
+    outer loop
+       vertex -9.16455e-15 43.5488 41.2735
+       vertex -15 48.526 43.2462
+       vertex -15 47.1779 44.7129
+    endloop
+  endfacet
+  facet normal 0.316193 0.678497 0.663071
+    outer loop
+       vertex -9.45658e-15 42.2636 42.5886
+       vertex -9.16455e-15 43.5488 41.2735
+       vertex -15 47.1779 44.7129
+    endloop
+  endfacet
+  facet normal 0.316194 0.678499 0.663069
+    outer loop
+       vertex -9.45658e-15 42.2636 42.5886
+       vertex -15 47.1779 44.7129
+       vertex -15 45.7855 46.1377
+    endloop
+  endfacet
+  facet normal 0.316194 0.65786 0.683551
+    outer loop
+       vertex -9.73972e-15 40.9386 43.8638
+       vertex -9.45658e-15 42.2636 42.5886
+       vertex -15 45.7855 46.1377
+    endloop
+  endfacet
+  facet normal 0.316192 0.657848 0.683563
+    outer loop
+       vertex -9.73972e-15 40.9386 43.8638
+       vertex -15 45.7855 46.1377
+       vertex -15 44.3501 47.5191
+    endloop
+  endfacet
+  facet normal 0.316192 0.636594 0.703399
+    outer loop
+       vertex -1.00137e-14 39.5751 45.0978
+       vertex -9.73972e-15 40.9386 43.8638
+       vertex -15 44.3501 47.5191
+    endloop
+  endfacet
+  facet normal 0.316195 0.636613 0.70338
+    outer loop
+       vertex -1.00137e-14 39.5751 45.0978
+       vertex -15 44.3501 47.5191
+       vertex -15 42.8731 48.8559
+    endloop
+  endfacet
+  facet normal 0.316195 0.614746 0.722571
+    outer loop
+       vertex -1.02783e-14 38.1745 46.2894
+       vertex -1.00137e-14 39.5751 45.0978
+       vertex -15 42.8731 48.8559
+    endloop
+  endfacet
+  facet normal 0.316196 0.614751 0.722566
+    outer loop
+       vertex -1.02783e-14 38.1745 46.2894
+       vertex -15 42.8731 48.8559
+       vertex -15 41.3558 50.1468
+    endloop
+  endfacet
+  facet normal 0.316196 0.592324 0.741062
+    outer loop
+       vertex -1.05332e-14 36.7381 47.4375
+       vertex -1.02783e-14 38.1745 46.2894
+       vertex -15 41.3558 50.1468
+    endloop
+  endfacet
+  facet normal 0.316193 0.592307 0.741077
+    outer loop
+       vertex -1.05332e-14 36.7381 47.4375
+       vertex -15 41.3558 50.1468
+       vertex -15 39.7996 51.3906
+    endloop
+  endfacet
+  facet normal 0.316193 0.5693 0.758893
+    outer loop
+       vertex -1.07783e-14 35.2671 48.541
+       vertex -1.05332e-14 36.7381 47.4375
+       vertex -15 39.7996 51.3906
+    endloop
+  endfacet
+  facet normal 0.316194 0.56931 0.758886
+    outer loop
+       vertex -1.07783e-14 35.2671 48.541
+       vertex -15 39.7996 51.3906
+       vertex -15 38.206 52.5861
+    endloop
+  endfacet
+  facet normal 0.316194 0.545815 0.775956
+    outer loop
+       vertex -1.10132e-14 33.763 49.599
+       vertex -1.07783e-14 35.2671 48.541
+       vertex -15 38.206 52.5861
+    endloop
+  endfacet
+  facet normal 0.316193 0.545803 0.775965
+    outer loop
+       vertex -1.10132e-14 33.763 49.599
+       vertex -15 38.206 52.5861
+       vertex -15 36.5766 53.7322
+    endloop
+  endfacet
+  facet normal 0.316192 0.521744 0.792342
+    outer loop
+       vertex -1.12378e-14 32.2272 50.6103
+       vertex -1.10132e-14 33.763 49.599
+       vertex -15 36.5766 53.7322
+    endloop
+  endfacet
+  facet normal 0.316198 0.521781 0.792315
+    outer loop
+       vertex -1.12378e-14 32.2272 50.6103
+       vertex -15 36.5766 53.7322
+       vertex -15 34.9128 54.8279
+    endloop
+  endfacet
+  facet normal 0.316198 0.497263 0.807928
+    outer loop
+       vertex -1.14518e-14 30.6611 51.5742
+       vertex -1.12378e-14 32.2272 50.6103
+       vertex -15 34.9128 54.8279
+    endloop
+  endfacet
+  facet normal 0.316192 0.497223 0.807955
+    outer loop
+       vertex -1.14518e-14 30.6611 51.5742
+       vertex -15 34.9128 54.8279
+       vertex -15 33.2162 55.872
+    endloop
+  endfacet
+  facet normal 0.316192 0.472251 0.822801
+    outer loop
+       vertex -1.1655e-14 29.0662 52.4896
+       vertex -1.14518e-14 30.6611 51.5742
+       vertex -15 33.2162 55.872
+    endloop
+  endfacet
+  facet normal 0.316193 0.472257 0.822797
+    outer loop
+       vertex -1.1655e-14 29.0662 52.4896
+       vertex -15 33.2162 55.872
+       vertex -15 31.4884 56.8637
+    endloop
+  endfacet
+  facet normal 0.316193 0.446776 0.836907
+    outer loop
+       vertex -1.18473e-14 27.444 53.3556
+       vertex -1.1655e-14 29.0662 52.4896
+       vertex -15 31.4884 56.8637
+    endloop
+  endfacet
+  facet normal 0.316197 0.446804 0.83689
+    outer loop
+       vertex -1.18473e-14 27.444 53.3556
+       vertex -15 31.4884 56.8637
+       vertex -15 29.7311 57.8019
+    endloop
+  endfacet
+  facet normal 0.316197 0.420985 0.850171
+    outer loop
+       vertex -1.20285e-14 25.7961 54.1716
+       vertex -1.18473e-14 27.444 53.3556
+       vertex -15 29.7311 57.8019
+    endloop
+  endfacet
+  facet normal 0.316195 0.420972 0.850179
+    outer loop
+       vertex -1.20285e-14 25.7961 54.1716
+       vertex -15 29.7311 57.8019
+       vertex -15 27.9458 58.6859
+    endloop
+  endfacet
+  facet normal 0.316195 0.394712 0.862684
+    outer loop
+       vertex -1.21984e-14 24.1239 54.9367
+       vertex -1.20285e-14 25.7961 54.1716
+       vertex -15 27.9458 58.6859
+    endloop
+  endfacet
+  facet normal 0.316191 0.394681 0.862699
+    outer loop
+       vertex -1.21984e-14 24.1239 54.9367
+       vertex -15 27.9458 58.6859
+       vertex -15 26.1342 59.5147
+    endloop
+  endfacet
+  facet normal 0.316191 0.368043 0.874396
+    outer loop
+       vertex -1.23568e-14 22.429 55.6501
+       vertex -1.21984e-14 24.1239 54.9367
+       vertex -15 26.1342 59.5147
+    endloop
+  endfacet
+  facet normal 0.316199 0.368108 0.874365
+    outer loop
+       vertex -1.23568e-14 22.429 55.6501
+       vertex -15 26.1342 59.5147
+       vertex -15 24.2981 60.2877
+    endloop
+  endfacet
+  facet normal 0.316199 0.341116 0.885244
+    outer loop
+       vertex -1.25036e-14 20.7131 56.3113
+       vertex -1.23568e-14 22.429 55.6501
+       vertex -15 24.2981 60.2877
+    endloop
+  endfacet
+  facet normal 0.316199 0.341116 0.885244
+    outer loop
+       vertex -1.25036e-14 20.7131 56.3113
+       vertex -15 24.2981 60.2877
+       vertex -15 22.4392 61.004
+    endloop
+  endfacet
+  facet normal 0.316199 0.31382 0.895285
+    outer loop
+       vertex -1.26387e-14 18.9777 56.9196
+       vertex -1.25036e-14 20.7131 56.3113
+       vertex -15 22.4392 61.004
+    endloop
+  endfacet
+  facet normal 0.3162 0.313824 0.895283
+    outer loop
+       vertex -1.26387e-14 18.9777 56.9196
+       vertex -15 22.4392 61.004
+       vertex -15 20.5592 61.663
+    endloop
+  endfacet
+  facet normal 0.3162 0.28627 0.904471
+    outer loop
+       vertex -1.27619e-14 17.2245 57.4745
+       vertex -1.26387e-14 18.9777 56.9196
+       vertex -15 20.5592 61.663
+    endloop
+  endfacet
+  facet normal 0.316193 0.286211 0.904492
+    outer loop
+       vertex -1.27619e-14 17.2245 57.4745
+       vertex -15 20.5592 61.663
+       vertex -15 18.6599 62.264
+    endloop
+  endfacet
+  facet normal 0.316192 0.258364 0.912836
+    outer loop
+       vertex -1.28731e-14 15.4551 57.9753
+       vertex -1.27619e-14 17.2245 57.4745
+       vertex -15 18.6599 62.264
+    endloop
+  endfacet
+  facet normal 0.316195 0.258386 0.912829
+    outer loop
+       vertex -1.28731e-14 15.4551 57.9753
+       vertex -15 18.6599 62.264
+       vertex -15 16.743 62.8066
+    endloop
+  endfacet
+  facet normal 0.316195 0.230298 0.920317
+    outer loop
+       vertex -1.29722e-14 13.6712 58.4217
+       vertex -1.28731e-14 15.4551 57.9753
+       vertex -15 16.743 62.8066
+    endloop
+  endfacet
+  facet normal 0.316196 0.230305 0.920315
+    outer loop
+       vertex -1.29722e-14 13.6712 58.4217
+       vertex -15 16.743 62.8066
+       vertex -15 14.8105 63.2902
+    endloop
+  endfacet
+  facet normal 0.316196 0.201982 0.926943
+    outer loop
+       vertex -1.30592e-14 11.8745 58.8132
+       vertex -1.29722e-14 13.6712 58.4217
+       vertex -15 14.8105 63.2902
+    endloop
+  endfacet
+  facet normal 0.316194 0.201961 0.926948
+    outer loop
+       vertex -1.30592e-14 11.8745 58.8132
+       vertex -15 14.8105 63.2902
+       vertex -15 12.864 63.7143
+    endloop
+  endfacet
+  facet normal 0.316194 0.173497 0.932695
+    outer loop
+       vertex -1.31338e-14 10.0666 59.1495
+       vertex -1.30592e-14 11.8745 58.8132
+       vertex -15 12.864 63.7143
+    endloop
+  endfacet
+  facet normal 0.316192 0.173482 0.932699
+    outer loop
+       vertex -1.31338e-14 10.0666 59.1495
+       vertex -15 12.864 63.7143
+       vertex -15 10.9054 64.0786
+    endloop
+  endfacet
+  facet normal 0.316192 0.144809 0.937578
+    outer loop
+       vertex -1.31962e-14 8.2492 59.4302
+       vertex -1.31338e-14 10.0666 59.1495
+       vertex -15 10.9054 64.0786
+    endloop
+  endfacet
+  facet normal 0.316193 0.144821 0.937576
+    outer loop
+       vertex -1.31962e-14 8.2492 59.4302
+       vertex -15 10.9054 64.0786
+       vertex -15 8.93664 64.3827
+    endloop
+  endfacet
+  facet normal 0.316193 0.116028 0.941573
+    outer loop
+       vertex -1.32461e-14 6.4241 59.6551
+       vertex -1.31962e-14 8.2492 59.4302
+       vertex -15 8.93664 64.3827
+    endloop
+  endfacet
+  facet normal 0.316197 0.116056 0.941568
+    outer loop
+       vertex -1.32461e-14 6.4241 59.6551
+       vertex -15 8.93664 64.3827
+       vertex -15 6.95944 64.6264
+    endloop
+  endfacet
+  facet normal 0.316197 0.087082 0.944689
+    outer loop
+       vertex -1.32836e-14 4.59295 59.8239
+       vertex -1.32461e-14 6.4241 59.6551
+       vertex -15 6.95944 64.6264
+    endloop
+  endfacet
+  facet normal 0.316199 0.0870994 0.944686
+    outer loop
+       vertex -1.32836e-14 4.59295 59.8239
+       vertex -15 6.95944 64.6264
+       vertex -15 4.9757 64.8093
+    endloop
+  endfacet
+  facet normal 0.316199 0.0581427 0.94691
+    outer loop
+       vertex -1.33086e-14 2.7575 59.9366
+       vertex -1.32836e-14 4.59295 59.8239
+       vertex -15 4.9757 64.8093
+    endloop
+  endfacet
+  facet normal 0.316193 0.0580956 0.946914
+    outer loop
+       vertex -1.33086e-14 2.7575 59.9366
+       vertex -15 4.9757 64.8093
+       vertex -15 2.98729 64.9313
+    endloop
+  endfacet
+  facet normal 0.316193 0.0290969 0.948248
+    outer loop
+       vertex -1.33211e-14 0.919455 59.993
+       vertex -1.33086e-14 2.7575 59.9366
+       vertex -15 2.98729 64.9313
+    endloop
+  endfacet
+  facet normal 0 0.0306705 0.99953
+    outer loop
+       vertex 40 0.919455 59.993
+       vertex 40 2.7575 59.9366
+       vertex -1.33086e-14 2.7575 59.9366
+    endloop
+  endfacet
+  facet normal -0 0.0306705 0.99953
+    outer loop
+       vertex -1.33211e-14 0.919455 59.993
+       vertex 40 0.919455 59.993
+       vertex -1.33086e-14 2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+       vertex 40 -0.919455 59.993
+       vertex 40 0.919455 59.993
+       vertex -1.33211e-14 0.919455 59.993
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -1.33211e-14 -0.919455 59.993
+       vertex 40 -0.919455 59.993
+       vertex -1.33211e-14 0.919455 59.993
+    endloop
+  endfacet
+  facet normal 0 -0.0306705 0.99953
+    outer loop
+       vertex -1.33086e-14 -2.7575 59.9366
+       vertex 40 -2.7575 59.9366
+       vertex 40 -0.919455 59.993
+    endloop
+  endfacet
+  facet normal 0 -0.0306705 0.99953
+    outer loop
+       vertex -1.33211e-14 -0.919455 59.993
+       vertex -1.33086e-14 -2.7575 59.9366
+       vertex 40 -0.919455 59.993
+    endloop
+  endfacet
+  facet normal 0 -0.0612872 0.99812
+    outer loop
+       vertex -1.32836e-14 -4.59295 59.8239
+       vertex 40 -4.59295 59.8239
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 0 -0.0612872 0.99812
+    outer loop
+       vertex -1.33086e-14 -2.7575 59.9366
+       vertex -1.32836e-14 -4.59295 59.8239
+       vertex 40 -2.7575 59.9366
+    endloop
+  endfacet
+  facet normal 0 -0.0917915 0.995778
+    outer loop
+       vertex -1.32461e-14 -6.4241 59.6551
+       vertex 40 -6.4241 59.6551
+       vertex 40 -4.59295 59.8239
+    endloop
+  endfacet
+  facet normal 0 -0.0917915 0.995778
+    outer loop
+       vertex -1.32836e-14 -4.59295 59.8239
+       vertex -1.32461e-14 -6.4241 59.6551
+       vertex 40 -4.59295 59.8239
+    endloop
+  endfacet
+  facet normal 0 -0.122303 0.992493
+    outer loop
+       vertex -1.31962e-14 -8.2492 59.4302
+       vertex 40 -8.2492 59.4302
+       vertex 40 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal 0 -0.122303 0.992493
+    outer loop
+       vertex -1.32461e-14 -6.4241 59.6551
+       vertex -1.31962e-14 -8.2492 59.4302
+       vertex 40 -6.4241 59.6551
+    endloop
+  endfacet
+  facet normal 0 -0.15264 0.988282
+    outer loop
+       vertex -1.31338e-14 -10.0666 59.1495
+       vertex 40 -10.0666 59.1495
+       vertex 40 -8.2492 59.4302
+    endloop
+  endfacet
+  facet normal 0 -0.15264 0.988282
+    outer loop
+       vertex -1.31962e-14 -8.2492 59.4302
+       vertex -1.31338e-14 -10.0666 59.1495
+       vertex 40 -8.2492 59.4302
+    endloop
+  endfacet
+  facet normal 0 -0.18288 0.983135
+    outer loop
+       vertex -1.30592e-14 -11.8745 58.8132
+       vertex 40 -11.8745 58.8132
+       vertex 40 -10.0666 59.1495
+    endloop
+  endfacet
+  facet normal 0 -0.18288 0.983135
+    outer loop
+       vertex -1.31338e-14 -10.0666 59.1495
+       vertex -1.30592e-14 -11.8745 58.8132
+       vertex 40 -10.0666 59.1495
+    endloop
+  endfacet
+  facet normal 0 -0.212905 0.977073
+    outer loop
+       vertex -1.29722e-14 -13.6712 58.4217
+       vertex 40 -13.6712 58.4217
+       vertex 40 -11.8745 58.8132
+    endloop
+  endfacet
+  facet normal 0 -0.212905 0.977073
+    outer loop
+       vertex -1.30592e-14 -11.8745 58.8132
+       vertex -1.29722e-14 -13.6712 58.4217
+       vertex 40 -11.8745 58.8132
+    endloop
+  endfacet
+  facet normal 0 -0.242753 0.970088
+    outer loop
+       vertex -1.28731e-14 -15.4551 57.9753
+       vertex 40 -15.4551 57.9753
+       vertex 40 -13.6712 58.4217
+    endloop
+  endfacet
+  facet normal 0 -0.242753 0.970088
+    outer loop
+       vertex -1.29722e-14 -13.6712 58.4217
+       vertex -1.28731e-14 -15.4551 57.9753
+       vertex 40 -13.6712 58.4217
+    endloop
+  endfacet
+  facet normal 0 -0.272336 0.962202
+    outer loop
+       vertex -1.27619e-14 -17.2245 57.4745
+       vertex 40 -17.2245 57.4745
+       vertex 40 -15.4551 57.9753
+    endloop
+  endfacet
+  facet normal 0 -0.272336 0.962202
+    outer loop
+       vertex -1.28731e-14 -15.4551 57.9753
+       vertex -1.27619e-14 -17.2245 57.4745
+       vertex 40 -15.4551 57.9753
+    endloop
+  endfacet
+  facet normal 0 -0.301752 0.953386
+    outer loop
+       vertex -1.26387e-14 -18.9777 56.9196
+       vertex 40 -18.9777 56.9196
+       vertex 40 -17.2245 57.4745
+    endloop
+  endfacet
+  facet normal 0 -0.301752 0.953386
+    outer loop
+       vertex -1.27619e-14 -17.2245 57.4745
+       vertex -1.26387e-14 -18.9777 56.9196
+       vertex 40 -17.2245 57.4745
+    endloop
+  endfacet
+  facet normal 0 -0.330793 0.943704
+    outer loop
+       vertex -1.25036e-14 -20.7131 56.3113
+       vertex 40 -20.7131 56.3113
+       vertex 40 -18.9777 56.9196
+    endloop
+  endfacet
+  facet normal 0 -0.330793 0.943704
+    outer loop
+       vertex -1.26387e-14 -18.9777 56.9196
+       vertex -1.25036e-14 -20.7131 56.3113
+       vertex 40 -18.9777 56.9196
+    endloop
+  endfacet
+  facet normal 0 -0.359565 0.93312
+    outer loop
+       vertex -1.23568e-14 -22.429 55.6501
+       vertex 40 -22.429 55.6501
+       vertex 40 -20.7131 56.3113
+    endloop
+  endfacet
+  facet normal 0 -0.359565 0.93312
+    outer loop
+       vertex -1.25036e-14 -20.7131 56.3113
+       vertex -1.23568e-14 -22.429 55.6501
+       vertex 40 -20.7131 56.3113
+    endloop
+  endfacet
+  facet normal 0 -0.387946 0.921682
+    outer loop
+       vertex -1.21984e-14 -24.1239 54.9367
+       vertex 40 -24.1239 54.9367
+       vertex 40 -22.429 55.6501
+    endloop
+  endfacet
+  facet normal 0 -0.387946 0.921682
+    outer loop
+       vertex -1.23568e-14 -22.429 55.6501
+       vertex -1.21984e-14 -24.1239 54.9367
+       vertex 40 -22.429 55.6501
+    endloop
+  endfacet
+  facet normal 0 -0.416058 0.909338
+    outer loop
+       vertex -1.20285e-14 -25.7961 54.1716
+       vertex 40 -25.7961 54.1716
+       vertex 40 -24.1239 54.9367
+    endloop
+  endfacet
+  facet normal 0 -0.416058 0.909338
+    outer loop
+       vertex -1.21984e-14 -24.1239 54.9367
+       vertex -1.20285e-14 -25.7961 54.1716
+       vertex 40 -24.1239 54.9367
+    endloop
+  endfacet
+  facet normal 0 -0.443753 0.896149
+    outer loop
+       vertex -1.18473e-14 -27.444 53.3556
+       vertex 40 -27.444 53.3556
+       vertex 40 -25.7961 54.1716
+    endloop
+  endfacet
+  facet normal 0 -0.443753 0.896149
+    outer loop
+       vertex -1.20285e-14 -25.7961 54.1716
+       vertex -1.18473e-14 -27.444 53.3556
+       vertex 40 -25.7961 54.1716
+    endloop
+  endfacet
+  facet normal 0 -0.470937 0.882167
+    outer loop
+       vertex -1.1655e-14 -29.0662 52.4896
+       vertex 40 -29.0662 52.4896
+       vertex 40 -27.444 53.3556
+    endloop
+  endfacet
+  facet normal 0 -0.470937 0.882167
+    outer loop
+       vertex -1.18473e-14 -27.444 53.3556
+       vertex -1.1655e-14 -29.0662 52.4896
+       vertex 40 -27.444 53.3556
+    endloop
+  endfacet
+  facet normal 0 -0.49779 0.867298
+    outer loop
+       vertex -1.14518e-14 -30.6611 51.5742
+       vertex 40 -30.6611 51.5742
+       vertex 40 -29.0662 52.4896
+    endloop
+  endfacet
+  facet normal 0 -0.49779 0.867298
+    outer loop
+       vertex -1.1655e-14 -29.0662 52.4896
+       vertex -1.14518e-14 -30.6611 51.5742
+       vertex 40 -29.0662 52.4896
+    endloop
+  endfacet
+  facet normal 0 -0.524156 0.851622
+    outer loop
+       vertex -1.12378e-14 -32.2272 50.6103
+       vertex 40 -32.2272 50.6103
+       vertex 40 -30.6611 51.5742
+    endloop
+  endfacet
+  facet normal 0 -0.524156 0.851622
+    outer loop
+       vertex -1.14518e-14 -30.6611 51.5742
+       vertex -1.12378e-14 -32.2272 50.6103
+       vertex 40 -30.6611 51.5742
+    endloop
+  endfacet
+  facet normal 0 -0.549959 0.835191
+    outer loop
+       vertex -1.10132e-14 -33.763 49.599
+       vertex 40 -33.763 49.599
+       vertex 40 -32.2272 50.6103
+    endloop
+  endfacet
+  facet normal 0 -0.549959 0.835191
+    outer loop
+       vertex -1.12378e-14 -32.2272 50.6103
+       vertex -1.10132e-14 -33.763 49.599
+       vertex 40 -32.2272 50.6103
+    endloop
+  endfacet
+  facet normal 0 -0.575332 0.81792
+    outer loop
+       vertex -1.07783e-14 -35.2671 48.541
+       vertex 40 -35.2671 48.541
+       vertex 40 -33.763 49.599
+    endloop
+  endfacet
+  facet normal 0 -0.575332 0.81792
+    outer loop
+       vertex -1.10132e-14 -33.763 49.599
+       vertex -1.07783e-14 -35.2671 48.541
+       vertex 40 -33.763 49.599
+    endloop
+  endfacet
+  facet normal 0 -0.600088 0.799934
+    outer loop
+       vertex -1.05332e-14 -36.7381 47.4375
+       vertex 40 -36.7381 47.4375
+       vertex 40 -35.2671 48.541
+    endloop
+  endfacet
+  facet normal 0 -0.600088 0.799934
+    outer loop
+       vertex -1.07783e-14 -35.2671 48.541
+       vertex -1.05332e-14 -36.7381 47.4375
+       vertex 40 -35.2671 48.541
+    endloop
+  endfacet
+  facet normal 0 -0.624357 0.781139
+    outer loop
+       vertex -1.02783e-14 -38.1745 46.2894
+       vertex 40 -38.1745 46.2894
+       vertex 40 -36.7381 47.4375
+    endloop
+  endfacet
+  facet normal 0 -0.624357 0.781139
+    outer loop
+       vertex -1.05332e-14 -36.7381 47.4375
+       vertex -1.02783e-14 -38.1745 46.2894
+       vertex 40 -36.7381 47.4375
+    endloop
+  endfacet
+  facet normal 0 -0.647991 0.761648
+    outer loop
+       vertex -1.00137e-14 -39.5751 45.0978
+       vertex 40 -39.5751 45.0978
+       vertex 40 -38.1745 46.2894
+    endloop
+  endfacet
+  facet normal 0 -0.647991 0.761648
+    outer loop
+       vertex -1.02783e-14 -38.1745 46.2894
+       vertex -1.00137e-14 -39.5751 45.0978
+       vertex 40 -38.1745 46.2894
+    endloop
+  endfacet
+  facet normal 0 -0.671021 0.741439
+    outer loop
+       vertex -9.73972e-15 -40.9386 43.8638
+       vertex 40 -40.9386 43.8638
+       vertex 40 -39.5751 45.0978
+    endloop
+  endfacet
+  facet normal 0 -0.671021 0.741439
+    outer loop
+       vertex -1.00137e-14 -39.5751 45.0978
+       vertex -9.73972e-15 -40.9386 43.8638
+       vertex 40 -39.5751 45.0978
+    endloop
+  endfacet
+  facet normal 0 -0.693437 0.720518
+    outer loop
+       vertex -9.45658e-15 -42.2636 42.5886
+       vertex 40 -42.2636 42.5886
+       vertex 40 -40.9386 43.8638
+    endloop
+  endfacet
+  facet normal 0 -0.693437 0.720518
+    outer loop
+       vertex -9.73972e-15 -40.9386 43.8638
+       vertex -9.45658e-15 -42.2636 42.5886
+       vertex 40 -40.9386 43.8638
+    endloop
+  endfacet
+  facet normal 0 -0.71519 0.69893
+    outer loop
+       vertex -9.16455e-15 -43.5488 41.2735
+       vertex 40 -43.5488 41.2735
+       vertex 40 -42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 0 -0.71519 0.69893
+    outer loop
+       vertex -9.45658e-15 -42.2636 42.5886
+       vertex -9.16455e-15 -43.5488 41.2735
+       vertex 40 -42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 0 -0.736278 0.676679
+    outer loop
+       vertex -8.86392e-15 -44.7932 39.9195
+       vertex 40 -44.7932 39.9195
+       vertex 40 -43.5488 41.2735
+    endloop
+  endfacet
+  facet normal 0 -0.736278 0.676679
+    outer loop
+       vertex -9.16455e-15 -43.5488 41.2735
+       vertex -8.86392e-15 -44.7932 39.9195
+       vertex 40 -43.5488 41.2735
+    endloop
+  endfacet
+  facet normal 0 -0.756652 0.653817
+    outer loop
+       vertex -8.55496e-15 -45.9955 38.5281
+       vertex 40 -45.9955 38.5281
+       vertex 40 -44.7932 39.9195
+    endloop
+  endfacet
+  facet normal 0 -0.756652 0.653817
+    outer loop
+       vertex -8.86392e-15 -44.7932 39.9195
+       vertex -8.55496e-15 -45.9955 38.5281
+       vertex 40 -44.7932 39.9195
+    endloop
+  endfacet
+  facet normal 0 -0.776334 0.630322
+    outer loop
+       vertex -8.23796e-15 -47.1546 37.1005
+       vertex 40 -47.1546 37.1005
+       vertex 40 -45.9955 38.5281
+    endloop
+  endfacet
+  facet normal 0 -0.776334 0.630322
+    outer loop
+       vertex -8.55496e-15 -45.9955 38.5281
+       vertex -8.23796e-15 -47.1546 37.1005
+       vertex 40 -45.9955 38.5281
+    endloop
+  endfacet
+  facet normal 0 -0.795296 0.606222
+    outer loop
+       vertex -7.91323e-15 -48.2694 35.638
+       vertex 40 -48.2694 35.638
+       vertex 40 -47.1546 37.1005
+    endloop
+  endfacet
+  facet normal 0 -0.795296 0.606222
+    outer loop
+       vertex -8.23796e-15 -47.1546 37.1005
+       vertex -7.91323e-15 -48.2694 35.638
+       vertex 40 -47.1546 37.1005
+    endloop
+  endfacet
+  facet normal 0 -0.813503 0.581561
+    outer loop
+       vertex -7.58106e-15 -49.3388 34.1421
+       vertex 40 -49.3388 34.1421
+       vertex 40 -48.2694 35.638
+    endloop
+  endfacet
+  facet normal 0 -0.813503 0.581561
+    outer loop
+       vertex -7.91323e-15 -48.2694 35.638
+       vertex -7.58106e-15 -49.3388 34.1421
+       vertex 40 -48.2694 35.638
+    endloop
+  endfacet
+  facet normal 0 -0.830935 0.556369
+    outer loop
+       vertex -7.24177e-15 -50.3619 32.6141
+       vertex 40 -50.3619 32.6141
+       vertex 40 -49.3388 34.1421
+    endloop
+  endfacet
+  facet normal 0 -0.830935 0.556369
+    outer loop
+       vertex -7.58106e-15 -49.3388 34.1421
+       vertex -7.24177e-15 -50.3619 32.6141
+       vertex 40 -49.3388 34.1421
+    endloop
+  endfacet
+  facet normal 0 -0.847604 0.530629
+    outer loop
+       vertex -6.89568e-15 -51.3377 31.0554
+       vertex 40 -51.3377 31.0554
+       vertex 40 -50.3619 32.6141
+    endloop
+  endfacet
+  facet normal 0 -0.847604 0.530629
+    outer loop
+       vertex -7.24177e-15 -50.3619 32.6141
+       vertex -6.89568e-15 -51.3377 31.0554
+       vertex 40 -50.3619 32.6141
+    endloop
+  endfacet
+  facet normal 0 -0.863451 0.504432
+    outer loop
+       vertex -6.54312e-15 -52.2653 29.4676
+       vertex 40 -52.2653 29.4676
+       vertex 40 -51.3377 31.0554
+    endloop
+  endfacet
+  facet normal 0 -0.863451 0.504432
+    outer loop
+       vertex -6.89568e-15 -51.3377 31.0554
+       vertex -6.54312e-15 -52.2653 29.4676
+       vertex 40 -51.3377 31.0554
+    endloop
+  endfacet
+  facet normal 0 -0.878508 0.477727
+    outer loop
+       vertex -6.1844e-15 -53.1438 27.8521
+       vertex 40 -53.1438 27.8521
+       vertex 40 -52.2653 29.4676
+    endloop
+  endfacet
+  facet normal 0 -0.878508 0.477727
+    outer loop
+       vertex -6.54312e-15 -52.2653 29.4676
+       vertex -6.1844e-15 -53.1438 27.8521
+       vertex 40 -52.2653 29.4676
+    endloop
+  endfacet
+  facet normal 0 -0.892735 0.450583
+    outer loop
+       vertex -5.81988e-15 -53.9724 26.2104
+       vertex 40 -53.9724 26.2104
+       vertex 40 -53.1438 27.8521
+    endloop
+  endfacet
+  facet normal 0 -0.892735 0.450583
+    outer loop
+       vertex -6.1844e-15 -53.1438 27.8521
+       vertex -5.81988e-15 -53.9724 26.2104
+       vertex 40 -53.1438 27.8521
+    endloop
+  endfacet
+  facet normal 0 -0.906143 0.422971
+    outer loop
+       vertex -5.44989e-15 -54.7502 24.5441
+       vertex 40 -54.7502 24.5441
+       vertex 40 -53.9724 26.2104
+    endloop
+  endfacet
+  facet normal 0 -0.906143 0.422971
+    outer loop
+       vertex -5.81988e-15 -53.9724 26.2104
+       vertex -5.44989e-15 -54.7502 24.5441
+       vertex 40 -53.9724 26.2104
+    endloop
+  endfacet
+  facet normal 0 -0.918649 0.395075
+    outer loop
+       vertex -5.07478e-15 -55.4767 22.8548
+       vertex 40 -55.4767 22.8548
+       vertex 40 -54.7502 24.5441
+    endloop
+  endfacet
+  facet normal 0 -0.918649 0.395075
+    outer loop
+       vertex -5.44989e-15 -54.7502 24.5441
+       vertex -5.07478e-15 -55.4767 22.8548
+       vertex 40 -54.7502 24.5441
+    endloop
+  endfacet
+  facet normal 0 -0.930344 0.366689
+    outer loop
+       vertex -4.6949e-15 -56.151 21.144
+       vertex 40 -56.151 21.144
+       vertex 40 -55.4767 22.8548
+    endloop
+  endfacet
+  facet normal 0 -0.930344 0.366689
+    outer loop
+       vertex -5.07478e-15 -55.4767 22.8548
+       vertex -4.6949e-15 -56.151 21.144
+       vertex 40 -55.4767 22.8548
+    endloop
+  endfacet
+  facet normal 0 -0.941139 0.338019
+    outer loop
+       vertex -4.31062e-15 -56.7726 19.4133
+       vertex 40 -56.7726 19.4133
+       vertex 40 -56.151 21.144
+    endloop
+  endfacet
+  facet normal 0 -0.941139 0.338019
+    outer loop
+       vertex -4.6949e-15 -56.151 21.144
+       vertex -4.31062e-15 -56.7726 19.4133
+       vertex 40 -56.151 21.144
+    endloop
+  endfacet
+  facet normal 0 -0.951064 0.308993
+    outer loop
+       vertex -3.92228e-15 -57.3408 17.6644
+       vertex 40 -57.3408 17.6644
+       vertex 40 -56.7726 19.4133
+    endloop
+  endfacet
+  facet normal 0 -0.951064 0.308993
+    outer loop
+       vertex -4.31062e-15 -56.7726 19.4133
+       vertex -3.92228e-15 -57.3408 17.6644
+       vertex 40 -56.7726 19.4133
+    endloop
+  endfacet
+  facet normal 0 -0.960078 0.279731
+    outer loop
+       vertex -3.53026e-15 -57.8552 15.8989
+       vertex 40 -57.8552 15.8989
+       vertex 40 -57.3408 17.6644
+    endloop
+  endfacet
+  facet normal 0 -0.960078 0.279731
+    outer loop
+       vertex -3.92228e-15 -57.3408 17.6644
+       vertex -3.53026e-15 -57.8552 15.8989
+       vertex 40 -57.3408 17.6644
+    endloop
+  endfacet
+  facet normal 0 -0.968193 0.250204
+    outer loop
+       vertex -3.13493e-15 -58.3153 14.1185
+       vertex 40 -58.3153 14.1185
+       vertex 40 -57.8552 15.8989
+    endloop
+  endfacet
+  facet normal 0 -0.968193 0.250204
+    outer loop
+       vertex -3.53026e-15 -57.8552 15.8989
+       vertex -3.13493e-15 -58.3153 14.1185
+       vertex 40 -57.8552 15.8989
+    endloop
+  endfacet
+  facet normal 0 -0.975421 0.22035
+    outer loop
+       vertex -2.73665e-15 -58.7205 12.3248
+       vertex 40 -58.7205 12.3248
+       vertex 40 -58.3153 14.1185
+    endloop
+  endfacet
+  facet normal 0 -0.975421 0.22035
+    outer loop
+       vertex -3.13493e-15 -58.3153 14.1185
+       vertex -2.73665e-15 -58.7205 12.3248
+       vertex 40 -58.3153 14.1185
+    endloop
+  endfacet
+  facet normal 0 -0.98171 0.190381
+    outer loop
+       vertex -2.3358e-15 -59.0706 10.5195
+       vertex 40 -59.0706 10.5195
+       vertex 40 -58.7205 12.3248
+    endloop
+  endfacet
+  facet normal 0 -0.98171 0.190381
+    outer loop
+       vertex -2.73665e-15 -58.7205 12.3248
+       vertex -2.3358e-15 -59.0706 10.5195
+       vertex 40 -58.7205 12.3248
+    endloop
+  endfacet
+  facet normal 0 -0.987075 0.160257
+    outer loop
+       vertex -1.93275e-15 -59.3653 8.70434
+       vertex 40 -59.3653 8.70434
+       vertex 40 -59.0706 10.5195
+    endloop
+  endfacet
+  facet normal 0 -0.987075 0.160257
+    outer loop
+       vertex -2.3358e-15 -59.0706 10.5195
+       vertex -1.93275e-15 -59.3653 8.70434
+       vertex 40 -59.0706 10.5195
+    endloop
+  endfacet
+  facet normal 0 -0.991532 0.12986
+    outer loop
+       vertex -1.52789e-15 -59.6041 6.88101
+       vertex 40 -59.6041 6.88101
+       vertex 40 -59.3653 8.70434
+    endloop
+  endfacet
+  facet normal 0 -0.991532 0.12986
+    outer loop
+       vertex -1.93275e-15 -59.3653 8.70434
+       vertex -1.52789e-15 -59.6041 6.88101
+       vertex 40 -59.3653 8.70434
+    endloop
+  endfacet
+  facet normal 0 -0.995042 0.0994604
+    outer loop
+       vertex -1.12159e-15 -59.787 5.05121
+       vertex 40 -59.787 5.05121
+       vertex 40 -59.6041 6.88101
+    endloop
+  endfacet
+  facet normal 0 -0.995042 0.0994604
+    outer loop
+       vertex -1.52789e-15 -59.6041 6.88101
+       vertex -1.12159e-15 -59.787 5.05121
+       vertex 40 -59.6041 6.88101
+    endloop
+  endfacet
+  facet normal 0 -0.997624 0.0689002
+    outer loop
+       vertex -7.14245e-16 -59.9137 3.21667
+       vertex 40 -59.9137 3.21667
+       vertex 40 -59.787 5.05121
+    endloop
+  endfacet
+  facet normal 0 -0.997624 0.0689002
+    outer loop
+       vertex -1.12159e-15 -59.787 5.05121
+       vertex -7.14245e-16 -59.9137 3.21667
+       vertex 40 -59.787 5.05121
+    endloop
+  endfacet
+  facet normal 0 -0.999267 0.0382837
+    outer loop
+       vertex -3.06225e-16 -59.9841 1.37911
+       vertex 40 -59.9841 1.37911
+       vertex 40 -59.9137 3.21667
+    endloop
+  endfacet
+  facet normal 0 -0.999267 0.0382837
+    outer loop
+       vertex -7.14245e-16 -59.9137 3.21667
+       vertex -3.06225e-16 -59.9841 1.37911
+       vertex 40 -59.9137 3.21667
+    endloop
+  endfacet
+  facet normal 0 -0.999971 0.00766713
+    outer loop
+       vertex 1.02083e-16 -59.9982 -0.459741
+       vertex 40 -59.9982 -0.459741
+       vertex 40 -59.9841 1.37911
+    endloop
+  endfacet
+  facet normal 0 -0.999971 0.00766713
+    outer loop
+       vertex -3.06225e-16 -59.9841 1.37911
+       vertex 1.02083e-16 -59.9982 -0.459741
+       vertex 40 -59.9841 1.37911
+    endloop
+  endfacet
+  facet normal 0 -0.999737 -0.0229475
+    outer loop
+       vertex 5.10295e-16 -59.956 -2.29816
+       vertex 40 -59.956 -2.29816
+       vertex 40 -59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal 0 -0.999737 -0.0229475
+    outer loop
+       vertex 1.02083e-16 -59.9982 -0.459741
+       vertex 5.10295e-16 -59.956 -2.29816
+       vertex 40 -59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal 0 -0.998561 -0.0536198
+    outer loop
+       vertex 9.18028e-16 -59.8574 -4.13443
+       vertex 40 -59.8574 -4.13443
+       vertex 40 -59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 0 -0.998561 -0.0536198
+    outer loop
+       vertex 5.10295e-16 -59.956 -2.29816
+       vertex 9.18028e-16 -59.8574 -4.13443
+       vertex 40 -59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 0 -0.996451 -0.0841806
+    outer loop
+       vertex 1.3249e-15 -59.7026 -5.96681
+       vertex 40 -59.7026 -5.96681
+       vertex 40 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 0 -0.996451 -0.0841806
+    outer loop
+       vertex 9.18028e-16 -59.8574 -4.13443
+       vertex 1.3249e-15 -59.7026 -5.96681
+       vertex 40 -59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 0 -0.993402 -0.114687
+    outer loop
+       vertex 1.73052e-15 -59.4917 -7.79359
+       vertex 40 -59.4917 -7.79359
+       vertex 40 -59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 0 -0.993402 -0.114687
+    outer loop
+       vertex 1.3249e-15 -59.7026 -5.96681
+       vertex 1.73052e-15 -59.4917 -7.79359
+       vertex 40 -59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 0 -0.989419 -0.145086
+    outer loop
+       vertex 2.13452e-15 -59.2249 -9.61304
+       vertex 40 -59.2249 -9.61304
+       vertex 40 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 0 -0.989419 -0.145086
+    outer loop
+       vertex 1.73052e-15 -59.4917 -7.79359
+       vertex 2.13452e-15 -59.2249 -9.61304
+       vertex 40 -59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 0 -0.984512 -0.175318
+    outer loop
+       vertex 2.53652e-15 -58.9025 -11.4235
+       vertex 40 -58.9025 -11.4235
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 0 -0.984512 -0.175318
+    outer loop
+       vertex 2.13452e-15 -59.2249 -9.61304
+       vertex 2.53652e-15 -58.9025 -11.4235
+       vertex 40 -59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 0 -0.978679 -0.205394
+    outer loop
+       vertex 2.93613e-15 -58.5248 -13.2232
+       vertex 40 -58.5248 -13.2232
+       vertex 40 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 0 -0.978679 -0.205394
+    outer loop
+       vertex 2.53652e-15 -58.9025 -11.4235
+       vertex 2.93613e-15 -58.5248 -13.2232
+       vertex 40 -58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 0 -0.97192 -0.235313
+    outer loop
+       vertex 3.33299e-15 -58.0921 -15.0104
+       vertex 40 -58.0921 -15.0104
+       vertex 40 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 0 -0.97192 -0.235313
+    outer loop
+       vertex 2.93613e-15 -58.5248 -13.2232
+       vertex 3.33299e-15 -58.0921 -15.0104
+       vertex 40 -58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 0 -0.964252 -0.264988
+    outer loop
+       vertex 3.72671e-15 -57.6048 -16.7836
+       vertex 40 -57.6048 -16.7836
+       vertex 40 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 0 -0.964252 -0.264988
+    outer loop
+       vertex 3.33299e-15 -58.0921 -15.0104
+       vertex 3.72671e-15 -57.6048 -16.7836
+       vertex 40 -58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 0 -0.955678 -0.294415
+    outer loop
+       vertex 4.11693e-15 -57.0634 -18.541
+       vertex 40 -57.0634 -18.541
+       vertex 40 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 0 -0.955678 -0.294415
+    outer loop
+       vertex 3.72671e-15 -57.6048 -16.7836
+       vertex 4.11693e-15 -57.0634 -18.541
+       vertex 40 -57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 0 -0.946208 -0.32356
+    outer loop
+       vertex 4.50329e-15 -56.4684 -20.281
+       vertex 40 -56.4684 -20.281
+       vertex 40 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 0 -0.946208 -0.32356
+    outer loop
+       vertex 4.11693e-15 -57.0634 -18.541
+       vertex 4.50329e-15 -56.4684 -20.281
+       vertex 40 -57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 0 -0.935859 -0.352374
+    outer loop
+       vertex 4.88542e-15 -55.8204 -22.002
+       vertex 40 -55.8204 -22.002
+       vertex 40 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 0 -0.935859 -0.352374
+    outer loop
+       vertex 4.50329e-15 -56.4684 -20.281
+       vertex 4.88542e-15 -55.8204 -22.002
+       vertex 40 -56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 0 -0.924598 -0.380944
+    outer loop
+       vertex 5.26295e-15 -55.1199 -23.7022
+       vertex 40 -55.1199 -23.7022
+       vertex 40 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 0 -0.924598 -0.380944
+    outer loop
+       vertex 4.88542e-15 -55.8204 -22.002
+       vertex 5.26295e-15 -55.1199 -23.7022
+       vertex 40 -55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 0 -0.91251 -0.409053
+    outer loop
+       vertex 5.63555e-15 -54.3677 -25.3802
+       vertex 40 -54.3677 -25.3802
+       vertex 40 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 0 -0.91251 -0.409053
+    outer loop
+       vertex 5.26295e-15 -55.1199 -23.7022
+       vertex 5.63555e-15 -54.3677 -25.3802
+       vertex 40 -55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 0 -0.899545 -0.436829
+    outer loop
+       vertex 6.00285e-15 -53.5644 -27.0344
+       vertex 40 -53.5644 -27.0344
+       vertex 40 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 0 -0.899545 -0.436829
+    outer loop
+       vertex 5.63555e-15 -54.3677 -25.3802
+       vertex 6.00285e-15 -53.5644 -27.0344
+       vertex 40 -54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 0 -0.885716 -0.464228
+    outer loop
+       vertex 6.36451e-15 -52.7107 -28.6632
+       vertex 40 -52.7107 -28.6632
+       vertex 40 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 0 -0.885716 -0.464228
+    outer loop
+       vertex 6.00285e-15 -53.5644 -27.0344
+       vertex 6.36451e-15 -52.7107 -28.6632
+       vertex 40 -53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 0 -0.871089 -0.491125
+    outer loop
+       vertex 6.72019e-15 -51.8076 -30.265
+       vertex 40 -51.8076 -30.265
+       vertex 40 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 0 -0.871089 -0.491125
+    outer loop
+       vertex 6.36451e-15 -52.7107 -28.6632
+       vertex 6.72019e-15 -51.8076 -30.265
+       vertex 40 -52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 0 -0.855641 -0.51757
+    outer loop
+       vertex 7.06956e-15 -50.8558 -31.8385
+       vertex 40 -50.8558 -31.8385
+       vertex 40 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 0 -0.855641 -0.51757
+    outer loop
+       vertex 6.72019e-15 -51.8076 -30.265
+       vertex 7.06956e-15 -50.8558 -31.8385
+       vertex 40 -51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 0 -0.839356 -0.543582
+    outer loop
+       vertex 7.41229e-15 -49.8562 -33.382
+       vertex 40 -49.8562 -33.382
+       vertex 40 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 0 -0.839356 -0.543582
+    outer loop
+       vertex 7.06956e-15 -50.8558 -31.8385
+       vertex 7.41229e-15 -49.8562 -33.382
+       vertex 40 -50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 0 -0.822303 -0.569049
+    outer loop
+       vertex 7.74806e-15 -48.8098 -34.8941
+       vertex 40 -48.8098 -34.8941
+       vertex 40 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 0 -0.822303 -0.569049
+    outer loop
+       vertex 7.41229e-15 -49.8562 -33.382
+       vertex 7.74806e-15 -48.8098 -34.8941
+       vertex 40 -49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 0 -0.804507 -0.593943
+    outer loop
+       vertex 8.07654e-15 -47.7176 -36.3735
+       vertex 40 -47.7176 -36.3735
+       vertex 40 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 0 -0.804507 -0.593943
+    outer loop
+       vertex 7.74806e-15 -48.8098 -34.8941
+       vertex 8.07654e-15 -47.7176 -36.3735
+       vertex 40 -48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 0 -0.785899 -0.618355
+    outer loop
+       vertex 8.39745e-15 -46.5805 -37.8187
+       vertex 40 -46.5805 -37.8187
+       vertex 40 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 0 -0.785899 -0.618355
+    outer loop
+       vertex 8.07654e-15 -47.7176 -36.3735
+       vertex 8.39745e-15 -46.5805 -37.8187
+       vertex 40 -47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 0 -0.766601 -0.642124
+    outer loop
+       vertex 8.71046e-15 -45.3997 -39.2284
+       vertex 40 -45.3997 -39.2284
+       vertex 40 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 0 -0.766601 -0.642124
+    outer loop
+       vertex 8.39745e-15 -46.5805 -37.8187
+       vertex 8.71046e-15 -45.3997 -39.2284
+       vertex 40 -46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 0 -0.746559 -0.665319
+    outer loop
+       vertex 9.01529e-15 -44.1762 -40.6013
+       vertex 40 -44.1762 -40.6013
+       vertex 40 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 0 -0.746559 -0.665319
+    outer loop
+       vertex 8.71046e-15 -45.3997 -39.2284
+       vertex 9.01529e-15 -44.1762 -40.6013
+       vertex 40 -45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 0 -0.725805 -0.687901
+    outer loop
+       vertex 9.31166e-15 -42.9112 -41.936
+       vertex 40 -42.9112 -41.936
+       vertex 40 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 0 -0.725805 -0.687901
+    outer loop
+       vertex 9.01529e-15 -44.1762 -40.6013
+       vertex 9.31166e-15 -42.9112 -41.936
+       vertex 40 -44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal -0 -0.704382 -0.709821
+    outer loop
+       vertex 40 -41.6059 -43.2313
+       vertex 40 -42.9112 -41.936
+       vertex 9.59928e-15 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 0 -0.704382 -0.709821
+    outer loop
+       vertex 9.59928e-15 -41.6059 -43.2313
+       vertex 40 -42.9112 -41.936
+       vertex 9.31166e-15 -42.9112 -41.936
+    endloop
+  endfacet
+  facet normal -0 -0.682324 -0.73105
+    outer loop
+       vertex 40 -40.2616 -44.486
+       vertex 40 -41.6059 -43.2313
+       vertex 9.87788e-15 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 0 -0.682324 -0.73105
+    outer loop
+       vertex 9.87788e-15 -40.2616 -44.486
+       vertex 40 -41.6059 -43.2313
+       vertex 9.59928e-15 -41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal -0 -0.659573 -0.75164
+    outer loop
+       vertex 40 -38.8794 -45.6989
+       vertex 40 -40.2616 -44.486
+       vertex 1.01472e-14 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 0 -0.659573 -0.75164
+    outer loop
+       vertex 1.01472e-14 -38.8794 -45.6989
+       vertex 40 -40.2616 -44.486
+       vertex 9.87788e-15 -40.2616 -44.486
+    endloop
+  endfacet
+  facet normal -0 -0.636246 -0.771486
+    outer loop
+       vertex 40 -37.4607 -46.8689
+       vertex 40 -38.8794 -45.6989
+       vertex 1.0407e-14 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 0 -0.636246 -0.771486
+    outer loop
+       vertex 1.0407e-14 -37.4607 -46.8689
+       vertex 40 -38.8794 -45.6989
+       vertex 1.01472e-14 -38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal -0 -0.612309 -0.790618
+    outer loop
+       vertex 40 -36.0068 -47.9949
+       vertex 40 -37.4607 -46.8689
+       vertex 1.0657e-14 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 0 -0.612309 -0.790618
+    outer loop
+       vertex 1.0657e-14 -36.0068 -47.9949
+       vertex 40 -37.4607 -46.8689
+       vertex 1.0407e-14 -37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal -0 -0.587794 -0.809011
+    outer loop
+       vertex 40 -34.5191 -49.0758
+       vertex 40 -36.0068 -47.9949
+       vertex 1.0897e-14 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 0 -0.587794 -0.809011
+    outer loop
+       vertex 1.0897e-14 -34.5191 -49.0758
+       vertex 40 -36.0068 -47.9949
+       vertex 1.0657e-14 -36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal -0 -0.562693 -0.826666
+    outer loop
+       vertex 40 -32.999 -50.1105
+       vertex 40 -34.5191 -49.0758
+       vertex 1.11268e-14 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 0 -0.562693 -0.826666
+    outer loop
+       vertex 1.11268e-14 -32.999 -50.1105
+       vertex 40 -34.5191 -49.0758
+       vertex 1.0897e-14 -34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal -0 -0.537161 -0.84348
+    outer loop
+       vertex 40 -31.4479 -51.0983
+       vertex 40 -32.999 -50.1105
+       vertex 1.13461e-14 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 0 -0.537161 -0.84348
+    outer loop
+       vertex 1.13461e-14 -31.4479 -51.0983
+       vertex 40 -32.999 -50.1105
+       vertex 1.11268e-14 -32.999 -50.1105
+    endloop
+  endfacet
+  facet normal -0 -0.511004 -0.859578
+    outer loop
+       vertex 40 -29.8672 -52.038
+       vertex 40 -31.4479 -51.0983
+       vertex 1.15548e-14 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 0 -0.511004 -0.859578
+    outer loop
+       vertex 1.15548e-14 -29.8672 -52.038
+       vertex 40 -31.4479 -51.0983
+       vertex 1.13461e-14 -31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal -0 -0.484428 -0.874831
+    outer loop
+       vertex 40 -28.2585 -52.9288
+       vertex 40 -29.8672 -52.038
+       vertex 1.17526e-14 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 0 -0.484428 -0.874831
+    outer loop
+       vertex 1.17526e-14 -28.2585 -52.9288
+       vertex 40 -29.8672 -52.038
+       vertex 1.15548e-14 -29.8672 -52.038
+    endloop
+  endfacet
+  facet normal -0 -0.457387 -0.889268
+    outer loop
+       vertex 40 -26.6232 -53.7699
+       vertex 40 -28.2585 -52.9288
+       vertex 1.19393e-14 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 0 -0.457387 -0.889268
+    outer loop
+       vertex 1.19393e-14 -26.6232 -53.7699
+       vertex 40 -28.2585 -52.9288
+       vertex 1.17526e-14 -28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal -0 -0.429925 -0.902865
+    outer loop
+       vertex 40 -24.9629 -54.5605
+       vertex 40 -26.6232 -53.7699
+       vertex 1.21149e-14 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 0 -0.429925 -0.902865
+    outer loop
+       vertex 1.21149e-14 -24.9629 -54.5605
+       vertex 40 -26.6232 -53.7699
+       vertex 1.19393e-14 -26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal -0 -0.402087 -0.915601
+    outer loop
+       vertex 40 -23.2792 -55.2999
+       vertex 40 -24.9629 -54.5605
+       vertex 1.2279e-14 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 0 -0.402087 -0.915601
+    outer loop
+       vertex 1.2279e-14 -23.2792 -55.2999
+       vertex 40 -24.9629 -54.5605
+       vertex 1.21149e-14 -24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal -0 -0.373809 -0.927506
+    outer loop
+       vertex 40 -21.5736 -55.9873
+       vertex 40 -23.2792 -55.2999
+       vertex 1.24317e-14 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 0 -0.373809 -0.927506
+    outer loop
+       vertex 1.24317e-14 -21.5736 -55.9873
+       vertex 40 -23.2792 -55.2999
+       vertex 1.2279e-14 -23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal -0 -0.345199 -0.93853
+    outer loop
+       vertex 40 -19.8477 -56.6221
+       vertex 40 -21.5736 -55.9873
+       vertex 1.25726e-14 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 0 -0.345199 -0.93853
+    outer loop
+       vertex 1.25726e-14 -19.8477 -56.6221
+       vertex 40 -21.5736 -55.9873
+       vertex 1.24317e-14 -21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal -0 -0.316325 -0.948651
+    outer loop
+       vertex 40 -18.1032 -57.2038
+       vertex 40 -19.8477 -56.6221
+       vertex 1.27018e-14 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 0 -0.316325 -0.948651
+    outer loop
+       vertex 1.27018e-14 -18.1032 -57.2038
+       vertex 40 -19.8477 -56.6221
+       vertex 1.25726e-14 -19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal -0 -0.287074 -0.957909
+    outer loop
+       vertex 40 -16.3417 -57.7317
+       vertex 40 -18.1032 -57.2038
+       vertex 1.2819e-14 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 0 -0.287074 -0.957909
+    outer loop
+       vertex 1.2819e-14 -16.3417 -57.7317
+       vertex 40 -18.1032 -57.2038
+       vertex 1.27018e-14 -18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal -0 -0.257604 -0.966251
+    outer loop
+       vertex 40 -14.5649 -58.2054
+       vertex 40 -16.3417 -57.7317
+       vertex 1.29242e-14 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 0 -0.257604 -0.966251
+    outer loop
+       vertex 1.29242e-14 -14.5649 -58.2054
+       vertex 40 -16.3417 -57.7317
+       vertex 1.2819e-14 -16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal -0 -0.227846 -0.973697
+    outer loop
+       vertex 40 -12.7743 -58.6244
+       vertex 40 -14.5649 -58.2054
+       vertex 1.30172e-14 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 0 -0.227846 -0.973697
+    outer loop
+       vertex 1.30172e-14 -12.7743 -58.6244
+       vertex 40 -14.5649 -58.2054
+       vertex 1.29242e-14 -14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal -0 -0.197893 -0.980224
+    outer loop
+       vertex 40 -10.9718 -58.9883
+       vertex 40 -12.7743 -58.6244
+       vertex 1.3098e-14 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 0 -0.197893 -0.980224
+    outer loop
+       vertex 1.3098e-14 -10.9718 -58.9883
+       vertex 40 -12.7743 -58.6244
+       vertex 1.30172e-14 -12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal -0 -0.167762 -0.985827
+    outer loop
+       vertex 40 -9.15896 -59.2968
+       vertex 40 -10.9718 -58.9883
+       vertex 1.31665e-14 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 0 -0.167762 -0.985827
+    outer loop
+       vertex 1.31665e-14 -9.15896 -59.2968
+       vertex 40 -10.9718 -58.9883
+       vertex 1.3098e-14 -10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal -0 -0.137528 -0.990498
+    outer loop
+       vertex 40 -7.33751 -59.5497
+       vertex 40 -9.15896 -59.2968
+       vertex 1.32227e-14 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 0 -0.137528 -0.990498
+    outer loop
+       vertex 1.32227e-14 -7.33751 -59.5497
+       vertex 40 -9.15896 -59.2968
+       vertex 1.31665e-14 -9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal -0 -0.107019 -0.994257
+    outer loop
+       vertex 40 -5.50917 -59.7465
+       vertex 40 -7.33751 -59.5497
+       vertex 1.32664e-14 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 0 -0.107019 -0.994257
+    outer loop
+       vertex 1.32664e-14 -5.50917 -59.7465
+       vertex 40 -7.33751 -59.5497
+       vertex 1.32227e-14 -7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal -0 -0.0765674 -0.997064
+    outer loop
+       vertex 40 -3.67566 -59.8873
+       vertex 40 -5.50917 -59.7465
+       vertex 1.32977e-14 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 0 -0.0765674 -0.997064
+    outer loop
+       vertex 1.32977e-14 -3.67566 -59.8873
+       vertex 40 -5.50917 -59.7465
+       vertex 1.32664e-14 -5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal -0 -0.0459528 -0.998944
+    outer loop
+       vertex 40 -1.83869 -59.9718
+       vertex 40 -3.67566 -59.8873
+       vertex 1.33164e-14 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 0 -0.0459528 -0.998944
+    outer loop
+       vertex 1.33164e-14 -1.83869 -59.9718
+       vertex 40 -3.67566 -59.8873
+       vertex 1.32977e-14 -3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal -0 -0.0153342 -0.999882
+    outer loop
+       vertex 40 0 -60
+       vertex 40 -1.83869 -59.9718
+       vertex 1.33227e-14 0 -60
+    endloop
+  endfacet
+  facet normal 0 -0.0153342 -0.999882
+    outer loop
+       vertex 1.33227e-14 0 -60
+       vertex 40 -1.83869 -59.9718
+       vertex 1.33164e-14 -1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 0 0.0153342 -0.999882
+    outer loop
+       vertex 40 0 -60
+       vertex 1.33227e-14 0 -60
+       vertex 40 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 0 0.0153342 -0.999882
+    outer loop
+       vertex 40 1.83869 -59.9718
+       vertex 1.33227e-14 0 -60
+       vertex 1.33164e-14 1.83869 -59.9718
+    endloop
+  endfacet
+  facet normal 0 0.0459528 -0.998944
+    outer loop
+       vertex 40 1.83869 -59.9718
+       vertex 1.33164e-14 1.83869 -59.9718
+       vertex 40 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 0 0.0459528 -0.998944
+    outer loop
+       vertex 40 3.67566 -59.8873
+       vertex 1.33164e-14 1.83869 -59.9718
+       vertex 1.32977e-14 3.67566 -59.8873
+    endloop
+  endfacet
+  facet normal 0 0.0765674 -0.997064
+    outer loop
+       vertex 40 3.67566 -59.8873
+       vertex 1.32977e-14 3.67566 -59.8873
+       vertex 40 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 0 0.0765674 -0.997064
+    outer loop
+       vertex 40 5.50917 -59.7465
+       vertex 1.32977e-14 3.67566 -59.8873
+       vertex 1.32664e-14 5.50917 -59.7465
+    endloop
+  endfacet
+  facet normal 0 0.107019 -0.994257
+    outer loop
+       vertex 40 5.50917 -59.7465
+       vertex 1.32664e-14 5.50917 -59.7465
+       vertex 40 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 0 0.107019 -0.994257
+    outer loop
+       vertex 40 7.33751 -59.5497
+       vertex 1.32664e-14 5.50917 -59.7465
+       vertex 1.32227e-14 7.33751 -59.5497
+    endloop
+  endfacet
+  facet normal 0 0.137528 -0.990498
+    outer loop
+       vertex 40 7.33751 -59.5497
+       vertex 1.32227e-14 7.33751 -59.5497
+       vertex 40 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 0 0.137528 -0.990498
+    outer loop
+       vertex 40 9.15896 -59.2968
+       vertex 1.32227e-14 7.33751 -59.5497
+       vertex 1.31665e-14 9.15896 -59.2968
+    endloop
+  endfacet
+  facet normal 0 0.167762 -0.985827
+    outer loop
+       vertex 40 9.15896 -59.2968
+       vertex 1.31665e-14 9.15896 -59.2968
+       vertex 40 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 0 0.167762 -0.985827
+    outer loop
+       vertex 40 10.9718 -58.9883
+       vertex 1.31665e-14 9.15896 -59.2968
+       vertex 1.3098e-14 10.9718 -58.9883
+    endloop
+  endfacet
+  facet normal 0 0.197893 -0.980224
+    outer loop
+       vertex 40 10.9718 -58.9883
+       vertex 1.3098e-14 10.9718 -58.9883
+       vertex 40 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 0 0.197893 -0.980224
+    outer loop
+       vertex 40 12.7743 -58.6244
+       vertex 1.3098e-14 10.9718 -58.9883
+       vertex 1.30172e-14 12.7743 -58.6244
+    endloop
+  endfacet
+  facet normal 0 0.227846 -0.973697
+    outer loop
+       vertex 40 12.7743 -58.6244
+       vertex 1.30172e-14 12.7743 -58.6244
+       vertex 40 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 0 0.227846 -0.973697
+    outer loop
+       vertex 40 14.5649 -58.2054
+       vertex 1.30172e-14 12.7743 -58.6244
+       vertex 1.29242e-14 14.5649 -58.2054
+    endloop
+  endfacet
+  facet normal 0 0.257604 -0.966251
+    outer loop
+       vertex 40 14.5649 -58.2054
+       vertex 1.29242e-14 14.5649 -58.2054
+       vertex 40 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 0 0.257604 -0.966251
+    outer loop
+       vertex 40 16.3417 -57.7317
+       vertex 1.29242e-14 14.5649 -58.2054
+       vertex 1.2819e-14 16.3417 -57.7317
+    endloop
+  endfacet
+  facet normal 0 0.287074 -0.957909
+    outer loop
+       vertex 40 16.3417 -57.7317
+       vertex 1.2819e-14 16.3417 -57.7317
+       vertex 40 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 0 0.287074 -0.957909
+    outer loop
+       vertex 40 18.1032 -57.2038
+       vertex 1.2819e-14 16.3417 -57.7317
+       vertex 1.27018e-14 18.1032 -57.2038
+    endloop
+  endfacet
+  facet normal 0 0.316325 -0.948651
+    outer loop
+       vertex 40 18.1032 -57.2038
+       vertex 1.27018e-14 18.1032 -57.2038
+       vertex 40 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 0 0.316325 -0.948651
+    outer loop
+       vertex 40 19.8477 -56.6221
+       vertex 1.27018e-14 18.1032 -57.2038
+       vertex 1.25726e-14 19.8477 -56.6221
+    endloop
+  endfacet
+  facet normal 0 0.345199 -0.93853
+    outer loop
+       vertex 40 19.8477 -56.6221
+       vertex 1.25726e-14 19.8477 -56.6221
+       vertex 40 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 0 0.345199 -0.93853
+    outer loop
+       vertex 40 21.5736 -55.9873
+       vertex 1.25726e-14 19.8477 -56.6221
+       vertex 1.24317e-14 21.5736 -55.9873
+    endloop
+  endfacet
+  facet normal 0 0.373809 -0.927506
+    outer loop
+       vertex 40 21.5736 -55.9873
+       vertex 1.24317e-14 21.5736 -55.9873
+       vertex 40 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 0 0.373809 -0.927506
+    outer loop
+       vertex 40 23.2792 -55.2999
+       vertex 1.24317e-14 21.5736 -55.9873
+       vertex 1.2279e-14 23.2792 -55.2999
+    endloop
+  endfacet
+  facet normal 0 0.402087 -0.915601
+    outer loop
+       vertex 40 23.2792 -55.2999
+       vertex 1.2279e-14 23.2792 -55.2999
+       vertex 40 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 0 0.402087 -0.915601
+    outer loop
+       vertex 40 24.9629 -54.5605
+       vertex 1.2279e-14 23.2792 -55.2999
+       vertex 1.21149e-14 24.9629 -54.5605
+    endloop
+  endfacet
+  facet normal 0 0.429925 -0.902865
+    outer loop
+       vertex 40 24.9629 -54.5605
+       vertex 1.21149e-14 24.9629 -54.5605
+       vertex 40 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 0 0.429925 -0.902865
+    outer loop
+       vertex 40 26.6232 -53.7699
+       vertex 1.21149e-14 24.9629 -54.5605
+       vertex 1.19393e-14 26.6232 -53.7699
+    endloop
+  endfacet
+  facet normal 0 0.457387 -0.889268
+    outer loop
+       vertex 40 26.6232 -53.7699
+       vertex 1.19393e-14 26.6232 -53.7699
+       vertex 40 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 0 0.457387 -0.889268
+    outer loop
+       vertex 40 28.2585 -52.9288
+       vertex 1.19393e-14 26.6232 -53.7699
+       vertex 1.17526e-14 28.2585 -52.9288
+    endloop
+  endfacet
+  facet normal 0 0.484428 -0.874831
+    outer loop
+       vertex 40 28.2585 -52.9288
+       vertex 1.17526e-14 28.2585 -52.9288
+       vertex 40 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 0 0.484428 -0.874831
+    outer loop
+       vertex 40 29.8672 -52.038
+       vertex 1.17526e-14 28.2585 -52.9288
+       vertex 1.15548e-14 29.8672 -52.038
+    endloop
+  endfacet
+  facet normal 0 0.511004 -0.859578
+    outer loop
+       vertex 40 29.8672 -52.038
+       vertex 1.15548e-14 29.8672 -52.038
+       vertex 40 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 0 0.511004 -0.859578
+    outer loop
+       vertex 40 31.4479 -51.0983
+       vertex 1.15548e-14 29.8672 -52.038
+       vertex 1.13461e-14 31.4479 -51.0983
+    endloop
+  endfacet
+  facet normal 0 0.537161 -0.84348
+    outer loop
+       vertex 40 31.4479 -51.0983
+       vertex 1.13461e-14 31.4479 -51.0983
+       vertex 40 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 0 0.537161 -0.84348
+    outer loop
+       vertex 40 32.999 -50.1105
+       vertex 1.13461e-14 31.4479 -51.0983
+       vertex 1.11268e-14 32.999 -50.1105
+    endloop
+  endfacet
+  facet normal 0 0.562693 -0.826666
+    outer loop
+       vertex 40 32.999 -50.1105
+       vertex 1.11268e-14 32.999 -50.1105
+       vertex 40 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 0 0.562693 -0.826666
+    outer loop
+       vertex 40 34.5191 -49.0758
+       vertex 1.11268e-14 32.999 -50.1105
+       vertex 1.0897e-14 34.5191 -49.0758
+    endloop
+  endfacet
+  facet normal 0 0.587794 -0.809011
+    outer loop
+       vertex 40 34.5191 -49.0758
+       vertex 1.0897e-14 34.5191 -49.0758
+       vertex 40 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 0 0.587794 -0.809011
+    outer loop
+       vertex 40 36.0068 -47.9949
+       vertex 1.0897e-14 34.5191 -49.0758
+       vertex 1.0657e-14 36.0068 -47.9949
+    endloop
+  endfacet
+  facet normal 0 0.612309 -0.790618
+    outer loop
+       vertex 40 36.0068 -47.9949
+       vertex 1.0657e-14 36.0068 -47.9949
+       vertex 40 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 0 0.612309 -0.790618
+    outer loop
+       vertex 40 37.4607 -46.8689
+       vertex 1.0657e-14 36.0068 -47.9949
+       vertex 1.0407e-14 37.4607 -46.8689
+    endloop
+  endfacet
+  facet normal 0 0.636246 -0.771486
+    outer loop
+       vertex 40 37.4607 -46.8689
+       vertex 1.0407e-14 37.4607 -46.8689
+       vertex 40 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 0 0.636246 -0.771486
+    outer loop
+       vertex 40 38.8794 -45.6989
+       vertex 1.0407e-14 37.4607 -46.8689
+       vertex 1.01472e-14 38.8794 -45.6989
+    endloop
+  endfacet
+  facet normal 0 0.659573 -0.75164
+    outer loop
+       vertex 40 38.8794 -45.6989
+       vertex 1.01472e-14 38.8794 -45.6989
+       vertex 40 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 0 0.659573 -0.75164
+    outer loop
+       vertex 40 40.2616 -44.486
+       vertex 1.01472e-14 38.8794 -45.6989
+       vertex 9.87788e-15 40.2616 -44.486
+    endloop
+  endfacet
+  facet normal 0 0.682324 -0.73105
+    outer loop
+       vertex 40 40.2616 -44.486
+       vertex 9.87788e-15 40.2616 -44.486
+       vertex 40 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 0 0.682324 -0.73105
+    outer loop
+       vertex 40 41.6059 -43.2313
+       vertex 9.87788e-15 40.2616 -44.486
+       vertex 9.59928e-15 41.6059 -43.2313
+    endloop
+  endfacet
+  facet normal 0 0.704382 -0.709821
+    outer loop
+       vertex 40 41.6059 -43.2313
+       vertex 9.59928e-15 41.6059 -43.2313
+       vertex 40 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 0 0.704382 -0.709821
+    outer loop
+       vertex 40 42.9112 -41.936
+       vertex 9.59928e-15 41.6059 -43.2313
+       vertex 9.31166e-15 42.9112 -41.936
+    endloop
+  endfacet
+  facet normal 0 0.725805 -0.687901
+    outer loop
+       vertex 40 42.9112 -41.936
+       vertex 9.31166e-15 42.9112 -41.936
+       vertex 40 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 0 0.725805 -0.687901
+    outer loop
+       vertex 40 44.1762 -40.6013
+       vertex 9.31166e-15 42.9112 -41.936
+       vertex 9.01529e-15 44.1762 -40.6013
+    endloop
+  endfacet
+  facet normal 0 0.746559 -0.665319
+    outer loop
+       vertex 40 44.1762 -40.6013
+       vertex 9.01529e-15 44.1762 -40.6013
+       vertex 40 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 0 0.746559 -0.665319
+    outer loop
+       vertex 40 45.3997 -39.2284
+       vertex 9.01529e-15 44.1762 -40.6013
+       vertex 8.71046e-15 45.3997 -39.2284
+    endloop
+  endfacet
+  facet normal 0 0.766601 -0.642124
+    outer loop
+       vertex 40 45.3997 -39.2284
+       vertex 8.71046e-15 45.3997 -39.2284
+       vertex 40 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 0 0.766601 -0.642124
+    outer loop
+       vertex 40 46.5805 -37.8187
+       vertex 8.71046e-15 45.3997 -39.2284
+       vertex 8.39745e-15 46.5805 -37.8187
+    endloop
+  endfacet
+  facet normal 0 0.785899 -0.618355
+    outer loop
+       vertex 40 46.5805 -37.8187
+       vertex 8.39745e-15 46.5805 -37.8187
+       vertex 40 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 0 0.785899 -0.618355
+    outer loop
+       vertex 40 47.7176 -36.3735
+       vertex 8.39745e-15 46.5805 -37.8187
+       vertex 8.07654e-15 47.7176 -36.3735
+    endloop
+  endfacet
+  facet normal 0 0.804507 -0.593943
+    outer loop
+       vertex 40 47.7176 -36.3735
+       vertex 8.07654e-15 47.7176 -36.3735
+       vertex 40 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 0 0.804507 -0.593943
+    outer loop
+       vertex 40 48.8098 -34.8941
+       vertex 8.07654e-15 47.7176 -36.3735
+       vertex 7.74806e-15 48.8098 -34.8941
+    endloop
+  endfacet
+  facet normal 0 0.822303 -0.569049
+    outer loop
+       vertex 40 48.8098 -34.8941
+       vertex 7.74806e-15 48.8098 -34.8941
+       vertex 40 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 0 0.822303 -0.569049
+    outer loop
+       vertex 40 49.8562 -33.382
+       vertex 7.74806e-15 48.8098 -34.8941
+       vertex 7.41229e-15 49.8562 -33.382
+    endloop
+  endfacet
+  facet normal 0 0.839356 -0.543582
+    outer loop
+       vertex 40 49.8562 -33.382
+       vertex 7.41229e-15 49.8562 -33.382
+       vertex 40 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 0 0.839356 -0.543582
+    outer loop
+       vertex 40 50.8558 -31.8385
+       vertex 7.41229e-15 49.8562 -33.382
+       vertex 7.06956e-15 50.8558 -31.8385
+    endloop
+  endfacet
+  facet normal 0 0.855641 -0.51757
+    outer loop
+       vertex 40 50.8558 -31.8385
+       vertex 7.06956e-15 50.8558 -31.8385
+       vertex 40 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 0 0.855641 -0.51757
+    outer loop
+       vertex 40 51.8076 -30.265
+       vertex 7.06956e-15 50.8558 -31.8385
+       vertex 6.72019e-15 51.8076 -30.265
+    endloop
+  endfacet
+  facet normal 0 0.871089 -0.491125
+    outer loop
+       vertex 40 51.8076 -30.265
+       vertex 6.72019e-15 51.8076 -30.265
+       vertex 40 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 0 0.871089 -0.491125
+    outer loop
+       vertex 40 52.7107 -28.6632
+       vertex 6.72019e-15 51.8076 -30.265
+       vertex 6.36451e-15 52.7107 -28.6632
+    endloop
+  endfacet
+  facet normal 0 0.885716 -0.464228
+    outer loop
+       vertex 40 52.7107 -28.6632
+       vertex 6.36451e-15 52.7107 -28.6632
+       vertex 40 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 0 0.885716 -0.464228
+    outer loop
+       vertex 40 53.5644 -27.0344
+       vertex 6.36451e-15 52.7107 -28.6632
+       vertex 6.00285e-15 53.5644 -27.0344
+    endloop
+  endfacet
+  facet normal 0 0.899545 -0.436829
+    outer loop
+       vertex 40 53.5644 -27.0344
+       vertex 6.00285e-15 53.5644 -27.0344
+       vertex 40 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 0 0.899545 -0.436829
+    outer loop
+       vertex 40 54.3677 -25.3802
+       vertex 6.00285e-15 53.5644 -27.0344
+       vertex 5.63555e-15 54.3677 -25.3802
+    endloop
+  endfacet
+  facet normal 0 0.91251 -0.409053
+    outer loop
+       vertex 40 54.3677 -25.3802
+       vertex 5.63555e-15 54.3677 -25.3802
+       vertex 40 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 0 0.91251 -0.409053
+    outer loop
+       vertex 40 55.1199 -23.7022
+       vertex 5.63555e-15 54.3677 -25.3802
+       vertex 5.26295e-15 55.1199 -23.7022
+    endloop
+  endfacet
+  facet normal 0 0.924598 -0.380944
+    outer loop
+       vertex 40 55.1199 -23.7022
+       vertex 5.26295e-15 55.1199 -23.7022
+       vertex 40 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 0 0.924598 -0.380944
+    outer loop
+       vertex 40 55.8204 -22.002
+       vertex 5.26295e-15 55.1199 -23.7022
+       vertex 4.88542e-15 55.8204 -22.002
+    endloop
+  endfacet
+  facet normal 0 0.935859 -0.352374
+    outer loop
+       vertex 40 55.8204 -22.002
+       vertex 4.88542e-15 55.8204 -22.002
+       vertex 40 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 0 0.935859 -0.352374
+    outer loop
+       vertex 40 56.4684 -20.281
+       vertex 4.88542e-15 55.8204 -22.002
+       vertex 4.50329e-15 56.4684 -20.281
+    endloop
+  endfacet
+  facet normal 0 0.946208 -0.32356
+    outer loop
+       vertex 40 56.4684 -20.281
+       vertex 4.50329e-15 56.4684 -20.281
+       vertex 40 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 0 0.946208 -0.32356
+    outer loop
+       vertex 40 57.0634 -18.541
+       vertex 4.50329e-15 56.4684 -20.281
+       vertex 4.11693e-15 57.0634 -18.541
+    endloop
+  endfacet
+  facet normal 0 0.955678 -0.294415
+    outer loop
+       vertex 40 57.0634 -18.541
+       vertex 4.11693e-15 57.0634 -18.541
+       vertex 40 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 0 0.955678 -0.294415
+    outer loop
+       vertex 40 57.6048 -16.7836
+       vertex 4.11693e-15 57.0634 -18.541
+       vertex 3.72671e-15 57.6048 -16.7836
+    endloop
+  endfacet
+  facet normal 0 0.964252 -0.264988
+    outer loop
+       vertex 40 57.6048 -16.7836
+       vertex 3.72671e-15 57.6048 -16.7836
+       vertex 40 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 0 0.964252 -0.264988
+    outer loop
+       vertex 40 58.0921 -15.0104
+       vertex 3.72671e-15 57.6048 -16.7836
+       vertex 3.33299e-15 58.0921 -15.0104
+    endloop
+  endfacet
+  facet normal 0 0.97192 -0.235313
+    outer loop
+       vertex 40 58.0921 -15.0104
+       vertex 3.33299e-15 58.0921 -15.0104
+       vertex 40 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 0 0.97192 -0.235313
+    outer loop
+       vertex 40 58.5248 -13.2232
+       vertex 3.33299e-15 58.0921 -15.0104
+       vertex 2.93613e-15 58.5248 -13.2232
+    endloop
+  endfacet
+  facet normal 0 0.978679 -0.205394
+    outer loop
+       vertex 40 58.5248 -13.2232
+       vertex 2.93613e-15 58.5248 -13.2232
+       vertex 40 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 0 0.978679 -0.205394
+    outer loop
+       vertex 40 58.9025 -11.4235
+       vertex 2.93613e-15 58.5248 -13.2232
+       vertex 2.53652e-15 58.9025 -11.4235
+    endloop
+  endfacet
+  facet normal 0 0.984512 -0.175318
+    outer loop
+       vertex 40 58.9025 -11.4235
+       vertex 2.53652e-15 58.9025 -11.4235
+       vertex 40 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 0 0.984512 -0.175318
+    outer loop
+       vertex 40 59.2249 -9.61304
+       vertex 2.53652e-15 58.9025 -11.4235
+       vertex 2.13452e-15 59.2249 -9.61304
+    endloop
+  endfacet
+  facet normal 0 0.989419 -0.145086
+    outer loop
+       vertex 40 59.2249 -9.61304
+       vertex 2.13452e-15 59.2249 -9.61304
+       vertex 40 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 0 0.989419 -0.145086
+    outer loop
+       vertex 40 59.4917 -7.79359
+       vertex 2.13452e-15 59.2249 -9.61304
+       vertex 1.73052e-15 59.4917 -7.79359
+    endloop
+  endfacet
+  facet normal 0 0.993402 -0.114687
+    outer loop
+       vertex 40 59.4917 -7.79359
+       vertex 1.73052e-15 59.4917 -7.79359
+       vertex 40 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 0 0.993402 -0.114687
+    outer loop
+       vertex 40 59.7026 -5.96681
+       vertex 1.73052e-15 59.4917 -7.79359
+       vertex 1.3249e-15 59.7026 -5.96681
+    endloop
+  endfacet
+  facet normal 0 0.996451 -0.0841806
+    outer loop
+       vertex 40 59.7026 -5.96681
+       vertex 1.3249e-15 59.7026 -5.96681
+       vertex 40 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 0 0.996451 -0.0841806
+    outer loop
+       vertex 40 59.8574 -4.13443
+       vertex 1.3249e-15 59.7026 -5.96681
+       vertex 9.18028e-16 59.8574 -4.13443
+    endloop
+  endfacet
+  facet normal 0 0.998561 -0.0536198
+    outer loop
+       vertex 40 59.8574 -4.13443
+       vertex 9.18028e-16 59.8574 -4.13443
+       vertex 40 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 0 0.998561 -0.0536198
+    outer loop
+       vertex 40 59.956 -2.29816
+       vertex 9.18028e-16 59.8574 -4.13443
+       vertex 5.10295e-16 59.956 -2.29816
+    endloop
+  endfacet
+  facet normal 0 0.999737 -0.0229475
+    outer loop
+       vertex 40 59.956 -2.29816
+       vertex 5.10295e-16 59.956 -2.29816
+       vertex 40 59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal 0 0.999737 -0.0229475
+    outer loop
+       vertex 40 59.9982 -0.459741
+       vertex 5.10295e-16 59.956 -2.29816
+       vertex 1.02083e-16 59.9982 -0.459741
+    endloop
+  endfacet
+  facet normal 0 0.999971 0.00766713
+    outer loop
+       vertex 40 59.9982 -0.459741
+       vertex 1.02083e-16 59.9982 -0.459741
+       vertex 40 59.9841 1.37911
+    endloop
+  endfacet
+  facet normal 0 0.999971 0.00766713
+    outer loop
+       vertex 40 59.9841 1.37911
+       vertex 1.02083e-16 59.9982 -0.459741
+       vertex -3.06225e-16 59.9841 1.37911
+    endloop
+  endfacet
+  facet normal 0 0.999267 0.0382837
+    outer loop
+       vertex 40 59.9841 1.37911
+       vertex -3.06225e-16 59.9841 1.37911
+       vertex 40 59.9137 3.21667
+    endloop
+  endfacet
+  facet normal 0 0.999267 0.0382837
+    outer loop
+       vertex 40 59.9137 3.21667
+       vertex -3.06225e-16 59.9841 1.37911
+       vertex -7.14245e-16 59.9137 3.21667
+    endloop
+  endfacet
+  facet normal 0 0.997624 0.0689002
+    outer loop
+       vertex 40 59.9137 3.21667
+       vertex -7.14245e-16 59.9137 3.21667
+       vertex 40 59.787 5.05121
+    endloop
+  endfacet
+  facet normal 0 0.997624 0.0689002
+    outer loop
+       vertex 40 59.787 5.05121
+       vertex -7.14245e-16 59.9137 3.21667
+       vertex -1.12159e-15 59.787 5.05121
+    endloop
+  endfacet
+  facet normal 0 0.995042 0.0994604
+    outer loop
+       vertex 40 59.787 5.05121
+       vertex -1.12159e-15 59.787 5.05121
+       vertex 40 59.6041 6.88101
+    endloop
+  endfacet
+  facet normal 0 0.995042 0.0994604
+    outer loop
+       vertex 40 59.6041 6.88101
+       vertex -1.12159e-15 59.787 5.05121
+       vertex -1.52789e-15 59.6041 6.88101
+    endloop
+  endfacet
+  facet normal 0 0.991532 0.12986
+    outer loop
+       vertex 40 59.6041 6.88101
+       vertex -1.52789e-15 59.6041 6.88101
+       vertex 40 59.3653 8.70434
+    endloop
+  endfacet
+  facet normal 0 0.991532 0.12986
+    outer loop
+       vertex 40 59.3653 8.70434
+       vertex -1.52789e-15 59.6041 6.88101
+       vertex -1.93275e-15 59.3653 8.70434
+    endloop
+  endfacet
+  facet normal 0 0.987075 0.160257
+    outer loop
+       vertex 40 59.3653 8.70434
+       vertex -1.93275e-15 59.3653 8.70434
+       vertex 40 59.0706 10.5195
+    endloop
+  endfacet
+  facet normal 0 0.987075 0.160257
+    outer loop
+       vertex 40 59.0706 10.5195
+       vertex -1.93275e-15 59.3653 8.70434
+       vertex -2.3358e-15 59.0706 10.5195
+    endloop
+  endfacet
+  facet normal 0 0.98171 0.190381
+    outer loop
+       vertex 40 59.0706 10.5195
+       vertex -2.3358e-15 59.0706 10.5195
+       vertex 40 58.7205 12.3248
+    endloop
+  endfacet
+  facet normal 0 0.98171 0.190381
+    outer loop
+       vertex 40 58.7205 12.3248
+       vertex -2.3358e-15 59.0706 10.5195
+       vertex -2.73665e-15 58.7205 12.3248
+    endloop
+  endfacet
+  facet normal 0 0.975421 0.22035
+    outer loop
+       vertex 40 58.7205 12.3248
+       vertex -2.73665e-15 58.7205 12.3248
+       vertex 40 58.3153 14.1185
+    endloop
+  endfacet
+  facet normal 0 0.975421 0.22035
+    outer loop
+       vertex 40 58.3153 14.1185
+       vertex -2.73665e-15 58.7205 12.3248
+       vertex -3.13493e-15 58.3153 14.1185
+    endloop
+  endfacet
+  facet normal 0 0.968193 0.250204
+    outer loop
+       vertex 40 58.3153 14.1185
+       vertex -3.13493e-15 58.3153 14.1185
+       vertex 40 57.8552 15.8989
+    endloop
+  endfacet
+  facet normal 0 0.968193 0.250204
+    outer loop
+       vertex 40 57.8552 15.8989
+       vertex -3.13493e-15 58.3153 14.1185
+       vertex -3.53026e-15 57.8552 15.8989
+    endloop
+  endfacet
+  facet normal 0 0.960078 0.279731
+    outer loop
+       vertex 40 57.8552 15.8989
+       vertex -3.53026e-15 57.8552 15.8989
+       vertex 40 57.3408 17.6644
+    endloop
+  endfacet
+  facet normal 0 0.960078 0.279731
+    outer loop
+       vertex 40 57.3408 17.6644
+       vertex -3.53026e-15 57.8552 15.8989
+       vertex -3.92228e-15 57.3408 17.6644
+    endloop
+  endfacet
+  facet normal 0 0.951064 0.308993
+    outer loop
+       vertex 40 57.3408 17.6644
+       vertex -3.92228e-15 57.3408 17.6644
+       vertex 40 56.7726 19.4133
+    endloop
+  endfacet
+  facet normal 0 0.951064 0.308993
+    outer loop
+       vertex 40 56.7726 19.4133
+       vertex -3.92228e-15 57.3408 17.6644
+       vertex -4.31062e-15 56.7726 19.4133
+    endloop
+  endfacet
+  facet normal 0 0.941139 0.338019
+    outer loop
+       vertex 40 56.7726 19.4133
+       vertex -4.31062e-15 56.7726 19.4133
+       vertex 40 56.151 21.144
+    endloop
+  endfacet
+  facet normal 0 0.941139 0.338019
+    outer loop
+       vertex 40 56.151 21.144
+       vertex -4.31062e-15 56.7726 19.4133
+       vertex -4.6949e-15 56.151 21.144
+    endloop
+  endfacet
+  facet normal 0 0.930344 0.366689
+    outer loop
+       vertex 40 56.151 21.144
+       vertex -4.6949e-15 56.151 21.144
+       vertex 40 55.4767 22.8548
+    endloop
+  endfacet
+  facet normal 0 0.930344 0.366689
+    outer loop
+       vertex 40 55.4767 22.8548
+       vertex -4.6949e-15 56.151 21.144
+       vertex -5.07478e-15 55.4767 22.8548
+    endloop
+  endfacet
+  facet normal 0 0.918649 0.395075
+    outer loop
+       vertex 40 55.4767 22.8548
+       vertex -5.07478e-15 55.4767 22.8548
+       vertex 40 54.7502 24.5441
+    endloop
+  endfacet
+  facet normal 0 0.918649 0.395075
+    outer loop
+       vertex 40 54.7502 24.5441
+       vertex -5.07478e-15 55.4767 22.8548
+       vertex -5.44989e-15 54.7502 24.5441
+    endloop
+  endfacet
+  facet normal 0 0.906143 0.422971
+    outer loop
+       vertex 40 54.7502 24.5441
+       vertex -5.44989e-15 54.7502 24.5441
+       vertex 40 53.9724 26.2104
+    endloop
+  endfacet
+  facet normal 0 0.906143 0.422971
+    outer loop
+       vertex 40 53.9724 26.2104
+       vertex -5.44989e-15 54.7502 24.5441
+       vertex -5.81988e-15 53.9724 26.2104
+    endloop
+  endfacet
+  facet normal 0 0.892735 0.450583
+    outer loop
+       vertex 40 53.9724 26.2104
+       vertex -5.81988e-15 53.9724 26.2104
+       vertex 40 53.1438 27.8521
+    endloop
+  endfacet
+  facet normal 0 0.892735 0.450583
+    outer loop
+       vertex 40 53.1438 27.8521
+       vertex -5.81988e-15 53.9724 26.2104
+       vertex -6.1844e-15 53.1438 27.8521
+    endloop
+  endfacet
+  facet normal 0 0.878508 0.477727
+    outer loop
+       vertex 40 53.1438 27.8521
+       vertex -6.1844e-15 53.1438 27.8521
+       vertex 40 52.2653 29.4676
+    endloop
+  endfacet
+  facet normal 0 0.878508 0.477727
+    outer loop
+       vertex 40 52.2653 29.4676
+       vertex -6.1844e-15 53.1438 27.8521
+       vertex -6.54312e-15 52.2653 29.4676
+    endloop
+  endfacet
+  facet normal 0 0.863451 0.504432
+    outer loop
+       vertex 40 52.2653 29.4676
+       vertex -6.54312e-15 52.2653 29.4676
+       vertex 40 51.3377 31.0554
+    endloop
+  endfacet
+  facet normal 0 0.863451 0.504432
+    outer loop
+       vertex 40 51.3377 31.0554
+       vertex -6.54312e-15 52.2653 29.4676
+       vertex -6.89568e-15 51.3377 31.0554
+    endloop
+  endfacet
+  facet normal 0 0.847604 0.530629
+    outer loop
+       vertex 40 51.3377 31.0554
+       vertex -6.89568e-15 51.3377 31.0554
+       vertex 40 50.3619 32.6141
+    endloop
+  endfacet
+  facet normal 0 0.847604 0.530629
+    outer loop
+       vertex 40 50.3619 32.6141
+       vertex -6.89568e-15 51.3377 31.0554
+       vertex -7.24177e-15 50.3619 32.6141
+    endloop
+  endfacet
+  facet normal 0 0.830935 0.556369
+    outer loop
+       vertex 40 50.3619 32.6141
+       vertex -7.24177e-15 50.3619 32.6141
+       vertex 40 49.3388 34.1421
+    endloop
+  endfacet
+  facet normal 0 0.830935 0.556369
+    outer loop
+       vertex 40 49.3388 34.1421
+       vertex -7.24177e-15 50.3619 32.6141
+       vertex -7.58106e-15 49.3388 34.1421
+    endloop
+  endfacet
+  facet normal 0 0.813503 0.581561
+    outer loop
+       vertex 40 49.3388 34.1421
+       vertex -7.58106e-15 49.3388 34.1421
+       vertex 40 48.2694 35.638
+    endloop
+  endfacet
+  facet normal 0 0.813503 0.581561
+    outer loop
+       vertex 40 48.2694 35.638
+       vertex -7.58106e-15 49.3388 34.1421
+       vertex -7.91323e-15 48.2694 35.638
+    endloop
+  endfacet
+  facet normal 0 0.795296 0.606222
+    outer loop
+       vertex 40 48.2694 35.638
+       vertex -7.91323e-15 48.2694 35.638
+       vertex 40 47.1546 37.1005
+    endloop
+  endfacet
+  facet normal 0 0.795296 0.606222
+    outer loop
+       vertex 40 47.1546 37.1005
+       vertex -7.91323e-15 48.2694 35.638
+       vertex -8.23796e-15 47.1546 37.1005
+    endloop
+  endfacet
+  facet normal 0 0.776334 0.630322
+    outer loop
+       vertex 40 47.1546 37.1005
+       vertex -8.23796e-15 47.1546 37.1005
+       vertex 40 45.9955 38.5281
+    endloop
+  endfacet
+  facet normal 0 0.776334 0.630322
+    outer loop
+       vertex 40 45.9955 38.5281
+       vertex -8.23796e-15 47.1546 37.1005
+       vertex -8.55496e-15 45.9955 38.5281
+    endloop
+  endfacet
+  facet normal 0 0.756652 0.653817
+    outer loop
+       vertex 40 45.9955 38.5281
+       vertex -8.55496e-15 45.9955 38.5281
+       vertex 40 44.7932 39.9195
+    endloop
+  endfacet
+  facet normal 0 0.756652 0.653817
+    outer loop
+       vertex 40 44.7932 39.9195
+       vertex -8.55496e-15 45.9955 38.5281
+       vertex -8.86392e-15 44.7932 39.9195
+    endloop
+  endfacet
+  facet normal 0 0.736278 0.676679
+    outer loop
+       vertex 40 44.7932 39.9195
+       vertex -8.86392e-15 44.7932 39.9195
+       vertex 40 43.5488 41.2735
+    endloop
+  endfacet
+  facet normal 0 0.736278 0.676679
+    outer loop
+       vertex 40 43.5488 41.2735
+       vertex -8.86392e-15 44.7932 39.9195
+       vertex -9.16455e-15 43.5488 41.2735
+    endloop
+  endfacet
+  facet normal 0 0.71519 0.69893
+    outer loop
+       vertex 40 43.5488 41.2735
+       vertex -9.16455e-15 43.5488 41.2735
+       vertex 40 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 0 0.71519 0.69893
+    outer loop
+       vertex 40 42.2636 42.5886
+       vertex -9.16455e-15 43.5488 41.2735
+       vertex -9.45658e-15 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 0 0.693437 0.720518
+    outer loop
+       vertex 40 40.9386 43.8638
+       vertex 40 42.2636 42.5886
+       vertex -9.45658e-15 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal -0 0.693437 0.720518
+    outer loop
+       vertex -9.73972e-15 40.9386 43.8638
+       vertex 40 40.9386 43.8638
+       vertex -9.45658e-15 42.2636 42.5886
+    endloop
+  endfacet
+  facet normal 0 0.671021 0.741439
+    outer loop
+       vertex 40 39.5751 45.0978
+       vertex 40 40.9386 43.8638
+       vertex -9.73972e-15 40.9386 43.8638
+    endloop
+  endfacet
+  facet normal -0 0.671021 0.741439
+    outer loop
+       vertex -1.00137e-14 39.5751 45.0978
+       vertex 40 39.5751 45.0978
+       vertex -9.73972e-15 40.9386 43.8638
+    endloop
+  endfacet
+  facet normal 0 0.647991 0.761648
+    outer loop
+       vertex 40 38.1745 46.2894
+       vertex 40 39.5751 45.0978
+       vertex -1.00137e-14 39.5751 45.0978
+    endloop
+  endfacet
+  facet normal -0 0.647991 0.761648
+    outer loop
+       vertex -1.02783e-14 38.1745 46.2894
+       vertex 40 38.1745 46.2894
+       vertex -1.00137e-14 39.5751 45.0978
+    endloop
+  endfacet
+  facet normal 0 0.624357 0.781139
+    outer loop
+       vertex 40 36.7381 47.4375
+       vertex 40 38.1745 46.2894
+       vertex -1.02783e-14 38.1745 46.2894
+    endloop
+  endfacet
+  facet normal -0 0.624357 0.781139
+    outer loop
+       vertex -1.05332e-14 36.7381 47.4375
+       vertex 40 36.7381 47.4375
+       vertex -1.02783e-14 38.1745 46.2894
+    endloop
+  endfacet
+  facet normal 0 0.600088 0.799934
+    outer loop
+       vertex 40 35.2671 48.541
+       vertex 40 36.7381 47.4375
+       vertex -1.05332e-14 36.7381 47.4375
+    endloop
+  endfacet
+  facet normal -0 0.600088 0.799934
+    outer loop
+       vertex -1.07783e-14 35.2671 48.541
+       vertex 40 35.2671 48.541
+       vertex -1.05332e-14 36.7381 47.4375
+    endloop
+  endfacet
+  facet normal 0 0.575332 0.81792
+    outer loop
+       vertex 40 33.763 49.599
+       vertex 40 35.2671 48.541
+       vertex -1.07783e-14 35.2671 48.541
+    endloop
+  endfacet
+  facet normal -0 0.575332 0.81792
+    outer loop
+       vertex -1.10132e-14 33.763 49.599
+       vertex 40 33.763 49.599
+       vertex -1.07783e-14 35.2671 48.541
+    endloop
+  endfacet
+  facet normal 0 0.549959 0.835191
+    outer loop
+       vertex 40 32.2272 50.6103
+       vertex 40 33.763 49.599
+       vertex -1.10132e-14 33.763 49.599
+    endloop
+  endfacet
+  facet normal -0 0.549959 0.835191
+    outer loop
+       vertex -1.12378e-14 32.2272 50.6103
+       vertex 40 32.2272 50.6103
+       vertex -1.10132e-14 33.763 49.599
+    endloop
+  endfacet
+  facet normal 0 0.524156 0.851622
+    outer loop
+       vertex 40 30.6611 51.5742
+       vertex 40 32.2272 50.6103
+       vertex -1.12378e-14 32.2272 50.6103
+    endloop
+  endfacet
+  facet normal -0 0.524156 0.851622
+    outer loop
+       vertex -1.14518e-14 30.6611 51.5742
+       vertex 40 30.6611 51.5742
+       vertex -1.12378e-14 32.2272 50.6103
+    endloop
+  endfacet
+  facet normal 0 0.49779 0.867298
+    outer loop
+       vertex 40 29.0662 52.4896
+       vertex 40 30.6611 51.5742
+       vertex -1.14518e-14 30.6611 51.5742
+    endloop
+  endfacet
+  facet normal -0 0.49779 0.867298
+    outer loop
+       vertex -1.1655e-14 29.0662 52.4896
+       vertex 40 29.0662 52.4896
+       vertex -1.14518e-14 30.6611 51.5742
+    endloop
+  endfacet
+  facet normal 0 0.470937 0.882167
+    outer loop
+       vertex 40 27.444 53.3556
+       vertex 40 29.0662 52.4896
+       vertex -1.1655e-14 29.0662 52.4896
+    endloop
+  endfacet
+  facet normal -0 0.470937 0.882167
+    outer loop
+       vertex -1.18473e-14 27.444 53.3556
+       vertex 40 27.444 53.3556
+       vertex -1.1655e-14 29.0662 52.4896
+    endloop
+  endfacet
+  facet normal 0 0.443753 0.896149
+    outer loop
+       vertex 40 25.7961 54.1716
+       vertex 40 27.444 53.3556
+       vertex -1.18473e-14 27.444 53.3556
+    endloop
+  endfacet
+  facet normal -0 0.443753 0.896149
+    outer loop
+       vertex -1.20285e-14 25.7961 54.1716
+       vertex 40 25.7961 54.1716
+       vertex -1.18473e-14 27.444 53.3556
+    endloop
+  endfacet
+  facet normal 0 0.416058 0.909338
+    outer loop
+       vertex 40 24.1239 54.9367
+       vertex 40 25.7961 54.1716
+       vertex -1.20285e-14 25.7961 54.1716
+    endloop
+  endfacet
+  facet normal -0 0.416058 0.909338
+    outer loop
+       vertex -1.21984e-14 24.1239 54.9367
+       vertex 40 24.1239 54.9367
+       vertex -1.20285e-14 25.7961 54.1716
+    endloop
+  endfacet
+  facet normal 0 0.387946 0.921682
+    outer loop
+       vertex 40 22.429 55.6501
+       vertex 40 24.1239 54.9367
+       vertex -1.21984e-14 24.1239 54.9367
+    endloop
+  endfacet
+  facet normal -0 0.387946 0.921682
+    outer loop
+       vertex -1.23568e-14 22.429 55.6501
+       vertex 40 22.429 55.6501
+       vertex -1.21984e-14 24.1239 54.9367
+    endloop
+  endfacet
+  facet normal 0 0.359565 0.93312
+    outer loop
+       vertex 40 20.7131 56.3113
+       vertex 40 22.429 55.6501
+       vertex -1.23568e-14 22.429 55.6501
+    endloop
+  endfacet
+  facet normal -0 0.359565 0.93312
+    outer loop
+       vertex -1.25036e-14 20.7131 56.3113
+       vertex 40 20.7131 56.3113
+       vertex -1.23568e-14 22.429 55.6501
+    endloop
+  endfacet
+  facet normal 0 0.330793 0.943704
+    outer loop
+       vertex 40 18.9777 56.9196
+       vertex 40 20.7131 56.3113
+       vertex -1.25036e-14 20.7131 56.3113
+    endloop
+  endfacet
+  facet normal -0 0.330793 0.943704
+    outer loop
+       vertex -1.26387e-14 18.9777 56.9196
+       vertex 40 18.9777 56.9196
+       vertex -1.25036e-14 20.7131 56.3113
+    endloop
+  endfacet
+  facet normal 0 0.301752 0.953386
+    outer loop
+       vertex 40 17.2245 57.4745
+       vertex 40 18.9777 56.9196
+       vertex -1.26387e-14 18.9777 56.9196
+    endloop
+  endfacet
+  facet normal -0 0.301752 0.953386
+    outer loop
+       vertex -1.27619e-14 17.2245 57.4745
+       vertex 40 17.2245 57.4745
+       vertex -1.26387e-14 18.9777 56.9196
+    endloop
+  endfacet
+  facet normal 0 0.272336 0.962202
+    outer loop
+       vertex 40 15.4551 57.9753
+       vertex 40 17.2245 57.4745
+       vertex -1.27619e-14 17.2245 57.4745
+    endloop
+  endfacet
+  facet normal -0 0.272336 0.962202
+    outer loop
+       vertex -1.28731e-14 15.4551 57.9753
+       vertex 40 15.4551 57.9753
+       vertex -1.27619e-14 17.2245 57.4745
+    endloop
+  endfacet
+  facet normal 0 0.242753 0.970088
+    outer loop
+       vertex 40 13.6712 58.4217
+       vertex 40 15.4551 57.9753
+       vertex -1.28731e-14 15.4551 57.9753
+    endloop
+  endfacet
+  facet normal -0 0.242753 0.970088
+    outer loop
+       vertex -1.29722e-14 13.6712 58.4217
+       vertex 40 13.6712 58.4217
+       vertex -1.28731e-14 15.4551 57.9753
+    endloop
+  endfacet
+  facet normal 0 0.212905 0.977073
+    outer loop
+       vertex 40 11.8745 58.8132
+       vertex 40 13.6712 58.4217
+       vertex -1.29722e-14 13.6712 58.4217
+    endloop
+  endfacet
+  facet normal -0 0.212905 0.977073
+    outer loop
+       vertex -1.30592e-14 11.8745 58.8132
+       vertex 40 11.8745 58.8132
+       vertex -1.29722e-14 13.6712 58.4217
+    endloop
+  endfacet
+  facet normal 0 0.18288 0.983135
+    outer loop
+       vertex 40 10.0666 59.1495
+       vertex 40 11.8745 58.8132
+       vertex -1.30592e-14 11.8745 58.8132
+    endloop
+  endfacet
+  facet normal -0 0.18288 0.983135
+    outer loop
+       vertex -1.31338e-14 10.0666 59.1495
+       vertex 40 10.0666 59.1495
+       vertex -1.30592e-14 11.8745 58.8132
+    endloop
+  endfacet
+  facet normal 0 0.15264 0.988282
+    outer loop
+       vertex 40 8.2492 59.4302
+       vertex 40 10.0666 59.1495
+       vertex -1.31338e-14 10.0666 59.1495
+    endloop
+  endfacet
+  facet normal -0 0.15264 0.988282
+    outer loop
+       vertex -1.31962e-14 8.2492 59.4302
+       vertex 40 8.2492 59.4302
+       vertex -1.31338e-14 10.0666 59.1495
+    endloop
+  endfacet
+  facet normal 0 0.122303 0.992493
+    outer loop
+       vertex 40 6.4241 59.6551
+       vertex 40 8.2492 59.4302
+       vertex -1.31962e-14 8.2492 59.4302
+    endloop
+  endfacet
+  facet normal -0 0.122303 0.992493
+    outer loop
+       vertex -1.32461e-14 6.4241 59.6551
+       vertex 40 6.4241 59.6551
+       vertex -1.31962e-14 8.2492 59.4302
+    endloop
+  endfacet
+  facet normal 0 0.0917915 0.995778
+    outer loop
+       vertex 40 4.59295 59.8239
+       vertex 40 6.4241 59.6551
+       vertex -1.32461e-14 6.4241 59.6551
+    endloop
+  endfacet
+  facet normal -0 0.0917915 0.995778
+    outer loop
+       vertex -1.32836e-14 4.59295 59.8239
+       vertex 40 4.59295 59.8239
+       vertex -1.32461e-14 6.4241 59.6551
+    endloop
+  endfacet
+  facet normal 0 0.0612872 0.99812
+    outer loop
+       vertex 40 2.7575 59.9366
+       vertex 40 4.59295 59.8239
+       vertex -1.32836e-14 4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -0 0.0612872 0.99812
+    outer loop
+       vertex -1.33086e-14 2.7575 59.9366
+       vertex 40 2.7575 59.9366
+       vertex -1.32836e-14 4.59295 59.8239
+    endloop
+  endfacet
+  facet normal -0.316194 0.029098 -0.948248
+    outer loop
+       vertex -15 -0.536348 34.9959
+       vertex -30 -1.83833 39.9577
+       vertex -30 -0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0.316194 -0 -0.948695
+    outer loop
+       vertex -15 0.536348 34.9959
+       vertex -15 -0.536348 34.9959
+       vertex -30 0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0.316194 -0 -0.948695
+    outer loop
+       vertex -30 0.61297 39.9953
+       vertex -15 -0.536348 34.9959
+       vertex -30 -0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0.316194 -0.029095 -0.948248
+    outer loop
+       vertex -15 1.60854 34.963
+       vertex -15 0.536348 34.9959
+       vertex -30 0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0.316193 -0.029098 -0.948248
+    outer loop
+       vertex -30 1.83833 39.9577
+       vertex -15 1.60854 34.963
+       vertex -30 0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0.316193 -0.0581058 -0.946914
+    outer loop
+       vertex -15 2.67922 34.8973
+       vertex -15 1.60854 34.963
+       vertex -30 1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -0.316193 -0.0581161 -0.946913
+    outer loop
+       vertex -30 3.06197 39.8826
+       vertex -15 2.67922 34.8973
+       vertex -30 1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -0.316193 -0.0871125 -0.944687
+    outer loop
+       vertex -15 3.74739 34.7988
+       vertex -15 2.67922 34.8973
+       vertex -30 3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -0.316196 -0.0870581 -0.944691
+    outer loop
+       vertex -30 4.28273 39.7701
+       vertex -15 3.74739 34.7988
+       vertex -30 3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -0.316197 -0.116036 -0.941571
+    outer loop
+       vertex -15 4.81203 34.6676
+       vertex -15 3.74739 34.7988
+       vertex -30 4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -0.316194 -0.116078 -0.941567
+    outer loop
+       vertex -30 5.49947 39.6201
+       vertex -15 4.81203 34.6676
+       vertex -30 4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -0.316194 -0.144777 -0.937583
+    outer loop
+       vertex -15 5.87216 34.5039
+       vertex -15 4.81203 34.6676
+       vertex -30 5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -0.316193 -0.144788 -0.937581
+    outer loop
+       vertex -30 6.71104 39.433
+       vertex -15 5.87216 34.5039
+       vertex -30 5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -0.316193 -0.173516 -0.932692
+    outer loop
+       vertex -15 6.92677 34.3077
+       vertex -15 5.87216 34.5039
+       vertex -30 6.71104 39.433
+    endloop
+  endfacet
+  facet normal -0.316194 -0.173495 -0.932695
+    outer loop
+       vertex -30 7.91631 39.2088
+       vertex -15 6.92677 34.3077
+       vertex -30 6.71104 39.433
+    endloop
+  endfacet
+  facet normal -0.316194 -0.201998 -0.92694
+    outer loop
+       vertex -15 7.97487 34.0793
+       vertex -15 6.92677 34.3077
+       vertex -30 7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -0.316196 -0.201977 -0.926944
+    outer loop
+       vertex -30 9.11414 38.9478
+       vertex -15 7.97487 34.0793
+       vertex -30 7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -0.316196 -0.230297 -0.920317
+    outer loop
+       vertex -15 9.01548 33.8189
+       vertex -15 7.97487 34.0793
+       vertex -30 9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -0.316195 -0.230299 -0.920317
+    outer loop
+       vertex -30 10.3034 38.6502
+       vertex -15 9.01548 33.8189
+       vertex -30 9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -0.316196 -0.258345 -0.912841
+    outer loop
+       vertex -15 10.0476 33.5268
+       vertex -15 9.01548 33.8189
+       vertex -30 10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -0.316193 -0.258388 -0.91283
+    outer loop
+       vertex -30 11.483 38.3163
+       vertex -15 10.0476 33.5268
+       vertex -30 10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -0.316192 -0.286278 -0.904471
+    outer loop
+       vertex -15 11.0703 33.2031
+       vertex -15 10.0476 33.5268
+       vertex -30 11.483 38.3163
+    endloop
+  endfacet
+  facet normal -0.316195 -0.286248 -0.904479
+    outer loop
+       vertex -30 12.6518 37.9464
+       vertex -15 11.0703 33.2031
+       vertex -30 11.483 38.3163
+    endloop
+  endfacet
+  facet normal -0.316195 -0.31379 -0.895297
+    outer loop
+       vertex -15 12.0826 32.8483
+       vertex -15 11.0703 33.2031
+       vertex -30 12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -0.316194 -0.313804 -0.895292
+    outer loop
+       vertex -30 13.8087 37.5409
+       vertex -15 12.0826 32.8483
+       vertex -30 12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -0.316194 -0.341101 -0.885252
+    outer loop
+       vertex -15 13.0836 32.4626
+       vertex -15 12.0826 32.8483
+       vertex -30 13.8087 37.5409
+    endloop
+  endfacet
+  facet normal -0.316194 -0.341101 -0.885252
+    outer loop
+       vertex -30 14.9527 37.1001
+       vertex -15 13.0836 32.4626
+       vertex -30 13.8087 37.5409
+    endloop
+  endfacet
+  facet normal -0.316194 -0.368078 -0.87438
+    outer loop
+       vertex -15 14.0723 32.0464
+       vertex -15 13.0836 32.4626
+       vertex -30 14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -0.316191 -0.368117 -0.874364
+    outer loop
+       vertex -30 16.0826 36.6244
+       vertex -15 14.0723 32.0464
+       vertex -30 14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -0.316191 -0.394723 -0.86268
+    outer loop
+       vertex -15 15.0477 31.6001
+       vertex -15 14.0723 32.0464
+       vertex -30 16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -0.316195 -0.394672 -0.862702
+    outer loop
+       vertex -30 17.1974 36.1144
+       vertex -15 15.0477 31.6001
+       vertex -30 16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -0.316195 -0.420975 -0.850177
+    outer loop
+       vertex -15 16.009 31.1241
+       vertex -15 15.0477 31.6001
+       vertex -30 17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -0.316194 -0.420984 -0.850173
+    outer loop
+       vertex -30 18.296 35.5704
+       vertex -15 16.009 31.1241
+       vertex -30 17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -0.316194 -0.446793 -0.836897
+    outer loop
+       vertex -15 16.9553 30.6189
+       vertex -15 16.009 31.1241
+       vertex -30 18.296 35.5704
+    endloop
+  endfacet
+  facet normal -0.316193 -0.446806 -0.836891
+    outer loop
+       vertex -30 19.3775 34.993
+       vertex -15 16.9553 30.6189
+       vertex -30 18.296 35.5704
+    endloop
+  endfacet
+  facet normal -0.316193 -0.472245 -0.822804
+    outer loop
+       vertex -15 17.8857 30.0849
+       vertex -15 16.9553 30.6189
+       vertex -30 19.3775 34.993
+    endloop
+  endfacet
+  facet normal -0.316194 -0.472233 -0.822811
+    outer loop
+       vertex -30 20.4407 34.3828
+       vertex -15 17.8857 30.0849
+       vertex -30 19.3775 34.993
+    endloop
+  endfacet
+  facet normal -0.316194 -0.497238 -0.807945
+    outer loop
+       vertex -15 18.7992 29.5227
+       vertex -15 17.8857 30.0849
+       vertex -30 20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -0.316193 -0.497252 -0.807937
+    outer loop
+       vertex -30 21.4848 33.7402
+       vertex -15 18.7992 29.5227
+       vertex -30 20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -0.316193 -0.521784 -0.792316
+    outer loop
+       vertex -15 19.6951 28.9327
+       vertex -15 18.7992 29.5227
+       vertex -30 21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -0.316197 -0.521731 -0.792348
+    outer loop
+       vertex -30 22.5087 33.066
+       vertex -15 19.6951 28.9327
+       vertex -30 21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -0.316198 -0.545772 -0.775985
+    outer loop
+       vertex -15 20.5725 28.3156
+       vertex -15 19.6951 28.9327
+       vertex -30 22.5087 33.066
+    endloop
+  endfacet
+  facet normal -0.316194 -0.545812 -0.775958
+    outer loop
+       vertex -30 23.5114 32.3607
+       vertex -15 20.5725 28.3156
+       vertex -30 22.5087 33.066
+    endloop
+  endfacet
+  facet normal -0.316193 -0.569303 -0.758891
+    outer loop
+       vertex -30 24.4921 31.625
+       vertex -15 21.4306 27.6719
+       vertex -30 23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -0.316194 -0.569288 -0.758902
+    outer loop
+       vertex -15 21.4306 27.6719
+       vertex -15 20.5725 28.3156
+       vertex -30 23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -0.316193 -0.592364 -0.741031
+    outer loop
+       vertex -15 22.2685 27.0021
+       vertex -15 21.4306 27.6719
+       vertex -30 24.4921 31.625
+    endloop
+  endfacet
+  facet normal -0.316196 -0.592323 -0.741062
+    outer loop
+       vertex -30 25.4497 30.8596
+       vertex -15 22.2685 27.0021
+       vertex -30 24.4921 31.625
+    endloop
+  endfacet
+  facet normal -0.316196 -0.614754 -0.722564
+    outer loop
+       vertex -15 23.0855 26.307
+       vertex -15 22.2685 27.0021
+       vertex -30 25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -0.316196 -0.614759 -0.722559
+    outer loop
+       vertex -30 26.3834 30.0652
+       vertex -15 23.0855 26.307
+       vertex -30 25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -0.316195 -0.636609 -0.703384
+    outer loop
+       vertex -15 23.8808 25.5872
+       vertex -15 23.0855 26.307
+       vertex -30 26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -0.316196 -0.636607 -0.703386
+    outer loop
+       vertex -30 27.2924 29.2425
+       vertex -15 23.8808 25.5872
+       vertex -30 26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -0.316196 -0.657837 -0.683572
+    outer loop
+       vertex -15 24.6537 24.8434
+       vertex -15 23.8808 25.5872
+       vertex -30 27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -0.316194 -0.65786 -0.683551
+    outer loop
+       vertex -30 28.1757 28.3924
+       vertex -15 24.6537 24.8434
+       vertex -30 27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -0.316194 -0.678478 -0.663091
+    outer loop
+       vertex -15 25.4035 24.0762
+       vertex -15 24.6537 24.8434
+       vertex -30 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal -0.316189 -0.678524 -0.663046
+    outer loop
+       vertex -30 29.0325 27.5156
+       vertex -15 25.4035 24.0762
+       vertex -30 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal -0.316189 -0.69849 -0.641978
+    outer loop
+       vertex -15 26.1294 23.2864
+       vertex -15 25.4035 24.0762
+       vertex -30 29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -0.31619 -0.698479 -0.641989
+    outer loop
+       vertex -30 29.8621 26.613
+       vertex -15 26.1294 23.2864
+       vertex -30 29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -0.31619 -0.717869 -0.620232
+    outer loop
+       vertex -15 26.8307 22.4747
+       vertex -15 26.1294 23.2864
+       vertex -30 29.8621 26.613
+    endloop
+  endfacet
+  facet normal -0.316197 -0.717806 -0.620302
+    outer loop
+       vertex -30 30.6637 25.6854
+       vertex -15 26.8307 22.4747
+       vertex -30 29.8621 26.613
+    endloop
+  endfacet
+  facet normal -0.316197 -0.736498 -0.597989
+    outer loop
+       vertex -15 27.5068 21.642
+       vertex -15 26.8307 22.4747
+       vertex -30 30.6637 25.6854
+    endloop
+  endfacet
+  facet normal -0.316196 -0.736505 -0.59798
+    outer loop
+       vertex -30 31.4364 24.7337
+       vertex -15 27.5068 21.642
+       vertex -30 30.6637 25.6854
+    endloop
+  endfacet
+  facet normal -0.316196 -0.754517 -0.575085
+    outer loop
+       vertex -15 28.1571 20.7888
+       vertex -15 27.5068 21.642
+       vertex -30 31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -0.316199 -0.754492 -0.575117
+    outer loop
+       vertex -30 32.1796 23.7587
+       vertex -15 28.1571 20.7888
+       vertex -30 31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -0.316199 -0.771726 -0.551776
+    outer loop
+       vertex -15 28.781 19.9162
+       vertex -15 28.1571 20.7888
+       vertex -30 32.1796 23.7587
+    endloop
+  endfacet
+  facet normal -0.316192 -0.771785 -0.551697
+    outer loop
+       vertex -30 32.8925 22.7614
+       vertex -15 28.781 19.9162
+       vertex -30 32.1796 23.7587
+    endloop
+  endfacet
+  facet normal -0.316192 -0.788299 -0.527832
+    outer loop
+       vertex -15 29.3778 19.0249
+       vertex -15 28.781 19.9162
+       vertex -30 32.8925 22.7614
+    endloop
+  endfacet
+  facet normal -0.316192 -0.788302 -0.527829
+    outer loop
+       vertex -30 33.5746 21.7427
+       vertex -15 29.3778 19.0249
+       vertex -30 32.8925 22.7614
+    endloop
+  endfacet
+  facet normal -0.316192 -0.804139 -0.503372
+    outer loop
+       vertex -15 29.947 18.1156
+       vertex -15 29.3778 19.0249
+       vertex -30 33.5746 21.7427
+    endloop
+  endfacet
+  facet normal -0.316198 -0.804086 -0.503453
+    outer loop
+       vertex -30 34.2252 20.7036
+       vertex -15 29.947 18.1156
+       vertex -30 33.5746 21.7427
+    endloop
+  endfacet
+  facet normal -0.316199 -0.819147 -0.478557
+    outer loop
+       vertex -15 30.4881 17.1894
+       vertex -15 29.947 18.1156
+       vertex -30 34.2252 20.7036
+    endloop
+  endfacet
+  facet normal -0.316192 -0.8192 -0.478471
+    outer loop
+       vertex -30 34.8435 19.645
+       vertex -15 30.4881 17.1894
+       vertex -30 34.2252 20.7036
+    endloop
+  endfacet
+  facet normal -0.316191 -0.833463 -0.453169
+    outer loop
+       vertex -15 31.0005 16.247
+       vertex -15 30.4881 17.1894
+       vertex -30 34.8435 19.645
+    endloop
+  endfacet
+  facet normal -0.316197 -0.833424 -0.453238
+    outer loop
+       vertex -30 35.4292 18.568
+       vertex -15 31.0005 16.247
+       vertex -30 34.8435 19.645
+    endloop
+  endfacet
+  facet normal -0.316197 -0.846904 -0.42752
+    outer loop
+       vertex -15 31.4839 15.2894
+       vertex -15 31.0005 16.247
+       vertex -30 35.4292 18.568
+    endloop
+  endfacet
+  facet normal -0.316194 -0.846922 -0.427487
+    outer loop
+       vertex -30 35.9816 17.4736
+       vertex -15 31.4839 15.2894
+       vertex -30 35.4292 18.568
+    endloop
+  endfacet
+  facet normal -0.316194 -0.859657 -0.401261
+    outer loop
+       vertex -15 31.9376 14.3174
+       vertex -15 31.4839 15.2894
+       vertex -30 35.9816 17.4736
+    endloop
+  endfacet
+  facet normal -0.316193 -0.859669 -0.401238
+    outer loop
+       vertex -30 36.5001 16.3627
+       vertex -15 31.9376 14.3174
+       vertex -30 35.9816 17.4736
+    endloop
+  endfacet
+  facet normal -0.316193 -0.871511 -0.37482
+    outer loop
+       vertex -15 32.3614 13.332
+       vertex -15 31.9376 14.3174
+       vertex -30 36.5001 16.3627
+    endloop
+  endfacet
+  facet normal -0.31619 -0.871527 -0.374785
+    outer loop
+       vertex -30 36.9844 15.2365
+       vertex -15 32.3614 13.332
+       vertex -30 36.5001 16.3627
+    endloop
+  endfacet
+  facet normal -0.31619 -0.88263 -0.347833
+    outer loop
+       vertex -15 32.7547 12.334
+       vertex -15 32.3614 13.332
+       vertex -30 36.9844 15.2365
+    endloop
+  endfacet
+  facet normal -0.316197 -0.882591 -0.347926
+    outer loop
+       vertex -30 37.434 14.096
+       vertex -15 32.7547 12.334
+       vertex -30 36.9844 15.2365
+    endloop
+  endfacet
+  facet normal -0.316197 -0.892855 -0.32067
+    outer loop
+       vertex -15 33.1173 11.3244
+       vertex -15 32.7547 12.334
+       vertex -30 37.434 14.096
+    endloop
+  endfacet
+  facet normal -0.316198 -0.892852 -0.320679
+    outer loop
+       vertex -30 37.8484 12.9422
+       vertex -15 33.1173 11.3244
+       vertex -30 37.434 14.096
+    endloop
+  endfacet
+  facet normal -0.316198 -0.902256 -0.293177
+    outer loop
+       vertex -15 33.4488 10.3042
+       vertex -15 33.1173 11.3244
+       vertex -30 37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -0.316196 -0.902267 -0.293146
+    outer loop
+       vertex -30 38.2272 11.7763
+       vertex -15 33.4488 10.3042
+       vertex -30 37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -0.316191 -0.910829 -0.265355
+    outer loop
+       vertex -30 38.5701 10.5993
+       vertex -15 33.7489 9.27435
+       vertex -30 38.2272 11.7763
+    endloop
+  endfacet
+  facet normal -0.316196 -0.910811 -0.265414
+    outer loop
+       vertex -15 33.7489 9.27435
+       vertex -15 33.4488 10.3042
+       vertex -30 38.2272 11.7763
+    endloop
+  endfacet
+  facet normal -0.316194 -0.918528 -0.237333
+    outer loop
+       vertex -30 38.8768 9.4123
+       vertex -15 34.0172 8.23577
+       vertex -30 38.5701 10.5993
+    endloop
+  endfacet
+  facet normal -0.316191 -0.918541 -0.237289
+    outer loop
+       vertex -15 34.0172 8.23577
+       vertex -15 33.7489 9.27435
+       vertex -30 38.5701 10.5993
+    endloop
+  endfacet
+  facet normal -0.316194 -0.92537 -0.209072
+    outer loop
+       vertex -15 34.2536 7.18944
+       vertex -15 34.0172 8.23577
+       vertex -30 38.8768 9.4123
+    endloop
+  endfacet
+  facet normal -0.316196 -0.925365 -0.209094
+    outer loop
+       vertex -30 39.147 8.21651
+       vertex -15 34.2536 7.18944
+       vertex -30 38.8768 9.4123
+    endloop
+  endfacet
+  facet normal -0.316196 -0.931329 -0.180682
+    outer loop
+       vertex -15 34.4579 6.13637
+       vertex -15 34.2536 7.18944
+       vertex -30 39.147 8.21651
+    endloop
+  endfacet
+  facet normal -0.316191 -0.931343 -0.180618
+    outer loop
+       vertex -30 39.3804 7.01299
+       vertex -15 34.4579 6.13637
+       vertex -30 39.147 8.21651
+    endloop
+  endfacet
+  facet normal -0.316191 -0.936449 -0.151941
+    outer loop
+       vertex -15 34.6297 5.07753
+       vertex -15 34.4579 6.13637
+       vertex -30 39.3804 7.01299
+    endloop
+  endfacet
+  facet normal -0.316194 -0.936441 -0.151985
+    outer loop
+       vertex -30 39.5768 5.80289
+       vertex -15 34.6297 5.07753
+       vertex -30 39.3804 7.01299
+    endloop
+  endfacet
+  facet normal -0.316194 -0.94065 -0.123285
+    outer loop
+       vertex -15 34.7691 4.01392
+       vertex -15 34.6297 5.07753
+       vertex -30 39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -0.316194 -0.940652 -0.123272
+    outer loop
+       vertex -30 39.7361 4.58734
+       vertex -15 34.7691 4.01392
+       vertex -30 39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -0.316193 -0.943998 -0.0942793
+    outer loop
+       vertex -15 34.8757 2.94654
+       vertex -15 34.7691 4.01392
+       vertex -30 39.7361 4.58734
+    endloop
+  endfacet
+  facet normal -0.316197 -0.943992 -0.0943338
+    outer loop
+       vertex -30 39.858 3.36747
+       vertex -15 34.8757 2.94654
+       vertex -30 39.7361 4.58734
+    endloop
+  endfacet
+  facet normal -0.316197 -0.946434 -0.0654429
+    outer loop
+       vertex -15 34.9497 1.87639
+       vertex -15 34.8757 2.94654
+       vertex -30 39.858 3.36747
+    endloop
+  endfacet
+  facet normal -0.316194 -0.946438 -0.0653901
+    outer loop
+       vertex -30 39.9425 2.14445
+       vertex -15 34.9497 1.87639
+       vertex -30 39.858 3.36747
+    endloop
+  endfacet
+  facet normal -0.316194 -0.947998 -0.0363486
+    outer loop
+       vertex -15 34.9908 0.804483
+       vertex -15 34.9497 1.87639
+       vertex -30 39.9425 2.14445
+    endloop
+  endfacet
+  facet normal -0.31619 -0.948001 -0.0362921
+    outer loop
+       vertex -30 39.9894 0.91941
+       vertex -15 34.9908 0.804483
+       vertex -30 39.9425 2.14445
+    endloop
+  endfacet
+  facet normal -0.31619 -0.948668 -0.00725352
+    outer loop
+       vertex -15 34.999 -0.268182
+       vertex -15 34.9908 0.804483
+       vertex -30 39.9894 0.91941
+    endloop
+  endfacet
+  facet normal -0.316191 -0.948668 -0.00727375
+    outer loop
+       vertex -30 39.9988 -0.306494
+       vertex -15 34.999 -0.268182
+       vertex -30 39.9894 0.91941
+    endloop
+  endfacet
+  facet normal -0.316191 -0.948444 0.0218448
+    outer loop
+       vertex -15 34.9743 -1.3406
+       vertex -15 34.999 -0.268182
+       vertex -30 39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal -0.316193 -0.948444 0.0218212
+    outer loop
+       vertex -30 39.9706 -1.53211
+       vertex -15 34.9743 -1.3406
+       vertex -30 39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal -0.316193 -0.947331 0.0508524
+    outer loop
+       vertex -15 34.9168 -2.41175
+       vertex -15 34.9743 -1.3406
+       vertex -30 39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal -0.316193 -0.947331 0.0508423
+    outer loop
+       vertex -30 39.9049 -2.75629
+       vertex -15 34.9168 -2.41175
+       vertex -30 39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal -0.316193 -0.945327 0.0798628
+    outer loop
+       vertex -15 34.8265 -3.48064
+       vertex -15 34.9168 -2.41175
+       vertex -30 39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal -0.316194 -0.945327 0.0798612
+    outer loop
+       vertex -30 39.8017 -3.97787
+       vertex -15 34.8265 -3.48064
+       vertex -30 39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal -0.316194 -0.942437 0.108783
+    outer loop
+       vertex -15 34.7035 -4.54626
+       vertex -15 34.8265 -3.48064
+       vertex -30 39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal -0.316192 -0.942435 0.108805
+    outer loop
+       vertex -30 39.6611 -5.19572
+       vertex -15 34.7035 -4.54626
+       vertex -30 39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal -0.316192 -0.938662 0.137611
+    outer loop
+       vertex -15 34.5479 -5.60761
+       vertex -15 34.7035 -4.54626
+       vertex -30 39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal -0.316194 -0.938664 0.137591
+    outer loop
+       vertex -30 39.4833 -6.40869
+       vertex -15 34.5479 -5.60761
+       vertex -30 39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal -0.316194 -0.933995 0.166358
+    outer loop
+       vertex -15 34.3598 -6.66369
+       vertex -15 34.5479 -5.60761
+       vertex -30 39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal -0.316192 -0.933992 0.166377
+    outer loop
+       vertex -30 39.2683 -7.61564
+       vertex -15 34.3598 -6.66369
+       vertex -30 39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal -0.316192 -0.928455 0.194919
+    outer loop
+       vertex -15 34.1394 -7.71351
+       vertex -15 34.3598 -6.66369
+       vertex -30 39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal -0.316196 -0.928467 0.194856
+    outer loop
+       vertex -30 39.0165 -8.81544
+       vertex -15 34.1394 -7.71351
+       vertex -30 39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal -0.316196 -0.922058 0.223222
+    outer loop
+       vertex -15 33.887 -8.75609
+       vertex -15 34.1394 -7.71351
+       vertex -30 39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal -0.316195 -0.922053 0.223246
+    outer loop
+       vertex -30 38.728 -10.007
+       vertex -15 33.887 -8.75609
+       vertex -30 39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal -0.316195 -0.914791 0.251352
+    outer loop
+       vertex -15 33.6028 -9.79044
+       vertex -15 33.887 -8.75609
+       vertex -30 38.728 -10.007
+    endloop
+  endfacet
+  facet normal -0.316195 -0.914791 0.251354
+    outer loop
+       vertex -30 38.4032 -11.1891
+       vertex -15 33.6028 -9.79044
+       vertex -30 38.728 -10.007
+    endloop
+  endfacet
+  facet normal -0.316195 -0.906651 0.279293
+    outer loop
+       vertex -15 33.287 -10.8156
+       vertex -15 33.6028 -9.79044
+       vertex -30 38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal -0.316196 -0.906654 0.279284
+    outer loop
+       vertex -30 38.0423 -12.3607
+       vertex -15 33.287 -10.8156
+       vertex -30 38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal -0.316196 -0.897657 0.306972
+    outer loop
+       vertex -15 32.9399 -11.8306
+       vertex -15 33.287 -10.8156
+       vertex -30 38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal -0.316195 -0.897654 0.306983
+    outer loop
+       vertex -30 37.6456 -13.5207
+       vertex -15 32.9399 -11.8306
+       vertex -30 38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal -0.316195 -0.887843 0.334299
+    outer loop
+       vertex -15 32.5619 -12.8345
+       vertex -15 32.9399 -11.8306
+       vertex -30 37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal -0.316194 -0.887841 0.334304
+    outer loop
+       vertex -30 37.2136 -14.668
+       vertex -15 32.5619 -12.8345
+       vertex -30 37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal -0.316194 -0.877171 0.361375
+    outer loop
+       vertex -15 32.1533 -13.8263
+       vertex -15 32.5619 -12.8345
+       vertex -30 37.2136 -14.668
+    endloop
+  endfacet
+  facet normal -0.316193 -0.877165 0.36139
+    outer loop
+       vertex -30 36.7466 -15.8015
+       vertex -15 32.1533 -13.8263
+       vertex -30 37.2136 -14.668
+    endloop
+  endfacet
+  facet normal -0.316193 -0.865684 0.38809
+    outer loop
+       vertex -15 31.7145 -14.8051
+       vertex -15 32.1533 -13.8263
+       vertex -30 36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal -0.316194 -0.865688 0.38808
+    outer loop
+       vertex -30 36.2451 -16.9202
+       vertex -15 31.7145 -14.8051
+       vertex -30 36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal -0.316194 -0.853398 0.414408
+    outer loop
+       vertex -15 31.2459 -15.7701
+       vertex -15 31.7145 -14.8051
+       vertex -30 36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal -0.316193 -0.853388 0.414428
+    outer loop
+       vertex -30 35.7096 -18.0229
+       vertex -15 31.2459 -15.7701
+       vertex -30 36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal -0.316192 -0.840265 0.440429
+    outer loop
+       vertex -15 30.7479 -16.7202
+       vertex -15 31.2459 -15.7701
+       vertex -30 35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal -0.316196 -0.840289 0.440379
+    outer loop
+       vertex -30 35.1405 -19.1088
+       vertex -15 30.7479 -16.7202
+       vertex -30 35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal -0.316196 -0.826404 0.465914
+    outer loop
+       vertex -15 30.2211 -17.6546
+       vertex -15 30.7479 -16.7202
+       vertex -30 35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal -0.316195 -0.826393 0.465935
+    outer loop
+       vertex -30 34.5384 -20.1767
+       vertex -15 30.2211 -17.6546
+       vertex -30 35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal -0.316195 -0.811729 0.491036
+    outer loop
+       vertex -15 29.6659 -18.5724
+       vertex -15 30.2211 -17.6546
+       vertex -30 34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal -0.316195 -0.811732 0.491032
+    outer loop
+       vertex -30 33.9039 -21.2256
+       vertex -15 29.6659 -18.5724
+       vertex -30 34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal -0.316195 -0.796299 0.515683
+    outer loop
+       vertex -15 29.0828 -19.4728
+       vertex -15 29.6659 -18.5724
+       vertex -30 33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal -0.316197 -0.796314 0.515658
+    outer loop
+       vertex -30 33.2375 -22.2547
+       vertex -15 29.0828 -19.4728
+       vertex -30 33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal -0.316197 -0.780127 0.539835
+    outer loop
+       vertex -15 28.4724 -20.3549
+       vertex -15 29.0828 -19.4728
+       vertex -30 33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal -0.316197 -0.780124 0.539839
+    outer loop
+       vertex -30 32.5399 -23.2628
+       vertex -15 28.4724 -20.3549
+       vertex -30 33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal -0.316197 -0.763199 0.563513
+    outer loop
+       vertex -15 27.8352 -21.2179
+       vertex -15 28.4724 -20.3549
+       vertex -30 32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal -0.316195 -0.763187 0.56353
+    outer loop
+       vertex -30 31.8117 -24.249
+       vertex -15 27.8352 -21.2179
+       vertex -30 32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal -0.316195 -0.745614 0.586583
+    outer loop
+       vertex -15 27.172 -22.0609
+       vertex -15 27.8352 -21.2179
+       vertex -30 31.8117 -24.249
+    endloop
+  endfacet
+  facet normal -0.316195 -0.745612 0.586586
+    outer loop
+       vertex -30 31.0537 -25.2125
+       vertex -15 27.172 -22.0609
+       vertex -30 31.8117 -24.249
+    endloop
+  endfacet
+  facet normal -0.316195 -0.727254 0.609198
+    outer loop
+       vertex -15 26.4831 -22.8833
+       vertex -15 27.172 -22.0609
+       vertex -30 31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal -0.316193 -0.727232 0.609225
+    outer loop
+       vertex -30 30.2664 -26.1523
+       vertex -15 26.4831 -22.8833
+       vertex -30 31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal -0.316193 -0.708237 0.631207
+    outer loop
+       vertex -15 25.7694 -23.6841
+       vertex -15 26.4831 -22.8833
+       vertex -30 30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal -0.316195 -0.70826 0.631181
+    outer loop
+       vertex -30 29.4508 -27.0675
+       vertex -15 25.7694 -23.6841
+       vertex -30 30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal -0.316195 -0.688584 0.652589
+    outer loop
+       vertex -15 25.0315 -24.4627
+       vertex -15 25.7694 -23.6841
+       vertex -30 29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal -0.316194 -0.68858 0.652594
+    outer loop
+       vertex -30 28.6075 -27.9573
+       vertex -15 25.0315 -24.4627
+       vertex -30 29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal -0.316194 -0.668258 0.673388
+    outer loop
+       vertex -15 24.2701 -25.2183
+       vertex -15 25.0315 -24.4627
+       vertex -30 28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal -0.316195 -0.66827 0.673377
+    outer loop
+       vertex -30 27.7373 -28.8209
+       vertex -15 24.2701 -25.2183
+       vertex -30 28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal -0.316196 -0.647302 0.693556
+    outer loop
+       vertex -15 23.4859 -25.9502
+       vertex -15 24.2701 -25.2183
+       vertex -30 27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -0.316194 -0.64729 0.693568
+    outer loop
+       vertex -30 26.8411 -29.6573
+       vertex -15 23.4859 -25.9502
+       vertex -30 27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -0.316194 -0.625759 0.713055
+    outer loop
+       vertex -15 22.6797 -26.6577
+       vertex -15 23.4859 -25.9502
+       vertex -30 26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -0.316191 -0.625722 0.713089
+    outer loop
+       vertex -30 25.9196 -30.4659
+       vertex -15 22.6797 -26.6577
+       vertex -30 26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -0.316191 -0.603592 0.731916
+    outer loop
+       vertex -15 21.8521 -27.3402
+       vertex -15 22.6797 -26.6577
+       vertex -30 25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -0.316191 -0.603602 0.731907
+    outer loop
+       vertex -30 24.9738 -31.2459
+       vertex -15 21.8521 -27.3402
+       vertex -30 25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -0.316191 -0.580879 0.750068
+    outer loop
+       vertex -15 21.004 -27.997
+       vertex -15 21.8521 -27.3402
+       vertex -30 24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -0.316196 -0.580935 0.750023
+    outer loop
+       vertex -30 24.0046 -31.9966
+       vertex -15 21.004 -27.997
+       vertex -30 24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -0.316197 -0.557632 0.767506
+    outer loop
+       vertex -15 20.1362 -28.6275
+       vertex -15 21.004 -27.997
+       vertex -30 24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -0.316194 -0.5576 0.767531
+    outer loop
+       vertex -30 23.0127 -32.7172
+       vertex -15 20.1362 -28.6275
+       vertex -30 24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -0.316194 -0.533868 0.784223
+    outer loop
+       vertex -15 19.2494 -29.2312
+       vertex -15 20.1362 -28.6275
+       vertex -30 23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -0.31619 -0.533826 0.784254
+    outer loop
+       vertex -30 21.9993 -33.407
+       vertex -15 19.2494 -29.2312
+       vertex -30 23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -0.31619 -0.509533 0.80025
+    outer loop
+       vertex -15 18.3446 -29.8073
+       vertex -15 19.2494 -29.2312
+       vertex -30 21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -0.316193 -0.50957 0.800225
+    outer loop
+       vertex -30 20.9652 -34.0655
+       vertex -15 18.3446 -29.8073
+       vertex -30 21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -0.316193 -0.484804 0.815467
+    outer loop
+       vertex -15 17.4225 -30.3555
+       vertex -15 18.3446 -29.8073
+       vertex -30 20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -0.316196 -0.484842 0.815444
+    outer loop
+       vertex -30 19.9115 -34.692
+       vertex -15 17.4225 -30.3555
+       vertex -30 20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -0.316196 -0.459554 0.829958
+    outer loop
+       vertex -15 16.4841 -30.8751
+       vertex -15 17.4225 -30.3555
+       vertex -30 19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -0.316198 -0.459582 0.829942
+    outer loop
+       vertex -30 18.839 -35.2859
+       vertex -15 16.4841 -30.8751
+       vertex -30 19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -0.316199 -0.43397 0.843616
+    outer loop
+       vertex -15 15.5302 -31.3658
+       vertex -15 16.4841 -30.8751
+       vertex -30 18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -0.316193 -0.433899 0.843655
+    outer loop
+       vertex -30 17.7488 -35.8466
+       vertex -15 15.5302 -31.3658
+       vertex -30 18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -0.316193 -0.407882 0.856536
+    outer loop
+       vertex -15 14.5617 -31.827
+       vertex -15 15.5302 -31.3658
+       vertex -30 17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -0.316193 -0.407878 0.856538
+    outer loop
+       vertex -30 16.6419 -36.3737
+       vertex -15 14.5617 -31.827
+       vertex -30 17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -0.316193 -0.381434 0.868637
+    outer loop
+       vertex -15 13.5795 -32.2583
+       vertex -15 14.5617 -31.827
+       vertex -30 16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -0.316194 -0.381457 0.868626
+    outer loop
+       vertex -30 15.5195 -36.8666
+       vertex -15 13.5795 -32.2583
+       vertex -30 16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -0.316194 -0.354654 0.87991
+    outer loop
+       vertex -15 12.5846 -32.6593
+       vertex -15 13.5795 -32.2583
+       vertex -30 15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -0.316194 -0.354644 0.879914
+    outer loop
+       vertex -30 14.3824 -37.3249
+       vertex -15 12.5846 -32.6593
+       vertex -30 15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -0.316194 -0.327478 0.890382
+    outer loop
+       vertex -15 11.5778 -33.0296
+       vertex -15 12.5846 -32.6593
+       vertex -30 14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -0.316194 -0.327487 0.890378
+    outer loop
+       vertex -30 13.2318 -37.7481
+       vertex -15 11.5778 -33.0296
+       vertex -30 14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -0.316194 -0.300085 0.899984
+    outer loop
+       vertex -15 10.5602 -33.3689
+       vertex -15 11.5778 -33.0296
+       vertex -30 13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -0.316195 -0.300095 0.89998
+    outer loop
+       vertex -30 12.0688 -38.1359
+       vertex -15 10.5602 -33.3689
+       vertex -30 13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -0.316195 -0.272316 0.908771
+    outer loop
+       vertex -15 9.53268 -33.6768
+       vertex -15 10.5602 -33.3689
+       vertex -30 12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -0.316196 -0.27233 0.908767
+    outer loop
+       vertex -30 10.8945 -38.4878
+       vertex -15 9.53268 -33.6768
+       vertex -30 12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -0.316196 -0.244359 0.916684
+    outer loop
+       vertex -15 8.49618 -33.9531
+       vertex -15 9.53268 -33.6768
+       vertex -30 10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -0.316197 -0.244379 0.916678
+    outer loop
+       vertex -30 9.70992 -38.8036
+       vertex -15 8.49618 -33.9531
+       vertex -30 10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -0.316197 -0.216148 0.923742
+    outer loop
+       vertex -15 7.4517 -34.1975
+       vertex -15 8.49618 -33.9531
+       vertex -30 9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -0.316197 -0.216137 0.923745
+    outer loop
+       vertex -30 8.51622 -39.0829
+       vertex -15 7.4517 -34.1975
+       vertex -30 9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -0.316196 -0.187761 0.929928
+    outer loop
+       vertex -15 6.40022 -34.4098
+       vertex -15 7.4517 -34.1975
+       vertex -30 8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -0.316195 -0.187737 0.929933
+    outer loop
+       vertex -30 7.31453 -39.3255
+       vertex -15 6.40022 -34.4098
+       vertex -30 8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -0.316195 -0.159191 0.935243
+    outer loop
+       vertex -15 5.34272 -34.5898
+       vertex -15 6.40022 -34.4098
+       vertex -30 7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -0.316194 -0.159181 0.935245
+    outer loop
+       vertex -30 6.10597 -39.5312
+       vertex -15 5.34272 -34.5898
+       vertex -30 7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -0.316194 -0.130449 0.939683
+    outer loop
+       vertex -15 4.28022 -34.7373
+       vertex -15 5.34272 -34.5898
+       vertex -30 6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -0.316196 -0.130469 0.93968
+    outer loop
+       vertex -30 4.89167 -39.6998
+       vertex -15 4.28022 -34.7373
+       vertex -30 6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -0.316196 -0.101528 0.943246
+    outer loop
+       vertex -15 3.21368 -34.8521
+       vertex -15 4.28022 -34.7373
+       vertex -30 4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -0.316196 -0.101532 0.943245
+    outer loop
+       vertex -30 3.67278 -39.831
+       vertex -15 3.21368 -34.8521
+       vertex -30 4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -0.316196 -0.0726965 0.945905
+    outer loop
+       vertex -15 2.14413 -34.9343
+       vertex -15 3.21368 -34.8521
+       vertex -30 3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0726636 0.945908
+    outer loop
+       vertex -30 2.45044 -39.9249
+       vertex -15 2.14413 -34.9343
+       vertex -30 3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0436021 0.947692
+    outer loop
+       vertex -15 1.07257 -34.9836
+       vertex -15 2.14413 -34.9343
+       vertex -30 2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -0.316192 -0.0435686 0.947694
+    outer loop
+       vertex -30 1.22579 -39.9812
+       vertex -15 1.07257 -34.9836
+       vertex -30 2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -0.316191 -0.0145037 0.948585
+    outer loop
+       vertex -15 0 -35
+       vertex -15 1.07257 -34.9836
+       vertex -30 1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -0.316194 -0.0145476 0.948583
+    outer loop
+       vertex -30 0 -40
+       vertex -15 0 -35
+       vertex -30 1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -0.316195 0.0145037 0.948584
+    outer loop
+       vertex -15 -1.07257 -34.9836
+       vertex -15 0 -35
+       vertex -30 0 -40
+    endloop
+  endfacet
+  facet normal -0.316191 0.0145476 0.948584
+    outer loop
+       vertex -15 -1.07257 -34.9836
+       vertex -30 0 -40
+       vertex -30 -1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -0.316194 0.0435685 0.947694
+    outer loop
+       vertex -15 -2.14413 -34.9343
+       vertex -30 -1.22579 -39.9812
+       vertex -30 -2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -0.316191 0.0436022 0.947693
+    outer loop
+       vertex -15 -2.14413 -34.9343
+       vertex -15 -1.07257 -34.9836
+       vertex -30 -1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -0.316194 0.0726965 0.945905
+    outer loop
+       vertex -15 -3.21368 -34.8521
+       vertex -15 -2.14413 -34.9343
+       vertex -30 -2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -0.316196 0.0726635 0.945907
+    outer loop
+       vertex -15 -3.21368 -34.8521
+       vertex -30 -2.45044 -39.9249
+       vertex -30 -3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -0.316196 0.101528 0.943246
+    outer loop
+       vertex -15 -4.28022 -34.7373
+       vertex -15 -3.21368 -34.8521
+       vertex -30 -3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -0.316196 0.101532 0.943245
+    outer loop
+       vertex -15 -4.28022 -34.7373
+       vertex -30 -3.67278 -39.831
+       vertex -30 -4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -0.316196 0.130449 0.939683
+    outer loop
+       vertex -15 -5.34272 -34.5898
+       vertex -15 -4.28022 -34.7373
+       vertex -30 -4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -0.316194 0.130469 0.93968
+    outer loop
+       vertex -15 -5.34272 -34.5898
+       vertex -30 -4.89167 -39.6998
+       vertex -30 -6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -0.316194 0.159191 0.935243
+    outer loop
+       vertex -15 -6.40022 -34.4098
+       vertex -15 -5.34272 -34.5898
+       vertex -30 -6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -0.316195 0.159181 0.935245
+    outer loop
+       vertex -15 -6.40022 -34.4098
+       vertex -30 -6.10597 -39.5312
+       vertex -30 -7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -0.316195 0.187761 0.929928
+    outer loop
+       vertex -15 -7.4517 -34.1975
+       vertex -15 -6.40022 -34.4098
+       vertex -30 -7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -0.316196 0.187737 0.929933
+    outer loop
+       vertex -15 -7.4517 -34.1975
+       vertex -30 -7.31453 -39.3255
+       vertex -30 -8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -0.316196 0.216148 0.923742
+    outer loop
+       vertex -15 -8.49618 -33.9531
+       vertex -15 -7.4517 -34.1975
+       vertex -30 -8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -0.316197 0.216137 0.923745
+    outer loop
+       vertex -15 -8.49618 -33.9531
+       vertex -30 -8.51622 -39.0829
+       vertex -30 -9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -0.316197 0.244359 0.916683
+    outer loop
+       vertex -15 -9.53268 -33.6768
+       vertex -15 -8.49618 -33.9531
+       vertex -30 -9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -0.316196 0.244379 0.916678
+    outer loop
+       vertex -15 -9.53268 -33.6768
+       vertex -30 -9.70992 -38.8036
+       vertex -30 -10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -0.316196 0.272316 0.908771
+    outer loop
+       vertex -15 -10.5602 -33.3689
+       vertex -15 -9.53268 -33.6768
+       vertex -30 -10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -0.316195 0.27233 0.908767
+    outer loop
+       vertex -15 -10.5602 -33.3689
+       vertex -30 -10.8945 -38.4878
+       vertex -30 -12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -0.316194 0.300095 0.89998
+    outer loop
+       vertex -15 -11.5778 -33.0296
+       vertex -30 -12.0688 -38.1359
+       vertex -30 -13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -0.316195 0.300085 0.899983
+    outer loop
+       vertex -15 -11.5778 -33.0296
+       vertex -15 -10.5602 -33.3689
+       vertex -30 -12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -0.316194 0.327478 0.890382
+    outer loop
+       vertex -15 -12.5846 -32.6593
+       vertex -15 -11.5778 -33.0296
+       vertex -30 -13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -0.316194 0.327487 0.890378
+    outer loop
+       vertex -15 -12.5846 -32.6593
+       vertex -30 -13.2318 -37.7481
+       vertex -30 -14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -0.316194 0.354654 0.87991
+    outer loop
+       vertex -15 -13.5795 -32.2583
+       vertex -15 -12.5846 -32.6593
+       vertex -30 -14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -0.316194 0.354644 0.879914
+    outer loop
+       vertex -15 -13.5795 -32.2583
+       vertex -30 -14.3824 -37.3249
+       vertex -30 -15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -0.316195 0.381434 0.868637
+    outer loop
+       vertex -15 -14.5617 -31.827
+       vertex -15 -13.5795 -32.2583
+       vertex -30 -15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -0.316193 0.381457 0.868627
+    outer loop
+       vertex -15 -14.5617 -31.827
+       vertex -30 -15.5195 -36.8666
+       vertex -30 -16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -0.316193 0.407882 0.856536
+    outer loop
+       vertex -15 -15.5302 -31.3658
+       vertex -15 -14.5617 -31.827
+       vertex -30 -16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -0.316193 0.407878 0.856538
+    outer loop
+       vertex -15 -15.5302 -31.3658
+       vertex -30 -16.6419 -36.3737
+       vertex -30 -17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -0.316193 0.433971 0.843618
+    outer loop
+       vertex -15 -16.4841 -30.8751
+       vertex -15 -15.5302 -31.3658
+       vertex -30 -17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -0.316198 0.433898 0.843653
+    outer loop
+       vertex -15 -16.4841 -30.8751
+       vertex -30 -17.7488 -35.8466
+       vertex -30 -18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -0.316199 0.459554 0.829957
+    outer loop
+       vertex -15 -17.4225 -30.3555
+       vertex -15 -16.4841 -30.8751
+       vertex -30 -18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -0.316196 0.459582 0.829942
+    outer loop
+       vertex -15 -17.4225 -30.3555
+       vertex -30 -18.839 -35.2859
+       vertex -30 -19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -0.316196 0.484804 0.815466
+    outer loop
+       vertex -15 -18.3446 -29.8073
+       vertex -15 -17.4225 -30.3555
+       vertex -30 -19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -0.316193 0.484843 0.815444
+    outer loop
+       vertex -15 -18.3446 -29.8073
+       vertex -30 -19.9115 -34.692
+       vertex -30 -20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -0.316193 0.509533 0.800249
+    outer loop
+       vertex -15 -19.2494 -29.2312
+       vertex -15 -18.3446 -29.8073
+       vertex -30 -20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -0.31619 0.50957 0.800226
+    outer loop
+       vertex -15 -19.2494 -29.2312
+       vertex -30 -20.9652 -34.0655
+       vertex -30 -21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -0.31619 0.533869 0.784224
+    outer loop
+       vertex -15 -20.1362 -28.6275
+       vertex -15 -19.2494 -29.2312
+       vertex -30 -21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -0.316194 0.533825 0.784253
+    outer loop
+       vertex -15 -20.1362 -28.6275
+       vertex -30 -21.9993 -33.407
+       vertex -30 -23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -0.316194 0.557633 0.767507
+    outer loop
+       vertex -15 -21.004 -27.997
+       vertex -15 -20.1362 -28.6275
+       vertex -30 -23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -0.316196 0.5576 0.76753
+    outer loop
+       vertex -15 -21.004 -27.997
+       vertex -30 -23.0127 -32.7172
+       vertex -30 -24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -0.316197 0.580878 0.750067
+    outer loop
+       vertex -15 -21.8521 -27.3402
+       vertex -15 -21.004 -27.997
+       vertex -30 -24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -0.316192 0.580936 0.750024
+    outer loop
+       vertex -15 -21.8521 -27.3402
+       vertex -30 -24.0046 -31.9966
+       vertex -30 -24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -0.316192 0.603592 0.731915
+    outer loop
+       vertex -15 -22.6797 -26.6577
+       vertex -15 -21.8521 -27.3402
+       vertex -30 -24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -0.316191 0.603602 0.731907
+    outer loop
+       vertex -15 -22.6797 -26.6577
+       vertex -30 -24.9738 -31.2459
+       vertex -30 -25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -0.31619 0.62576 0.713056
+    outer loop
+       vertex -15 -23.4859 -25.9502
+       vertex -15 -22.6797 -26.6577
+       vertex -30 -25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -0.316194 0.625721 0.713088
+    outer loop
+       vertex -15 -23.4859 -25.9502
+       vertex -30 -25.9196 -30.4659
+       vertex -30 -26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -0.316194 0.647302 0.693557
+    outer loop
+       vertex -15 -24.2701 -25.2183
+       vertex -15 -23.4859 -25.9502
+       vertex -30 -26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -0.316195 0.64729 0.693568
+    outer loop
+       vertex -15 -24.2701 -25.2183
+       vertex -30 -26.8411 -29.6573
+       vertex -30 -27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -0.316196 0.668258 0.673388
+    outer loop
+       vertex -15 -25.0315 -24.4627
+       vertex -15 -24.2701 -25.2183
+       vertex -30 -27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -0.316194 0.66827 0.673377
+    outer loop
+       vertex -15 -25.0315 -24.4627
+       vertex -30 -27.7373 -28.8209
+       vertex -30 -28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal -0.316194 0.688584 0.652589
+    outer loop
+       vertex -15 -25.7694 -23.6841
+       vertex -15 -25.0315 -24.4627
+       vertex -30 -28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal -0.316195 0.688579 0.652594
+    outer loop
+       vertex -15 -25.7694 -23.6841
+       vertex -30 -28.6075 -27.9573
+       vertex -30 -29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal -0.316195 0.708236 0.631207
+    outer loop
+       vertex -15 -26.4831 -22.8833
+       vertex -15 -25.7694 -23.6841
+       vertex -30 -29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal -0.316193 0.70826 0.631181
+    outer loop
+       vertex -15 -26.4831 -22.8833
+       vertex -30 -29.4508 -27.0675
+       vertex -30 -30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal -0.316193 0.727255 0.609199
+    outer loop
+       vertex -15 -27.172 -22.0609
+       vertex -15 -26.4831 -22.8833
+       vertex -30 -30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal -0.316195 0.727232 0.609225
+    outer loop
+       vertex -15 -27.172 -22.0609
+       vertex -30 -30.2664 -26.1523
+       vertex -30 -31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal -0.316195 0.745614 0.586584
+    outer loop
+       vertex -15 -27.8352 -21.2179
+       vertex -15 -27.172 -22.0609
+       vertex -30 -31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal -0.316195 0.745612 0.586586
+    outer loop
+       vertex -15 -27.8352 -21.2179
+       vertex -30 -31.0537 -25.2125
+       vertex -30 -31.8117 -24.249
+    endloop
+  endfacet
+  facet normal -0.316195 0.763199 0.563513
+    outer loop
+       vertex -15 -28.4724 -20.3549
+       vertex -15 -27.8352 -21.2179
+       vertex -30 -31.8117 -24.249
+    endloop
+  endfacet
+  facet normal -0.316197 0.763187 0.56353
+    outer loop
+       vertex -15 -28.4724 -20.3549
+       vertex -30 -31.8117 -24.249
+       vertex -30 -32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal -0.316197 0.780127 0.539835
+    outer loop
+       vertex -15 -29.0828 -19.4728
+       vertex -15 -28.4724 -20.3549
+       vertex -30 -32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal -0.316197 0.780124 0.539839
+    outer loop
+       vertex -15 -29.0828 -19.4728
+       vertex -30 -32.5399 -23.2628
+       vertex -30 -33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal -0.316197 0.796298 0.515683
+    outer loop
+       vertex -15 -29.6659 -18.5724
+       vertex -15 -29.0828 -19.4728
+       vertex -30 -33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal -0.316195 0.796314 0.515659
+    outer loop
+       vertex -15 -29.6659 -18.5724
+       vertex -30 -33.2375 -22.2547
+       vertex -30 -33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal -0.316195 0.811729 0.491036
+    outer loop
+       vertex -15 -30.2211 -17.6546
+       vertex -15 -29.6659 -18.5724
+       vertex -30 -33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal -0.316195 0.811732 0.491032
+    outer loop
+       vertex -15 -30.2211 -17.6546
+       vertex -30 -33.9039 -21.2256
+       vertex -30 -34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal -0.316195 0.826405 0.465914
+    outer loop
+       vertex -15 -30.7479 -16.7202
+       vertex -15 -30.2211 -17.6546
+       vertex -30 -34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal -0.316196 0.826393 0.465935
+    outer loop
+       vertex -15 -30.7479 -16.7202
+       vertex -30 -34.5384 -20.1767
+       vertex -30 -35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal -0.316197 0.840264 0.440428
+    outer loop
+       vertex -15 -31.2459 -15.7701
+       vertex -15 -30.7479 -16.7202
+       vertex -30 -35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal -0.316193 0.84029 0.44038
+    outer loop
+       vertex -15 -31.2459 -15.7701
+       vertex -30 -35.1405 -19.1088
+       vertex -30 -35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal -0.316193 0.853398 0.414408
+    outer loop
+       vertex -15 -31.7145 -14.8051
+       vertex -15 -31.2459 -15.7701
+       vertex -30 -35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal -0.316194 0.853388 0.414427
+    outer loop
+       vertex -15 -31.7145 -14.8051
+       vertex -30 -35.7096 -18.0229
+       vertex -30 -36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal -0.316194 0.865683 0.38809
+    outer loop
+       vertex -15 -32.1533 -13.8263
+       vertex -15 -31.7145 -14.8051
+       vertex -30 -36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal -0.316193 0.865688 0.38808
+    outer loop
+       vertex -15 -32.1533 -13.8263
+       vertex -30 -36.2451 -16.9202
+       vertex -30 -36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal -0.316193 0.877171 0.361376
+    outer loop
+       vertex -15 -32.5619 -12.8345
+       vertex -15 -32.1533 -13.8263
+       vertex -30 -36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal -0.316194 0.877165 0.36139
+    outer loop
+       vertex -15 -32.5619 -12.8345
+       vertex -30 -36.7466 -15.8015
+       vertex -30 -37.2136 -14.668
+    endloop
+  endfacet
+  facet normal -0.316194 0.887843 0.334299
+    outer loop
+       vertex -15 -32.9399 -11.8306
+       vertex -15 -32.5619 -12.8345
+       vertex -30 -37.2136 -14.668
+    endloop
+  endfacet
+  facet normal -0.316195 0.887841 0.334304
+    outer loop
+       vertex -15 -32.9399 -11.8306
+       vertex -30 -37.2136 -14.668
+       vertex -30 -37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal -0.316195 0.897658 0.306972
+    outer loop
+       vertex -15 -33.287 -10.8156
+       vertex -15 -32.9399 -11.8306
+       vertex -30 -37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal -0.316196 0.897653 0.306983
+    outer loop
+       vertex -15 -33.287 -10.8156
+       vertex -30 -37.6456 -13.5207
+       vertex -30 -38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal -0.316196 0.906651 0.279293
+    outer loop
+       vertex -15 -33.6028 -9.79044
+       vertex -15 -33.287 -10.8156
+       vertex -30 -38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal -0.316195 0.906654 0.279284
+    outer loop
+       vertex -15 -33.6028 -9.79044
+       vertex -30 -38.0423 -12.3607
+       vertex -30 -38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal -0.316195 0.914791 0.251352
+    outer loop
+       vertex -15 -33.887 -8.75609
+       vertex -15 -33.6028 -9.79044
+       vertex -30 -38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal -0.316195 0.914791 0.251354
+    outer loop
+       vertex -15 -33.887 -8.75609
+       vertex -30 -38.4032 -11.1891
+       vertex -30 -38.728 -10.007
+    endloop
+  endfacet
+  facet normal -0.316195 0.922059 0.223222
+    outer loop
+       vertex -15 -34.1394 -7.71351
+       vertex -15 -33.887 -8.75609
+       vertex -30 -38.728 -10.007
+    endloop
+  endfacet
+  facet normal -0.316196 0.922053 0.223245
+    outer loop
+       vertex -15 -34.1394 -7.71351
+       vertex -30 -38.728 -10.007
+       vertex -30 -39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal -0.316196 0.928454 0.194918
+    outer loop
+       vertex -15 -34.3598 -6.66369
+       vertex -15 -34.1394 -7.71351
+       vertex -30 -39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal -0.316192 0.928468 0.194857
+    outer loop
+       vertex -15 -34.3598 -6.66369
+       vertex -30 -39.0165 -8.81544
+       vertex -30 -39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal -0.316192 0.933996 0.166358
+    outer loop
+       vertex -15 -34.5479 -5.60761
+       vertex -15 -34.3598 -6.66369
+       vertex -30 -39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal -0.316193 0.933992 0.166377
+    outer loop
+       vertex -15 -34.5479 -5.60761
+       vertex -30 -39.2683 -7.61564
+       vertex -30 -39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal -0.316194 0.938661 0.137611
+    outer loop
+       vertex -15 -34.7035 -4.54626
+       vertex -15 -34.5479 -5.60761
+       vertex -30 -39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal -0.316192 0.938665 0.137591
+    outer loop
+       vertex -15 -34.7035 -4.54626
+       vertex -30 -39.4833 -6.40869
+       vertex -30 -39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal -0.316192 0.942438 0.108783
+    outer loop
+       vertex -15 -34.8265 -3.48064
+       vertex -15 -34.7035 -4.54626
+       vertex -30 -39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal -0.316194 0.942435 0.108805
+    outer loop
+       vertex -15 -34.8265 -3.48064
+       vertex -30 -39.6611 -5.19572
+       vertex -30 -39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal -0.316194 0.945327 0.0798627
+    outer loop
+       vertex -15 -34.9168 -2.41175
+       vertex -15 -34.8265 -3.48064
+       vertex -30 -39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal -0.316193 0.945327 0.0798612
+    outer loop
+       vertex -15 -34.9168 -2.41175
+       vertex -30 -39.8017 -3.97787
+       vertex -30 -39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal -0.316193 0.947331 0.0508524
+    outer loop
+       vertex -15 -34.9743 -1.3406
+       vertex -15 -34.9168 -2.41175
+       vertex -30 -39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal -0.316193 0.947332 0.0508424
+    outer loop
+       vertex -15 -34.9743 -1.3406
+       vertex -30 -39.9049 -2.75629
+       vertex -30 -39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal -0.316193 0.948443 0.0218448
+    outer loop
+       vertex -15 -34.999 -0.268182
+       vertex -15 -34.9743 -1.3406
+       vertex -30 -39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal -0.316191 0.948445 0.0218212
+    outer loop
+       vertex -15 -34.999 -0.268182
+       vertex -30 -39.9706 -1.53211
+       vertex -30 -39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal -0.316191 0.948668 -0.00725352
+    outer loop
+       vertex -15 -34.9908 0.804483
+       vertex -15 -34.999 -0.268182
+       vertex -30 -39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal -0.31619 0.948668 -0.00727375
+    outer loop
+       vertex -15 -34.9908 0.804483
+       vertex -30 -39.9988 -0.306494
+       vertex -30 -39.9894 0.91941
+    endloop
+  endfacet
+  facet normal -0.31619 0.947999 -0.0363486
+    outer loop
+       vertex -15 -34.9497 1.87639
+       vertex -15 -34.9908 0.804483
+       vertex -30 -39.9894 0.91941
+    endloop
+  endfacet
+  facet normal -0.316194 0.948 -0.036292
+    outer loop
+       vertex -15 -34.9497 1.87639
+       vertex -30 -39.9894 0.91941
+       vertex -30 -39.9425 2.14445
+    endloop
+  endfacet
+  facet normal -0.316194 0.946435 -0.065443
+    outer loop
+       vertex -15 -34.8757 2.94654
+       vertex -15 -34.9497 1.87639
+       vertex -30 -39.9425 2.14445
+    endloop
+  endfacet
+  facet normal -0.316197 0.946437 -0.06539
+    outer loop
+       vertex -15 -34.8757 2.94654
+       vertex -30 -39.9425 2.14445
+       vertex -30 -39.858 3.36747
+    endloop
+  endfacet
+  facet normal -0.316197 0.943997 -0.0942792
+    outer loop
+       vertex -15 -34.7691 4.01392
+       vertex -15 -34.8757 2.94654
+       vertex -30 -39.858 3.36747
+    endloop
+  endfacet
+  facet normal -0.316194 0.943993 -0.0943339
+    outer loop
+       vertex -15 -34.7691 4.01392
+       vertex -30 -39.858 3.36747
+       vertex -30 -39.7361 4.58734
+    endloop
+  endfacet
+  facet normal -0.316193 0.94065 -0.123285
+    outer loop
+       vertex -15 -34.6297 5.07753
+       vertex -15 -34.7691 4.01392
+       vertex -30 -39.7361 4.58734
+    endloop
+  endfacet
+  facet normal -0.316194 0.940651 -0.123272
+    outer loop
+       vertex -15 -34.6297 5.07753
+       vertex -30 -39.7361 4.58734
+       vertex -30 -39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -0.316194 0.936448 -0.15194
+    outer loop
+       vertex -15 -34.4579 6.13637
+       vertex -15 -34.6297 5.07753
+       vertex -30 -39.5768 5.80289
+    endloop
+  endfacet
+  facet normal -0.316191 0.936442 -0.151985
+    outer loop
+       vertex -15 -34.4579 6.13637
+       vertex -30 -39.5768 5.80289
+       vertex -30 -39.3804 7.01299
+    endloop
+  endfacet
+  facet normal -0.316191 0.931331 -0.180682
+    outer loop
+       vertex -15 -34.2536 7.18944
+       vertex -15 -34.4579 6.13637
+       vertex -30 -39.3804 7.01299
+    endloop
+  endfacet
+  facet normal -0.316196 0.931342 -0.180618
+    outer loop
+       vertex -15 -34.2536 7.18944
+       vertex -30 -39.3804 7.01299
+       vertex -30 -39.147 8.21651
+    endloop
+  endfacet
+  facet normal -0.316196 0.92537 -0.209072
+    outer loop
+       vertex -15 -34.0172 8.23577
+       vertex -15 -34.2536 7.18944
+       vertex -30 -39.147 8.21651
+    endloop
+  endfacet
+  facet normal -0.316194 0.925365 -0.209094
+    outer loop
+       vertex -15 -34.0172 8.23577
+       vertex -30 -39.147 8.21651
+       vertex -30 -38.8768 9.4123
+    endloop
+  endfacet
+  facet normal -0.316191 0.918529 -0.237333
+    outer loop
+       vertex -15 -33.7489 9.27435
+       vertex -30 -38.8768 9.4123
+       vertex -30 -38.5701 10.5993
+    endloop
+  endfacet
+  facet normal -0.316194 0.91854 -0.237289
+    outer loop
+       vertex -15 -33.7489 9.27435
+       vertex -15 -34.0172 8.23577
+       vertex -30 -38.8768 9.4123
+    endloop
+  endfacet
+  facet normal -0.316191 0.910812 -0.265414
+    outer loop
+       vertex -15 -33.4488 10.3042
+       vertex -15 -33.7489 9.27435
+       vertex -30 -38.5701 10.5993
+    endloop
+  endfacet
+  facet normal -0.316195 0.910828 -0.265355
+    outer loop
+       vertex -15 -33.4488 10.3042
+       vertex -30 -38.5701 10.5993
+       vertex -30 -38.2272 11.7763
+    endloop
+  endfacet
+  facet normal -0.316195 0.902257 -0.293177
+    outer loop
+       vertex -15 -33.1173 11.3244
+       vertex -15 -33.4488 10.3042
+       vertex -30 -38.2272 11.7763
+    endloop
+  endfacet
+  facet normal -0.316198 0.902266 -0.293145
+    outer loop
+       vertex -15 -33.1173 11.3244
+       vertex -30 -38.2272 11.7763
+       vertex -30 -37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -0.316198 0.892855 -0.320669
+    outer loop
+       vertex -15 -32.7547 12.334
+       vertex -15 -33.1173 11.3244
+       vertex -30 -37.8484 12.9422
+    endloop
+  endfacet
+  facet normal -0.316197 0.892852 -0.320679
+    outer loop
+       vertex -15 -32.7547 12.334
+       vertex -30 -37.8484 12.9422
+       vertex -30 -37.434 14.096
+    endloop
+  endfacet
+  facet normal -0.316197 0.882628 -0.347832
+    outer loop
+       vertex -15 -32.3614 13.332
+       vertex -15 -32.7547 12.334
+       vertex -30 -37.434 14.096
+    endloop
+  endfacet
+  facet normal -0.31619 0.882593 -0.347927
+    outer loop
+       vertex -15 -32.3614 13.332
+       vertex -30 -37.434 14.096
+       vertex -30 -36.9844 15.2365
+    endloop
+  endfacet
+  facet normal -0.31619 0.871512 -0.37482
+    outer loop
+       vertex -15 -31.9376 14.3174
+       vertex -15 -32.3614 13.332
+       vertex -30 -36.9844 15.2365
+    endloop
+  endfacet
+  facet normal -0.316192 0.871527 -0.374785
+    outer loop
+       vertex -15 -31.9376 14.3174
+       vertex -30 -36.9844 15.2365
+       vertex -30 -36.5001 16.3627
+    endloop
+  endfacet
+  facet normal -0.316193 0.859658 -0.401261
+    outer loop
+       vertex -15 -31.4839 15.2894
+       vertex -15 -31.9376 14.3174
+       vertex -30 -36.5001 16.3627
+    endloop
+  endfacet
+  facet normal -0.316194 0.859668 -0.401238
+    outer loop
+       vertex -15 -31.4839 15.2894
+       vertex -30 -36.5001 16.3627
+       vertex -30 -35.9816 17.4736
+    endloop
+  endfacet
+  facet normal -0.316194 0.846904 -0.427521
+    outer loop
+       vertex -15 -31.0005 16.247
+       vertex -15 -31.4839 15.2894
+       vertex -30 -35.9816 17.4736
+    endloop
+  endfacet
+  facet normal -0.316197 0.846921 -0.427486
+    outer loop
+       vertex -15 -31.0005 16.247
+       vertex -30 -35.9816 17.4736
+       vertex -30 -35.4292 18.568
+    endloop
+  endfacet
+  facet normal -0.316197 0.833462 -0.453168
+    outer loop
+       vertex -15 -30.4881 17.1894
+       vertex -15 -31.0005 16.247
+       vertex -30 -35.4292 18.568
+    endloop
+  endfacet
+  facet normal -0.316191 0.833425 -0.453239
+    outer loop
+       vertex -15 -30.4881 17.1894
+       vertex -30 -35.4292 18.568
+       vertex -30 -34.8435 19.645
+    endloop
+  endfacet
+  facet normal -0.316191 0.819149 -0.478558
+    outer loop
+       vertex -15 -29.947 18.1156
+       vertex -15 -30.4881 17.1894
+       vertex -30 -34.8435 19.645
+    endloop
+  endfacet
+  facet normal -0.316198 0.819198 -0.47847
+    outer loop
+       vertex -15 -29.947 18.1156
+       vertex -30 -34.8435 19.645
+       vertex -30 -34.2252 20.7036
+    endloop
+  endfacet
+  facet normal -0.316199 0.804137 -0.503371
+    outer loop
+       vertex -15 -29.3778 19.0249
+       vertex -15 -29.947 18.1156
+       vertex -30 -34.2252 20.7036
+    endloop
+  endfacet
+  facet normal -0.316192 0.804087 -0.503454
+    outer loop
+       vertex -15 -29.3778 19.0249
+       vertex -30 -34.2252 20.7036
+       vertex -30 -33.5746 21.7427
+    endloop
+  endfacet
+  facet normal -0.316192 0.788299 -0.527832
+    outer loop
+       vertex -15 -28.781 19.9162
+       vertex -15 -29.3778 19.0249
+       vertex -30 -33.5746 21.7427
+    endloop
+  endfacet
+  facet normal -0.316192 0.788301 -0.527829
+    outer loop
+       vertex -15 -28.781 19.9162
+       vertex -30 -33.5746 21.7427
+       vertex -30 -32.8925 22.7614
+    endloop
+  endfacet
+  facet normal -0.316192 0.771728 -0.551778
+    outer loop
+       vertex -15 -28.1571 20.7888
+       vertex -15 -28.781 19.9162
+       vertex -30 -32.8925 22.7614
+    endloop
+  endfacet
+  facet normal -0.316199 0.771784 -0.551696
+    outer loop
+       vertex -15 -28.1571 20.7888
+       vertex -30 -32.8925 22.7614
+       vertex -30 -32.1796 23.7587
+    endloop
+  endfacet
+  facet normal -0.316196 0.754493 -0.575117
+    outer loop
+       vertex -15 -27.5068 21.642
+       vertex -30 -32.1796 23.7587
+       vertex -30 -31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -0.316199 0.754517 -0.575085
+    outer loop
+       vertex -15 -27.5068 21.642
+       vertex -15 -28.1571 20.7888
+       vertex -30 -32.1796 23.7587
+    endloop
+  endfacet
+  facet normal -0.316196 0.736498 -0.597989
+    outer loop
+       vertex -15 -26.8307 22.4747
+       vertex -15 -27.5068 21.642
+       vertex -30 -31.4364 24.7337
+    endloop
+  endfacet
+  facet normal -0.316197 0.736505 -0.597979
+    outer loop
+       vertex -15 -26.8307 22.4747
+       vertex -30 -31.4364 24.7337
+       vertex -30 -30.6637 25.6854
+    endloop
+  endfacet
+  facet normal -0.316197 0.717867 -0.62023
+    outer loop
+       vertex -15 -26.1294 23.2864
+       vertex -15 -26.8307 22.4747
+       vertex -30 -30.6637 25.6854
+    endloop
+  endfacet
+  facet normal -0.316191 0.717807 -0.620303
+    outer loop
+       vertex -15 -26.1294 23.2864
+       vertex -30 -30.6637 25.6854
+       vertex -30 -29.8621 26.613
+    endloop
+  endfacet
+  facet normal -0.31619 0.69849 -0.641978
+    outer loop
+       vertex -15 -25.4035 24.0762
+       vertex -15 -26.1294 23.2864
+       vertex -30 -29.8621 26.613
+    endloop
+  endfacet
+  facet normal -0.316189 0.698479 -0.64199
+    outer loop
+       vertex -15 -25.4035 24.0762
+       vertex -30 -29.8621 26.613
+       vertex -30 -29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -0.316189 0.678479 -0.663092
+    outer loop
+       vertex -15 -24.6537 24.8434
+       vertex -15 -25.4035 24.0762
+       vertex -30 -29.0325 27.5156
+    endloop
+  endfacet
+  facet normal -0.316194 0.678523 -0.663045
+    outer loop
+       vertex -15 -24.6537 24.8434
+       vertex -30 -29.0325 27.5156
+       vertex -30 -28.1757 28.3924
+    endloop
+  endfacet
+  facet normal -0.316194 0.657837 -0.683573
+    outer loop
+       vertex -15 -23.8808 25.5872
+       vertex -15 -24.6537 24.8434
+       vertex -30 -28.1757 28.3924
+    endloop
+  endfacet
+  facet normal -0.316196 0.657859 -0.683551
+    outer loop
+       vertex -15 -23.8808 25.5872
+       vertex -30 -28.1757 28.3924
+       vertex -30 -27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -0.316196 0.636609 -0.703384
+    outer loop
+       vertex -15 -23.0855 26.307
+       vertex -15 -23.8808 25.5872
+       vertex -30 -27.2924 29.2425
+    endloop
+  endfacet
+  facet normal -0.316195 0.636607 -0.703386
+    outer loop
+       vertex -15 -23.0855 26.307
+       vertex -30 -27.2924 29.2425
+       vertex -30 -26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -0.316196 0.614754 -0.722564
+    outer loop
+       vertex -15 -22.2685 27.0021
+       vertex -15 -23.0855 26.307
+       vertex -30 -26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -0.316196 0.614759 -0.722559
+    outer loop
+       vertex -15 -22.2685 27.0021
+       vertex -30 -26.3834 30.0652
+       vertex -30 -25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -0.316197 0.592364 -0.74103
+    outer loop
+       vertex -15 -21.4306 27.6719
+       vertex -15 -22.2685 27.0021
+       vertex -30 -25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -0.316193 0.592324 -0.741063
+    outer loop
+       vertex -15 -21.4306 27.6719
+       vertex -30 -25.4497 30.8596
+       vertex -30 -24.4921 31.625
+    endloop
+  endfacet
+  facet normal -0.316193 0.569288 -0.758903
+    outer loop
+       vertex -15 -20.5725 28.3156
+       vertex -15 -21.4306 27.6719
+       vertex -30 -24.4921 31.625
+    endloop
+  endfacet
+  facet normal -0.316194 0.569303 -0.758891
+    outer loop
+       vertex -15 -20.5725 28.3156
+       vertex -30 -24.4921 31.625
+       vertex -30 -23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -0.316194 0.545773 -0.775986
+    outer loop
+       vertex -15 -19.6951 28.9327
+       vertex -15 -20.5725 28.3156
+       vertex -30 -23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -0.316197 0.545811 -0.775957
+    outer loop
+       vertex -15 -19.6951 28.9327
+       vertex -30 -23.5114 32.3607
+       vertex -30 -22.5087 33.066
+    endloop
+  endfacet
+  facet normal -0.316197 0.521783 -0.792314
+    outer loop
+       vertex -15 -18.7992 29.5227
+       vertex -15 -19.6951 28.9327
+       vertex -30 -22.5087 33.066
+    endloop
+  endfacet
+  facet normal -0.316193 0.521732 -0.79235
+    outer loop
+       vertex -15 -18.7992 29.5227
+       vertex -30 -22.5087 33.066
+       vertex -30 -21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -0.316193 0.497239 -0.807945
+    outer loop
+       vertex -15 -17.8857 30.0849
+       vertex -15 -18.7992 29.5227
+       vertex -30 -21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -0.316194 0.497252 -0.807937
+    outer loop
+       vertex -15 -17.8857 30.0849
+       vertex -30 -21.4848 33.7402
+       vertex -30 -20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -0.316194 0.472245 -0.822803
+    outer loop
+       vertex -15 -16.9553 30.6189
+       vertex -15 -17.8857 30.0849
+       vertex -30 -20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -0.316193 0.472233 -0.822811
+    outer loop
+       vertex -15 -16.9553 30.6189
+       vertex -30 -20.4407 34.3828
+       vertex -30 -19.3775 34.993
+    endloop
+  endfacet
+  facet normal -0.316193 0.446794 -0.836897
+    outer loop
+       vertex -15 -16.009 31.1241
+       vertex -15 -16.9553 30.6189
+       vertex -30 -19.3775 34.993
+    endloop
+  endfacet
+  facet normal -0.316194 0.446806 -0.836891
+    outer loop
+       vertex -15 -16.009 31.1241
+       vertex -30 -19.3775 34.993
+       vertex -30 -18.296 35.5704
+    endloop
+  endfacet
+  facet normal -0.316194 0.420975 -0.850177
+    outer loop
+       vertex -15 -15.0477 31.6001
+       vertex -15 -16.009 31.1241
+       vertex -30 -18.296 35.5704
+    endloop
+  endfacet
+  facet normal -0.316195 0.420984 -0.850173
+    outer loop
+       vertex -15 -15.0477 31.6001
+       vertex -30 -18.296 35.5704
+       vertex -30 -17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -0.316195 0.394723 -0.862679
+    outer loop
+       vertex -15 -14.0723 32.0464
+       vertex -15 -15.0477 31.6001
+       vertex -30 -17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -0.316191 0.394672 -0.862703
+    outer loop
+       vertex -15 -14.0723 32.0464
+       vertex -30 -17.1974 36.1144
+       vertex -30 -16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -0.316191 0.368079 -0.874381
+    outer loop
+       vertex -15 -13.0836 32.4626
+       vertex -15 -14.0723 32.0464
+       vertex -30 -16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -0.316194 0.368117 -0.874363
+    outer loop
+       vertex -15 -13.0836 32.4626
+       vertex -30 -16.0826 36.6244
+       vertex -30 -14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -0.316194 0.341101 -0.885252
+    outer loop
+       vertex -15 -12.0826 32.8483
+       vertex -15 -13.0836 32.4626
+       vertex -30 -14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -0.316194 0.341101 -0.885252
+    outer loop
+       vertex -15 -12.0826 32.8483
+       vertex -30 -14.9527 37.1001
+       vertex -30 -13.8087 37.5409
+    endloop
+  endfacet
+  facet normal -0.316194 0.31379 -0.895297
+    outer loop
+       vertex -15 -11.0703 33.2031
+       vertex -15 -12.0826 32.8483
+       vertex -30 -13.8087 37.5409
+    endloop
+  endfacet
+  facet normal -0.316195 0.313804 -0.895292
+    outer loop
+       vertex -15 -11.0703 33.2031
+       vertex -30 -13.8087 37.5409
+       vertex -30 -12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -0.316195 0.286278 -0.90447
+    outer loop
+       vertex -15 -10.0476 33.5268
+       vertex -15 -11.0703 33.2031
+       vertex -30 -12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -0.316193 0.286248 -0.90448
+    outer loop
+       vertex -15 -10.0476 33.5268
+       vertex -30 -12.6518 37.9464
+       vertex -30 -11.483 38.3163
+    endloop
+  endfacet
+  facet normal -0.316192 0.258346 -0.912842
+    outer loop
+       vertex -15 -9.01548 33.8189
+       vertex -15 -10.0476 33.5268
+       vertex -30 -11.483 38.3163
+    endloop
+  endfacet
+  facet normal -0.316195 0.258388 -0.912829
+    outer loop
+       vertex -15 -9.01548 33.8189
+       vertex -30 -11.483 38.3163
+       vertex -30 -10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -0.316195 0.230297 -0.920317
+    outer loop
+       vertex -15 -7.97487 34.0793
+       vertex -15 -9.01548 33.8189
+       vertex -30 -10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -0.316196 0.230299 -0.920317
+    outer loop
+       vertex -15 -7.97487 34.0793
+       vertex -30 -10.3034 38.6502
+       vertex -30 -9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -0.316196 0.201998 -0.92694
+    outer loop
+       vertex -15 -6.92677 34.3077
+       vertex -15 -7.97487 34.0793
+       vertex -30 -9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -0.316194 0.201977 -0.926945
+    outer loop
+       vertex -15 -6.92677 34.3077
+       vertex -30 -9.11414 38.9478
+       vertex -30 -7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -0.316194 0.173516 -0.932691
+    outer loop
+       vertex -15 -5.87216 34.5039
+       vertex -15 -6.92677 34.3077
+       vertex -30 -7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -0.316193 0.173495 -0.932696
+    outer loop
+       vertex -15 -5.87216 34.5039
+       vertex -30 -7.91631 39.2088
+       vertex -30 -6.71104 39.433
+    endloop
+  endfacet
+  facet normal -0.316193 0.144777 -0.937583
+    outer loop
+       vertex -15 -4.81203 34.6676
+       vertex -15 -5.87216 34.5039
+       vertex -30 -6.71104 39.433
+    endloop
+  endfacet
+  facet normal -0.316193 0.144788 -0.937581
+    outer loop
+       vertex -15 -4.81203 34.6676
+       vertex -30 -6.71104 39.433
+       vertex -30 -5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -0.316193 0.116036 -0.941572
+    outer loop
+       vertex -15 -3.74739 34.7988
+       vertex -15 -4.81203 34.6676
+       vertex -30 -5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -0.316196 0.116078 -0.941566
+    outer loop
+       vertex -15 -3.74739 34.7988
+       vertex -30 -5.49947 39.6201
+       vertex -30 -4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -0.316197 0.0871124 -0.944686
+    outer loop
+       vertex -15 -2.67922 34.8973
+       vertex -15 -3.74739 34.7988
+       vertex -30 -4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -0.316193 0.0870582 -0.944692
+    outer loop
+       vertex -15 -2.67922 34.8973
+       vertex -30 -4.28273 39.7701
+       vertex -30 -3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -0.316193 0.0581058 -0.946914
+    outer loop
+       vertex -15 -1.60854 34.963
+       vertex -15 -2.67922 34.8973
+       vertex -30 -3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -0.316193 0.058116 -0.946913
+    outer loop
+       vertex -15 -1.60854 34.963
+       vertex -30 -3.06197 39.8826
+       vertex -30 -1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -0.316193 0.029095 -0.948249
+    outer loop
+       vertex -15 -0.536348 34.9959
+       vertex -15 -1.60854 34.963
+       vertex -30 -1.83833 39.9577
+    endloop
+  endfacet
+  facet normal 0.316194 0.029095 -0.948248
+    outer loop
+       vertex -8.88074e-15 -0.61297 39.9953
+       vertex -15 -1.60854 34.963
+       vertex -15 -0.536348 34.9959
+    endloop
+  endfacet
+  facet normal 0.316194 0 -0.948695
+    outer loop
+       vertex -8.88074e-15 0.61297 39.9953
+       vertex -8.88074e-15 -0.61297 39.9953
+       vertex -15 0.536348 34.9959
+    endloop
+  endfacet
+  facet normal 0.316194 0 -0.948695
+    outer loop
+       vertex -15 0.536348 34.9959
+       vertex -8.88074e-15 -0.61297 39.9953
+       vertex -15 -0.536348 34.9959
+    endloop
+  endfacet
+  facet normal 0.316194 -0.029098 -0.948248
+    outer loop
+       vertex -8.8724e-15 1.83833 39.9577
+       vertex -8.88074e-15 0.61297 39.9953
+       vertex -15 0.536348 34.9959
+    endloop
+  endfacet
+  facet normal 0.316193 -0.029095 -0.948249
+    outer loop
+       vertex -15 1.60854 34.963
+       vertex -8.8724e-15 1.83833 39.9577
+       vertex -15 0.536348 34.9959
+    endloop
+  endfacet
+  facet normal 0.316193 -0.058116 -0.946913
+    outer loop
+       vertex -8.85572e-15 3.06197 39.8826
+       vertex -8.8724e-15 1.83833 39.9577
+       vertex -15 1.60854 34.963
+    endloop
+  endfacet
+  facet normal 0.316193 -0.0581058 -0.946914
+    outer loop
+       vertex -15 2.67922 34.8973
+       vertex -8.85572e-15 3.06197 39.8826
+       vertex -15 1.60854 34.963
+    endloop
+  endfacet
+  facet normal 0.316193 -0.0870582 -0.944692
+    outer loop
+       vertex -8.83073e-15 4.28273 39.7701
+       vertex -8.85572e-15 3.06197 39.8826
+       vertex -15 2.67922 34.8973
+    endloop
+  endfacet
+  facet normal 0.316197 -0.0871124 -0.944686
+    outer loop
+       vertex -15 3.74739 34.7988
+       vertex -8.83073e-15 4.28273 39.7701
+       vertex -15 2.67922 34.8973
+    endloop
+  endfacet
+  facet normal 0.316196 -0.116078 -0.941566
+    outer loop
+       vertex -8.79744e-15 5.49947 39.6201
+       vertex -8.83073e-15 4.28273 39.7701
+       vertex -15 3.74739 34.7988
+    endloop
+  endfacet
+  facet normal 0.316193 -0.116036 -0.941572
+    outer loop
+       vertex -15 4.81203 34.6676
+       vertex -8.79744e-15 5.49947 39.6201
+       vertex -15 3.74739 34.7988
+    endloop
+  endfacet
+  facet normal 0.316193 -0.144788 -0.937581
+    outer loop
+       vertex -8.75589e-15 6.71104 39.433
+       vertex -8.79744e-15 5.49947 39.6201
+       vertex -15 4.81203 34.6676
+    endloop
+  endfacet
+  facet normal 0.316193 -0.144777 -0.937583
+    outer loop
+       vertex -15 5.87216 34.5039
+       vertex -8.75589e-15 6.71104 39.433
+       vertex -15 4.81203 34.6676
+    endloop
+  endfacet
+  facet normal 0.316193 -0.173495 -0.932696
+    outer loop
+       vertex -8.70611e-15 7.91631 39.2088
+       vertex -8.75589e-15 6.71104 39.433
+       vertex -15 5.87216 34.5039
+    endloop
+  endfacet
+  facet normal 0.316194 -0.173516 -0.932691
+    outer loop
+       vertex -15 6.92677 34.3077
+       vertex -8.70611e-15 7.91631 39.2088
+       vertex -15 5.87216 34.5039
+    endloop
+  endfacet
+  facet normal 0.316194 -0.201977 -0.926945
+    outer loop
+       vertex -8.64815e-15 9.11414 38.9478
+       vertex -8.70611e-15 7.91631 39.2088
+       vertex -15 6.92677 34.3077
+    endloop
+  endfacet
+  facet normal 0.316196 -0.201998 -0.92694
+    outer loop
+       vertex -15 7.97487 34.0793
+       vertex -8.64815e-15 9.11414 38.9478
+       vertex -15 6.92677 34.3077
+    endloop
+  endfacet
+  facet normal 0.316196 -0.230299 -0.920317
+    outer loop
+       vertex -8.58207e-15 10.3034 38.6502
+       vertex -8.64815e-15 9.11414 38.9478
+       vertex -15 7.97487 34.0793
+    endloop
+  endfacet
+  facet normal 0.316195 -0.230297 -0.920317
+    outer loop
+       vertex -15 9.01548 33.8189
+       vertex -8.58207e-15 10.3034 38.6502
+       vertex -15 7.97487 34.0793
+    endloop
+  endfacet
+  facet normal 0.316195 -0.258388 -0.912829
+    outer loop
+       vertex -8.50793e-15 11.483 38.3163
+       vertex -8.58207e-15 10.3034 38.6502
+       vertex -15 9.01548 33.8189
+    endloop
+  endfacet
+  facet normal 0.316192 -0.258346 -0.912842
+    outer loop
+       vertex -15 10.0476 33.5268
+       vertex -8.50793e-15 11.483 38.3163
+       vertex -15 9.01548 33.8189
+    endloop
+  endfacet
+  facet normal 0.316193 -0.286248 -0.90448
+    outer loop
+       vertex -8.4258e-15 12.6518 37.9464
+       vertex -8.50793e-15 11.483 38.3163
+       vertex -15 10.0476 33.5268
+    endloop
+  endfacet
+  facet normal 0.316195 -0.286278 -0.90447
+    outer loop
+       vertex -15 11.0703 33.2031
+       vertex -8.4258e-15 12.6518 37.9464
+       vertex -15 10.0476 33.5268
+    endloop
+  endfacet
+  facet normal 0.316195 -0.313804 -0.895292
+    outer loop
+       vertex -8.33575e-15 13.8087 37.5409
+       vertex -8.4258e-15 12.6518 37.9464
+       vertex -15 11.0703 33.2031
+    endloop
+  endfacet
+  facet normal 0.316194 -0.31379 -0.895297
+    outer loop
+       vertex -15 12.0826 32.8483
+       vertex -8.33575e-15 13.8087 37.5409
+       vertex -15 11.0703 33.2031
+    endloop
+  endfacet
+  facet normal 0.316194 -0.341101 -0.885252
+    outer loop
+       vertex -8.23788e-15 14.9527 37.1001
+       vertex -8.33575e-15 13.8087 37.5409
+       vertex -15 12.0826 32.8483
+    endloop
+  endfacet
+  facet normal 0.316194 -0.341101 -0.885252
+    outer loop
+       vertex -15 13.0836 32.4626
+       vertex -8.23788e-15 14.9527 37.1001
+       vertex -15 12.0826 32.8483
+    endloop
+  endfacet
+  facet normal 0.316194 -0.368117 -0.874363
+    outer loop
+       vertex -8.13226e-15 16.0826 36.6244
+       vertex -8.23788e-15 14.9527 37.1001
+       vertex -15 13.0836 32.4626
+    endloop
+  endfacet
+  facet normal 0.316191 -0.368079 -0.874381
+    outer loop
+       vertex -15 14.0723 32.0464
+       vertex -8.13226e-15 16.0826 36.6244
+       vertex -15 13.0836 32.4626
+    endloop
+  endfacet
+  facet normal 0.316191 -0.394672 -0.862703
+    outer loop
+       vertex -8.01901e-15 17.1974 36.1144
+       vertex -8.13226e-15 16.0826 36.6244
+       vertex -15 14.0723 32.0464
+    endloop
+  endfacet
+  facet normal 0.316195 -0.394723 -0.862679
+    outer loop
+       vertex -15 15.0477 31.6001
+       vertex -8.01901e-15 17.1974 36.1144
+       vertex -15 14.0723 32.0464
+    endloop
+  endfacet
+  facet normal 0.316195 -0.420984 -0.850173
+    outer loop
+       vertex -7.89822e-15 18.296 35.5704
+       vertex -8.01901e-15 17.1974 36.1144
+       vertex -15 15.0477 31.6001
+    endloop
+  endfacet
+  facet normal 0.316194 -0.420975 -0.850177
+    outer loop
+       vertex -15 16.009 31.1241
+       vertex -7.89822e-15 18.296 35.5704
+       vertex -15 15.0477 31.6001
+    endloop
+  endfacet
+  facet normal 0.316194 -0.446806 -0.836891
+    outer loop
+       vertex -7.77002e-15 19.3775 34.993
+       vertex -7.89822e-15 18.296 35.5704
+       vertex -15 16.009 31.1241
+    endloop
+  endfacet
+  facet normal 0.316193 -0.446794 -0.836897
+    outer loop
+       vertex -15 16.9553 30.6189
+       vertex -7.77002e-15 19.3775 34.993
+       vertex -15 16.009 31.1241
+    endloop
+  endfacet
+  facet normal 0.316193 -0.472233 -0.822811
+    outer loop
+       vertex -7.63451e-15 20.4407 34.3828
+       vertex -7.77002e-15 19.3775 34.993
+       vertex -15 16.9553 30.6189
+    endloop
+  endfacet
+  facet normal 0.316194 -0.472245 -0.822803
+    outer loop
+       vertex -15 17.8857 30.0849
+       vertex -7.63451e-15 20.4407 34.3828
+       vertex -15 16.9553 30.6189
+    endloop
+  endfacet
+  facet normal 0.316194 -0.497252 -0.807937
+    outer loop
+       vertex -7.49184e-15 21.4848 33.7402
+       vertex -7.63451e-15 20.4407 34.3828
+       vertex -15 17.8857 30.0849
+    endloop
+  endfacet
+  facet normal 0.316193 -0.497239 -0.807945
+    outer loop
+       vertex -15 18.7992 29.5227
+       vertex -7.49184e-15 21.4848 33.7402
+       vertex -15 17.8857 30.0849
+    endloop
+  endfacet
+  facet normal 0.316193 -0.521732 -0.79235
+    outer loop
+       vertex -7.34212e-15 22.5087 33.066
+       vertex -7.49184e-15 21.4848 33.7402
+       vertex -15 18.7992 29.5227
+    endloop
+  endfacet
+  facet normal 0.316197 -0.521783 -0.792314
+    outer loop
+       vertex -15 19.6951 28.9327
+       vertex -7.34212e-15 22.5087 33.066
+       vertex -15 18.7992 29.5227
+    endloop
+  endfacet
+  facet normal 0.316197 -0.545811 -0.775957
+    outer loop
+       vertex -7.18551e-15 23.5114 32.3607
+       vertex -7.34212e-15 22.5087 33.066
+       vertex -15 19.6951 28.9327
+    endloop
+  endfacet
+  facet normal 0.316194 -0.545773 -0.775986
+    outer loop
+       vertex -15 20.5725 28.3156
+       vertex -7.18551e-15 23.5114 32.3607
+       vertex -15 19.6951 28.9327
+    endloop
+  endfacet
+  facet normal 0.316194 -0.569303 -0.758891
+    outer loop
+       vertex -7.02216e-15 24.4921 31.625
+       vertex -7.18551e-15 23.5114 32.3607
+       vertex -15 20.5725 28.3156
+    endloop
+  endfacet
+  facet normal 0.316193 -0.569288 -0.758903
+    outer loop
+       vertex -15 21.4306 27.6719
+       vertex -7.02216e-15 24.4921 31.625
+       vertex -15 20.5725 28.3156
+    endloop
+  endfacet
+  facet normal 0.316193 -0.592324 -0.741063
+    outer loop
+       vertex -6.8522e-15 25.4497 30.8596
+       vertex -7.02216e-15 24.4921 31.625
+       vertex -15 21.4306 27.6719
+    endloop
+  endfacet
+  facet normal 0.316197 -0.592364 -0.74103
+    outer loop
+       vertex -15 22.2685 27.0021
+       vertex -6.8522e-15 25.4497 30.8596
+       vertex -15 21.4306 27.6719
+    endloop
+  endfacet
+  facet normal 0.316196 -0.614759 -0.722559
+    outer loop
+       vertex -6.67581e-15 26.3834 30.0652
+       vertex -6.8522e-15 25.4497 30.8596
+       vertex -15 22.2685 27.0021
+    endloop
+  endfacet
+  facet normal 0.316196 -0.614754 -0.722564
+    outer loop
+       vertex -15 23.0855 26.307
+       vertex -6.67581e-15 26.3834 30.0652
+       vertex -15 22.2685 27.0021
+    endloop
+  endfacet
+  facet normal 0.316195 -0.636607 -0.703386
+    outer loop
+       vertex -6.49315e-15 27.2924 29.2425
+       vertex -6.67581e-15 26.3834 30.0652
+       vertex -15 23.0855 26.307
+    endloop
+  endfacet
+  facet normal 0.316196 -0.636609 -0.703384
+    outer loop
+       vertex -15 23.8808 25.5872
+       vertex -6.49315e-15 27.2924 29.2425
+       vertex -15 23.0855 26.307
+    endloop
+  endfacet
+  facet normal 0.316196 -0.657859 -0.683551
+    outer loop
+       vertex -6.30439e-15 28.1757 28.3924
+       vertex -6.49315e-15 27.2924 29.2425
+       vertex -15 23.8808 25.5872
+    endloop
+  endfacet
+  facet normal 0.316194 -0.657837 -0.683573
+    outer loop
+       vertex -15 24.6537 24.8434
+       vertex -6.30439e-15 28.1757 28.3924
+       vertex -15 23.8808 25.5872
+    endloop
+  endfacet
+  facet normal 0.316194 -0.678523 -0.663045
+    outer loop
+       vertex -6.1097e-15 29.0325 27.5156
+       vertex -6.30439e-15 28.1757 28.3924
+       vertex -15 24.6537 24.8434
+    endloop
+  endfacet
+  facet normal 0.316189 -0.678479 -0.663092
+    outer loop
+       vertex -15 25.4035 24.0762
+       vertex -6.1097e-15 29.0325 27.5156
+       vertex -15 24.6537 24.8434
+    endloop
+  endfacet
+  facet normal 0.316189 -0.698479 -0.64199
+    outer loop
+       vertex -5.90928e-15 29.8621 26.613
+       vertex -6.1097e-15 29.0325 27.5156
+       vertex -15 25.4035 24.0762
+    endloop
+  endfacet
+  facet normal 0.31619 -0.69849 -0.641978
+    outer loop
+       vertex -15 26.1294 23.2864
+       vertex -5.90928e-15 29.8621 26.613
+       vertex -15 25.4035 24.0762
+    endloop
+  endfacet
+  facet normal 0.316191 -0.717807 -0.620303
+    outer loop
+       vertex -5.70331e-15 30.6637 25.6854
+       vertex -5.90928e-15 29.8621 26.613
+       vertex -15 26.1294 23.2864
+    endloop
+  endfacet
+  facet normal 0.316197 -0.717867 -0.62023
+    outer loop
+       vertex -15 26.8307 22.4747
+       vertex -5.70331e-15 30.6637 25.6854
+       vertex -15 26.1294 23.2864
+    endloop
+  endfacet
+  facet normal 0.316197 -0.736505 -0.597979
+    outer loop
+       vertex -5.49198e-15 31.4364 24.7337
+       vertex -5.70331e-15 30.6637 25.6854
+       vertex -15 26.8307 22.4747
+    endloop
+  endfacet
+  facet normal 0.316196 -0.736498 -0.597989
+    outer loop
+       vertex -15 27.5068 21.642
+       vertex -5.49198e-15 31.4364 24.7337
+       vertex -15 26.8307 22.4747
+    endloop
+  endfacet
+  facet normal 0.316196 -0.754493 -0.575117
+    outer loop
+       vertex -5.27549e-15 32.1796 23.7587
+       vertex -5.49198e-15 31.4364 24.7337
+       vertex -15 27.5068 21.642
+    endloop
+  endfacet
+  facet normal 0.316199 -0.754517 -0.575085
+    outer loop
+       vertex -15 28.1571 20.7888
+       vertex -5.27549e-15 32.1796 23.7587
+       vertex -15 27.5068 21.642
+    endloop
+  endfacet
+  facet normal 0.316199 -0.771784 -0.551696
+    outer loop
+       vertex -5.05404e-15 32.8925 22.7614
+       vertex -5.27549e-15 32.1796 23.7587
+       vertex -15 28.1571 20.7888
+    endloop
+  endfacet
+  facet normal 0.316192 -0.771728 -0.551778
+    outer loop
+       vertex -15 28.781 19.9162
+       vertex -5.05404e-15 32.8925 22.7614
+       vertex -15 28.1571 20.7888
+    endloop
+  endfacet
+  facet normal 0.316192 -0.788301 -0.527829
+    outer loop
+       vertex -4.82785e-15 33.5746 21.7427
+       vertex -5.05404e-15 32.8925 22.7614
+       vertex -15 28.781 19.9162
+    endloop
+  endfacet
+  facet normal 0.316192 -0.788299 -0.527832
+    outer loop
+       vertex -15 29.3778 19.0249
+       vertex -4.82785e-15 33.5746 21.7427
+       vertex -15 28.781 19.9162
+    endloop
+  endfacet
+  facet normal 0.316192 -0.804087 -0.503454
+    outer loop
+       vertex -4.59712e-15 34.2252 20.7036
+       vertex -4.82785e-15 33.5746 21.7427
+       vertex -15 29.3778 19.0249
+    endloop
+  endfacet
+  facet normal 0.316199 -0.804137 -0.503371
+    outer loop
+       vertex -15 29.947 18.1156
+       vertex -4.59712e-15 34.2252 20.7036
+       vertex -15 29.3778 19.0249
+    endloop
+  endfacet
+  facet normal 0.316198 -0.819198 -0.47847
+    outer loop
+       vertex -4.36208e-15 34.8435 19.645
+       vertex -4.59712e-15 34.2252 20.7036
+       vertex -15 29.947 18.1156
+    endloop
+  endfacet
+  facet normal 0.316191 -0.819149 -0.478558
+    outer loop
+       vertex -15 30.4881 17.1894
+       vertex -4.36208e-15 34.8435 19.645
+       vertex -15 29.947 18.1156
+    endloop
+  endfacet
+  facet normal 0.316191 -0.833425 -0.453239
+    outer loop
+       vertex -4.12293e-15 35.4292 18.568
+       vertex -4.36208e-15 34.8435 19.645
+       vertex -15 30.4881 17.1894
+    endloop
+  endfacet
+  facet normal 0.316197 -0.833462 -0.453168
+    outer loop
+       vertex -15 31.0005 16.247
+       vertex -4.12293e-15 35.4292 18.568
+       vertex -15 30.4881 17.1894
+    endloop
+  endfacet
+  facet normal 0.316197 -0.846921 -0.427486
+    outer loop
+       vertex -3.87992e-15 35.9816 17.4736
+       vertex -4.12293e-15 35.4292 18.568
+       vertex -15 31.0005 16.247
+    endloop
+  endfacet
+  facet normal 0.316194 -0.846904 -0.427521
+    outer loop
+       vertex -15 31.4839 15.2894
+       vertex -3.87992e-15 35.9816 17.4736
+       vertex -15 31.0005 16.247
+    endloop
+  endfacet
+  facet normal 0.316194 -0.859668 -0.401238
+    outer loop
+       vertex -3.63326e-15 36.5001 16.3627
+       vertex -3.87992e-15 35.9816 17.4736
+       vertex -15 31.4839 15.2894
+    endloop
+  endfacet
+  facet normal 0.316193 -0.859658 -0.401261
+    outer loop
+       vertex -15 31.9376 14.3174
+       vertex -3.63326e-15 36.5001 16.3627
+       vertex -15 31.4839 15.2894
+    endloop
+  endfacet
+  facet normal 0.316192 -0.871527 -0.374785
+    outer loop
+       vertex -3.38319e-15 36.9844 15.2365
+       vertex -3.63326e-15 36.5001 16.3627
+       vertex -15 31.9376 14.3174
+    endloop
+  endfacet
+  facet normal 0.31619 -0.871512 -0.37482
+    outer loop
+       vertex -15 32.3614 13.332
+       vertex -3.38319e-15 36.9844 15.2365
+       vertex -15 31.9376 14.3174
+    endloop
+  endfacet
+  facet normal 0.31619 -0.882593 -0.347927
+    outer loop
+       vertex -3.12994e-15 37.434 14.096
+       vertex -3.38319e-15 36.9844 15.2365
+       vertex -15 32.3614 13.332
+    endloop
+  endfacet
+  facet normal 0.316197 -0.882628 -0.347832
+    outer loop
+       vertex -15 32.7547 12.334
+       vertex -3.12994e-15 37.434 14.096
+       vertex -15 32.3614 13.332
+    endloop
+  endfacet
+  facet normal 0.316197 -0.892852 -0.320679
+    outer loop
+       vertex -2.87375e-15 37.8484 12.9422
+       vertex -3.12994e-15 37.434 14.096
+       vertex -15 32.7547 12.334
+    endloop
+  endfacet
+  facet normal 0.316198 -0.892855 -0.320669
+    outer loop
+       vertex -15 33.1173 11.3244
+       vertex -2.87375e-15 37.8484 12.9422
+       vertex -15 32.7547 12.334
+    endloop
+  endfacet
+  facet normal 0.316198 -0.902266 -0.293145
+    outer loop
+       vertex -2.61485e-15 38.2272 11.7763
+       vertex -2.87375e-15 37.8484 12.9422
+       vertex -15 33.1173 11.3244
+    endloop
+  endfacet
+  facet normal 0.316195 -0.902257 -0.293177
+    outer loop
+       vertex -15 33.4488 10.3042
+       vertex -2.61485e-15 38.2272 11.7763
+       vertex -15 33.1173 11.3244
+    endloop
+  endfacet
+  facet normal 0.316195 -0.910828 -0.265355
+    outer loop
+       vertex -2.35351e-15 38.5701 10.5993
+       vertex -2.61485e-15 38.2272 11.7763
+       vertex -15 33.4488 10.3042
+    endloop
+  endfacet
+  facet normal 0.316191 -0.910812 -0.265414
+    outer loop
+       vertex -15 33.7489 9.27435
+       vertex -2.35351e-15 38.5701 10.5993
+       vertex -15 33.4488 10.3042
+    endloop
+  endfacet
+  facet normal 0.316191 -0.918529 -0.237333
+    outer loop
+       vertex -2.08995e-15 38.8768 9.4123
+       vertex -2.35351e-15 38.5701 10.5993
+       vertex -15 33.7489 9.27435
+    endloop
+  endfacet
+  facet normal 0.316194 -0.91854 -0.237289
+    outer loop
+       vertex -15 34.0172 8.23577
+       vertex -2.08995e-15 38.8768 9.4123
+       vertex -15 33.7489 9.27435
+    endloop
+  endfacet
+  facet normal 0.316194 -0.925365 -0.209094
+    outer loop
+       vertex -1.82443e-15 39.147 8.21651
+       vertex -2.08995e-15 38.8768 9.4123
+       vertex -15 34.0172 8.23577
+    endloop
+  endfacet
+  facet normal 0.316196 -0.92537 -0.209072
+    outer loop
+       vertex -15 34.2536 7.18944
+       vertex -1.82443e-15 39.147 8.21651
+       vertex -15 34.0172 8.23577
+    endloop
+  endfacet
+  facet normal 0.316196 -0.931342 -0.180618
+    outer loop
+       vertex -1.5572e-15 39.3804 7.01299
+       vertex -1.82443e-15 39.147 8.21651
+       vertex -15 34.2536 7.18944
+    endloop
+  endfacet
+  facet normal 0.316191 -0.931331 -0.180682
+    outer loop
+       vertex -15 34.4579 6.13637
+       vertex -1.5572e-15 39.3804 7.01299
+       vertex -15 34.2536 7.18944
+    endloop
+  endfacet
+  facet normal 0.316191 -0.936442 -0.151985
+    outer loop
+       vertex -1.2885e-15 39.5768 5.80289
+       vertex -1.5572e-15 39.3804 7.01299
+       vertex -15 34.4579 6.13637
+    endloop
+  endfacet
+  facet normal 0.316194 -0.936448 -0.15194
+    outer loop
+       vertex -15 34.6297 5.07753
+       vertex -1.2885e-15 39.5768 5.80289
+       vertex -15 34.4579 6.13637
+    endloop
+  endfacet
+  facet normal 0.316194 -0.940651 -0.123272
+    outer loop
+       vertex -1.01859e-15 39.7361 4.58734
+       vertex -1.2885e-15 39.5768 5.80289
+       vertex -15 34.6297 5.07753
+    endloop
+  endfacet
+  facet normal 0.316193 -0.94065 -0.123285
+    outer loop
+       vertex -15 34.7691 4.01392
+       vertex -1.01859e-15 39.7361 4.58734
+       vertex -15 34.6297 5.07753
+    endloop
+  endfacet
+  facet normal 0.316194 -0.943993 -0.0943339
+    outer loop
+       vertex -7.4773e-16 39.858 3.36747
+       vertex -1.01859e-15 39.7361 4.58734
+       vertex -15 34.7691 4.01392
+    endloop
+  endfacet
+  facet normal 0.316197 -0.943997 -0.0942792
+    outer loop
+       vertex -15 34.8757 2.94654
+       vertex -7.4773e-16 39.858 3.36747
+       vertex -15 34.7691 4.01392
+    endloop
+  endfacet
+  facet normal 0.316197 -0.946437 -0.06539
+    outer loop
+       vertex -4.76163e-16 39.9425 2.14445
+       vertex -7.4773e-16 39.858 3.36747
+       vertex -15 34.8757 2.94654
+    endloop
+  endfacet
+  facet normal 0.316194 -0.946435 -0.065443
+    outer loop
+       vertex -15 34.9497 1.87639
+       vertex -4.76163e-16 39.9425 2.14445
+       vertex -15 34.8757 2.94654
+    endloop
+  endfacet
+  facet normal 0.316194 -0.948 -0.036292
+    outer loop
+       vertex -2.0415e-16 39.9894 0.91941
+       vertex -4.76163e-16 39.9425 2.14445
+       vertex -15 34.9497 1.87639
+    endloop
+  endfacet
+  facet normal 0.31619 -0.947999 -0.0363486
+    outer loop
+       vertex -15 34.9908 0.804483
+       vertex -2.0415e-16 39.9894 0.91941
+       vertex -15 34.9497 1.87639
+    endloop
+  endfacet
+  facet normal 0.31619 -0.948668 -0.00727375
+    outer loop
+       vertex 6.80553e-17 39.9988 -0.306494
+       vertex -2.0415e-16 39.9894 0.91941
+       vertex -15 34.9908 0.804483
+    endloop
+  endfacet
+  facet normal 0.316191 -0.948668 -0.00725352
+    outer loop
+       vertex -15 34.999 -0.268182
+       vertex 6.80553e-17 39.9988 -0.306494
+       vertex -15 34.9908 0.804483
+    endloop
+  endfacet
+  facet normal 0.316191 -0.948445 0.0218212
+    outer loop
+       vertex 3.40197e-16 39.9706 -1.53211
+       vertex 6.80553e-17 39.9988 -0.306494
+       vertex -15 34.999 -0.268182
+    endloop
+  endfacet
+  facet normal 0.316193 -0.948443 0.0218448
+    outer loop
+       vertex -15 34.9743 -1.3406
+       vertex 3.40197e-16 39.9706 -1.53211
+       vertex -15 34.999 -0.268182
+    endloop
+  endfacet
+  facet normal 0.316193 -0.947332 0.0508424
+    outer loop
+       vertex 6.12018e-16 39.9049 -2.75629
+       vertex 3.40197e-16 39.9706 -1.53211
+       vertex -15 34.9743 -1.3406
+    endloop
+  endfacet
+  facet normal 0.316193 -0.947331 0.0508524
+    outer loop
+       vertex -15 34.9168 -2.41175
+       vertex 6.12018e-16 39.9049 -2.75629
+       vertex -15 34.9743 -1.3406
+    endloop
+  endfacet
+  facet normal 0.316193 -0.945327 0.0798612
+    outer loop
+       vertex 8.83265e-16 39.8017 -3.97787
+       vertex 6.12018e-16 39.9049 -2.75629
+       vertex -15 34.9168 -2.41175
+    endloop
+  endfacet
+  facet normal 0.316194 -0.945327 0.0798627
+    outer loop
+       vertex -15 34.8265 -3.48064
+       vertex 8.83265e-16 39.8017 -3.97787
+       vertex -15 34.9168 -2.41175
+    endloop
+  endfacet
+  facet normal 0.316194 -0.942435 0.108805
+    outer loop
+       vertex 1.15368e-15 39.6611 -5.19572
+       vertex 8.83265e-16 39.8017 -3.97787
+       vertex -15 34.8265 -3.48064
+    endloop
+  endfacet
+  facet normal 0.316192 -0.942438 0.108783
+    outer loop
+       vertex -15 34.7035 -4.54626
+       vertex 1.15368e-15 39.6611 -5.19572
+       vertex -15 34.8265 -3.48064
+    endloop
+  endfacet
+  facet normal 0.316192 -0.938665 0.137591
+    outer loop
+       vertex 1.42302e-15 39.4833 -6.40869
+       vertex 1.15368e-15 39.6611 -5.19572
+       vertex -15 34.7035 -4.54626
+    endloop
+  endfacet
+  facet normal 0.316194 -0.938661 0.137611
+    outer loop
+       vertex -15 34.5479 -5.60761
+       vertex 1.42302e-15 39.4833 -6.40869
+       vertex -15 34.7035 -4.54626
+    endloop
+  endfacet
+  facet normal 0.316193 -0.933992 0.166377
+    outer loop
+       vertex 1.69101e-15 39.2683 -7.61564
+       vertex 1.42302e-15 39.4833 -6.40869
+       vertex -15 34.5479 -5.60761
+    endloop
+  endfacet
+  facet normal 0.316192 -0.933996 0.166358
+    outer loop
+       vertex -15 34.3598 -6.66369
+       vertex 1.69101e-15 39.2683 -7.61564
+       vertex -15 34.5479 -5.60761
+    endloop
+  endfacet
+  facet normal 0.316192 -0.928468 0.194857
+    outer loop
+       vertex 1.95742e-15 39.0165 -8.81544
+       vertex 1.69101e-15 39.2683 -7.61564
+       vertex -15 34.3598 -6.66369
+    endloop
+  endfacet
+  facet normal 0.316196 -0.928454 0.194918
+    outer loop
+       vertex -15 34.1394 -7.71351
+       vertex 1.95742e-15 39.0165 -8.81544
+       vertex -15 34.3598 -6.66369
+    endloop
+  endfacet
+  facet normal 0.316196 -0.922053 0.223245
+    outer loop
+       vertex 2.22199e-15 38.728 -10.007
+       vertex 1.95742e-15 39.0165 -8.81544
+       vertex -15 34.1394 -7.71351
+    endloop
+  endfacet
+  facet normal 0.316195 -0.922059 0.223222
+    outer loop
+       vertex -15 33.887 -8.75609
+       vertex 2.22199e-15 38.728 -10.007
+       vertex -15 34.1394 -7.71351
+    endloop
+  endfacet
+  facet normal 0.316195 -0.914791 0.251354
+    outer loop
+       vertex 2.48447e-15 38.4032 -11.1891
+       vertex 2.22199e-15 38.728 -10.007
+       vertex -15 33.887 -8.75609
+    endloop
+  endfacet
+  facet normal 0.316195 -0.914791 0.251352
+    outer loop
+       vertex -15 33.6028 -9.79044
+       vertex 2.48447e-15 38.4032 -11.1891
+       vertex -15 33.887 -8.75609
+    endloop
+  endfacet
+  facet normal 0.316195 -0.906654 0.279284
+    outer loop
+       vertex 2.74462e-15 38.0423 -12.3607
+       vertex 2.48447e-15 38.4032 -11.1891
+       vertex -15 33.6028 -9.79044
+    endloop
+  endfacet
+  facet normal 0.316196 -0.906651 0.279293
+    outer loop
+       vertex -15 33.287 -10.8156
+       vertex 2.74462e-15 38.0423 -12.3607
+       vertex -15 33.6028 -9.79044
+    endloop
+  endfacet
+  facet normal 0.316196 -0.897653 0.306983
+    outer loop
+       vertex 3.00219e-15 37.6456 -13.5207
+       vertex 2.74462e-15 38.0423 -12.3607
+       vertex -15 33.287 -10.8156
+    endloop
+  endfacet
+  facet normal 0.316195 -0.897658 0.306972
+    outer loop
+       vertex -15 32.9399 -11.8306
+       vertex 3.00219e-15 37.6456 -13.5207
+       vertex -15 33.287 -10.8156
+    endloop
+  endfacet
+  facet normal 0.316195 -0.887841 0.334304
+    outer loop
+       vertex 3.25694e-15 37.2136 -14.668
+       vertex 3.00219e-15 37.6456 -13.5207
+       vertex -15 32.9399 -11.8306
+    endloop
+  endfacet
+  facet normal 0.316194 -0.887843 0.334299
+    outer loop
+       vertex -15 32.5619 -12.8345
+       vertex 3.25694e-15 37.2136 -14.668
+       vertex -15 32.9399 -11.8306
+    endloop
+  endfacet
+  facet normal 0.316194 -0.877165 0.36139
+    outer loop
+       vertex 3.50863e-15 36.7466 -15.8015
+       vertex 3.25694e-15 37.2136 -14.668
+       vertex -15 32.5619 -12.8345
+    endloop
+  endfacet
+  facet normal 0.316193 -0.877171 0.361376
+    outer loop
+       vertex -15 32.1533 -13.8263
+       vertex 3.50863e-15 36.7466 -15.8015
+       vertex -15 32.5619 -12.8345
+    endloop
+  endfacet
+  facet normal 0.316193 -0.865688 0.38808
+    outer loop
+       vertex 3.75703e-15 36.2451 -16.9202
+       vertex 3.50863e-15 36.7466 -15.8015
+       vertex -15 32.1533 -13.8263
+    endloop
+  endfacet
+  facet normal 0.316194 -0.865683 0.38809
+    outer loop
+       vertex -15 31.7145 -14.8051
+       vertex 3.75703e-15 36.2451 -16.9202
+       vertex -15 32.1533 -13.8263
+    endloop
+  endfacet
+  facet normal 0.316194 -0.853388 0.414427
+    outer loop
+       vertex 4.0019e-15 35.7096 -18.0229
+       vertex 3.75703e-15 36.2451 -16.9202
+       vertex -15 31.7145 -14.8051
+    endloop
+  endfacet
+  facet normal 0.316193 -0.853398 0.414408
+    outer loop
+       vertex -15 31.2459 -15.7701
+       vertex 4.0019e-15 35.7096 -18.0229
+       vertex -15 31.7145 -14.8051
+    endloop
+  endfacet
+  facet normal 0.316193 -0.84029 0.44038
+    outer loop
+       vertex 4.243e-15 35.1405 -19.1088
+       vertex 4.0019e-15 35.7096 -18.0229
+       vertex -15 31.2459 -15.7701
+    endloop
+  endfacet
+  facet normal 0.316197 -0.840264 0.440428
+    outer loop
+       vertex -15 30.7479 -16.7202
+       vertex 4.243e-15 35.1405 -19.1088
+       vertex -15 31.2459 -15.7701
+    endloop
+  endfacet
+  facet normal 0.316196 -0.826393 0.465935
+    outer loop
+       vertex 4.48013e-15 34.5384 -20.1767
+       vertex 4.243e-15 35.1405 -19.1088
+       vertex -15 30.7479 -16.7202
+    endloop
+  endfacet
+  facet normal 0.316195 -0.826405 0.465914
+    outer loop
+       vertex -15 30.2211 -17.6546
+       vertex 4.48013e-15 34.5384 -20.1767
+       vertex -15 30.7479 -16.7202
+    endloop
+  endfacet
+  facet normal 0.316195 -0.811732 0.491032
+    outer loop
+       vertex 4.71304e-15 33.9039 -21.2256
+       vertex 4.48013e-15 34.5384 -20.1767
+       vertex -15 30.2211 -17.6546
+    endloop
+  endfacet
+  facet normal 0.316195 -0.811729 0.491036
+    outer loop
+       vertex -15 29.6659 -18.5724
+       vertex 4.71304e-15 33.9039 -21.2256
+       vertex -15 30.2211 -17.6546
+    endloop
+  endfacet
+  facet normal 0.316195 -0.796314 0.515659
+    outer loop
+       vertex 4.94153e-15 33.2375 -22.2547
+       vertex 4.71304e-15 33.9039 -21.2256
+       vertex -15 29.6659 -18.5724
+    endloop
+  endfacet
+  facet normal 0.316197 -0.796298 0.515683
+    outer loop
+       vertex -15 29.0828 -19.4728
+       vertex 4.94153e-15 33.2375 -22.2547
+       vertex -15 29.6659 -18.5724
+    endloop
+  endfacet
+  facet normal 0.316197 -0.780124 0.539839
+    outer loop
+       vertex 5.16537e-15 32.5399 -23.2628
+       vertex 4.94153e-15 33.2375 -22.2547
+       vertex -15 29.0828 -19.4728
+    endloop
+  endfacet
+  facet normal 0.316197 -0.780127 0.539835
+    outer loop
+       vertex -15 28.4724 -20.3549
+       vertex 5.16537e-15 32.5399 -23.2628
+       vertex -15 29.0828 -19.4728
+    endloop
+  endfacet
+  facet normal 0.316197 -0.763187 0.56353
+    outer loop
+       vertex 5.38436e-15 31.8117 -24.249
+       vertex 5.16537e-15 32.5399 -23.2628
+       vertex -15 28.4724 -20.3549
+    endloop
+  endfacet
+  facet normal 0.316195 -0.763199 0.563513
+    outer loop
+       vertex -15 27.8352 -21.2179
+       vertex 5.38436e-15 31.8117 -24.249
+       vertex -15 28.4724 -20.3549
+    endloop
+  endfacet
+  facet normal 0.316195 -0.745612 0.586586
+    outer loop
+       vertex 5.5983e-15 31.0537 -25.2125
+       vertex 5.38436e-15 31.8117 -24.249
+       vertex -15 27.8352 -21.2179
+    endloop
+  endfacet
+  facet normal 0.316195 -0.745614 0.586584
+    outer loop
+       vertex -15 27.172 -22.0609
+       vertex 5.5983e-15 31.0537 -25.2125
+       vertex -15 27.8352 -21.2179
+    endloop
+  endfacet
+  facet normal 0.316195 -0.727232 0.609225
+    outer loop
+       vertex 5.80697e-15 30.2664 -26.1523
+       vertex 5.5983e-15 31.0537 -25.2125
+       vertex -15 27.172 -22.0609
+    endloop
+  endfacet
+  facet normal 0.316193 -0.727255 0.609199
+    outer loop
+       vertex -15 26.4831 -22.8833
+       vertex 5.80697e-15 30.2664 -26.1523
+       vertex -15 27.172 -22.0609
+    endloop
+  endfacet
+  facet normal 0.316193 -0.70826 0.631181
+    outer loop
+       vertex 6.0102e-15 29.4508 -27.0675
+       vertex 5.80697e-15 30.2664 -26.1523
+       vertex -15 26.4831 -22.8833
+    endloop
+  endfacet
+  facet normal 0.316195 -0.708236 0.631207
+    outer loop
+       vertex -15 25.7694 -23.6841
+       vertex 6.0102e-15 29.4508 -27.0675
+       vertex -15 26.4831 -22.8833
+    endloop
+  endfacet
+  facet normal 0.316195 -0.688579 0.652594
+    outer loop
+       vertex 6.20777e-15 28.6075 -27.9573
+       vertex 6.0102e-15 29.4508 -27.0675
+       vertex -15 25.7694 -23.6841
+    endloop
+  endfacet
+  facet normal 0.316194 -0.688584 0.652589
+    outer loop
+       vertex -15 25.0315 -24.4627
+       vertex 6.20777e-15 28.6075 -27.9573
+       vertex -15 25.7694 -23.6841
+    endloop
+  endfacet
+  facet normal 0.316194 -0.66827 0.673377
+    outer loop
+       vertex 6.39952e-15 27.7373 -28.8209
+       vertex 6.20777e-15 28.6075 -27.9573
+       vertex -15 25.0315 -24.4627
+    endloop
+  endfacet
+  facet normal 0.316196 -0.668258 0.673388
+    outer loop
+       vertex -15 24.2701 -25.2183
+       vertex 6.39952e-15 27.7373 -28.8209
+       vertex -15 25.0315 -24.4627
+    endloop
+  endfacet
+  facet normal 0.316195 -0.64729 0.693568
+    outer loop
+       vertex 6.58525e-15 26.8411 -29.6573
+       vertex 6.39952e-15 27.7373 -28.8209
+       vertex -15 24.2701 -25.2183
+    endloop
+  endfacet
+  facet normal 0.316194 -0.647302 0.693557
+    outer loop
+       vertex -15 23.4859 -25.9502
+       vertex 6.58525e-15 26.8411 -29.6573
+       vertex -15 24.2701 -25.2183
+    endloop
+  endfacet
+  facet normal 0.316194 -0.625721 0.713088
+    outer loop
+       vertex 6.7648e-15 25.9196 -30.4659
+       vertex 6.58525e-15 26.8411 -29.6573
+       vertex -15 23.4859 -25.9502
+    endloop
+  endfacet
+  facet normal 0.31619 -0.62576 0.713056
+    outer loop
+       vertex -15 22.6797 -26.6577
+       vertex 6.7648e-15 25.9196 -30.4659
+       vertex -15 23.4859 -25.9502
+    endloop
+  endfacet
+  facet normal 0.316191 -0.603602 0.731907
+    outer loop
+       vertex 6.93799e-15 24.9738 -31.2459
+       vertex 6.7648e-15 25.9196 -30.4659
+       vertex -15 22.6797 -26.6577
+    endloop
+  endfacet
+  facet normal 0.316192 -0.603592 0.731915
+    outer loop
+       vertex -15 21.8521 -27.3402
+       vertex 6.93799e-15 24.9738 -31.2459
+       vertex -15 22.6797 -26.6577
+    endloop
+  endfacet
+  facet normal 0.316192 -0.580936 0.750024
+    outer loop
+       vertex 7.10467e-15 24.0046 -31.9966
+       vertex 6.93799e-15 24.9738 -31.2459
+       vertex -15 21.8521 -27.3402
+    endloop
+  endfacet
+  facet normal 0.316197 -0.580878 0.750067
+    outer loop
+       vertex -15 21.004 -27.997
+       vertex 7.10467e-15 24.0046 -31.9966
+       vertex -15 21.8521 -27.3402
+    endloop
+  endfacet
+  facet normal 0.316196 -0.5576 0.76753
+    outer loop
+       vertex 7.26467e-15 23.0127 -32.7172
+       vertex 7.10467e-15 24.0046 -31.9966
+       vertex -15 21.004 -27.997
+    endloop
+  endfacet
+  facet normal 0.316194 -0.557633 0.767507
+    outer loop
+       vertex -15 20.1362 -28.6275
+       vertex 7.26467e-15 23.0127 -32.7172
+       vertex -15 21.004 -27.997
+    endloop
+  endfacet
+  facet normal 0.316194 -0.533825 0.784253
+    outer loop
+       vertex 7.41785e-15 21.9993 -33.407
+       vertex 7.26467e-15 23.0127 -32.7172
+       vertex -15 20.1362 -28.6275
+    endloop
+  endfacet
+  facet normal 0.31619 -0.533869 0.784224
+    outer loop
+       vertex -15 19.2494 -29.2312
+       vertex 7.41785e-15 21.9993 -33.407
+       vertex -15 20.1362 -28.6275
+    endloop
+  endfacet
+  facet normal 0.31619 -0.50957 0.800226
+    outer loop
+       vertex 7.56406e-15 20.9652 -34.0655
+       vertex 7.41785e-15 21.9993 -33.407
+       vertex -15 19.2494 -29.2312
+    endloop
+  endfacet
+  facet normal 0.316193 -0.509533 0.800249
+    outer loop
+       vertex -15 18.3446 -29.8073
+       vertex 7.56406e-15 20.9652 -34.0655
+       vertex -15 19.2494 -29.2312
+    endloop
+  endfacet
+  facet normal 0.316193 -0.484843 0.815444
+    outer loop
+       vertex 7.70317e-15 19.9115 -34.692
+       vertex 7.56406e-15 20.9652 -34.0655
+       vertex -15 18.3446 -29.8073
+    endloop
+  endfacet
+  facet normal 0.316196 -0.484804 0.815466
+    outer loop
+       vertex -15 17.4225 -30.3555
+       vertex 7.70317e-15 19.9115 -34.692
+       vertex -15 18.3446 -29.8073
+    endloop
+  endfacet
+  facet normal 0.316196 -0.459582 0.829942
+    outer loop
+       vertex 7.83504e-15 18.839 -35.2859
+       vertex 7.70317e-15 19.9115 -34.692
+       vertex -15 17.4225 -30.3555
+    endloop
+  endfacet
+  facet normal 0.316199 -0.459554 0.829957
+    outer loop
+       vertex -15 16.4841 -30.8751
+       vertex 7.83504e-15 18.839 -35.2859
+       vertex -15 17.4225 -30.3555
+    endloop
+  endfacet
+  facet normal 0.316198 -0.433898 0.843653
+    outer loop
+       vertex 7.95955e-15 17.7488 -35.8466
+       vertex 7.83504e-15 18.839 -35.2859
+       vertex -15 16.4841 -30.8751
+    endloop
+  endfacet
+  facet normal 0.316193 -0.433971 0.843618
+    outer loop
+       vertex -15 15.5302 -31.3658
+       vertex 7.95955e-15 17.7488 -35.8466
+       vertex -15 16.4841 -30.8751
+    endloop
+  endfacet
+  facet normal 0.316193 -0.407878 0.856538
+    outer loop
+       vertex 8.07658e-15 16.6419 -36.3737
+       vertex 7.95955e-15 17.7488 -35.8466
+       vertex -15 15.5302 -31.3658
+    endloop
+  endfacet
+  facet normal 0.316193 -0.407882 0.856536
+    outer loop
+       vertex -15 14.5617 -31.827
+       vertex 8.07658e-15 16.6419 -36.3737
+       vertex -15 15.5302 -31.3658
+    endloop
+  endfacet
+  facet normal 0.316193 -0.381457 0.868627
+    outer loop
+       vertex 8.18603e-15 15.5195 -36.8666
+       vertex 8.07658e-15 16.6419 -36.3737
+       vertex -15 14.5617 -31.827
+    endloop
+  endfacet
+  facet normal 0.316195 -0.381434 0.868637
+    outer loop
+       vertex -15 13.5795 -32.2583
+       vertex 8.18603e-15 15.5195 -36.8666
+       vertex -15 14.5617 -31.827
+    endloop
+  endfacet
+  facet normal 0.316194 -0.354644 0.879914
+    outer loop
+       vertex 8.28779e-15 14.3824 -37.3249
+       vertex 8.18603e-15 15.5195 -36.8666
+       vertex -15 13.5795 -32.2583
+    endloop
+  endfacet
+  facet normal 0.316194 -0.354654 0.87991
+    outer loop
+       vertex -15 12.5846 -32.6593
+       vertex 8.28779e-15 14.3824 -37.3249
+       vertex -15 13.5795 -32.2583
+    endloop
+  endfacet
+  facet normal 0.316194 -0.327487 0.890378
+    outer loop
+       vertex 8.38176e-15 13.2318 -37.7481
+       vertex 8.28779e-15 14.3824 -37.3249
+       vertex -15 12.5846 -32.6593
+    endloop
+  endfacet
+  facet normal 0.316194 -0.327478 0.890382
+    outer loop
+       vertex -15 11.5778 -33.0296
+       vertex 8.38176e-15 13.2318 -37.7481
+       vertex -15 12.5846 -32.6593
+    endloop
+  endfacet
+  facet normal 0.316194 -0.300095 0.89998
+    outer loop
+       vertex 8.46786e-15 12.0688 -38.1359
+       vertex 8.38176e-15 13.2318 -37.7481
+       vertex -15 11.5778 -33.0296
+    endloop
+  endfacet
+  facet normal 0.316195 -0.300085 0.899983
+    outer loop
+       vertex -15 10.5602 -33.3689
+       vertex 8.46786e-15 12.0688 -38.1359
+       vertex -15 11.5778 -33.0296
+    endloop
+  endfacet
+  facet normal 0.316195 -0.27233 0.908767
+    outer loop
+       vertex 8.54601e-15 10.8945 -38.4878
+       vertex 8.46786e-15 12.0688 -38.1359
+       vertex -15 10.5602 -33.3689
+    endloop
+  endfacet
+  facet normal 0.316196 -0.272316 0.908771
+    outer loop
+       vertex -15 9.53268 -33.6768
+       vertex 8.54601e-15 10.8945 -38.4878
+       vertex -15 10.5602 -33.3689
+    endloop
+  endfacet
+  facet normal 0.316196 -0.244379 0.916678
+    outer loop
+       vertex 8.61612e-15 9.70992 -38.8036
+       vertex 8.54601e-15 10.8945 -38.4878
+       vertex -15 9.53268 -33.6768
+    endloop
+  endfacet
+  facet normal 0.316197 -0.244359 0.916683
+    outer loop
+       vertex -15 8.49618 -33.9531
+       vertex 8.61612e-15 9.70992 -38.8036
+       vertex -15 9.53268 -33.6768
+    endloop
+  endfacet
+  facet normal 0.316197 -0.216137 0.923745
+    outer loop
+       vertex 8.67815e-15 8.51622 -39.0829
+       vertex 8.61612e-15 9.70992 -38.8036
+       vertex -15 8.49618 -33.9531
+    endloop
+  endfacet
+  facet normal 0.316196 -0.216148 0.923742
+    outer loop
+       vertex -15 7.4517 -34.1975
+       vertex 8.67815e-15 8.51622 -39.0829
+       vertex -15 8.49618 -33.9531
+    endloop
+  endfacet
+  facet normal 0.316196 -0.187737 0.929933
+    outer loop
+       vertex 8.73202e-15 7.31453 -39.3255
+       vertex 8.67815e-15 8.51622 -39.0829
+       vertex -15 7.4517 -34.1975
+    endloop
+  endfacet
+  facet normal 0.316195 -0.187761 0.929928
+    outer loop
+       vertex -15 6.40022 -34.4098
+       vertex 8.73202e-15 7.31453 -39.3255
+       vertex -15 7.4517 -34.1975
+    endloop
+  endfacet
+  facet normal 0.316195 -0.159181 0.935245
+    outer loop
+       vertex 8.77769e-15 6.10597 -39.5312
+       vertex 8.73202e-15 7.31453 -39.3255
+       vertex -15 6.40022 -34.4098
+    endloop
+  endfacet
+  facet normal 0.316194 -0.159191 0.935243
+    outer loop
+       vertex -15 5.34272 -34.5898
+       vertex 8.77769e-15 6.10597 -39.5312
+       vertex -15 6.40022 -34.4098
+    endloop
+  endfacet
+  facet normal 0.316194 -0.130469 0.93968
+    outer loop
+       vertex 8.81512e-15 4.89167 -39.6998
+       vertex 8.77769e-15 6.10597 -39.5312
+       vertex -15 5.34272 -34.5898
+    endloop
+  endfacet
+  facet normal 0.316196 -0.130449 0.939683
+    outer loop
+       vertex -15 4.28022 -34.7373
+       vertex 8.81512e-15 4.89167 -39.6998
+       vertex -15 5.34272 -34.5898
+    endloop
+  endfacet
+  facet normal 0.316196 -0.101532 0.943245
+    outer loop
+       vertex 8.84426e-15 3.67278 -39.831
+       vertex 8.81512e-15 4.89167 -39.6998
+       vertex -15 4.28022 -34.7373
+    endloop
+  endfacet
+  facet normal 0.316196 -0.101528 0.943246
+    outer loop
+       vertex -15 3.21368 -34.8521
+       vertex 8.84426e-15 3.67278 -39.831
+       vertex -15 4.28022 -34.7373
+    endloop
+  endfacet
+  facet normal 0.316196 -0.0726635 0.945907
+    outer loop
+       vertex 8.8651e-15 2.45044 -39.9249
+       vertex 8.84426e-15 3.67278 -39.831
+       vertex -15 3.21368 -34.8521
+    endloop
+  endfacet
+  facet normal 0.316194 -0.0726965 0.945905
+    outer loop
+       vertex -15 2.14413 -34.9343
+       vertex 8.8651e-15 2.45044 -39.9249
+       vertex -15 3.21368 -34.8521
+    endloop
+  endfacet
+  facet normal 0.316194 -0.0435685 0.947694
+    outer loop
+       vertex 8.87761e-15 1.22579 -39.9812
+       vertex 8.8651e-15 2.45044 -39.9249
+       vertex -15 2.14413 -34.9343
+    endloop
+  endfacet
+  facet normal 0.316191 -0.0436022 0.947693
+    outer loop
+       vertex -15 1.07257 -34.9836
+       vertex 8.87761e-15 1.22579 -39.9812
+       vertex -15 2.14413 -34.9343
+    endloop
+  endfacet
+  facet normal 0.316191 -0.0145476 0.948584
+    outer loop
+       vertex 8.88178e-15 0 -40
+       vertex 8.87761e-15 1.22579 -39.9812
+       vertex -15 1.07257 -34.9836
+    endloop
+  endfacet
+  facet normal 0.316195 -0.0145037 0.948584
+    outer loop
+       vertex -15 0 -35
+       vertex 8.88178e-15 0 -40
+       vertex -15 1.07257 -34.9836
+    endloop
+  endfacet
+  facet normal 0.316194 0.0145476 0.948583
+    outer loop
+       vertex 8.87761e-15 -1.22579 -39.9812
+       vertex 8.88178e-15 0 -40
+       vertex -15 0 -35
+    endloop
+  endfacet
+  facet normal 0.316191 0.0145037 0.948585
+    outer loop
+       vertex 8.87761e-15 -1.22579 -39.9812
+       vertex -15 0 -35
+       vertex -15 -1.07257 -34.9836
+    endloop
+  endfacet
+  facet normal 0.316192 0.0435686 0.947694
+    outer loop
+       vertex 8.8651e-15 -2.45044 -39.9249
+       vertex 8.87761e-15 -1.22579 -39.9812
+       vertex -15 -1.07257 -34.9836
+    endloop
+  endfacet
+  facet normal 0.316194 0.0436021 0.947692
+    outer loop
+       vertex 8.8651e-15 -2.45044 -39.9249
+       vertex -15 -1.07257 -34.9836
+       vertex -15 -2.14413 -34.9343
+    endloop
+  endfacet
+  facet normal 0.316194 0.0726636 0.945908
+    outer loop
+       vertex 8.84426e-15 -3.67278 -39.831
+       vertex 8.8651e-15 -2.45044 -39.9249
+       vertex -15 -2.14413 -34.9343
+    endloop
+  endfacet
+  facet normal 0.316196 0.0726965 0.945905
+    outer loop
+       vertex 8.84426e-15 -3.67278 -39.831
+       vertex -15 -2.14413 -34.9343
+       vertex -15 -3.21368 -34.8521
+    endloop
+  endfacet
+  facet normal 0.316196 0.101532 0.943245
+    outer loop
+       vertex 8.81512e-15 -4.89167 -39.6998
+       vertex 8.84426e-15 -3.67278 -39.831
+       vertex -15 -3.21368 -34.8521
+    endloop
+  endfacet
+  facet normal 0.316196 0.101528 0.943246
+    outer loop
+       vertex 8.81512e-15 -4.89167 -39.6998
+       vertex -15 -3.21368 -34.8521
+       vertex -15 -4.28022 -34.7373
+    endloop
+  endfacet
+  facet normal 0.316196 0.130469 0.93968
+    outer loop
+       vertex 8.77769e-15 -6.10597 -39.5312
+       vertex 8.81512e-15 -4.89167 -39.6998
+       vertex -15 -4.28022 -34.7373
+    endloop
+  endfacet
+  facet normal 0.316194 0.130449 0.939683
+    outer loop
+       vertex 8.77769e-15 -6.10597 -39.5312
+       vertex -15 -4.28022 -34.7373
+       vertex -15 -5.34272 -34.5898
+    endloop
+  endfacet
+  facet normal 0.316194 0.159181 0.935245
+    outer loop
+       vertex 8.73202e-15 -7.31453 -39.3255
+       vertex 8.77769e-15 -6.10597 -39.5312
+       vertex -15 -5.34272 -34.5898
+    endloop
+  endfacet
+  facet normal 0.316195 0.159191 0.935243
+    outer loop
+       vertex 8.73202e-15 -7.31453 -39.3255
+       vertex -15 -5.34272 -34.5898
+       vertex -15 -6.40022 -34.4098
+    endloop
+  endfacet
+  facet normal 0.316195 0.187737 0.929933
+    outer loop
+       vertex 8.67815e-15 -8.51622 -39.0829
+       vertex 8.73202e-15 -7.31453 -39.3255
+       vertex -15 -6.40022 -34.4098
+    endloop
+  endfacet
+  facet normal 0.316196 0.187761 0.929928
+    outer loop
+       vertex 8.67815e-15 -8.51622 -39.0829
+       vertex -15 -6.40022 -34.4098
+       vertex -15 -7.4517 -34.1975
+    endloop
+  endfacet
+  facet normal 0.316197 0.216137 0.923745
+    outer loop
+       vertex 8.61612e-15 -9.70992 -38.8036
+       vertex 8.67815e-15 -8.51622 -39.0829
+       vertex -15 -7.4517 -34.1975
+    endloop
+  endfacet
+  facet normal 0.316197 0.216148 0.923742
+    outer loop
+       vertex 8.61612e-15 -9.70992 -38.8036
+       vertex -15 -7.4517 -34.1975
+       vertex -15 -8.49618 -33.9531
+    endloop
+  endfacet
+  facet normal 0.316197 0.244379 0.916678
+    outer loop
+       vertex 8.54601e-15 -10.8945 -38.4878
+       vertex 8.61612e-15 -9.70992 -38.8036
+       vertex -15 -8.49618 -33.9531
+    endloop
+  endfacet
+  facet normal 0.316196 0.244359 0.916684
+    outer loop
+       vertex 8.54601e-15 -10.8945 -38.4878
+       vertex -15 -8.49618 -33.9531
+       vertex -15 -9.53268 -33.6768
+    endloop
+  endfacet
+  facet normal 0.316196 0.27233 0.908767
+    outer loop
+       vertex 8.46786e-15 -12.0688 -38.1359
+       vertex 8.54601e-15 -10.8945 -38.4878
+       vertex -15 -9.53268 -33.6768
+    endloop
+  endfacet
+  facet normal 0.316195 0.272316 0.908771
+    outer loop
+       vertex 8.46786e-15 -12.0688 -38.1359
+       vertex -15 -9.53268 -33.6768
+       vertex -15 -10.5602 -33.3689
+    endloop
+  endfacet
+  facet normal 0.316195 0.300095 0.89998
+    outer loop
+       vertex 8.38176e-15 -13.2318 -37.7481
+       vertex 8.46786e-15 -12.0688 -38.1359
+       vertex -15 -10.5602 -33.3689
+    endloop
+  endfacet
+  facet normal 0.316194 0.300085 0.899984
+    outer loop
+       vertex 8.38176e-15 -13.2318 -37.7481
+       vertex -15 -10.5602 -33.3689
+       vertex -15 -11.5778 -33.0296
+    endloop
+  endfacet
+  facet normal 0.316194 0.327487 0.890378
+    outer loop
+       vertex 8.28779e-15 -14.3824 -37.3249
+       vertex 8.38176e-15 -13.2318 -37.7481
+       vertex -15 -11.5778 -33.0296
+    endloop
+  endfacet
+  facet normal 0.316194 0.327478 0.890382
+    outer loop
+       vertex 8.28779e-15 -14.3824 -37.3249
+       vertex -15 -11.5778 -33.0296
+       vertex -15 -12.5846 -32.6593
+    endloop
+  endfacet
+  facet normal 0.316194 0.354644 0.879914
+    outer loop
+       vertex 8.18603e-15 -15.5195 -36.8666
+       vertex 8.28779e-15 -14.3824 -37.3249
+       vertex -15 -12.5846 -32.6593
+    endloop
+  endfacet
+  facet normal 0.316194 0.354654 0.87991
+    outer loop
+       vertex 8.18603e-15 -15.5195 -36.8666
+       vertex -15 -12.5846 -32.6593
+       vertex -15 -13.5795 -32.2583
+    endloop
+  endfacet
+  facet normal 0.316194 0.381457 0.868626
+    outer loop
+       vertex 8.07658e-15 -16.6419 -36.3737
+       vertex 8.18603e-15 -15.5195 -36.8666
+       vertex -15 -13.5795 -32.2583
+    endloop
+  endfacet
+  facet normal 0.316193 0.381434 0.868637
+    outer loop
+       vertex 8.07658e-15 -16.6419 -36.3737
+       vertex -15 -13.5795 -32.2583
+       vertex -15 -14.5617 -31.827
+    endloop
+  endfacet
+  facet normal 0.316193 0.407878 0.856538
+    outer loop
+       vertex 7.95955e-15 -17.7488 -35.8466
+       vertex 8.07658e-15 -16.6419 -36.3737
+       vertex -15 -14.5617 -31.827
+    endloop
+  endfacet
+  facet normal 0.316193 0.407882 0.856536
+    outer loop
+       vertex 7.95955e-15 -17.7488 -35.8466
+       vertex -15 -14.5617 -31.827
+       vertex -15 -15.5302 -31.3658
+    endloop
+  endfacet
+  facet normal 0.316193 0.433899 0.843655
+    outer loop
+       vertex 7.83504e-15 -18.839 -35.2859
+       vertex 7.95955e-15 -17.7488 -35.8466
+       vertex -15 -15.5302 -31.3658
+    endloop
+  endfacet
+  facet normal 0.316199 0.43397 0.843616
+    outer loop
+       vertex 7.83504e-15 -18.839 -35.2859
+       vertex -15 -15.5302 -31.3658
+       vertex -15 -16.4841 -30.8751
+    endloop
+  endfacet
+  facet normal 0.316198 0.459582 0.829942
+    outer loop
+       vertex 7.70317e-15 -19.9115 -34.692
+       vertex 7.83504e-15 -18.839 -35.2859
+       vertex -15 -16.4841 -30.8751
+    endloop
+  endfacet
+  facet normal 0.316196 0.459554 0.829958
+    outer loop
+       vertex 7.70317e-15 -19.9115 -34.692
+       vertex -15 -16.4841 -30.8751
+       vertex -15 -17.4225 -30.3555
+    endloop
+  endfacet
+  facet normal 0.316196 0.484842 0.815444
+    outer loop
+       vertex 7.56406e-15 -20.9652 -34.0655
+       vertex 7.70317e-15 -19.9115 -34.692
+       vertex -15 -17.4225 -30.3555
+    endloop
+  endfacet
+  facet normal 0.316193 0.484804 0.815467
+    outer loop
+       vertex 7.56406e-15 -20.9652 -34.0655
+       vertex -15 -17.4225 -30.3555
+       vertex -15 -18.3446 -29.8073
+    endloop
+  endfacet
+  facet normal 0.316193 0.50957 0.800225
+    outer loop
+       vertex 7.41785e-15 -21.9993 -33.407
+       vertex 7.56406e-15 -20.9652 -34.0655
+       vertex -15 -18.3446 -29.8073
+    endloop
+  endfacet
+  facet normal 0.31619 0.509533 0.80025
+    outer loop
+       vertex 7.41785e-15 -21.9993 -33.407
+       vertex -15 -18.3446 -29.8073
+       vertex -15 -19.2494 -29.2312
+    endloop
+  endfacet
+  facet normal 0.31619 0.533826 0.784254
+    outer loop
+       vertex 7.26467e-15 -23.0127 -32.7172
+       vertex 7.41785e-15 -21.9993 -33.407
+       vertex -15 -19.2494 -29.2312
+    endloop
+  endfacet
+  facet normal 0.316194 0.533868 0.784223
+    outer loop
+       vertex 7.26467e-15 -23.0127 -32.7172
+       vertex -15 -19.2494 -29.2312
+       vertex -15 -20.1362 -28.6275
+    endloop
+  endfacet
+  facet normal 0.316194 0.5576 0.767531
+    outer loop
+       vertex 7.10467e-15 -24.0046 -31.9966
+       vertex 7.26467e-15 -23.0127 -32.7172
+       vertex -15 -20.1362 -28.6275
+    endloop
+  endfacet
+  facet normal 0.316197 0.557632 0.767506
+    outer loop
+       vertex 7.10467e-15 -24.0046 -31.9966
+       vertex -15 -20.1362 -28.6275
+       vertex -15 -21.004 -27.997
+    endloop
+  endfacet
+  facet normal 0.316196 0.580935 0.750023
+    outer loop
+       vertex 6.93799e-15 -24.9738 -31.2459
+       vertex 7.10467e-15 -24.0046 -31.9966
+       vertex -15 -21.004 -27.997
+    endloop
+  endfacet
+  facet normal 0.316191 0.580879 0.750068
+    outer loop
+       vertex 6.93799e-15 -24.9738 -31.2459
+       vertex -15 -21.004 -27.997
+       vertex -15 -21.8521 -27.3402
+    endloop
+  endfacet
+  facet normal 0.316191 0.603602 0.731907
+    outer loop
+       vertex 6.7648e-15 -25.9196 -30.4659
+       vertex 6.93799e-15 -24.9738 -31.2459
+       vertex -15 -21.8521 -27.3402
+    endloop
+  endfacet
+  facet normal 0.316191 0.603592 0.731916
+    outer loop
+       vertex 6.7648e-15 -25.9196 -30.4659
+       vertex -15 -21.8521 -27.3402
+       vertex -15 -22.6797 -26.6577
+    endloop
+  endfacet
+  facet normal 0.316191 0.625722 0.713089
+    outer loop
+       vertex 6.58525e-15 -26.8411 -29.6573
+       vertex 6.7648e-15 -25.9196 -30.4659
+       vertex -15 -22.6797 -26.6577
+    endloop
+  endfacet
+  facet normal 0.316194 0.625759 0.713055
+    outer loop
+       vertex 6.58525e-15 -26.8411 -29.6573
+       vertex -15 -22.6797 -26.6577
+       vertex -15 -23.4859 -25.9502
+    endloop
+  endfacet
+  facet normal 0.316194 0.64729 0.693568
+    outer loop
+       vertex 6.39952e-15 -27.7373 -28.8209
+       vertex 6.58525e-15 -26.8411 -29.6573
+       vertex -15 -23.4859 -25.9502
+    endloop
+  endfacet
+  facet normal 0.316196 0.647302 0.693556
+    outer loop
+       vertex 6.39952e-15 -27.7373 -28.8209
+       vertex -15 -23.4859 -25.9502
+       vertex -15 -24.2701 -25.2183
+    endloop
+  endfacet
+  facet normal 0.316195 0.66827 0.673377
+    outer loop
+       vertex 6.20777e-15 -28.6075 -27.9573
+       vertex 6.39952e-15 -27.7373 -28.8209
+       vertex -15 -24.2701 -25.2183
+    endloop
+  endfacet
+  facet normal 0.316194 0.668258 0.673388
+    outer loop
+       vertex 6.20777e-15 -28.6075 -27.9573
+       vertex -15 -24.2701 -25.2183
+       vertex -15 -25.0315 -24.4627
+    endloop
+  endfacet
+  facet normal 0.316194 0.68858 0.652594
+    outer loop
+       vertex 6.0102e-15 -29.4508 -27.0675
+       vertex 6.20777e-15 -28.6075 -27.9573
+       vertex -15 -25.0315 -24.4627
+    endloop
+  endfacet
+  facet normal 0.316195 0.688584 0.652589
+    outer loop
+       vertex 6.0102e-15 -29.4508 -27.0675
+       vertex -15 -25.0315 -24.4627
+       vertex -15 -25.7694 -23.6841
+    endloop
+  endfacet
+  facet normal 0.316195 0.70826 0.631181
+    outer loop
+       vertex 5.80697e-15 -30.2664 -26.1523
+       vertex 6.0102e-15 -29.4508 -27.0675
+       vertex -15 -25.7694 -23.6841
+    endloop
+  endfacet
+  facet normal 0.316193 0.708237 0.631207
+    outer loop
+       vertex 5.80697e-15 -30.2664 -26.1523
+       vertex -15 -25.7694 -23.6841
+       vertex -15 -26.4831 -22.8833
+    endloop
+  endfacet
+  facet normal 0.316193 0.727232 0.609225
+    outer loop
+       vertex 5.5983e-15 -31.0537 -25.2125
+       vertex 5.80697e-15 -30.2664 -26.1523
+       vertex -15 -26.4831 -22.8833
+    endloop
+  endfacet
+  facet normal 0.316195 0.727254 0.609198
+    outer loop
+       vertex 5.5983e-15 -31.0537 -25.2125
+       vertex -15 -26.4831 -22.8833
+       vertex -15 -27.172 -22.0609
+    endloop
+  endfacet
+  facet normal 0.316195 0.745612 0.586586
+    outer loop
+       vertex 5.38436e-15 -31.8117 -24.249
+       vertex 5.5983e-15 -31.0537 -25.2125
+       vertex -15 -27.172 -22.0609
+    endloop
+  endfacet
+  facet normal 0.316195 0.745614 0.586583
+    outer loop
+       vertex 5.38436e-15 -31.8117 -24.249
+       vertex -15 -27.172 -22.0609
+       vertex -15 -27.8352 -21.2179
+    endloop
+  endfacet
+  facet normal 0.316195 0.763187 0.56353
+    outer loop
+       vertex 5.16537e-15 -32.5399 -23.2628
+       vertex 5.38436e-15 -31.8117 -24.249
+       vertex -15 -27.8352 -21.2179
+    endloop
+  endfacet
+  facet normal 0.316197 0.763199 0.563513
+    outer loop
+       vertex 5.16537e-15 -32.5399 -23.2628
+       vertex -15 -27.8352 -21.2179
+       vertex -15 -28.4724 -20.3549
+    endloop
+  endfacet
+  facet normal 0.316197 0.780124 0.539839
+    outer loop
+       vertex 4.94153e-15 -33.2375 -22.2547
+       vertex 5.16537e-15 -32.5399 -23.2628
+       vertex -15 -28.4724 -20.3549
+    endloop
+  endfacet
+  facet normal 0.316197 0.780127 0.539835
+    outer loop
+       vertex 4.94153e-15 -33.2375 -22.2547
+       vertex -15 -28.4724 -20.3549
+       vertex -15 -29.0828 -19.4728
+    endloop
+  endfacet
+  facet normal 0.316197 0.796314 0.515658
+    outer loop
+       vertex 4.71304e-15 -33.9039 -21.2256
+       vertex 4.94153e-15 -33.2375 -22.2547
+       vertex -15 -29.0828 -19.4728
+    endloop
+  endfacet
+  facet normal 0.316195 0.796299 0.515683
+    outer loop
+       vertex 4.71304e-15 -33.9039 -21.2256
+       vertex -15 -29.0828 -19.4728
+       vertex -15 -29.6659 -18.5724
+    endloop
+  endfacet
+  facet normal 0.316195 0.811732 0.491032
+    outer loop
+       vertex 4.48013e-15 -34.5384 -20.1767
+       vertex 4.71304e-15 -33.9039 -21.2256
+       vertex -15 -29.6659 -18.5724
+    endloop
+  endfacet
+  facet normal 0.316195 0.811729 0.491036
+    outer loop
+       vertex 4.48013e-15 -34.5384 -20.1767
+       vertex -15 -29.6659 -18.5724
+       vertex -15 -30.2211 -17.6546
+    endloop
+  endfacet
+  facet normal 0.316195 0.826393 0.465935
+    outer loop
+       vertex 4.243e-15 -35.1405 -19.1088
+       vertex 4.48013e-15 -34.5384 -20.1767
+       vertex -15 -30.2211 -17.6546
+    endloop
+  endfacet
+  facet normal 0.316196 0.826404 0.465914
+    outer loop
+       vertex 4.243e-15 -35.1405 -19.1088
+       vertex -15 -30.2211 -17.6546
+       vertex -15 -30.7479 -16.7202
+    endloop
+  endfacet
+  facet normal 0.316196 0.840289 0.440379
+    outer loop
+       vertex 4.0019e-15 -35.7096 -18.0229
+       vertex 4.243e-15 -35.1405 -19.1088
+       vertex -15 -30.7479 -16.7202
+    endloop
+  endfacet
+  facet normal 0.316192 0.840265 0.440429
+    outer loop
+       vertex 4.0019e-15 -35.7096 -18.0229
+       vertex -15 -30.7479 -16.7202
+       vertex -15 -31.2459 -15.7701
+    endloop
+  endfacet
+  facet normal 0.316193 0.853388 0.414428
+    outer loop
+       vertex 3.75703e-15 -36.2451 -16.9202
+       vertex 4.0019e-15 -35.7096 -18.0229
+       vertex -15 -31.2459 -15.7701
+    endloop
+  endfacet
+  facet normal 0.316194 0.853398 0.414408
+    outer loop
+       vertex 3.75703e-15 -36.2451 -16.9202
+       vertex -15 -31.2459 -15.7701
+       vertex -15 -31.7145 -14.8051
+    endloop
+  endfacet
+  facet normal 0.316194 0.865688 0.38808
+    outer loop
+       vertex 3.50863e-15 -36.7466 -15.8015
+       vertex 3.75703e-15 -36.2451 -16.9202
+       vertex -15 -31.7145 -14.8051
+    endloop
+  endfacet
+  facet normal 0.316193 0.865684 0.38809
+    outer loop
+       vertex 3.50863e-15 -36.7466 -15.8015
+       vertex -15 -31.7145 -14.8051
+       vertex -15 -32.1533 -13.8263
+    endloop
+  endfacet
+  facet normal 0.316193 0.877165 0.36139
+    outer loop
+       vertex 3.25694e-15 -37.2136 -14.668
+       vertex 3.50863e-15 -36.7466 -15.8015
+       vertex -15 -32.1533 -13.8263
+    endloop
+  endfacet
+  facet normal 0.316194 0.877171 0.361375
+    outer loop
+       vertex 3.25694e-15 -37.2136 -14.668
+       vertex -15 -32.1533 -13.8263
+       vertex -15 -32.5619 -12.8345
+    endloop
+  endfacet
+  facet normal 0.316194 0.887841 0.334304
+    outer loop
+       vertex 3.00219e-15 -37.6456 -13.5207
+       vertex 3.25694e-15 -37.2136 -14.668
+       vertex -15 -32.5619 -12.8345
+    endloop
+  endfacet
+  facet normal 0.316195 0.887843 0.334299
+    outer loop
+       vertex 3.00219e-15 -37.6456 -13.5207
+       vertex -15 -32.5619 -12.8345
+       vertex -15 -32.9399 -11.8306
+    endloop
+  endfacet
+  facet normal 0.316195 0.897654 0.306983
+    outer loop
+       vertex 2.74462e-15 -38.0423 -12.3607
+       vertex 3.00219e-15 -37.6456 -13.5207
+       vertex -15 -32.9399 -11.8306
+    endloop
+  endfacet
+  facet normal 0.316196 0.897657 0.306972
+    outer loop
+       vertex 2.74462e-15 -38.0423 -12.3607
+       vertex -15 -32.9399 -11.8306
+       vertex -15 -33.287 -10.8156
+    endloop
+  endfacet
+  facet normal 0.316196 0.906654 0.279284
+    outer loop
+       vertex 2.48447e-15 -38.4032 -11.1891
+       vertex 2.74462e-15 -38.0423 -12.3607
+       vertex -15 -33.287 -10.8156
+    endloop
+  endfacet
+  facet normal 0.316195 0.906651 0.279293
+    outer loop
+       vertex 2.48447e-15 -38.4032 -11.1891
+       vertex -15 -33.287 -10.8156
+       vertex -15 -33.6028 -9.79044
+    endloop
+  endfacet
+  facet normal 0.316195 0.914791 0.251354
+    outer loop
+       vertex 2.22199e-15 -38.728 -10.007
+       vertex 2.48447e-15 -38.4032 -11.1891
+       vertex -15 -33.6028 -9.79044
+    endloop
+  endfacet
+  facet normal 0.316195 0.914791 0.251352
+    outer loop
+       vertex 2.22199e-15 -38.728 -10.007
+       vertex -15 -33.6028 -9.79044
+       vertex -15 -33.887 -8.75609
+    endloop
+  endfacet
+  facet normal 0.316195 0.922053 0.223246
+    outer loop
+       vertex 1.95742e-15 -39.0165 -8.81544
+       vertex 2.22199e-15 -38.728 -10.007
+       vertex -15 -33.887 -8.75609
+    endloop
+  endfacet
+  facet normal 0.316196 0.922058 0.223222
+    outer loop
+       vertex 1.95742e-15 -39.0165 -8.81544
+       vertex -15 -33.887 -8.75609
+       vertex -15 -34.1394 -7.71351
+    endloop
+  endfacet
+  facet normal 0.316196 0.928467 0.194856
+    outer loop
+       vertex 1.69101e-15 -39.2683 -7.61564
+       vertex 1.95742e-15 -39.0165 -8.81544
+       vertex -15 -34.1394 -7.71351
+    endloop
+  endfacet
+  facet normal 0.316192 0.928455 0.194919
+    outer loop
+       vertex 1.69101e-15 -39.2683 -7.61564
+       vertex -15 -34.1394 -7.71351
+       vertex -15 -34.3598 -6.66369
+    endloop
+  endfacet
+  facet normal 0.316192 0.933992 0.166377
+    outer loop
+       vertex 1.42302e-15 -39.4833 -6.40869
+       vertex 1.69101e-15 -39.2683 -7.61564
+       vertex -15 -34.3598 -6.66369
+    endloop
+  endfacet
+  facet normal 0.316194 0.933995 0.166358
+    outer loop
+       vertex 1.42302e-15 -39.4833 -6.40869
+       vertex -15 -34.3598 -6.66369
+       vertex -15 -34.5479 -5.60761
+    endloop
+  endfacet
+  facet normal 0.316194 0.938664 0.137591
+    outer loop
+       vertex 1.15368e-15 -39.6611 -5.19572
+       vertex 1.42302e-15 -39.4833 -6.40869
+       vertex -15 -34.5479 -5.60761
+    endloop
+  endfacet
+  facet normal 0.316192 0.938662 0.137611
+    outer loop
+       vertex 1.15368e-15 -39.6611 -5.19572
+       vertex -15 -34.5479 -5.60761
+       vertex -15 -34.7035 -4.54626
+    endloop
+  endfacet
+  facet normal 0.316192 0.942435 0.108805
+    outer loop
+       vertex 8.83265e-16 -39.8017 -3.97787
+       vertex 1.15368e-15 -39.6611 -5.19572
+       vertex -15 -34.7035 -4.54626
+    endloop
+  endfacet
+  facet normal 0.316194 0.942437 0.108783
+    outer loop
+       vertex 8.83265e-16 -39.8017 -3.97787
+       vertex -15 -34.7035 -4.54626
+       vertex -15 -34.8265 -3.48064
+    endloop
+  endfacet
+  facet normal 0.316194 0.945327 0.0798612
+    outer loop
+       vertex 6.12018e-16 -39.9049 -2.75629
+       vertex 8.83265e-16 -39.8017 -3.97787
+       vertex -15 -34.8265 -3.48064
+    endloop
+  endfacet
+  facet normal 0.316193 0.945327 0.0798628
+    outer loop
+       vertex 6.12018e-16 -39.9049 -2.75629
+       vertex -15 -34.8265 -3.48064
+       vertex -15 -34.9168 -2.41175
+    endloop
+  endfacet
+  facet normal 0.316193 0.947331 0.0508423
+    outer loop
+       vertex 3.40197e-16 -39.9706 -1.53211
+       vertex 6.12018e-16 -39.9049 -2.75629
+       vertex -15 -34.9168 -2.41175
+    endloop
+  endfacet
+  facet normal 0.316193 0.947331 0.0508524
+    outer loop
+       vertex 3.40197e-16 -39.9706 -1.53211
+       vertex -15 -34.9168 -2.41175
+       vertex -15 -34.9743 -1.3406
+    endloop
+  endfacet
+  facet normal 0.316193 0.948444 0.0218212
+    outer loop
+       vertex 6.80553e-17 -39.9988 -0.306494
+       vertex 3.40197e-16 -39.9706 -1.53211
+       vertex -15 -34.9743 -1.3406
+    endloop
+  endfacet
+  facet normal 0.316191 0.948444 0.0218448
+    outer loop
+       vertex 6.80553e-17 -39.9988 -0.306494
+       vertex -15 -34.9743 -1.3406
+       vertex -15 -34.999 -0.268182
+    endloop
+  endfacet
+  facet normal 0.316191 0.948668 -0.00727375
+    outer loop
+       vertex -2.0415e-16 -39.9894 0.91941
+       vertex 6.80553e-17 -39.9988 -0.306494
+       vertex -15 -34.999 -0.268182
+    endloop
+  endfacet
+  facet normal 0.31619 0.948668 -0.00725352
+    outer loop
+       vertex -2.0415e-16 -39.9894 0.91941
+       vertex -15 -34.999 -0.268182
+       vertex -15 -34.9908 0.804483
+    endloop
+  endfacet
+  facet normal 0.31619 0.948001 -0.0362921
+    outer loop
+       vertex -4.76163e-16 -39.9425 2.14445
+       vertex -2.0415e-16 -39.9894 0.91941
+       vertex -15 -34.9908 0.804483
+    endloop
+  endfacet
+  facet normal 0.316194 0.947998 -0.0363486
+    outer loop
+       vertex -4.76163e-16 -39.9425 2.14445
+       vertex -15 -34.9908 0.804483
+       vertex -15 -34.9497 1.87639
+    endloop
+  endfacet
+  facet normal 0.316194 0.946438 -0.0653901
+    outer loop
+       vertex -7.4773e-16 -39.858 3.36747
+       vertex -4.76163e-16 -39.9425 2.14445
+       vertex -15 -34.9497 1.87639
+    endloop
+  endfacet
+  facet normal 0.316197 0.946434 -0.0654429
+    outer loop
+       vertex -7.4773e-16 -39.858 3.36747
+       vertex -15 -34.9497 1.87639
+       vertex -15 -34.8757 2.94654
+    endloop
+  endfacet
+  facet normal 0.316197 0.943992 -0.0943338
+    outer loop
+       vertex -1.01859e-15 -39.7361 4.58734
+       vertex -7.4773e-16 -39.858 3.36747
+       vertex -15 -34.8757 2.94654
+    endloop
+  endfacet
+  facet normal 0.316193 0.943998 -0.0942793
+    outer loop
+       vertex -1.01859e-15 -39.7361 4.58734
+       vertex -15 -34.8757 2.94654
+       vertex -15 -34.7691 4.01392
+    endloop
+  endfacet
+  facet normal 0.316194 0.940652 -0.123272
+    outer loop
+       vertex -1.2885e-15 -39.5768 5.80289
+       vertex -1.01859e-15 -39.7361 4.58734
+       vertex -15 -34.7691 4.01392
+    endloop
+  endfacet
+  facet normal 0.316194 0.94065 -0.123285
+    outer loop
+       vertex -1.2885e-15 -39.5768 5.80289
+       vertex -15 -34.7691 4.01392
+       vertex -15 -34.6297 5.07753
+    endloop
+  endfacet
+  facet normal 0.316194 0.936441 -0.151985
+    outer loop
+       vertex -1.5572e-15 -39.3804 7.01299
+       vertex -1.2885e-15 -39.5768 5.80289
+       vertex -15 -34.6297 5.07753
+    endloop
+  endfacet
+  facet normal 0.316191 0.936449 -0.151941
+    outer loop
+       vertex -1.5572e-15 -39.3804 7.01299
+       vertex -15 -34.6297 5.07753
+       vertex -15 -34.4579 6.13637
+    endloop
+  endfacet
+  facet normal 0.316191 0.931343 -0.180618
+    outer loop
+       vertex -1.82443e-15 -39.147 8.21651
+       vertex -1.5572e-15 -39.3804 7.01299
+       vertex -15 -34.4579 6.13637
+    endloop
+  endfacet
+  facet normal 0.316196 0.931329 -0.180682
+    outer loop
+       vertex -1.82443e-15 -39.147 8.21651
+       vertex -15 -34.4579 6.13637
+       vertex -15 -34.2536 7.18944
+    endloop
+  endfacet
+  facet normal 0.316196 0.925365 -0.209094
+    outer loop
+       vertex -2.08995e-15 -38.8768 9.4123
+       vertex -1.82443e-15 -39.147 8.21651
+       vertex -15 -34.2536 7.18944
+    endloop
+  endfacet
+  facet normal 0.316194 0.92537 -0.209072
+    outer loop
+       vertex -2.08995e-15 -38.8768 9.4123
+       vertex -15 -34.2536 7.18944
+       vertex -15 -34.0172 8.23577
+    endloop
+  endfacet
+  facet normal 0.316194 0.918528 -0.237333
+    outer loop
+       vertex -2.35351e-15 -38.5701 10.5993
+       vertex -2.08995e-15 -38.8768 9.4123
+       vertex -15 -34.0172 8.23577
+    endloop
+  endfacet
+  facet normal 0.316191 0.918541 -0.237289
+    outer loop
+       vertex -2.35351e-15 -38.5701 10.5993
+       vertex -15 -34.0172 8.23577
+       vertex -15 -33.7489 9.27435
+    endloop
+  endfacet
+  facet normal 0.316191 0.910829 -0.265355
+    outer loop
+       vertex -2.61485e-15 -38.2272 11.7763
+       vertex -2.35351e-15 -38.5701 10.5993
+       vertex -15 -33.7489 9.27435
+    endloop
+  endfacet
+  facet normal 0.316196 0.910811 -0.265414
+    outer loop
+       vertex -2.61485e-15 -38.2272 11.7763
+       vertex -15 -33.7489 9.27435
+       vertex -15 -33.4488 10.3042
+    endloop
+  endfacet
+  facet normal 0.316196 0.902267 -0.293146
+    outer loop
+       vertex -2.87375e-15 -37.8484 12.9422
+       vertex -2.61485e-15 -38.2272 11.7763
+       vertex -15 -33.4488 10.3042
+    endloop
+  endfacet
+  facet normal 0.316198 0.902256 -0.293177
+    outer loop
+       vertex -2.87375e-15 -37.8484 12.9422
+       vertex -15 -33.4488 10.3042
+       vertex -15 -33.1173 11.3244
+    endloop
+  endfacet
+  facet normal 0.316198 0.892852 -0.320679
+    outer loop
+       vertex -3.12994e-15 -37.434 14.096
+       vertex -2.87375e-15 -37.8484 12.9422
+       vertex -15 -33.1173 11.3244
+    endloop
+  endfacet
+  facet normal 0.316197 0.892855 -0.32067
+    outer loop
+       vertex -3.12994e-15 -37.434 14.096
+       vertex -15 -33.1173 11.3244
+       vertex -15 -32.7547 12.334
+    endloop
+  endfacet
+  facet normal 0.316197 0.882591 -0.347926
+    outer loop
+       vertex -3.38319e-15 -36.9844 15.2365
+       vertex -3.12994e-15 -37.434 14.096
+       vertex -15 -32.7547 12.334
+    endloop
+  endfacet
+  facet normal 0.31619 0.88263 -0.347833
+    outer loop
+       vertex -3.38319e-15 -36.9844 15.2365
+       vertex -15 -32.7547 12.334
+       vertex -15 -32.3614 13.332
+    endloop
+  endfacet
+  facet normal 0.31619 0.871527 -0.374785
+    outer loop
+       vertex -3.63326e-15 -36.5001 16.3627
+       vertex -3.38319e-15 -36.9844 15.2365
+       vertex -15 -32.3614 13.332
+    endloop
+  endfacet
+  facet normal 0.316193 0.871511 -0.37482
+    outer loop
+       vertex -3.63326e-15 -36.5001 16.3627
+       vertex -15 -32.3614 13.332
+       vertex -15 -31.9376 14.3174
+    endloop
+  endfacet
+  facet normal 0.316193 0.859669 -0.401238
+    outer loop
+       vertex -3.87992e-15 -35.9816 17.4736
+       vertex -3.63326e-15 -36.5001 16.3627
+       vertex -15 -31.9376 14.3174
+    endloop
+  endfacet
+  facet normal 0.316194 0.859657 -0.401261
+    outer loop
+       vertex -3.87992e-15 -35.9816 17.4736
+       vertex -15 -31.9376 14.3174
+       vertex -15 -31.4839 15.2894
+    endloop
+  endfacet
+  facet normal 0.316194 0.846922 -0.427487
+    outer loop
+       vertex -4.12293e-15 -35.4292 18.568
+       vertex -3.87992e-15 -35.9816 17.4736
+       vertex -15 -31.4839 15.2894
+    endloop
+  endfacet
+  facet normal 0.316197 0.846904 -0.42752
+    outer loop
+       vertex -4.12293e-15 -35.4292 18.568
+       vertex -15 -31.4839 15.2894
+       vertex -15 -31.0005 16.247
+    endloop
+  endfacet
+  facet normal 0.316197 0.833424 -0.453238
+    outer loop
+       vertex -4.36208e-15 -34.8435 19.645
+       vertex -4.12293e-15 -35.4292 18.568
+       vertex -15 -31.0005 16.247
+    endloop
+  endfacet
+  facet normal 0.316191 0.833463 -0.453169
+    outer loop
+       vertex -4.36208e-15 -34.8435 19.645
+       vertex -15 -31.0005 16.247
+       vertex -15 -30.4881 17.1894
+    endloop
+  endfacet
+  facet normal 0.316192 0.8192 -0.478471
+    outer loop
+       vertex -4.59712e-15 -34.2252 20.7036
+       vertex -4.36208e-15 -34.8435 19.645
+       vertex -15 -30.4881 17.1894
+    endloop
+  endfacet
+  facet normal 0.316199 0.819147 -0.478557
+    outer loop
+       vertex -4.59712e-15 -34.2252 20.7036
+       vertex -15 -30.4881 17.1894
+       vertex -15 -29.947 18.1156
+    endloop
+  endfacet
+  facet normal 0.316198 0.804086 -0.503453
+    outer loop
+       vertex -4.82785e-15 -33.5746 21.7427
+       vertex -4.59712e-15 -34.2252 20.7036
+       vertex -15 -29.947 18.1156
+    endloop
+  endfacet
+  facet normal 0.316192 0.804139 -0.503372
+    outer loop
+       vertex -4.82785e-15 -33.5746 21.7427
+       vertex -15 -29.947 18.1156
+       vertex -15 -29.3778 19.0249
+    endloop
+  endfacet
+  facet normal 0.316192 0.788302 -0.527829
+    outer loop
+       vertex -5.05404e-15 -32.8925 22.7614
+       vertex -4.82785e-15 -33.5746 21.7427
+       vertex -15 -29.3778 19.0249
+    endloop
+  endfacet
+  facet normal 0.316192 0.788299 -0.527832
+    outer loop
+       vertex -5.05404e-15 -32.8925 22.7614
+       vertex -15 -29.3778 19.0249
+       vertex -15 -28.781 19.9162
+    endloop
+  endfacet
+  facet normal 0.316192 0.771785 -0.551697
+    outer loop
+       vertex -5.27549e-15 -32.1796 23.7587
+       vertex -5.05404e-15 -32.8925 22.7614
+       vertex -15 -28.781 19.9162
+    endloop
+  endfacet
+  facet normal 0.316199 0.771726 -0.551776
+    outer loop
+       vertex -5.27549e-15 -32.1796 23.7587
+       vertex -15 -28.781 19.9162
+       vertex -15 -28.1571 20.7888
+    endloop
+  endfacet
+  facet normal 0.316199 0.754492 -0.575117
+    outer loop
+       vertex -5.49198e-15 -31.4364 24.7337
+       vertex -5.27549e-15 -32.1796 23.7587
+       vertex -15 -28.1571 20.7888
+    endloop
+  endfacet
+  facet normal 0.316196 0.754517 -0.575085
+    outer loop
+       vertex -5.49198e-15 -31.4364 24.7337
+       vertex -15 -28.1571 20.7888
+       vertex -15 -27.5068 21.642
+    endloop
+  endfacet
+  facet normal 0.316196 0.736505 -0.59798
+    outer loop
+       vertex -5.70331e-15 -30.6637 25.6854
+       vertex -5.49198e-15 -31.4364 24.7337
+       vertex -15 -27.5068 21.642
+    endloop
+  endfacet
+  facet normal 0.316197 0.736498 -0.597989
+    outer loop
+       vertex -5.70331e-15 -30.6637 25.6854
+       vertex -15 -27.5068 21.642
+       vertex -15 -26.8307 22.4747
+    endloop
+  endfacet
+  facet normal 0.316197 0.717806 -0.620302
+    outer loop
+       vertex -5.90928e-15 -29.8621 26.613
+       vertex -5.70331e-15 -30.6637 25.6854
+       vertex -15 -26.8307 22.4747
+    endloop
+  endfacet
+  facet normal 0.31619 0.717869 -0.620232
+    outer loop
+       vertex -5.90928e-15 -29.8621 26.613
+       vertex -15 -26.8307 22.4747
+       vertex -15 -26.1294 23.2864
+    endloop
+  endfacet
+  facet normal 0.31619 0.698479 -0.641989
+    outer loop
+       vertex -6.1097e-15 -29.0325 27.5156
+       vertex -5.90928e-15 -29.8621 26.613
+       vertex -15 -26.1294 23.2864
+    endloop
+  endfacet
+  facet normal 0.316189 0.69849 -0.641978
+    outer loop
+       vertex -6.1097e-15 -29.0325 27.5156
+       vertex -15 -26.1294 23.2864
+       vertex -15 -25.4035 24.0762
+    endloop
+  endfacet
+  facet normal 0.316189 0.678524 -0.663046
+    outer loop
+       vertex -6.30439e-15 -28.1757 28.3924
+       vertex -6.1097e-15 -29.0325 27.5156
+       vertex -15 -25.4035 24.0762
+    endloop
+  endfacet
+  facet normal 0.316194 0.678478 -0.663091
+    outer loop
+       vertex -6.30439e-15 -28.1757 28.3924
+       vertex -15 -25.4035 24.0762
+       vertex -15 -24.6537 24.8434
+    endloop
+  endfacet
+  facet normal 0.316194 0.65786 -0.683551
+    outer loop
+       vertex -6.49315e-15 -27.2924 29.2425
+       vertex -6.30439e-15 -28.1757 28.3924
+       vertex -15 -24.6537 24.8434
+    endloop
+  endfacet
+  facet normal 0.316196 0.657837 -0.683572
+    outer loop
+       vertex -6.49315e-15 -27.2924 29.2425
+       vertex -15 -24.6537 24.8434
+       vertex -15 -23.8808 25.5872
+    endloop
+  endfacet
+  facet normal 0.316196 0.636607 -0.703386
+    outer loop
+       vertex -6.67581e-15 -26.3834 30.0652
+       vertex -6.49315e-15 -27.2924 29.2425
+       vertex -15 -23.8808 25.5872
+    endloop
+  endfacet
+  facet normal 0.316195 0.636609 -0.703384
+    outer loop
+       vertex -6.67581e-15 -26.3834 30.0652
+       vertex -15 -23.8808 25.5872
+       vertex -15 -23.0855 26.307
+    endloop
+  endfacet
+  facet normal 0.316196 0.614759 -0.722559
+    outer loop
+       vertex -6.8522e-15 -25.4497 30.8596
+       vertex -6.67581e-15 -26.3834 30.0652
+       vertex -15 -23.0855 26.307
+    endloop
+  endfacet
+  facet normal 0.316196 0.614754 -0.722564
+    outer loop
+       vertex -6.8522e-15 -25.4497 30.8596
+       vertex -15 -23.0855 26.307
+       vertex -15 -22.2685 27.0021
+    endloop
+  endfacet
+  facet normal 0.316196 0.592323 -0.741062
+    outer loop
+       vertex -7.02216e-15 -24.4921 31.625
+       vertex -6.8522e-15 -25.4497 30.8596
+       vertex -15 -22.2685 27.0021
+    endloop
+  endfacet
+  facet normal 0.316193 0.592364 -0.741031
+    outer loop
+       vertex -7.02216e-15 -24.4921 31.625
+       vertex -15 -22.2685 27.0021
+       vertex -15 -21.4306 27.6719
+    endloop
+  endfacet
+  facet normal 0.316193 0.569303 -0.758891
+    outer loop
+       vertex -7.18551e-15 -23.5114 32.3607
+       vertex -7.02216e-15 -24.4921 31.625
+       vertex -15 -21.4306 27.6719
+    endloop
+  endfacet
+  facet normal 0.316194 0.569288 -0.758902
+    outer loop
+       vertex -7.18551e-15 -23.5114 32.3607
+       vertex -15 -21.4306 27.6719
+       vertex -15 -20.5725 28.3156
+    endloop
+  endfacet
+  facet normal 0.316194 0.545812 -0.775958
+    outer loop
+       vertex -7.34212e-15 -22.5087 33.066
+       vertex -7.18551e-15 -23.5114 32.3607
+       vertex -15 -20.5725 28.3156
+    endloop
+  endfacet
+  facet normal 0.316198 0.545772 -0.775985
+    outer loop
+       vertex -7.34212e-15 -22.5087 33.066
+       vertex -15 -20.5725 28.3156
+       vertex -15 -19.6951 28.9327
+    endloop
+  endfacet
+  facet normal 0.316197 0.521731 -0.792348
+    outer loop
+       vertex -7.49184e-15 -21.4848 33.7402
+       vertex -7.34212e-15 -22.5087 33.066
+       vertex -15 -19.6951 28.9327
+    endloop
+  endfacet
+  facet normal 0.316193 0.521784 -0.792316
+    outer loop
+       vertex -7.49184e-15 -21.4848 33.7402
+       vertex -15 -19.6951 28.9327
+       vertex -15 -18.7992 29.5227
+    endloop
+  endfacet
+  facet normal 0.316193 0.497252 -0.807937
+    outer loop
+       vertex -7.63451e-15 -20.4407 34.3828
+       vertex -7.49184e-15 -21.4848 33.7402
+       vertex -15 -18.7992 29.5227
+    endloop
+  endfacet
+  facet normal 0.316194 0.497238 -0.807945
+    outer loop
+       vertex -7.63451e-15 -20.4407 34.3828
+       vertex -15 -18.7992 29.5227
+       vertex -15 -17.8857 30.0849
+    endloop
+  endfacet
+  facet normal 0.316194 0.472233 -0.822811
+    outer loop
+       vertex -7.77002e-15 -19.3775 34.993
+       vertex -7.63451e-15 -20.4407 34.3828
+       vertex -15 -17.8857 30.0849
+    endloop
+  endfacet
+  facet normal 0.316193 0.472245 -0.822804
+    outer loop
+       vertex -7.77002e-15 -19.3775 34.993
+       vertex -15 -17.8857 30.0849
+       vertex -15 -16.9553 30.6189
+    endloop
+  endfacet
+  facet normal 0.316193 0.446806 -0.836891
+    outer loop
+       vertex -7.89822e-15 -18.296 35.5704
+       vertex -7.77002e-15 -19.3775 34.993
+       vertex -15 -16.9553 30.6189
+    endloop
+  endfacet
+  facet normal 0.316194 0.446793 -0.836897
+    outer loop
+       vertex -7.89822e-15 -18.296 35.5704
+       vertex -15 -16.9553 30.6189
+       vertex -15 -16.009 31.1241
+    endloop
+  endfacet
+  facet normal 0.316194 0.420984 -0.850173
+    outer loop
+       vertex -8.01901e-15 -17.1974 36.1144
+       vertex -7.89822e-15 -18.296 35.5704
+       vertex -15 -16.009 31.1241
+    endloop
+  endfacet
+  facet normal 0.316195 0.420975 -0.850177
+    outer loop
+       vertex -8.01901e-15 -17.1974 36.1144
+       vertex -15 -16.009 31.1241
+       vertex -15 -15.0477 31.6001
+    endloop
+  endfacet
+  facet normal 0.316195 0.394672 -0.862702
+    outer loop
+       vertex -8.13226e-15 -16.0826 36.6244
+       vertex -8.01901e-15 -17.1974 36.1144
+       vertex -15 -15.0477 31.6001
+    endloop
+  endfacet
+  facet normal 0.316191 0.394723 -0.86268
+    outer loop
+       vertex -8.13226e-15 -16.0826 36.6244
+       vertex -15 -15.0477 31.6001
+       vertex -15 -14.0723 32.0464
+    endloop
+  endfacet
+  facet normal 0.316191 0.368117 -0.874364
+    outer loop
+       vertex -8.23788e-15 -14.9527 37.1001
+       vertex -8.13226e-15 -16.0826 36.6244
+       vertex -15 -14.0723 32.0464
+    endloop
+  endfacet
+  facet normal 0.316194 0.368078 -0.87438
+    outer loop
+       vertex -8.23788e-15 -14.9527 37.1001
+       vertex -15 -14.0723 32.0464
+       vertex -15 -13.0836 32.4626
+    endloop
+  endfacet
+  facet normal 0.316194 0.341101 -0.885252
+    outer loop
+       vertex -8.33575e-15 -13.8087 37.5409
+       vertex -8.23788e-15 -14.9527 37.1001
+       vertex -15 -13.0836 32.4626
+    endloop
+  endfacet
+  facet normal 0.316194 0.341101 -0.885252
+    outer loop
+       vertex -8.33575e-15 -13.8087 37.5409
+       vertex -15 -13.0836 32.4626
+       vertex -15 -12.0826 32.8483
+    endloop
+  endfacet
+  facet normal 0.316194 0.313804 -0.895292
+    outer loop
+       vertex -8.4258e-15 -12.6518 37.9464
+       vertex -8.33575e-15 -13.8087 37.5409
+       vertex -15 -12.0826 32.8483
+    endloop
+  endfacet
+  facet normal 0.316195 0.31379 -0.895297
+    outer loop
+       vertex -8.4258e-15 -12.6518 37.9464
+       vertex -15 -12.0826 32.8483
+       vertex -15 -11.0703 33.2031
+    endloop
+  endfacet
+  facet normal 0.316195 0.286248 -0.904479
+    outer loop
+       vertex -8.50793e-15 -11.483 38.3163
+       vertex -8.4258e-15 -12.6518 37.9464
+       vertex -15 -11.0703 33.2031
+    endloop
+  endfacet
+  facet normal 0.316192 0.286278 -0.904471
+    outer loop
+       vertex -8.50793e-15 -11.483 38.3163
+       vertex -15 -11.0703 33.2031
+       vertex -15 -10.0476 33.5268
+    endloop
+  endfacet
+  facet normal 0.316193 0.258388 -0.91283
+    outer loop
+       vertex -8.58207e-15 -10.3034 38.6502
+       vertex -8.50793e-15 -11.483 38.3163
+       vertex -15 -10.0476 33.5268
+    endloop
+  endfacet
+  facet normal 0.316196 0.258345 -0.912841
+    outer loop
+       vertex -8.58207e-15 -10.3034 38.6502
+       vertex -15 -10.0476 33.5268
+       vertex -15 -9.01548 33.8189
+    endloop
+  endfacet
+  facet normal 0.316195 0.230299 -0.920317
+    outer loop
+       vertex -8.64815e-15 -9.11414 38.9478
+       vertex -8.58207e-15 -10.3034 38.6502
+       vertex -15 -9.01548 33.8189
+    endloop
+  endfacet
+  facet normal 0.316196 0.230297 -0.920317
+    outer loop
+       vertex -8.64815e-15 -9.11414 38.9478
+       vertex -15 -9.01548 33.8189
+       vertex -15 -7.97487 34.0793
+    endloop
+  endfacet
+  facet normal 0.316196 0.201977 -0.926944
+    outer loop
+       vertex -8.70611e-15 -7.91631 39.2088
+       vertex -8.64815e-15 -9.11414 38.9478
+       vertex -15 -7.97487 34.0793
+    endloop
+  endfacet
+  facet normal 0.316194 0.201998 -0.92694
+    outer loop
+       vertex -8.70611e-15 -7.91631 39.2088
+       vertex -15 -7.97487 34.0793
+       vertex -15 -6.92677 34.3077
+    endloop
+  endfacet
+  facet normal 0.316194 0.173495 -0.932695
+    outer loop
+       vertex -8.75589e-15 -6.71104 39.433
+       vertex -8.70611e-15 -7.91631 39.2088
+       vertex -15 -6.92677 34.3077
+    endloop
+  endfacet
+  facet normal 0.316193 0.173516 -0.932692
+    outer loop
+       vertex -8.75589e-15 -6.71104 39.433
+       vertex -15 -6.92677 34.3077
+       vertex -15 -5.87216 34.5039
+    endloop
+  endfacet
+  facet normal 0.316193 0.144788 -0.937581
+    outer loop
+       vertex -8.79744e-15 -5.49947 39.6201
+       vertex -8.75589e-15 -6.71104 39.433
+       vertex -15 -5.87216 34.5039
+    endloop
+  endfacet
+  facet normal 0.316194 0.144777 -0.937583
+    outer loop
+       vertex -8.79744e-15 -5.49947 39.6201
+       vertex -15 -5.87216 34.5039
+       vertex -15 -4.81203 34.6676
+    endloop
+  endfacet
+  facet normal 0.316194 0.116078 -0.941567
+    outer loop
+       vertex -8.83073e-15 -4.28273 39.7701
+       vertex -8.79744e-15 -5.49947 39.6201
+       vertex -15 -4.81203 34.6676
+    endloop
+  endfacet
+  facet normal 0.316197 0.116036 -0.941571
+    outer loop
+       vertex -8.83073e-15 -4.28273 39.7701
+       vertex -15 -4.81203 34.6676
+       vertex -15 -3.74739 34.7988
+    endloop
+  endfacet
+  facet normal 0.316196 0.0870581 -0.944691
+    outer loop
+       vertex -8.85572e-15 -3.06197 39.8826
+       vertex -8.83073e-15 -4.28273 39.7701
+       vertex -15 -3.74739 34.7988
+    endloop
+  endfacet
+  facet normal 0.316193 0.0871125 -0.944687
+    outer loop
+       vertex -8.85572e-15 -3.06197 39.8826
+       vertex -15 -3.74739 34.7988
+       vertex -15 -2.67922 34.8973
+    endloop
+  endfacet
+  facet normal 0.316193 0.0581161 -0.946913
+    outer loop
+       vertex -8.8724e-15 -1.83833 39.9577
+       vertex -8.85572e-15 -3.06197 39.8826
+       vertex -15 -2.67922 34.8973
+    endloop
+  endfacet
+  facet normal 0.316193 0.0581058 -0.946914
+    outer loop
+       vertex -8.8724e-15 -1.83833 39.9577
+       vertex -15 -2.67922 34.8973
+       vertex -15 -1.60854 34.963
+    endloop
+  endfacet
+  facet normal 0.316193 0.029098 -0.948248
+    outer loop
+       vertex -8.88074e-15 -0.61297 39.9953
+       vertex -8.8724e-15 -1.83833 39.9577
+       vertex -15 -1.60854 34.963
+    endloop
+  endfacet
+  facet normal 0 0.0306716 -0.99953
+    outer loop
+       vertex 40 -1.83833 39.9577
+       vertex -8.8724e-15 -1.83833 39.9577
+       vertex 40 -0.61297 39.9953
+    endloop
+  endfacet
+  facet normal 0 0.0306716 -0.99953
+    outer loop
+       vertex 40 -0.61297 39.9953
+       vertex -8.8724e-15 -1.83833 39.9577
+       vertex -8.88074e-15 -0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0 -0 -1
+    outer loop
+       vertex 40 0.61297 39.9953
+       vertex 40 -0.61297 39.9953
+       vertex -8.88074e-15 0.61297 39.9953
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -8.88074e-15 0.61297 39.9953
+       vertex 40 -0.61297 39.9953
+       vertex -8.88074e-15 -0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0 -0.0306716 -0.99953
+    outer loop
+       vertex 40 1.83833 39.9577
+       vertex 40 0.61297 39.9953
+       vertex -8.8724e-15 1.83833 39.9577
+    endloop
+  endfacet
+  facet normal 0 -0.0306716 -0.99953
+    outer loop
+       vertex -8.8724e-15 1.83833 39.9577
+       vertex 40 0.61297 39.9953
+       vertex -8.88074e-15 0.61297 39.9953
+    endloop
+  endfacet
+  facet normal -0 -0.061259 -0.998122
+    outer loop
+       vertex 40 3.06197 39.8826
+       vertex 40 1.83833 39.9577
+       vertex -8.85572e-15 3.06197 39.8826
+    endloop
+  endfacet
+  facet normal 0 -0.061259 -0.998122
+    outer loop
+       vertex -8.85572e-15 3.06197 39.8826
+       vertex 40 1.83833 39.9577
+       vertex -8.8724e-15 1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -0 -0.0917662 -0.995781
+    outer loop
+       vertex 40 4.28273 39.7701
+       vertex 40 3.06197 39.8826
+       vertex -8.83073e-15 4.28273 39.7701
+    endloop
+  endfacet
+  facet normal 0 -0.0917662 -0.995781
+    outer loop
+       vertex -8.83073e-15 4.28273 39.7701
+       vertex 40 3.06197 39.8826
+       vertex -8.85572e-15 3.06197 39.8826
+    endloop
+  endfacet
+  facet normal -0 -0.122355 -0.992486
+    outer loop
+       vertex 40 5.49947 39.6201
+       vertex 40 4.28273 39.7701
+       vertex -8.79744e-15 5.49947 39.6201
+    endloop
+  endfacet
+  facet normal 0 -0.122355 -0.992486
+    outer loop
+       vertex -8.79744e-15 5.49947 39.6201
+       vertex 40 4.28273 39.7701
+       vertex -8.83073e-15 4.28273 39.7701
+    endloop
+  endfacet
+  facet normal -0 -0.152618 -0.988285
+    outer loop
+       vertex 40 6.71104 39.433
+       vertex 40 5.49947 39.6201
+       vertex -8.75589e-15 6.71104 39.433
+    endloop
+  endfacet
+  facet normal 0 -0.152618 -0.988285
+    outer loop
+       vertex -8.75589e-15 6.71104 39.433
+       vertex 40 5.49947 39.6201
+       vertex -8.79744e-15 5.49947 39.6201
+    endloop
+  endfacet
+  facet normal -0 -0.182877 -0.983136
+    outer loop
+       vertex 40 7.91631 39.2088
+       vertex 40 6.71104 39.433
+       vertex -8.70611e-15 7.91631 39.2088
+    endloop
+  endfacet
+  facet normal 0 -0.182877 -0.983136
+    outer loop
+       vertex -8.70611e-15 7.91631 39.2088
+       vertex 40 6.71104 39.433
+       vertex -8.75589e-15 6.71104 39.433
+    endloop
+  endfacet
+  facet normal -0 -0.2129 -0.977074
+    outer loop
+       vertex 40 9.11414 38.9478
+       vertex 40 7.91631 39.2088
+       vertex -8.64815e-15 9.11414 38.9478
+    endloop
+  endfacet
+  facet normal 0 -0.2129 -0.977074
+    outer loop
+       vertex -8.64815e-15 9.11414 38.9478
+       vertex 40 7.91631 39.2088
+       vertex -8.70611e-15 7.91631 39.2088
+    endloop
+  endfacet
+  facet normal -0 -0.242754 -0.970088
+    outer loop
+       vertex 40 10.3034 38.6502
+       vertex 40 9.11414 38.9478
+       vertex -8.58207e-15 10.3034 38.6502
+    endloop
+  endfacet
+  facet normal 0 -0.242754 -0.970088
+    outer loop
+       vertex -8.58207e-15 10.3034 38.6502
+       vertex 40 9.11414 38.9478
+       vertex -8.64815e-15 9.11414 38.9478
+    endloop
+  endfacet
+  facet normal -0 -0.272361 -0.962195
+    outer loop
+       vertex 40 11.483 38.3163
+       vertex 40 10.3034 38.6502
+       vertex -8.50793e-15 11.483 38.3163
+    endloop
+  endfacet
+  facet normal 0 -0.272361 -0.962195
+    outer loop
+       vertex -8.50793e-15 11.483 38.3163
+       vertex 40 10.3034 38.6502
+       vertex -8.58207e-15 10.3034 38.6502
+    endloop
+  endfacet
+  facet normal -0 -0.301728 -0.953394
+    outer loop
+       vertex 40 12.6518 37.9464
+       vertex 40 11.483 38.3163
+       vertex -8.4258e-15 12.6518 37.9464
+    endloop
+  endfacet
+  facet normal 0 -0.301728 -0.953394
+    outer loop
+       vertex -8.4258e-15 12.6518 37.9464
+       vertex 40 11.483 38.3163
+       vertex -8.50793e-15 11.483 38.3163
+    endloop
+  endfacet
+  facet normal -0 -0.330775 -0.94371
+    outer loop
+       vertex 40 13.8087 37.5409
+       vertex 40 12.6518 37.9464
+       vertex -8.33575e-15 13.8087 37.5409
+    endloop
+  endfacet
+  facet normal 0 -0.330775 -0.94371
+    outer loop
+       vertex -8.33575e-15 13.8087 37.5409
+       vertex 40 12.6518 37.9464
+       vertex -8.4258e-15 12.6518 37.9464
+    endloop
+  endfacet
+  facet normal -0 -0.359547 -0.933127
+    outer loop
+       vertex 40 14.9527 37.1001
+       vertex 40 13.8087 37.5409
+       vertex -8.23788e-15 14.9527 37.1001
+    endloop
+  endfacet
+  facet normal 0 -0.359547 -0.933127
+    outer loop
+       vertex -8.23788e-15 14.9527 37.1001
+       vertex 40 13.8087 37.5409
+       vertex -8.33575e-15 13.8087 37.5409
+    endloop
+  endfacet
+  facet normal 2.28535e-06 -0.387956 -0.921678
+    outer loop
+       vertex 40 16.0826 36.6245
+       vertex 40 14.9527 37.1001
+       vertex -8.13226e-15 16.0826 36.6244
+    endloop
+  endfacet
+  facet normal 0 -0.388024 -0.921649
+    outer loop
+       vertex -8.13226e-15 16.0826 36.6244
+       vertex 40 14.9527 37.1001
+       vertex -8.23788e-15 14.9527 37.1001
+    endloop
+  endfacet
+  facet normal -0 -0.416083 -0.909327
+    outer loop
+       vertex 40 17.1974 36.1144
+       vertex 40 16.0826 36.6245
+       vertex -8.01901e-15 17.1974 36.1144
+    endloop
+  endfacet
+  facet normal 2.2548e-06 -0.416016 -0.909357
+    outer loop
+       vertex -8.01901e-15 17.1974 36.1144
+       vertex 40 16.0826 36.6245
+       vertex -8.13226e-15 16.0826 36.6244
+    endloop
+  endfacet
+  facet normal -0 -0.443751 -0.89615
+    outer loop
+       vertex 40 18.296 35.5704
+       vertex 40 17.1974 36.1144
+       vertex -7.89822e-15 18.296 35.5704
+    endloop
+  endfacet
+  facet normal 0 -0.443751 -0.89615
+    outer loop
+       vertex -7.89822e-15 18.296 35.5704
+       vertex 40 17.1974 36.1144
+       vertex -8.01901e-15 17.1974 36.1144
+    endloop
+  endfacet
+  facet normal -0 -0.470969 -0.88215
+    outer loop
+       vertex 40 19.3775 34.993
+       vertex 40 18.296 35.5704
+       vertex -7.77002e-15 19.3775 34.993
+    endloop
+  endfacet
+  facet normal 0 -0.470969 -0.88215
+    outer loop
+       vertex -7.77002e-15 19.3775 34.993
+       vertex 40 18.296 35.5704
+       vertex -7.89822e-15 18.296 35.5704
+    endloop
+  endfacet
+  facet normal -0 -0.497771 -0.867308
+    outer loop
+       vertex 40 20.4407 34.3828
+       vertex 40 19.3775 34.993
+       vertex -7.63451e-15 20.4407 34.3828
+    endloop
+  endfacet
+  facet normal 0 -0.497771 -0.867308
+    outer loop
+       vertex -7.63451e-15 20.4407 34.3828
+       vertex 40 19.3775 34.993
+       vertex -7.77002e-15 19.3775 34.993
+    endloop
+  endfacet
+  facet normal -0 -0.524144 -0.85163
+    outer loop
+       vertex 40 21.4848 33.7402
+       vertex 40 20.4407 34.3828
+       vertex -7.49184e-15 21.4848 33.7402
+    endloop
+  endfacet
+  facet normal 0 -0.524144 -0.85163
+    outer loop
+       vertex -7.49184e-15 21.4848 33.7402
+       vertex 40 20.4407 34.3828
+       vertex -7.63451e-15 20.4407 34.3828
+    endloop
+  endfacet
+  facet normal -0 -0.549947 -0.8352
+    outer loop
+       vertex 40 22.5087 33.066
+       vertex 40 21.4848 33.7402
+       vertex -7.34212e-15 22.5087 33.066
+    endloop
+  endfacet
+  facet normal 0 -0.549947 -0.8352
+    outer loop
+       vertex -7.34212e-15 22.5087 33.066
+       vertex 40 21.4848 33.7402
+       vertex -7.49184e-15 21.4848 33.7402
+    endloop
+  endfacet
+  facet normal -0 -0.575329 -0.817922
+    outer loop
+       vertex 40 23.5114 32.3607
+       vertex 40 22.5087 33.066
+       vertex -7.18551e-15 23.5114 32.3607
+    endloop
+  endfacet
+  facet normal 0 -0.575329 -0.817922
+    outer loop
+       vertex -7.18551e-15 23.5114 32.3607
+       vertex 40 22.5087 33.066
+       vertex -7.34212e-15 22.5087 33.066
+    endloop
+  endfacet
+  facet normal -0 -0.600091 -0.799932
+    outer loop
+       vertex 40 24.4921 31.625
+       vertex 40 23.5114 32.3607
+       vertex -7.02216e-15 24.4921 31.625
+    endloop
+  endfacet
+  facet normal 0 -0.600091 -0.799932
+    outer loop
+       vertex -7.02216e-15 24.4921 31.625
+       vertex 40 23.5114 32.3607
+       vertex -7.18551e-15 23.5114 32.3607
+    endloop
+  endfacet
+  facet normal -0 -0.624357 -0.781139
+    outer loop
+       vertex 40 25.4497 30.8596
+       vertex 40 24.4921 31.625
+       vertex -6.8522e-15 25.4497 30.8596
+    endloop
+  endfacet
+  facet normal 0 -0.624357 -0.781139
+    outer loop
+       vertex -6.8522e-15 25.4497 30.8596
+       vertex 40 24.4921 31.625
+       vertex -7.02216e-15 24.4921 31.625
+    endloop
+  endfacet
+  facet normal -0 -0.648005 -0.761636
+    outer loop
+       vertex 40 26.3834 30.0652
+       vertex 40 25.4497 30.8596
+       vertex -6.67581e-15 26.3834 30.0652
+    endloop
+  endfacet
+  facet normal 0 -0.648005 -0.761636
+    outer loop
+       vertex -6.67581e-15 26.3834 30.0652
+       vertex 40 25.4497 30.8596
+       vertex -6.8522e-15 25.4497 30.8596
+    endloop
+  endfacet
+  facet normal -0 -0.671035 -0.741426
+    outer loop
+       vertex 40 27.2924 29.2425
+       vertex 40 26.3834 30.0652
+       vertex -6.49315e-15 27.2924 29.2425
+    endloop
+  endfacet
+  facet normal 0 -0.671035 -0.741426
+    outer loop
+       vertex -6.49315e-15 27.2924 29.2425
+       vertex 40 26.3834 30.0652
+       vertex -6.67581e-15 26.3834 30.0652
+    endloop
+  endfacet
+  facet normal -0 -0.693437 -0.720518
+    outer loop
+       vertex 40 28.1757 28.3924
+       vertex 40 27.2924 29.2425
+       vertex -6.30439e-15 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal 0 -0.693437 -0.720518
+    outer loop
+       vertex -6.30439e-15 28.1757 28.3924
+       vertex 40 27.2924 29.2425
+       vertex -6.49315e-15 27.2924 29.2425
+    endloop
+  endfacet
+  facet normal 1.73307e-06 -0.715178 -0.698943
+    outer loop
+       vertex -6.1097e-15 29.0325 27.5156
+       vertex 40 29.0325 27.5157
+       vertex 40 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal 0 -0.715217 -0.698902
+    outer loop
+       vertex -6.30439e-15 28.1757 28.3924
+       vertex -6.1097e-15 29.0325 27.5156
+       vertex 40 28.1757 28.3924
+    endloop
+  endfacet
+  facet normal 0 -0.736289 -0.676667
+    outer loop
+       vertex -5.90928e-15 29.8621 26.613
+       vertex 40 29.8621 26.613
+       vertex 40 29.0325 27.5157
+    endloop
+  endfacet
+  facet normal 1.67793e-06 -0.736252 -0.676707
+    outer loop
+       vertex -6.1097e-15 29.0325 27.5156
+       vertex -5.90928e-15 29.8621 26.613
+       vertex 40 29.0325 27.5157
+    endloop
+  endfacet
+  facet normal 0 -0.756625 -0.653849
+    outer loop
+       vertex -5.70331e-15 30.6637 25.6854
+       vertex 40 30.6637 25.6854
+       vertex 40 29.8621 26.613
+    endloop
+  endfacet
+  facet normal 0 -0.756625 -0.653849
+    outer loop
+       vertex -5.90928e-15 29.8621 26.613
+       vertex -5.70331e-15 30.6637 25.6854
+       vertex 40 29.8621 26.613
+    endloop
+  endfacet
+  facet normal 0 -0.776336 -0.630319
+    outer loop
+       vertex -5.49198e-15 31.4364 24.7337
+       vertex 40 31.4364 24.7337
+       vertex 40 30.6637 25.6854
+    endloop
+  endfacet
+  facet normal 0 -0.776336 -0.630319
+    outer loop
+       vertex -5.70331e-15 30.6637 25.6854
+       vertex -5.49198e-15 31.4364 24.7337
+       vertex 40 30.6637 25.6854
+    endloop
+  endfacet
+  facet normal 0 -0.795297 -0.60622
+    outer loop
+       vertex -5.27549e-15 32.1796 23.7587
+       vertex 40 32.1796 23.7587
+       vertex 40 31.4364 24.7337
+    endloop
+  endfacet
+  facet normal 0 -0.795297 -0.60622
+    outer loop
+       vertex -5.49198e-15 31.4364 24.7337
+       vertex -5.27549e-15 32.1796 23.7587
+       vertex 40 31.4364 24.7337
+    endloop
+  endfacet
+  facet normal 0 -0.813523 -0.581533
+    outer loop
+       vertex -5.05404e-15 32.8925 22.7614
+       vertex 40 32.8925 22.7614
+       vertex 40 32.1796 23.7587
+    endloop
+  endfacet
+  facet normal 0 -0.813523 -0.581533
+    outer loop
+       vertex -5.27549e-15 32.1796 23.7587
+       vertex -5.05404e-15 32.8925 22.7614
+       vertex 40 32.1796 23.7587
+    endloop
+  endfacet
+  facet normal 0 -0.830932 -0.556374
+    outer loop
+       vertex -4.82785e-15 33.5746 21.7427
+       vertex 40 33.5746 21.7427
+       vertex 40 32.8925 22.7614
+    endloop
+  endfacet
+  facet normal 0 -0.830932 -0.556374
+    outer loop
+       vertex -5.05404e-15 32.8925 22.7614
+       vertex -4.82785e-15 33.5746 21.7427
+       vertex 40 32.8925 22.7614
+    endloop
+  endfacet
+  facet normal 0 -0.847572 -0.530681
+    outer loop
+       vertex -4.59712e-15 34.2252 20.7036
+       vertex 40 34.2252 20.7036
+       vertex 40 33.5746 21.7427
+    endloop
+  endfacet
+  facet normal 0 -0.847572 -0.530681
+    outer loop
+       vertex -4.82785e-15 33.5746 21.7427
+       vertex -4.59712e-15 34.2252 20.7036
+       vertex 40 33.5746 21.7427
+    endloop
+  endfacet
+  facet normal 1.25064e-06 -0.863481 -0.504382
+    outer loop
+       vertex -4.36208e-15 34.8435 19.645
+       vertex 40 34.8435 19.6451
+       vertex 40 34.2252 20.7036
+    endloop
+  endfacet
+  facet normal 0 -0.863501 -0.504346
+    outer loop
+       vertex -4.59712e-15 34.2252 20.7036
+       vertex -4.36208e-15 34.8435 19.645
+       vertex 40 34.2252 20.7036
+    endloop
+  endfacet
+  facet normal 0 -0.878515 -0.477716
+    outer loop
+       vertex -4.12293e-15 35.4292 18.568
+       vertex 40 35.4292 18.568
+       vertex 40 34.8435 19.6451
+    endloop
+  endfacet
+  facet normal 1.18461e-06 -0.878496 -0.477749
+    outer loop
+       vertex -4.36208e-15 34.8435 19.645
+       vertex -4.12293e-15 35.4292 18.568
+       vertex 40 34.8435 19.6451
+    endloop
+  endfacet
+  facet normal 0 -0.892723 -0.450605
+    outer loop
+       vertex -3.87992e-15 35.9816 17.4736
+       vertex 40 35.9816 17.4736
+       vertex 40 35.4292 18.568
+    endloop
+  endfacet
+  facet normal 0 -0.892723 -0.450605
+    outer loop
+       vertex -4.12293e-15 35.4292 18.568
+       vertex -3.87992e-15 35.9816 17.4736
+       vertex 40 35.4292 18.568
+    endloop
+  endfacet
+  facet normal 0 -0.906159 -0.422937
+    outer loop
+       vertex -3.63326e-15 36.5001 16.3627
+       vertex 40 36.5001 16.3627
+       vertex 40 35.9816 17.4736
+    endloop
+  endfacet
+  facet normal 0 -0.906159 -0.422937
+    outer loop
+       vertex -3.87992e-15 35.9816 17.4736
+       vertex -3.63326e-15 36.5001 16.3627
+       vertex 40 35.9816 17.4736
+    endloop
+  endfacet
+  facet normal 0 -0.918658 -0.395053
+    outer loop
+       vertex -3.38319e-15 36.9844 15.2365
+       vertex 40 36.9844 15.2365
+       vertex 40 36.5001 16.3627
+    endloop
+  endfacet
+  facet normal 0 -0.918658 -0.395053
+    outer loop
+       vertex -3.63326e-15 36.5001 16.3627
+       vertex -3.38319e-15 36.9844 15.2365
+       vertex 40 36.5001 16.3627
+    endloop
+  endfacet
+  facet normal 0 -0.930323 -0.366742
+    outer loop
+       vertex -3.12994e-15 37.434 14.096
+       vertex 40 37.434 14.096
+       vertex 40 36.9844 15.2365
+    endloop
+  endfacet
+  facet normal 0 -0.930323 -0.366742
+    outer loop
+       vertex -3.38319e-15 36.9844 15.2365
+       vertex -3.12994e-15 37.434 14.096
+       vertex 40 36.9844 15.2365
+    endloop
+  endfacet
+  facet normal 0 -0.941138 -0.338022
+    outer loop
+       vertex -2.87375e-15 37.8484 12.9422
+       vertex 40 37.8484 12.9422
+       vertex 40 37.434 14.096
+    endloop
+  endfacet
+  facet normal 0 -0.941138 -0.338022
+    outer loop
+       vertex -3.12994e-15 37.434 14.096
+       vertex -2.87375e-15 37.8484 12.9422
+       vertex 40 37.434 14.096
+    endloop
+  endfacet
+  facet normal 0 -0.951062 -0.308999
+    outer loop
+       vertex -2.61485e-15 38.2272 11.7763
+       vertex 40 38.2272 11.7763
+       vertex 40 37.8484 12.9422
+    endloop
+  endfacet
+  facet normal 0 -0.951062 -0.308999
+    outer loop
+       vertex -2.87375e-15 37.8484 12.9422
+       vertex -2.61485e-15 38.2272 11.7763
+       vertex 40 37.8484 12.9422
+    endloop
+  endfacet
+  facet normal 0 -0.960086 -0.279705
+    outer loop
+       vertex -2.35351e-15 38.5701 10.5993
+       vertex 40 38.5701 10.5993
+       vertex 40 38.2272 11.7763
+    endloop
+  endfacet
+  facet normal 0 -0.960086 -0.279705
+    outer loop
+       vertex -2.61485e-15 38.2272 11.7763
+       vertex -2.35351e-15 38.5701 10.5993
+       vertex 40 38.2272 11.7763
+    endloop
+  endfacet
+  facet normal 0 -0.968202 -0.250168
+    outer loop
+       vertex -2.08995e-15 38.8768 9.4123
+       vertex 40 38.8768 9.4123
+       vertex 40 38.5701 10.5993
+    endloop
+  endfacet
+  facet normal 0 -0.968202 -0.250168
+    outer loop
+       vertex -2.35351e-15 38.5701 10.5993
+       vertex -2.08995e-15 38.8768 9.4123
+       vertex 40 38.5701 10.5993
+    endloop
+  endfacet
+  facet normal 0 -0.975409 -0.220402
+    outer loop
+       vertex -1.82443e-15 39.147 8.21651
+       vertex 40 39.147 8.21651
+       vertex 40 38.8768 9.4123
+    endloop
+  endfacet
+  facet normal 0 -0.975409 -0.220402
+    outer loop
+       vertex -2.08995e-15 38.8768 9.4123
+       vertex -1.82443e-15 39.147 8.21651
+       vertex 40 38.8768 9.4123
+    endloop
+  endfacet
+  facet normal 0 -0.981709 -0.190386
+    outer loop
+       vertex -1.5572e-15 39.3804 7.01299
+       vertex 40 39.3804 7.01299
+       vertex 40 39.147 8.21651
+    endloop
+  endfacet
+  facet normal 0 -0.981709 -0.190386
+    outer loop
+       vertex -1.82443e-15 39.147 8.21651
+       vertex -1.5572e-15 39.3804 7.01299
+       vertex 40 39.147 8.21651
+    endloop
+  endfacet
+  facet normal 0 -0.987084 -0.160204
+    outer loop
+       vertex -1.2885e-15 39.5768 5.80289
+       vertex 40 39.5768 5.80289
+       vertex 40 39.3804 7.01299
+    endloop
+  endfacet
+  facet normal 0 -0.987084 -0.160204
+    outer loop
+       vertex -1.5572e-15 39.3804 7.01299
+       vertex -1.2885e-15 39.5768 5.80289
+       vertex 40 39.3804 7.01299
+    endloop
+  endfacet
+  facet normal 0 -0.991522 -0.129939
+    outer loop
+       vertex -1.01859e-15 39.7361 4.58734
+       vertex 40 39.7361 4.58734
+       vertex 40 39.5768 5.80289
+    endloop
+  endfacet
+  facet normal 0 -0.991522 -0.129939
+    outer loop
+       vertex -1.2885e-15 39.5768 5.80289
+       vertex -1.01859e-15 39.7361 4.58734
+       vertex 40 39.5768 5.80289
+    endloop
+  endfacet
+  facet normal 2.48928e-08 -0.995044 -0.0994363
+    outer loop
+       vertex -7.4773e-16 39.858 3.36747
+       vertex 40 39.858 3.36748
+       vertex 40 39.7361 4.58734
+    endloop
+  endfacet
+  facet normal 0 -0.995044 -0.0994355
+    outer loop
+       vertex -1.01859e-15 39.7361 4.58734
+       vertex -7.4773e-16 39.858 3.36747
+       vertex 40 39.7361 4.58734
+    endloop
+  endfacet
+  facet normal 0 -0.997622 -0.0689259
+    outer loop
+       vertex -4.76163e-16 39.9425 2.14445
+       vertex 40 39.9425 2.14445
+       vertex 40 39.858 3.36748
+    endloop
+  endfacet
+  facet normal 1.7255e-08 -0.997622 -0.0689264
+    outer loop
+       vertex -7.4773e-16 39.858 3.36747
+       vertex -4.76163e-16 39.9425 2.14445
+       vertex 40 39.858 3.36748
+    endloop
+  endfacet
+  facet normal 0 -0.999268 -0.0382547
+    outer loop
+       vertex -2.0415e-16 39.9894 0.91941
+       vertex 40 39.9894 0.91941
+       vertex 40 39.9425 2.14445
+    endloop
+  endfacet
+  facet normal 0 -0.999268 -0.0382547
+    outer loop
+       vertex -4.76163e-16 39.9425 2.14445
+       vertex -2.0415e-16 39.9894 0.91941
+       vertex 40 39.9425 2.14445
+    endloop
+  endfacet
+  facet normal 0 -0.999971 -0.00766711
+    outer loop
+       vertex 6.80553e-17 39.9988 -0.306494
+       vertex 40 39.9988 -0.306494
+       vertex 40 39.9894 0.91941
+    endloop
+  endfacet
+  facet normal 0 -0.999971 -0.00766711
+    outer loop
+       vertex -2.0415e-16 39.9894 0.91941
+       vertex 6.80553e-17 39.9988 -0.306494
+       vertex 40 39.9894 0.91941
+    endloop
+  endfacet
+  facet normal 0 -0.999735 0.0230013
+    outer loop
+       vertex 3.40197e-16 39.9706 -1.53211
+       vertex 40 39.9706 -1.53211
+       vertex 40 39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal 0 -0.999735 0.0230013
+    outer loop
+       vertex 6.80553e-17 39.9988 -0.306494
+       vertex 3.40197e-16 39.9706 -1.53211
+       vertex 40 39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal 0 -0.998563 0.0535919
+    outer loop
+       vertex 6.12018e-16 39.9049 -2.75629
+       vertex 40 39.9049 -2.75629
+       vertex 40 39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal 0 -0.998563 0.0535919
+    outer loop
+       vertex 3.40197e-16 39.9706 -1.53211
+       vertex 6.12018e-16 39.9049 -2.75629
+       vertex 40 39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal 0 -0.996451 0.0841801
+    outer loop
+       vertex 8.83265e-16 39.8017 -3.97787
+       vertex 40 39.8017 -3.97787
+       vertex 40 39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal 0 -0.996451 0.0841801
+    outer loop
+       vertex 6.12018e-16 39.9049 -2.75629
+       vertex 8.83265e-16 39.8017 -3.97787
+       vertex 40 39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal 0 -0.993401 0.114689
+    outer loop
+       vertex 1.15368e-15 39.6611 -5.19572
+       vertex 40 39.6611 -5.19572
+       vertex 40 39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal 0 -0.993401 0.114689
+    outer loop
+       vertex 8.83265e-16 39.8017 -3.97787
+       vertex 1.15368e-15 39.6611 -5.19572
+       vertex 40 39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal 0 -0.989427 0.145032
+    outer loop
+       vertex 1.42302e-15 39.4833 -6.40869
+       vertex 40 39.4833 -6.40869
+       vertex 40 39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal 0 -0.989427 0.145032
+    outer loop
+       vertex 1.15368e-15 39.6611 -5.19572
+       vertex 1.42302e-15 39.4833 -6.40869
+       vertex 40 39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal 0 -0.984502 0.175374
+    outer loop
+       vertex 1.69101e-15 39.2683 -7.61564
+       vertex 40 39.2683 -7.61564
+       vertex 40 39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal 0 -0.984502 0.175374
+    outer loop
+       vertex 1.42302e-15 39.4833 -6.40869
+       vertex 1.69101e-15 39.2683 -7.61564
+       vertex 40 39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal 0 -0.978679 0.205394
+    outer loop
+       vertex 1.95742e-15 39.0165 -8.81544
+       vertex 40 39.0165 -8.81544
+       vertex 40 39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal 0 -0.978679 0.205394
+    outer loop
+       vertex 1.69101e-15 39.2683 -7.61564
+       vertex 1.95742e-15 39.0165 -8.81544
+       vertex 40 39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal 0 -0.971918 0.235319
+    outer loop
+       vertex 2.22199e-15 38.728 -10.007
+       vertex 40 38.728 -10.007
+       vertex 40 39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal 0 -0.971918 0.235319
+    outer loop
+       vertex 1.95742e-15 39.0165 -8.81544
+       vertex 2.22199e-15 38.728 -10.007
+       vertex 40 39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal 0 -0.964263 0.264948
+    outer loop
+       vertex 2.48447e-15 38.4032 -11.1891
+       vertex 40 38.4032 -11.1891
+       vertex 40 38.728 -10.007
+    endloop
+  endfacet
+  facet normal 0 -0.964263 0.264948
+    outer loop
+       vertex 2.22199e-15 38.728 -10.007
+       vertex 2.48447e-15 38.4032 -11.1891
+       vertex 40 38.728 -10.007
+    endloop
+  endfacet
+  facet normal 0 -0.955686 0.294388
+    outer loop
+       vertex 2.74462e-15 38.0423 -12.3607
+       vertex 40 38.0423 -12.3607
+       vertex 40 38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal 0 -0.955686 0.294388
+    outer loop
+       vertex 2.48447e-15 38.4032 -11.1891
+       vertex 2.74462e-15 38.0423 -12.3607
+       vertex 40 38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal 0 -0.946199 0.323585
+    outer loop
+       vertex 3.00219e-15 37.6456 -13.5207
+       vertex 40 37.6456 -13.5207
+       vertex 40 38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal 0 -0.946199 0.323585
+    outer loop
+       vertex 2.74462e-15 38.0423 -12.3607
+       vertex 3.00219e-15 37.6456 -13.5207
+       vertex 40 38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal 0 -0.935856 0.352383
+    outer loop
+       vertex 3.25694e-15 37.2136 -14.668
+       vertex 40 37.2136 -14.668
+       vertex 40 37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal 0 -0.935856 0.352383
+    outer loop
+       vertex 3.00219e-15 37.6456 -13.5207
+       vertex 3.25694e-15 37.2136 -14.668
+       vertex 40 37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal 0 -0.924602 0.380934
+    outer loop
+       vertex 3.50863e-15 36.7466 -15.8015
+       vertex 40 36.7466 -15.8015
+       vertex 40 37.2136 -14.668
+    endloop
+  endfacet
+  facet normal 0 -0.924602 0.380934
+    outer loop
+       vertex 3.25694e-15 37.2136 -14.668
+       vertex 3.50863e-15 36.7466 -15.8015
+       vertex 40 37.2136 -14.668
+    endloop
+  endfacet
+  facet normal 0 -0.912504 0.409067
+    outer loop
+       vertex 3.75703e-15 36.2451 -16.9202
+       vertex 40 36.2451 -16.9202
+       vertex 40 36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal 0 -0.912504 0.409067
+    outer loop
+       vertex 3.50863e-15 36.7466 -15.8015
+       vertex 3.75703e-15 36.2451 -16.9202
+       vertex 40 36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal 0 -0.899539 0.43684
+    outer loop
+       vertex 4.0019e-15 35.7096 -18.0229
+       vertex 40 35.7096 -18.0229
+       vertex 40 36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal 0 -0.899539 0.43684
+    outer loop
+       vertex 3.75703e-15 36.2451 -16.9202
+       vertex 4.0019e-15 35.7096 -18.0229
+       vertex 40 36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal 0 -0.885733 0.464195
+    outer loop
+       vertex 4.243e-15 35.1405 -19.1088
+       vertex 40 35.1405 -19.1088
+       vertex 40 35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal 0 -0.885733 0.464195
+    outer loop
+       vertex 4.0019e-15 35.7096 -18.0229
+       vertex 4.243e-15 35.1405 -19.1088
+       vertex 40 35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal 0 -0.871085 0.491133
+    outer loop
+       vertex 4.48013e-15 34.5384 -20.1767
+       vertex 40 34.5384 -20.1767
+       vertex 40 35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal 0 -0.871085 0.491133
+    outer loop
+       vertex 4.243e-15 35.1405 -19.1088
+       vertex 4.48013e-15 34.5384 -20.1767
+       vertex 40 35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal 0 -0.855631 0.517587
+    outer loop
+       vertex 4.71304e-15 33.9039 -21.2256
+       vertex 40 33.9039 -21.2256
+       vertex 40 34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal 0 -0.855631 0.517587
+    outer loop
+       vertex 4.48013e-15 34.5384 -20.1767
+       vertex 4.71304e-15 33.9039 -21.2256
+       vertex 40 34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal 0 -0.839379 0.543546
+    outer loop
+       vertex 4.94153e-15 33.2375 -22.2547
+       vertex 40 33.2375 -22.2547
+       vertex 40 33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal 0 -0.839379 0.543546
+    outer loop
+       vertex 4.71304e-15 33.9039 -21.2256
+       vertex 4.94153e-15 33.2375 -22.2547
+       vertex 40 33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal 0 -0.822314 0.569034
+    outer loop
+       vertex 5.16537e-15 32.5399 -23.2628
+       vertex 40 32.5399 -23.2628
+       vertex 40 33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal 0 -0.822314 0.569034
+    outer loop
+       vertex 4.94153e-15 33.2375 -22.2547
+       vertex 5.16537e-15 32.5399 -23.2628
+       vertex 40 33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal 0 -0.804461 0.594006
+    outer loop
+       vertex 5.38436e-15 31.8117 -24.249
+       vertex 40 31.8117 -24.249
+       vertex 40 32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal 0 -0.804461 0.594006
+    outer loop
+       vertex 5.16537e-15 32.5399 -23.2628
+       vertex 5.38436e-15 31.8117 -24.249
+       vertex 40 32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal 0 -0.785935 0.618309
+    outer loop
+       vertex 5.5983e-15 31.0537 -25.2125
+       vertex 40 31.0537 -25.2125
+       vertex 40 31.8117 -24.249
+    endloop
+  endfacet
+  facet normal 0 -0.785935 0.618309
+    outer loop
+       vertex 5.38436e-15 31.8117 -24.249
+       vertex 5.5983e-15 31.0537 -25.2125
+       vertex 40 31.8117 -24.249
+    endloop
+  endfacet
+  facet normal 0 -0.766561 0.642172
+    outer loop
+       vertex 5.80697e-15 30.2664 -26.1523
+       vertex 40 30.2664 -26.1523
+       vertex 40 31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal 0 -0.766561 0.642172
+    outer loop
+       vertex 5.5983e-15 31.0537 -25.2125
+       vertex 5.80697e-15 30.2664 -26.1523
+       vertex 40 31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal 0 -0.746563 0.665315
+    outer loop
+       vertex 6.0102e-15 29.4508 -27.0675
+       vertex 40 29.4508 -27.0675
+       vertex 40 30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal 0 -0.746563 0.665315
+    outer loop
+       vertex 5.80697e-15 30.2664 -26.1523
+       vertex 6.0102e-15 29.4508 -27.0675
+       vertex 40 30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal 0 -0.725818 0.687887
+    outer loop
+       vertex 6.20777e-15 28.6075 -27.9573
+       vertex 40 28.6075 -27.9573
+       vertex 40 29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal 0 -0.725818 0.687887
+    outer loop
+       vertex 6.0102e-15 29.4508 -27.0675
+       vertex 6.20777e-15 28.6075 -27.9573
+       vertex 40 29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal 0 -0.70441 0.709793
+    outer loop
+       vertex 6.39952e-15 27.7373 -28.8209
+       vertex 40 27.7373 -28.8209
+       vertex 40 28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal 0 -0.70441 0.709793
+    outer loop
+       vertex 6.20777e-15 28.6075 -27.9573
+       vertex 6.39952e-15 27.7373 -28.8209
+       vertex 40 28.6075 -27.9573
+    endloop
+  endfacet
+  facet normal 0 -0.682295 0.731077
+    outer loop
+       vertex 6.58525e-15 26.8411 -29.6573
+       vertex 40 26.8411 -29.6573
+       vertex 40 27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal 0 -0.682295 0.731077
+    outer loop
+       vertex 6.39952e-15 27.7373 -28.8209
+       vertex 6.58525e-15 26.8411 -29.6573
+       vertex 40 27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal 0 -0.65956 0.751652
+    outer loop
+       vertex 6.7648e-15 25.9196 -30.4659
+       vertex 40 25.9196 -30.4659
+       vertex 40 26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal 0 -0.65956 0.751652
+    outer loop
+       vertex 6.58525e-15 26.8411 -29.6573
+       vertex 6.7648e-15 25.9196 -30.4659
+       vertex 40 26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal 0 -0.636244 0.771488
+    outer loop
+       vertex 6.93799e-15 24.9738 -31.2459
+       vertex 40 24.9738 -31.2459
+       vertex 40 25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal 0 -0.636244 0.771488
+    outer loop
+       vertex 6.7648e-15 25.9196 -30.4659
+       vertex 6.93799e-15 24.9738 -31.2459
+       vertex 40 25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal 0 -0.612352 0.790585
+    outer loop
+       vertex 7.10467e-15 24.0046 -31.9966
+       vertex 40 24.0046 -31.9966
+       vertex 40 24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal 0 -0.612352 0.790585
+    outer loop
+       vertex 6.93799e-15 24.9738 -31.2459
+       vertex 7.10467e-15 24.0046 -31.9966
+       vertex 40 24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal 0 -0.587755 0.809039
+    outer loop
+       vertex 7.26467e-15 23.0127 -32.7172
+       vertex 40 23.0127 -32.7172
+       vertex 40 24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal 0 -0.587755 0.809039
+    outer loop
+       vertex 7.10467e-15 24.0046 -31.9966
+       vertex 7.26467e-15 23.0127 -32.7172
+       vertex 40 24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal 0 -0.562694 0.826665
+    outer loop
+       vertex 7.41785e-15 21.9993 -33.407
+       vertex 40 21.9993 -33.407
+       vertex 40 23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal 0 -0.562694 0.826665
+    outer loop
+       vertex 7.26467e-15 23.0127 -32.7172
+       vertex 7.41785e-15 21.9993 -33.407
+       vertex 40 23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal 0 -0.537127 0.843501
+    outer loop
+       vertex 7.56406e-15 20.9652 -34.0655
+       vertex 40 20.9652 -34.0655
+       vertex 40 21.9993 -33.407
+    endloop
+  endfacet
+  facet normal 0 -0.537127 0.843501
+    outer loop
+       vertex 7.41785e-15 21.9993 -33.407
+       vertex 7.56406e-15 20.9652 -34.0655
+       vertex 40 21.9993 -33.407
+    endloop
+  endfacet
+  facet normal 0 -0.511063 0.859543
+    outer loop
+       vertex 7.70317e-15 19.9115 -34.692
+       vertex 40 19.9115 -34.692
+       vertex 40 20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal 0 -0.511063 0.859543
+    outer loop
+       vertex 7.56406e-15 20.9652 -34.0655
+       vertex 7.70317e-15 19.9115 -34.692
+       vertex 40 20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal 0 -0.484437 0.874826
+    outer loop
+       vertex 7.83504e-15 18.839 -35.2859
+       vertex 40 18.839 -35.2859
+       vertex 40 19.9115 -34.692
+    endloop
+  endfacet
+  facet normal 0 -0.484437 0.874826
+    outer loop
+       vertex 7.70317e-15 19.9115 -34.692
+       vertex 7.83504e-15 18.839 -35.2859
+       vertex 40 19.9115 -34.692
+    endloop
+  endfacet
+  facet normal 0 -0.457364 0.88928
+    outer loop
+       vertex 7.95955e-15 17.7488 -35.8466
+       vertex 40 17.7488 -35.8466
+       vertex 40 18.839 -35.2859
+    endloop
+  endfacet
+  facet normal 0 -0.457364 0.88928
+    outer loop
+       vertex 7.83504e-15 18.839 -35.2859
+       vertex 7.95955e-15 17.7488 -35.8466
+       vertex 40 18.839 -35.2859
+    endloop
+  endfacet
+  facet normal 0 -0.429936 0.902859
+    outer loop
+       vertex 8.07658e-15 16.6419 -36.3737
+       vertex 40 16.6419 -36.3737
+       vertex 40 17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal 0 -0.429936 0.902859
+    outer loop
+       vertex 7.95955e-15 17.7488 -35.8466
+       vertex 8.07658e-15 16.6419 -36.3737
+       vertex 40 17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal 0 -0.402086 0.915602
+    outer loop
+       vertex 8.18603e-15 15.5195 -36.8666
+       vertex 40 15.5195 -36.8666
+       vertex 40 16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal 0 -0.402086 0.915602
+    outer loop
+       vertex 8.07658e-15 16.6419 -36.3737
+       vertex 8.18603e-15 15.5195 -36.8666
+       vertex 40 16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal 0 -0.373823 0.9275
+    outer loop
+       vertex 8.28779e-15 14.3824 -37.3249
+       vertex 40 14.3824 -37.3249
+       vertex 40 15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal 0 -0.373823 0.9275
+    outer loop
+       vertex 8.18603e-15 15.5195 -36.8666
+       vertex 8.28779e-15 14.3824 -37.3249
+       vertex 40 15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal 0 -0.345198 0.93853
+    outer loop
+       vertex 8.38176e-15 13.2318 -37.7481
+       vertex 40 13.2318 -37.7481
+       vertex 40 14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal 0 -0.345198 0.93853
+    outer loop
+       vertex 8.28779e-15 14.3824 -37.3249
+       vertex 8.38176e-15 13.2318 -37.7481
+       vertex 40 14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal 0 -0.316324 0.948651
+    outer loop
+       vertex 8.46786e-15 12.0688 -38.1359
+       vertex 40 12.0688 -38.1359
+       vertex 40 13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal 0 -0.316324 0.948651
+    outer loop
+       vertex 8.38176e-15 13.2318 -37.7481
+       vertex 8.46786e-15 12.0688 -38.1359
+       vertex 40 13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal 0 -0.287057 0.957913
+    outer loop
+       vertex 8.54601e-15 10.8945 -38.4878
+       vertex 40 10.8945 -38.4878
+       vertex 40 12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal 0 -0.287057 0.957913
+    outer loop
+       vertex 8.46786e-15 12.0688 -38.1359
+       vertex 8.54601e-15 10.8945 -38.4878
+       vertex 40 12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal 0 -0.257595 0.966253
+    outer loop
+       vertex 8.61612e-15 9.70992 -38.8036
+       vertex 40 9.70992 -38.8036
+       vertex 40 10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal 0 -0.257595 0.966253
+    outer loop
+       vertex 8.54601e-15 10.8945 -38.4878
+       vertex 8.61612e-15 9.70992 -38.8036
+       vertex 40 10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal 0 -0.227826 0.973702
+    outer loop
+       vertex 8.67815e-15 8.51622 -39.0829
+       vertex 40 8.51622 -39.0829
+       vertex 40 9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal 0 -0.227826 0.973702
+    outer loop
+       vertex 8.61612e-15 9.70992 -38.8036
+       vertex 8.67815e-15 8.51622 -39.0829
+       vertex 40 9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal 0 -0.19789 0.980224
+    outer loop
+       vertex 8.73202e-15 7.31453 -39.3255
+       vertex 40 7.31453 -39.3255
+       vertex 40 8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal 0 -0.19789 0.980224
+    outer loop
+       vertex 8.67815e-15 8.51622 -39.0829
+       vertex 8.73202e-15 7.31453 -39.3255
+       vertex 40 8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal 0 -0.16779 0.985823
+    outer loop
+       vertex 8.77769e-15 6.10597 -39.5312
+       vertex 40 6.10597 -39.5312
+       vertex 40 7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal 0 -0.16779 0.985823
+    outer loop
+       vertex 8.73202e-15 7.31453 -39.3255
+       vertex 8.77769e-15 6.10597 -39.5312
+       vertex 40 7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal 0 -0.137525 0.990498
+    outer loop
+       vertex 8.81512e-15 4.89167 -39.6998
+       vertex 40 4.89167 -39.6998
+       vertex 40 6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal 0 -0.137525 0.990498
+    outer loop
+       vertex 8.77769e-15 6.10597 -39.5312
+       vertex 8.81512e-15 4.89167 -39.6998
+       vertex 40 6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal 0 -0.107023 0.994257
+    outer loop
+       vertex 8.84426e-15 3.67278 -39.831
+       vertex 40 3.67278 -39.831
+       vertex 40 4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal 0 -0.107023 0.994257
+    outer loop
+       vertex 8.81512e-15 4.89167 -39.6998
+       vertex 8.84426e-15 3.67278 -39.831
+       vertex 40 4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal 0 -0.0765932 0.997062
+    outer loop
+       vertex 8.8651e-15 2.45044 -39.9249
+       vertex 40 2.45044 -39.9249
+       vertex 40 3.67278 -39.831
+    endloop
+  endfacet
+  facet normal 0 -0.0765932 0.997062
+    outer loop
+       vertex 8.84426e-15 3.67278 -39.831
+       vertex 8.8651e-15 2.45044 -39.9249
+       vertex 40 3.67278 -39.831
+    endloop
+  endfacet
+  facet normal 0 -0.0459247 0.998945
+    outer loop
+       vertex 8.87761e-15 1.22579 -39.9812
+       vertex 40 1.22579 -39.9812
+       vertex 40 2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal 0 -0.0459247 0.998945
+    outer loop
+       vertex 8.8651e-15 2.45044 -39.9249
+       vertex 8.87761e-15 1.22579 -39.9812
+       vertex 40 2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal 0 -0.0153343 0.999882
+    outer loop
+       vertex 8.88178e-15 0 -40
+       vertex 40 0 -40
+       vertex 40 1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal 0 -0.0153343 0.999882
+    outer loop
+       vertex 8.87761e-15 1.22579 -39.9812
+       vertex 8.88178e-15 0 -40
+       vertex 40 1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal 0 0.0153343 0.999882
+    outer loop
+       vertex 40 -1.22579 -39.9812
+       vertex 40 0 -40
+       vertex 8.88178e-15 0 -40
+    endloop
+  endfacet
+  facet normal -0 0.0153343 0.999882
+    outer loop
+       vertex 8.87761e-15 -1.22579 -39.9812
+       vertex 40 -1.22579 -39.9812
+       vertex 8.88178e-15 0 -40
+    endloop
+  endfacet
+  facet normal 0 0.0459247 0.998945
+    outer loop
+       vertex 40 -2.45044 -39.9249
+       vertex 40 -1.22579 -39.9812
+       vertex 8.87761e-15 -1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal -0 0.0459247 0.998945
+    outer loop
+       vertex 8.8651e-15 -2.45044 -39.9249
+       vertex 40 -2.45044 -39.9249
+       vertex 8.87761e-15 -1.22579 -39.9812
+    endloop
+  endfacet
+  facet normal 0 0.0765932 0.997062
+    outer loop
+       vertex 40 -3.67278 -39.831
+       vertex 40 -2.45044 -39.9249
+       vertex 8.8651e-15 -2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal -0 0.0765932 0.997062
+    outer loop
+       vertex 8.84426e-15 -3.67278 -39.831
+       vertex 40 -3.67278 -39.831
+       vertex 8.8651e-15 -2.45044 -39.9249
+    endloop
+  endfacet
+  facet normal 0 0.107023 0.994257
+    outer loop
+       vertex 40 -4.89167 -39.6998
+       vertex 40 -3.67278 -39.831
+       vertex 8.84426e-15 -3.67278 -39.831
+    endloop
+  endfacet
+  facet normal -0 0.107023 0.994257
+    outer loop
+       vertex 8.81512e-15 -4.89167 -39.6998
+       vertex 40 -4.89167 -39.6998
+       vertex 8.84426e-15 -3.67278 -39.831
+    endloop
+  endfacet
+  facet normal 0 0.137525 0.990498
+    outer loop
+       vertex 40 -6.10597 -39.5312
+       vertex 40 -4.89167 -39.6998
+       vertex 8.81512e-15 -4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal -0 0.137525 0.990498
+    outer loop
+       vertex 8.77769e-15 -6.10597 -39.5312
+       vertex 40 -6.10597 -39.5312
+       vertex 8.81512e-15 -4.89167 -39.6998
+    endloop
+  endfacet
+  facet normal 0 0.16779 0.985823
+    outer loop
+       vertex 40 -7.31453 -39.3255
+       vertex 40 -6.10597 -39.5312
+       vertex 8.77769e-15 -6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal -0 0.16779 0.985823
+    outer loop
+       vertex 8.73202e-15 -7.31453 -39.3255
+       vertex 40 -7.31453 -39.3255
+       vertex 8.77769e-15 -6.10597 -39.5312
+    endloop
+  endfacet
+  facet normal 0 0.19789 0.980224
+    outer loop
+       vertex 40 -8.51622 -39.0829
+       vertex 40 -7.31453 -39.3255
+       vertex 8.73202e-15 -7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal -0 0.19789 0.980224
+    outer loop
+       vertex 8.67815e-15 -8.51622 -39.0829
+       vertex 40 -8.51622 -39.0829
+       vertex 8.73202e-15 -7.31453 -39.3255
+    endloop
+  endfacet
+  facet normal 0 0.227826 0.973702
+    outer loop
+       vertex 40 -9.70992 -38.8036
+       vertex 40 -8.51622 -39.0829
+       vertex 8.67815e-15 -8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal -0 0.227826 0.973702
+    outer loop
+       vertex 8.61612e-15 -9.70992 -38.8036
+       vertex 40 -9.70992 -38.8036
+       vertex 8.67815e-15 -8.51622 -39.0829
+    endloop
+  endfacet
+  facet normal 0 0.257595 0.966253
+    outer loop
+       vertex 40 -10.8945 -38.4878
+       vertex 40 -9.70992 -38.8036
+       vertex 8.61612e-15 -9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal -0 0.257595 0.966253
+    outer loop
+       vertex 8.54601e-15 -10.8945 -38.4878
+       vertex 40 -10.8945 -38.4878
+       vertex 8.61612e-15 -9.70992 -38.8036
+    endloop
+  endfacet
+  facet normal 0 0.287057 0.957913
+    outer loop
+       vertex 40 -12.0688 -38.1359
+       vertex 40 -10.8945 -38.4878
+       vertex 8.54601e-15 -10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal -0 0.287057 0.957913
+    outer loop
+       vertex 8.46786e-15 -12.0688 -38.1359
+       vertex 40 -12.0688 -38.1359
+       vertex 8.54601e-15 -10.8945 -38.4878
+    endloop
+  endfacet
+  facet normal 0 0.316324 0.948651
+    outer loop
+       vertex 40 -13.2318 -37.7481
+       vertex 40 -12.0688 -38.1359
+       vertex 8.46786e-15 -12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal -0 0.316324 0.948651
+    outer loop
+       vertex 8.38176e-15 -13.2318 -37.7481
+       vertex 40 -13.2318 -37.7481
+       vertex 8.46786e-15 -12.0688 -38.1359
+    endloop
+  endfacet
+  facet normal 0 0.345198 0.93853
+    outer loop
+       vertex 40 -14.3824 -37.3249
+       vertex 40 -13.2318 -37.7481
+       vertex 8.38176e-15 -13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal -0 0.345198 0.93853
+    outer loop
+       vertex 8.28779e-15 -14.3824 -37.3249
+       vertex 40 -14.3824 -37.3249
+       vertex 8.38176e-15 -13.2318 -37.7481
+    endloop
+  endfacet
+  facet normal 0 0.373823 0.9275
+    outer loop
+       vertex 40 -15.5195 -36.8666
+       vertex 40 -14.3824 -37.3249
+       vertex 8.28779e-15 -14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal -0 0.373823 0.9275
+    outer loop
+       vertex 8.18603e-15 -15.5195 -36.8666
+       vertex 40 -15.5195 -36.8666
+       vertex 8.28779e-15 -14.3824 -37.3249
+    endloop
+  endfacet
+  facet normal 0 0.402086 0.915602
+    outer loop
+       vertex 40 -16.6419 -36.3737
+       vertex 40 -15.5195 -36.8666
+       vertex 8.18603e-15 -15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal -0 0.402086 0.915602
+    outer loop
+       vertex 8.07658e-15 -16.6419 -36.3737
+       vertex 40 -16.6419 -36.3737
+       vertex 8.18603e-15 -15.5195 -36.8666
+    endloop
+  endfacet
+  facet normal 0 0.429936 0.902859
+    outer loop
+       vertex 40 -17.7488 -35.8466
+       vertex 40 -16.6419 -36.3737
+       vertex 8.07658e-15 -16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal -0 0.429936 0.902859
+    outer loop
+       vertex 7.95955e-15 -17.7488 -35.8466
+       vertex 40 -17.7488 -35.8466
+       vertex 8.07658e-15 -16.6419 -36.3737
+    endloop
+  endfacet
+  facet normal 0 0.457364 0.88928
+    outer loop
+       vertex 40 -18.839 -35.2859
+       vertex 40 -17.7488 -35.8466
+       vertex 7.95955e-15 -17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal -0 0.457364 0.88928
+    outer loop
+       vertex 7.83504e-15 -18.839 -35.2859
+       vertex 40 -18.839 -35.2859
+       vertex 7.95955e-15 -17.7488 -35.8466
+    endloop
+  endfacet
+  facet normal 0 0.484437 0.874826
+    outer loop
+       vertex 40 -19.9115 -34.692
+       vertex 40 -18.839 -35.2859
+       vertex 7.83504e-15 -18.839 -35.2859
+    endloop
+  endfacet
+  facet normal -0 0.484437 0.874826
+    outer loop
+       vertex 7.70317e-15 -19.9115 -34.692
+       vertex 40 -19.9115 -34.692
+       vertex 7.83504e-15 -18.839 -35.2859
+    endloop
+  endfacet
+  facet normal 0 0.511063 0.859543
+    outer loop
+       vertex 40 -20.9652 -34.0655
+       vertex 40 -19.9115 -34.692
+       vertex 7.70317e-15 -19.9115 -34.692
+    endloop
+  endfacet
+  facet normal -0 0.511063 0.859543
+    outer loop
+       vertex 7.56406e-15 -20.9652 -34.0655
+       vertex 40 -20.9652 -34.0655
+       vertex 7.70317e-15 -19.9115 -34.692
+    endloop
+  endfacet
+  facet normal 0 0.537127 0.843501
+    outer loop
+       vertex 40 -21.9993 -33.407
+       vertex 40 -20.9652 -34.0655
+       vertex 7.56406e-15 -20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal -0 0.537127 0.843501
+    outer loop
+       vertex 7.41785e-15 -21.9993 -33.407
+       vertex 40 -21.9993 -33.407
+       vertex 7.56406e-15 -20.9652 -34.0655
+    endloop
+  endfacet
+  facet normal 0 0.562694 0.826665
+    outer loop
+       vertex 40 -23.0127 -32.7172
+       vertex 40 -21.9993 -33.407
+       vertex 7.41785e-15 -21.9993 -33.407
+    endloop
+  endfacet
+  facet normal -0 0.562694 0.826665
+    outer loop
+       vertex 7.26467e-15 -23.0127 -32.7172
+       vertex 40 -23.0127 -32.7172
+       vertex 7.41785e-15 -21.9993 -33.407
+    endloop
+  endfacet
+  facet normal 0 0.587755 0.809039
+    outer loop
+       vertex 40 -24.0046 -31.9966
+       vertex 40 -23.0127 -32.7172
+       vertex 7.26467e-15 -23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal -0 0.587755 0.809039
+    outer loop
+       vertex 7.10467e-15 -24.0046 -31.9966
+       vertex 40 -24.0046 -31.9966
+       vertex 7.26467e-15 -23.0127 -32.7172
+    endloop
+  endfacet
+  facet normal 0 0.612352 0.790585
+    outer loop
+       vertex 40 -24.9738 -31.2459
+       vertex 40 -24.0046 -31.9966
+       vertex 7.10467e-15 -24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal -0 0.612352 0.790585
+    outer loop
+       vertex 6.93799e-15 -24.9738 -31.2459
+       vertex 40 -24.9738 -31.2459
+       vertex 7.10467e-15 -24.0046 -31.9966
+    endloop
+  endfacet
+  facet normal 0 0.636244 0.771488
+    outer loop
+       vertex 40 -25.9196 -30.4659
+       vertex 40 -24.9738 -31.2459
+       vertex 6.93799e-15 -24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal -0 0.636244 0.771488
+    outer loop
+       vertex 6.7648e-15 -25.9196 -30.4659
+       vertex 40 -25.9196 -30.4659
+       vertex 6.93799e-15 -24.9738 -31.2459
+    endloop
+  endfacet
+  facet normal 0 0.65956 0.751652
+    outer loop
+       vertex 40 -26.8411 -29.6573
+       vertex 40 -25.9196 -30.4659
+       vertex 6.7648e-15 -25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal -0 0.65956 0.751652
+    outer loop
+       vertex 6.58525e-15 -26.8411 -29.6573
+       vertex 40 -26.8411 -29.6573
+       vertex 6.7648e-15 -25.9196 -30.4659
+    endloop
+  endfacet
+  facet normal 0 0.682295 0.731077
+    outer loop
+       vertex 40 -27.7373 -28.8209
+       vertex 40 -26.8411 -29.6573
+       vertex 6.58525e-15 -26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal -0 0.682295 0.731077
+    outer loop
+       vertex 6.39952e-15 -27.7373 -28.8209
+       vertex 40 -27.7373 -28.8209
+       vertex 6.58525e-15 -26.8411 -29.6573
+    endloop
+  endfacet
+  facet normal 0 0.70441 0.709793
+    outer loop
+       vertex 40 -28.6075 -27.9573
+       vertex 40 -27.7373 -28.8209
+       vertex 6.39952e-15 -27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal -0 0.70441 0.709793
+    outer loop
+       vertex 6.20777e-15 -28.6075 -27.9573
+       vertex 40 -28.6075 -27.9573
+       vertex 6.39952e-15 -27.7373 -28.8209
+    endloop
+  endfacet
+  facet normal 0 0.725818 0.687887
+    outer loop
+       vertex 40 -28.6075 -27.9573
+       vertex 6.20777e-15 -28.6075 -27.9573
+       vertex 40 -29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal 0 0.725818 0.687887
+    outer loop
+       vertex 40 -29.4508 -27.0675
+       vertex 6.20777e-15 -28.6075 -27.9573
+       vertex 6.0102e-15 -29.4508 -27.0675
+    endloop
+  endfacet
+  facet normal 0 0.746563 0.665315
+    outer loop
+       vertex 40 -29.4508 -27.0675
+       vertex 6.0102e-15 -29.4508 -27.0675
+       vertex 40 -30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal 0 0.746563 0.665315
+    outer loop
+       vertex 40 -30.2664 -26.1523
+       vertex 6.0102e-15 -29.4508 -27.0675
+       vertex 5.80697e-15 -30.2664 -26.1523
+    endloop
+  endfacet
+  facet normal 0 0.766561 0.642172
+    outer loop
+       vertex 40 -30.2664 -26.1523
+       vertex 5.80697e-15 -30.2664 -26.1523
+       vertex 40 -31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal 0 0.766561 0.642172
+    outer loop
+       vertex 40 -31.0537 -25.2125
+       vertex 5.80697e-15 -30.2664 -26.1523
+       vertex 5.5983e-15 -31.0537 -25.2125
+    endloop
+  endfacet
+  facet normal 0 0.785935 0.618309
+    outer loop
+       vertex 40 -31.0537 -25.2125
+       vertex 5.5983e-15 -31.0537 -25.2125
+       vertex 40 -31.8117 -24.249
+    endloop
+  endfacet
+  facet normal 0 0.785935 0.618309
+    outer loop
+       vertex 40 -31.8117 -24.249
+       vertex 5.5983e-15 -31.0537 -25.2125
+       vertex 5.38436e-15 -31.8117 -24.249
+    endloop
+  endfacet
+  facet normal 0 0.804461 0.594006
+    outer loop
+       vertex 40 -31.8117 -24.249
+       vertex 5.38436e-15 -31.8117 -24.249
+       vertex 40 -32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal 0 0.804461 0.594006
+    outer loop
+       vertex 40 -32.5399 -23.2628
+       vertex 5.38436e-15 -31.8117 -24.249
+       vertex 5.16537e-15 -32.5399 -23.2628
+    endloop
+  endfacet
+  facet normal 0 0.822314 0.569034
+    outer loop
+       vertex 40 -32.5399 -23.2628
+       vertex 5.16537e-15 -32.5399 -23.2628
+       vertex 40 -33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal 0 0.822314 0.569034
+    outer loop
+       vertex 40 -33.2375 -22.2547
+       vertex 5.16537e-15 -32.5399 -23.2628
+       vertex 4.94153e-15 -33.2375 -22.2547
+    endloop
+  endfacet
+  facet normal 0 0.839379 0.543546
+    outer loop
+       vertex 40 -33.2375 -22.2547
+       vertex 4.94153e-15 -33.2375 -22.2547
+       vertex 40 -33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal 0 0.839379 0.543546
+    outer loop
+       vertex 40 -33.9039 -21.2256
+       vertex 4.94153e-15 -33.2375 -22.2547
+       vertex 4.71304e-15 -33.9039 -21.2256
+    endloop
+  endfacet
+  facet normal 0 0.855631 0.517587
+    outer loop
+       vertex 40 -33.9039 -21.2256
+       vertex 4.71304e-15 -33.9039 -21.2256
+       vertex 40 -34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal 0 0.855631 0.517587
+    outer loop
+       vertex 40 -34.5384 -20.1767
+       vertex 4.71304e-15 -33.9039 -21.2256
+       vertex 4.48013e-15 -34.5384 -20.1767
+    endloop
+  endfacet
+  facet normal 0 0.871085 0.491133
+    outer loop
+       vertex 40 -34.5384 -20.1767
+       vertex 4.48013e-15 -34.5384 -20.1767
+       vertex 40 -35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal 0 0.871085 0.491133
+    outer loop
+       vertex 40 -35.1405 -19.1088
+       vertex 4.48013e-15 -34.5384 -20.1767
+       vertex 4.243e-15 -35.1405 -19.1088
+    endloop
+  endfacet
+  facet normal 0 0.885733 0.464195
+    outer loop
+       vertex 40 -35.1405 -19.1088
+       vertex 4.243e-15 -35.1405 -19.1088
+       vertex 40 -35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal 0 0.885733 0.464195
+    outer loop
+       vertex 40 -35.7096 -18.0229
+       vertex 4.243e-15 -35.1405 -19.1088
+       vertex 4.0019e-15 -35.7096 -18.0229
+    endloop
+  endfacet
+  facet normal 0 0.899539 0.43684
+    outer loop
+       vertex 40 -35.7096 -18.0229
+       vertex 4.0019e-15 -35.7096 -18.0229
+       vertex 40 -36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal 0 0.899539 0.43684
+    outer loop
+       vertex 40 -36.2451 -16.9202
+       vertex 4.0019e-15 -35.7096 -18.0229
+       vertex 3.75703e-15 -36.2451 -16.9202
+    endloop
+  endfacet
+  facet normal 0 0.912504 0.409067
+    outer loop
+       vertex 40 -36.2451 -16.9202
+       vertex 3.75703e-15 -36.2451 -16.9202
+       vertex 40 -36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal 0 0.912504 0.409067
+    outer loop
+       vertex 40 -36.7466 -15.8015
+       vertex 3.75703e-15 -36.2451 -16.9202
+       vertex 3.50863e-15 -36.7466 -15.8015
+    endloop
+  endfacet
+  facet normal 0 0.924602 0.380934
+    outer loop
+       vertex 40 -36.7466 -15.8015
+       vertex 3.50863e-15 -36.7466 -15.8015
+       vertex 40 -37.2136 -14.668
+    endloop
+  endfacet
+  facet normal 0 0.924602 0.380934
+    outer loop
+       vertex 40 -37.2136 -14.668
+       vertex 3.50863e-15 -36.7466 -15.8015
+       vertex 3.25694e-15 -37.2136 -14.668
+    endloop
+  endfacet
+  facet normal 0 0.935856 0.352383
+    outer loop
+       vertex 40 -37.2136 -14.668
+       vertex 3.25694e-15 -37.2136 -14.668
+       vertex 40 -37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal 0 0.935856 0.352383
+    outer loop
+       vertex 40 -37.6456 -13.5207
+       vertex 3.25694e-15 -37.2136 -14.668
+       vertex 3.00219e-15 -37.6456 -13.5207
+    endloop
+  endfacet
+  facet normal 0 0.946199 0.323585
+    outer loop
+       vertex 40 -37.6456 -13.5207
+       vertex 3.00219e-15 -37.6456 -13.5207
+       vertex 40 -38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal 0 0.946199 0.323585
+    outer loop
+       vertex 40 -38.0423 -12.3607
+       vertex 3.00219e-15 -37.6456 -13.5207
+       vertex 2.74462e-15 -38.0423 -12.3607
+    endloop
+  endfacet
+  facet normal 0 0.955686 0.294388
+    outer loop
+       vertex 40 -38.0423 -12.3607
+       vertex 2.74462e-15 -38.0423 -12.3607
+       vertex 40 -38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal 0 0.955686 0.294388
+    outer loop
+       vertex 40 -38.4032 -11.1891
+       vertex 2.74462e-15 -38.0423 -12.3607
+       vertex 2.48447e-15 -38.4032 -11.1891
+    endloop
+  endfacet
+  facet normal 0 0.964263 0.264948
+    outer loop
+       vertex 40 -38.4032 -11.1891
+       vertex 2.48447e-15 -38.4032 -11.1891
+       vertex 40 -38.728 -10.007
+    endloop
+  endfacet
+  facet normal 0 0.964263 0.264948
+    outer loop
+       vertex 40 -38.728 -10.007
+       vertex 2.48447e-15 -38.4032 -11.1891
+       vertex 2.22199e-15 -38.728 -10.007
+    endloop
+  endfacet
+  facet normal 0 0.971918 0.235319
+    outer loop
+       vertex 40 -38.728 -10.007
+       vertex 2.22199e-15 -38.728 -10.007
+       vertex 40 -39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal 0 0.971918 0.235319
+    outer loop
+       vertex 40 -39.0165 -8.81544
+       vertex 2.22199e-15 -38.728 -10.007
+       vertex 1.95742e-15 -39.0165 -8.81544
+    endloop
+  endfacet
+  facet normal 0 0.978679 0.205394
+    outer loop
+       vertex 40 -39.0165 -8.81544
+       vertex 1.95742e-15 -39.0165 -8.81544
+       vertex 40 -39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal 0 0.978679 0.205394
+    outer loop
+       vertex 40 -39.2683 -7.61564
+       vertex 1.95742e-15 -39.0165 -8.81544
+       vertex 1.69101e-15 -39.2683 -7.61564
+    endloop
+  endfacet
+  facet normal 0 0.984502 0.175374
+    outer loop
+       vertex 40 -39.2683 -7.61564
+       vertex 1.69101e-15 -39.2683 -7.61564
+       vertex 40 -39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal 0 0.984502 0.175374
+    outer loop
+       vertex 40 -39.4833 -6.40869
+       vertex 1.69101e-15 -39.2683 -7.61564
+       vertex 1.42302e-15 -39.4833 -6.40869
+    endloop
+  endfacet
+  facet normal 0 0.989427 0.145032
+    outer loop
+       vertex 40 -39.4833 -6.40869
+       vertex 1.42302e-15 -39.4833 -6.40869
+       vertex 40 -39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal 0 0.989427 0.145032
+    outer loop
+       vertex 40 -39.6611 -5.19572
+       vertex 1.42302e-15 -39.4833 -6.40869
+       vertex 1.15368e-15 -39.6611 -5.19572
+    endloop
+  endfacet
+  facet normal 0 0.993401 0.114689
+    outer loop
+       vertex 40 -39.6611 -5.19572
+       vertex 1.15368e-15 -39.6611 -5.19572
+       vertex 40 -39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal 0 0.993401 0.114689
+    outer loop
+       vertex 40 -39.8017 -3.97787
+       vertex 1.15368e-15 -39.6611 -5.19572
+       vertex 8.83265e-16 -39.8017 -3.97787
+    endloop
+  endfacet
+  facet normal 0 0.996451 0.0841801
+    outer loop
+       vertex 40 -39.8017 -3.97787
+       vertex 8.83265e-16 -39.8017 -3.97787
+       vertex 40 -39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal 0 0.996451 0.0841801
+    outer loop
+       vertex 40 -39.9049 -2.75629
+       vertex 8.83265e-16 -39.8017 -3.97787
+       vertex 6.12018e-16 -39.9049 -2.75629
+    endloop
+  endfacet
+  facet normal 0 0.998563 0.0535919
+    outer loop
+       vertex 40 -39.9049 -2.75629
+       vertex 6.12018e-16 -39.9049 -2.75629
+       vertex 40 -39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal 0 0.998563 0.0535919
+    outer loop
+       vertex 40 -39.9706 -1.53211
+       vertex 6.12018e-16 -39.9049 -2.75629
+       vertex 3.40197e-16 -39.9706 -1.53211
+    endloop
+  endfacet
+  facet normal 0 0.999735 0.0230013
+    outer loop
+       vertex 40 -39.9706 -1.53211
+       vertex 3.40197e-16 -39.9706 -1.53211
+       vertex 40 -39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal 0 0.999735 0.0230013
+    outer loop
+       vertex 40 -39.9988 -0.306494
+       vertex 3.40197e-16 -39.9706 -1.53211
+       vertex 6.80553e-17 -39.9988 -0.306494
+    endloop
+  endfacet
+  facet normal 0 0.999971 -0.00766711
+    outer loop
+       vertex 40 -39.9988 -0.306494
+       vertex 6.80553e-17 -39.9988 -0.306494
+       vertex 40 -39.9894 0.91941
+    endloop
+  endfacet
+  facet normal 0 0.999971 -0.00766711
+    outer loop
+       vertex 40 -39.9894 0.91941
+       vertex 6.80553e-17 -39.9988 -0.306494
+       vertex -2.0415e-16 -39.9894 0.91941
+    endloop
+  endfacet
+  facet normal 0 0.999268 -0.0382547
+    outer loop
+       vertex 40 -39.9894 0.91941
+       vertex -2.0415e-16 -39.9894 0.91941
+       vertex 40 -39.9425 2.14445
+    endloop
+  endfacet
+  facet normal 0 0.999268 -0.0382547
+    outer loop
+       vertex 40 -39.9425 2.14445
+       vertex -2.0415e-16 -39.9894 0.91941
+       vertex -4.76163e-16 -39.9425 2.14445
+    endloop
+  endfacet
+  facet normal 0 0.997622 -0.0689259
+    outer loop
+       vertex 40 -39.9425 2.14445
+       vertex -4.76163e-16 -39.9425 2.14445
+       vertex 40 -39.858 3.36748
+    endloop
+  endfacet
+  facet normal 1.7255e-08 0.997622 -0.0689264
+    outer loop
+       vertex 40 -39.858 3.36748
+       vertex -4.76163e-16 -39.9425 2.14445
+       vertex -7.4773e-16 -39.858 3.36747
+    endloop
+  endfacet
+  facet normal 2.48928e-08 0.995044 -0.0994363
+    outer loop
+       vertex 40 -39.858 3.36748
+       vertex -7.4773e-16 -39.858 3.36747
+       vertex 40 -39.7361 4.58734
+    endloop
+  endfacet
+  facet normal 0 0.995044 -0.0994355
+    outer loop
+       vertex 40 -39.7361 4.58734
+       vertex -7.4773e-16 -39.858 3.36747
+       vertex -1.01859e-15 -39.7361 4.58734
+    endloop
+  endfacet
+  facet normal 0 0.991522 -0.129939
+    outer loop
+       vertex 40 -39.7361 4.58734
+       vertex -1.01859e-15 -39.7361 4.58734
+       vertex 40 -39.5768 5.80289
+    endloop
+  endfacet
+  facet normal 0 0.991522 -0.129939
+    outer loop
+       vertex 40 -39.5768 5.80289
+       vertex -1.01859e-15 -39.7361 4.58734
+       vertex -1.2885e-15 -39.5768 5.80289
+    endloop
+  endfacet
+  facet normal 0 0.987084 -0.160204
+    outer loop
+       vertex 40 -39.5768 5.80289
+       vertex -1.2885e-15 -39.5768 5.80289
+       vertex 40 -39.3804 7.01299
+    endloop
+  endfacet
+  facet normal 0 0.987084 -0.160204
+    outer loop
+       vertex 40 -39.3804 7.01299
+       vertex -1.2885e-15 -39.5768 5.80289
+       vertex -1.5572e-15 -39.3804 7.01299
+    endloop
+  endfacet
+  facet normal 0 0.981709 -0.190386
+    outer loop
+       vertex 40 -39.3804 7.01299
+       vertex -1.5572e-15 -39.3804 7.01299
+       vertex 40 -39.147 8.21651
+    endloop
+  endfacet
+  facet normal 0 0.981709 -0.190386
+    outer loop
+       vertex 40 -39.147 8.21651
+       vertex -1.5572e-15 -39.3804 7.01299
+       vertex -1.82443e-15 -39.147 8.21651
+    endloop
+  endfacet
+  facet normal 0 0.975409 -0.220402
+    outer loop
+       vertex 40 -39.147 8.21651
+       vertex -1.82443e-15 -39.147 8.21651
+       vertex 40 -38.8768 9.4123
+    endloop
+  endfacet
+  facet normal 0 0.975409 -0.220402
+    outer loop
+       vertex 40 -38.8768 9.4123
+       vertex -1.82443e-15 -39.147 8.21651
+       vertex -2.08995e-15 -38.8768 9.4123
+    endloop
+  endfacet
+  facet normal 0 0.968202 -0.250168
+    outer loop
+       vertex 40 -38.8768 9.4123
+       vertex -2.08995e-15 -38.8768 9.4123
+       vertex 40 -38.5701 10.5993
+    endloop
+  endfacet
+  facet normal 0 0.968202 -0.250168
+    outer loop
+       vertex 40 -38.5701 10.5993
+       vertex -2.08995e-15 -38.8768 9.4123
+       vertex -2.35351e-15 -38.5701 10.5993
+    endloop
+  endfacet
+  facet normal 0 0.960086 -0.279705
+    outer loop
+       vertex 40 -38.5701 10.5993
+       vertex -2.35351e-15 -38.5701 10.5993
+       vertex 40 -38.2272 11.7763
+    endloop
+  endfacet
+  facet normal 0 0.960086 -0.279705
+    outer loop
+       vertex 40 -38.2272 11.7763
+       vertex -2.35351e-15 -38.5701 10.5993
+       vertex -2.61485e-15 -38.2272 11.7763
+    endloop
+  endfacet
+  facet normal 0 0.951062 -0.308999
+    outer loop
+       vertex 40 -38.2272 11.7763
+       vertex -2.61485e-15 -38.2272 11.7763
+       vertex 40 -37.8484 12.9422
+    endloop
+  endfacet
+  facet normal 0 0.951062 -0.308999
+    outer loop
+       vertex 40 -37.8484 12.9422
+       vertex -2.61485e-15 -38.2272 11.7763
+       vertex -2.87375e-15 -37.8484 12.9422
+    endloop
+  endfacet
+  facet normal 0 0.941138 -0.338022
+    outer loop
+       vertex 40 -37.8484 12.9422
+       vertex -2.87375e-15 -37.8484 12.9422
+       vertex 40 -37.434 14.096
+    endloop
+  endfacet
+  facet normal 0 0.941138 -0.338022
+    outer loop
+       vertex 40 -37.434 14.096
+       vertex -2.87375e-15 -37.8484 12.9422
+       vertex -3.12994e-15 -37.434 14.096
+    endloop
+  endfacet
+  facet normal 0 0.930323 -0.366742
+    outer loop
+       vertex 40 -37.434 14.096
+       vertex -3.12994e-15 -37.434 14.096
+       vertex 40 -36.9844 15.2365
+    endloop
+  endfacet
+  facet normal 0 0.930323 -0.366742
+    outer loop
+       vertex 40 -36.9844 15.2365
+       vertex -3.12994e-15 -37.434 14.096
+       vertex -3.38319e-15 -36.9844 15.2365
+    endloop
+  endfacet
+  facet normal 0 0.918658 -0.395053
+    outer loop
+       vertex 40 -36.9844 15.2365
+       vertex -3.38319e-15 -36.9844 15.2365
+       vertex 40 -36.5001 16.3627
+    endloop
+  endfacet
+  facet normal 0 0.918658 -0.395053
+    outer loop
+       vertex 40 -36.5001 16.3627
+       vertex -3.38319e-15 -36.9844 15.2365
+       vertex -3.63326e-15 -36.5001 16.3627
+    endloop
+  endfacet
+  facet normal 0 0.906159 -0.422937
+    outer loop
+       vertex 40 -36.5001 16.3627
+       vertex -3.63326e-15 -36.5001 16.3627
+       vertex 40 -35.9816 17.4736
+    endloop
+  endfacet
+  facet normal 0 0.906159 -0.422937
+    outer loop
+       vertex 40 -35.9816 17.4736
+       vertex -3.63326e-15 -36.5001 16.3627
+       vertex -3.87992e-15 -35.9816 17.4736
+    endloop
+  endfacet
+  facet normal 0 0.892723 -0.450605
+    outer loop
+       vertex 40 -35.9816 17.4736
+       vertex -3.87992e-15 -35.9816 17.4736
+       vertex 40 -35.4292 18.568
+    endloop
+  endfacet
+  facet normal 0 0.892723 -0.450605
+    outer loop
+       vertex 40 -35.4292 18.568
+       vertex -3.87992e-15 -35.9816 17.4736
+       vertex -4.12293e-15 -35.4292 18.568
+    endloop
+  endfacet
+  facet normal 0 0.878515 -0.477716
+    outer loop
+       vertex 40 -35.4292 18.568
+       vertex -4.12293e-15 -35.4292 18.568
+       vertex 40 -34.8435 19.6451
+    endloop
+  endfacet
+  facet normal 1.18461e-06 0.878496 -0.477749
+    outer loop
+       vertex 40 -34.8435 19.6451
+       vertex -4.12293e-15 -35.4292 18.568
+       vertex -4.36208e-15 -34.8435 19.645
+    endloop
+  endfacet
+  facet normal 1.25064e-06 0.863481 -0.504382
+    outer loop
+       vertex 40 -34.8435 19.6451
+       vertex -4.36208e-15 -34.8435 19.645
+       vertex 40 -34.2252 20.7036
+    endloop
+  endfacet
+  facet normal 0 0.863501 -0.504346
+    outer loop
+       vertex 40 -34.2252 20.7036
+       vertex -4.36208e-15 -34.8435 19.645
+       vertex -4.59712e-15 -34.2252 20.7036
+    endloop
+  endfacet
+  facet normal 0 0.847572 -0.530681
+    outer loop
+       vertex 40 -34.2252 20.7036
+       vertex -4.59712e-15 -34.2252 20.7036
+       vertex 40 -33.5746 21.7427
+    endloop
+  endfacet
+  facet normal 0 0.847572 -0.530681
+    outer loop
+       vertex 40 -33.5746 21.7427
+       vertex -4.59712e-15 -34.2252 20.7036
+       vertex -4.82785e-15 -33.5746 21.7427
+    endloop
+  endfacet
+  facet normal 0 0.830932 -0.556374
+    outer loop
+       vertex 40 -33.5746 21.7427
+       vertex -4.82785e-15 -33.5746 21.7427
+       vertex 40 -32.8925 22.7614
+    endloop
+  endfacet
+  facet normal 0 0.830932 -0.556374
+    outer loop
+       vertex 40 -32.8925 22.7614
+       vertex -4.82785e-15 -33.5746 21.7427
+       vertex -5.05404e-15 -32.8925 22.7614
+    endloop
+  endfacet
+  facet normal 0 0.813523 -0.581533
+    outer loop
+       vertex 40 -32.8925 22.7614
+       vertex -5.05404e-15 -32.8925 22.7614
+       vertex 40 -32.1796 23.7587
+    endloop
+  endfacet
+  facet normal 0 0.813523 -0.581533
+    outer loop
+       vertex 40 -32.1796 23.7587
+       vertex -5.05404e-15 -32.8925 22.7614
+       vertex -5.27549e-15 -32.1796 23.7587
+    endloop
+  endfacet
+  facet normal 0 0.795297 -0.60622
+    outer loop
+       vertex 40 -32.1796 23.7587
+       vertex -5.27549e-15 -32.1796 23.7587
+       vertex 40 -31.4364 24.7337
+    endloop
+  endfacet
+  facet normal 0 0.795297 -0.60622
+    outer loop
+       vertex 40 -31.4364 24.7337
+       vertex -5.27549e-15 -32.1796 23.7587
+       vertex -5.49198e-15 -31.4364 24.7337
+    endloop
+  endfacet
+  facet normal 0 0.776336 -0.630319
+    outer loop
+       vertex 40 -31.4364 24.7337
+       vertex -5.49198e-15 -31.4364 24.7337
+       vertex 40 -30.6637 25.6854
+    endloop
+  endfacet
+  facet normal 0 0.776336 -0.630319
+    outer loop
+       vertex 40 -30.6637 25.6854
+       vertex -5.49198e-15 -31.4364 24.7337
+       vertex -5.70331e-15 -30.6637 25.6854
+    endloop
+  endfacet
+  facet normal 0 0.756625 -0.653849
+    outer loop
+       vertex 40 -30.6637 25.6854
+       vertex -5.70331e-15 -30.6637 25.6854
+       vertex 40 -29.8621 26.613
+    endloop
+  endfacet
+  facet normal 0 0.756625 -0.653849
+    outer loop
+       vertex 40 -29.8621 26.613
+       vertex -5.70331e-15 -30.6637 25.6854
+       vertex -5.90928e-15 -29.8621 26.613
+    endloop
+  endfacet
+  facet normal 0 0.736289 -0.676667
+    outer loop
+       vertex 40 -29.8621 26.613
+       vertex -5.90928e-15 -29.8621 26.613
+       vertex 40 -29.0325 27.5157
+    endloop
+  endfacet
+  facet normal 1.67793e-06 0.736252 -0.676707
+    outer loop
+       vertex 40 -29.0325 27.5157
+       vertex -5.90928e-15 -29.8621 26.613
+       vertex -6.1097e-15 -29.0325 27.5156
+    endloop
+  endfacet
+  facet normal 1.73307e-06 0.715178 -0.698943
+    outer loop
+       vertex 40 -29.0325 27.5157
+       vertex -6.1097e-15 -29.0325 27.5156
+       vertex 40 -28.1757 28.3924
+    endloop
+  endfacet
+  facet normal 0 0.715217 -0.698902
+    outer loop
+       vertex 40 -28.1757 28.3924
+       vertex -6.1097e-15 -29.0325 27.5156
+       vertex -6.30439e-15 -28.1757 28.3924
+    endloop
+  endfacet
+  facet normal 0 0.693437 -0.720518
+    outer loop
+       vertex 40 -28.1757 28.3924
+       vertex -6.30439e-15 -28.1757 28.3924
+       vertex 40 -27.2924 29.2425
+    endloop
+  endfacet
+  facet normal 0 0.693437 -0.720518
+    outer loop
+       vertex 40 -27.2924 29.2425
+       vertex -6.30439e-15 -28.1757 28.3924
+       vertex -6.49315e-15 -27.2924 29.2425
+    endloop
+  endfacet
+  facet normal 0 0.671035 -0.741426
+    outer loop
+       vertex 40 -27.2924 29.2425
+       vertex -6.49315e-15 -27.2924 29.2425
+       vertex 40 -26.3834 30.0652
+    endloop
+  endfacet
+  facet normal 0 0.671035 -0.741426
+    outer loop
+       vertex 40 -26.3834 30.0652
+       vertex -6.49315e-15 -27.2924 29.2425
+       vertex -6.67581e-15 -26.3834 30.0652
+    endloop
+  endfacet
+  facet normal 0 0.648005 -0.761636
+    outer loop
+       vertex 40 -26.3834 30.0652
+       vertex -6.67581e-15 -26.3834 30.0652
+       vertex 40 -25.4497 30.8596
+    endloop
+  endfacet
+  facet normal 0 0.648005 -0.761636
+    outer loop
+       vertex 40 -25.4497 30.8596
+       vertex -6.67581e-15 -26.3834 30.0652
+       vertex -6.8522e-15 -25.4497 30.8596
+    endloop
+  endfacet
+  facet normal 0 0.624357 -0.781139
+    outer loop
+       vertex 40 -25.4497 30.8596
+       vertex -6.8522e-15 -25.4497 30.8596
+       vertex 40 -24.4921 31.625
+    endloop
+  endfacet
+  facet normal 0 0.624357 -0.781139
+    outer loop
+       vertex 40 -24.4921 31.625
+       vertex -6.8522e-15 -25.4497 30.8596
+       vertex -7.02216e-15 -24.4921 31.625
+    endloop
+  endfacet
+  facet normal 0 0.600091 -0.799932
+    outer loop
+       vertex 40 -24.4921 31.625
+       vertex -7.02216e-15 -24.4921 31.625
+       vertex 40 -23.5114 32.3607
+    endloop
+  endfacet
+  facet normal 0 0.600091 -0.799932
+    outer loop
+       vertex 40 -23.5114 32.3607
+       vertex -7.02216e-15 -24.4921 31.625
+       vertex -7.18551e-15 -23.5114 32.3607
+    endloop
+  endfacet
+  facet normal 0 0.575329 -0.817922
+    outer loop
+       vertex 40 -23.5114 32.3607
+       vertex -7.18551e-15 -23.5114 32.3607
+       vertex 40 -22.5087 33.066
+    endloop
+  endfacet
+  facet normal 0 0.575329 -0.817922
+    outer loop
+       vertex 40 -22.5087 33.066
+       vertex -7.18551e-15 -23.5114 32.3607
+       vertex -7.34212e-15 -22.5087 33.066
+    endloop
+  endfacet
+  facet normal 0 0.549947 -0.8352
+    outer loop
+       vertex 40 -22.5087 33.066
+       vertex -7.34212e-15 -22.5087 33.066
+       vertex 40 -21.4848 33.7402
+    endloop
+  endfacet
+  facet normal 0 0.549947 -0.8352
+    outer loop
+       vertex 40 -21.4848 33.7402
+       vertex -7.34212e-15 -22.5087 33.066
+       vertex -7.49184e-15 -21.4848 33.7402
+    endloop
+  endfacet
+  facet normal 0 0.524144 -0.85163
+    outer loop
+       vertex 40 -21.4848 33.7402
+       vertex -7.49184e-15 -21.4848 33.7402
+       vertex 40 -20.4407 34.3828
+    endloop
+  endfacet
+  facet normal 0 0.524144 -0.85163
+    outer loop
+       vertex 40 -20.4407 34.3828
+       vertex -7.49184e-15 -21.4848 33.7402
+       vertex -7.63451e-15 -20.4407 34.3828
+    endloop
+  endfacet
+  facet normal 0 0.497771 -0.867308
+    outer loop
+       vertex 40 -20.4407 34.3828
+       vertex -7.63451e-15 -20.4407 34.3828
+       vertex 40 -19.3775 34.993
+    endloop
+  endfacet
+  facet normal 0 0.497771 -0.867308
+    outer loop
+       vertex 40 -19.3775 34.993
+       vertex -7.63451e-15 -20.4407 34.3828
+       vertex -7.77002e-15 -19.3775 34.993
+    endloop
+  endfacet
+  facet normal 0 0.470969 -0.88215
+    outer loop
+       vertex 40 -19.3775 34.993
+       vertex -7.77002e-15 -19.3775 34.993
+       vertex 40 -18.296 35.5704
+    endloop
+  endfacet
+  facet normal 0 0.470969 -0.88215
+    outer loop
+       vertex 40 -18.296 35.5704
+       vertex -7.77002e-15 -19.3775 34.993
+       vertex -7.89822e-15 -18.296 35.5704
+    endloop
+  endfacet
+  facet normal 0 0.443751 -0.89615
+    outer loop
+       vertex 40 -18.296 35.5704
+       vertex -7.89822e-15 -18.296 35.5704
+       vertex 40 -17.1974 36.1144
+    endloop
+  endfacet
+  facet normal 0 0.443751 -0.89615
+    outer loop
+       vertex 40 -17.1974 36.1144
+       vertex -7.89822e-15 -18.296 35.5704
+       vertex -8.01901e-15 -17.1974 36.1144
+    endloop
+  endfacet
+  facet normal 0 0.416083 -0.909327
+    outer loop
+       vertex 40 -17.1974 36.1144
+       vertex -8.01901e-15 -17.1974 36.1144
+       vertex 40 -16.0826 36.6245
+    endloop
+  endfacet
+  facet normal 2.2548e-06 0.416016 -0.909357
+    outer loop
+       vertex 40 -16.0826 36.6245
+       vertex -8.01901e-15 -17.1974 36.1144
+       vertex -8.13226e-15 -16.0826 36.6244
+    endloop
+  endfacet
+  facet normal 2.28535e-06 0.387956 -0.921678
+    outer loop
+       vertex 40 -16.0826 36.6245
+       vertex -8.13226e-15 -16.0826 36.6244
+       vertex 40 -14.9527 37.1001
+    endloop
+  endfacet
+  facet normal 0 0.388024 -0.921649
+    outer loop
+       vertex 40 -14.9527 37.1001
+       vertex -8.13226e-15 -16.0826 36.6244
+       vertex -8.23788e-15 -14.9527 37.1001
+    endloop
+  endfacet
+  facet normal 0 0.359547 -0.933127
+    outer loop
+       vertex 40 -14.9527 37.1001
+       vertex -8.23788e-15 -14.9527 37.1001
+       vertex 40 -13.8087 37.5409
+    endloop
+  endfacet
+  facet normal 0 0.359547 -0.933127
+    outer loop
+       vertex 40 -13.8087 37.5409
+       vertex -8.23788e-15 -14.9527 37.1001
+       vertex -8.33575e-15 -13.8087 37.5409
+    endloop
+  endfacet
+  facet normal 0 0.330775 -0.94371
+    outer loop
+       vertex 40 -13.8087 37.5409
+       vertex -8.33575e-15 -13.8087 37.5409
+       vertex 40 -12.6518 37.9464
+    endloop
+  endfacet
+  facet normal 0 0.330775 -0.94371
+    outer loop
+       vertex 40 -12.6518 37.9464
+       vertex -8.33575e-15 -13.8087 37.5409
+       vertex -8.4258e-15 -12.6518 37.9464
+    endloop
+  endfacet
+  facet normal 0 0.301728 -0.953394
+    outer loop
+       vertex 40 -12.6518 37.9464
+       vertex -8.4258e-15 -12.6518 37.9464
+       vertex 40 -11.483 38.3163
+    endloop
+  endfacet
+  facet normal 0 0.301728 -0.953394
+    outer loop
+       vertex 40 -11.483 38.3163
+       vertex -8.4258e-15 -12.6518 37.9464
+       vertex -8.50793e-15 -11.483 38.3163
+    endloop
+  endfacet
+  facet normal 0 0.272361 -0.962195
+    outer loop
+       vertex 40 -11.483 38.3163
+       vertex -8.50793e-15 -11.483 38.3163
+       vertex 40 -10.3034 38.6502
+    endloop
+  endfacet
+  facet normal 0 0.272361 -0.962195
+    outer loop
+       vertex 40 -10.3034 38.6502
+       vertex -8.50793e-15 -11.483 38.3163
+       vertex -8.58207e-15 -10.3034 38.6502
+    endloop
+  endfacet
+  facet normal 0 0.242754 -0.970088
+    outer loop
+       vertex 40 -10.3034 38.6502
+       vertex -8.58207e-15 -10.3034 38.6502
+       vertex 40 -9.11414 38.9478
+    endloop
+  endfacet
+  facet normal 0 0.242754 -0.970088
+    outer loop
+       vertex 40 -9.11414 38.9478
+       vertex -8.58207e-15 -10.3034 38.6502
+       vertex -8.64815e-15 -9.11414 38.9478
+    endloop
+  endfacet
+  facet normal 0 0.2129 -0.977074
+    outer loop
+       vertex 40 -9.11414 38.9478
+       vertex -8.64815e-15 -9.11414 38.9478
+       vertex 40 -7.91631 39.2088
+    endloop
+  endfacet
+  facet normal 0 0.2129 -0.977074
+    outer loop
+       vertex 40 -7.91631 39.2088
+       vertex -8.64815e-15 -9.11414 38.9478
+       vertex -8.70611e-15 -7.91631 39.2088
+    endloop
+  endfacet
+  facet normal 0 0.182877 -0.983136
+    outer loop
+       vertex 40 -7.91631 39.2088
+       vertex -8.70611e-15 -7.91631 39.2088
+       vertex 40 -6.71104 39.433
+    endloop
+  endfacet
+  facet normal 0 0.182877 -0.983136
+    outer loop
+       vertex 40 -6.71104 39.433
+       vertex -8.70611e-15 -7.91631 39.2088
+       vertex -8.75589e-15 -6.71104 39.433
+    endloop
+  endfacet
+  facet normal 0 0.152618 -0.988285
+    outer loop
+       vertex 40 -6.71104 39.433
+       vertex -8.75589e-15 -6.71104 39.433
+       vertex 40 -5.49947 39.6201
+    endloop
+  endfacet
+  facet normal 0 0.152618 -0.988285
+    outer loop
+       vertex 40 -5.49947 39.6201
+       vertex -8.75589e-15 -6.71104 39.433
+       vertex -8.79744e-15 -5.49947 39.6201
+    endloop
+  endfacet
+  facet normal 0 0.122355 -0.992486
+    outer loop
+       vertex 40 -5.49947 39.6201
+       vertex -8.79744e-15 -5.49947 39.6201
+       vertex 40 -4.28273 39.7701
+    endloop
+  endfacet
+  facet normal 0 0.122355 -0.992486
+    outer loop
+       vertex 40 -4.28273 39.7701
+       vertex -8.79744e-15 -5.49947 39.6201
+       vertex -8.83073e-15 -4.28273 39.7701
+    endloop
+  endfacet
+  facet normal 0 0.0917662 -0.995781
+    outer loop
+       vertex 40 -4.28273 39.7701
+       vertex -8.83073e-15 -4.28273 39.7701
+       vertex 40 -3.06197 39.8826
+    endloop
+  endfacet
+  facet normal 0 0.0917662 -0.995781
+    outer loop
+       vertex 40 -3.06197 39.8826
+       vertex -8.83073e-15 -4.28273 39.7701
+       vertex -8.85572e-15 -3.06197 39.8826
+    endloop
+  endfacet
+  facet normal 0 0.061259 -0.998122
+    outer loop
+       vertex 40 -3.06197 39.8826
+       vertex -8.85572e-15 -3.06197 39.8826
+       vertex 40 -1.83833 39.9577
+    endloop
+  endfacet
+  facet normal 0 0.061259 -0.998122
+    outer loop
+       vertex 40 -1.83833 39.9577
+       vertex -8.85572e-15 -3.06197 39.8826
+       vertex -8.8724e-15 -1.83833 39.9577
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 51.6219 2.52376
+       vertex -30 52.2672 1.96458
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 52.2672 1.96458
+       vertex -30 52.7289 1.24625
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 52.7289 1.24625
+       vertex -30 52.9695 0.426945
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 52.9695 0.426945
+       vertex -30 52.9695 -0.426945
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 52.9695 -0.426945
+       vertex -30 52.7289 -1.24624
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 52.7289 -1.24624
+       vertex -30 52.2672 -1.96458
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 52.2672 -1.96458
+       vertex -30 51.6219 -2.52376
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 51.6219 -2.52376
+       vertex -30 50.8452 -2.87848
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 50.8452 -2.87848
+       vertex -30 50 -3
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 50 -3
+       vertex -30 49.1548 -2.87848
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 49.1548 -2.87848
+       vertex -30 48.3781 -2.52376
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 48.3781 -2.52376
+       vertex -30 47.7328 -1.96458
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 47.7328 -1.96458
+       vertex -30 47.2711 -1.24624
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 47.2711 -1.24624
+       vertex -30 47.0305 -0.426945
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 47.0305 -0.426945
+       vertex -30 47.0305 0.426945
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 47.0305 0.426945
+       vertex -30 47.2711 1.24625
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 47.2711 1.24625
+       vertex -30 47.7328 1.96458
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 47.7328 1.96458
+       vertex -30 48.3781 2.52376
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 48.3781 2.52376
+       vertex -30 49.1548 2.87848
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -30 50.8452 2.87848
+       vertex -30 49.1548 2.87848
+       vertex -30 50 3
+    endloop
+  endfacet
+endsolid
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties
new file mode 100644
index 0000000000..2e5e5b4480
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/constant/turbulenceProperties
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  LES;
+
+LES
+{
+    LESModel        kEqn;
+
+    delta           cubeRootVol;
+
+    turbulence      on;
+
+    printCoeffs     on;
+
+    oneEqEddyCoeffs
+    {
+        Prt             1;
+    }
+
+    cubeRootVolCoeffs
+    {
+        deltaCoeff      1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict
new file mode 100644
index 0000000000..4c4909b1ee
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     pimpleFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.1;
+
+deltaT          1e-4;
+
+writeControl    adjustableRunTime;
+
+writeInterval   2e-3;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.2;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami
new file mode 100644
index 0000000000..4d81900c79
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.ami
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      createPatchDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// This application/dictionary controls:
+// - optional: create new patches from boundary faces (either given as
+//   a set of patches or as a faceSet)
+// - always: order faces on coupled patches such that they are opposite. This
+//   is done for all coupled faces, not just for any patches created.
+// - optional: synchronise points on coupled patches.
+// - always: remove zero-sized (non-coupled) patches (that were not added)
+
+// 1. Create cyclic:
+// - specify where the faces should come from
+// - specify the type of cyclic. If a rotational specify the rotationAxis
+//   and centre to make matching easier
+// - always create both halves in one invocation with correct 'neighbourPatch'
+//   setting.
+// - optionally pointSync true to guarantee points to line up.
+
+// 2. Correct incorrect cyclic:
+// This will usually fail upon loading:
+//  "face 0 area does not match neighbour 2 by 0.0100005%"
+//  " -- possible face ordering problem."
+// - in polyMesh/boundary file:
+//      - loosen matchTolerance of all cyclics to get case to load
+//      - or change patch type from 'cyclic' to 'patch'
+//        and regenerate cyclic as above
+
+// Do a synchronisation of coupled points after creation of any patches.
+// Note: this does not work with points that are on multiple coupled patches
+//       with transformations (i.e. cyclics).
+pointSync false;//true;
+
+tol 1e-3;
+
+// Patches to create.
+patches
+(
+    {
+        name ami0;
+
+        patchInfo
+        {
+            type cyclicPeriodicAMI;
+            inGroups 1(cyclicAMI);
+            neighbourPatch ami1;
+            periodicPatch cyclic0;
+            matchTolerance $tol;
+            nRotationalTransforms 18;
+        }
+
+        constructFrom patches;
+
+        patches (ami);
+    }
+    {
+        name ami1;
+
+        patchInfo
+        {
+            type cyclicPeriodicAMI;
+            inGroups 1(cyclicAMI);
+            neighbourPatch ami0;
+            periodicPatch cyclic0;
+            matchTolerance $tol;
+            nRotationalTransforms 18;
+        }
+
+        constructFrom patches;
+
+        patches (ami_slave);
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic
new file mode 100644
index 0000000000..a794302a47
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/createPatchDict.cyclic
@@ -0,0 +1,92 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      createPatchDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// This application/dictionary controls:
+// - optional: create new patches from boundary faces (either given as
+//   a set of patches or as a faceSet)
+// - always: order faces on coupled patches such that they are opposite. This
+//   is done for all coupled faces, not just for any patches created.
+// - optional: synchronise points on coupled patches.
+// - always: remove zero-sized (non-coupled) patches (that were not added)
+
+// 1. Create cyclic:
+// - specify where the faces should come from
+// - specify the type of cyclic. If a rotational specify the rotationAxis
+//   and centre to make matching easier
+// - always create both halves in one invocation with correct 'neighbourPatch'
+//   setting.
+// - optionally pointSync true to guarantee points to line up.
+
+// 2. Correct incorrect cyclic:
+// This will usually fail upon loading:
+//  "face 0 area does not match neighbour 2 by 0.0100005%"
+//  " -- possible face ordering problem."
+// - in polyMesh/boundary file:
+//      - loosen matchTolerance of all cyclics to get case to load
+//      - or change patch type from 'cyclic' to 'patch'
+//        and regenerate cyclic as above
+
+// Do a synchronisation of coupled points after creation of any patches.
+// Note: this does not work with points that are on multiple coupled patches
+//       with transformations (i.e. cyclics).
+pointSync false;//true;
+
+tol 1e-3;
+
+// Patches to create.
+patches
+(
+    {
+        name cyclic0;
+
+        patchInfo
+        {
+            type cyclicSlip;
+            neighbourPatch cyclic1;
+
+            transform rotational;
+            rotationAxis   (1 0 0);
+            rotationCentre (0 0 0);
+
+            matchTolerance $tol;
+        }
+
+        constructFrom patches;
+
+        patches (coupled0);
+    }
+    {
+        name cyclic1;
+
+        patchInfo
+        {
+            type cyclicSlip;
+            neighbourPatch cyclic0;
+
+            transform rotational;
+            rotationAxis   (1 0 0);
+            rotationCentre (0 0 0);
+
+            matchTolerance $tol;
+        }
+
+        constructFrom patches;
+
+        patches (coupled1);
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict
new file mode 100644
index 0000000000..e2d4768fd4
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/decomposeParDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 6;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n               ( 6 1 1 );
+    delta           0.001;
+    order           xyz;
+}
+
+preservePatches (cyclic0 cyclic1 ami0 ami1);
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes
new file mode 100644
index 0000000000..b9f2b3d83c
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSchemes
@@ -0,0 +1,73 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         leastSquares;
+    grad(U)         cellLimited Gauss linear 0.99;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss limitedLinearV 1;
+    div(phid,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,epsilon) Gauss limitedLinear 1;
+    div(phi,R)      Gauss limitedLinear 1;
+    div(R)          Gauss linear;
+    div(phiXi,Xi)   Gauss limitedLinear 1;
+    div(phiXi,Su)   Gauss limitedLinear 1;
+    div(phiSt,b)    Gauss limitedLinear01 1;
+    div(phi,ft_b_ha_hau) Gauss multivariateSelection
+    {
+        fu  limitedLinear01 1;
+        ft  limitedLinear01 1;
+        b   limitedLinear01 1;
+        ha  limitedLinear 1;
+        hau limitedLinear 1;
+    };
+    div(U)          Gauss linear;
+    div((Su*n))     Gauss linear;
+    div((U+((Su*Xi)*n))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(meshPhi,p)  Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
new file mode 100644
index 0000000000..43248903df
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/fvSolution
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "(p|Phi|rho)"
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0.1;
+        minIter         1;
+    }
+
+    "(p|Phi|rho)Final"
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+        minIter         1;
+    }
+
+    pcorr
+    {
+        $p;
+        tolerance       1e-02;
+        relTol          0;
+    }
+
+    "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+        minIter         1;
+    }
+
+    "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)Final"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+        minIter         1;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 2;
+    nCorrectors     1;
+    nNonOrthogonalCorrectors 0;
+}
+
+potentialFlow
+{
+    nNonOrthogonalCorrectors 20;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
new file mode 100644
index 0000000000..a541632960
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/meshQualityDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      meshQualityDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include defaults parameters from master dictionary
+#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+
+maxNonOrtho 55;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict
new file mode 100644
index 0000000000..0960aa7152
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict
@@ -0,0 +1,375 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      snappyHexMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh true;
+snap            true;
+addLayers       false;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+// Surfaces are used
+// - to specify refinement for any mesh cell intersecting it
+// - to specify refinement for any mesh cell inside/outside/near
+// - to 'snap' the mesh boundary to the surface
+geometry
+{
+    ami.obj
+    {
+        type triSurfaceMesh;
+        name ami;
+    }
+    blade1.obj
+    {
+        type triSurfaceMesh;
+        name blade1;
+    }
+    blade2.obj
+    {
+        type triSurfaceMesh;
+        name blade2;
+    }
+    inlet.stl
+    {
+        type triSurfaceMesh;
+        name inlet;
+    }
+    outlet.stl
+    {
+        type triSurfaceMesh;
+        name outlet;
+    }
+    walls.stl
+    {
+        type triSurfaceMesh;
+        name walls;
+    }
+};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations refining just a
+    // few cells. This setting will cause refinement to stop if <= minimumRefine
+    // are selected for refinement. Note: it will at least do one iteration
+    // (unless the number of cells to refine is 0)
+    minRefinementCells 0;
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 5;
+
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by its edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    features
+    (
+    );
+
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {
+        ami
+        {
+            level (1 1);
+            cellZone rotating;
+            faceZone rotating;
+            faceType baffle;
+            cellZoneInside insidePoint;
+            insidePoint (34 50 0);
+        }
+        blade1
+        {
+            level (1 1);
+            faceType baffle;
+        }
+        blade2
+        {
+            level (1 1);
+            faceType baffle;
+        }
+        cooling
+        {
+            level (1 1);
+            patchInfo
+            {
+                type patch;
+            }
+        }
+        inlet
+        {
+            level (1 1);
+            patchInfo
+            {
+                type patch;
+            }
+        }
+        outlet
+        {
+            level (1 1);
+            patchInfo
+            {
+                type patch;
+            }
+        }
+        walls
+        {
+            level (1 1);
+            patchInfo
+            {
+                type wall;
+                inGroups (wall);
+            }
+        }
+    }
+
+    resolveFeatureAngle 30;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   descending order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {
+    }
+
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the locationInMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    // This is an outside point locationInMesh (-0.033 -0.033 0.0033);
+    locationInMesh (-15 50 0);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces true;
+}
+
+
+
+// Settings for the snapping.
+snapControls
+{
+    //- Number of patch smoothing iterations before finding correspondence
+    //  to surface
+    nSmoothPatch 3;
+
+    //- Relative distance for points to be attracted by surface feature point
+    //  or edge. True distance is this factor times local
+    //  maximum edge length.
+    tolerance 1.0;
+
+    //- Number of mesh displacement relaxation iterations.
+    nSolveIter 300;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    // Feature snapping
+
+        //- Number of feature edge snapping iterations.
+        //  Leave out altogether to disable.
+        nFeatureSnapIter 10;
+
+        //- Detect (geometric) features by sampling the surface
+        implicitFeatureSnap true;
+
+        //- Use castellatedMeshControls::features
+        explicitFeatureSnap false;
+
+        //- Detect features between multiple surfaces
+        //  (only for explicitFeatureSnap, default = false)
+        multiRegionFeatureSnap true;
+}
+
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
+    relativeSizes true;
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+        "blade."
+        {
+            nSurfaceLayers 2;
+        }
+    }
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.0;
+
+
+    // Wanted thickness of final added cell layer. If multiple layers
+    // is the thickness of the layer furthest away from the wall.
+    // Relative to undistorted size of cell outside layer.
+    // See relativeSizes parameter.
+    finalLayerThickness 0.25;
+
+    // Minimum thickness of cell layer. If for any reason layer
+    // cannot be above minThickness do not add layer.
+    // See relativeSizes parameter.
+    minThickness 0.2;
+
+    // If points get not extruded do nGrow layers of connected faces that are
+    // also not grown. This helps convergence of the layer addition process
+    // close to features.
+    nGrow 0;
+
+
+    // Advanced settings
+
+    // When not to extrude surface. 0 is flat surface, 90 is when two faces
+    // are perpendicular
+    featureAngle 30;
+
+    // Maximum number of snapping relaxation iterations. Should stop
+    // before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    // Number of smoothing iterations of surface normals
+    nSmoothSurfaceNormals 1;
+
+    // Number of smoothing iterations of interior mesh movement direction
+    nSmoothNormals 3;
+
+    // Smooth layer thickness over surface patches
+    nSmoothThickness 10;
+
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 0.5;
+
+    // Reduce layer growth where ratio thickness to medial
+    // distance is large
+    maxThicknessToMedialRatio 0.3;
+
+    // Angle used to pick up medial axis points
+    minMedianAxisAngle 90;
+
+    // Create buffer region for new layer terminations
+    nBufferCellsNoExtrude 0;
+
+
+    // Overall max number of layer addition iterations. The mesher will exit
+    // if it reaches this number of iterations; possibly with an illegal
+    // mesh.
+    nLayerIter 50;
+
+    // Max number of iterations after which relaxed meshQuality controls
+    // get used. Up to nRelaxIter it uses the settings in meshQualityControls,
+    // after nRelaxIter it uses the values in meshQualityControls::relaxed.
+    nRelaxedIter 20;
+}
+
+
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+meshQualityControls
+{
+    #include "meshQualityDict"
+
+    // Optional : some meshing phases allow usage of relaxed rules.
+    // See e.g. addLayersControls::nRelaxedIter.
+    relaxed
+    {
+        //- Maximum non-orthogonality allowed. Set to 180 to disable.
+        maxNonOrtho 75;
+    }
+
+    // Advanced
+
+    //- Number of error distribution iterations
+    nSmoothScale 4;
+    //- amount to scale back displacement at error points
+    errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Write flags
+writeFlags
+(
+    scalarLevels    // write volScalarField with cellLevel for postprocessing
+    layerSets       // write cellSets, faceSets of faces in layer
+    layerFields     // write volScalarField for layer coverage
+);
+
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1E-6;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Su b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Su
new file mode 100644
index 0000000000..f04602c76e
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Su
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      Su;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform 0.135;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    "inlet.*"
+    {
+        type            fixedValue;
+        value           uniform 0.135;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 0.135;
+        value           uniform 0.135;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/T b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/T
new file mode 100644
index 0000000000..72e2eacd9c
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/T
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    "inlet.*"
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 300;
+        value           uniform 300;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Tu b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Tu
new file mode 100644
index 0000000000..a0f6c23416
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Tu
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      Tu;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    "inlet.*"
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 300;
+        value           uniform 300;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/U b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/U
new file mode 100644
index 0000000000..d72e121f4b
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/U
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (2 0 0);
+
+/*
+A=[2 1]
+M=[28.8504 16.0428]
+AFR=17.1256917852
+T=300
+p=1e5
+R=8314.3
+rho=p/R/T.*M
+U=[2 NaN]
+U(2)=rho(1)*U(1)*A(1)/(rho(2)*A(2))/AFR
+*/
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    inletAir
+    {
+        type            fixedValue;
+        value           uniform (2 0 0);
+    }
+    inletFuel
+    {
+        type            fixedValue;
+        value           uniform (0.42003 0 0);
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Xi b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Xi
new file mode 100644
index 0000000000..2e3916db13
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/Xi
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      Xi;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    "inlet.*"
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/alphat b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/alphat
new file mode 100644
index 0000000000..e1333cb73a
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/alphat
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+    "inlet.*"
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/b b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/b
new file mode 100644
index 0000000000..a643a79320
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/b
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      b;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    "inlet.*"
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/epsilon b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/epsilon
new file mode 100644
index 0000000000..00d8139225
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/epsilon
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 100;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            epsilonWallFunction;
+        value           uniform 100;
+    }
+    "inlet.*"
+    {
+        type            turbulentMixingLengthDissipationRateInlet;
+        mixingLength    0.001;
+        value           uniform 100;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/ft b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/ft
new file mode 100644
index 0000000000..2ec70b3e41
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/ft
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      ft;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    inletAir
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    inletFuel
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/k b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/k
new file mode 100644
index 0000000000..838c8f5532
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/k
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            kqRWallFunction;
+        value           uniform 1;
+    }
+    "inlet.*"
+    {
+        type            turbulentIntensityKineticEnergyInlet;
+        intensity       0.04;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut
new file mode 100644
index 0000000000..f9eef58ba8
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/nut
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    "inlet.*"
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/p b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/p
new file mode 100644
index 0000000000..a2597811d3
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/p
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    "(walls|cylinder)"
+    {
+        type            zeroGradient;
+    }
+    "inlet.*"
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           uniform 100000;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
new file mode 100644
index 0000000000..fd4c761252
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       pointScalarField;
+    location    "0";
+    object      pointDisplacementy;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    cylinder
+    {
+        type            codedFixedValue;
+        redirectType    pointDisplacementy_cylinder;
+        code
+        #{
+            const scalar t = this->db().time().value();
+            const scalar a = 0.001;
+            const scalar f = 200;
+            operator==(a*sin(constant::mathematical::twoPi*f*t));
+        #};
+        value           $internalField;
+    }
+    "inlet.*"
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/etc/templates/compressibleInflowOutflow/constant/RASProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/RASProperties
similarity index 83%
rename from etc/templates/compressibleInflowOutflow/constant/RASProperties
rename to tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/RASProperties
index 496ee3b41c..d9eae64aeb 100644
--- a/etc/templates/compressibleInflowOutflow/constant/RASProperties
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/RASProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      RASProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,4 +21,5 @@ turbulence      on;
 
 printCoeffs     on;
 
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties
new file mode 100644
index 0000000000..64315efb7b
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/combustionProperties
@@ -0,0 +1,73 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      combustionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+laminarFlameSpeedCorrelation Gulders;
+
+fuel            Methane;
+
+Su              Su [ 0 1 -1 0 0 0 0 ] 0;
+
+SuModel         unstrained;
+
+equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1;
+
+sigmaExt        sigmaExt [ 0 0 -1 0 0 0 0 ] 100000;
+
+XiModel         transport;
+
+XiCoef          XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
+
+XiShapeCoef     XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
+
+uPrimeCoef      uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
+
+GuldersCoeffs
+{
+    Methane
+    {
+        W               0.422;
+        eta             0.15;
+        xi              5.18;
+        alpha           2;
+        beta            -0.5;
+        f               2.3;
+    }
+}
+
+ignite          yes;
+
+ignitionSites
+(
+    {
+        location        (0.006 0 0.0005);
+        diameter        0.001;
+        start           0.02;
+        duration        0.04;
+        strength        5;
+    }
+);
+
+ignitionSphereFraction 1;
+
+ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0.001;
+
+ignitionCircleFraction 0.5;
+
+ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0.001;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
new file mode 100644
index 0000000000..9d03869761
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/dynamicMeshDict
@@ -0,0 +1,34 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh   dynamicMotionSolverFvMesh;
+
+motionSolverLibs ( "libfvMotionSolvers.so" );
+
+solver displacementComponentLaplacian;
+
+displacementComponentLaplacianCoeffs
+{
+    component y;
+
+    diffusivity uniform;
+
+    applyPointLocation false;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g
new file mode 100644
index 0000000000..c5c44bde87
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..08c9580ff0
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/polyMesh/blockMeshDict
@@ -0,0 +1,156 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.001;
+
+vertices
+(
+    (-15                -6                0)
+    (-15                -2                0)
+    (-15                 2                0)
+    (-15                 6                0)
+    ( -6                -6                0)
+    ( -6                -2                0)
+    ( -6                 2                0)
+    ( -6                 6                0)
+    ( -2.82842712474619 -2.82842712474619 0)
+    ( -3.86370330515627 -1.03527618041008 0)
+    ( -3.86370330515627  1.03527618041008 0)
+    ( -2.82842712474619  2.82842712474619 0)
+    (  2.82842712474619 -2.82842712474619 0)
+    (  2.82842712474619  2.82842712474619 0)
+    (  6                -6                0)
+    (  6                 6                0)
+    ( 50                -6                0)
+    ( 50                 6                0)
+
+    (-15                -6                1)
+    (-15                -2                1)
+    (-15                 2                1)
+    (-15                 6                1)
+    ( -6                -6                1)
+    ( -6                -2                1)
+    ( -6                 2                1)
+    ( -6                 6                1)
+    ( -2.82842712474619 -2.82842712474619 1)
+    ( -3.86370330515627 -1.03527618041008 1)
+    ( -3.86370330515627  1.03527618041008 1)
+    ( -2.82842712474619  2.82842712474619 1)
+    (  2.82842712474619 -2.82842712474619 1)
+    (  2.82842712474619  2.82842712474619 1)
+    (  6                -6                1)
+    (  6                 6                1)
+    ( 50                -6                1)
+    ( 50                 6                1)
+);
+
+blocks
+(
+    hex ( 0  4  5  1 18 22 23 19) (16  8 1) simpleGrading (1 1 1)
+    hex ( 1  5  6  2 19 23 24 20) (16  8 1) simpleGrading (1 1 1)
+    hex ( 2  6  7  3 20 24 25 21) (16  8 1) simpleGrading (1 1 1)
+    hex ( 4  8  9  5 22 26 27 23) ( 8  8 1) simpleGrading (1 1 1)
+    hex ( 5  9 10  6 23 27 28 24) ( 8  8 1) simpleGrading (1 1 1)
+    hex ( 6 10 11  7 24 28 29 25) ( 8  8 1) simpleGrading (1 1 1)
+    hex ( 4 14 12  8 22 32 30 26) (24  8 1) simpleGrading (1 1 1)
+    hex (12 14 15 13 30 32 33 31) ( 8 24 1) simpleGrading (1 1 1)
+    hex (11 13 15  7 29 31 33 25) (24  8 1) simpleGrading (1 1 1)
+    hex (14 16 17 15 32 34 35 33) (80 24 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+    arc  8  9 (-3.46410161513775 2 0)
+    arc  9 10 (-4                0 0)
+    arc 10 11 (-3.46410161513775 2 0)
+    arc 11 13 ( 0                4 0)
+    arc 13 12 ( 4                0 0)
+    arc 12  8 ( 0               -4 0)
+
+    arc 26 27 (-3.46410161513775 2 1)
+    arc 27 28 (-4                0 1)
+    arc 28 29 (-3.46410161513775 2 1)
+    arc 29 31 ( 0                4 1)
+    arc 31 30 ( 4                0 1)
+    arc 30 26 ( 0               -4 1)
+);
+
+defaultPatch
+{
+    name    frontAndBack;
+    type    empty;
+}
+
+boundary
+(
+    inletAir
+    {
+        type patch;
+        faces
+        (
+            (0 1 19 18)
+            (2 3 21 20)
+        );
+    }
+    inletFuel
+    {
+        type patch;
+        faces
+        (
+            (1 2 20 19)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (16 17 35 34)
+        );
+    }
+    walls
+    {
+        type wall;
+        faces
+        (
+            ( 0  4 22 18)
+            ( 3  7 25 21)
+            ( 4 14 32 22)
+            ( 7 15 33 25)
+            (14 16 34 32)
+            (15 17 35 33)
+        );
+    }
+    cylinder
+    {
+        type wall;
+        faces
+        (
+            ( 8  9 27 26)
+            ( 9 10 28 27)
+            (10 11 29 28)
+            (11 13 31 29)
+            (13 12 30 31)
+            (12  8 26 30)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties
new file mode 100644
index 0000000000..aa818bc057
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/thermophysicalProperties
@@ -0,0 +1,115 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heheuPsiThermo;
+    mixture         inhomogeneousMixture;
+    transport       sutherland;
+    thermo          janaf;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          absoluteEnthalpy;
+}
+
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 17.1256917852;
+
+fuel
+{
+    specie
+    {
+        nMoles          1;
+
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+
+        highCpCoeffs    ( 1.68347900000000e+00   1.02372400000000e-02  -3.87512900000000e-06
+                          6.78558500000000e-10  -4.50342300000000e-14  -1.00807900000000e+04
+                          9.62339500000000e+00 );
+        lowCpCoeffs     ( 7.78741500000000e-01   1.74766800000000e-02  -2.78340900000000e-05
+                          3.04970800000000e-08  -1.22393100000000e-11  -9.82522900000000e+03
+                          1.37221900000000e+01);
+
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+oxidant
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.8504;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.0885497471e+00  1.3043264856e-03 -4.7552447148e-07
+                          8.3493327980e-11 -5.5737056214e-15 -9.8814063549e+02
+                         -4.0547404058e+00 );
+        lowCpCoeffs     ( 3.2806699701e+00  1.3492770106e-03 -3.2517684297e-06
+                          4.7326393524e-09 -2.1155491172e-12 -1.0176130308e+03
+                          4.3881233780e+00 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+burntProducts
+{
+    specie
+    {
+        nMoles          1;
+
+        molWeight       27.6333203887;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+
+        highCpCoeffs    ( 3.0233794599e+00  1.9430560990e-03 -6.9382318371e-07
+                          1.1776092714e-10 -7.6289056653e-15 -1.0995628377e+04
+                         -3.0620017962e+00 );
+        lowCpCoeffs     ( 3.2182230144e+00  2.6101069239e-03 -5.0302916124e-06
+                          6.0101629539e-09 -2.4254586430e-12 -1.1068041672e+04
+                          4.2846702447e+00 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties
new file mode 100644
index 0000000000..ef08c4a188
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/constant/turbulenceProperties
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict
new file mode 100644
index 0000000000..9e126880ea
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict.1st;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     XiDyMFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.1;
+
+deltaT          1e-5;
+
+writeControl    adjustableRunTime;
+
+writeInterval   1e-3;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  8;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           0.4;
+
+libs            ( "libfvMotionSolvers.so" );
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes
new file mode 100644
index 0000000000..afd622acb1
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSchemes
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss limitedLinearV 1;
+    div(phid,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,epsilon) Gauss limitedLinear 1;
+    div(phi,R)      Gauss limitedLinear 1;
+    div(R)          Gauss linear;
+    div(phiXi,Xi)   Gauss limitedLinear 1;
+    div(phiXi,Su)   Gauss limitedLinear 1;
+    div(phiSt,b)    Gauss limitedLinear01 1;
+    div(phi,ft_b_ha_hau) Gauss multivariateSelection
+    {
+        fu  limitedLinear01 1;
+        ft  limitedLinear01 1;
+        b   limitedLinear01 1;
+        ha  limitedLinear 1;
+        hau limitedLinear 1;
+    };
+    div(U)          Gauss linear;
+    div((Su*n))     Gauss linear;
+    div((U+((Su*Xi)*n))) Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(meshPhi,p)  Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
new file mode 100644
index 0000000000..61366e52fc
--- /dev/null
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/system/fvSolution
@@ -0,0 +1,71 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "(p|rho|cellDisplacementy)"
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0.1;
+        minIter         1;
+    }
+
+    "(p|rho|cellDisplacementy)Final"
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+        minIter         1;
+    }
+
+    pcorr
+    {
+        $p;
+        tolerance       1e-2;
+        relTol          0;
+    }
+
+    "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+        minIter         1;
+    }
+
+    "(U|b|ft|fu|Su|Xi|ha|hau|k|epsilon)Final"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+        minIter         1;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 2;
+    nCorrectors     1;
+    nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
index 7d562f80a6..8cb8043486 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
index 7b8b4d5d8c..2ccfec2ebe 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
index 077a9258d2..251263c11f 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
index 877f79811f..1f512f57cf 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
index 7cc029fa49..811020e253 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat
index 55ca676745..6fc0ed6dc0 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
index 903a1ae64a..3ea1dc4faa 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
index 18300060a6..5b55ab3525 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
index e1cd539e31..6c68916dd9 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
index 225df02ee3..3b2a4a8f31 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
index f5f843e597..be6b6e7dce 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
index e39fcccf87..434deaf9d8 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
index 6321ca5353..ced0b5884c 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
index 5efd92db69..a27fa59ba3 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index e6e3ab3a22..bcca8e5c02 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
index 397d6345d0..dbbb4bb740 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
index b9a4c7ca82..2b0835b5dd 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict
index 27e99b3608..fdedb6c71e 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
index 86b3f48952..023f7c8519 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
index f5476baa16..817f039080 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
index 706044c8b1..b413ed1713 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/gri/chemkin/transportProperties b/tutorials/combustion/chemFoam/gri/chemkin/transportProperties
new file mode 100644
index 0000000000..c54853202c
--- /dev/null
+++ b/tutorials/combustion/chemFoam/gri/chemkin/transportProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- 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;
+    location    "chemkin";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+".*"
+{
+    transport
+    {
+        As 0;
+        Ts 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
index bf097e0ba3..cd3aae5f29 100644
--- a/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/gri/constant/initialConditions b/tutorials/combustion/chemFoam/gri/constant/initialConditions
index 8aff3f1f19..7b620eb755 100644
--- a/tutorials/combustion/chemFoam/gri/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/gri/constant/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
index c979a11fd0..58207acbee 100644
--- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,8 +27,7 @@ thermoType
 }
 
 CHEMKINFile     "$FOAM_CASE/chemkin/chem.inp";
-
 CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
-
+CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/gri/system/controlDict b/tutorials/combustion/chemFoam/gri/system/controlDict
index 4a0eb6c38e..e9b4b223b8 100644
--- a/tutorials/combustion/chemFoam/gri/system/controlDict
+++ b/tutorials/combustion/chemFoam/gri/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -47,7 +47,9 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-suppressSolverInfo yes;
-
+DebugSwitches
+{
+    SolverPerformance   0;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/gri/system/fvSchemes b/tutorials/combustion/chemFoam/gri/system/fvSchemes
index 0bd096859e..b1f03c7acc 100644
--- a/tutorials/combustion/chemFoam/gri/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/gri/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/gri/system/fvSolution b/tutorials/combustion/chemFoam/gri/system/fvSolution
index c090558aa2..647159e6b6 100644
--- a/tutorials/combustion/chemFoam/gri/system/fvSolution
+++ b/tutorials/combustion/chemFoam/gri/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/h2/chemkin/transportProperties b/tutorials/combustion/chemFoam/h2/chemkin/transportProperties
new file mode 100644
index 0000000000..c54853202c
--- /dev/null
+++ b/tutorials/combustion/chemFoam/h2/chemkin/transportProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- 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;
+    location    "chemkin";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+".*"
+{
+    transport
+    {
+        As 0;
+        Ts 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
index bf097e0ba3..cd3aae5f29 100644
--- a/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/h2/constant/initialConditions b/tutorials/combustion/chemFoam/h2/constant/initialConditions
index 73c484cb94..4ee655b760 100644
--- a/tutorials/combustion/chemFoam/h2/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/h2/constant/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
index c979a11fd0..58207acbee 100644
--- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,8 +27,7 @@ thermoType
 }
 
 CHEMKINFile     "$FOAM_CASE/chemkin/chem.inp";
-
 CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
-
+CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/h2/system/controlDict b/tutorials/combustion/chemFoam/h2/system/controlDict
index caebf52265..260c29b9a7 100644
--- a/tutorials/combustion/chemFoam/h2/system/controlDict
+++ b/tutorials/combustion/chemFoam/h2/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -47,7 +47,9 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-suppressSolverInfo yes;
-
+DebugSwitches
+{
+    SolverPerformance   0;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/h2/system/fvSchemes b/tutorials/combustion/chemFoam/h2/system/fvSchemes
index b19e2dd0b1..56700de989 100644
--- a/tutorials/combustion/chemFoam/h2/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/h2/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/h2/system/fvSolution b/tutorials/combustion/chemFoam/h2/system/fvSolution
index c090558aa2..647159e6b6 100644
--- a/tutorials/combustion/chemFoam/h2/system/fvSolution
+++ b/tutorials/combustion/chemFoam/h2/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/gri/constant/turbulenceProperties b/tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties
similarity index 86%
rename from tutorials/combustion/chemFoam/gri/constant/turbulenceProperties
rename to tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties
index c2c3b28a1b..6e932ca799 100644
--- a/tutorials/combustion/chemFoam/gri/constant/turbulenceProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/chemkin/transportProperties
@@ -10,12 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
+    location    "chemkin";
+    object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;
-
+".*"
+{
+    transport
+    {
+        As 0;
+        Ts 0;
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
index bf097e0ba3..cd3aae5f29 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions b/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions
index 34ebb058de..76dff0b122 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
index c979a11fd0..58207acbee 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,8 +27,7 @@ thermoType
 }
 
 CHEMKINFile     "$FOAM_CASE/chemkin/chem.inp";
-
 CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
-
+CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/ic8h18/system/controlDict b/tutorials/combustion/chemFoam/ic8h18/system/controlDict
index 622cadcc0c..a9b2c7e829 100644
--- a/tutorials/combustion/chemFoam/ic8h18/system/controlDict
+++ b/tutorials/combustion/chemFoam/ic8h18/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -47,7 +47,9 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-suppressSolverInfo yes;
-
+DebugSwitches
+{
+    SolverPerformance   0;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes b/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes
index 0bd096859e..b1f03c7acc 100644
--- a/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/ic8h18/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18/system/fvSolution b/tutorials/combustion/chemFoam/ic8h18/system/fvSolution
index c090558aa2..647159e6b6 100644
--- a/tutorials/combustion/chemFoam/ic8h18/system/fvSolution
+++ b/tutorials/combustion/chemFoam/ic8h18/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/turbulenceProperties b/tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties
similarity index 86%
rename from tutorials/combustion/chemFoam/ic8h18/constant/turbulenceProperties
rename to tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties
index c2c3b28a1b..6e932ca799 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/turbulenceProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/chemkin/transportProperties
@@ -10,12 +10,18 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
+    location    "chemkin";
+    object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;
-
+".*"
+{
+    transport
+    {
+        As 0;
+        Ts 0;
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
index a2a5861997..44b1e2b283 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions b/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions
index be2d2cbfff..6b1f7249d7 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
index c979a11fd0..58207acbee 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,8 +27,7 @@ thermoType
 }
 
 CHEMKINFile     "$FOAM_CASE/chemkin/chem.inp";
-
 CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
-
+CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/nc7h16/system/controlDict b/tutorials/combustion/chemFoam/nc7h16/system/controlDict
index fe0feaaf9d..fb41dac859 100644
--- a/tutorials/combustion/chemFoam/nc7h16/system/controlDict
+++ b/tutorials/combustion/chemFoam/nc7h16/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -47,7 +47,9 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-suppressSolverInfo yes;
-
+DebugSwitches
+{
+    SolverPerformance   0;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes b/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes
index 80a6122946..cf4024d885 100644
--- a/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes
+++ b/tutorials/combustion/chemFoam/nc7h16/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/chemFoam/nc7h16/system/fvSolution b/tutorials/combustion/chemFoam/nc7h16/system/fvSolution
index c090558aa2..647159e6b6 100644
--- a/tutorials/combustion/chemFoam/nc7h16/system/fvSolution
+++ b/tutorials/combustion/chemFoam/nc7h16/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/Su b/tutorials/combustion/engineFoam/kivaTest/-180/Su
index df707c11d1..8c49718271 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/Su
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/Su
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/T b/tutorials/combustion/engineFoam/kivaTest/-180/T
index 312510a748..1365f841fe 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/T
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/Tu b/tutorials/combustion/engineFoam/kivaTest/-180/Tu
index 1bf0dcc70e..d5d60f82c6 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/Tu
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/Tu
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/U b/tutorials/combustion/engineFoam/kivaTest/-180/U
index 46d20b16d4..45e0effa10 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/U
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/Xi b/tutorials/combustion/engineFoam/kivaTest/-180/Xi
index 3bd96c362b..5c994621fb 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/Xi
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/Xi
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
index 65c47ed499..cc264e1353 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/alphat
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/b b/tutorials/combustion/engineFoam/kivaTest/-180/b
index b485cd7408..3e3a5048b9 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/b
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/b
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
index 9cb713ec95..8d3c9c6b54 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/ft b/tutorials/combustion/engineFoam/kivaTest/-180/ft
index 4d42fccfd9..4c04487563 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/ft
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/ft
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/fu b/tutorials/combustion/engineFoam/kivaTest/-180/fu
index 49fdfe8c37..6c71126424 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/fu
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/fu
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k
index fb951423a9..dede753ae2 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/k
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/nut b/tutorials/combustion/engineFoam/kivaTest/-180/nut
index 68a368eb00..744d1681d7 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/nut
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/p b/tutorials/combustion/engineFoam/kivaTest/-180/p
index 5f4e4fa91c..da1d829c15 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/p
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
index c0de6fda5d..6fea44aee3 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
index 1c21d87a30..3a08e2119b 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index 863152a970..7764d7af9e 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
index d417c37376..ea41df1d93 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
index 1e0ebc519b..faf1d82c66 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
index b164746874..e46643a0e6 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
index df1b2ab5da..f04a2852be 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
index a572ef725d..bcbb08c119 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2
index 251bc6632f..cf18c0efd2 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
index 91036e1a56..8ad18689bc 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
index 98bf184dec..0e1b4c62cf 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
index 418120f1e9..5b592fd292 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
index cc3de91d28..3b817aabe3 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
index 481383761d..60c4549273 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
index 0ebaacfbc0..656c6733b0 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
index 0ac01a3002..4e5f658a88 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Uf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
index 69e916c492..a1bda8a446 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/deltaf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k
index 2c8622d228..ee29f19d57 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
index f7a34d2069..73593ebd7d 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p
index 9aee743d50..a66f68ba1d 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh
index d95b85f7ba..26bf95f896 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
index aaeee9d11c..1d1cd44dec 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
index 2212e48d7c..c6b313dc11 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
index 50c0c51a59..16784ffff8 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Y0Default
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
index 4b88585cc8..f5ad1d1109 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/char
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
index 5e2985df7e..2c9e39c3d2 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
index 3e15d9f426..79f9bf26b5 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/wood
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
index ccf72d6127..af372fbcbe 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties
index a57292861b..86988d805f 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g
index b10785499b..7725369597 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
index 7cb5c41c06..da8a18a91c 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
index 014b85f5f4..1cc9cd5631 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
index a4b2c48134..dd4e14fa20 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
index 4765d84e02..8086293611 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index d988145a1c..60a9470942 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
index 12ce2a582f..e900e1b028 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
index f369d4d97d..31d63402a2 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Positions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
index 1f9b1416c0..9e28750289 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index 36489e7d47..9df2bfc427 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
index d2d8f2cd2a..161842e99a 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
index 8ce5d08b45..3fdb734bd7 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
index 0973192685..95a1f0b82c 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict
index b4802459ae..67fab7ac17 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict
index 471023d263..1d2dcd7dd4 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
index 8fb65d5c53..e8398e0630 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
index 77e4e801ef..5f0b9bdff7 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictFilm
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
index 4e723ce9ec..7470d86f00 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/extrudeToRegionMeshDictPyr
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
index edf40660b6..3abfa6179b 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
index 09a0c7f2dd..66f2f5c3c9 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
index a6a35f420f..852f948e45 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
index 9872d8c84c..4c12c3aae0 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
index 0d88de754a..70bf637a4c 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
index 282be76457..3a6f21c25b 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution
index 070876d363..e724d328ef 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
index c974c1091b..20b1925fee 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
index 45714f1a1d..ff2b7f3f58 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/pyrolysisRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
index 2c4402d4bd..bc51b3bb48 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8 b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
index 178527b915..3b232b3642 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
index d04c625f9b..41fe3640ea 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
index 27fb7c0953..e88f201bf1 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2 b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
index af44210d0c..8430717e47 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/O2 b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/O2
index bdc453249f..9167d834ac 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/O2
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
index 02752e8e3d..5358578c84 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
index f5e2ba0301..4bc806b936 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,13 +27,6 @@ boundaryField
         value           $internalField;
     }
 
-    top
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
     burner
     {
         type            flowRateInletVelocity;
@@ -41,7 +34,7 @@ boundaryField
         value           uniform (0 0 0);
     }
 
-    sides
+    "(top|sides)"
     {
         type            pressureInletOutletVelocity;
         phi             phi;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/Ydefault b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/Ydefault
index 69d4144e09..5e6d1eba5b 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
index b9d5bb084f..8ecdcc557e 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/k b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/k
index ed118112e0..f7c0531029 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/k
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
index 6bce272600..1003e3840b 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p
index 185ce45104..7cd9c8727d 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
index f0770e8bd9..ea80f706ef 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,19 +27,13 @@ boundaryField
         value           $internalField;
     }
 
-    top
-    {
-        type            zeroGradient;
-        value           $internalField;
-    }
-
     burner
     {
         type            fixedFluxPressure;
         value           $internalField;
     }
 
-    sides
+    "(top|sides)"
     {
         type            totalPressure;
         U               U;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
index 6b451a9d53..ccc4678c64 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
index 900fa3ae76..e4b051db2f 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Y0Default b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Y0Default
index d2276ce443..77bcb76e39 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Y0Default
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Y0Default
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/char b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/char
index 7f209e5234..6a0b3418ae 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/char
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/char
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/p b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/p
index 5e2985df7e..2c9e39c3d2 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/p
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood
index 4b30182d37..2c7d0d61c2 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/wood
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/additionalControls b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/additionalControls
index ccf72d6127..af372fbcbe 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
index 643c593447..574e7c3117 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/g b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/g
index 147aea75b7..710f2a6ab5 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/g
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/hRef b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/hRef
new file mode 100644
index 0000000000..f0112ff3e8
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/hRef
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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       uniformDimensionedScalarField;
+    location    "constant";
+    object      hRef;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 0 0 0 0 0];
+value           4.2;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
index df407c07ff..2ee9f92ceb 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties
index edf1949fe5..e7f6e73fcc 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid
index a4b2c48134..dd4e14fa20 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermo.solid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index a4d89de8c3..48e7422f94 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
index 92922644ed..ce2ff64454 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
index 3dded6d720..467ff58a87 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
index 1f9b1416c0..9e28750289 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/surfaceFilmProperties
index ed5d67f625..db5db22ec3 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermo.compressibleGas
index 7544819fc4..e5c21d81c7 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
index e75fc0cc63..1fb2ccd529 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
index 94eb369ba1..95a1f0b82c 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
@@ -96,4 +96,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict
index 0f22bb42f9..75241f1947 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/cRefine.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/cRefine.topoSetDict
index e5f361be93..e1c3fd370c 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/cRefine.topoSetDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/cRefine.topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict
index 3ba435df9f..90b842148d 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/createPatchDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/createPatchDict
index deb72029e1..0cc1b3d564 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/decomposeParDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/decomposeParDict
index e596fcc0b5..381a261f04 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/decomposeParDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict
index c32e4b3bcc..36c5757b82 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/f.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/f.topoSetDict
index fe77b152d8..97a7c061d2 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/f.topoSetDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/f.topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fBurner.topoSetDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fBurner.topoSetDict
index ef751dd06f..39f773d925 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fBurner.topoSetDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fBurner.topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
index f28d6fcd16..d262d3ff4c 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -28,9 +28,10 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss limitedLinear 1;
+    div(phi,U)      Gauss LUST grad(U);
+    div(phi,K)      Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
-    div(phi,Yi_h)  Gauss multivariateSelection
+    div(phi,Yi_h)   Gauss multivariateSelection
     {
         O2              linearUpwind grad(O2);
         N2              linearUpwind grad(N2);
@@ -40,7 +41,6 @@ divSchemes
         h               linearUpwind grad(h);
     };
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
-    div(phi,K)          Gauss limitedLinear 1;
     div(Ji,Ii_h)        Gauss upwind;
 }
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
index 47cd5fb2fe..2867afc255 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
+    "rho.*"
     {
         solver          PCG;
         preconditioner  DIC;
@@ -25,12 +25,6 @@ solvers
         relTol          0;
     };
 
-    "(rho)Final"
-    {
-        $rho;
-        relTol          0;
-    }
-
     p_rgh
     {
         solver              GAMG;
@@ -39,18 +33,16 @@ solvers
         smoother            GaussSeidel;
         cacheAgglomeration  true;
         nCellsInCoarsestLevel   10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
+        agglomerator        faceAreaPair;
+        mergeLevels         1;
     };
 
     p_rghFinal
     {
         $p_rgh;
-        tolerance           1e-6;
         relTol              0;
     };
 
-
     "(U|Yi|k|h|omega)"
     {
         solver          PBiCG;
@@ -63,11 +55,9 @@ solvers
     "(U|Yi|k|h|omega)Final"
     {
         $U;
-        tolerance       1e-6;
         relTol          0;
     };
 
-
     Ii
     {
         solver                  GAMG;
@@ -90,7 +80,6 @@ solvers
         tolerance       1e-04;
         relTol          0;
     }
-
 }
 
 PIMPLE
@@ -105,9 +94,9 @@ relaxationFactors
 {
     equations
     {
-        "(U|k).*"                   1;
-        "(C3H8|O2|H2O|CO2|h).*"     1;
+        ".*"            1;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/decomposeParDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/decomposeParDict
index 0bdaaab7fa..054de7da9e 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/decomposeParDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes
index 1a0a8dfb06..2bc24cbf8c 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
index 88bd5c58e9..bd9b10118a 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/refineMeshDict b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/refineMeshDict
index 185d454e5f..2735737bb8 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/refineMeshDict
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
index 0c17615d4c..8901bd82eb 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,18 +21,11 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
index c19dd58f09..54a212b4d1 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
index b38b64bdea..9c09695b45 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
index 248e3fa02d..92809b699d 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,24 +21,22 @@ internalField   uniform 0.76699;
 
 boundaryField
 {
-    outlet
-    {
-        type            calculated;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            calculated;
+        value           $internalField;
     }
 
     base
     {
         type            calculated;
+        value           $internalField;
     }
 
     inlet
     {
         type            calculated;
+        value           $internalField;
     }
 
     frontAndBack
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
index ef57804773..e725d32a00 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,14 +21,7 @@ internalField   uniform 0.23301;
 
 boundaryField
 {
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
index 8f4990b6ce..3101413fa8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,18 +21,11 @@ internalField   uniform 300;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
-    }
-
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
index 9a1ad04efe..08c3c3bf4d 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,20 +21,12 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
 
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-
-    }
-
-    sides
-    {
         type            pressureInletOutletVelocity;
-        outletValue     uniform (0 0 0);
         value           uniform (0 0 0);
+
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
index 74003f28f3..f5b207f478 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    base
-    {
-        type            zeroGradient;
-    }
-
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
         value           $internalField;
     }
 
+    base
+    {
+        type            zeroGradient;
+    }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    sides
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
index fe217e29ee..d0042744f7 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,12 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
index 377a3d0090..a22578cfb8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,11 +21,11 @@ internalField   uniform 1e-4;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 1e-4;
-        value           uniform 1e-4;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     sides
@@ -37,14 +37,13 @@ boundaryField
 
     base
     {
-        type            fixedValue;
-        value           uniform 1e-4;
+        type            zeroGradient;
     }
 
     inlet
     {
         type            fixedValue;
-        value           uniform 1e-4;
+        value           $internalField;
     }
 
     frontAndBack
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
index d22df48d1b..b0fb94a669 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,12 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega
index faca2f4dd8..8ef2c1b6e8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
index 85a1f09dc4..ca84eeec3b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      p_rgh;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -21,13 +21,7 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
-    {
-        type            calculated;
-        value           $internalField;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            calculated;
         value           $internalField;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
index d941becc55..58e96ae3c9 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,13 +21,7 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
-    {
-        type            fixedFluxPressure;
-        value           $internalField;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            totalPressure;
         p0              $internalField;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
index cc500661a9..14e86ddc90 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls
index ccf72d6127..af372fbcbe 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
new file mode 100644
index 0000000000..0eb18861b1
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
@@ -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;
+    location    "constant";
+    object      chemistryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+chemistryType
+{
+    chemistrySolver   noChemistrySolver;
+    chemistryThermo   psi;
+}
+
+chemistry           on;
+
+initialChemicalTimeStep 1e-07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
index 51e80f82d6..395077f438 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -16,7 +16,12 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 combustionModel  infinitelyFastChemistry<psiThermoCombustion,gasHThermoPhysics>;
+
 //combustionModel  FSD<psiThermoCombustion,gasHThermoPhysics>;
+//combustionModel  diffusionMulticomponent<psiChemistryCombustion,gasHThermoPhysics>;
+//NOTE: To use diffusionMulticomponent combustion model you need to rename files:
+// reactions.twoSteps -> reactions
+// thermophysicalProperties.twoSteps -> thermophysicalProperties
 
 active  true;
 
@@ -26,8 +31,22 @@ infinitelyFastChemistryCoeffs
     C           5.0;
 }
 
+diffusionMulticomponentCoeffs
+{
+    Ci          (1.0 1.5);
+    fuels       (CH4 CO);
+    oxydants    (O2 O2);
+    YoxStream   (0.23 0.23);
+    YfStream    (1.0 1.0);
+    sigma       (0.02 0.02);
+    oxydantRes  (0.015 0.005);
+    ftCorr      (0  0);
+    laminarIgn  false;
+}
+
 FSDCoeffs
 {
+    semiImplicit no;
     Cv          0.1;
     ftVarMin    1e-2;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/g b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/g
index 81cfdb427d..e57f4b203c 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/g
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/hRef b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/hRef
new file mode 100644
index 0000000000..5c70335e25
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/hRef
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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       uniformDimensionedScalarField;
+    location    "constant";
+    object      hRef;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 0 0 0 0 0];
+value           1;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
deleted file mode 100644
index 0082e381a9..0000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev-OpenCFD                           |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    base
-    {
-        type            patch;
-        nFaces          134;
-        startFace       44700;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          150;
-        startFace       44834;
-    }
-    sides
-    {
-        type            patch;
-        nFaces          300;
-        startFace       44984;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          45000;
-        startFace       45284;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          16;
-        startFace       90284;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
index d61f60c729..0158e8a6af 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
index 5c303889a4..7214856367 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -189,7 +189,7 @@ greyMeanAbsorptionEmissionCoeffs
 
 scatterModel    none;
 
-sootModel mixtureFractionSoot<gasHThermoPhysics>;
+sootModel none;//mixtureFractionSoot<gasHThermoPhysics>;
 
 mixtureFractionSootCoeffs
 {
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
index 1f9b1416c0..9e28750289 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions
index 67f2373c38..f8d7139b6b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions
@@ -9,7 +9,7 @@ species
 
 reactions
 {
-    propaneReaction
+    methaneReaction
     {
         type         irreversibleinfiniteReaction;
         reaction     "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2";
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps
new file mode 100644
index 0000000000..360014f503
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions.twoSteps
@@ -0,0 +1,30 @@
+species
+(
+    O2
+    H2O
+    CH4
+    CO2
+    CO
+    N2
+);
+
+reactions
+{
+    methaneReaction
+    {
+        type        irreversibleArrheniusReaction;
+        reaction    "CH4^0.9 + 2O2^1.1 = CO + 2H2O";
+        A           2.119e12;
+        beta        0;
+        Ta          17676;
+    }
+
+    COReaction
+    {
+        type         irreversibleArrheniusReaction;
+        reaction     "CO + 0.5O2^0.25 = CO2";
+        A            1e6;
+        beta         0;
+        Ta           6060;
+    }
+}
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties
index ed5d67f625..db5db22ec3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas
index db19942525..49844bae06 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -124,3 +124,26 @@ N2
         Ts              170.672;
     }
 }
+
+CO
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0106;
+    }
+    thermodynamics
+    {
+        Tlow            200;
+        Thigh           6000;
+        Tcommon         1000;
+        highCpCoeffs    ( 3.04849 0.00135173 -4.85794e-07 7.88536e-11 -4.69807e-15 -14266.1 6.0171 );
+        lowCpCoeffs     ( 3.57953 -0.000610354 1.01681e-06 9.07006e-10 -9.04424e-13 -14344.1 3.50841 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 5e88ec565c..55d66cc882 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
new file mode 100644
index 0000000000..a45bf57fa1
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties.twoSteps
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            hePsiThermo;
+    mixture         reactingMixture;
+    transport       sutherland;
+    thermo          janaf;
+    energy          sensibleEnthalpy;
+    equationOfState perfectGas;
+    specie          specie;
+}
+
+inertSpecie N2;
+
+fuel        CH4;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/constant/reactions";
+
+foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
index 2b6d52fc7d..d222b1980e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict
index 87e8275969..40b9b7b6d0 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
index 689f2a866c..f2241ad2fb 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -32,7 +32,7 @@ writeInterval   0.1;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  6;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
index d8182f3300..a2ec3c3d22 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index 01608aaaa1..e7104e99c7 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -28,20 +28,22 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss limitedLinear 1;
+
+    div(phi,U)      Gauss LUST grad(U);
+    div(phi,K)      Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
-    div(phi,Yi_h)  Gauss multivariateSelection
+    div(phi,Yi_h)   Gauss multivariateSelection
     {
         O2              limitedLinear01 1;
         CH4             limitedLinear01 1;
         N2              limitedLinear01 1;
         H2O             limitedLinear01 1;
         CO2             limitedLinear01 1;
+        CO              limitedLinear01 1;
         h               limitedLinear 1;
     };
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
-    div(phi,omega)  Gauss limitedLinear 1;
-    div(phi,K)      Gauss limitedLinear 1;
+    div(phi,omega)  Gauss upwind;
     div(U)          Gauss linear;
     div(Ji,Ii_h)    Gauss upwind;
 }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
index a7e9319e2c..57529ba75f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
index 0b8b1e0dc4..4171aa5881 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
index bb36a422a7..9644eaca6f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,22 +21,18 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
index e7bea0ebea..fb9c46bdc8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
index 9d5ac9c871..9cdcf792d2 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
index f44c142482..7c2eca7a75 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,21 +21,22 @@ internalField   uniform 0.76699;
 
 boundaryField
 {
-    outlet
-    {
-        type            calculated;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            calculated;
+        value           $internalField;
     }
+
     base
     {
         type            calculated;
+        value           $internalField;
     }
+
     inlet
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
index a5dab92ad1..5feff77d2d 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,31 +21,23 @@ internalField   uniform 0.23301;
 
 boundaryField
 {
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
         value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
-    frontBack
-    {
-        type            empty;
-    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
index 7d8327178d..873d078a92 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,28 +21,23 @@ internalField   uniform 300;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
-    }
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 300;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
index 6cf6336379..7d29e341fb 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,31 +21,24 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    outlet
-    {
-
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-
-    }
-    sides
+    "(outlet|sides)"
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
         phi             phi;
     }
+
     base
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform (0 0.01 0);
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
index afa47eaadb..386c7450d2 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,30 +21,23 @@ internalField   uniform 0;
 
 boundaryField
 {
-    base
-    {
-        type            zeroGradient;
-    }
-
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
         value           $internalField;
     }
 
+    base
+    {
+        type            zeroGradient;
+    }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
-
-    sides
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
index eee8d350d2..793536ad38 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,23 +21,20 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            zeroGradient;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
index 89387dba53..df30b15dd2 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,28 +21,23 @@ internalField   uniform 1e-4;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 1e-4;
-        value           uniform 1e-4;
-    }
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 1e-4;
-        value           uniform 1e-4;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
-        value           uniform 1e-4;
+        value           $internalField;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
index f626af5668..e2fc97b049 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,18 +21,16 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            zeroGradient;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
index f403fa62a9..a0ef2bf25a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,26 +21,22 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
-        type           calculated;
-        value          $internalField;
+        type            calculated;
+        value           $internalField;
     }
 
-    sides
-    {
-        type           calculated;
-        value          $internalField;
-    }
     base
     {
-        type           calculated;
-        value          $internalField;
+        type            calculated;
+        value           $internalField;
     }
+
     inlet
     {
-        type           calculated;
-        value          $internalField;
+        type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
index 420c10de47..9032a58e9f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,12 +21,7 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
-    {
-        type            fixedFluxPressure;
-        value           $internalField;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            totalPressure;
         p0              $internalField;
@@ -34,14 +29,16 @@ boundaryField
         phi             phi;
         rho             rho;
         psi             none;
-        gamma           0;
+        gamma           1;
         value           $internalField;
     }
+
     base
     {
         type            fixedFluxPressure;
         value           $internalField;
     }
+
     inlet
     {
         type            fixedFluxPressure;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls
index ccf72d6127..af372fbcbe 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
index 62fbf8fb24..c58ee24776 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
index cedf34b411..a77d956587 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g
index 81cfdb427d..e57f4b203c 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/hRef b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/hRef
new file mode 100644
index 0000000000..5c70335e25
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/hRef
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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       uniformDimensionedScalarField;
+    location    "constant";
+    object      hRef;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 0 0 0 0 0];
+value           1;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
index d61f60c729..0158e8a6af 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
index 79c4fe7fe2..07aa0579dc 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
index c6da25f550..ea8758e291 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties
index ed5d67f625..db5db22ec3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas
index db19942525..367faadefd 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index 5e88ec565c..55d66cc882 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
index fc866e3362..85200f22f5 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict
index cb9b457847..c2a04cfb37 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
index bae6296f20..2d7daf48fe 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -32,7 +32,7 @@ writeInterval   0.1;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  6;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
index d8182f3300..a2ec3c3d22 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
index 2d8292f957..6a7e72df96 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
index a713ce9d93..474346dfcf 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,11 +27,12 @@ gradSchemes
 
 divSchemes
 {
-    default        none;
-    div(phi,U)      Gauss linear;
+    default         none;
+
+    div(phi,U)      Gauss LUST grad(U);
     div(phi,K)      Gauss linear;
     div(phi,k)      Gauss limitedLinear 1;
-    div(phi,Yi_h) Gauss multivariateSelection
+    div(phi,Yi_h)   Gauss multivariateSelection
     {
         O2              limitedLinear01 1;
         CH4             limitedLinear01 1;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
index 574c3cfd75..dbb0505249 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
index 6e4e4d02c0..43aa4399af 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
index 15dd5eddf1..61f76d6a2a 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CH4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2
index 2fef379ec7..12efa11dc6 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/CO2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O
index ca22735630..8e065f3e2c 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
index f1b3314273..7947ecd71c 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
index 95649fdac4..b29ae9dffb 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
index fcf963a775..ef1c75615a 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
index c235ba3d65..ca32ebfb98 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
index 96004af717..cf322de72d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
index c74018bbdb..3244699b19 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
index deca9ba60d..4612f1e800 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
index 93d33d5232..5c345f5c9d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties
index d5c12209c1..9b50afab09 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
index ff00e560b4..c1dd719871 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
index ae01272133..ede2493a1b 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
index 3683ab3388..df1f24f54c 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
index a87c823f8f..12aa45d177 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
index 9208e7ca8f..ece96fde64 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
index 7491893cc3..3605590fb2 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4
index 15dd5eddf1..61f76d6a2a 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CH4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2
index 2fef379ec7..12efa11dc6 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/CO2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O
index ca22735630..8e065f3e2c 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2
index 8b2b2e8b5d..9399b31ea5 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2 b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2
index 95649fdac4..b29ae9dffb 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T
index fcf963a775..ef1c75615a 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U
index c235ba3d65..ca32ebfb98 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault
index 96004af717..cf322de72d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat
index c74018bbdb..3244699b19 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p
index deca9ba60d..4612f1e800 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties
index 93d33d5232..5c345f5c9d 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties
index d5c12209c1..9b50afab09 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/polyMesh/boundary b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/polyMesh/boundary
deleted file mode 100644
index 4ba3243474..0000000000
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/polyMesh/boundary
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    fuel
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7860;
-    }
-    air
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7900;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          200;
-        startFace       7940;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          8000;
-        startFace       8140;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index ff00e560b4..c1dd719871 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties
index ae01272133..ede2493a1b 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict
index 3683ab3388..df1f24f54c 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
index 792dbf2499..44f22cc78b 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes
index 4eac5336f5..d1bcbc2249 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution
index 4d0db2d721..e5dc05fe50 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2DLTS/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/T b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/T
index 6cfc544728..4daac7060b 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/T
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U
index 2e86739791..629e8bce8a 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
index 807dc87866..0d9007c0dd 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx
index 520fbd4b1a..d7fe50d3b0 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/pointMotionUx
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict
index 95000b1405..8ec7acaa1c 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/polyMesh/boundary
deleted file mode 100644
index 73ab6c4061..0000000000
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/polyMesh/boundary
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-8
-(
-    movingWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          85;
-        startFace       3665;
-    }
-    farFieldMoving
-    {
-        type            patch;
-        nFaces          50;
-        startFace       3750;
-    }
-    fixedWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          35;
-        startFace       3800;
-    }
-    axis
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          0;
-        startFace       3835;
-    }
-    left
-    {
-        type            patch;
-        nFaces          30;
-        startFace       3835;
-    }
-    farField
-    {
-        type            patch;
-        nFaces          35;
-        startFace       3865;
-    }
-    back
-    {
-        type            wedge;
-        inGroups        1(wedge);
-        nFaces          1900;
-        startFace       3900;
-    }
-    front
-    {
-        type            wedge;
-        inGroups        1(wedge);
-        nFaces          1900;
-        startFace       5800;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties
index 582e7e1ac1..250da7a4b8 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/turbulenceProperties b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/blockMeshDict b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/blockMeshDict
index af8f8bfda3..73b7815e77 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/controlDict b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/controlDict
index 9458edb8dd..2091e96ed1 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/controlDict
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
index 29b42ee983..c17ff218b5 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSchemes b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSchemes
index ff46e854e6..1cffc161fc 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSolution b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSolution
index 5161002b21..3e7517f74b 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
index 3ddfa33af1..3fe88670a6 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
index de2bad551b..1e1e4a05e5 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
index bf63a32f63..ff2ec4374d 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
index 4fee89f86e..cb965d5fbd 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
index c0560004a0..b1f103d94e 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
index 9de87d0b3f..b5bb0fa50b 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
deleted file mode 100644
index fde0c49a89..0000000000
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
+++ /dev/null
@@ -1,64 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-7
-(
-    inlet
-    {
-        type            patch;
-        nFaces          10;
-        startFace       2320;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          20;
-        startFace       2330;
-    }
-    freestreamInlet
-    {
-        type            patch;
-        nFaces          10;
-        startFace       2350;
-    }
-    freestream
-    {
-        type            patch;
-        nFaces          60;
-        startFace       2360;
-    }
-    wedge1
-    {
-        type            wedge;
-        nFaces          1200;
-        startFace       2420;
-    }
-    wedge2
-    {
-        type            wedge;
-        nFaces          1200;
-        startFace       3620;
-    }
-    defaultFaces
-    {
-        type            empty;
-        nFaces          0;
-        startFace       4820;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index f7ae5e91df..95dcc54c2a 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
index 0f23994333..978a7fca62 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
index 67c02eebd1..3d6c803f3c 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
index 095b7f29a7..17297ea98a 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
index c957f6991c..83118418d6 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
index 94f758fbe1..d9fddbbde8 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
index 3268609ce9..a9c7d7a917 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
index 5be2e5455b..9e384cc470 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
index fe12955f13..d13ca35997 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
index 81496be82e..f7b81cc7f3 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
index 0c51a9780f..aeba55e33d 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
index 002aa05a96..ab57d90501 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index 311e40d8fa..9cbad3aed1 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
index 3efa819518..cf592e7a72 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict
index 29dc22590f..8a999b85c8 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index 2b464c7cb2..caa01da008 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
index 1df1a22cb6..9a14fe9f20 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
index e552d56d07..512a22f946 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
index aab9c22d97..f140203259 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
index d710014845..38c48328b8 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
index 5b05864fad..9a0f3940b1 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
index 7c5c3a6af0..ba8f13a49a 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index f26f216f96..cc6102518e 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
index 3ca2b8fe85..a867996494 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
index 9ff404944b..e8dc3f2290 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
index c957f6991c..83118418d6 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
index 5c6a40dae6..a69e8134ed 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
index 3dd529262f..4c5200493b 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
index c6dbdb46cb..0d892fbaa2 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
index 2fa2f6f49e..ca7f6fc69b 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index 20369bc4ac..54134a7c2d 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
index 9385198524..27ef08a868 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
index a07cf065e2..315732fa41 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
index c957f6991c..83118418d6 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
index 5c6a40dae6..a69e8134ed 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
index dbc34e6cba..e73e259509 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
index 7da5ec784d..e65f1a8261 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
index d826cfa477..bad62aaf6d 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T
index dbc34e6cba..e73e259509 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0/T
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U
index 7da5ec784d..e65f1a8261 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0/U
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p
index d826cfa477..bad62aaf6d 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/0/p
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index dff8b1620d..83f9bd4918 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
index f34de7d825..2c0056dcb6 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
index 1f7712c3c2..3916282af9 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
index c957f6991c..83118418d6 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
index 5c6a40dae6..a69e8134ed 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
index 3e3241f33e..3a52a5d4af 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
index cd21562c8c..0d41636545 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
index 17160bc43f..ad86b90652 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
index 87a30870ee..41b6710155 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
index 7c5c3a6af0..ba8f13a49a 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index 20369bc4ac..54134a7c2d 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
index 6d85880e39..fc536e9a70 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
index 268a42d4c7..b64dd07d2a 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
index c957f6991c..83118418d6 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
index 5c6a40dae6..a69e8134ed 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T
index bbd52de121..1c8f43adde 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U
index dc2686147f..b2ad8f0c01 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat
index 1589874959..d908ca1869 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon
index ac29735441..2b385215a1 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k
index 62a6c6a62c..50dde2225c 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
index bf4775a271..1e8e21da91 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p
index dbb74a3363..88f5635d60 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
index 6224731ba2..f763819a9f 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings
index 64cc638a67..1be56d184c 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict
index 91865a2a19..59fe666d0f 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties
index 7182386e00..39e2c3cba3 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties
index 587f6acbd9..df7f6b835c 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/AMI.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/AMI.eMesh
index e94f9fdaf6..54d93472fd 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/AMI.eMesh
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/AMI.eMesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh
index 27d7e52827..9ab388fd84 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/shaft.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/shaft.eMesh
index 0790d852e8..374d2fad99 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/shaft.eMesh
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/shaft.eMesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh
index b60c3443da..2638a791a8 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/wall.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/wall.eMesh
index 35bd8195a9..daffaf4ab4 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/wall.eMesh
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/wall.eMesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/blockMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/blockMeshDict
index f524bb35c6..266fbfd539 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/controlDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/controlDict
index 8dd5c62f0f..22b6e1c855 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/controlDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createBafflesDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createBafflesDict
index a7b38ff6b8..b446030159 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createBafflesDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createPatchDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createPatchDict
index 9861be8d4e..264504633b 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createPatchDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes
index da7424d0e2..73031bb787 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution
index c23f49d6d9..2dbe9b9aa5 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict
index 00eee0f698..389c4ebd88 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDict
index ba92af85e8..8a8e3704b7 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDict
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
index 92dbe2cc22..ac31830765 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
index 39b2f9bce2..40180bd693 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
index 29279adbfe..892f5fac0e 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat
index 5ce0dfcc52..8d48047168 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
index def21ccbd7..e7381beda3 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
index d615af36d9..679b4d9bba 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/muTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
index 726b637f78..d6a2b20c72 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
index ed1ce104ab..c145cd10e4 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index 581ceffc70..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
index 392e2e045b..f418d51cdd 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
index dccceff3d8..6c7b296484 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
index 06932c9369..6d4abc10e4 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
index 60b6961604..71062b2c6a 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
index 4eddb38721..af32506641 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
index 561ca236be..04da8a4eb2 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
index 590ae2411e..f5d0f3dbe1 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
index b2a20bdcd7..f8699b2007 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
index 8c7abfb78f..269bf417ed 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
index acbc36ec25..06c5e568c5 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
index 4170dde35c..9a78672d52 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
index e3bdb75a7e..a8a6122143 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/fvOptions
index 542638fca8..0a23452315 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,8 +29,8 @@ porosity1
 
         DarcyForchheimerCoeffs
         {
-            d   d [0 -2 0 0 0 0 0] (7e5 -1000 -1000);
-            f   f [0 -1 0 0 0 0 0] (0 0 0);
+            d   (7e5 -1000 -1000);
+            f   (0 0 0);
 
             coordinateSystem
             {
@@ -39,8 +39,8 @@ porosity1
                 coordinateRotation
                 {
                     type    axesRotation;
-                    e1  (0.70710678 0.70710678 0);
-                    e3  (0 0 1);
+                    e1      (0.70710678 0.70710678 0);
+                    e3      (0 0 1);
                 }
             }
         }
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/boundary
deleted file mode 100644
index 7a2d7d0e5e..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       64100;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
index 7182386e00..39e2c3cba3 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4
index ce48c80996..9af34cc640 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict
index 124eddf8db..27097933f2 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
index 359d6ad3e1..2641e6e3dd 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 879c2a07f9..a25deccf52 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/T b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/T
index 76e54ad382..49076359f1 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
index 47440fb13c..c03c7a14e7 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/alphat
index 33ecb425e2..910221a06e 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/epsilon
index 8c7abfb78f..269bf417ed 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/k b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/k
index acbc36ec25..06c5e568c5 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/nut b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/nut
index 4170dde35c..9a78672d52 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/p b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/p
index e3bdb75a7e..a8a6122143 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/fvOptions
index 73c8c8a72a..aed428ab56 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,8 +29,8 @@ porosity1
 
         DarcyForchheimerCoeffs
         {
-            d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-            f   f [0 -1 0 0 0 0 0] (0 0 0);
+            d   (5e7 -1000 -1000);
+            f   (0 0 0);
 
             coordinateSystem
             {
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/polyMesh/boundary
deleted file mode 100644
index 7a2d7d0e5e..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       64100;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/thermophysicalProperties
index 7182386e00..39e2c3cba3 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict
deleted file mode 100644
index f10c6a9354..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// block definition for a porosity with an angled inlet/outlet
-// the porosity is not aligned with the main axes
-//
-
-convertToMeters 0.001;
-
-vertices
-(
-    // inlet region
-    ( -150  0  -25 )  // pt 0 (in1b)
-    ( -150 35.35533906  -25 ) // pt 1 (in2b)
-    ( -150  0  25 )  // pt 2 (in1f)
-    ( -150 35.35533906  25 ) // pt 3 (in2f)
-
-    // join inlet->outlet
-    (  0 0  -25 )    // pt 4 (join1b)
-    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b)
-    (  0 0  25 )    // pt 6 (join1f)
-    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f)
-
-    // porosity ends ->outlet
-    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b)
-    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b)
-    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f)
-    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f)
-
-    // outlet
-    (141.42135624 141.42135624 -25) // pt 12 (out1b)
-    (106.06601718 176.7766953 -25) // pt 13 (out2b)
-    (141.42135624 141.42135624 25) // pt 14 (out1f)
-    (106.06601718 176.7766953 25) // pt 15 (out2f)
-);
-
-blocks
-(
-    // inlet block
-    hex (0 4 5 1 2 6 7 3)
-    inlet (15 20 20) simpleGrading (1 1 1)
-
-    // porosity block
-    hex (4 8 9 5 6 10 11 7)
-    porosity (20 20 20) simpleGrading (1 1 1)
-
-    // outlet block
-    hex (8 12 13 9 10 14 15 11)
-    outlet (20 20 20)  simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-patches
-(
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    (2 6 7 3)
-    // outlet block
-    (10 14 15 11)
-    )
-
-    wall back
-    (
-    // inlet block
-    (1 5 4 0)
-    // outlet block
-    (9 13 12 8)
-    )
-
-    wall walls
-    (
-    // inlet block
-    (2 0 4 6)
-    (7 5 1 3)
-    // outlet block
-    (10 8 12 14)
-    (15 13 9 11)
-    )
-
-    wall porosityWall
-    (
-    // porosity block
-    (6 10 11 7)
-    // porosity block
-    (5 9 8 4)
-    // porosity block
-    (6 4 8 10)
-    (11 9 5 7)
-    )
-
-    patch inlet
-    (
-    (3 1 0 2)
-    )
-
-    patch outlet
-    (
-    (15 13 12 14)
-    )
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict.m4
index 09a4670392..702a60f084 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/controlDict b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/controlDict
index 7fd111a2f2..9ea0df2c05 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSchemes
index a1fefe7b4b..d0ccddd4f0 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSolution
index 83e599258f..1b6ae88dc0 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
index a96758a4f9..cf386ce577 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
index fa9e7a4f40..782d0a417c 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat
index a685edcef3..d11d669146 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
index fdcaf9c137..94a002c97d 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
index 72d1287df1..88c937e799 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
index 2f778b6395..f52bb820c4 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
index dc890e42e1..95e34f45cd 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
index 98fa427ba8..7caa904643 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
index 6671abebe7..ae4d164406 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
index 02fa2df1b9..9cf0f7ebd0 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict
index 165a600c7b..2e5f98c1a5 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
index 8cb4270b7b..df5ef372ad 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
index 748560d7c2..1ce64a9311 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
index e7c64b955d..c5b5df7dab 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/T b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/T
index ce30375f64..e4b07ad146 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
index 8f856ef5ea..e49fcb3e84 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/alphat b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/alphat
index bf206ead35..4bb03e19bd 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
index 3b5704561a..ab50487b67 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
index 74be565a85..26d6795453 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
index 6ca6d3aef6..be86624e1f 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/p b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/p
index 843dcecd00..ea282d6184 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/MRFProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/MRFProperties
index 6264ab2c6b..c7663e02d7 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/fvOptions
index 56123402fa..101bcd41d1 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,8 +29,8 @@ porosity1
 
         DarcyForchheimerCoeffs
         {
-            d   d [0 -2 0 0 0 0 0] (1e5 -1000 -1000);
-            f   f [0 -1 0 0 0 0 0] (0 0 0);
+            d   (1e5 -1000 -1000);
+            f   (0 0 0);
 
             coordinateSystem
             {
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/thermophysicalProperties
index 82e3c59f87..24be771845 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4
index ea4a17b79f..e7db95040c 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/controlDict
index 3ee2c8f628..b3bca3aa83 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
index 71bcc6b81f..bba476b65f 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution
index af90c13ebe..2e4495f855 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict
deleted file mode 100644
index f10c6a9354..0000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// block definition for a porosity with an angled inlet/outlet
-// the porosity is not aligned with the main axes
-//
-
-convertToMeters 0.001;
-
-vertices
-(
-    // inlet region
-    ( -150  0  -25 )  // pt 0 (in1b)
-    ( -150 35.35533906  -25 ) // pt 1 (in2b)
-    ( -150  0  25 )  // pt 2 (in1f)
-    ( -150 35.35533906  25 ) // pt 3 (in2f)
-
-    // join inlet->outlet
-    (  0 0  -25 )    // pt 4 (join1b)
-    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b)
-    (  0 0  25 )    // pt 6 (join1f)
-    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f)
-
-    // porosity ends ->outlet
-    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b)
-    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b)
-    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f)
-    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f)
-
-    // outlet
-    (141.42135624 141.42135624 -25) // pt 12 (out1b)
-    (106.06601718 176.7766953 -25) // pt 13 (out2b)
-    (141.42135624 141.42135624 25) // pt 14 (out1f)
-    (106.06601718 176.7766953 25) // pt 15 (out2f)
-);
-
-blocks
-(
-    // inlet block
-    hex (0 4 5 1 2 6 7 3)
-    inlet (15 20 20) simpleGrading (1 1 1)
-
-    // porosity block
-    hex (4 8 9 5 6 10 11 7)
-    porosity (20 20 20) simpleGrading (1 1 1)
-
-    // outlet block
-    hex (8 12 13 9 10 14 15 11)
-    outlet (20 20 20)  simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-patches
-(
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    (2 6 7 3)
-    // outlet block
-    (10 14 15 11)
-    )
-
-    wall back
-    (
-    // inlet block
-    (1 5 4 0)
-    // outlet block
-    (9 13 12 8)
-    )
-
-    wall walls
-    (
-    // inlet block
-    (2 0 4 6)
-    (7 5 1 3)
-    // outlet block
-    (10 8 12 14)
-    (15 13 9 11)
-    )
-
-    wall porosityWall
-    (
-    // porosity block
-    (6 10 11 7)
-    // porosity block
-    (5 9 8 4)
-    // porosity block
-    (6 4 8 10)
-    (11 9 5 7)
-    )
-
-    patch inlet
-    (
-    (3 1 0 2)
-    )
-
-    patch outlet
-    (
-    (15 13 12 14)
-    )
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
index 4974079c9d..83de517420 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
index 890b5f5632..79b8ad20e5 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
index 6d5e3b2a4c..e0db110ebb 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
index 76e54ad382..49076359f1 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
index e121b9c3c1..2f4b95f215 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
index 33ecb425e2..910221a06e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
index dc27e2fcff..849a447cc3 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
index 2b39c9a2cd..227bfc91f5 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
index fcb2bc9b00..15b6d252eb 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
index e3bdb75a7e..a8a6122143 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions
index d41d1e8b8d..768b8da1fb 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
deleted file mode 100644
index 95aefeb04b..0000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       64100;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties
index 9795d83b85..812459f2e6 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -23,8 +23,8 @@ porosity1
 
     DarcyForchheimerCoeffs
     {
-        d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-        f   f [0 -1 0 0 0 0 0] (0 0 0);
+        d   (5e7 -1000 -1000);
+        f   (0 0 0);
 
         coordinateSystem
         {
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index 920fff435c..5055046b5c 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict
deleted file mode 100644
index f10c6a9354..0000000000
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// block definition for a porosity with an angled inlet/outlet
-// the porosity is not aligned with the main axes
-//
-
-convertToMeters 0.001;
-
-vertices
-(
-    // inlet region
-    ( -150  0  -25 )  // pt 0 (in1b)
-    ( -150 35.35533906  -25 ) // pt 1 (in2b)
-    ( -150  0  25 )  // pt 2 (in1f)
-    ( -150 35.35533906  25 ) // pt 3 (in2f)
-
-    // join inlet->outlet
-    (  0 0  -25 )    // pt 4 (join1b)
-    ( -35.35533906   35.35533906  -25 ) // pt 5 (join2b)
-    (  0 0  25 )    // pt 6 (join1f)
-    ( -35.35533906   35.35533906  25 ) // pt 7 (join2f)
-
-    // porosity ends ->outlet
-    ( 70.71067812 70.71067812  -25 )  // pt 8 (poro1b)
-    ( 35.35533906 106.06601718  -25 )  // pt 9 (poro2b)
-    ( 70.71067812 70.71067812  25 )  // pt 10 (poro1f)
-    ( 35.35533906 106.06601718  25 )  // pt 11 (poro2f)
-
-    // outlet
-    (141.42135624 141.42135624 -25) // pt 12 (out1b)
-    (106.06601718 176.7766953 -25) // pt 13 (out2b)
-    (141.42135624 141.42135624 25) // pt 14 (out1f)
-    (106.06601718 176.7766953 25) // pt 15 (out2f)
-);
-
-blocks
-(
-    // inlet block
-    hex (0 4 5 1 2 6 7 3)
-    inlet (15 20 20) simpleGrading (1 1 1)
-
-    // porosity block
-    hex (4 8 9 5 6 10 11 7)
-    porosity (20 20 20) simpleGrading (1 1 1)
-
-    // outlet block
-    hex (8 12 13 9 10 14 15 11)
-    outlet (20 20 20)  simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-patches
-(
-    // is there no way of defining all my 'defaultFaces' to be 'wall'?
-    wall front
-    (
-    // inlet block
-    (2 6 7 3)
-    // outlet block
-    (10 14 15 11)
-    )
-
-    wall back
-    (
-    // inlet block
-    (1 5 4 0)
-    // outlet block
-    (9 13 12 8)
-    )
-
-    wall walls
-    (
-    // inlet block
-    (2 0 4 6)
-    (7 5 1 3)
-    // outlet block
-    (10 8 12 14)
-    (15 13 9 11)
-    )
-
-    wall porosityWall
-    (
-    // porosity block
-    (6 10 11 7)
-    // porosity block
-    (5 9 8 4)
-    // porosity block
-    (6 4 8 10)
-    (11 9 5 7)
-    )
-
-    patch inlet
-    (
-    (3 1 0 2)
-    )
-
-    patch outlet
-    (
-    (15 13 12 14)
-    )
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
index 09a4670392..702a60f084 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
index ded00ba569..1ff38a3f4b 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
index 890b5f5632..79b8ad20e5 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
index 357917a0b7..16e64acce7 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
index 76e54ad382..49076359f1 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
index e121b9c3c1..2f4b95f215 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
index 33ecb425e2..910221a06e 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
index dc27e2fcff..849a447cc3 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
index 2b39c9a2cd..227bfc91f5 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
index fcb2bc9b00..15b6d252eb 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
index e3bdb75a7e..a8a6122143 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
index fd223008c6..e57d791f24 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -45,8 +45,8 @@ porosity1
 
         fixedCoeffCoeffs
         {
-            alpha       alpha [0 0 -1 0 0 0 0] (500 -1000 -1000);
-            beta        beta  [0 -1 0 0 0 0 0] (0 0 0);
+            alpha       (500 -1000 -1000);
+            beta        (0 0 0);
             rhoRef      1;
 
             coordinateSystem
@@ -56,8 +56,8 @@ porosity1
                 coordinateRotation
                 {
                     type    axesRotation;
-                    e1  (0.70710678 0.70710678 0);
-                    e2  (0 0 1);
+                    e1      (0.70710678 0.70710678 0);
+                    e2      (0 0 1);
                 }
             }
         }
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
deleted file mode 100644
index 7a2d7d0e5e..0000000000
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       64100;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
index db1f5947af..76df75f120 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4 b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
index 09a4670392..702a60f084 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict
index 2ec29c29a8..08dccfe485 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
index b23305abb6..864c3c95bd 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
index 3e5f185454..d75f9772f9 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/T b/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
index 0ae25f9093..8540e72d49 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/U b/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
index 22ce6f4d03..14dd29bd99 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat b/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat
index 3a6625042c..ef57fca280 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon
index 71b9c782d1..cbe385c2a6 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/k b/tutorials/compressible/rhoSimpleFoam/squareBend/0/k
index 7ee52f8dbf..53dca849e4 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut b/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut
index ac8d562f40..080932f974 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/p b/tutorials/compressible/rhoSimpleFoam/squareBend/0/p
index 79a1eeb028..f5a4885b9f 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/p
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/polyMesh/boundary b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/polyMesh/boundary
deleted file mode 100644
index 72f6b668ca..0000000000
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/polyMesh/boundary
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    Default_Boundary_Region
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          22400;
-        startFace       324400;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       346800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       347200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
index 8658d3da81..fcb3cd8163 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
index 9bec6a9547..68ccf9a3ae 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
index edddd719e6..af923bbecf 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict
index 9e844a62ba..59ac6bbf16 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes
index ac63c55d11..2d08e53da1 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
index 8fe57aeb78..8b3daebd97 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/T b/tutorials/compressible/sonicDyMFoam/movingCone/0/T
index 6cfc544728..4daac7060b 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/T
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/U b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
index 2e86739791..629e8bce8a 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/U
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/p b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
index 807dc87866..0d9007c0dd 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/p
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
index 520fbd4b1a..d7fe50d3b0 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
index 95000b1405..8ec7acaa1c 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/compressible/sonicDyMFoam/movingCone/constant/polyMesh/boundary
deleted file mode 100644
index 89afa01256..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/polyMesh/boundary
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-8
-(
-    movingWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          85;
-        startFace       3665;
-    }
-    farFieldMoving
-    {
-        type            patch;
-        nFaces          50;
-        startFace       3750;
-    }
-    fixedWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          35;
-        startFace       3800;
-    }
-    axis
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          0;
-        startFace       3835;
-    }
-    left
-    {
-        type            patch;
-        nFaces          30;
-        startFace       3835;
-    }
-    farField
-    {
-        type            patch;
-        nFaces          35;
-        startFace       3865;
-    }
-    back
-    {
-        type            wedge;
-        inGroups        1(wedge);
-        nFaces          1900;
-        startFace       3900;
-    }
-    front
-    {
-        type            wedge;
-        inGroups        1(wedge);
-        nFaces          1900;
-        startFace       5800;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
index 582e7e1ac1..250da7a4b8 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties b/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
index af8f8bfda3..73b7815e77 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
index 00464ce893..251aa5d9c0 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
index 29b42ee983..c17ff218b5 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
index 823e92a106..c4edfa3f85 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
index 5161002b21..3e7517f74b 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
index 17160bc43f..ad86b90652 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
index 108d3b176d..6c1a62b0f3 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
index bdbc4f96ce..47af1b587b 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
deleted file mode 100644
index 53cce9211b..0000000000
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    inlet
-    {
-        type            patch;
-        nFaces          50;
-        startFace       10325;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       10375;
-    }
-    bottom
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          25;
-        startFace       10415;
-    }
-    top
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          125;
-        startFace       10440;
-    }
-    obstacle
-    {
-        type            patch;
-        nFaces          110;
-        startFace       10565;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          10500;
-        startFace       10675;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index f26f216f96..cc6102518e 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
index 496a295813..c7a4543a44 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
index 3fc5df7bb9..915e99e5f0 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index fb2db00392..af7d78e236 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
index 2875f8c7aa..5f5f2bf2d7 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
index dbc34e6cba..e73e259509 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
index 7da5ec784d..e65f1a8261 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
index 9aa3823c4d..ba95542364 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
index d826cfa477..bad62aaf6d 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
index dbc34e6cba..e73e259509 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
index 7da5ec784d..e65f1a8261 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
index 9aa3823c4d..ba95542364 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
index d826cfa477..bad62aaf6d 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
deleted file mode 100644
index 7fc4ff3fe5..0000000000
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-2
-(
-    sides
-    {
-        type            patch;
-        nFaces          2;
-        startFace       999;
-    }
-    empty
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4000;
-        startFace       1001;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index 7d0bc7caf3..cd9b961881 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
index f55c05e176..6ea1a02dde 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
index 45903d7b3b..3a454e5d1c 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index 43433e562d..9dff458a2f 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
index 11b41801ae..88b6ab1681 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
index 56c198065e..34176d6c3f 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
index cd21562c8c..0d41636545 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
index 34dcaca89e..c4e9ae6f04 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
index c50c9171d0..a17f542dc8 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
index 2c29b22fea..e5f2a2a089 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
index 867915923d..42e3b8527a 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
index 807d2a2b30..00c8787f40 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
index b8c80af97c..ecdb5226f6 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
index 846f03a390..9e15acd262 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
similarity index 69%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
index 871192082a..edae5c37f5 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allclean
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allclean
@@ -1,14 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
-rm -rf comms
-
-killall externalSolver > /dev/null 2>&1
-
+rm -f constant/polyMesh/boundary > /dev/null 2>&1
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
index 4e85cda825..0df7881d40 100755
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -9,10 +9,7 @@ application=`getApplication`
 
 runApplication star3ToFoam prostar/nacaAirfoil
 
-mv constant/polyMesh/boundary temp
-sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
-    temp > constant/polyMesh/boundary
-rm temp
+sed -i -e 's/symmetry\([)]*;\)/empty\1/' constant/polyMesh/boundary
 
 runApplication $application
 
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
deleted file mode 100644
index becd8320f7..0000000000
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    INLE1
-    {
-        type            patch;
-        nFaces          400;
-        startFace       79570;
-    }
-    OUTL2
-    {
-        type            patch;
-        nFaces          200;
-        startFace       79970;
-    }
-    SYMP3
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          80000;
-        startFace       80170;
-    }
-    WALL10
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          260;
-        startFace       160170;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
deleted file mode 100644
index f20d97eab5..0000000000
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    INLE1
-    {
-        type            patch;
-        physicalType    supersonicFreestream;
-        startFace       79570;
-        nFaces          400;
-    }
-
-    OUTL2
-    {
-        type            patch;
-        physicalType    pressureTransmissiveOutlet;
-        startFace       79970;
-        nFaces          200;
-    }
-
-    SYMP3
-    {
-        type            empty;
-        physicalType    empty;
-        startFace       80170;
-        nFaces          80000;
-    }
-
-    WALL10
-    {
-        type            wall;
-        physicalType    adiabaticWallFunctions;
-        startFace       160170;
-        nFaces          260;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index 341cdb94d5..671f822d1f 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
index b9a4c7ca82..2b0835b5dd 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index bc4dac801a..cb536e1670 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index 68acc29cb7..6ae6033b55 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
index afc24d24a2..5e3d1bd9c2 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/T b/tutorials/compressible/sonicFoam/ras/prism/0/T
index 6505163362..3b09f70d28 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/T
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/U b/tutorials/compressible/sonicFoam/ras/prism/0/U
index f9eff07595..3295b946cb 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/U
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
index 4eeae65666..0d00f73a62 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/alphat
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
index baba5a8001..7867f743b4 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k
index 61815273a5..b9244650c6 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/k
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/nut b/tutorials/compressible/sonicFoam/ras/prism/0/nut
index 3035025ddc..745edae790 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/nut
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/p b/tutorials/compressible/sonicFoam/ras/prism/0/p
index c1cc7124ff..677e5167d0 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/p
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index 341cdb94d5..671f822d1f 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict b/tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict
index 6db2ef7663..7f2790931d 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
index f5dcfb9881..aa9ba526d9 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index cf64fe7144..16b59b3a44 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
index b1a21b1f9a..123b5e2c73 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
index 8cd64051f0..b990ffd09f 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
index 216ee63bec..e74fe4436d 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
deleted file mode 100644
index b1ca7310c6..0000000000
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    outerWall
-    {
-        type            wall;
-        nFaces          225;
-        startFace       7275;
-    }
-    axis
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          120;
-        startFace       7500;
-    }
-    nozzle
-    {
-        type            patch;
-        nFaces          5;
-        startFace       7620;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3725;
-        startFace       7625;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3725;
-        startFace       11350;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
index 93c3dbbd46..066d7eaaef 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
index ae4876ed06..62883d06a0 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
index 512b49940e..7d36ba276a 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
index a48accc6ba..e00542766b 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
index 85de5505e1..8cc32f9687 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
index 438b2dd3c4..ea02dd439e 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
index 3a1827546e..d4b654116c 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
index 8557b5815f..f3fb5cd3d7 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
index b3de99a728..8b5d722eee 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
index 7079c1405b..08404904d2 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
index 4c20820399..620db22dfd 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
index c3647d56f6..e1cbed8ad8 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
index b7c7278bb3..30b02d1ea4 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
index 2f9b8d6b3e..fc7a55c277 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
index efc71c530a..3dd873139a 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
index 527596874e..d98cc8e35e 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
index 688e05647f..f1bda270a2 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
index 19ba2ae8a6..587157d271 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
index 0b48c0f3c7..9ecb2ad4ad 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index 28634ee885..7abbfb1035 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
index 8a506df6a4..4d35115fa0 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
index 9fa9343345..243127f806 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
index 6b5579ebd6..931132a0f4 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
index 244d32f440..ba80d5a2f2 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
index e891b1fe96..eedb132831 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
index 74aa0df594..f282402187 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
index d4d2a23259..2658ce3978 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
index 70ee634932..e5c3388fe2 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
index 931e0b946a..c6e5ddfa45 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
index 5478aef6a6..c825a00c4e 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
index 60d26fd3f0..cf965c579b 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
index cd4e40f537..60c7fbe6b4 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
index 5851b65b4e..d4f98291a9 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
index 149029c91e..35f211c91f 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
index 831fedc8c4..02b50e71e9 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 2f17c188c0..354aba55e1 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
index 8a506df6a4..4d35115fa0 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
index 549f9968fd..d37db2ba83 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
index ef322d8c87..a162684f34 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
index 744ecbbfb8..b09e5dea5a 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
index 785995c6cf..ab115fb2b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
index 7b9c6df33a..217a0d6662 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
index ead6eebcbd..b416eaf1e0 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
index ced72b0e8d..af490231bc 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
index 0bd68d2dd0..8c9822f4b4 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
index 2a65f62e04..2028f597ee 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
index 49d5c4c775..15cb99053b 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
index a07b9b4cc5..0eea0d2931 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
index 10cad731eb..beb88ec19d 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
index bc4a574945..3054f11955 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
index 599dfd540c..5830023166 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 8045c73096..356f99e8e0 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
index 458d8e2a38..e0d339b78f 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
index a08adb3d84..65873bed26 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
index cf0b5fbe89..17202ca3e0 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
index 894eae1cc6..0e36388122 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
index e439fc13eb..e9610a78b0 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
index ceb691b287..ca1ab93f12 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
index 0bf22cdfa3..02ea3b000e 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
index 1612d96501..b35a25f01d 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
index 8acab6b8d8..9edd1b91ef 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
index 22569085b6..4873ba05f3 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
index ad0611f3d8..9feeeab65b 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
index 76b980adfb..bf44ee6a59 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
index 1e3b369992..f2c0d74bac 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
index 65ccb86b8a..e971bda0ab 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 7215ec7182..8a316cc0b3 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
index f1d9f6fde1..0dc09eaf32 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
index 1b76b7810c..10d1db8302 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
index ca9f9a8d7d..4afa55a3f7 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
index ffa336e9f6..789934700a 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index d862b2bbf0..e2233c88c2 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
index 557d7c993a..c2f1fe31ef 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
index aeb72cb3b6..78fedc0816 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
index 1e18f45f4a..c3fb5837cc 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
index 4f408f3b7c..6ce14dda9e 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/potentialDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 n|    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
index 1b76b7810c..10d1db8302 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
index 03d7d452bc..6073e69191 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
index 5602b2aef1..1d301a3638 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index 2828d37cac..2e5244fc7d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
index 953d9d8d66..6eff2a638e 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
index 6a705e952b..a014d645c0 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
index 43d505439c..ca191916a2 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
index eb5c6bc074..afc7b732dd 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/potentialDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
index 34e7af7e7c..8438d2784d 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
index 08318f4bb7..6b1012e55e 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
index 4d620ea04f..3cb94398d8 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 362c825338..a9a721bbce 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
index bb5ec38a10..1604f5d3be 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
index 6a705e952b..a014d645c0 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
index 517d341a3f..a308395802 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
index eb5c6bc074..afc7b732dd 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/potentialDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
index 5720f56c4c..fdb2cff393 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
index 4c10b95307..2bafda70bb 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
index db3d16a104..fc0aa5a6f6 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
index 0b63cecf2b..2ba06bd774 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
index dfbffe862e..b2a1d9b329 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
index 181294c4b9..ef6e64a6c4 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
index bb403e3cf2..808aa2cba2 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/B b/tutorials/electromagnetics/mhdFoam/hartmann/0/B
index 4c56e8c248..000dc6f39d 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/B
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/B
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/U b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
index a419bbdc71..580125d718 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/U
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux b/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
index 710f0df1b2..1c0de1984d 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy
index 7154a1fe5f..4fd5a114bf 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz
index fb4475364a..8d3fb8816a 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/p b/tutorials/electromagnetics/mhdFoam/hartmann/0/p
index f7c4ff6c74..12359f6780 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/p
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/pB b/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
index 8c0651f787..41bfa421d5 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
index 703d83b4dc..5582857fb3 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
index d49b984b60..61278185a1 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
index 906592ca76..3266b33dc2 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
index 5332e1f62f..7fba5d0e34 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
index 0f31523126..689248a593 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
index 829a7315b6..cb50d8224c 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/0/V b/tutorials/financial/financialFoam/europeanCall/0/V
index bac3baf408..d7bd171de3 100644
--- a/tutorials/financial/financialFoam/europeanCall/0/V
+++ b/tutorials/financial/financialFoam/europeanCall/0/V
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
index 98fdad00a9..ad67827360 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
+++ b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
index 5ddefb958c..f3ce3a2fef 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict
index 6dc5d0d65c..1079276153 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/controlDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSchemes b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
index 21f8a13b13..260a17a681 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
+++ b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSolution b/tutorials/financial/financialFoam/europeanCall/system/fvSolution
index 3b95a48479..cf80cb20cc 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/fvSolution
+++ b/tutorials/financial/financialFoam/europeanCall/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
index ae7aa33db2..89d04907ae 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
index 6c92f22050..62c581096c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
index d743d3dfbb..7d47e74a7f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon
index 892d69375d..bd731d1761 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k
index 8e5e6563ee..9ccabe8ced 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut
index a4ff414984..f14a480511 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
index 78874025a2..ed297deb8e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
index b2d94f6866..f206894d43 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
index ce09e52108..013f3be8ef 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
index 57a82196c9..a7eab6a604 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
index 642eca1f62..cd8ec1f9bd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
index c81e72a231..c3655757b7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
index 324df46ada..714975d7ea 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
index 25eb455679..5eac4fb84e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org
index ae7aa33db2..89d04907ae 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
index 6c92f22050..62c581096c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
index d743d3dfbb..7d47e74a7f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon
index 892d69375d..bd731d1761 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k
index 8e5e6563ee..9ccabe8ced 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut
index a4ff414984..f14a480511 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
index 78874025a2..ed297deb8e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
index b2d94f6866..f206894d43 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
index ce09e52108..013f3be8ef 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
index 57a82196c9..a7eab6a604 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
index 82e81acc13..dc6fb20830 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 5314cd6d6c..10dc4fabfb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
index a5df85e653..d899f4fd5a 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
index 25eb455679..5eac4fb84e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index 2e1c070168..8152adf88c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index 8c96ab7f5f..b78cac662f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
index 0008a1123d..b1d0004cd0 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
index 9737d5e7e5..ff6a02828d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
index 1db0b544b6..322b24620d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
index 3cde4853d6..4ad9e8d0df 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index b128cf935d..c2e9145e4b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index 31c0555bcf..8baabd088d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
index a0d7102656..c925386e15 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
index ce09e52108..013f3be8ef 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh
index 2df900d9e1..c06f7ade92 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/triSurface/fridgeA.eMesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
index 265f408344..8b2c824e21 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 590a482d4a..73cfe8ada4 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
index 4bb3b12c71..c839e2b32b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 3d8c60dc1f..529984badd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -41,6 +41,7 @@ divSchemes
 laplacianSchemes
 {
     default         Gauss linear limited corrected 0.333;
+    laplacian(diffusivity,cellDisplacement) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
index 627615c534..3f72fad538 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -32,6 +32,12 @@ solvers
         tolerance       1e-07;
         relTol          0.1;
     }
+
+    cellDisplacement
+    {
+        $p_rgh;
+        relTol          0;
+    }
 }
 
 SIMPLE
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
index 4dfba773e3..4c6a178d86 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 710ce54571..c5c2904b6c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -294,7 +294,7 @@ addLayersControls
     // cannot be above minThickness do not add layer.
     // Relative to undistorted size of cell outside layer.
     // See relativeSizes parameter.
-    minThickness 0.25;
+    minThickness 0.05;
 
     // If points get not extruded do nGrow layers of connected faces that are
     // also not grown. This helps convergence of the layer addition process
@@ -313,30 +313,29 @@ addLayersControls
     // before upon reaching a correct mesh.
     nRelaxIter 5;
 
-    // Number of smoothing iterations of surface normals
-    nSmoothSurfaceNormals 1;
-
-    // Number of smoothing iterations of interior mesh movement direction
-    nSmoothNormals 3;
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 0.5;
 
     // Smooth layer thickness over surface patches
     nSmoothThickness 10;
 
-    // Stop layer growth on highly warped cells
-    maxFaceThicknessRatio 0.5;
 
-    // Reduce layer growth where ratio thickness to medial
-    // distance is large
-    maxThicknessToMedialRatio 0.3;
 
-    // Angle used to pick up medial axis points
-    // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x.
-    minMedianAxisAngle 90;
+    //- Use displacementMotionSolver to shrink mesh
+    meshShrinker displacementMotionSolver;
+
+    //- Use laplacian for shrinking
+    solver displacementLaplacian;
+
+    displacementLaplacianCoeffs
+    {
+        diffusivity quadratic inverseDistance ("two.*" igloo);
+    }
+
 
     // Create buffer region for new layer terminations
     nBufferCellsNoExtrude 0;
 
-
     // Overall max number of layer addition iterations. The mesher will exit
     // if it reaches this number of iterations; possibly with an illegal
     // mesh.
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
index 5d326e6898..7618fde9fe 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
index 5d326e6898..7618fde9fe 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/T.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
index 6c92f22050..62c581096c 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
index 5b9884a613..2a1e3e9d6f 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
index 892d69375d..bd731d1761 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
index 8e5e6563ee..9ccabe8ced 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
index a4ff414984..f14a480511 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
index 5c26f07ac4..d6ab24211f 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
index 8602946911..93802e444f 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index ab678e4d88..8e8f602886 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
index 57a82196c9..a7eab6a604 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
index 6a36bdbf8d..83c6f41749 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
index 994a06ef44..c198821ef9 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
index 7127fdc8c6..78d0b84613 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -60,6 +60,8 @@ PIMPLE
     nOuterCorrectors 1;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       1e5;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
index 25eb455679..5eac4fb84e 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
index 4eca541b1c..ee76306fcf 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
index 2d917d036f..cd89241126 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
index 9e486ba215..c3d6016aa2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
index f1ac119104..539f7dd9a3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
index ccdab2054e..b88881cc84 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut
index bc7b910408..3313f6e203 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
index 481f4e64d7..21d533eb48 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
index 9b1e74247b..6529e328ea 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
index 15979d020e..c788d5e6f7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
deleted file mode 100644
index 0e07c61c65..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    frontAndBack
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1050;
-        startFace       228225;
-    }
-    topAndBottom
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          10500;
-        startFace       229275;
-    }
-    hot
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          2250;
-        startFace       239775;
-    }
-    cold
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          2250;
-        startFace       242025;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 95579e34cb..cd2c5ebdf1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
index 691c02bb16..20708218a0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
index 5f2f1e8fd2..b3eec9ac84 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
index 5df05af0da..8ca46687fb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index 0b96d46074..4edbffd946 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
index b19527e0ce..d59cfbef3b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
index f623168a16..7d6d849af8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T
index 09fb826c63..becccdc438 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
index 7bcd3844cc..7a47e95616 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
index b870a3b0f9..57b9f5d4e0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/Q b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/Q
index d5a2ba9cfd..69be3cf9c8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/Q
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/Q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T
index ea17f0ac0b..78d7171308 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p
index 7db4668cb7..9d52dc3817 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
index ddfe447494..0de9846571 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DTemperatureMasterBafflePatches
index 1c2a91f28c..b59009501f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DTemperatureMasterBafflePatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DbaffleSolidThermo
index 82a4468a90..272f3ec82c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/1DBaffle/1DbaffleSolidThermo
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DTemperatureMasterBafflePatches
index a068b051ba..b0c1daa28f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DbaffleSolidThermo
index 05d8ca3f74..872813886a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/3DbaffleSolidThermo
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/extrudeModel b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/extrudeModel
index da7c54084d..5314860da9 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/extrudeModel
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/3DBaffle/extrudeModel
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/baffle3DSetup
index 4203ba9223..2eb3b79dc3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/baffle3DSetup
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches
index c9385a0f64..2ce3746185 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/include/wallBafflePatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
index 4d4a90ccca..494eb627ef 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
index 448198c9c2..b70ceebc9c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
index 9b7bfd7d53..e8797f7439 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
index b93e0275f1..b012ebaf4d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
index 95579e34cb..cd2c5ebdf1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
index 02c3d67bb6..e922a40115 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
index 853676faaa..102fc86966 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
index ebdab1ccda..56e08f4fa0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffle3DRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
index e7907cf3e2..482176786c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
index 78f6a784a2..9cb20f6bfe 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
index 2bc58e0d70..491d56f117 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
index 7e71c2ea5f..479e8f4bbe 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution
index a5f011bb00..ec7266f9a3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun
deleted file mode 100755
index ba2d933543..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-./Allrun.pre
-
-runApplication $(getApplication) &
-
-./externalSolver
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/README b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/README
deleted file mode 100644
index 10d7392eb4..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Example of an explicit coupling between OpenFOAM and an external application
-using the externalCoupled boundary conditions.
-
-The case is based on the buoyantCavity tutorial case, whereby on each iteration
-the 'hot' and 'cold' patch temperatures are incremented by 1K.
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/polyMesh/boundary
deleted file mode 100644
index 0e07c61c65..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    frontAndBack
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1050;
-        startFace       228225;
-    }
-    topAndBottom
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          10500;
-        startFace       229275;
-    }
-    hot
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          2250;
-        startFace       239775;
-    }
-    cold
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          2250;
-        startFace       242025;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
index a7e83e641d..3c6ec4363d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/T
index 54f57f70cb..1b27024a05 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U
index e1d0972d79..f6953c1b25 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/alphat
index a270cb2178..de0ce76def 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon
index a0fa682a61..4994c3ae87 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k
index 0ca172de85..129b3bcd52 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut
index 86ee5ac89b..6b703d59f0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p
index 4e42fa9aef..fb9be497bf 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p_rgh
index b8deb5e595..fc98742c11 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/polyMesh/boundary
deleted file mode 100644
index dd60bda33a..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    box
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       303675;
-    }
-    floor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          5125;
-        startFace       303975;
-    }
-    ceiling
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          5225;
-        startFace       309100;
-    }
-    fixedWalls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          6000;
-        startFace       314325;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
index cb84664b87..5881d9769a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
index ab678e4d88..8e8f602886 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
index 0e75a7462f..436724ff01 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
index a593790c42..83ff0938e1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict
index 9e12984010..f9d959e2dc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
index 96b831bc89..1433113709 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
index c4fd0cde06..2e7aa2f698 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
index fe75242d76..dcd3b3a644 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
index 9d5ac9c871..9cdcf792d2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/T
index 54f57f70cb..1b27024a05 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U
index e1d0972d79..f6953c1b25 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/alphat
index 8347982fb3..f2b5612f54 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon
index c49b1005e3..bd0270839e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k
index 0ca172de85..129b3bcd52 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut
index a7fc155fc2..77ffecf4b0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p
index c55cbc277d..48fe8a009f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p_rgh
index b8deb5e595..fc98742c11 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
deleted file mode 100644
index 8cff40253e..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    box
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       303675;
-    }
-    floor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          5125;
-        startFace       303975;
-    }
-    ceiling
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          5225;
-        startFace       309100;
-    }
-    fixedWalls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          6000;
-        startFace       314325;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
index 9bd4093240..e618063f90 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index ab678e4d88..8e8f602886 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
index 0e75a7462f..436724ff01 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
index a593790c42..83ff0938e1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict
index 76e8fe4bef..45bcb0270d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
index 54466bf0d1..6d831fd9eb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
index 8ce57081a3..d3c22ccbd5 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/T
similarity index 72%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/T
index 20d992ff42..fe4d75bd0f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/T
@@ -2,27 +2,29 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    walls
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    ".*"
     {
-        type            patch;
-        nFaces          5532;
-        startFace       74754;
+        type            calculated;
+        value           uniform 300;
     }
-)
+}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/U
new file mode 100644
index 0000000000..ef547fb0d3
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/U
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0.01 0 0);
+
+boundaryField
+{
+    ".*"
+    {
+        type            calculated;
+        value           uniform (0.01 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/epsilon
new file mode 100644
index 0000000000..4df5689c01
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/epsilon
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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       volScalarField;
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 0.01;
+
+boundaryField
+{
+    ".*"
+    {
+        type            calculated;
+        value           uniform 0.01;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/k
similarity index 72%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/k
index 20d992ff42..51b012e11c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/k
@@ -2,27 +2,30 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    walls
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0.1;
+
+boundaryField
+{
+    ".*"
     {
-        type            patch;
-        nFaces          5532;
-        startFace       74754;
+        type            calculated;
+        value           uniform 0.1;
     }
-)
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/p
similarity index 72%
rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/p
index b16c01a16f..958a40ff27 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/p
@@ -2,27 +2,29 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    walls
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    ".*"
     {
-        type            wall;
-        nFaces          64000;
-        startFace       3040000;
+        type            calculated;
+        value           uniform 1e5;
     }
-)
+}
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/p_rgh
similarity index 71%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/p_rgh
index 20d992ff42..6baa60c260 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/0/p_rgh
@@ -2,27 +2,29 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    walls
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    ".*"
     {
-        type            patch;
-        nFaces          5532;
-        startFace       74754;
+        type            calculated;
+        value           uniform 1e5;
     }
-)
+}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
new file mode 100755
index 0000000000..82e538bb43
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allclean
@@ -0,0 +1,23 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm -rf comms
+rm -rf VTK
+rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf 0/bottomWater
+rm -rf 0/topAir
+rm -rf 0/heater
+rm -rf 0/leftSolid
+rm -rf 0/rightSolid
+rm -f 0/cellToRegion
+rm -rf constant/bottomWater/polyMesh
+rm -rf constant/topAir/polyMesh
+rm -rf constant/heater/polyMesh
+rm -rf constant/leftSolid/polyMesh
+rm -rf constant/rightSolid/polyMesh
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
new file mode 100755
index 0000000000..bfb99ee4d1
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun
@@ -0,0 +1,28 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+./Allrun.pre
+
+#-- Run on single processor
+#runApplication `getApplication` &
+# Simulated external solver
+#runApplication ./externalSolver
+
+# Decompose
+runApplication decomposePar -allRegions
+
+# Run OpenFOAM
+runParallel `getApplication` 4 &
+
+# Simulated external solver
+runApplication ./externalSolver
+
+# Reconstruct
+runApplication reconstructPar -allRegions
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
new file mode 100755
index 0000000000..d841e3cfe0
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/Allrun.pre
@@ -0,0 +1,33 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication topoSet
+runApplication splitMeshRegions -cellZones -overwrite
+
+# remove fluid fields from solid regions (important for post-processing)
+for i in heater leftSolid rightSolid
+do
+   rm -f 0*/$i/{nut,alphat,epsilon,k,U,p_rgh}
+done
+
+
+for i in bottomWater topAir heater leftSolid rightSolid
+do
+   changeDictionary -region $i > log.changeDictionary.$i 2>&1
+done
+
+# Create coupling geometry
+runApplication createExternalCoupledPatchGeometry \
+    -regions '(topAir heater)' coupleGroup
+
+echo
+echo "creating files for paraview post-processing"
+echo
+paraFoam -touchAll
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/README.txt b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/README.txt
new file mode 100644
index 0000000000..b0ca34a873
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/README.txt
@@ -0,0 +1,3 @@
+Modification of the heatTransfer chtMultiRegionFoam tutorial that demonstrates
+the externalCoupled functionObject in combination with the ./externalSolver
+script to simulate coupling to an external code.
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/g
similarity index 90%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/g
index 0cc222ca34..2a29484f31 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,5 +17,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 -9.81 0);
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/radiationProperties
new file mode 100644
index 0000000000..13c1c495ce
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/radiationProperties
@@ -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      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  none;
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/thermophysicalProperties
new file mode 100644
index 0000000000..cdc4d01490
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/thermophysicalProperties
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18;
+    }
+    equationOfState
+    {
+        rho             1000;
+    }
+    thermodynamics
+    {
+        Cp              4181;
+        Hf              0;
+    }
+    transport
+    {
+        mu              959e-6;
+        Pr              6.62;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/h2/constant/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/turbulenceProperties
similarity index 89%
rename from tutorials/combustion/chemFoam/h2/constant/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/turbulenceProperties
index c2c3b28a1b..e01c7d0bdb 100644
--- a/tutorials/combustion/chemFoam/h2/constant/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/bottomWater/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,12 +10,10 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/heater/radiationProperties
new file mode 100644
index 0000000000..d0fc2af6ae
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/heater/radiationProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation off;
+
+radiationModel  none;
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/heater/thermophysicalProperties
new file mode 100644
index 0000000000..e8143c4f0f
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   50;
+    }
+
+    transport
+    {
+        kappa   80;
+    }
+
+    thermodynamics
+    {
+        Hf      0;
+        Cp      450;
+    }
+
+    equationOfState
+    {
+        rho     8000;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/leftSolid/radiationProperties
new file mode 120000
index 0000000000..08087c37b4
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/leftSolid/radiationProperties
@@ -0,0 +1 @@
+../heater/radiationProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/leftSolid/thermophysicalProperties
new file mode 120000
index 0000000000..dc4d3a18ee
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1 @@
+../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..db35f72692
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/polyMesh/blockMeshDict
@@ -0,0 +1,96 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-0.1 -0.04  -0.05)
+    ( 0.1 -0.04  -0.05)
+    ( 0.1  0.04  -0.05)
+    (-0.1  0.04  -0.05)
+    (-0.1 -0.04   0.05)
+    ( 0.1 -0.04   0.05)
+    ( 0.1  0.04   0.05)
+    (-0.1  0.04   0.05)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (30 10 10) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    maxY
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    minY
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    minZ
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    maxZ
+    {
+        type wall;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/regionProperties
new file mode 100644
index 0000000000..d8ce83ab54
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/regionProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      regionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+regions
+(
+    fluid       (bottomWater topAir)
+    solid       (heater leftSolid rightSolid)
+);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/rightSolid/radiationProperties
new file mode 120000
index 0000000000..08087c37b4
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/rightSolid/radiationProperties
@@ -0,0 +1 @@
+../heater/radiationProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/rightSolid/thermophysicalProperties
new file mode 120000
index 0000000000..dc4d3a18ee
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1 @@
+../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/g
new file mode 120000
index 0000000000..fea3757006
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/g
@@ -0,0 +1 @@
+../bottomWater/g
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/radiationProperties
new file mode 120000
index 0000000000..583b06cb0b
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/radiationProperties
@@ -0,0 +1 @@
+../bottomWater/radiationProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties
similarity index 83%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties
index 95579e34cb..3c7f4162e4 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
+    location    "constant/bottomWater";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,17 +31,17 @@ mixture
     specie
     {
         nMoles          1;
-        molWeight       28.96;
+        molWeight       28.9;
     }
     thermodynamics
     {
-        Cp              1004.4;
+        Cp              1000;
         Hf              0;
     }
     transport
     {
-        mu              1.831e-05;
-        Pr              0.705;
+        mu              1.8e-05;
+        Pr              0.7;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/turbulenceProperties
new file mode 120000
index 0000000000..ec52cbd592
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/constant/topAir/turbulenceProperties
@@ -0,0 +1 @@
+../bottomWater/turbulenceProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver
similarity index 53%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
rename to tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver
index 03c25c644a..cf8caf9c6b 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/externalSolver
@@ -1,20 +1,29 @@
 #!/bin/sh
 #
 # Dummy external solver to communicate with OpenFOAM via externalCoupled
-# boundary conditions
+# functionObject
 #
 # Functionality is hard-coded for this particular test case
 # - patch temperatures increased by 1K on each step
 #
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Check for unassigned variables
+set -u
 
 echo "Executing dummy external solver"
 
 commsDir="comms"
+regionGroupName="heater_topAir"
+patchGroupName="coupleGroup"
+fieldName="T"
+
 lockFile="${commsDir}/OpenFOAM.lock"
-dataFile="${commsDir}/data"
+dataFile="${commsDir}/${regionGroupName}/${patchGroupName}/${fieldName}"
 waitSec=1
 timeOut=10
+nSteps=200  # maximum number of time steps. Note: should be more than
+            # number of iterations on the OpenFOAM side
 refGrad=0
 valueFraction=1
 
@@ -27,16 +36,21 @@ init()
 {
     log "initialisation: creating ${dataFile}.in"
 
-    # Hard-coded for 2 patches of size 2250
-    n=2250
-    refCold=283
-    refHot=303
+    # Hard-coded for patch of size 8 (heater/minY)
+    n1=8
+    refValue1=500
     touch "${dataFile}.in"
-    for i in $(seq 1 $n); do
-        echo "$refHot $refGrad $valueFraction" >> "${dataFile}.in"
+    log "initialisation: adding $n1 data elements with refValue $refValue1"
+    for i in $(seq 1 $n1); do
+        echo "$refValue1 $refGrad $valueFraction" >> "${dataFile}.in"
     done
-    for i in $(seq 1 $n); do
-        echo "$refCold $refGrad $valueFraction" >> "${dataFile}.in"
+
+    # Hard-coded for patch of size 40 (topAir/minX)
+    n2=40
+    refValue2=300
+    log "initialisation: adding $n2 data elements with refValue $refValue2"
+    for i in $(seq 1 $n2); do
+        echo "$refValue2 $refGrad $valueFraction" >> "${dataFile}.in"
     done
 
     # create lock file to pass control to OF
@@ -44,6 +58,10 @@ init()
 }
 
 
+# create the comms directory
+mkdir -p ${commsDir}/${regionGroupName}/${patchGroupName}
+
+
 # tutorial case employs the 'initByExternalOption', so we need to provide
 # the initial values
 init
@@ -51,7 +69,7 @@ init
 
 totalWait=0
 step=0
-while [ 1 ]; do
+while [ $step -lt $nSteps ]; do
     if [ -f $lockFile ]; then
         log "found lock file ${lockFile} - waiting"
         totalWait=$(expr $totalWait + $waitSec)
@@ -70,9 +88,10 @@ while [ 1 ]; do
         log "sleeping for $waitSec secs to simulate external process"
         sleep $waitSec
 
-        log "creating ${dataFile}.in"
+        log "updating ${dataFile}.in from ${dataFile}.out"
 
-        awk '{if( $1 != "#" ){print $2+1 " 0 1"}}' ${dataFile}.out > ${dataFile}.in
+        awk '{if( $1 != "#" ){print $1+1 " 0 1"}}' \
+            ${dataFile}.out | tee ${dataFile}.in
 
         log "creating lock file ${lockFile}"
         touch ${lockFile}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/README b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/README
new file mode 100644
index 0000000000..5a81b9a570
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/README
@@ -0,0 +1,3 @@
+fvSolution is used for outer correctors specification.
+fvSchemes is only so that pre-processing activities can proceed
+
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
new file mode 100644
index 0000000000..f96df87b35
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -0,0 +1,173 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    U
+    {
+        internalField   uniform (0.001 0 0);
+
+        boundaryField
+        {
+            minX
+            {
+                type            fixedValue;
+                value           uniform (0.001 0 0);
+            }
+
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform (0 0 0);
+            }
+
+            ".*"
+            {
+                type            fixedValue;
+                value           uniform (0 0 0);
+            }
+        }
+    }
+
+    T
+    {
+        internalField   uniform 300;
+
+        boundaryField
+        {
+            minX
+            {
+                type            fixedValue;
+                value           uniform 300;
+            }
+
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform 300;
+            }
+
+            ".*"
+            {
+                type            zeroGradient;
+                value           uniform 300;
+            }
+
+            "bottomWater_to_.*"
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           fluidThermo;
+                kappaName       none;
+                value           uniform 300;
+            }
+        }
+    }
+
+    epsilon
+    {
+        internalField   uniform 0.01;
+
+        boundaryField
+        {
+            minX
+            {
+                type            fixedValue;
+                value           uniform 0.01;
+            }
+
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform 0.01;
+            }
+
+            ".*"
+            {
+                type            epsilonWallFunction;
+                value           uniform 0.01;
+            }
+        }
+    }
+
+    k
+    {
+        internalField   uniform 0.1;
+
+        boundaryField
+        {
+            minX
+            {
+                type            inletOutlet;
+                inletValue      uniform 0.1;
+            }
+
+            maxX
+            {
+                type            zeroGradient;
+                value           uniform 0.1;
+            }
+
+            ".*"
+            {
+                type            kqRWallFunction;
+                value           uniform 0.1;
+            }
+        }
+    }
+
+    p_rgh
+    {
+        internalField   uniform 0;
+
+        boundaryField
+        {
+            minX
+            {
+                type            zeroGradient;
+                value           uniform 0;
+            }
+
+            maxX
+            {
+                type            fixedValue;
+                value           uniform 0;
+            }
+
+            ".*"
+            {
+                type            fixedFluxPressure;
+                value           uniform 0;
+            }
+        }
+    }
+
+    p
+    {
+        internalField   uniform 0;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            calculated;
+                value           uniform 0;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/decomposeParDict
new file mode 100644
index 0000000000..1aaedd5a48
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSchemes
new file mode 100644
index 0000000000..969a28a36b
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSchemes
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+
+    div(phi,U)      Gauss upwind;
+    div(phi,K)      Gauss linear;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(R)          Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default        Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution
new file mode 100644
index 0000000000..1029cf6c33
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/fvSolution
@@ -0,0 +1,87 @@
+/*--------------------------------*- 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      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.01;
+
+        smoother         GaussSeidel;
+
+        cacheAgglomeration  true;
+        nCellsInCoarsestLevel 10;
+        agglomerator     faceAreaPair;
+        mergeLevels      1;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance        1e-7;
+        relTol           0;
+    }
+
+    "(U|h|k|epsilon|R)"
+    {
+        solver           PBiCG;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    "(U|h|k|epsilon|R)Final"
+    {
+        $U;
+        tolerance        1e-7;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   on;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict
new file mode 100644
index 0000000000..d89596f257
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/controlDict
@@ -0,0 +1,96 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Library defines new boundary conditions
+libs            ("libOpenFOAM.so" "libjobControl.so");
+
+application     chtMultiRegionFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  8;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+maxCo           0.6;
+
+// Maximum diffusion number
+maxDi           10.0;
+
+adjustTimeStep  yes;
+
+functions
+{
+    externalCoupled
+    {
+        // Where to load it from (if not already in solver)
+        functionObjectLibs ("libjobControl.so");
+
+        type            externalCoupled;
+
+        // Directory to use for communication
+        commsDir        "${FOAM_CASE}/comms";
+
+        // Does external process start first
+        initByExternal  true;
+
+        // Additional output
+        log             true;
+
+        regions
+        {
+            // Region name (wildcards allowed)
+            "(topAir|heater)"
+            {
+                // In topAir adjust the minX patch (fixedValue)
+
+                // Patch or patchGroup
+                coupleGroup
+                {
+                    // Fields to output in commsDir
+                    writeFields (T);
+                    // Fields to read from commsDir
+                    readFields  (T);
+                }
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/decomposeParDict
new file mode 100644
index 0000000000..d5cce80157
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/decomposeParDict
@@ -0,0 +1,60 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/fvSchemes
new file mode 100644
index 0000000000..74e2a13e89
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/fvSchemes
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+}
+
+gradSchemes
+{
+}
+
+divSchemes
+{
+}
+
+laplacianSchemes
+{
+}
+
+interpolationSchemes
+{
+}
+
+snGradSchemes
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/fvSolution
new file mode 100644
index 0000000000..8570cd3674
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/fvSolution
@@ -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      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+PIMPLE
+{
+    nOuterCorrectors 1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
new file mode 100644
index 0000000000..de2577c9dc
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
@@ -0,0 +1,77 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minY
+        {
+            type            patch;
+            inGroups        (coupleGroup);
+        }
+        minZ
+        {
+            type            patch;
+        }
+        maxZ
+        {
+            type            patch;
+        }
+    }
+
+
+    T
+    {
+        internalField   uniform 300;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            zeroGradient;
+                value           uniform 300;
+            }
+            "heater_to_.*"
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           solidThermo;
+                kappaName       none;
+                value           uniform 300;
+            }
+
+            heater_to_leftSolid
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           solidThermo;
+                kappaName       none;
+                thicknessLayers (1e-3);
+                kappaLayers     (5e-4);
+                value           uniform 300;
+            }
+
+            minY
+            {
+                type            fixedValue;
+                value           uniform 500;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/decomposeParDict
new file mode 100644
index 0000000000..5fb43412f8
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/decomposeParDict
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+method          scotch;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/fvSchemes
new file mode 100644
index 0000000000..6560e338b0
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/fvSchemes
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/fvSolution
new file mode 100644
index 0000000000..cb81d31859
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/fvSolution
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
new file mode 100644
index 0000000000..cee6d9bad5
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -0,0 +1,65 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minZ
+        {
+            type            patch;
+        }
+        maxZ
+        {
+            type            patch;
+        }
+    }
+
+    T
+    {
+        internalField   uniform 300;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            zeroGradient;
+                value           uniform 300;
+            }
+            "leftSolid_to_.*"
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           solidThermo;
+                kappaName       none;
+                value           uniform 300;
+            }
+
+            leftSolid_to_heater
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           solidThermo;
+                kappaName       none;
+                thicknessLayers (1e-3);
+                kappaLayers     (5e-4);
+                value           uniform 300;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/decomposeParDict
new file mode 100644
index 0000000000..5fb43412f8
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+method          scotch;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/fvSchemes
new file mode 120000
index 0000000000..63236f302c
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/fvSchemes
@@ -0,0 +1 @@
+../heater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/fvSolution
new file mode 120000
index 0000000000..0bde0fc62f
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/fvSolution
@@ -0,0 +1 @@
+../heater/fvSolution
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
new file mode 100644
index 0000000000..4ae37990d5
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minZ
+        {
+            type            patch;
+        }
+        maxZ
+        {
+            type            patch;
+        }
+    }
+
+    T
+    {
+        internalField   uniform 300;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            zeroGradient;
+                value           uniform 300;
+            }
+            "rightSolid_to_.*"
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           solidThermo;
+                kappaName       none;
+                value           uniform 300;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/decomposeParDict
new file mode 100644
index 0000000000..5fb43412f8
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+method          scotch;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/fvSchemes
new file mode 120000
index 0000000000..63236f302c
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/fvSchemes
@@ -0,0 +1 @@
+../heater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/fvSolution
new file mode 120000
index 0000000000..0bde0fc62f
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/fvSolution
@@ -0,0 +1 @@
+../heater/fvSolution
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
new file mode 100644
index 0000000000..6c03c92f25
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -0,0 +1,179 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minX
+        {
+            inGroups        (coupleGroup);
+        }
+    }
+
+    U
+    {
+        internalField   uniform (0.1 0 0);
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            fixedValue;
+                value           uniform (0 0 0);
+            }
+            minX
+            {
+                type            fixedValue;
+                value           uniform ( 0.1 0 0 );
+            }
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform ( 0 0 0 );
+                value           uniform ( 0.1 0 0 );
+            }
+        }
+    }
+
+    T
+    {
+        internalField   uniform 300;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            zeroGradient;
+            }
+
+            minX
+            {
+                type            fixedValue;
+                value           uniform 300;
+            }
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform 300;
+                value           uniform 300;
+            }
+
+            "topAir_to_.*"
+            {
+                type            compressible::turbulentTemperatureCoupledBaffleMixed;
+                Tnbr            T;
+                kappa           fluidThermo;
+                kappaName       none;
+                value           uniform 300;
+            }
+        }
+    }
+
+    epsilon
+    {
+        internalField   uniform 0.01;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            epsilonWallFunction;
+                value           uniform 0.01;
+            }
+
+            minX
+            {
+                type            fixedValue;
+                value           uniform 0.01;
+            }
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform 0.01;
+                value           uniform 0.01;
+            }
+        }
+    }
+
+    k
+    {
+        internalField   uniform 0.1;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            kqRWallFunction;
+                value           uniform 0.1;
+            }
+
+            minX
+            {
+                type            fixedValue;
+                value           uniform 0.1;
+            }
+            maxX
+            {
+                type            inletOutlet;
+                inletValue      uniform 0.1;
+                value           uniform 0.1;
+            }
+        }
+    }
+
+    p_rgh
+    {
+        internalField   uniform 1e5;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            fixedFluxPressure;
+                value           uniform 1e5;
+            }
+
+            maxX
+            {
+                type            fixedValue;
+                value           uniform 1e5;
+            }
+        }
+    }
+
+    p
+    {
+        internalField   uniform 1e5;
+
+        boundaryField
+        {
+            ".*"
+            {
+                type            calculated;
+                value           uniform 1e5;
+            }
+
+            maxX
+            {
+                type            calculated;
+                value           uniform 1e5;
+            }
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/decomposeParDict
new file mode 100644
index 0000000000..1aaedd5a48
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/fvSchemes
new file mode 120000
index 0000000000..323c0787e2
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/fvSchemes
@@ -0,0 +1 @@
+../bottomWater/fvSchemes
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/fvSolution
new file mode 120000
index 0000000000..90d9c92347
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/fvSolution
@@ -0,0 +1 @@
+../bottomWater/fvSolution
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topoSetDict
new file mode 100644
index 0000000000..badc605210
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topoSetDict
@@ -0,0 +1,178 @@
+/*--------------------------------*- 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      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    // Heater
+    {
+        name    heaterCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-0.01001    0 -100 )(0.01001 0.00999 100);
+        }
+    }
+    {
+        name    heaterCellSet;
+        type    cellSet;
+        action  add;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
+        }
+    }
+    {
+        name    heater;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set heaterCellSet;
+        }
+    }
+
+    // leftSolid
+    {
+        name    leftSolidCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-100 0 -100 )(-0.01001 0.00999 100);
+        }
+    }
+    {
+        name    leftSolid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set leftSolidCellSet;
+        }
+    }
+
+    // rightSolid
+    {
+        name    rightSolidCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (0.01001 0 -100 )(100 0.00999 100);
+        }
+    }
+    {
+        name    rightSolid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set rightSolidCellSet;
+        }
+    }
+
+    // topAir
+    {
+        name    topAirCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-100 0.00999 -100 )(100 100 100);
+        }
+    }
+    {
+        name    topAir;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set topAirCellSet;
+        }
+    }
+
+
+    // bottomWater is all the other cells
+    {
+        name    bottomWaterCellSet;
+        type    cellSet;
+        action  new;
+        source  cellToCell;
+        sourceInfo
+        {
+            set heaterCellSet;
+        }
+    }
+    {
+        name    bottomWaterCellSet;
+        type    cellSet;
+        action  add;
+        source  cellToCell;
+        sourceInfo
+        {
+            set leftSolidCellSet;
+        }
+    }
+    {
+        name    bottomWaterCellSet;
+        type    cellSet;
+        action  add;
+        source  cellToCell;
+        sourceInfo
+        {
+            set rightSolidCellSet;
+        }
+    }
+    {
+        name    bottomWaterCellSet;
+        type    cellSet;
+        action  add;
+        source  cellToCell;
+        sourceInfo
+        {
+            set topAirCellSet;
+        }
+    }
+    {
+        name    bottomWaterCellSet;
+        type    cellSet;
+        action  invert;
+    }
+    {
+        name    bottomWater;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set bottomWaterCellSet;
+        }
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
index a2e5fd849a..fe4d75bd0f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
index 5c6a42bb1d..ef547fb0d3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
index 95a8ab2419..3134b42f29 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
index 5b206de234..1ee582b6c3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/cellToRegion b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/cellToRegion
index 9b51c7b0f8..ac67372581 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/cellToRegion
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/cellToRegion
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
index d411f9233d..33c3dfeb2e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
index c5017c9401..a6d8268edb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
index a3a5ab7142..941907806c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
index 104dee8a6a..be0ec68c08 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon
index e20d661451..4df5689c01 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k
index 351dfc5606..51b012e11c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
index 3e97215963..958a40ff27 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p_rgh
index 8673f6e9bc..6baa60c260 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/g
index 6f32e33835..2a29484f31 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties
index 42defceaf4..13c1c495ce 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
index 828c78d208..cdc4d01490 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties
index e63bbc5081..e01c7d0bdb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
index 09c45f4749..9d5646d40e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index edb01db8b8..e8143c4f0f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
deleted file mode 100644
index a8feba3802..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    maxY
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       8300;
-    }
-    minX
-    {
-        type            patch;
-        nFaces          100;
-        startFace       8600;
-    }
-    maxX
-    {
-        type            patch;
-        nFaces          100;
-        startFace       8700;
-    }
-    minY
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       8800;
-    }
-    minZ
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       9100;
-    }
-    maxZ
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       9400;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
index 0666069c2c..d8ce83ab54 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index c293c032a3..67910214a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
index 2a69ccd09c..db35f72692 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
index 63a08c87a1..f96df87b35 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
index 8f2303576a..e477f47b83 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
index 102345b38d..1029cf6c33 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index 32b54e823d..ce09e481c1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
index 3eb54ba02f..d5cce80157 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
index a61bdb780e..74e2a13e89 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
index cde9e49189..8570cd3674 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index a95dd145d5..93a07e27c7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
index e405fc009e..5fb43412f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index 0f84921410..6560e338b0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
index ccb0d3183f..cb81d31859 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 1709662b51..cee6d9bad5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
index e405fc009e..5fb43412f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index ba99b13705..4ae37990d5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
index e405fc009e..5fb43412f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 2a68977f3d..ac4921d965 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
index feb3d898bc..badc605210 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
index a2e5fd849a..fe4d75bd0f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
index 5c6a42bb1d..ef547fb0d3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat
index e86a8ed674..fae2e1b802 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon
index e20d661451..4df5689c01 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k
index 351dfc5606..51b012e11c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
index 3e97215963..958a40ff27 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p_rgh
index 8673f6e9bc..6baa60c260 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
index 43c782881d..a5945f0eea 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g
index 6f32e33835..2a29484f31 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
index 42defceaf4..13c1c495ce 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index c293c032a3..67910214a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
index e63bbc5081..e01c7d0bdb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
index ee2e56a39e..9aaacf2f13 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index df146b74f3..f728c1d9a6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
index 1f1e965d52..32628145d5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
index 2a69ccd09c..db35f72692 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index b7bddf908d..b3cbbb6466 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 4e566a5ec1..8533edec48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
index ee88ddd676..d914d0ab34 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index 1a24823f4d..1a9011364f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
index e02c7b8af7..ed718393ce 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
index a61bdb780e..74e2a13e89 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
index cde9e49189..8570cd3674 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 3c883e6ee2..bff815e96b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index 2adcc274a3..acce3ad8d1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
index ccb0d3183f..cb81d31859 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 987aeb8b43..d7adf663bd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
index 4dfba773e3..4c6a178d86 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index ba99b13705..4ae37990d5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
index 53802769e3..e8781a69fa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index f33e016252..3acc876e66 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index 2a68977f3d..ac4921d965 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/H2O b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/H2O
new file mode 100644
index 0000000000..b6cd7dc285
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/H2O
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "0";
+    object      H2O;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.01;
+
+boundaryField
+{
+    ".*"
+    {
+        type            zeroGradient;
+        value           uniform 0.01;
+    }
+    cabin_to_windshield
+    {
+        type            fixedGradient;
+        gradient        uniform 0.0;
+    }
+    inlet
+    {
+        type            uniformFixedValue;
+        uniformValue           table
+        (
+            (0   0.01)
+            (60  0.01)
+            (61  0.00)
+            (100 0.00)
+        );
+    }
+    outlet
+    {
+        type            inletOutlet;
+        value           uniform 0.01;
+        inletValue      uniform 0.01;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/T
new file mode 100644
index 0000000000..d1f1d597c1
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/T
@@ -0,0 +1,76 @@
+/*--------------------------------*- 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      binary;
+    class       volScalarField;
+    location    "0/cabin";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    inlet
+    {
+        type            uniformFixedValue;
+        uniformValue           table
+        (
+            (0   273)
+            (60  273)
+            (61  308)
+            (100 308)
+        );
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    cabin_to_windshield
+    {
+        type            humidityTemperatureCoupledMixed;
+        kappa           fluidThermo;
+        kappaName       none;
+
+        // Mode of operation: inert, condensation, vaporization,
+        // condensationAndEvaporation
+        mode            condensationAndEvaporation;
+        specieName      H2O;
+        carrierMolWeight  28.9 ;//Air from thermophysicalProperties
+        L               0.1;
+        Tvap            273;    //Minimum temperature for evaporation
+
+        liquid
+        {
+            H2O
+            {
+                defaultCoeffs       yes;
+            }
+        }
+
+        value           $internalField;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/U b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/U
new file mode 100644
index 0000000000..44e948fadb
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/U
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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      binary;
+    class       volVectorField;
+    location    "0/cabin";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            uniformFixedValue;
+        uniformValue           table
+        (
+            (0   (0 0 0))
+            (60  (0 0 0))
+            (61  (-2 0 0))
+            (100 (-2 0 0))
+        );
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    cabin_to_windshield
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/alphat
similarity index 78%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/alphat
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/alphat
index 9e486ba215..034d1df310 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/alphat
@@ -2,15 +2,15 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       volScalarField;
-    location    "0";
+    location    "0/cabin";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,25 +21,27 @@ internalField   uniform 0;
 
 boundaryField
 {
-    frontAndBack
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    walls
     {
         type            compressible::alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
-    topAndBottom
-    {
-        type            compressible::alphatWallFunction;
-        Prt             0.85;
-        value           uniform 0;
-    }
-    hot
-    {
-        type            compressible::alphatWallFunction;
-        Prt             0.85;
-        value           uniform 0;
-    }
-    cold
+    cabin_to_windshield
     {
         type            compressible::alphatWallFunction;
         Prt             0.85;
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/k
similarity index 50%
rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/k
index 1e23642ed6..70acaf3add 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/k
@@ -2,57 +2,57 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "0/cabin";
+    object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-6
-(
-    front
-    {
-        type            wall;
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        nFaces          700;
-        startFace       64100;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        nFaces          1600;
-        startFace       66200;
-    }
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0.00015;
+
+boundaryField
+{
     inlet
     {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
+        type            uniformFixedValue;
+        uniformValue    table
+        (
+            (0   0.00015)
+            (60  0.00015)
+            (61  0.00015)
+            (100 0.00015)
+        );
     }
     outlet
     {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
+        type            inletOutlet;
+        inletValue      uniform 0.00015;
+        value           uniform 0.00015;
     }
-)
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    walls
+    {
+        type            kqRWallFunction;
+        value           uniform 0.00015;
+    }
+    cabin_to_windshield
+    {
+        type            kqRWallFunction;
+        value           uniform 0.00015;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/nut
similarity index 51%
rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/nut
index fd2bf46376..dd2ecb6fd1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/nut
@@ -2,53 +2,56 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    format      binary;
+    class       volScalarField;
+    location    "0/cabin";
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
-(
-    outlet
-    {
-        type            wall;
-        nFaces          25;
-        startFace       300;
-    }
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
     inlet
     {
-        type            wall;
-        nFaces          25;
-        startFace       325;
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
     }
     walls
     {
-        type            wall;
-        nFaces          50;
-        startFace       350;
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
     }
-    back
+    cabin_to_windshield
     {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          25;
-        startFace       400;
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
     }
-    front
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          25;
-        startFace       425;
-    }
-)
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/omega
similarity index 56%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/omega
index 481f4e64d7..a781e6c0f1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/omega
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/omega
@@ -2,44 +2,55 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       volScalarField;
-    location    "0";
+    location    "0/cabin";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 -1 0 0 0 0];
 
-internalField   uniform 0.12;
+internalField   uniform 0.2;
 
 boundaryField
 {
-    frontAndBack
+
+    inlet
     {
-        type            omegaWallFunction;
-        value           uniform 0.12;
+        type            uniformFixedValue;
+        uniformValue    table
+        (
+            (0   0.2)
+            (60  0.2)
+            (61  0.2)
+            (100 0.2)
+        );
     }
-    topAndBottom
+    outlet
     {
-        type            omegaWallFunction;
-        value           uniform 0.12;
+        type            inletOutlet;
+        inletValue      uniform 0.2;
+        value           uniform 0.2;
     }
-    hot
+    symmetry
     {
-        type            omegaWallFunction;
-        value           uniform 0.12;
+        type            symmetryPlane;
     }
-    cold
+    ".*"
     {
         type            omegaWallFunction;
-        value           uniform 0.12;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        beta1           0.075;
+        value           uniform 0.2;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p
new file mode 100644
index 0000000000..ba92440b8a
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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      binary;
+    class       volScalarField;
+    location    "0/cabin";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 100000;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 100000;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    walls
+    {
+        type            calculated;
+        value           uniform 100000;
+    }
+    cabin_to_windshield
+    {
+        type            calculated;
+        value           uniform 100000;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p_rgh
similarity index 63%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p_rgh
index 15979d020e..c9958322b8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/p_rgh
@@ -2,47 +2,51 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       volScalarField;
-    location    "0";
+    location    "0/cabin";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 1e5;
+internalField   uniform 100000;
 
 boundaryField
 {
-    frontAndBack
+    inlet
     {
         type            fixedFluxPressure;
-        value           uniform 1e5;
+        gradient        uniform 0;
+        value           uniform 100000;
     }
-
-    topAndBottom
+    outlet
     {
-        type            fixedFluxPressure;
-        value           uniform 1e5;
+        type            fixedValue;
+        value           uniform 100000;
     }
-
-    hot
+    symmetry
     {
-        type            fixedFluxPressure;
-        value           uniform 1e5;
+        type            symmetryPlane;
     }
-
-    cold
+    walls
     {
         type            fixedFluxPressure;
-        value           uniform 1e5;
+        gradient        uniform 0;
+        value           uniform 100000;
+    }
+    cabin_to_windshield
+    {
+        type            fixedFluxPressure;
+        gradient        uniform 0;
+        value           uniform 100000;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/T
new file mode 100644
index 0000000000..137877db1e
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/T
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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      binary;
+    class       volScalarField;
+    location    "0/windshield";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 260;
+
+boundaryField
+{
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    windshield_to_cabin
+    {
+        type            humidityTemperatureCoupledMixed;
+        kappa           solidThermo;
+        kappaName       none;
+        value           uniform 260;
+    }
+    exterior
+    {
+        type            externalWallHeatFluxTemperature;
+        kappa           solidThermo;
+        kappaName       none;
+        h               uniform 10;
+        Ta              uniform 260;
+        value           uniform 260;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/p
similarity index 65%
rename from tutorials/lagrangian/sprayFoam/aachenBomb/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/p
index 5e28555623..d5191bcff4 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/windshield/p
@@ -2,27 +2,35 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "0/windshield";
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    walls
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    symmetry
     {
-        type            wall;
-        nFaces          19762;
-        startFace       494419;
+        type            symmetryPlane;
     }
-)
+    ".*"
+    {
+        type            calculated;
+        value           uniform 100000;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
new file mode 100755
index 0000000000..734eec89e4
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+rm -rf 0
+rm -rf constant/windshield/polyMesh
+rm -rf constant/cabin/polyMesh
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
new file mode 100755
index 0000000000..0330f6a530
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun
@@ -0,0 +1,27 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# create the underlying block mesh
+runApplication blockMesh
+
+# create the set for the obstacles
+runApplication topoSet
+
+# mesh processing to generate the inlet duct
+runApplication subsetMesh c0 -patch walls -overwrite
+
+# split into the cabin, ice and exterior regions
+runApplication splitMeshRegions -cellZones -overwrite
+
+# create register face and cell zones
+rm log.topoSet
+runApplication topoSet -region cabin -dict system/topoSetDictRegister
+
+# set the initial fields
+rm -rf 0
+cp -rf 0.org 0
+
+runApplication $(getApplication)
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/g b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/g
similarity index 89%
rename from tutorials/combustion/engineFoam/kivaTest/constant/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/g
index 508d658494..4fea433a00 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 0);
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties
new file mode 100644
index 0000000000..9aaacf2f13
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/radiationProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  none;
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties
new file mode 100644
index 0000000000..bae7fe977a
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/thermophysicalProperties
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState incompressiblePerfectGas;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+dpdt    no;
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    equationOfState
+    {
+        pRef        1e5;
+    }
+    transport
+    {
+        mu          1.84e-05;
+        Pr          0.7;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties
new file mode 100644
index 0000000000..8026ec2217
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/cabin/turbulenceProperties
@@ -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;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RAS;
+
+RAS
+{
+    RASModel            kOmegaSST;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties
new file mode 100644
index 0000000000..61107c3c01
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/regionProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      regionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+regions
+(
+    fluid       (cabin)
+    solid       (windshield)
+);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties
new file mode 100644
index 0000000000..9aaacf2f13
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/radiationProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  none;
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties
new file mode 100644
index 0000000000..d21ef249dc
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/constant/windshield/thermophysicalProperties
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   12;
+    }
+
+    transport
+    {
+        kappa   0.9;
+    }
+
+    thermodynamics
+    {
+        Hf      0;
+        Cp      500;
+    }
+
+    equationOfState
+    {
+        rho     2400;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict
new file mode 100644
index 0000000000..aa2e0a6b86
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/blockMeshDict
@@ -0,0 +1,154 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( -0.10      0    0)  // 0 // cabin interior
+    ( -0.05      0    0)  // 1
+    (  0.20      0    0)  // 2
+    (  0.20   0.05    0)  // 3
+    ( -0.05   0.05    0)  // 4
+    ( -0.05   0.10    0)  // 5
+    (  1.00   0.10    0)  // 6
+    (  1.00   0.50    0)  // 7
+    (  0.35   0.50    0)  // 8
+    (  0.30   0.50    0)  // 9
+    ( -0.10   0.10    0)  // 10
+    ( -0.10   0.05    0)  // 11
+
+    ( -0.1005  0.10    0)  // 12   // windshield (doubled vertices with 10, 9)
+    (  0.2995  0.50    0)  // 13
+
+    ( -0.50   0.50    0)  // 14   // cabin exterior
+    ( -0.50   0.10    0)  // 15
+
+
+    (     0      0    0.70)  // 16   // cabin interior
+    (  0.05      0    0.70)  // 17
+    (  0.20      0    0.70)  // 18
+    (  0.20   0.05    0.70)  // 19
+    (  0.05   0.05    0.70)  // 20
+    (  0.05   0.10    0.70)  // 21
+    (  1.00   0.10    0.70)  // 22
+    (  1.00   0.50    0.70)  // 23
+    (  0.45   0.50    0.70)  // 24
+    (  0.40   0.50    0.70)  // 25
+    (     0   0.10    0.70)  // 26
+    (     0   0.05    0.70)  // 27
+
+    (  -0.0005 0.10    0.70)  // 28   // windshield (doubled vertices with 26,25)
+    (  0.3995  0.50    0.70)  // 29
+
+    ( -0.50   0.50    0.70)  // 30  // cabin exterior
+    ( -0.50   0.10    0.70)  // 31
+);
+
+
+blocks
+(
+    hex ( 1 2 3  4 17 18 19 20) cabin (15  5 50) simpleGrading (1 1 1)
+    hex ( 0 1 4 11 16 17 20 27) cabin ( 7  5 50) simpleGrading (1 1 1)
+    hex (11 4 5 10 27 20 21 26) cabin ( 7  5 50) simpleGrading (1 1 1)
+    hex (10 5 8  9 26 21 24 25) cabin ( 7 45 50) simpleGrading (1 1 1)
+    hex ( 5 6 7  8 21 22 23 24) cabin (45 45 50) simpleGrading (3 1 1)
+
+    hex ( 12 10 9 13 28 26 25 29) windshield (45 45 50) simpleGrading (1 1 1)
+
+);
+
+
+edges
+(
+    arc 9 10 (0.07 0.3 0)
+    arc 12 13 (0.0695 0.3 0)
+
+    arc 25 26 (0.17 0.3 0.70)
+    arc 28 29 (0.1695 0.3 0.70)
+
+    arc 9 25 (0.33 0.5 0.35)
+    arc 13 29 (0.3295 0.5 0.35)
+
+    arc 10 26 (-0.07 0.1 0.35)
+    arc 12 28 (-0.0705 0.1 0.35)
+
+    arc 5 8 (0.13 0.3 0)
+    arc 21 24 (0.23 0.3 0.70)
+
+    arc 8 24 (0.38 0.5 0.35)
+    arc 5 21 (-0.02 0.1 0.35)
+
+    arc 11 27 (-0.07 0.05 0.35)
+    arc 0 16 (-0.07 0 0.35)
+
+    arc 4 20 (-0.02 0.05 0.35)
+    arc 1 17 (-0.02 0 0.35)
+);
+
+
+defaultPatch
+{
+    name    walls;
+    type    wall;
+}
+
+
+boundary
+(
+    inlet
+    {
+        type    patch;
+        faces
+        (
+            (2 18 19 3)
+        );
+    }
+    outlet
+    {
+        type    patch;
+        faces
+        (
+            (6 22 23 7)
+        );
+    }
+    exterior
+    {
+        type    patch;
+        faces
+        (
+            (12 13 29 28)
+        );
+    }
+    symmetry
+    {
+        type    symmetryPlane;
+        faces
+        (
+            (5 6 7 8)
+            (10 5 8 9)
+            (12 10 9 13)
+        );
+    }
+);
+
+
+mergePatchPairs
+(
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions
new file mode 100644
index 0000000000..0c50cbd4ee
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvOptions
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+airDeflection
+{
+    type            directionalPressureGradientExplicitSource;
+    active          true;
+
+    directionalPressureGradientExplicitSourceCoeffs
+    {
+        selectionMode   cellZone;
+        cellZone        c1Zone;
+
+        fieldNames  (U);
+        flowDir     (1 2 0);        // flow direction
+        relaxationFactor    0.3;
+
+        faceZone     f1Zone;
+
+        //Pressure drop model [Pa]
+        model       DarcyForchheimer;//volumetricFlowRateTable/constant
+
+        //DarcyForchheimer
+        D           5e7;
+        I           0;
+        length      0.01;
+
+        //constant
+        pressureDrop    8;
+
+        //volumetricFlowRateTable
+        outOfBounds     clamp;
+        fileName        "volFlowRateTable";
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
new file mode 100644
index 0000000000..728f82048e
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
@@ -0,0 +1,69 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p_rgh)     Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss linearUpwind grad(U);
+    div(phi,H2O)    Gauss upwind;
+    div(phi,K)      Gauss linear;
+    div(phi,h)      Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,omega)  Gauss limitedLinear 1;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian((rho*nuEff),U) Gauss linear corrected;
+    laplacian((rho*DkEff),k) Gauss linear corrected;
+    laplacian((rho*DomegaEff),omega) Gauss linear corrected;
+    laplacian(rhorAUf,p_rgh) Gauss linear corrected;
+    laplacian(alphaEff,h) Gauss linear corrected;
+    laplacian(((rho*nut)+thermo:mu),H2O) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+    directionalPressureGradient::Uf     upwind  phi;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+wallDist
+{
+    method meshWave;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution
new file mode 100644
index 0000000000..933e02965c
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSolution
@@ -0,0 +1,94 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p_rgh
+    {
+        solver          GAMG;
+        tolerance       1e-06;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        smoother        GaussSeidel;
+        relTol          0;
+    }
+
+    "rho.*"
+    {
+        $p_rgh;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+
+    "(U|h|R|k|epsilon|omega)"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-05;
+        relTol          0.01;
+    }
+
+    "(U|h|R|k|epsilon|omega)Final"
+    {
+        $U;
+        relTol          0;
+    }
+
+    H2O
+    {
+        $U;
+    }
+
+    H2OFinal
+    {
+        $U;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+        ".*"        1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
new file mode 100644
index 0000000000..e7384de853
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    // make the mesh a little more interesting...
+    {
+        name    c0;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box     (-100 -100 -100) (100 0.1 0.25);
+        }
+    }
+    {
+        name    c0;
+        type    cellSet;
+        action  add;
+        source  boxToCell;
+        sourceInfo
+        {
+            box     (-100 -100 0.45) (100 0.1 100);
+        }
+    }
+    {
+        name    c0;
+        type    cellSet;
+        action  add;
+        source  boxToCell;
+        sourceInfo
+        {
+            box     (-100 0.05 0.33) (100 0.1 0.38);
+        }
+    }
+    {
+        name    c0;
+        type    cellSet;
+        action  invert;
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
new file mode 100644
index 0000000000..0192d3259f
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister
@@ -0,0 +1,68 @@
+/*--------------------------------*- 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      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    f1;
+        type    faceSet;
+        action  new;
+        source  boxToFace;
+        sourceInfo
+        {
+            box     (-0.126 0.08665  0.2565) (0.02 0.090665 0.446);
+        }
+    }
+
+     {
+        name    f1Zone;
+        type    faceZoneSet;
+        action  new;
+        source  setAndNormalToFaceZone;
+        sourceInfo
+        {
+            faceSet     f1;
+            normal  (0 1 0);
+        }
+    }
+
+    {
+        name    c1;
+        type    cellZoneSet;
+        action  new;
+        source  faceToCell;
+        sourceInfo
+        {
+            set     f1Zone;
+            option  neighbour;
+        }
+    }
+
+    {
+        name    c1Zone;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set c1;
+        }
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
new file mode 100644
index 0000000000..5daf39f542
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
@@ -0,0 +1,101 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs            ("libliquidPropertiesFvPatchFields.so");
+
+application     chtMultiRegionFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         90;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   2.5;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  10;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           12;
+
+maxDi           10;
+
+maxDeltaT       1;
+
+functions
+{
+    H2O
+    {
+        type            scalarTransport;
+
+        functionObjectLibs ("libutilityFunctionObjects.so");
+
+        resetOnStartUp  no;
+
+        region cabin;
+
+
+        // employ schemes used by U to the scalar transport equation
+        // note: field name is given by the name of the function, in this case
+        // 'scalar1'
+        autoSchemes     no;
+
+        fvOptions
+        {
+        }
+    }
+
+    fileUpdate
+    {
+        type                timeActivatedFileUpdate;
+        functionObjectLibs  ("libutilityFunctionObjects.so");
+        outputControl       timeStep;
+        outputInterval      1;
+        region              cabin;
+        fileToUpdate        "$FOAM_CASE/system/controlDict";
+
+        timeVsFile
+        (
+            ( 1     "$FOAM_CASE/system/controlDict.0" )
+            ( 5     "$FOAM_CASE/system/controlDict.5")
+            ( 20    "$FOAM_CASE/system/controlDict.20")
+            ( 60    "$FOAM_CASE/system/controlDict.60")
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.0 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.0
new file mode 100644
index 0000000000..c7dfcdd805
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.0
@@ -0,0 +1,101 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs            ("libliquidPropertiesFvPatchFields.so");
+
+application     chtMultiRegionFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         90;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   10;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  10;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           2.5;
+
+maxDi           10;
+
+maxDeltaT       0.3;
+
+functions
+{
+    H2O
+    {
+        type            scalarTransport;
+
+        functionObjectLibs ("libutilityFunctionObjects.so");
+
+        resetOnStartUp  no;
+
+        region cabin;
+
+
+        // employ schemes used by U to the scalar transport equation
+        // note: field name is given by the name of the function, in this case
+        // 'scalar1'
+        autoSchemes     no;
+
+        fvOptions
+        {
+        }
+    }
+
+    fileUpdate
+    {
+        type                timeActivatedFileUpdate;
+        functionObjectLibs  ("libutilityFunctionObjects.so");
+        outputControl       timeStep;
+        outputInterval      1;
+        region              cabin;
+        fileToUpdate        "$FOAM_CASE/system/controlDict";
+
+        timeVsFile
+        (
+            ( 1     "$FOAM_CASE/system/controlDict.0" )
+            ( 5     "$FOAM_CASE/system/controlDict.5")
+            ( 20    "$FOAM_CASE/system/controlDict.20")
+            ( 60    "$FOAM_CASE/system/controlDict.60")
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.20 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.20
new file mode 100644
index 0000000000..4afa114290
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.20
@@ -0,0 +1,101 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs            ("libliquidPropertiesFvPatchFields.so");
+
+application     chtMultiRegionFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         90;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   10;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  10;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           8;
+
+maxDi           10;
+
+maxDeltaT       1;
+
+functions
+{
+    H2O
+    {
+        type            scalarTransport;
+
+        functionObjectLibs ("libutilityFunctionObjects.so");
+
+        resetOnStartUp  no;
+
+        region cabin;
+
+
+        // employ schemes used by U to the scalar transport equation
+        // note: field name is given by the name of the function, in this case
+        // 'scalar1'
+        autoSchemes     no;
+
+        fvOptions
+        {
+        }
+    }
+
+    fileUpdate
+    {
+        type                timeActivatedFileUpdate;
+        functionObjectLibs  ("libutilityFunctionObjects.so");
+        outputControl       timeStep;
+        outputInterval      1;
+        region              cabin;
+        fileToUpdate        "$FOAM_CASE/system/controlDict";
+
+        timeVsFile
+        (
+            ( 1     "$FOAM_CASE/system/controlDict.0" )
+            ( 5     "$FOAM_CASE/system/controlDict.5")
+            ( 20    "$FOAM_CASE/system/controlDict.20")
+            ( 60    "$FOAM_CASE/system/controlDict.60")
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.5 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.5
new file mode 100644
index 0000000000..f115cb3217
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.5
@@ -0,0 +1,101 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs            ("libliquidPropertiesFvPatchFields.so");
+
+application     chtMultiRegionFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         90;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   10;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  10;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           5;
+
+maxDi           10;
+
+maxDeltaT       1;
+
+functions
+{
+    H2O
+    {
+        type            scalarTransport;
+
+        functionObjectLibs ("libutilityFunctionObjects.so");
+
+        resetOnStartUp  no;
+
+        region cabin;
+
+
+        // employ schemes used by U to the scalar transport equation
+        // note: field name is given by the name of the function, in this case
+        // 'scalar1'
+        autoSchemes     no;
+
+        fvOptions
+        {
+        }
+    }
+
+    fileUpdate
+    {
+        type                timeActivatedFileUpdate;
+        functionObjectLibs  ("libutilityFunctionObjects.so");
+        outputControl       timeStep;
+        outputInterval      1;
+        region              cabin;
+        fileToUpdate        "$FOAM_CASE/system/controlDict";
+
+        timeVsFile
+        (
+            ( 1     "$FOAM_CASE/system/controlDict.0" )
+            ( 5     "$FOAM_CASE/system/controlDict.5")
+            ( 20    "$FOAM_CASE/system/controlDict.20")
+            ( 60    "$FOAM_CASE/system/controlDict.60")
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.60 b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.60
new file mode 100644
index 0000000000..5daf39f542
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict.60
@@ -0,0 +1,101 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs            ("libliquidPropertiesFvPatchFields.so");
+
+application     chtMultiRegionFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         90;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   2.5;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  10;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           12;
+
+maxDi           10;
+
+maxDeltaT       1;
+
+functions
+{
+    H2O
+    {
+        type            scalarTransport;
+
+        functionObjectLibs ("libutilityFunctionObjects.so");
+
+        resetOnStartUp  no;
+
+        region cabin;
+
+
+        // employ schemes used by U to the scalar transport equation
+        // note: field name is given by the name of the function, in this case
+        // 'scalar1'
+        autoSchemes     no;
+
+        fvOptions
+        {
+        }
+    }
+
+    fileUpdate
+    {
+        type                timeActivatedFileUpdate;
+        functionObjectLibs  ("libutilityFunctionObjects.so");
+        outputControl       timeStep;
+        outputInterval      1;
+        region              cabin;
+        fileToUpdate        "$FOAM_CASE/system/controlDict";
+
+        timeVsFile
+        (
+            ( 1     "$FOAM_CASE/system/controlDict.0" )
+            ( 5     "$FOAM_CASE/system/controlDict.5")
+            ( 20    "$FOAM_CASE/system/controlDict.20")
+            ( 60    "$FOAM_CASE/system/controlDict.60")
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes
similarity index 78%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes
index 70c6c85c26..47fd09b0fd 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -11,18 +11,32 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "system";
-    object      decomposeParDict;
+    object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 4;
-
-method          simple;
-
-simpleCoeffs
+ddtSchemes
+{
+}
+
+gradSchemes
+{
+}
+
+divSchemes
+{
+}
+
+laplacianSchemes
+{
+}
+
+interpolationSchemes
+{
+}
+
+snGradSchemes
 {
-    n               (2 2 1);
-    delta           0.001;
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution
new file mode 100644
index 0000000000..8215b2492e
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/fvSolution
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+PIMPLE
+{
+    nOuterCorrectors 1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
new file mode 100644
index 0000000000..e7384de853
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    // make the mesh a little more interesting...
+    {
+        name    c0;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box     (-100 -100 -100) (100 0.1 0.25);
+        }
+    }
+    {
+        name    c0;
+        type    cellSet;
+        action  add;
+        source  boxToCell;
+        sourceInfo
+        {
+            box     (-100 -100 0.45) (100 0.1 100);
+        }
+    }
+    {
+        name    c0;
+        type    cellSet;
+        action  add;
+        source  boxToCell;
+        sourceInfo
+        {
+            box     (-100 0.05 0.33) (100 0.1 0.38);
+        }
+    }
+    {
+        name    c0;
+        type    cellSet;
+        action  invert;
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes
new file mode 100644
index 0000000000..acce3ad8d1
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSchemes
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution
new file mode 100644
index 0000000000..d26e8f858a
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/windshield/fvSolution
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.01;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+        ".*"        1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/T
index fcb0067f35..fa56fd7bbd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U
index a5466e3636..4755dd2340 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat
index 40eeda22be..1119f6aeb5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/alphat
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.x                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon
index 49dcfaa45a..842137fc14 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k
index 3f0421bdf8..5f163be151 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut
index 63b9c797a6..3491ea7ee1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/nut
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.x                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p
index f20dd774ef..8284dc423f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p_rgh
index 04dc57929b..8d713a59af 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/air/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/AoV b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/AoV
index 0791bb96be..6184eaa0ca 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/AoV
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/AoV
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/T
index bd86a29732..a61fd502ff 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U
index 23454ad6de..5bd87f2d22 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/htcConst b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/htcConst
index 4f3040e85a..fa5f334251 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/htcConst
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/htcConst
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p
index db0ae810f9..54ce74a0f8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p_rgh
index 955b6b4408..d6ce190f5d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.org/porous/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
index e1733d54b9..dba373044b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index 9ed7edb422..a3ef666839 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -46,8 +46,8 @@ porosityBlockage
 
         DarcyForchheimerCoeffs
         {
-            d   d [0 -2 0 0 0] (-1000 -1000 1e4);
-            f   f [0 -1 0 0 0] (0 0 0);
+            d   (-1000 -1000 1e4);
+            f   (0 0 0);
 
             coordinateSystem
             {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/g
index 6343b983a8..d8c51800b8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
index aa0a16678f..25a36e70c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
index b3c0a58998..5c63ed0776 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 2938940b28..e5ff138ae6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/g
index 6343b983a8..d8c51800b8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
index 41e355a66b..0c01af6cc0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
index e63bbc5081..e01c7d0bdb 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
index 749edd93d5..d6a9382616 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
index d0439108c7..5af03aa56e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
index 818b3b2320..831cf159a8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
index a83c3fa159..be63e303f0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
index cd9de1b917..5d63eb5011 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
index 622f5fe32f..b393a73e5d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
index ec3896ad12..980ba70498 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
index f9f33b1095..545cf7b069 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
index 0a4ea76bcd..6404f133f4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
index a83c3fa159..be63e303f0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
index a61bdb780e..74e2a13e89 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
index cde9e49189..8570cd3674 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
index f32b1c7621..74bae01e14 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
index e20a0291b4..53c6a418db 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
index 9ba18c7a37..a629a46a1c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
index 4b106f6ea9..63d9bdfee7 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
index 95bef67fc7..c2261b23d5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr
index b4f1299fde..bad8846dd2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/Qr
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
index 65d05cfc73..b1ac0594de 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
index ee97b3a9fd..8e47fbcddf 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
index d2a81a89e2..f4e27ad95f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
index ad5c96dfee..b2509f9670 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
index aaf33c77d4..66e0be0a83 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
index 0bcd7b7190..638c8c7d7c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/g
index 6f32e33835..2a29484f31 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/g
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
index 79034a694b..956cb65e42 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
index c293c032a3..67910214a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
index e63bbc5081..e01c7d0bdb 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
index 380dcfbeaa..b22aeab889 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
index 90c8ed5828..e75b019da5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 894a9f39be..a870b72f00 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/boundary
deleted file mode 100644
index a8feba3802..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    maxY
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       8300;
-    }
-    minX
-    {
-        type            patch;
-        nFaces          100;
-        startFace       8600;
-    }
-    maxX
-    {
-        type            patch;
-        nFaces          100;
-        startFace       8700;
-    }
-    minY
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       8800;
-    }
-    minZ
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       9100;
-    }
-    maxZ
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          300;
-        startFace       9400;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
index 8e1fe39d2c..c0fac6efef 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
index 79882275de..afb506e8f0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
index 2a69ccd09c..db35f72692 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index c583021fa3..e4f22ae77e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict
index f051e7b79a..e70c10e65a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
index 7629bb9034..44900daae1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
index debdfcc0bb..9396f2e457 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
index 8cffdb8ad2..714cde1a02 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
index 9bdbb31cd2..1aaedd5a48 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
index a61bdb780e..74e2a13e89 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
index 007d20b6c3..ae9961643e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index b9adae7e6f..6d4a0d89b3 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict
index fd8f4413c3..3967523116 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
index 7cdc6a2121..b02fd41b55 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
index b743687b83..852536f64a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index cf0d33b686..2fdbeba5da 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict
index fd8f4413c3..3967523116 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index 746ee5a881..8a4c23974a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict
index fd8f4413c3..3967523116 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index f5edd119d9..a6f2b78a18 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict
index f051e7b79a..e70c10e65a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
index dc7c09c0a4..f18946a888 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel
index f9e9e7cf5d..a3a03bb56a 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/Urel
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon
index 0c718a4974..f22f5133f5 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k
index 4136dc3807..d20fdae863 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut
index 3db0d49a1a..157ebabee8 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/p b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/p
index c526474155..1fb2e924bd 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/p
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties
index b79bfdaaa1..157a6dbe6a 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/SRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary
deleted file mode 100644
index 921d19779b..0000000000
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          144;
-        startFace       5640;
-    }
-    freestream
-    {
-        type            patch;
-        nFaces          96;
-        startFace       5784;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          2880;
-        startFace       5880;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          2880;
-        startFace       8760;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4 b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
index cc97d9e819..a650675100 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict
index 2cb02b7c5c..5a07f3a3e9 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
index 028cb552d4..3b2e9b1e0a 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
index 089ea62af0..a7fa4d2531 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
index c5a14c7e8c..91cde21fff 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
index 79bb0f4ba8..97d3e9d9d6 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/k b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
index 550261b194..aab1980d8d 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
index 07b4439977..cac22a23cf 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
index 323e4ed2d3..4f9fd90c8b 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/p b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
index 32fe7135fd..a6e6c9260e 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties
index 8cd31e33c8..dc0f31a248 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/SRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
index ee68cad641..bc49def7df 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
index 4406361c66..890f36eea4 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict b/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
index b5813557ed..813d818d43 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict b/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict
index 20b4d58679..2baa2e29bc 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
index 69e1612784..572ee0897f 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
index 5a22e0e39c..0bd56cb698 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
index b333f4acc2..a7da95034a 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
index e25eb90eee..b97a5a9575 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/Ua
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon
index ab06b7b912..106cb5c140 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k
index 7de1adf4b5..02e185a3d5 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut
index 7e5dd36574..c69d99d117 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
index 819d2fcaff..3a1f5aa98e 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/0/pa
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
index f2c42dfc29..db59998270 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
index 0e75a7462f..436724ff01 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
index 9ac6b42a1a..0652e3557c 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
index 04847ab844..9abb2c59a3 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
index 064d11bf5c..bf46c0c94f 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
index 893d2bcbb2..58c6abdaa4 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
index 11e676bc08..ab1a00bc63 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
index 4579dd76ff..759e0bc6ab 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
index 5048e273ad..c5123d1176 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nut b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nut
index fab3233dd7..33c4b77ec5 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
index b5b39c1297..83c2d1a048 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
index 456ff86925..68464e6b5b 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/blockMeshDict
index 57f405b47d..62035176f0 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
index e2e924484b..50fc85cb25 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
index 0fd54ce506..83a5154617 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
index 0d68b37e51..fb0b2c8e5e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
index d4791411aa..74df26d0b7 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
index e03063b0fe..6c142a6ee2 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
index 5bac915cad..24fbae8de0 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
index 7068537e93..2561ede86a 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
index 357138e284..d6c51034ce 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
index 72455ddff4..8bf2005006 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/blockMeshDict
index 913a9e8a12..418507c5ac 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
index 9e3db9cfaa..fcf0fe251d 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
index a90d7abcb8..c9dbdf2a0f 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
index 5e723c4d5a..fc49ee964e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
index 8044da3873..a1812c6dd4 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
index 316b143c19..da1605054e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
index 55761ee96d..a914e67859 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
index 7068537e93..2561ede86a 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
index 348b9ed37d..53054ded65 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
index 21c2ddb4e8..5431a4432d 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
index 762b0ac7ee..e0c1198a91 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
index b540b6d446..2b146c1cda 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
index 9b3fd54ef6..a479d6dda3 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
index a9a119b1fb..29bdd3042d 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/blockMeshDict
index 913a9e8a12..418507c5ac 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/blockMeshDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
index 72f13f8e5a..e39c1506af 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
index 36dca60f67..8a9f5b504f 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
index da77d8e642..98f5258784 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/0/U
index 711702f987..64c0bdf47c 100644
--- a/tutorials/incompressible/icoFoam/cavity/0/U
+++ b/tutorials/incompressible/icoFoam/cavity/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/0/p b/tutorials/incompressible/icoFoam/cavity/0/p
index 3e00d9eb31..e71be28d23 100644
--- a/tutorials/incompressible/icoFoam/cavity/0/p
+++ b/tutorials/incompressible/icoFoam/cavity/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
index 91dd751024..2ea2fe8ef8 100644
--- a/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/system/blockMeshDict
index 165a600c7b..2e5f98c1a5 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict
index d2fa09cc52..8644d48460 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
index 025dfc0818..defd28a4f4 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/system/fvSolution
index f9e556f155..40f946159b 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavityClipped/0/U
index a6397f5f68..0aac31286d 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/0/U
+++ b/tutorials/incompressible/icoFoam/cavityClipped/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/0/p b/tutorials/incompressible/icoFoam/cavityClipped/0/p
index b5027f3b96..11ed8322be 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/0/p
+++ b/tutorials/incompressible/icoFoam/cavityClipped/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
index 91dd751024..2ea2fe8ef8 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict
index 45d10b78b9..b3ef525fcd 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
index 157e5c00e8..c69a6650b2 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
index 212c7bd2ac..dac011b745 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
index f9e556f155..40f946159b 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
index eb1030bac1..9d368f7efe 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavityGrade/0/U
index b0731001e7..90704b691b 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/0/U
+++ b/tutorials/incompressible/icoFoam/cavityGrade/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/0/p b/tutorials/incompressible/icoFoam/cavityGrade/0/p
index b7568dc0fa..934b2a288b 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/0/p
+++ b/tutorials/incompressible/icoFoam/cavityGrade/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
index 91dd751024..2ea2fe8ef8 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict b/tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict
index 6784a7547a..61d65858ff 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
index a2a7bc2e74..0769326412 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
index 72d70d2c25..38acdb51a4 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
index f9e556f155..40f946159b 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
index 3268609ce9..a9c7d7a917 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/0/U b/tutorials/incompressible/icoFoam/elbow/0/U
index 737cbb41c2..37434f2da2 100644
--- a/tutorials/incompressible/icoFoam/elbow/0/U
+++ b/tutorials/incompressible/icoFoam/elbow/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/0/p b/tutorials/incompressible/icoFoam/elbow/0/p
index ff4958d993..b17aeb6631 100644
--- a/tutorials/incompressible/icoFoam/elbow/0/p
+++ b/tutorials/incompressible/icoFoam/elbow/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/Allclean b/tutorials/incompressible/icoFoam/elbow/Allclean
index b44622ae69..e44a03c204 100755
--- a/tutorials/incompressible/icoFoam/elbow/Allclean
+++ b/tutorials/incompressible/icoFoam/elbow/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -f constant/polyMesh/boundary
+rm -f constant/polyMesh/boundary > /dev/null 2>&1
 rm -rf fluentInterface
 cleanCase
 
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
deleted file mode 100644
index b1349beb72..0000000000
--- a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
+++ /dev/null
@@ -1,67 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(    wall-4
-    {
-        type            wall;
-        physicalType    wall;
-        startFace       1300;
-        nFaces          100;
-    }
-
-    velocity-inlet-5
-    {
-        type            patch;
-        physicalType    inlet;
-        startFace       1400;
-        nFaces          8;
-    }
-
-    velocity-inlet-6
-    {
-        type            patch;
-        physicalType    inlet;
-        startFace       1408;
-        nFaces          4;
-    }
-
-    pressure-outlet-7
-    {
-        type            patch;
-        physicalType    outlet;
-        startFace       1412;
-        nFaces          8;
-    }
-
-    wall-8
-    {
-        type            wall;
-        physicalType    wall;
-        startFace       1420;
-        nFaces          34;
-    }
-
-    frontAndBackPlanes
-    {
-        type            empty;
-        physicalType    empty;
-        startFace       1454;
-        nFaces          1836;
-    }
-
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
index 91dd751024..2ea2fe8ef8 100644
--- a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict
index d177f3bee0..2fa4900be7 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/controlDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict b/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
index 56e694db05..ddca769851 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSchemes b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
index edea98c32a..603c06fc76 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSolution b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
index 009414f72c..d444d743db 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
index fe19c84035..078095e40c 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
index 2e74f403e1..d15b44b3fa 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
index c1222a182c..5ee57ab89a 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
index fd5ccd9ac9..34f284efef 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
index ed94ae0d67..2f99ea1e66 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
index ca9faeb190..f4ed3c889b 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
index 0d3d3d41f3..bde6130bae 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U
index 1904f895ce..210a9401b2 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
index 20f7d6d669..72a69e2007 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k
index 1414ac9208..532a447eea 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut
index cfb43ebe07..ebc4b3f196 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/p b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/p
index db4b0f6a54..85cc523f2b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
index 6536aa4658..d7fd66ff0f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties
index f572eff811..19aa96c9ae 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
index 61596b70af..3d41cd392b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict
index 2fe07eeb4f..9f8c70d2b4 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/decomposeParDict
index 8e9095ea0e..b59552df8d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
index 35cf907ec2..80a7a68ed4 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution
index af2204ee45..6597b77f31 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/topoSetDict b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/topoSetDict
index de7ca6af92..5b10489a73 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
index 2e86739791..629e8bce8a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
index 8fcdd39fb4..63ac7e1a44 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
index 74570f1b72..0d57e181d7 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict
index 95000b1405..8ec7acaa1c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict
index af8f8bfda3..73b7815e77 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
index 9b931e305a..998c1db700 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
index 29b42ee983..c17ff218b5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
index cec8c92cef..8fabba70f5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index 3f4c1cb3ca..ca90e2e20b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U
index 72f38fd6dd..3b34ecab3b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/epsilon b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/epsilon
index 36447c1079..a918fcc8c4 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/k b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/k
index 286cdf4e26..3c2e6a2688 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut
index 55d04b4210..d2ed90c9da 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/p b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/p
index 6a9c955b27..cc6cfcf67c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/dynamicMeshDict
index ae204c40bc..21ec6c819a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties
index 96b2b749ad..61fed2bf82 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict
index 638f674947..e34f3675e0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict
index 3521d07583..fec9b5852b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict
index 54e2ab822b..947139c12d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createPatchDict
index cbfab2fa08..625197ef29 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createPatchDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/decomposeParDict
index 8b22fc9971..69d43472c6 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
index 5eab8e1c0b..b06fe87017 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution
index 61da672625..a80476d5bc 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict
index 31a334f325..0212d6e979 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
new file mode 100644
index 0000000000..518542aabc
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
+    {
+        type            fixedValue;
+        value           uniform (1 0 0);
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        value           $internalField;
+    }
+    walls
+    {
+        type            movingWallVelocity;
+        value           uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
similarity index 67%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
index f1ac119104..f841bbff53 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -17,29 +17,27 @@ FoamFile
 
 dimensions      [0 2 -3 0 0 0 0];
 
-internalField   uniform 4e-06;
+internalField   uniform 1.8e-3;
 
 boundaryField
 {
-    frontAndBack
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
     {
-        type            epsilonWallFunction;
-        value           uniform 4e-06;
+        type            fixedValue;
+        value           $internalField;
     }
-    topAndBottom
+    outlet
     {
-        type            epsilonWallFunction;
-        value           uniform 4e-06;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
-    hot
+    walls
     {
         type            epsilonWallFunction;
-        value           uniform 4e-06;
-    }
-    cold
-    {
-        type            epsilonWallFunction;
-        value           uniform 4e-06;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
similarity index 67%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
index ccdab2054e..013645106d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/k
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -17,29 +17,27 @@ FoamFile
 
 dimensions      [0 2 -2 0 0 0 0];
 
-internalField   uniform 3.75e-04;
+internalField   uniform 3.75e-3;
 
 boundaryField
 {
-    frontAndBack
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
     {
-        type            kqRWallFunction;
-        value           uniform 3.75e-04;
+        type            fixedValue;
+        value           $internalField;
     }
-    topAndBottom
+    outlet
     {
-        type            kqRWallFunction;
-        value           uniform 3.75e-04;
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
-    hot
+    walls
     {
         type            kqRWallFunction;
-        value           uniform 3.75e-04;
-    }
-    cold
-    {
-        type            kqRWallFunction;
-        value           uniform 3.75e-04;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
similarity index 70%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
index 9b1e74247b..e85276585d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -11,37 +11,32 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      p;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [1 -1 -2 0 0 0 0];
+dimensions      [0 2 -1 0 0 0 0];
 
-internalField   uniform 1e5;
+internalField   uniform 0;
 
 boundaryField
 {
-    frontAndBack
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    inlet
     {
-        type            calculated;
+        type            fixedValue;
         value           $internalField;
     }
-
-    topAndBottom
+    outlet
     {
-        type            calculated;
+        type            inletOutlet;
+        inletValue      $internalField;
         value           $internalField;
     }
-
-    hot
+    walls
     {
-        type            calculated;
-        value           $internalField;
-    }
-
-    cold
-    {
-        type            calculated;
+        type            nutkWallFunction;
         value           $internalField;
     }
 }
diff --git a/applications/test/fieldMapping/pipe1D/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
similarity index 61%
rename from applications/test/fieldMapping/pipe1D/constant/polyMesh/boundary
rename to tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
index a284128db2..ca88a8804a 100644
--- a/applications/test/fieldMapping/pipe1D/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
@@ -2,40 +2,41 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "0";
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-3
-(
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     inlet
     {
-        type            patch;
-        nFaces          1;
-        startFace       19;
+        type            zeroGradient;
     }
     outlet
     {
-        type            patch;
-        nFaces          1;
-        startFace       20;
+        type            fixedValue;
+        value           uniform 0;
     }
-    defaultFaces
+    walls
     {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          80;
-        startFace       21;
+        type            zeroGradient;
     }
-)
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/README.txt b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/README.txt
new file mode 100644
index 0000000000..cf014b64f5
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/README.txt
@@ -0,0 +1,4 @@
+Testcase for cyclicPeriodicAMI functionality. This case is adapted
+from the oscillatingInletACMI2D testcase. Assumes cyclic behaviour
+in y-direction; this cyclic transformation is used to extend the underlying
+cyclicAMI such that the weights on either side add up to (at least) one.
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict
new file mode 100644
index 0000000000..21ec6c819a
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/dynamicMeshDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh   solidBodyMotionFvMesh;
+
+motionSolverLibs ( "libfvMotionSolvers.so" );
+
+solidBodyMotionFvMeshCoeffs
+{
+    cellZone        inletChannel;
+
+    solidBodyMotionFunction  oscillatingLinearMotion;
+
+    oscillatingLinearMotionCoeffs
+    {
+        amplitude       (0 0.5 0);
+        omega           3.14; // rad/s  (.5 rps)
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..b7e3450614
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/polyMesh/blockMeshDict
@@ -0,0 +1,158 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (0   0.333333333333333 0  )
+    (0   1.333333333333333 0  )
+    (0   1.333333333333333 0.1)
+    (0   0.333333333333333 0.1)
+
+    (0.8 0.333333333333333 0  )
+    (0.8 1.333333333333333 0  )
+    (0.8 1.333333333333333 0.1)
+    (0.8 0.333333333333333 0.1)
+
+    (1   0.333333333333333 0  )
+    (1   1.333333333333333 0  )
+    (1   1.333333333333333 0.1)
+    (1   0.333333333333333 0.1)
+
+    (1   0   0  )
+    (1   1   0  )
+    (1   1   0.1)
+    (1   0   0.1)
+
+    (1.2 0   0  )
+    (1.2 1   0  )
+    (1.2 1   0.1)
+    (1.2 0   0.1)
+
+    (3   0   0  )
+    (3   1   0  )
+    (3   1   0.1)
+    (3   0   0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) inletChannel (40 1 64) simpleGrading (1 1 1)
+    hex (4 5 6 7 8 9 10 11 12) inletChannel (40 1 16) simpleGrading (1 1 1)
+
+    hex (12 13 14 15 16 17 18 19) (96 1  8) simpleGrading (1 1 1)
+    hex (16 17 18 19 20 21 22 23) (96 1 72) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (20 21 22 23)
+        );
+    }
+    walls
+    {
+        type wall;
+        faces
+        (
+            (0 3 7 4)
+            (16 19 23 20)
+            (1 2 6 5)
+            (17 18 22 21)
+        );
+    }
+    cyclicMoving1
+    {
+        type cyclic;
+        neighbourPatch cyclicMoving2;
+        faces
+        (
+            (4 7 11 8)
+        );
+    }
+    cyclicMoving2
+    {
+        type cyclic;
+        neighbourPatch cyclicMoving1;
+        faces
+        (
+            (5 6 10 9)
+        );
+    }
+    cyclicStationary1
+    {
+        type cyclic;
+        neighbourPatch cyclicStationary2;
+        faces
+        (
+            (12 15 19 16)
+        );
+    }
+    cyclicStationary2
+    {
+        type cyclic;
+        neighbourPatch cyclicStationary1;
+        faces
+        (
+            (13 14 18 17)
+        );
+    }
+    ami1
+    {
+        type cyclicPeriodicAMI;
+        inGroups 1(cyclicAMI);
+        neighbourPatch ami2;
+        periodicPatch cyclicMoving1;
+        faces
+        (
+            (8 9 10 11)
+        );
+    }
+    ami2
+    {
+        type cyclicPeriodicAMI;
+        inGroups 1(cyclicAMI);
+        neighbourPatch ami1;
+        periodicPatch cyclicMoving1;
+        faces
+        (
+            (12 13 14 15)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/transportProperties
new file mode 100644
index 0000000000..baad17c9aa
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/transportProperties
@@ -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;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties
new file mode 100644
index 0000000000..f604016178
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/constant/turbulenceProperties
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/controlDict
new file mode 100644
index 0000000000..fec9b5852b
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     pimpleDyMFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         5;
+
+deltaT          0.005;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.05;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  true;
+
+maxCo           0.5;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/fvSchemes
new file mode 100644
index 0000000000..b06fe87017
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/fvSchemes
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+    grad(U)         cellLimited Gauss linear 1;
+}
+
+divSchemes
+{
+    default         none;
+//    div(phi,U)      Gauss upwind;
+    div(phi,U)      Gauss linearUpwind grad(U);
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear limited corrected 0.33;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.33;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/fvSolution
new file mode 100644
index 0000000000..a80476d5bc
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/system/fvSolution
@@ -0,0 +1,80 @@
+/*--------------------------------*- 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      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    pcorr
+    {
+        solver          GAMG;
+        tolerance       1e-2;
+        relTol          0;
+        smoother        GaussSeidel;
+        cacheAgglomeration no;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+        maxIter         50;
+    }
+
+    p
+    {
+        $pcorr;
+        tolerance       1e-5;
+        relTol          0.01;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|epsilon)"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    "(U|k|epsilon)Final"
+    {
+        $U;
+        tolerance       1e-6;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    correctPhi          no;
+    nOuterCorrectors    1;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+//    "(U|k|epsilon).*"   1;
+}
+
+cache
+{
+    grad(U);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
index cea2ca0d79..bb7de78813 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
index 611e624d8e..418e68d29f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
index 6b5c178b69..4983c7be3c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
index 366352e5f5..cd83676e9a 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
index c34b9c9a4f..2fb0b237e4 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict
index 8bbe661926..75a16c19a7 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties
index 96b2b749ad..61fed2bf82 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
index aaf32f8a3b..3064c0b871 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict
index 6aa1d41268..523318f821 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict
index 57b261e480..160e862433 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict
index ad10b2e643..d814083a85 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createInletOutletSets.topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict
index d83f0bc7c3..0f4141e74e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/decomposeParDict
index a850f68aef..1edc425c22 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
index 0349e3e87e..5a32703891 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
index 5eab8e1c0b..b06fe87017 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution
index 4bb239703a..a16ff79cdb 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields b/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields
index 57a93256db..aef5410ebf 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/readFields
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict
index a6122210a1..93862d9d66 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
index 156b5c88c7..adabd3059f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
index 113a8a4943..bf1ccb5168 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/U b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/U
index 12f437853b..ed8f19c6f5 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/fixedInlet b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/fixedInlet
index f88cacb61e..491f5d824c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/fixedInlet
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/fixedInlet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
index 01475bef75..91e0624872 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/initialConditions b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/initialConditions
index 6501615826..ebd14b307e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/initialConditions
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/k b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/k
index 0203605b09..0b5679db11 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/nut
index 5c44f0d9cd..bf2292e319 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/omega b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/omega
index 52373c885b..c9e7583c03 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/omega
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/p b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/p
index 6ed3e58173..0d68d56708 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
index 71924be16e..2df39f10bb 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
index 13d0937968..d8f921947f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
deleted file mode 100644
index 14c5f7a6a8..0000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    topAndBottom
-    {
-        type            patch;
-        nFaces          72;
-        startFace       25179;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       25251;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          62;
-        startFace       25291;
-    }
-    wing
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          378;
-        startFace       25353;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12565;
-        startFace       25731;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12565;
-        startFace       38296;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties
index 7cdb62d172..44160c6548 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties
index 02fa2df1b9..9cf0f7ebd0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict
index 3efee6d829..b0a0eae847 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict
index e5697b9b28..d61fc5b686 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
index a993ff41f2..f3ab9ae04c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
index 60cc53cf31..bccfe50fbf 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U
index 94c7cb1bca..7df61c926c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/fixedInlet b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/fixedInlet
index f88cacb61e..491f5d824c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/fixedInlet
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/fixedInlet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches
index 01475bef75..91e0624872 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/initialConditions b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/initialConditions
index 6501615826..ebd14b307e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/initialConditions
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/k b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/k
index 0203605b09..0b5679db11 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/k
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/nut
index 5c44f0d9cd..bf2292e319 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/omega b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/omega
index 52373c885b..c9e7583c03 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/omega
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/p b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/p
index 6ed3e58173..0d68d56708 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/p
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
deleted file mode 100644
index 14c5f7a6a8..0000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    topAndBottom
-    {
-        type            patch;
-        nFaces          72;
-        startFace       25179;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       25251;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          62;
-        startFace       25291;
-    }
-    wing
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          378;
-        startFace       25353;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12565;
-        startFace       25731;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12565;
-        startFace       38296;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
index 7cdb62d172..44160c6548 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
index 114cd1c268..643dd7945f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
index daf4a2f361..dd1cd66692 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
index 137b9a2e7b..2517ea017d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
index f4cec290c3..dfbda12d74 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
index 5db95f3150..7e4214dbf3 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
index 0505b50bb6..f5de734cec 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
index fe82d719fc..0143d1850c 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict
index 2d17386de2..242d369902 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
index 60386d68fd..e626b52856 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
index 746184a64d..f30940737e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution
index 850c27e7cd..68ff940395 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
index 8911dc9edf..d485a4a378 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/U b/tutorials/incompressible/pimpleFoam/TJunction/0/U
index 1616d0b038..833878f683 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/U
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
index 1d8307f461..40d6f604e7 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/k b/tutorials/incompressible/pimpleFoam/TJunction/0/k
index 12fc09d659..8c7cd78eed 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/k
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda b/tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda
index 46b65e00d6..ee57234257 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/nut b/tutorials/incompressible/pimpleFoam/TJunction/0/nut
index 9f68c55f67..446993a49b 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/nut
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/p b/tutorials/incompressible/pimpleFoam/TJunction/0/p
index e1512cda4f..d89bc1ac26 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict
index 93a50690b4..5eabdfd065 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
index 72da914bee..d046c1a037 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
index 8e5d8a941a..0581498e43 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
index 109f3af33e..d36c83b6bb 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U
index 54e519308c..c273d0221b 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/epsilon b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/epsilon
index 3648316bd3..4a46aa9ef7 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/k b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/k
index bd8e325c2f..fef19369b4 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/k
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nuTilda b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nuTilda
index 5bd1e94d8b..3320ac3e07 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nut b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nut
index 894d5b5345..02681cce57 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nut
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/p b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/p
index 42728c992c..9662caffb8 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/p
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict
index 7464688c33..6f05726885 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
index 27b7eb8a96..24e6fddf89 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
index 19ea37dfdb..c937312691 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
index 8e5d8a941a..0581498e43 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
index 109f3af33e..d36c83b6bb 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
index 579d2161fa..5db89173c7 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/U b/tutorials/incompressible/pimpleFoam/channel395/0.org/U
index a079b6fd9a..054dbc16b5 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/U
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/k b/tutorials/incompressible/pimpleFoam/channel395/0.org/k
index 1246beed09..62662b8aa6 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/k
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda b/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda
index 6d172d79d1..c4639169d0 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/nut b/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
index 5c2f99d6ec..84690abafb 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/p b/tutorials/incompressible/pimpleFoam/channel395/0.org/p
index fb4ce87850..8ea0f960d3 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/p
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions b/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
index 99535be64b..a1ee669972 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/postChannelDict b/tutorials/incompressible/pimpleFoam/channel395/constant/postChannelDict
index eeba7a043e..f2b9f7561b 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/postChannelDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/postChannelDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
index fa0218b01a..33e216f9f9 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
index 1f1772f0e4..9872be6f0a 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict
index b2d9a75c9c..d98abc9fd9 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
index 9dc482f560..8d82e32da4 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
index d4b2c3d0ab..250ddde2c7 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes b/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
index a7c8341824..55c6c5b00d 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
index b3abd8eafb..b9695144c9 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
index 9b63f3c191..0820320ab8 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kl b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kl
index 02441c87b6..9250927146 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kl
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kl
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kt b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kt
index 54a6f988eb..c4036f33f5 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kt
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/kt
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
index ed303c8e96..bbde2f743a 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/omega b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/omega
index 1bfacff964..4f59f96550 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/omega
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/p b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/p
index e2ef78a321..630ec0b274 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/p
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
index 610a08bc7d..286c4bb8df 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
index d6c0926546..2569fdb583 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict
index 28e1b8a9f3..d8f765b4dd 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
index f179288734..d0ea938ad2 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
index 799d184069..d440f85aa0 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
index f179288734..d0ea938ad2 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/controlDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/controlDict
index 0cf8f7e718..0c7aa6034f 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/createPatchDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/createPatchDict
index 2a4e08aa12..47b775c3f4 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/createPatchDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
index 6cfc7e2e94..66272a489b 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution
index 1065ac0db3..0f6261a1e9 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/mirrorMeshDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/mirrorMeshDict
index c3beed9d01..7dc4b63ed4 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/mirrorMeshDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/mirrorMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/topoSetDict b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/topoSetDict
index 1c633c6e7b..0ae59fc713 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/U b/tutorials/incompressible/pimpleFoam/pitzDaily/0/U
index 885c5b9de4..5bf56cda86 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/epsilon b/tutorials/incompressible/pimpleFoam/pitzDaily/0/epsilon
index d82c45e629..bad6dcfd9b 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/k b/tutorials/incompressible/pimpleFoam/pitzDaily/0/k
index 7de1adf4b5..02e185a3d5 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/k
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/pimpleFoam/pitzDaily/0/nuTilda
index cbe04420b9..8ae1977905 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/nut b/tutorials/incompressible/pimpleFoam/pitzDaily/0/nut
index 585d8ec0f4..8509035d79 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/nut
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/0/p b/tutorials/incompressible/pimpleFoam/pitzDaily/0/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index 581ceffc70..0000000000
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
index d5016f6d22..cae8b7795c 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/pitzDaily/system/controlDict
index a8ea900b3c..53b4d45d18 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
index f3462c0da0..41b07dc872 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution
index 9de4397498..fd2fd68b33 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/controlDict
index 86a623e506..e71830f3ea 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
index 440b2b2311..7f8ec18955 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
index ea00426f61..1c73705198 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
index 35b21043f9..ac471adb1c 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
index 359098a8e3..bc691b5b01 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/fixedInlet b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/fixedInlet
index f88cacb61e..491f5d824c 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/fixedInlet
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/fixedInlet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/frontBackUpperPatches b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/frontBackUpperPatches
index ae6ea03155..986f3a5e52 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/frontBackUpperPatches
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/frontBackUpperPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/initialConditions b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/initialConditions
index 43b32387cf..82f5d554a3 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/initialConditions
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/include/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k
index 8e61ee9e54..a886f6d1df 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda
index 7b24b27473..368c0d9184 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut
index 38155ce79c..5438c7ac01 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p
index ac663ce37e..24fefab95c 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall
index c865acf47b..5a50ccfeca 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/blockMeshDict.8pSmall
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary
deleted file mode 100644
index 7e7cb8fc3c..0000000000
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          160;
-        startFace       3456;
-    }
-    back
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          160;
-        startFace       3616;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          64;
-        startFace       3776;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          64;
-        startFace       3840;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          160;
-        startFace       3904;
-    }
-    upperWall
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          160;
-        startFace       4064;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
index cfff554e17..1b27f88d13 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict
index 53f4ee3447..a490e4d4f4 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
index d44525d3a3..6d0f734532 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
index 140f824423..282e60ed92 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict
index e40f3fff5e..f4b7bc2127 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.hierarchical b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.hierarchical
index e40f3fff5e..f4b7bc2127 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.hierarchical
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.hierarchical
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.ptscotch b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.ptscotch
index 90922d44b7..f63da29d31 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.ptscotch
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/decomposeParDict.ptscotch
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
index 8e8704743c..b8cb538cda 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
index 64721464c9..9bbd1a6d45 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
index 5eeddfb8fd..cdc364515f 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/readFields b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/readFields
index 74f082c98b..3b91ea1ca4 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/readFields
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/readFields
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict
index e9285153db..e1942c348e 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
index e5f7497292..40880fd950 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
index 510508331e..4d77452d7a 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
index def21ccbd7..e7381beda3 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
index dc1122df56..74ae339aed 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
index 726b637f78..d6a2b20c72 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index 581ceffc70..0000000000
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
index 9c4722d37c..c9982a6c80 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 18601d4485..e34960f381 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
index f017d958de..b7aa89af6c 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
index 1ae8d1c803..bff209bbf9 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/U b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/U
index b6f21e58e7..dc98db6b28 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/U
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/k b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/k
index 70e6310b8d..07a8bd3cee 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/k
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuTilda b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuTilda
index 0861891bc6..323632ffd4 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
index 726b637f78..d6a2b20c72 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/p b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/p
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
index 19b9695576..0c56f41212 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict
index 1727ab6e17..05469f9575 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
index 18601d4485..e34960f381 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/decomposeParDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/decomposeParDict
index 45f4908726..39db2e7e3a 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
index 2da8edf967..a1c8fe792a 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution
index 3c6eb61dd2..40567f1750 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/U b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
index 711702f987..64c0bdf47c 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/U
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon b/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
index 6b009c939a..601fc09051 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/k b/tutorials/incompressible/pisoFoam/ras/cavity/0/k
index 72d1287df1..88c937e799 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/k
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda b/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
index 36021c60af..fa4cc6ce1f 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
index 2a9a9727fc..03aabc568c 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/omega b/tutorials/incompressible/pisoFoam/ras/cavity/0/omega
index a7040dd843..53413b6b0b 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/omega
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/p b/tutorials/incompressible/pisoFoam/ras/cavity/0/p
index 3e00d9eb31..e71be28d23 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/p
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
deleted file mode 100644
index 6eb3105b4d..0000000000
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
+++ /dev/null
@@ -1,43 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    movingWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          20;
-        startFace       760;
-    }
-    fixedWalls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          60;
-        startFace       780;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          800;
-        startFace       840;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
index 3ffed52b9a..8514285603 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict
index 165a600c7b..2e5f98c1a5 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
index 15396ddf40..7f6d6f63f4 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
index 886aa7a11f..86f2283746 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
index 7342e01ebe..d0e6f74b52 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
index 711702f987..64c0bdf47c 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/epsilon b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/epsilon
index 6b009c939a..601fc09051 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/epsilon
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/k b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/k
index 72d1287df1..88c937e799 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/k
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nuTilda b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nuTilda
index 36021c60af..fa4cc6ce1f 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nuTilda
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nut b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nut
index 2a9a9727fc..03aabc568c 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nut
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/p b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/p
index 3e00d9eb31..e71be28d23 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/p
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
index d587253c9a..d15444b222 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict
index 165a600c7b..2e5f98c1a5 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/controlDict
index 15396ddf40..7f6d6f63f4 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
index 8e5d8a941a..0581498e43 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution
index f54b30c2e8..b379fd5fa0 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
index e146e81dcb..069e18cc87 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
index e91f509664..fd250044da 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution
index 3feda21ae1..efe04aa240 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
index 76e54ad382..49076359f1 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
index fe2432b8aa..2a98b3a312 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
index dc27e2fcff..849a447cc3 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
index 2b39c9a2cd..227bfc91f5 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
index fcb2bc9b00..15b6d252eb 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
index dd95d3a8eb..89aa267b81 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties
index 80421b7786..f1f1367ca4 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -23,8 +23,8 @@ porosity1
 
     DarcyForchheimerCoeffs
     {
-        d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-        f   f [0 -1 0 0 0 0 0] (0 0 0);
+        d   (5e7 -1000 -1000);
+        f   (0 0 0);
 
         coordinateSystem
         {
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
index 09a4670392..702a60f084 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
index 4fb10f0a09..15bf44d7f8 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
index 55e113a109..7dc3cb0df3 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution
index e0337498e5..932961c11b 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T
index 01953be09c..db6db54602 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
index 842ef78abe..eb1a18f041 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
index 8eac570f52..201d0b138d 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
index 7b491926d0..18302d4a7b 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut
index 52456edd6e..1cc3751500 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p
index b3937ece05..0d0970bd08 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
index 4016a54045..6ffac4b939 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -23,8 +23,8 @@ porosity1
 
     DarcyForchheimerCoeffs
     {
-        d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
-        f   f [0 -1 0 0 0 0 0] (0 0 0);
+        d   (5e7 -1000 -1000);
+        f   (0 0 0);
 
         coordinateSystem
         {
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
index 381b548eff..5d5a450ef5 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict
index 5977e0ee8b..9e0235f7cd 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces
index 5977e0ee8b..9e0235f7cd 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.collapseFaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces
index 0389a33b5a..70e80bd6cf 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/collapseDict.indirectPatchFaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict
index 4906ae6fa1..071b0f55f7 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict
index 8514a9c041..8ff8602d18 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
index d1b78f3df7..d6f3e906c1 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
index 55e113a109..7dc3cb0df3 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution
index 688dee189f..43fcb98c38 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces
index 054efdddac..565182bf54 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
index 83061a7975..b27e910720 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.geometry
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions
index b701da1622..51843dd21e 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.shapeControlFunctions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
index 4dfba773e3..4c6a178d86 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
index 3a47cc447d..5c9392b211 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0/h b/tutorials/incompressible/shallowWaterFoam/squareBump/0/h
index 65141b34c9..abe0a9cf6e 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0/h
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0/h
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0/hTotal b/tutorials/incompressible/shallowWaterFoam/squareBump/0/hTotal
index fdaf7b1916..31bc304ae7 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0/hTotal
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0/hTotal
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/0/hU b/tutorials/incompressible/shallowWaterFoam/squareBump/0/hU
index 134b60f778..27d3fb1cb2 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/0/hU
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/0/hU
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
index 9be337ce9f..49e8de1ea7 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/h0 b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/h0
index f3e38114c6..a358e8b95f 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/h0
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/h0
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
index 96a9cc8ad2..b3029ba33b 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index e811bce9f7..1dd21d6ec0 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
index 675ce090d3..84096b1c9c 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index aa5358894e..8b3e726ea3 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
index bd0c70dbff..10c518d66a 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/U b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
index 3fa0d8ab8b..a195ae950e 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/U
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
index 42e1dccd97..d61e4f394c 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
index 1e2a80af91..35cb90407e 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/p b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
index 5e45181672..70c1a8ee65 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/p
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
deleted file mode 100644
index 34e79da6d3..0000000000
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-4
-(
-inlet
-{
-    type patch;
-    physicalType inlet;
-    nFaces 134;
-    startFace 21254;
-}
-
-outlet
-{
-    type patch;
-    physicalType outlet;
-    nFaces 160;
-    startFace 21388;
-}
-
-walls
-{
-    type wall;
-    physicalType wall;
-    nFaces 78;
-    startFace 21548;
-}
-
-frontAndBack
-{
-    type empty;
-    physicalType empty;
-    nFaces 21440;
-    startFace 21626;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
index 6af290f719..1a1a9379e6 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
index 6e1107987f..4367ebbed8 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
index 3eb9cf35fa..87951ccbda 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
index 665a42b98e..b4684d0f1d 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
index a6f9fcbb13..0739b5bea1 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
index 7fcac0b62d..7061aa1e0f 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
index 7ce5efe1f2..855bf1847d 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
index af2c98fc88..1997cd4f5f 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
index 50a72fd555..32ca9ed08b 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
index 38cb42ae26..af4076746f 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U
index 8f856ef5ea..e49fcb3e84 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
index 8adf568087..4fcfc43f98 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k
index 74be565a85..26d6795453 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut
index 6ca6d3aef6..be86624e1f 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/p b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/p
index 210696026e..62440e983b 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/p
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties
index 67639822de..2b1e622aca 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 188a0f0c58..0000000000
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
index d5016f6d22..cae8b7795c 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
index 34336b01fa..7f7722911d 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
index 8fc98dfebf..a8abcfbe13 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution
index 474b439f82..3e107104b9 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/U b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
index 9ce8375a2b..3698431ed9 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/include/fixedInlet b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/fixedInlet
index f88cacb61e..491f5d824c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/include/fixedInlet
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/fixedInlet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/include/frontBackUpperPatches b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/frontBackUpperPatches
index 47d273e1e4..494637c441 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/include/frontBackUpperPatches
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/frontBackUpperPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/include/initialConditions b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/initialConditions
index 43b32387cf..82f5d554a3 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/include/initialConditions
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/include/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/k b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
index ab2ad5bf92..ad7f6308d1 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/nut b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
index 85100ea6cd..0cb760d3d8 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/omega b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
index bba2678417..971389707e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/p b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
index 337a45eb11..d02d8cdbe1 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
index 497a0a06ea..35734dd5ea 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
index 3af0c8a8c2..0a9f48ca1a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index c7607fc236..ade73fb1be 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
index 140f824423..282e60ed92 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
index 60dc789dbb..ed8cab434c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
index c18110d122..55c62fe84f 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 816363a613..4bcee4e331 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index 6f9e2f67b8..d7adb04eb8 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict b/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
index 5de5b25817..47b71187e1 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/readFields b/tutorials/incompressible/simpleFoam/motorBike/system/readFields
index 57a93256db..aef5410ebf 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/readFields
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/readFields
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 326b9cd736..2353cc2899 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 3c248c0dd7..3db67375db 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
index fa00f86001..8098430cd1 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index c071607c9a..c67080848b 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
index 7ae235fa09..bbb340c67a 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
index 73f9d7fa51..7ae127f4c5 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
index 777c1a96c0..190b9ef3fd 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
index 4bf99d876f..fafa9ce328 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
index d749dfae0b..b3852b260f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
index ddb179578c..d8c0742c05 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
index af89ac5fe9..c3798f8a3e 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
index d79fd05ffb..ad45339293 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
index 5676059cf1..9b0cb79516 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
index e43cefc79a..1e9fdaebe3 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict
index b76e7ccd24..1e77902236 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
index 7707bb1666..f5b0139520 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
index 155643b2f4..6ea4912eed 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
index bce9f89021..b07df9c73f 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/U b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
index 885c5b9de4..5bf56cda86 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
index d82c45e629..bad6dcfd9b 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/f b/tutorials/incompressible/simpleFoam/pitzDaily/0/f
index f9885d8d8c..d0630fb211 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/f
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/f
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/k b/tutorials/incompressible/simpleFoam/pitzDaily/0/k
index 7de1adf4b5..02e185a3d5 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
index cbe04420b9..8ae1977905 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
index 585d8ec0f4..8509035d79 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/omega b/tutorials/incompressible/simpleFoam/pitzDaily/0/omega
index bd29dcb49e..2760bd2f99 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/omega
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/p b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/p
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/v2 b/tutorials/incompressible/simpleFoam/pitzDaily/0/v2
index b7bc05b72c..363c79211e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/v2
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/v2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
index 147c6edaf5..1a597ab28f 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,7 +21,7 @@ RAS
 {
     // Tested with kEpsilon, realizableKE, kOmega, kOmegaSST, v2f,
     // ShihQuadraticKE, LienCubicKE.
-    RASModel        v2f;
+    RASModel        kEpsilon;
 
     turbulence      on;
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index e003bc42fd..ea31cab6d6 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
index caf871a8b4..f479b64caa 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index 9a4ad93421..69462badd0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,8 +57,8 @@ relaxationFactors
 {
     equations
     {
-        U               0.95;
-        ".*"            0.95;
+        U               0.9; // 0.9 is more stable but 0.95 more convergent
+        ".*"            0.9; // 0.9 is more stable but 0.95 more convergent
     }
 }
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
index bb861bfc6d..328e5c8249 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
index 01dccefae7..6bebc6b3f0 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
index c0fa4d80d4..fa5b7dfe42 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
index cbe04420b9..8ae1977905 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
index 585d8ec0f4..8509035d79 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
index 0fdd33ec47..6385cc1831 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
index 8c8429a77c..054bd3d4c4 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
index c2bf342ab6..b5ab577c23 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
index aa3e41c28f..12a23da069 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
index 1fc0437242..112768a4d9 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
index 401efe9083..54cb84a4d1 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
index d5016f6d22..cae8b7795c 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
index 0e0fcf1c98..d700a73972 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 18e4c651fb..965737c812 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
index 2b84894486..f4ff2ae598 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
index 308b280e12..289b7c300e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
index ed2f5b2fe9..6591670a3d 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0/U b/tutorials/incompressible/simpleFoam/rotorDisk/0/U
index 72ad7bcdc6..7298f1b7bd 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0/U
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0/k b/tutorials/incompressible/simpleFoam/rotorDisk/0/k
index aa99726828..5fc10977a0 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0/k
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0/nut b/tutorials/incompressible/simpleFoam/rotorDisk/0/nut
index cd13cad5b1..f9ba060283 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0/nut
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0/omega b/tutorials/incompressible/simpleFoam/rotorDisk/0/omega
index 5174a759f5..08429d8eb8 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0/omega
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/0/p b/tutorials/incompressible/simpleFoam/rotorDisk/0/p
index 95c7b3781d..28e7d9ae0f 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/0/p
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/rotorDisk/constant/polyMesh/boundary
deleted file mode 100644
index 1c931bf76f..0000000000
--- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    slipWall
-    {
-        type            slip;
-        inGroups        1(slip);
-        nFaces          11616;
-        startFace       215580;
-        inGroups        1 ( slip );
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          1788;
-        startFace       227196;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          1788;
-        startFace       228984;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties b/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties
index 40d0124471..d6897af2e8 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict
index 28d06ebbd5..7630af0966 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict
index 1a69737a8d..5a4c14e670 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/createPatchDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/createPatchDict
index a7e0036371..b2dd636d8f 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/createPatchDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
index 75f6c6c1c9..5ab1b063fd 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
index 868870fe4d..59aab2ea7a 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution
index b0aac0d39e..9c087b5551 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
index 2e38dda770..a3519f64aa 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict
index 959688f732..dcaa5d64c3 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/U b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/U
index 8aa9427eaa..e907793228 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/U
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/epsilon b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/epsilon
index fdfa0cad34..3b857a7214 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/epsilon
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/ABLConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/ABLConditions
index c40c87b65f..b0523f2110 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/ABLConditions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/ABLConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/fixedInlet b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/fixedInlet
index f88cacb61e..491f5d824c 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/fixedInlet
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/fixedInlet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/initialConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/initialConditions
index 9eaeecaae2..45d4734b5f 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/initialConditions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/sideAndTopPatches
index bddc17121f..ae6e48fa97 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/sideAndTopPatches
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/include/sideAndTopPatches
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/k b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/k
index 4708c79430..e2010a5e0d 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/k
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/nut b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/nut
index c6e19a240b..61e858640a 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/p b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/p
index 6433d777ed..b9ab4d70b5 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0.org/p
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
index cea20e3485..fe2cb50243 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
index fee53af24e..30c5ca9146 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
index ef4c3177ac..0b7cdfb4e2 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
index f648f3ed70..c947100568 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.hierarchical b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.hierarchical
index 541de112df..b1885affb2 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.hierarchical
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.hierarchical
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch
index 55c3c4f291..d81e912124 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
index 1d67406c9c..3ef1aa2cc5 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution
index 0ddb5a5c7d..76dfcdfd82 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
index b882f821e4..9da0a7962c 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
index 665171df46..265cba03dd 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
index 8b7d69447a..fa60e9ff87 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon
index 0d85dabb8b..a4f87d9016 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/k b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/k
index 791667e164..c2e8a6dabe 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/k
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut
index 54a56f319f..ddd53fc4f8 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
index 3bca06ea5a..3adae5253a 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
index 9acbd4a507..2d312ebd3f 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
index c4d5b2e351..44798983a1 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict
index 91ae59260b..a7070c134e 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
index e34ff9f922..15e6f992a4 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
index 2075c248ff..e264fdeaf6 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution
index bdb34dd0f4..1dad106e70 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict
index c38396d710..9c18d6c4a9 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
index fed73f13c1..ebf443817c 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict
index 10a7645af2..36ae64279b 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
index 486a026f8d..020830745e 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
index d4715eccd0..3988f7d194 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions
index d12dfd9cc7..ee5b5cbc1b 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudPositions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
index 2d537d6f61..b6d87bb8d1 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index b8d9232a1b..015a3dca02 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
index efac897025..78eb75c11d 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
index 2ab413c7c1..6b691cf8c6 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
index 72bc540502..6664777e01 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes
index 080bc042fa..c8bceab61c 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
index 87b08f21d8..b78de15ced 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict
index 12930d0346..ce5f93c23c 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
index 486a026f8d..020830745e 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
index 9138901c7b..5d490aa84e 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
index a0d7102656..c925386e15 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions
index d12dfd9cc7..ee5b5cbc1b 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudPositions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
index fdb104bc2d..4eb1c640e9 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index c2f2a2b466..6c2bcaa3ca 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
index 34274f8b4a..77b6946790 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
index 073b1ed886..c2ccbb2886 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
index c8a6392a34..8588dcc59f 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
index d78fa6fa5d..7ba677c878 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
index c263fc92e7..6a9e257c0a 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/U.air b/tutorials/lagrangian/MPPICFoam/column/0/U.air
index fefe194de0..7ceab32a28 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/column/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/0/p b/tutorials/lagrangian/MPPICFoam/column/0/p
index f59797fbd9..38b7e8fbf4 100644
--- a/tutorials/lagrangian/MPPICFoam/column/0/p
+++ b/tutorials/lagrangian/MPPICFoam/column/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/g b/tutorials/lagrangian/MPPICFoam/column/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions
index 000c72a944..dab06d3dfc 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudPositions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
index f086e389ec..9b039a5bd7 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index b8d9232a1b..015a3dca02 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
index c5cbc4272b..bf5f1076a3 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/column/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/controlDict b/tutorials/lagrangian/MPPICFoam/column/system/controlDict
index e4337f6567..d15820e6af 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/column/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
index be85128ef5..db8f52fe6b 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
index 58779e7c76..3d4ac58294 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air b/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
index 7f8968fb24..83a15eea38 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air b/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air
index 28fbdabab5..05a81b418a 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air b/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air
index ce5e04cb5e..5caef072b4 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/p b/tutorials/lagrangian/MPPICFoam/cyclone/0/p
index a53d132adc..853ce288ce 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/0/p
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
index a0d7102656..c925386e15 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 78bac15385..ee8df959b6 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index c2f2a2b466..6c2bcaa3ca 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
index e9b36c8dc4..27d8932eea 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
index 39093e0511..b2dbe5c14f 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
index 33bfb938f0..5003234733 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
index 8118bbc16f..7c25e76c38 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes
index f820310d23..9159482c22 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
index c3d1c32b1e..570323a4bb 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
index 59372f7327..637457a329 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
index 08270dfd69..4510bd7843 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
index 783d4b68ab..a2074dbb04 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index 6da6ab578f..ac3d8e76bf 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index b8d9232a1b..015a3dca02 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
index f0e1288a96..d710bde592 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
index 8329f435e1..a1cf05a05f 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
index b044660a05..8e8217cd49 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
index c0af0e68fa..e53bc1e515 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4
index 759680fa4b..bde829a360 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO
index 9ca0618a6b..14c40d8992 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2
index 428e101409..8b50e82e0d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
index 08aa019d77..7480229c54 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2
index c1b04127c6..9168d7a6df 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O
index 1093d8750d..eb5aa54a9a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2
index b699719c33..7e1d8c66d8 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2
index 8bc6fd4855..1840b42f0c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/T b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/T
index 5b273ff997..52fbdf950e 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/T
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
index 104a8c18de..0e80f8cea9 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
index 8ceda71797..dcbf2d0005 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
index 5f62ec144f..91d0183902 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
index 31facc9f6f..20edd9f149 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut
index 718743bbca..f2c6cb0139 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p
index 100ce897f9..6a7fd75c5c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org
index fdeca33b0c..f622013dac 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
index 2d6208654b..06bc7267b2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
index 520746bf75..f318ed98be 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index f74deb9d42..37183c6ea5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
index 1832dddf0a..ab8e6056da 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
index 3b2be66914..84aa4f57dd 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
index ee8ddad892..9dda7b6614 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index a11f62fd91..1ccb64630d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
index 783de52cfb..e1b24bcb90 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
index d087edc1df..9cdbf524ce 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 63932b5a8d..66569d0ac0 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
index c323d93972..6531bdd6d8 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
index d01b982bc2..b5bb7baae9 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/polyMesh";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index c2ec4d6879..1162f634f9 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
index a83c3fa159..be63e303f0 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
index 85910aef45..a3a22cb447 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index 23f65f64b3..4cdcc4078b 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index e3cb0465c2..804b8c0ff8 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U
index 779c65fb9b..efab0e473c 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/mu b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/mu
index f7f9724f63..eb71e41471 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/mu
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/mu
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/rho b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/rho
index 02796ac17b..10ccba8ca7 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/rho
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.org/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
index 150adb2953..6392af4995 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
index dbbab9e9f0..50e9188864 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
index 6489c94578..89fdfdd67f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
index a3de59c3d4..7feb2b4eb3 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
index 0f07bb6aa8..17fa8fe81b 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
index 309cee03eb..1b8a2d358f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
index 12930d0346..ce5f93c23c 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
index 0cf7233205..502a4c619e 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
index f8a0bc16ad..820c727bdc 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
index 41b8c64e80..5414fc2b3d 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
deleted file mode 100644
index cf66d374fc..0000000000
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-2
-(
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          136;
-        startFace       1852;
-    }
-    frontAndBack
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1920;
-        startFace       1988;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
index dbbab9e9f0..50e9188864 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
index 359a48779a..9864822d63 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
index 7ddca37d52..590365cdab 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
index 0f07bb6aa8..17fa8fe81b 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
index 309cee03eb..1b8a2d358f 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/H2O
index 76a0a81659..5e1dccea96 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/N2
index bbb0cd48ed..cc5c913e85 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/N2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/O2
index 3fee82e4fa..b0e5c52822 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/O2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/T
index 6a1684763f..d7e527d5cd 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U
index 3881e0ef43..e790b8b87f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p
index 7fb8a92933..fcda0699d1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
index 99be8758e2..bc1fb4c61a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Tf
index 6443623aa2..bc6b8e79fc 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf
index 6c0c54bc0a..14a9ce78fa 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/deltaf
index 9f77264908..d4a1350758 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/additionalControls b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/additionalControls
index 3c9227fb60..dbbbbf342c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/additionalControls
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
index 8fbc88a1b3..7fefc6da90 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/combustionProperties
index 4fe87a3132..633af5c520 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
index 1cff004fd8..2514799c87 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/g b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/g
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/parcelInjectionProperties
index 13b472069e..291e17a767 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/parcelInjectionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/radiationProperties
index 94cc3749b1..33e9ace334 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
index 8486354e79..fe6a495743 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
index 6236fafceb..84d7acd2fe 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
index 0a37bdeb40..76a0e5dfc1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/blockMeshDict
index de67f4e222..e1c61670e3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/controlDict
index 1f8fdd3957..774a13b839 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/createPatchDict
index 7270ff3b15..0f0db31a6c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/decomposeParDict
index 4c067a1acb..402a39c58e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict
index 8917dc6019..a88477152a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
index 76448b808b..766968439a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
index a7112d9460..b874edb100 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict
index 94c4fcb707..db2dbfff6a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSchemes
index 83a7faa077..6ef83f5454 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
index 669b3a56a3..e1120810f2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/H2O
index d186711d7f..ae297f8760 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/N2
index 7fc516bc43..70fe2f4443 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/N2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/O2
index 233715e3ab..1e36c78e3a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/O2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
index 070a82b341..1b394d98b7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
index 0f8cd0ff3e..81425a7b0d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/alphat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/alphat
index 5e7440c9e3..16ce4a5ed3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/alphat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon
index e73cabb04b..79e9457100 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/htcConv b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/htcConv
index d1baf0bd37..3fd0a6f293 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/htcConv
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/htcConv
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k
index 01d40325b5..389f09dbdd 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut
index e985d6e5f2..5f8c1cbbe1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p
index 1db2c0020a..333c21b8f8 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
index df06f47fd0..0e11f99109 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Tf
index c69678cda2..dee03cc908 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf
index 944e0883b8..d62d022434 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/deltaf
index 87acff0fd2..1b030261ba 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index 019978bbb4..06e9e9ec5f 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -30,7 +30,7 @@ rm -rf system/wallFilmRegion
 cp -r system/wallFilmRegion.org system/wallFilmRegion
 
 find ./0 -maxdepth 1 -type f -exec \
-    sed -i "s/wallFilm/\"(region0_to.*)\"/g" {} \;
+    sed -i -e "s/wallFilm/\"(region0_to.*)\"/g" {} \;
 
 paraFoam -touch
 paraFoam -touch -region wallFilmRegion
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/additionalControls b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/additionalControls
index ccf72d6127..af372fbcbe 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/additionalControls
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
index 8fbc88a1b3..7fefc6da90 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/combustionProperties
index 87d04695b8..09bad138f9 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
index 1cff004fd8..2514799c87 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/g b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/g
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/radiationProperties
index 94cc3749b1..33e9ace334 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index c9d32f4468..e1e31b813b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index 74365c1012..122b4624a2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 0a37bdeb40..76a0e5dfc1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties
index eeaaa9205c..b2ec1bfe54 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
index e375202c3b..bfe0562df1 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
@@ -3,7 +3,7 @@
 # =========                 |                                                 #
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           #
 #  \\    /   O peration     | Version:  dev                                   #
-#   \\  /    A nd           | Web:      www.OpenFOAM.org                      #
+#   \\  /    A nd           | Web:      www.OpenFOAM.com                      #
 #    \\/     M anipulation  |                                                 #
 #-----------------------------------------------------------------------------#
 cd ${0%/*} || exit 1    # Run from this directory
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/blockMeshDict
index c6a29977b7..96e2a01e2e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
index b7b5130a7e..f7902f5fef 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/controlDict
index 9c80274228..2c9ac3d157 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict
index 41474f0503..42d4356017 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict
index 6cfa8d6cb0..941ed8b162 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
index db567d0710..60a1eb9a10 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
index 94c21573c2..9392805fda 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict
index 57fd283dde..3ac3cd8df8 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
index 41474f0503..42d4356017 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes
index e82818faae..183876a302 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
index 746ca95536..62767ba3ac 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/H2O
index ea0e30e66c..2d90f452cd 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/N2
index 65a955d3a7..3d8a7b367e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/N2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/O2
index 92642b8878..deb3fe0815 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/O2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/T
index 9ecdd0329b..7e13456ed5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U
index ba15e86721..7ddcf319b9 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p
index 67a9bd96ca..cdb7e3e085 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
index 7333dfae9b..3f5f18cd3e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Tf
index 79468fe730..a18851705b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf
index 747b11c53f..4645c1211c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/deltaf
index e11d5cae00..3f9de4d2bc 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/additionalControls b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/additionalControls
index 46d11c3a27..cd51e00683 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/additionalControls
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
index 8fbc88a1b3..7fefc6da90 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/combustionProperties
index 87d04695b8..09bad138f9 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat
index 1cff004fd8..2514799c87 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/g b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/parcelInjectionProperties
index 030ab4250f..82b94b726d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/parcelInjectionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/radiationProperties
index 94cc3749b1..33e9ace334 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/reactingCloud1Properties
index f8ded69cfc..75b004c211 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index e2ec8389d8..751fd186e8 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
index 0a37bdeb40..76a0e5dfc1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict
index d1438f1da6..0b76d9ee43 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/polyMesh";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/controlDict
index 5cec7ebc21..0112e6ec43 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/createPatchDict
index cbfab2fa08..625197ef29 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/decomposeParDict
index 4c067a1acb..402a39c58e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict
index c207619060..dfc2fd1c9a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
index 5f39e30362..92e46e2825 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
index be992a7810..4ab8c53463 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet
index 72ed9e455c..25822849b4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion.topoSet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
index c919a481fe..2ad8690d9c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
index 529db4dc28..1482dbb4bf 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
index 445075206e..d25897fb80 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O
index cb57caaa92..dc6d9ef6e6 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2
index ef7ff824ab..7b9af84330 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2
index a9c3ccf847..bfe6e93dec 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T
index 52d3650d61..2e7ba274aa 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U
index d784c2620c..bbc1b46edd 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p
index 14a8277b2c..8d41ed7bb7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
index 840f0d21be..d8d9be7154 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Tf
index b1fa5e3bbf..27907a23e3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Tf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Tf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf
index 3f1e95c9bb..f62ab5eab4 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/Uf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/deltaf
index 2bce6d51f9..ed6be8ec4b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/deltaf
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/wallFilmRegion/deltaf
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/additionalControls b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/additionalControls
index 3c9227fb60..dbbbbf342c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/additionalControls
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/additionalControls
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
index 8fbc88a1b3..7fefc6da90 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/combustionProperties
index 87d04695b8..09bad138f9 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
index 1cff004fd8..2514799c87 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/g b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/parcelInjectionProperties
index 030ab4250f..82b94b726d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/parcelInjectionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/radiationProperties
index 94cc3749b1..33e9ace334 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
index 4221fe44c4..e1fd367c46 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
index 9874aa34ba..95456b8bf0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
index 0a37bdeb40..76a0e5dfc1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict
index 88d4bbb5d5..293b0d23b7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/polyMesh";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/controlDict
index fbc37cc396..455b0df40b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/createPatchDict
index cbfab2fa08..625197ef29 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/decomposeParDict
index 4c067a1acb..402a39c58e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict
index c207619060..dfc2fd1c9a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
index db567d0710..60a1eb9a10 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
index 1933c385ed..8a13c0c887 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet
index 94c4fcb707..db2dbfff6a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion.topoSet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createPatchDict
index c919a481fe..2ad8690d9c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
index 85cb149bf4..aee2b5bcd0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSchemes
index c07603f778..440c34073a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
index 91c65c4206..9f8729b6af 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
index 15dd5eddf1..61f76d6a2a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
index 2fef379ec7..12efa11dc6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
index ca22735630..8e065f3e2c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
index 8b2b2e8b5d..9399b31ea5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
index 95649fdac4..b29ae9dffb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
index fcf963a775..ef1c75615a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
index c235ba3d65..ca32ebfb98 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
index 7c1a3594d0..a289449433 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
index deca9ba60d..4612f1e800 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
index d1620aaeb0..35b2852810 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
index ebdde7591f..146afcc521 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
index bad68a398b..1b778482ec 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/polyMesh/boundary
deleted file mode 100644
index 4ba3243474..0000000000
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/polyMesh/boundary
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    fuel
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7860;
-    }
-    air
-    {
-        type            patch;
-        nFaces          40;
-        startFace       7900;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          200;
-        startFace       7940;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          8000;
-        startFace       8140;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
index 0ebf90015a..5e7fd9533a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
index f8ded69cfc..75b004c211 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index ff00e560b4..c1dd719871 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
index 4c54af61d5..4e8c8b2010 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
index aefe0c27d7..68ff5154b0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict
index 3683ab3388..df1f24f54c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
index ac6e8ac1ea..42347bae3c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
index f96bf8b822..5e86e6c6b7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
index 0b9ca62591..265398d914 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G
index 6fea304048..d7bcfc6ac4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O
index 6cee312c8b..3f98dbc16b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2
index e0b994958a..bf0d8948b8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2
index afd5664eee..0952aa3ac7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T
index 9aa18b3fcb..a2596f8234 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
index 0fb8c0a8ad..c5a8327ac5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat
index edaab89a8b..1374360798 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
index 92a339181e..880df0f381 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
index e81f9772af..492a812fe6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
index 5f9535f881..5e0d4fc671 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p
index ab56d7d4fb..7f7bd7d55f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/G b/tutorials/lagrangian/reactingParcelFoam/filter/0/G
index 6fea304048..d7bcfc6ac4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O
index 6cee312c8b..3f98dbc16b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0/N2
index e0b994958a..bf0d8948b8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0/O2
index afd5664eee..0952aa3ac7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/T b/tutorials/lagrangian/reactingParcelFoam/filter/0/T
index 9aa18b3fcb..a2596f8234 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/U b/tutorials/lagrangian/reactingParcelFoam/filter/0/U
index 0fb8c0a8ad..c5a8327ac5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat
index edaab89a8b..1374360798 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
index 92a339181e..880df0f381 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/k b/tutorials/lagrangian/reactingParcelFoam/filter/0/k
index e81f9772af..492a812fe6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
index 5f9535f881..5e0d4fc671 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/p b/tutorials/lagrangian/reactingParcelFoam/filter/0/p
index ab56d7d4fb..7f7bd7d55f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
index 502724fef5..f88eca29cb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
index 334391590c..1dba25225d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
index 01546fe137..7ef2c2cfc0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,8 +29,8 @@ filter1
 
         DarcyForchheimerCoeffs
         {
-            d   d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
-            f   f [0 -1 0 0 0 0 0] (0 0 0);
+            d   (500000 -1000 -1000);
+            f   (0 0 0);
 
             coordinateSystem
             {
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
index 71671c99dd..ed4480fb5b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index 1c436933ea..2183c4cbf7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
index 6981f2ccb7..9f65b5b4a9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
index dba1fea2c1..01d7b9f944 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
index ec4289e977..754ea7d35a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index a703f9908a..057ca76dd0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
index 2939a395ed..b85961b888 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
index ae16964f93..e3406c3eb2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant/polyMesh";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
index 908f3c60e1..55b1de65a5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
index 51019fc93e..e7a26a9af4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict
index 1caf47dc89..550adf14ff 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
index 448ae93303..722b14611c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
index bc634cf1f9..dfdb7138b3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
index 244dbcbccf..10695bafaf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
index 748dbafce7..c80e1499fa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
index ff1b3927fd..eca73ca4bd 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O
index cda9cf350c..c20b24f4e2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T
index d6b5507ed8..2dc5ad432d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
index aaa843b84c..f42f8b73fa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air
index 2b7eebd8f6..32291aa21c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p
index 11e02431f5..c1a4e828fe 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
index 9dcb7f347e..258f358d6f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
index 334391590c..1dba25225d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
index 0ebf90015a..5e7fd9533a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
index f6dece8399..98e700df9e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index 7e9edb9fa7..207108947b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
index ec4289e977..754ea7d35a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index 8e324f5244..7b6841f051 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties
index de7621bb4a..86fabad2f3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
index 230c2cf876..c66d09352e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict
index e3cab720a5..9b55cd65b7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
index 34498508b2..ca71bad368 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
index 1da4d9837a..46d1fd63f5 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict
index ef28e304b7..8cb6f96dc3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/probesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/H2O
index baa8dd2152..67bb975759 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/T
index df744edb03..9ebb91c508 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
index a403d36428..dee2c9a858 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/air
index 81541afef9..10e47881dc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/alphat
index a608aeed6a..5ed0ccca4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k
index 098b4a6eb0..18966093e4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut
index 41fe074824..3f329d8306 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
index 462084a38f..8dcf7af4aa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/p
index 921f06d7a1..39e19c05d3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
index 502724fef5..f88eca29cb 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
index 334391590c..1dba25225d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index 1c436933ea..2183c4cbf7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
index 3f4219d95e..13a183ddb9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 769807e133..25421cee6a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index 3b8bf27dfe..02997b7a34 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index d12affc2f3..ed0cccbc65 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
index 89a95c3f03..32a96ba915 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
index 47e0eb9f8c..9e14e31883 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
@@ -2,14 +2,13 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version         2.0;
     format          ascii;
-    location        "";
     note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
index 0db2ed9c0c..80d9a67faa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
index 71ab19b7d6..4c03e06e95 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
index 4773926418..8cef169400 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/H2O
index baa8dd2152..67bb975759 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/T
index df744edb03..9ebb91c508 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
index 7f8c434997..773822c731 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/air
index 81541afef9..10e47881dc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/alphat
index a608aeed6a..5ed0ccca4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/k
index 098b4a6eb0..18966093e4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/nut
index 41fe074824..3f329d8306 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/omega
index 462084a38f..8dcf7af4aa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/p
index 921f06d7a1..39e19c05d3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O
index baa8dd2152..67bb975759 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T
index df744edb03..9ebb91c508 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U
index 7f8c434997..773822c731 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air
index 81541afef9..10e47881dc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat
index a608aeed6a..5ed0ccca4a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k
index 098b4a6eb0..18966093e4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut
index 41fe074824..3f329d8306 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega
index 462084a38f..8dcf7af4aa 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p
index 921f06d7a1..39e19c05d3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
index 0fbd9de5dc..452b72a9ff 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
index 5ede7572c3..7f8ae34b52 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index bf4c329856..1f2a4a1a9b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary
deleted file mode 100644
index 74eb1fa772..0000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    back
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          9340;
-        startFace       265900;
-    }
-    front
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          9340;
-        startFace       275240;
-    }
-    inletCentral
-    {
-        type            patch;
-        nFaces          100;
-        startFace       284580;
-    }
-    inletSides
-    {
-        type            patch;
-        nFaces          200;
-        startFace       284680;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          300;
-        startFace       284880;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          9320;
-        startFace       285180;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
index 0ebf90015a..5e7fd9533a 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index b052bcb95f..cd3e589c43 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
index 3b8bf27dfe..02997b7a34 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
index c2a5aa1eb7..e48ab4c658 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties
index 89a95c3f03..32a96ba915 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
index 47e0eb9f8c..9e14e31883 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
@@ -2,14 +2,13 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version         2.0;
     format          ascii;
-    location        "";
     note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
index f9ae462cd4..4e8f02451c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
index ffd25b6fa7..7ee30836e0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
index 99ee73e745..1febc88c64 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/H2O b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/H2O
index baa8dd2152..67bb975759 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/H2O
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/T b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/T
index df744edb03..9ebb91c508 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/T
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U
index 401e7ced02..00e35b1c07 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/air b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/air
index 81541afef9..10e47881dc 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/air
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/alphat b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/alphat
index a608aeed6a..5ed0ccca4a 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/alphat
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k
index 098b4a6eb0..18966093e4 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut
index 41fe074824..3f329d8306 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
index 462084a38f..8dcf7af4aa 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/p b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/p
index 921f06d7a1..39e19c05d3 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/p
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O
index baa8dd2152..67bb975759 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T
index df744edb03..9ebb91c508 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U
index 401e7ced02..00e35b1c07 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air
index 81541afef9..10e47881dc 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat
index a608aeed6a..5ed0ccca4a 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k
index 098b4a6eb0..18966093e4 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut
index 41fe074824..3f329d8306 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
index 462084a38f..8dcf7af4aa 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p
index 921f06d7a1..39e19c05d3 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
index 0fbd9de5dc..452b72a9ff 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
index 5ede7572c3..7f8ae34b52 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index bf4c329856..1f2a4a1a9b 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
index 0ebf90015a..5e7fd9533a 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index b052bcb95f..cd3e589c43 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index 3b8bf27dfe..02997b7a34 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 9b63bc18b3..790c7b1cd4 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
index 87ceaddfd1..f11d6e30cb 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
index 47e0eb9f8c..9e14e31883 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
@@ -2,14 +2,13 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version         2.0;
     format          ascii;
-    location        "";
     note            "Created Wed Jul  1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
     class           dictionary;
     object          blockMeshDict;
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
index 899d68f0a9..3a10ffbb33 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
index 298c772624..6662904e3c 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
index aaf64c1f4e..64c8c87089 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
index 41c2e09290..9137cfc993 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
index b8e040eeb5..7283851e7b 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/T b/tutorials/lagrangian/sprayFoam/aachenBomb/0/T
index b2849112d5..a3c3691cfc 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/T
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
index a5ec83ea2b..345230296b 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
index 6d98e56617..51f63919c7 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat b/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat
index c56c4724ce..0dea325777 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
index c14d3d7e02..f645ef3088 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
index 434499066b..09b34fb920 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
index 455e746345..526ec0dd94 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
index 8366736d08..b7a643ab72 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties
new file mode 100644
index 0000000000..c69c457866
--- /dev/null
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "chemkin";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+".*"
+{
+    transport
+    {
+        As 1.67212e-6;
+        Ts 170.672;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
index 999aba673f..87f6d4455f 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
index f7b1cae9b7..6e52c56a44 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
index 1d67449446..ad79d91646 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
index 94cc3749b1..33e9ace334 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index 9e409bc482..f8f0bee864 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index ebae047d0b..49a499aeb0 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -27,8 +27,8 @@ thermoType
 }
 
 CHEMKINFile     "$FOAM_CASE/chemkin/chem.inp";
-
 CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
+CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
 
 newFormat       yes;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
index 017f5dba9f..ee2b79b17e 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
index a965562bc9..822baede79 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
index 7c512bc41b..02050053c0 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
index c9db21c07d..f014547fad 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
index 3c6aa13b4f..2137ee290f 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
similarity index 95%
rename from tutorials/mesh/foamyHexMesh/blob/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict
rename to tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
index a0d9e31895..2069492ac0 100644
--- a/tutorials/mesh/foamyHexMesh/blob/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict
index ab04a5be77..6b0ded5d04 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/collapseDict b/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
index 4ab55ec7bf..7b76109771 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/controlDict b/tutorials/mesh/foamyHexMesh/blob/system/controlDict
index 56534bc1d5..bedbb93922 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
index ab04a5be77..6b0ded5d04 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
index 5f399eb98a..9e7d06c265 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes b/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/blob/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
index 740eb61a4b..39c45aff34 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/blob/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
index 43213b09f1..3460ffce02 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
index 4ff7febbcd..89f4868fd2 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
index f58b038ef4..bc88979e22 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict
similarity index 95%
rename from tutorials/mesh/foamyHexMesh/flange/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict
rename to tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict
index 81d15816e3..b9f80e1c53 100644
--- a/tutorials/mesh/foamyHexMesh/flange/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict
index 4e7dd85a1c..4134c2ddaa 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/collapseDict b/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
index 4ab55ec7bf..7b76109771 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/controlDict b/tutorials/mesh/foamyHexMesh/flange/system/controlDict
index 658047bdf8..cd48a48d73 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
index 4e7dd85a1c..4134c2ddaa 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict b/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
index 68666ebc86..701cd8fea7 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/faceSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
index 5b3c0ba8a3..dbfdd57e39 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes b/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
index e23e380164..eb12ee51a3 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/flange/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
index 6368c12298..003764a186 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/flange/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry b/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry
index 0190b2bb88..e9a6175601 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry
+++ b/tutorials/mesh/foamyHexMesh/flange/system/meshDict.geometry
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
index 93dac79886..7674410722 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict
index 7a62de3ec9..264df11e9b 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
index 03ae10303e..b5fbbec638 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
index 2b15837788..f5fe246e03 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/U b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/U
index b04e46ac47..a1ea5a698b 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/U
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/alpha.phase1 b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/alpha.phase1
index a4f5aa39cb..6f4d174602 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/alpha.phase1
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/alpha.phase1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/epsilon b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/epsilon
index 8bfd1f4bec..1a0191f48a 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/epsilon
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/k b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/k
index f421a4da3e..4d08a7473b 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/k
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/nut b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/nut
index 1f482c86c6..93c68870e9 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/nut
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/p_rgh b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/p_rgh
index 6742c65233..5ce8456bf2 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/p_rgh
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
index 9800c48df4..b4b9ae6861 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
index a1b5e037da..ed25238aa3 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
index d7309cb888..e8cd4446bc 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict
similarity index 95%
rename from tutorials/mesh/foamyHexMesh/mixerVessel/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict
rename to tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict
index a5a61e691f..179b5763c7 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/backgroundMeshDecomposition/polyMesh/blockMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
index 0389a33b5a..70e80bd6cf 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces
index 5977e0ee8b..9e0235f7cd 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.collapseFaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces
index 0389a33b5a..70e80bd6cf 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/collapseDict.indirectPatchFaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict
index db3a70619f..80a64bb465 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow
index d4de12484a..e66a9ff193 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.flow
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh
index db3a70619f..80a64bb465 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict.mesh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict
index b2dd8749d7..7dd48273d2 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict
index 5aafd9aa4e..f0af03ebb0 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict
index c4c78689f9..ad97897325 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
index 6ffc0dbcea..70a8ce2b6f 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
index 8fa0876f2f..cae73015b1 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
index 407b1f2cc0..e47a599038 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl
index 43243240cc..7468109366 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.cellShapeControl
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces
index 83abcab0d3..8674bcf9ac 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.conformationSurfaces
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
index 1fc8a9163a..99ba531eb4 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshDict.geometry
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
index 358c725ccc..a6b9db570d 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict
index 1cdb64006f..aa1d1d1e60 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
index 72c1479aed..7643354847 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
index be7a782fe3..2955ba4a31 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/collapseDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
index c392e61b82..11d65848fe 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
index 4eea925e0a..60bd6c110a 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
index 7a6ec470ee..a0b9a4e853 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
index 8dabfdac0a..94abb90461 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
index ee51c39034..d76857a5e2 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
index 363fbd4fc1..d896ebdc0c 100644
--- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
+++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T
index be34e9a10d..0bbd360e28 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
index 3b20a7f85e..a9af33776e 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p
index 17ffaefbbc..30215be925 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
index 4f39633071..c593099369 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
index 142d2e116b..f166dde132 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
index c380287785..a5baeec670 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.mesher
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
index 142d2e116b..f166dde132 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/controlDict.rhoCentralFoam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
index 1a0e64aa5c..0e99e3d320 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
index b825f1608b..abf8227930 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/extrude2DMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
index 0e6990e169..bdbb2de407 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
index c2f6d12dbc..87e3211da9 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
index bdde37d65c..6d0d4028ec 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
index d82c88dd2b..11c0f1f773 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
index 97f40d2753..e7ae281dd9 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
index b825f1608b..abf8227930 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/extrude2DMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
index 8cbfb7a94a..7d2c1e6af5 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/foamyQuadMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
index 8ce8c60878..63508ece8a 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
index 7ff6c35a0b..5f7e03e6de 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/controlDict b/tutorials/mesh/foamyQuadMesh/square/system/controlDict
index ccd8cd716a..529703f734 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/controlDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict b/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
index eaf3d62f3a..835693a31d 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/extrude2DMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict b/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
index 2758228922..6c3dc83d2c 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes b/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
index f2b1c3d1e5..1fea5495b5 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
+++ b/tutorials/mesh/foamyQuadMesh/square/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/fvSolution b/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
index 8ce8c60878..63508ece8a 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
+++ b/tutorials/mesh/foamyQuadMesh/square/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
index 6a2e6d3ffe..2238b678c5 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement
index d0bd18b383..90b91e5ba2 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
index 4aaa9e488c..c1c416f802 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
index 91dd751024..2ea2fe8ef8 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
index fedb6ff28a..b6fd6c2b96 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
index e551ed0c7f..d5741d6976 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
index c4ec24ade6..f6300907a4 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
index 72d70d2c25..38acdb51a4 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
index 898ec2420b..75a46ef7be 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -33,7 +33,7 @@ solvers
         relTol          0;
     }
 
-    cellDisplacement
+    "cellDisplacement.*"
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -53,5 +53,8 @@ solvers
     }
 }
 
+PIMPLE
+{}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U b/tutorials/mesh/parallel/cavity/0/U
similarity index 75%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U
rename to tutorials/mesh/parallel/cavity/0/U
index 2d917d036f..64c0bdf47c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/U
+++ b/tutorials/mesh/parallel/cavity/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,30 +20,22 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
+    movingWall
+    {
+        type            fixedValue;
+        value           uniform (1 0 0);
+    }
+
+    fixedWalls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
     frontAndBack
     {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    topAndBottom
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    hot
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    cold
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
+        type            empty;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary b/tutorials/mesh/parallel/cavity/0/p
similarity index 67%
rename from tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
rename to tutorials/mesh/parallel/cavity/0/p
index ef087376e6..e71be28d23 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
+++ b/tutorials/mesh/parallel/cavity/0/p
@@ -2,34 +2,38 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-2
-(
-    sides
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    movingWall
     {
-        type            patch;
-        nFaces          2;
-        startFace       99;
+        type            zeroGradient;
     }
-    empty
+
+    fixedWalls
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
     {
         type            empty;
-        inGroups        1(empty);
-        nFaces          400;
-        startFace       101;
     }
-)
+}
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/Allclean b/tutorials/mesh/parallel/cavity/Allclean
new file mode 100755
index 0000000000..48fe2ebdab
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/Allclean
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+# Restore default dictionaries
+cp system/decomposeParDict-2 system/decomposeParDict
+cp system/controlDict-startTime system/controlDict
+
+cleanCase
+rm -f constant/polyMesh/boundary
+rm -f constant/polyMesh/procAddressing
diff --git a/tutorials/mesh/parallel/cavity/Allrun b/tutorials/mesh/parallel/cavity/Allrun
new file mode 100755
index 0000000000..22412ea287
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/Allrun
@@ -0,0 +1,36 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+
+#cp system/decomposeParDict-2 system/decomposeParDict
+#runApplication decomposePar
+
+# redistributePar to do decomposition
+runParallel redistributePar 2 -decompose
+
+# Bit of renumbering and running
+runParallel -log log.renumberMesh-CuthillMcKee renumberMesh 2 -overwrite
+runParallel -log log.icoFoam-CuthillMcKee icoFoam 2
+
+# Bit of bad renumbering and running
+runParallel -log log.renumberMesh-parallel renumberMesh 2 -overwrite -dict system/renumberMeshDict-random
+runParallel -log log.icoFoam-random icoFoam 2
+
+# Pick up last result
+cp system/controlDict-latestTime system/controlDict
+
+# Redistribute to 5 processors
+runParallel -log log.redistributePar-5 redistributePar 5 -decomposeParDict system/decomposeParDict-5 -cellDist
+
+# Run a bit more
+runParallel -log log.icoFoam-5 icoFoam 5 -decomposeParDict system/decomposeParDict-5
+
+# Reconstruct mesh and results
+runParallel -log log.redistributePar-1 redistributePar 5 -reconstruct -decomposeParDict system/decomposeParDict
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict b/tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..2e5f98c1a5
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/constant/polyMesh/blockMeshDict
@@ -0,0 +1,75 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+vertices
+(
+    (0 0 0)
+    (1 0 0)
+    (1 1 0)
+    (0 1 0)
+    (0 0 0.1)
+    (1 0 0.1)
+    (1 1 0.1)
+    (0 1 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/constant/transportProperties b/tutorials/mesh/parallel/cavity/constant/transportProperties
new file mode 100644
index 0000000000..fb50fc693d
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 0.01;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/controlDict b/tutorials/mesh/parallel/cavity/system/controlDict
new file mode 100644
index 0000000000..8644d48460
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/controlDict
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.5;
+
+deltaT          0.005;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/controlDict-latestTime b/tutorials/mesh/parallel/cavity/system/controlDict-latestTime
new file mode 100644
index 0000000000..d62268c82e
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/controlDict-latestTime
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     icoFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1.0;
+
+deltaT          0.005;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/controlDict-startTime b/tutorials/mesh/parallel/cavity/system/controlDict-startTime
new file mode 100644
index 0000000000..8644d48460
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/controlDict-startTime
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.5;
+
+deltaT          0.005;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/decomposeParDict b/tutorials/mesh/parallel/cavity/system/decomposeParDict
new file mode 100644
index 0000000000..a119e7e4da
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/decomposeParDict
@@ -0,0 +1,143 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  2;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+//- Keep owner and neighbour on same processor for faces in patches:
+//  (makes sense only for cyclic patches)
+//preservePatches (cyclic_half0 cyclic_half1);
+
+//- Keep all of faceSet on a single processor. This puts all cells
+//  connected with a point, edge or face on the same processor.
+//  (just having face connected cells might not guarantee a balanced
+//  decomposition)
+// The processor can be -1 (the decompositionMethod chooses the processor
+// for a good load balance) or explicitly provided (upsets balance).
+//singleProcessorFaceSets ((f0 -1));
+
+
+//- Keep owner and neighbour of baffles on same processor (i.e. keep it
+//  detectable as a baffle). Baffles are two boundary face sharing the
+//  same points.
+//preserveBaffles true;
+
+//- Use the volScalarField named here as a weight for each cell in the
+//  decomposition.  For example, use a particle population field to decompose
+//  for a balanced number of particles in a lagrangian simulation.
+// weightField dsmcRhoNMean;
+
+method          scotch;
+//method          hierarchical;
+// method          simple;
+// method          metis;
+// method          manual;
+// method          multiLevel;
+// method          structured;  // does 2D decomposition of structured mesh
+
+multiLevelCoeffs
+{
+    // Decomposition methods to apply in turn. This is like hierarchical but
+    // fully general - every method can be used at every level.
+
+    level0
+    {
+        numberOfSubdomains  64;
+        //method simple;
+        //simpleCoeffs
+        //{
+        //    n           (2 1 1);
+        //    delta       0.001;
+        //}
+        method scotch;
+    }
+    level1
+    {
+        numberOfSubdomains  4;
+        method scotch;
+    }
+}
+
+// Desired output
+
+simpleCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (1 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+metisCoeffs
+{
+ /*
+    processorWeights
+    (
+        1
+        1
+        1
+        1
+    );
+  */
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+structuredCoeffs
+{
+    // Patches to do 2D decomposition on. Structured mesh only; cells have
+    // to be in 'columns' on top of patches.
+    patches     (movingWall);
+
+    // Method to use on the 2D subset
+    method      scotch;
+}
+
+//// Is the case distributed? Note: command-line argument -roots takes
+//// precedence
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/decomposeParDict-2 b/tutorials/mesh/parallel/cavity/system/decomposeParDict-2
new file mode 100644
index 0000000000..a119e7e4da
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/decomposeParDict-2
@@ -0,0 +1,143 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  2;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+//- Keep owner and neighbour on same processor for faces in patches:
+//  (makes sense only for cyclic patches)
+//preservePatches (cyclic_half0 cyclic_half1);
+
+//- Keep all of faceSet on a single processor. This puts all cells
+//  connected with a point, edge or face on the same processor.
+//  (just having face connected cells might not guarantee a balanced
+//  decomposition)
+// The processor can be -1 (the decompositionMethod chooses the processor
+// for a good load balance) or explicitly provided (upsets balance).
+//singleProcessorFaceSets ((f0 -1));
+
+
+//- Keep owner and neighbour of baffles on same processor (i.e. keep it
+//  detectable as a baffle). Baffles are two boundary face sharing the
+//  same points.
+//preserveBaffles true;
+
+//- Use the volScalarField named here as a weight for each cell in the
+//  decomposition.  For example, use a particle population field to decompose
+//  for a balanced number of particles in a lagrangian simulation.
+// weightField dsmcRhoNMean;
+
+method          scotch;
+//method          hierarchical;
+// method          simple;
+// method          metis;
+// method          manual;
+// method          multiLevel;
+// method          structured;  // does 2D decomposition of structured mesh
+
+multiLevelCoeffs
+{
+    // Decomposition methods to apply in turn. This is like hierarchical but
+    // fully general - every method can be used at every level.
+
+    level0
+    {
+        numberOfSubdomains  64;
+        //method simple;
+        //simpleCoeffs
+        //{
+        //    n           (2 1 1);
+        //    delta       0.001;
+        //}
+        method scotch;
+    }
+    level1
+    {
+        numberOfSubdomains  4;
+        method scotch;
+    }
+}
+
+// Desired output
+
+simpleCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (1 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+metisCoeffs
+{
+ /*
+    processorWeights
+    (
+        1
+        1
+        1
+        1
+    );
+  */
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+structuredCoeffs
+{
+    // Patches to do 2D decomposition on. Structured mesh only; cells have
+    // to be in 'columns' on top of patches.
+    patches     (movingWall);
+
+    // Method to use on the 2D subset
+    method      scotch;
+}
+
+//// Is the case distributed? Note: command-line argument -roots takes
+//// precedence
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/decomposeParDict-5 b/tutorials/mesh/parallel/cavity/system/decomposeParDict-5
new file mode 100644
index 0000000000..539167d298
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/decomposeParDict-5
@@ -0,0 +1,143 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  5;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+//- Keep owner and neighbour on same processor for faces in patches:
+//  (makes sense only for cyclic patches)
+//preservePatches (cyclic_half0 cyclic_half1);
+
+//- Keep all of faceSet on a single processor. This puts all cells
+//  connected with a point, edge or face on the same processor.
+//  (just having face connected cells might not guarantee a balanced
+//  decomposition)
+// The processor can be -1 (the decompositionMethod chooses the processor
+// for a good load balance) or explicitly provided (upsets balance).
+//singleProcessorFaceSets ((f0 -1));
+
+
+//- Keep owner and neighbour of baffles on same processor (i.e. keep it
+//  detectable as a baffle). Baffles are two boundary face sharing the
+//  same points.
+//preserveBaffles true;
+
+//- Use the volScalarField named here as a weight for each cell in the
+//  decomposition.  For example, use a particle population field to decompose
+//  for a balanced number of particles in a lagrangian simulation.
+// weightField dsmcRhoNMean;
+
+method          scotch;
+//method          hierarchical;
+// method          simple;
+// method          metis;
+// method          manual;
+// method          multiLevel;
+// method          structured;  // does 2D decomposition of structured mesh
+
+multiLevelCoeffs
+{
+    // Decomposition methods to apply in turn. This is like hierarchical but
+    // fully general - every method can be used at every level.
+
+    level0
+    {
+        numberOfSubdomains  64;
+        //method simple;
+        //simpleCoeffs
+        //{
+        //    n           (2 1 1);
+        //    delta       0.001;
+        //}
+        method scotch;
+    }
+    level1
+    {
+        numberOfSubdomains  4;
+        method scotch;
+    }
+}
+
+// Desired output
+
+simpleCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (1 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+metisCoeffs
+{
+ /*
+    processorWeights
+    (
+        1
+        1
+        1
+        1
+    );
+  */
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+structuredCoeffs
+{
+    // Patches to do 2D decomposition on. Structured mesh only; cells have
+    // to be in 'columns' on top of patches.
+    patches     (movingWall);
+
+    // Method to use on the 2D subset
+    method      scotch;
+}
+
+//// Is the case distributed? Note: command-line argument -roots takes
+//// precedence
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes b/tutorials/mesh/parallel/cavity/system/fvSchemes
similarity index 67%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes
rename to tutorials/mesh/parallel/cavity/system/fvSchemes
index 0b96d46074..defd28a4f4 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSchemes
+++ b/tutorials/mesh/parallel/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,31 +10,26 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
-    default steadyState;
+    default         Euler;
 }
 
 gradSchemes
 {
     default         Gauss linear;
+    grad(p)         Gauss linear;
 }
 
 divSchemes
 {
     default         none;
-
-    div(phi,U)      bounded Gauss limitedLinear 0.2;
-    div(phi,K)      bounded Gauss limitedLinear 0.2;
-    div(phi,h)      bounded Gauss limitedLinear 0.2;
-    div(phi,k)      bounded Gauss limitedLinear 0.2;
-    div(phi,epsilon) bounded Gauss limitedLinear 0.2;
-    div(phi,omega) bounded Gauss limitedLinear 0.2;
-    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(phi,U)      Gauss linear;
 }
 
 laplacianSchemes
@@ -52,10 +47,5 @@ snGradSchemes
     default         orthogonal;
 }
 
-wallDist
-{
-    method meshWave;
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/fvSolution b/tutorials/mesh/parallel/cavity/system/fvSolution
new file mode 100644
index 0000000000..40f946159b
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/fvSolution
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random b/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random
new file mode 100644
index 0000000000..cfbe17241a
--- /dev/null
+++ b/tutorials/mesh/parallel/cavity/system/renumberMeshDict-random
@@ -0,0 +1,112 @@
+/*--------------------------------*- 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;
+    note        "mesh renumbering dictionary";
+    object      renumberMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Write maps from renumbered back to original mesh
+writeMaps true;
+
+// Optional entry: sort cells on coupled boundaries to last for use with
+// e.g. nonBlockingGaussSeidel.
+sortCoupledFaceCells false;
+
+// Optional entry: renumber on a block-by-block basis. It uses a
+// blockCoeffs dictionary to construct a decompositionMethod to do
+// a block subdivision) and then applies the renumberMethod to each
+// block in turn. This can be used in large cases to keep the blocks
+// fitting in cache with all the the cache misses bunched at the end.
+// This number is the approximate size of the blocks - this gets converted
+// to a number of blocks that is the input to the decomposition method.
+//blockSize 1000;
+
+// Optional entry: sort points into internal and boundary points
+//orderPoints false;
+
+// Optional: suppress renumbering cellSets,faceSets,pointSets
+//renumberSets false;
+
+
+//method          CuthillMcKee;
+//method          Sloan;
+//method          manual;
+method          random;
+//method          structured;
+//method          spring;
+//method          zoltan;             // only if compiled with zoltan support
+
+//CuthillMcKeeCoeffs
+//{
+//    // Reverse CuthillMcKee (RCM) or plain
+//    reverse true;
+//}
+
+manualCoeffs
+{
+    // In system directory: new-to-original (i.e. order) labelIOList
+    dataFile "cellMap";
+}
+
+
+// For extruded (i.e. structured in one direction) meshes
+structuredCoeffs
+{
+    // Patches that mesh was extruded from. These determine the starting
+    // layer of cells
+    patches (movingWall);
+    // Method to renumber the starting layer of cells
+    method  random;
+
+    // Renumber in columns (depthFirst) or in layers
+    depthFirst true;
+
+    // Reverse ordering
+    reverse false;
+}
+
+
+springCoeffs
+{
+    // Maximum jump of cell indices. Is fraction of number of cells
+    maxCo 0.01;
+
+    // Limit the amount of movement; the fraction maxCo gets decreased
+    // with every iteration
+    freezeFraction 0.999;
+
+    // Maximum number of iterations
+    maxIter 1000;
+}
+
+
+blockCoeffs
+{
+    method          scotch;
+    //method hierarchical;
+    //hierarchicalCoeffs
+    //{
+    //    n           (1 2 1);
+    //    delta       0.001;
+    //    order       xyz;
+    //}
+}
+
+
+zoltanCoeffs
+{
+    ORDER_METHOD    LOCAL_HSFC;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/0.org/G b/tutorials/mesh/parallel/filter/0.org/G
new file mode 100644
index 0000000000..3ae5fafc79
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/G
@@ -0,0 +1,73 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      G;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 1 0 -3 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivityMode  lookup;
+        emissivity      uniform 1;
+        value           uniform 0;
+        refValue        uniform 0;
+        refGradient     uniform 0;
+        valueFraction   uniform 0;
+    }
+    inlet
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivityMode  lookup;
+        emissivity      uniform 1;
+        value           uniform 0;
+        refValue        uniform 0;
+        refGradient     uniform 0;
+        valueFraction   uniform 0;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary b/tutorials/mesh/parallel/filter/0.org/H2O
similarity index 57%
rename from tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
rename to tutorials/mesh/parallel/filter/0.org/H2O
index ca0bb3a113..9c68b24600 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
+++ b/tutorials/mesh/parallel/filter/0.org/H2O
@@ -2,51 +2,59 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "1";
+    object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
-(
-    top
+dimensions      [ 0 0 0 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
     {
-        type            wall;
-        nFaces          60;
-        startFace       3510;
+        type            zeroGradient;
     }
     inlet
     {
-        type            patch;
-        nFaces          30;
-        startFace       3570;
+        type            fixedValue;
+        value           uniform 0;
     }
     outlet
     {
-        type            patch;
-        nFaces          30;
-        startFace       3600;
+        type            zeroGradient;
     }
-    bottom
+    cycLeft_half0
     {
-        type            symmetryPlane;
-        nFaces          60;
-        startFace       3630;
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
     }
     frontAndBack
     {
         type            empty;
-        nFaces          3600;
-        startFace       3690;
     }
-)
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/T b/tutorials/mesh/parallel/filter/0.org/N2
similarity index 57%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/T
rename to tutorials/mesh/parallel/filter/0.org/N2
index 3bf09662bb..d48b765dd0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/T
+++ b/tutorials/mesh/parallel/filter/0.org/N2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,45 +10,49 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
-    object      T;
+    location    "1";
+    object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 0 1 0 0 0];
+dimensions      [ 0 0 0 0 0 0 0 ];
 
-internalField   uniform 293;
+internalField   uniform 0.79;
 
 boundaryField
 {
+    walls
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.79;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
     frontAndBack
     {
-        type            zeroGradient;
+        type            empty;
     }
-
-    topAndBottom
+    cycLeft_half1
     {
-        type            zeroGradient;
+        type            cyclic;
     }
-
-    hot
+    cycRight_half1
     {
-        type            externalCoupledTemperature;
-        commsDir        "${FOAM_CASE}/comms";
-        fileName        "data";
-        initByExternal  yes;
-        log             true;
-        value           uniform 307.75; // 34.6 degC
-    }
-
-    cold
-    {
-        type            externalCoupledTemperature;
-        commsDir        "${FOAM_CASE}/comms";
-        fileName        "data";
-        initByExternal  yes;
-        log             true;
-        value           uniform 288.15; // 15 degC
+        type            cyclic;
     }
 }
 
diff --git a/tutorials/mesh/parallel/filter/0.org/O2 b/tutorials/mesh/parallel/filter/0.org/O2
new file mode 100644
index 0000000000..5556a9a738
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/O2
@@ -0,0 +1,60 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 0 0 0 0 0 0 ];
+
+internalField   uniform 0.21;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.21;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/0.org/T b/tutorials/mesh/parallel/filter/0.org/T
new file mode 100644
index 0000000000..010027cad1
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/T
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 0 0 1 0 0 0 ];
+
+internalField   uniform 350;
+
+boundaryField
+{
+    walls
+    {
+        type            fixedValue;
+        value           uniform 400;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 350;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/polyMesh/boundary b/tutorials/mesh/parallel/filter/0.org/U
similarity index 54%
rename from tutorials/multiphase/interFoam/laminar/capillaryRise/constant/polyMesh/boundary
rename to tutorials/mesh/parallel/filter/0.org/U
index 4fcdb24111..d76a77ab40 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/polyMesh/boundary
+++ b/tutorials/mesh/parallel/filter/0.org/U
@@ -2,47 +2,60 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volVectorField;
+    location    "1";
+    object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          20;
-        startFace       15580;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          20;
-        startFace       15600;
-    }
+dimensions      [ 0 1 -1 0 0 0 0 ];
+
+internalField   uniform ( 0 0 0 );
+
+boundaryField
+{
     walls
     {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          800;
-        startFace       15620;
+        type            fixedValue;
+        value           uniform ( 0 0 0 );
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform ( 5 0 0 );
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
     }
     frontAndBack
     {
         type            empty;
-        inGroups        1(empty);
-        nFaces          16000;
-        startFace       16420;
     }
-)
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/0.org/alphat b/tutorials/mesh/parallel/filter/0.org/alphat
new file mode 100644
index 0000000000..29c9c1493b
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/alphat
@@ -0,0 +1,62 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 1 -1 -1 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/0.org/epsilon b/tutorials/mesh/parallel/filter/0.org/epsilon
new file mode 100644
index 0000000000..3f9e09b68b
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/epsilon
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -3 0 0 0 0 ];
+
+internalField   uniform 0.0449;
+
+boundaryField
+{
+    walls
+    {
+        type            epsilonWallFunction;
+        value           uniform 0.0449;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.0449;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/0.org/k b/tutorials/mesh/parallel/filter/0.org/k
new file mode 100644
index 0000000000..8facaf6895
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/k
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0.0938;
+
+boundaryField
+{
+    walls
+    {
+        type            kqRWallFunction;
+        value           uniform 0.0938;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.0938;
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut b/tutorials/mesh/parallel/filter/0.org/nut
similarity index 75%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut
rename to tutorials/mesh/parallel/filter/0.org/nut
index bc7b910408..dc921d78eb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/0/nut
+++ b/tutorials/mesh/parallel/filter/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,24 +21,22 @@ internalField   uniform 0;
 
 boundaryField
 {
-    frontAndBack
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    walls
     {
-        type            nutUWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
-    topAndBottom
+    inlet
     {
-        type            nutUWallFunction;
+        type            calculated;
         value           uniform 0;
     }
-    hot
+    outlet
     {
-        type            nutUWallFunction;
-        value           uniform 0;
-    }
-    cold
-    {
-        type            nutUWallFunction;
+        type            calculated;
         value           uniform 0;
     }
 }
diff --git a/tutorials/mesh/parallel/filter/0.org/p b/tutorials/mesh/parallel/filter/0.org/p
new file mode 100644
index 0000000000..b9ea8154ab
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/0.org/p
@@ -0,0 +1,60 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "1";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 1 -1 -2 0 0 0 0 ];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           uniform 100000;
+    }
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/Allclean b/tutorials/mesh/parallel/filter/Allclean
new file mode 100755
index 0000000000..48ffd679aa
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/Allclean
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+# remove 0 directory
+rm -rf 0
+
+# remove post-processing directory
+rm -rf postProcessing
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun
new file mode 100755
index 0000000000..8367f6c36f
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/Allrun
@@ -0,0 +1,33 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+# create mesh
+runApplication blockMesh
+
+# copy 0.org to 0
+cp -r 0.org 0
+
+# create sets
+runApplication topoSet
+
+# create baffles and fields
+runApplication createBaffles -overwrite
+
+runApplication $application
+
+#- redistributePar to do decomposition
+runParallel redistributePar 3 -decompose -cellDist
+
+#- Continue running for a bit more
+runParallel -log log.reactingParcelFoam-par $application 3
+
+#- Reconstruct all times
+runParallel -log log.redistributePar-1 redistributePar 3 -reconstruct
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/parallel/filter/constant/chemistryProperties b/tutorials/mesh/parallel/filter/constant/chemistryProperties
new file mode 100644
index 0000000000..f88eca29cb
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/chemistryProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      chemistryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+chemistryType
+{
+    chemistrySolver   noChemistrySolver;
+    chemistryThermo   rho;
+}
+
+chemistry       off;
+
+initialChemicalTimeStep 1e-07;
+
+EulerImplicitCoeffs
+{
+    cTauChem        0.05;
+    equilibriumRateLimiter off;
+}
+
+odeCoeffs
+{
+    solver          seulex;
+    eps             0.05;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/combustionProperties b/tutorials/mesh/parallel/filter/constant/combustionProperties
new file mode 100644
index 0000000000..1dba25225d
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/combustionProperties
@@ -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;
+    location    "constant";
+    object      combustionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+combustionModel  PaSR<rhoChemistryCombustion>;
+
+active  false;
+
+PaSRCoeffs
+{
+    Cmix                1.0;
+    turbulentReaction   off;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g b/tutorials/mesh/parallel/filter/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
rename to tutorials/mesh/parallel/filter/constant/g
index 508d658494..9dbeee70c8 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
+++ b/tutorials/mesh/parallel/filter/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 0);
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties b/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
new file mode 100644
index 0000000000..ed4480fb5b
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/parcelInjectionProperties
@@ -0,0 +1,26 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      scalarListList;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
+(
+    (0.1 0.32 0.0) (0.5  0.25 0.0) 0.001 1000 0.2 300 4200 (0 1 0) () (1) ()
+    (0.1 0.44 0.0) (0.5  0.10 0.0) 0.001 1000 0.2 300 4200 (0 1 0) () (1) ()
+    (0.1 0.56 0.0) (0.5 -0.10 0.0) 0.001 1000 0.2 300 4200 (0 1 0) () (1) ()
+    (0.1 0.68 0.0) (0.5 -0.25 0.0) 0.001 1000 0.2 300 4200 (0 1 0) () (1) ()
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/particleTrackProperties b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
new file mode 100644
index 0000000000..2183c4cbf7
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      particleTrackProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+cloudName       reactingCloud1;
+
+sampleFrequency 1;
+
+maxPositions    1000000;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict b/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..f96068810e
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/polyMesh/blockMeshDict
@@ -0,0 +1,123 @@
+/*--------------------------------*- 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;
+    location    "constant/polyMesh";
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (0.00  0.25  0)    //  0
+    (1.00  0.25  0)    //  1
+    (1.25  0.00  0)    //  2
+    (2.25  0.00  0)    //  3
+    (2.50  0.25  0)    //  4
+    (4.00  0.25  0)    //  5
+
+    (4.00  0.75  0)    //  6
+    (2.50  0.75  0)    //  7
+    (2.25  1.00  0)    //  8
+    (1.25  1.00  0)    //  9
+    (1.00  0.75  0)    // 10
+    (0.00  0.75  0)    // 11
+
+
+    (0.00  0.25  0.1)  // 12
+    (1.00  0.25  0.1)  // 13
+    (1.25  0.00  0.1)  // 14
+    (2.25  0.00  0.1)  // 15
+    (2.50  0.25  0.1)  // 16
+    (4.00  0.25  0.1)  // 17
+
+    (4.00  0.75  0.1)  // 18
+    (2.50  0.75  0.1)  // 19
+    (2.25  1.00  0.1)  // 20
+    (1.25  1.00  0.1)  // 21
+    (1.00  0.75  0.1)  // 22
+    (0.00  0.75  0.1)  // 23
+);
+
+blocks
+(
+    hex ( 0  1 10 11 12 13 22 23) (20 20 1) simpleGrading (1 1 1)
+    hex ( 1  2  9 10 13 14 21 22) ( 8 20 1) simpleGrading (1 1 1)
+    hex ( 2  3  8  9 14 15 20 21) (20 20 1) simpleGrading (1 1 1)
+    hex ( 3  4  7  8 15 16 19 20) ( 8 20 1) simpleGrading (1 1 1)
+    hex ( 4  5  6  7 16 17 18 19) (30 20 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    walls
+    {
+        type wall;
+        faces
+        (
+            ( 0  1 13 12)
+            ( 1  2 14 13)
+            ( 2  3 15 14)
+            ( 3  4 16 15)
+            ( 4  5 17 16)
+            ( 6  7 19 18)
+            ( 7  8 20 19)
+            ( 8  9 21 20)
+            ( 9 10 22 21)
+            (10 11 23 22)
+        );
+    }
+
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (11  0 12 23)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            ( 5  6 18 17)
+        );
+    }
+
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            ( 0 11 10  1)
+            ( 1 10  9  2)
+            ( 2  9  8  3)
+            ( 3  8  7  4)
+            ( 4  7  6  5)
+            (12 13 22 23)
+            (13 14 21 22)
+            (14 15 20 21)
+            (15 16 19 20)
+            (16 17 18 19)
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/radiationProperties b/tutorials/mesh/parallel/filter/constant/radiationProperties
new file mode 100644
index 0000000000..9f65b5b4a9
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/radiationProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  none;
+
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties b/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
new file mode 100644
index 0000000000..9d9958bde0
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/reactingCloud1Properties
@@ -0,0 +1,188 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      reactingCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solution
+{
+    active          true;
+    coupled         true;
+    transient       yes;
+    cellValueSourceCorrection on;
+    maxCo           0.3;
+
+    sourceTerms
+    {
+        schemes
+        {
+            rho             explicit 1;
+            U               explicit 1;
+            Yi              explicit 1;
+            h               explicit 1;
+            radiation       explicit 1;
+        }
+    }
+
+    interpolationSchemes
+    {
+        rho             cell;
+        U               cellPoint;
+        thermo:mu       cell;
+        T               cell;
+        Cp              cell;
+        kappa           cell;
+        p               cell;
+    }
+
+    integrationSchemes
+    {
+        U               Euler;
+        T               analytical;
+    }
+}
+
+
+constantProperties
+{
+    rho0            1000;
+    T0              300;
+    Cp0             4100;
+
+    constantVolume  false;
+}
+
+
+subModels
+{
+    particleForces
+    {
+        sphereDrag;
+        gravity;
+    }
+
+    injectionModels
+    {
+        model1
+        {
+            type            reactingMultiphaseLookupTableInjection;
+            massTotal       1e-2;
+            parcelBasisType mass;
+            SOI             0.1;
+            inputFile       "parcelInjectionProperties";
+            duration        1.0;
+            parcelsPerSecond 250;
+            randomise       true;
+        }
+    }
+
+    dispersionModel none;
+
+    patchInteractionModel localInteraction;
+
+    heatTransferModel RanzMarshall;
+
+    compositionModel singleMixtureFraction;
+
+    phaseChangeModel liquidEvaporation;
+
+    devolatilisationModel none;
+
+    surfaceReactionModel none;
+
+    stochasticCollisionModel none;
+
+    surfaceFilmModel none;
+
+    radiation       off;
+
+    localInteractionCoeffs
+    {
+        patches
+        (
+            "(walls|cyc.*)"
+            {
+                type        rebound;
+            }
+
+            "inlet|outlet"
+            {
+                type escape;
+            }
+        );
+    }
+
+    RanzMarshallCoeffs
+    {
+        BirdCorrection  true;
+    }
+
+    singleMixtureFractionCoeffs
+    {
+        phases
+        (
+            gas
+            {
+            }
+            liquid
+            {
+                H2O         1;
+            }
+            solid
+            {
+            }
+        );
+        YGasTot0        0;
+        YLiquidTot0     1;
+        YSolidTot0      0;
+    }
+
+    liquidEvaporationCoeffs
+    {
+        enthalpyTransfer enthalpyDifference;
+
+        activeLiquids   ( H2O );
+    }
+}
+
+
+cloudFunctions
+{
+    patchPostProcessing1
+    {
+        type            patchPostProcessing;
+        maxStoredParcels 20;
+        patches
+        (
+            cycLeft_half0
+            cycLeft_half1
+        );
+    }
+
+    facePostProcessing1
+    {
+        type            facePostProcessing;
+        surfaceFormat   vtk;
+        resetOnWrite    no;
+        log             yes;
+
+        faceZones
+        (
+            cycLeft
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/reactions b/tutorials/mesh/parallel/filter/constant/reactions
new file mode 100644
index 0000000000..cdc9995d9e
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/reactions
@@ -0,0 +1,9 @@
+species
+(
+    N2
+    O2
+    H2O
+);
+
+reactions
+{}
diff --git a/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly b/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly
new file mode 100644
index 0000000000..754ea7d35a
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/thermo.incompressiblePoly
@@ -0,0 +1,115 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermo.incompressiblePoly;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+N2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+    }
+}
+
+O2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+    }
+}
+
+H2O
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              -13423000;
+        Sf              10482;
+        CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+    }
+}
+
+air
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.85;
+    }
+    equationOfState
+    {
+        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    }
+    thermodynamics
+    {
+        Hf              0;
+        Sf              0;
+        CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    }
+    transport
+    {
+        muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+        kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
new file mode 100644
index 0000000000..057ca76dd0
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         reactingMixture;
+    transport       polynomial;
+    thermo          hPolynomial;
+    energy          sensibleEnthalpy;
+    equationOfState icoPolynomial;
+    specie          specie;
+}
+
+dpdt no;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/constant/reactions";
+
+foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
+
+liquids
+{
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
+}
+
+solids
+{
+    // none
+}
+
+inertSpecie     N2;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/turbulenceProperties b/tutorials/mesh/parallel/filter/constant/turbulenceProperties
new file mode 100644
index 0000000000..a0c0c19787
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/constant/turbulenceProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- 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      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RAS;
+
+RAS
+{
+    RASModel            kEpsilon;
+
+    turbulence          on;
+
+    printCoeffs         on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/controlDict b/tutorials/mesh/parallel/filter/system/controlDict
new file mode 100644
index 0000000000..2f6847dcc4
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/controlDict
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingParcelFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          nextWrite;
+
+endTime         5;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.4;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  10;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           1.0;
+
+maxDeltaT       1;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/createBafflesDict b/tutorials/mesh/parallel/filter/system/createBafflesDict
new file mode 100644
index 0000000000..550adf14ff
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/createBafflesDict
@@ -0,0 +1,81 @@
+/*--------------------------------*- 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      createBafflesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Whether to convert internal faces only (so leave boundary faces intact).
+// This is only relevant if your face selection type can pick up boundary
+// faces.
+internalFacesOnly true;
+
+// Baffles to create.
+baffles
+{
+    cycLeft
+    {
+        //- Use predefined faceZone to select faces and orientation.
+        type        faceZone;
+        zoneName    cycLeft;
+
+        patches
+        {
+            master
+            {
+                //- Master side patch
+
+                name            cycLeft_half0;
+                type            cyclic;
+                neighbourPatch  cycLeft_half1;
+            }
+            slave
+            {
+                //- Slave side patch
+
+                name            cycLeft_half1;
+                type            cyclic;
+                neighbourPatch  cycLeft_half0;
+            }
+        }
+    }
+
+    cycRight
+    {
+        //- Use predefined faceZone to select faces and orientation.
+        type        faceZone;
+        zoneName    cycRight;
+
+        patches
+        {
+            master
+            {
+                //- Master side patch
+
+                name            cycRight_half0;
+                type            cyclic;
+                neighbourPatch  cycRight_half1;
+            }
+            slave
+            {
+                //- Slave side patch
+
+                name            cycRight_half1;
+                type            cyclic;
+                neighbourPatch  cycRight_half0;
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/decomposeParDict b/tutorials/mesh/parallel/filter/system/decomposeParDict
new file mode 100644
index 0000000000..d800b5a2d1
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/decomposeParDict
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 3;
+
+method          scotch;
+
+preserveFaceZones
+(
+    cycLeft
+    cycRight
+);
+
+simpleCoeffs
+{
+    n               ( 2 2 1 );
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               ( 1 1 1 );
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/fvOptions b/tutorials/mesh/parallel/filter/system/fvOptions
new file mode 100644
index 0000000000..28ad970e43
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/fvOptions
@@ -0,0 +1,124 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+filter1
+{
+    type            explicitPorositySource;
+    active          yes;
+
+    explicitPorositySourceCoeffs
+    {
+        selectionMode   cellZone;
+        cellZone        filter;
+
+        type            DarcyForchheimer;
+
+        DarcyForchheimerCoeffs
+        {
+            d   d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
+            f   f [0 -1 0 0 0 0 0] (0 0 0);
+
+            coordinateSystem
+            {
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1  (1 0 0);
+                    e2  (0 1 0);
+                }
+            }
+        }
+    }
+}
+
+
+massSource1
+{
+    type            scalarSemiImplicitSource;
+    active          yes;
+
+    scalarSemiImplicitSourceCoeffs
+    {
+        timeStart       0.2;
+        duration        2.0;
+        selectionMode   points;
+        points
+        (
+            (2.75 0.5 0)
+        );
+
+        volumeMode      absolute;
+        injectionRateSuSp
+        {
+            rho         (1e-4 0); // kg/s
+            H2O         (1e-4 0); // kg/s
+        }
+    }
+}
+
+
+momentumSource1
+{
+    type            vectorSemiImplicitSource;
+    active          yes;
+
+    vectorSemiImplicitSourceCoeffs
+    {
+        timeStart       0.2;
+        duration        2.0;
+        selectionMode   points;
+        points
+        (
+            (2.75 0.5 0)
+        );
+
+        volumeMode      absolute;
+        injectionRateSuSp
+        {
+            U           ((0 0.005 0) 0);
+        }
+    }
+}
+
+
+energySource1
+{
+    type            scalarSemiImplicitSource;
+    active          yes;
+
+    scalarSemiImplicitSourceCoeffs
+    {
+        timeStart       0.2;
+        duration        2.0;
+        selectionMode   points;
+        points
+        (
+            (2.75 0.5 0)
+        );
+
+        volumeMode      absolute;
+        injectionRateSuSp
+        {
+            h           (10 0);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/fvSchemes b/tutorials/mesh/parallel/filter/system/fvSchemes
new file mode 100644
index 0000000000..dfdb7138b3
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/fvSchemes
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+
+    div(phi,U)      Gauss upwind;
+    div(phid,p)     Gauss upwind;
+    div(phi,K)      Gauss linear;
+    div(phi,h)     Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(U)          Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(phi,Yi_h)   Gauss upwind;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/fvSolution b/tutorials/mesh/parallel/filter/system/fvSolution
new file mode 100644
index 0000000000..1c7dedbf3d
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/fvSolution
@@ -0,0 +1,112 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    "(U|k|epsilon)"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-06;
+        relTol          0.1;
+    }
+
+    "(U|k|epsilon)Final"
+    {
+        $U;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    p
+    {
+        solver          GAMG;
+        tolerance       0;
+        relTol          0.1;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(Yi|O2|N2|H2O)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    h
+    {
+        $Yi;
+        relTol          0.1;
+    }
+
+    hFinal
+    {
+        $Yi;
+    }
+}
+
+PIMPLE
+{
+    transonic       no;
+    nOuterCorrectors 1;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    momentumPredictor yes;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+        ".*Final"       1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/system/topoSetDict b/tutorials/mesh/parallel/filter/system/topoSetDict
new file mode 100644
index 0000000000..5422818434
--- /dev/null
+++ b/tutorials/mesh/parallel/filter/system/topoSetDict
@@ -0,0 +1,157 @@
+/*--------------------------------*- 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      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    // filter
+    {
+        name    filterCells;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (1.5 -10 -10) (2 10 10);
+        }
+    }
+    {
+        name    filter;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set filterCells;
+        }
+    }
+
+
+    {
+        name    leftFluidCells;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-10 -10 -10) (1.5 10 10);
+        }
+    }
+    {
+        name    leftFluid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set leftFluidCells;
+        }
+    }
+    {
+        name    rightFluidCells;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (2 -1 -1) (10 10 10);
+        }
+    }
+    {
+        name    rightFluid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set rightFluidCells;
+        }
+    }
+
+
+    // cycLeft
+    {
+        name    cycLeftFaces;
+        type    faceSet;
+        action  new;
+        source  cellToFace;
+        sourceInfo
+        {
+            set     filterCells;
+            option  all;
+        }
+    }
+    {
+        name    cycLeftFaces;
+        type    faceSet;
+        action  subset;
+        source  cellToFace;
+        sourceInfo
+        {
+            set     leftFluidCells;
+            option  all;
+        }
+    }
+    // Create faceZone from cycLeft
+    {
+        name    cycLeft;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        sourceInfo
+        {
+            faceSet cycLeftFaces;    // name of faceSet
+        }
+    }
+
+    // cycRight
+    {
+        name    cycRightFaces;
+        type    faceSet;
+        action  new;
+        source  cellToFace;
+        sourceInfo
+        {
+            set     filterCells;
+            option  all;
+        }
+    }
+    {
+        name    cycRightFaces;
+        type    faceSet;
+        action  subset;
+        source  cellToFace;
+        sourceInfo
+        {
+            set     rightFluidCells;
+            option  all;
+        }
+    }
+    // Create faceZone from cycRight
+    {
+        name    cycRight;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        sourceInfo
+        {
+            faceSet cycRightFaces;   // name of faceSet
+        }
+    }
+
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun
index a035a98d0a..aeac877153 100755
--- a/tutorials/mesh/snappyHexMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/Allrun
@@ -7,6 +7,16 @@ cd ${0%/*} || exit 1    # Run from this directory
     ./Allrun
 )
 
+(
+    cd addLayersToFaceZone || exit
+    ./Allrun
+)
+
+(
+    cd gap_detection || exit
+    ./Allrun
+)
+
 exit 0
 
 # These cases are links to solver test cases and are run when the Allrun
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U
new file mode 100644
index 0000000000..2f44ca187f
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/U
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [m s^-1];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    minX
+    {
+        type            uniformFixedValue;
+        uniformValue    (1 0 0);
+    }
+    maxX
+    {
+        type            zeroGradient;
+    }
+
+    wall
+    {
+        type            uniformFixedValue;
+        uniformValue    (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p
new file mode 100644
index 0000000000..a8612a339f
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/0/p
@@ -0,0 +1,43 @@
+/*--------------------------------*- 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       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [m^2/s^2];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
+    minX
+    {
+        type            zeroGradient;
+    }
+
+    maxX
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    wall
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean
new file mode 100755
index 0000000000..5a47b6aef5
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -f constant/polyMesh/boundary
+
+cleanCase
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun
similarity index 67%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre
rename to tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun
index 0fca0f1d79..8d81745f11 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun.pre
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/Allrun
@@ -4,8 +4,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runApplication blockMesh
-runApplication createExternalCoupledPatchGeometry T
 
+runApplication blockMesh
+
+runApplication topoSet
+
+runApplication snappyHexMesh -overwrite
+
+runApplication checkMesh
+
+runApplication simpleFoam
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict
similarity index 65%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict
rename to tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict
index 5f2f1e8fd2..5e2eea9566 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/polyMesh/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -18,62 +18,66 @@ convertToMeters 0.001;
 
 vertices
 (
-    ( 0     0  -260)
-    (76     0  -260)
-    (76  2180  -260)
-    ( 0  2180  -260)
-    ( 0     0   260)
-    (76     0   260)
-    (76  2180   260)
-    ( 0  2180   260)
+    ( 0 0 0)
+    (10 0 0)
+    (10 6 0)
+    ( 0 6 0)
+    ( 0 0 1)
+    (10 0 1)
+    (10 6 1)
+    ( 0 6 1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (20 12 1) simpleGrading (1 1 1)
 );
 
 edges
 (
 );
 
-blocks
-(
-    hex (0 1 2 3 4 5 6 7) (35 150 15) simpleGrading (1 1 1)
-);
-
 boundary
 (
+    maxY
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    minY
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
     frontAndBack
     {
-        type wall;
-        faces
-        (
-            (0 1 5 4)
-            (2 3 7 6)
-        );
-    }
-
-    topAndBottom
-    {
-        type wall;
+        type empty;
         faces
         (
+            (0 3 2 1)
             (4 5 6 7)
-            (3 2 1 0)
-        );
-    }
-
-    hot
-    {
-        type wall;
-        faces
-        (
-            (6 5 1 2)
-        );
-    }
-
-    cold
-    {
-        type wall;
-        faces
-        (
-            (4 7 3 0)
         );
     }
 );
@@ -81,3 +85,5 @@ boundary
 mergePatchPairs
 (
 );
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties
new file mode 100644
index 0000000000..ce7acf265a
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/turbulenceProperties b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties
similarity index 89%
rename from tutorials/combustion/chemFoam/nc7h16/constant/turbulenceProperties
rename to tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties
index c2c3b28a1b..9f320def43 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/turbulenceProperties
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -15,7 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  laminar;
-
+simulationType laminar;
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/controlDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict
similarity index 88%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/controlDict
rename to tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict
index 2df20103c1..96e44af25e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     buoyantSimpleFoam;
+application     simpleFoam;
 
 startFrom       startTime;
 
@@ -28,7 +29,7 @@ deltaT          1;
 
 writeControl    timeStep;
 
-writeInterval   10;
+writeInterval   20;
 
 purgeWrite      0;
 
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict
new file mode 100644
index 0000000000..a119e7e4da
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/decomposeParDict
@@ -0,0 +1,143 @@
+/*--------------------------------*- 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;
+    note        "mesh decomposition control dictionary";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  2;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+//- Keep owner and neighbour on same processor for faces in patches:
+//  (makes sense only for cyclic patches)
+//preservePatches (cyclic_half0 cyclic_half1);
+
+//- Keep all of faceSet on a single processor. This puts all cells
+//  connected with a point, edge or face on the same processor.
+//  (just having face connected cells might not guarantee a balanced
+//  decomposition)
+// The processor can be -1 (the decompositionMethod chooses the processor
+// for a good load balance) or explicitly provided (upsets balance).
+//singleProcessorFaceSets ((f0 -1));
+
+
+//- Keep owner and neighbour of baffles on same processor (i.e. keep it
+//  detectable as a baffle). Baffles are two boundary face sharing the
+//  same points.
+//preserveBaffles true;
+
+//- Use the volScalarField named here as a weight for each cell in the
+//  decomposition.  For example, use a particle population field to decompose
+//  for a balanced number of particles in a lagrangian simulation.
+// weightField dsmcRhoNMean;
+
+method          scotch;
+//method          hierarchical;
+// method          simple;
+// method          metis;
+// method          manual;
+// method          multiLevel;
+// method          structured;  // does 2D decomposition of structured mesh
+
+multiLevelCoeffs
+{
+    // Decomposition methods to apply in turn. This is like hierarchical but
+    // fully general - every method can be used at every level.
+
+    level0
+    {
+        numberOfSubdomains  64;
+        //method simple;
+        //simpleCoeffs
+        //{
+        //    n           (2 1 1);
+        //    delta       0.001;
+        //}
+        method scotch;
+    }
+    level1
+    {
+        numberOfSubdomains  4;
+        method scotch;
+    }
+}
+
+// Desired output
+
+simpleCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (1 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+metisCoeffs
+{
+ /*
+    processorWeights
+    (
+        1
+        1
+        1
+        1
+    );
+  */
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+structuredCoeffs
+{
+    // Patches to do 2D decomposition on. Structured mesh only; cells have
+    // to be in 'columns' on top of patches.
+    patches     (movingWall);
+
+    // Method to use on the 2D subset
+    method      scotch;
+}
+
+//// Is the case distributed? Note: command-line argument -roots takes
+//// precedence
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes
new file mode 100644
index 0000000000..4863528557
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSchemes
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         steadyState;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      bounded Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution
new file mode 100644
index 0000000000..a13cf7e889
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/fvSolution
@@ -0,0 +1,70 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "(p|Phi)"
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+
+SIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+potentialFlow
+{
+    nNonOrthogonalCorrectors 3;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        k               0.7;
+        omega           0.7;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
new file mode 100644
index 0000000000..8095b2eb46
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/meshQualityDict
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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      meshQualityDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include defaults parameters from master dictionary
+#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict
new file mode 100644
index 0000000000..1a79f1da8c
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict
@@ -0,0 +1,316 @@
+/*--------------------------------*- 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      snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh false;
+snap            false;
+addLayers       true;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+geometry
+{};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations refining just a
+    // few cells. This setting will cause refinement to stop if <= minimumRefine
+    // are selected for refinement. Note: it will at least do one iteration
+    // (unless the number of cells to refine is 0)
+    minRefinementCells 0;
+
+    // Allow a certain level of imbalance during refining
+    // (since balancing is quite expensive)
+    // Expressed as fraction of perfect balance (= overall number of cells /
+    // nProcs). 0=balance always.
+    maxLoadUnbalance 0.10;
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 1;
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by explicitly provided
+    // edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    // Specify 'levels' in the same way as the 'distance' mode in the
+    // refinementRegions (see below). The old specification
+    //      level   2;
+    // is equivalent to
+    //      levels  ((0 2));
+
+    features
+    ();
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {}
+
+    // Feature angle:
+    // - used if min and max refinement level of a surface differ
+    // - used if feature snapping (see snapControls below) is used
+    resolveFeatureAngle 30;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   increasing order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {}
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the location(s)InMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    //
+    // There are two different ways of specifying the regions to keep:
+    // 1. a single locationInMesh. All the 'zoned' surfaces are marked as such
+    //    in the refinementSurfaces with the faceZone and cellZone keywords.
+    //
+    // or
+    //
+    // 2. multiple locationsInMesh, with per location the name of the cellZone.
+    //    This uses walking to determine zones and automatically creates
+    //    faceZones on the outside of cellZones.
+
+
+    // Ad 1. Specify a single location and how to treat faces inbetween
+    //       cellZones
+    locationInMesh (5 0.28 0.43);
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces true;
+}
+
+
+// Settings for the snapping.
+snapControls
+{
+    // Number of patch smoothing iterations before finding correspondence
+    // to surface
+    nSmoothPatch 3;
+
+    // Maximum relative distance for points to be attracted by surface.
+    // True distance is this factor times local maximum edge length.
+    // Note: changed(corrected) w.r.t 17x! (17x used 2* tolerance)
+    tolerance 2.0;
+
+    // Number of mesh displacement relaxation iterations.
+    nSolveIter 30;
+
+    // Maximum number of snapping relaxation iterations. Should stop
+    // before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+}
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
+    relativeSizes false;
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.0;
+
+    firstLayerThickness 0.2e-3;
+
+    // Minimum overall thickness of total layers. If for any reason layer
+    // cannot be above minThickness do not add layer.
+    // If relativeSizes this is relative to undistorted size of cell
+    // outside layer..
+    minThickness 0.1e-3;
+
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+        maxY
+        {
+            nSurfaceLayers 2;
+        }
+        minY
+        {
+            nSurfaceLayers 2;
+        }
+        A
+        {
+            nSurfaceLayers 2;
+        }
+        A_slave
+        {
+            nSurfaceLayers 2;
+        }
+    }
+
+    // If points get not extruded do nGrow layers of connected faces that are
+    // also not grown. This helps convergence of the layer addition process
+    // close to features.
+    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
+    nGrow 0;
+
+    // Advanced settings
+
+
+    // Static analysis of starting mesh
+
+        // When not to extrude surface. 0 is flat surface, 90 is when two faces
+        // are perpendicular
+        featureAngle 130;
+
+        // When to merge patch faces. Default is featureAngle
+        //mergePatchFacesAngle 45;
+
+        // Do not extrude around sharp edge if not both faces are extruded.
+        // Default is 0.5*featureAngle. Set to -180 always attempt extrusion
+        layerTerminationAngle -180;
+
+        // Stop layer growth on highly warped cells
+        maxFaceThicknessRatio 0.5;
+
+
+    // Patch displacement
+
+        // Number of smoothing iterations of surface normals
+        nSmoothSurfaceNormals 1;
+
+        // Smooth layer thickness over surface patches
+        nSmoothThickness 10;
+
+
+
+    // Medial axis analysis
+
+        // Angle used to pick up medial axis points
+        // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130
+        // in 17x.
+        minMedialAxisAngle 90;
+
+        // Reduce layer growth where ratio thickness to medial
+        // distance is large
+        maxThicknessToMedialRatio 0.3;
+
+        // Number of smoothing iterations of interior mesh movement direction
+        nSmoothNormals 3;
+
+
+    // Mesh shrinking
+
+        // Optional: at non-patched sides allow mesh to slip if extrusion
+        // direction makes angle larger than slipFeatureAngle. Default is
+        // 0.5*featureAngle.
+        slipFeatureAngle 30;
+
+        // Maximum number of snapping relaxation iterations. Should stop
+        // before upon reaching a correct mesh.
+        nRelaxIter 5;
+
+        // Create buffer region for new layer terminations
+        nBufferCellsNoExtrude 0;
+
+        // Overall max number of layer addition iterations. The mesher will
+        // exit if it reaches this number of iterations; possibly with an
+        // illegal mesh.
+        nLayerIter 50;
+//
+//        // Max number of iterations after which relaxed meshQuality controls
+//        // get used. Up to nRelaxedIter it uses the settings in
+//        // meshQualityControls,
+//        // after nRelaxedIter it uses the values in
+//        // meshQualityControls::relaxed.
+//        nRelaxedIter 20;
+//
+//        // Additional reporting: if there are just a few faces where there
+//        // are mesh errors (after adding the layers) print their face centres.
+//        // This helps in tracking down problematic mesh areas.
+//        //additionalReporting true;
+}
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+meshQualityControls
+{
+    // Specify mesh quality constraints in separate dictionary so can
+    // be reused (e.g. checkMesh -meshQuality)
+    #include "meshQualityDict"
+
+    // Advanced
+
+        // Number of error distribution iterations
+        nSmoothScale 4;
+        // amount to scale back displacement at error points
+        errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1e-6;
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
new file mode 100644
index 0000000000..5b2641526f
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict
@@ -0,0 +1,88 @@
+/*--------------------------------*- 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      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    // FaceZone A
+    {
+        name    leftA;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-100e-3 -100e-3 -100e-3) (2e-3 100e-3 100e-3);
+        }
+    }
+    {
+        name    A;
+        type    faceSet;
+        action  new;
+        source  boxToFace;
+        sourceInfo
+        {
+            box (1.999e-3 -100e-3 -100e-3) (2.001e-3 100e-3 100e-3);
+        }
+    }
+    {
+        name    A;
+        type    faceZoneSet;
+        action  new;
+        source  setsToFaceZone;
+        sourceInfo
+        {
+            faceSet A;      // name of faceSet
+            cellSet leftA;  // name of cellSet of slave side
+        }
+    }
+
+
+    // FaceZone B
+    {
+        name    leftB;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-100e-3 -100e-3 -100e-3) (8e-3 100e-3 100e-3);
+        }
+    }
+    {
+        name    B;
+        type    faceSet;
+        action  new;
+        source  boxToFace;
+        sourceInfo
+        {
+            box (7.999e-3 -100e-3 -100e-3) (8.001e-3 100e-3 100e-3);
+        }
+    }
+    {
+        name    B;
+        type    faceZoneSet;
+        action  new;
+        source  setsToFaceZone;
+        sourceInfo
+        {
+            faceSet B;      // name of faceSet
+            cellSet leftB;  // name of cellSet of slave side
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
index 6686626020..655d5f00a6 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/controlDict b/tutorials/mesh/snappyHexMesh/flange/system/controlDict
index e20d3954ed..24246e48a0 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict
index a0e7d1044c..b2c65df95a 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes b/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes
index 6acef5c539..24372ac127 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/flange/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/fvSolution b/tutorials/mesh/snappyHexMesh/flange/system/fvSolution
index 6db4e1a6ba..058ab20731 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/flange/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
index d06e1d63e2..c9e3f309b7 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
index beffcbc2bc..5b90b40183 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
index 21384ba40c..08d20b94a6 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/Allclean b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean
new file mode 100755
index 0000000000..8bfe3dc5d7
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/Allclean
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+\rm -f constant/polyMesh/boundary > /dev/null 2>&1
+cleanCase
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel b/tutorials/mesh/snappyHexMesh/gap_detection/Allrun
similarity index 69%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
rename to tutorials/mesh/snappyHexMesh/gap_detection/Allrun
index 8c451a124e..c2975fc527 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/Allrun-parallel
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/Allrun
@@ -4,13 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-./Allrun.pre
+runApplication blockMesh
 
 runApplication decomposePar
 
-runParallel $(getApplication) 4 &
-
-./externalSolver
+runParallel snappyHexMesh 8 -overwrite
 
+runApplication reconstructParMesh -constant
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/README.txt b/tutorials/mesh/snappyHexMesh/gap_detection/README.txt
new file mode 100644
index 0000000000..883972db8b
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/README.txt
@@ -0,0 +1,7 @@
+Testcase for automatic gap refinement. The geometry is two nested boxes
+with a single small pipe between them.
+
+- 1 cell initial mesh
+- consistent normal orientation of surface so
+  specify a 'gapMode' to limit refinement only to
+  gaps on the 'outside' of the surface
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..820e6492e9
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/constant/polyMesh/blockMeshDict
@@ -0,0 +1,102 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-400 -100  -400)
+    ( 400 -100  -400)
+    ( 400  700  -400)
+    (-400  700  -400)
+    (-400 -100   400)
+    ( 400 -100   400)
+    ( 400  700   400)
+    (-400  700   400)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (1 1 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    maxY
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+
+    minY
+    {
+        type patch;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    ground
+    {
+        type patch;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+
+    maxZ
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/constant/triSurface/mech_test.obj b/tutorials/mesh/snappyHexMesh/gap_detection/constant/triSurface/mech_test.obj
new file mode 100644
index 0000000000..d078954dc0
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/constant/triSurface/mech_test.obj
@@ -0,0 +1,124 @@
+# Wavefront OBJ file
+# Regions:
+#     0    patch0
+#
+# points    : 40
+# triangles : 76
+#
+v 80 20 -20
+v -80 20 -20
+v 100 0 0
+v -100 0 0
+v 80 20 -280
+v -80 20 -280
+v 80 280 -100
+v -80 280 -100
+v 100 0 -300
+v -100 0 -300
+v 100 300 -120
+v -100 300 -120
+v 80 280 -280
+v -80 280 -280
+v 100 300 -300
+v -100 300 -300
+v 0 445 0
+v 0 445 -20
+v 3.53538 446.464 0
+v -3.53538 446.464 0
+v -3.53538 446.464 -20
+v 3.53538 446.464 -20
+v 5 450 0
+v -5 450 0
+v -5 450 -20
+v 5 450 -20
+v -3.53538 453.536 0
+v 3.53538 453.536 0
+v -3.53538 453.536 -20
+v 3.53538 453.536 -20
+v 0 455 0
+v 0 455 -20
+v 80 580 -20
+v -80 580 -20
+v 80 580 -100
+v -80 580 -100
+v 100 600 0
+v -100 600 0
+v 100 600 -120
+v -100 600 -120
+g patch0
+f 39 37 3
+f 4 3 37
+f 11 39 3
+f 15 11 3
+f 9 15 3
+f 10 9 3
+f 10 3 4
+f 40 37 39
+f 19 4 37
+f 38 37 40
+f 27 37 38
+f 23 19 37
+f 28 23 37
+f 31 28 37
+f 27 31 37
+f 40 39 11
+f 16 11 15
+f 12 11 16
+f 40 11 12
+f 16 15 9
+f 16 9 10
+f 12 10 4
+f 38 12 4
+f 24 38 4
+f 20 24 4
+f 17 20 4
+f 19 17 4
+f 12 16 10
+f 38 40 12
+f 27 38 24
+f 25 24 20
+f 29 27 24
+f 29 24 25
+f 21 20 17
+f 21 25 20
+f 18 17 19
+f 21 17 18
+f 22 19 23
+f 18 19 22
+f 26 23 28
+f 22 23 26
+f 30 28 31
+f 26 28 30
+f 32 31 27
+f 30 31 32
+f 32 27 29
+f 7 5 1
+f 2 1 5
+f 33 7 1
+f 26 33 1
+f 34 1 2
+f 21 1 34
+f 22 26 1
+f 18 22 1
+f 21 18 1
+f 7 13 5
+f 6 5 13
+f 6 2 5
+f 14 13 7
+f 6 13 14
+f 33 35 7
+f 8 7 35
+f 14 7 8
+f 34 35 33
+f 36 35 34
+f 8 35 36
+f 30 34 33
+f 26 30 33
+f 36 34 2
+f 8 36 2
+f 14 8 2
+f 6 14 2
+f 29 25 34
+f 21 34 25
+f 32 29 34
+f 30 32 34
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict
new file mode 100644
index 0000000000..0c8cb07cc8
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/controlDict
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev   s                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     snappyHexMesh;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         2000;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   100;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict
new file mode 100644
index 0000000000..767c82d67c
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/decomposeParDict
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 8;
+
+method          hierarchical;
+
+simpleCoeffs
+{
+    n               ( 4 1 1 );
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               ( 2 2 2 );
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "cellDecomposition";
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes
new file mode 100644
index 0000000000..6219229a0e
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSchemes
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         steadyState;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+
+    div(phi,U)      bounded Gauss upwind;
+    div(phi,T)      bounded Gauss upwind;
+    div(phi,k)      bounded Gauss upwind;
+    div(phi,epsilon) bounded Gauss upwind;
+    div(phi,R)      bounded Gauss upwind;
+    div(R)          Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution
similarity index 66%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution
rename to tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution
index d30cdf20b4..fb8d82159b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -19,39 +19,32 @@ solvers
 {
     p_rgh
     {
-        solver           GAMG;
-        tolerance        1e-7;
-        relTol           0.01;
-
-        smoother         DICGaussSeidel;
-
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-08;
+        relTol          0.01;
     }
 
-    "(U|h|k|epsilon|omega)"
+    "(U|T|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
-        tolerance       1e-8;
+        tolerance       1e-07;
         relTol          0.1;
     }
 }
 
 SIMPLE
 {
-    momentumPredictor yes;
-    nNonOrthogonalCorrectors 0;
+    nNonOrthogonalCorrectors 2;
     pRefCell        0;
     pRefValue       0;
 
     residualControl
     {
         p_rgh           1e-2;
-        U               1e-3;
-        h               1e-3;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
@@ -62,14 +55,13 @@ relaxationFactors
 {
     fields
     {
-        rho             1.0;
         p_rgh           0.7;
     }
     equations
     {
-        U               0.3;
-        h               0.3;
-        "(k|epsilon|omega)" 0.7;
+        U               0.2;
+        T               0.5;
+        "(k|epsilon)"   0.7;
     }
 }
 
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
new file mode 100644
index 0000000000..8095b2eb46
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/meshQualityDict
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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      meshQualityDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include defaults parameters from master dictionary
+#include "$WM_PROJECT_DIR/etc/caseDicts/meshQualityDict"
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict
new file mode 100644
index 0000000000..3aa4550338
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict
@@ -0,0 +1,297 @@
+/*--------------------------------*- 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      snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh true;
+snap            false;
+addLayers       false;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+// Surfaces are used
+// - to specify refinement for any mesh cell intersecting it
+// - to specify refinement for any mesh cell inside/outside/near
+// - to 'snap' the mesh boundary to the surface
+geometry
+{
+    mech_test.obj
+    {
+        type triSurfaceMesh;
+    }
+    all
+    {
+        type searchableBox;
+        min (-1000 -1000 -1000);
+        max (1000 1000 1000);
+    }
+
+};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations refining just a
+    // few cells. This setting will cause refinement to stop if <= minimumRefine
+    // are selected for refinement. Note: it will at least do one iteration
+    // (unless the number of cells to refine is 0)
+    minRefinementCells 0;
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 1;
+
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by its edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    features
+    (
+    );
+
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {
+        mech_test.obj
+        {
+            // Surface-wise min and max refinement level
+            level (0 0);
+        }
+    }
+
+    // Resolve sharp angles
+    resolveFeatureAngle 60;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   descending order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {
+        all
+        {
+            mode        inside;
+
+            // Dummy base level
+            levels      ((10000 0));
+
+            // If cells
+            // - have level 0..9
+            // - and are in a gap < 3 cell sizes across
+            // - with the gap on the inside ('inside'), outside ('outside')
+            //   or both ('mixed') of the surface
+            // refine them
+            gapLevel    (4 0 10);
+            gapMode     outside;
+        }
+    }
+
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the locationInMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    locationInMesh (-100 -5 -300);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces false;
+}
+
+
+
+// Settings for the snapping.
+snapControls
+{
+    //- Number of patch smoothing iterations before finding correspondence
+    //  to surface
+    nSmoothPatch 3;
+
+    //- Relative distance for points to be attracted by surface feature point
+    //  or edge. True distance is this factor times local
+    //  maximum edge length.
+    tolerance 2.0;
+
+    //- Number of mesh displacement relaxation iterations.
+    nSolveIter 30;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+
+    // Feature snapping
+
+        //- Number of feature edge snapping iterations.
+        //  Leave out altogether to disable.
+        nFeatureSnapIter 10;
+
+        //- Detect (geometric) features by sampling the surface (default=false)
+        implicitFeatureSnap true;
+
+        //- Use castellatedMeshControls::features (default = true)
+        explicitFeatureSnap false;
+}
+
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
+    relativeSizes true;
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+    }
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.0;
+
+    // Wanted thickness of final added cell layer. If multiple layers
+    // is the thickness of the layer furthest away from the wall.
+    // Relative to undistorted size of cell outside layer.
+    // is the thickness of the layer furthest away from the wall.
+    // See relativeSizes parameter.
+    finalLayerThickness 0.5;
+
+    // Minimum thickness of cell layer. If for any reason layer
+    // cannot be above minThickness do not add layer.
+    // Relative to undistorted size of cell outside layer.
+    // See relativeSizes parameter.
+    minThickness 0.25;
+
+    // If points get not extruded do nGrow layers of connected faces that are
+    // also not grown. This helps convergence of the layer addition process
+    // close to features.
+    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
+    nGrow 0;
+
+
+    // Advanced settings
+
+    // When not to extrude surface. 0 is flat surface, 90 is when two faces
+    // are perpendicular
+    featureAngle 60;
+
+    // Maximum number of snapping relaxation iterations. Should stop
+    // before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    // Number of smoothing iterations of surface normals
+    nSmoothSurfaceNormals 1;
+
+    // Number of smoothing iterations of interior mesh movement direction
+    nSmoothNormals 3;
+
+    // Smooth layer thickness over surface patches
+    nSmoothThickness 10;
+
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 0.5;
+
+    // Reduce layer growth where ratio thickness to medial
+    // distance is large
+    maxThicknessToMedialRatio 0.3;
+
+    // Angle used to pick up medial axis points
+    // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x.
+    minMedianAxisAngle 90;
+
+    // Create buffer region for new layer terminations
+    nBufferCellsNoExtrude 0;
+
+
+    // Overall max number of layer addition iterations. The mesher will exit
+    // if it reaches this number of iterations; possibly with an illegal
+    // mesh.
+    nLayerIter 50;
+}
+
+
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+meshQualityControls
+{
+    #include "meshQualityDict"
+
+    // Advanced
+
+    //- Number of error distribution iterations
+    nSmoothScale 4;
+    //- amount to scale back displacement at error points
+    errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1e-6;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
index f910c08cd5..88ccafa82e 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
index 0adb2cfd3a..9277901a31 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
index 25ca30f1e1..d269638688 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
index f56907e7b4..e43447e010 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
index 22afb75d57..1cb43a54f1 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
index 799ce286c8..b735aa8e94 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
index 69abb4a4ba..0eca12b8a9 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
index 2891ba9e2c..08323dca73 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
index ec7ce02462..ac5d08b1db 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict
index 2c82215f5b..7f8eaeaf2d 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 4507e794d2..8c8b3bbbbf 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
index a864d386d8..187fe81834 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
index ca2022df7b..080a5c3fc0 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
index ebf214d53d..c0ee755895 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
index bf26e5fea2..26a7d17f9c 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
index 36c6a57d8f..ada32184c9 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
index e5baac2df7..e06e313e63 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
index 5321455943..b5d215afb3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
index 40cd251c1c..3a94c2980a 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
index 9df6a831bf..71ca2a0a75 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut
index f85002726d..b814109650 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
index a85f4b9d0d..a4fdfc0044 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
index ae5f186cb5..f7e1d05856 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
index 69abb4a4ba..0eca12b8a9 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
index af76643fd0..53c154a6d2 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
index ec7ce02462..ac5d08b1db 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict
index c61c1bad40..f0fd856199 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index f6f1aa2f31..696fc2fb15 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
index 2b89341a0b..9c7f123e6b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
index 7e1a541e0a..68287fe32b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
index 3268609ce9..a9c7d7a917 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
index 4e4114d4cb..5860174d7e 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
index bf26e5fea2..26a7d17f9c 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
index 36c6a57d8f..ada32184c9 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
index e5baac2df7..e06e313e63 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
index f910c08cd5..88ccafa82e 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
index 0adb2cfd3a..9277901a31 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
index 25ca30f1e1..d269638688 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
index 7faa6b9abb..bea66f50db 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
index 17b398f9c3..ec924e6502 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
index 22afb75d57..1cb43a54f1 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
index 799ce286c8..b735aa8e94 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
index ff3b881184..fce74a801f 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
index af76643fd0..53c154a6d2 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
index 02fa2df1b9..9cf0f7ebd0 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict
index 2c82215f5b..7f8eaeaf2d 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
index bf39b58c86..c13287f7d0 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index 98d90bf940..bcf771df83 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
index d2ebcca130..00058d2e2c 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
index ebf214d53d..c0ee755895 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
index bf26e5fea2..26a7d17f9c 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
index 36c6a57d8f..ada32184c9 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
index e5baac2df7..e06e313e63 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/T b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/T
index 94f61b7825..f0c7817e64 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/T
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/U b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/U
index e18422b1de..dd73de53a5 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/U
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.org b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.org
index 70366ec29f..0a30f6e7e0 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.org
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p
index ca99ff2f92..095bd952c0 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p_rgh
index b4a73cde42..be7e5e68ad 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p_rgh
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
index d02a77dba8..24b77dce7b 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
deleted file mode 100644
index f1bde7bdce..0000000000
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    walls
-    {
-        type            patch;
-        nFaces          148;
-        startFace       2646;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          1360;
-        startFace       2794;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          1360;
-        startFace       4154;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
index eb43806c07..840fb97208 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.air
index e61009c10b..1b3c1ebe20 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.water
index 1ffcbddad7..efa8a3d1ac 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
index f746c06799..1057d7ff03 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
index 8285c3af96..298398efab 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
index a510da92c9..d77a5acc2f 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
index ba82276408..075358d5dc 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution
index f8d6ef8c93..a21b27ef8f 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/setFieldsDict
index 75a2dfccb8..02f00a05b7 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org
index ce47bfaefc..10114086e8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U
index f267a870fc..0c401792c3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
index 6a1b3d978f..d331efbad7 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org
index 1e603613af..523be9c371 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org
index 8bd9793d9a..c6dda0bd1d 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary
deleted file mode 100644
index 85fa84fac7..0000000000
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-2
-(
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          480;
-        startFace       25360;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          25600;
-        startFace       25840;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
index 8506bd51f3..373e55d703 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
index e61009c10b..1b3c1ebe20 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index 1ffcbddad7..efa8a3d1ac 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
index 9ed9a630b5..373cda8359 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
index c1d09089d0..dac9b48484 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
index a8d12117cb..92b50d2cd1 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index 592be355bb..3cf7633495 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
index 87fd237577..7bd6b4abbb 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org
index ce47bfaefc..10114086e8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U
index f267a870fc..0c401792c3 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
index d90b720092..36dd31d38e 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org
index 1e603613af..523be9c371 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org
index 396d380dad..6714301706 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
index 8506bd51f3..373e55d703 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
index e61009c10b..1b3c1ebe20 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
index 1ffcbddad7..efa8a3d1ac 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
index 3a1e12dfd6..8e843b8219 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
index bb61973589..793ed1ee64 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict
index 154b891e74..3da308d405 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
index a8d12117cb..92b50d2cd1 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index fef915a850..359fc987a9 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
index 2103e99c13..48e8188f97 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/T b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/T
index 8041c3700d..9ec8356c03 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/T
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U
index 7ea3a0c323..e0f017a3e0 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air
index be8307fdf2..301f125b76 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury
index d224de9509..af29c86226 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil
index bfcff63aed..e941fa3301 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water
index cf96bb9d9f..8459958350 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alphas b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alphas
index 10e3ea7a07..3571b185b5 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alphas
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p
index 26edbd338c..208b497dae 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
index 16835050d0..dcc34064fe 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
deleted file mode 100644
index 79ef3a79e1..0000000000
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4432;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4482;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          62;
-        startFace       4532;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4594;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4640;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
index 69dc3521df..649f457831 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
index e90070ef13..8783673c4d 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
index 0bcdc33f4c..122979a78d 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
index 91e7adc381..4e90c9960d 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index c2993ed491..bc2f3b7f4f 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index 48b8225422..dc6b83fbf7 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 06dd87a96d..31e6c3403a 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
index b277afb1c5..93677421e9 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
index 0e54934898..2d20dad982 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
index b6d074e64f..74b8ab6347 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/alpha.sludge
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
index 9e0ba7dc7c..c7b58dc92a 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
index 76308a68f9..e63a0a9ab3 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/nut b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/nut
index 797355c5b8..7627ca73c9 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/nut
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
index 81c72d7f7a..80700495c2 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary
deleted file mode 100644
index 18f019f6b4..0000000000
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/polyMesh/boundary
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    inlet
-    {
-        type            patch;
-        nFaces          40;
-        startFace       15760;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          4;
-        startFace       15800;
-    }
-    bottomWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          200;
-        startFace       15804;
-    }
-    endWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          36;
-        startFace       16004;
-    }
-    top
-    {
-        type            patch;
-        nFaces          200;
-        startFace       16040;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          16000;
-        startFace       16240;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
index 6e6819c266..ee1ff5904f 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/turbulenceProperties
index 0f4e4b2f70..d3fed2a156 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict
index 5e07da7098..6989957561 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
index 67e02247c9..af6dca327d 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
index 6f88448cd7..660fd24c05 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
index f646f34de8..b2fc7adbfa 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
index 500a0fbea1..db40c3524b 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
index 9f52927f11..f5d721ff49 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/alpha.sludge
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
index ae75a15a18..fc4b84ac55 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
index 9c6787c56b..07dbee6c2f 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/nut b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/nut
index 3edcd60060..7926f5b250 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/nut
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
index dd48a876bc..ec3ced0749 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/MRFProperties
index 3a308661ec..195dd6e49a 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
index 037e3b47f3..622f53c352 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
index 6e6819c266..ee1ff5904f 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/turbulenceProperties
index 0f4e4b2f70..d3fed2a156 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
index 5f9bee1349..fa0cea59a3 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
index f466df997d..b489a89b78 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
index b137e29faf..64198347f1 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
index c5884201fc..8b089c7a95 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
index da99a43dd3..a0d97fd405 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
index f70c7a430d..b18b915f2e 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/alpha.sludge
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
index 2fd593a4e5..a385ed8f18 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
index 5d2d4217db..9167932900 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/nut b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/nut
index d595464559..fb8e80bfd9 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/nut
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
index 0e6a2c640f..5dabb2ef58 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary
deleted file mode 100644
index 5ccd3d50b0..0000000000
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,160 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    SYMP3
-    {
-        type            patch;
-        startFace       53708;
-        nFaces          3191;
-    }
-
-    INLE1
-    {
-        type            patch;
-        startFace       56899;
-        nFaces          45;
-    }
-
-    OUTL9
-    {
-        type            patch;
-        startFace       56944;
-        nFaces          11;
-    }
-
-    OUTL10
-    {
-        type            patch;
-        startFace       56955;
-        nFaces          11;
-    }
-
-    OUTL11
-    {
-        type            patch;
-        startFace       56966;
-        nFaces          11;
-    }
-
-    OUTL12
-    {
-        type            patch;
-        startFace       56977;
-        nFaces          11;
-    }
-
-    WALL6
-    {
-        type            wall;
-        startFace       56988;
-        nFaces          1474;
-    }
-
-    WALL8
-    {
-        type            wall;
-        startFace       58462;
-        nFaces          1640;
-    }
-
-    WALL61
-    {
-        type            wall;
-        startFace       60102;
-        nFaces          44;
-    }
-
-    WALL62
-    {
-        type            wall;
-        startFace       60146;
-        nFaces          78;
-    }
-
-    WALL63
-    {
-        type            wall;
-        startFace       60224;
-        nFaces          255;
-    }
-
-    WALL64
-    {
-        type            wall;
-        startFace       60479;
-        nFaces          157;
-    }
-
-    WALL65
-    {
-        type            wall;
-        startFace       60636;
-        nFaces          35;
-    }
-
-    WALL66
-    {
-        type            wall;
-        startFace       60671;
-        nFaces          60;
-    }
-
-    WALL67
-    {
-        type            wall;
-        startFace       60731;
-        nFaces          55;
-    }
-
-    WALL68
-    {
-        type            wall;
-        startFace       60786;
-        nFaces          116;
-    }
-
-    WALL69
-    {
-        type            wall;
-        startFace       60902;
-        nFaces          24;
-    }
-
-    WALL7
-    {
-        type            wall;
-        startFace       60926;
-        nFaces          121;
-    }
-
-    WALL70
-    {
-        type            wall;
-        startFace       61047;
-        nFaces          182;
-    }
-
-    OUTL15
-    {
-        type            patch;
-        startFace       61229;
-        nFaces          14;
-    }
-
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
index 32ba3d76e8..ec05525205 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/turbulenceProperties
index 0f4e4b2f70..d3fed2a156 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
index dd41af85ba..7bd2f20731 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
index 7e16ca35fd..3c2fcebb27 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
index 5e1559c673..1bba73f6a7 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U
index 49416151d8..18b5a0b7ec 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water
index 48e62daa04..ff2ea10208 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k
index 651840bed6..ff43a4d9d2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut
index 06c3a53b30..c4ac906d3e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega
index 9edeb123bb..728f715563 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh
index 5d264eace7..a610028b49 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement
index d8cf1d57ce..f4ee802bcb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.org/pointDisplacement
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
index 02088e1075..eac9516c5c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/g b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/g
index a0d7102656..c925386e15 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/hRef b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/hRef
index bda49ba883..ab21e7caee 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/hRef
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/hRef
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
index 7e4c459f6a..37f2dc6c9a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
index 02fa2df1b9..9cf0f7ebd0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict
index 8ac42309c3..22abed42ae 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
index 0af365257e..a331571dda 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
index 59a74ecc06..86042cbe2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution
index 4aaf52f6d2..e526decafb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/meshQualityDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/meshQualityDict
index 46e33cde63..4b59971a44 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/meshQualityDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/refineMeshDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/refineMeshDict
index 0168dd166f..4fd120c194 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/refineMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/setFieldsDict
index c19c3b991d..b35425590a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/snappyHexMeshDict
index 8d3ead9c5c..61811df2af 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/surfaceFeatureExtractDict
index 64ef9b9205..fceb1a3a3f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.1
index 92ecf2d5bf..774f89ff1e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.1
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.2
index 06f0616542..b7368cd931 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.2
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.3
index 04eaa8b97f..9459c41b8f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.3
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.3
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.4
index 23a54c9438..9262f056da 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.4
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.5
index a2e19ca8c1..a8d7380443 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.5
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.5
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.6
index 6af2ed95fb..31bd62ba99 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.6
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/topoSetDict.6
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/U b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/U
index e2088b5e51..812217174f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/U
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
index e0eda6f9eb..ed7d441302 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
index e0eda6f9eb..ed7d441302 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/k b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/k
index 375776f540..e9dd7a3666 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/k
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/nut b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/nut
index 2cb94295f9..f9f1f80182 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/nut
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/omega b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/omega
index ea3112f3d0..603fa1af8f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/omega
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
index e4a0e7e87a..7b7751c84e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
index 7132713ff0..909cdd68a7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
index 577be61a90..8fbd17836b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict
index be900a601a..9b6e15b2db 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
index 17b816689b..46e619773a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
index d8343ef47c..0d0e97e27b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
index 174990b05f..d2bd286f9f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index 5ca78b8588..e51de276c9 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
index 66707d36f1..ed98314496 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict
index 75ff45bc12..0f1602f73e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U
index 3bd47593e0..ad8c802bbf 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
index e09e2739bd..4d826d807a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/epsilon b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/epsilon
index 7f3186509e..30d7b862c3 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/epsilon
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/k b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/k
index b43eb2f5c0..7e9f7b1002 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/k
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/nut b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/nut
index 9d437e9841..cd3c24cc42 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/nut
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
index e24799fc14..8e9baf3ea0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement
index 2b8d06c0fe..df37546dee 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
index 090aa63d16..52ae4663dc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/g b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
deleted file mode 100644
index 5fc0f412aa..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    stationaryWalls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          2800;
-        startFace       33146;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          400;
-        startFace       35946;
-    }
-    floatingObject
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          348;
-        startFace       36346;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
index f746c06799..1057d7ff03 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict
index 2eab354fa4..6ac0a09ac5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
index 6510d78a12..20cd72aafc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
index dcdc623346..b013cdcf57 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
index 591aa1c33f..62b37fe558 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index ae6f2be175..4c8f2c5e9c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
index 2d1e4680ca..1759714bca 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
index 138730aaf0..3fd493dbdf 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/U b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/U
index b04e46ac47..a1ea5a698b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/U
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
index 17678343e2..235004623e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/epsilon b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/epsilon
index 8bfd1f4bec..1a0191f48a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/epsilon
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/k b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/k
index f421a4da3e..4d08a7473b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/k
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/nut b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/nut
index 1f482c86c6..93c68870e9 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/nut
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/p_rgh
index f6bf576d4e..1539e75176 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict
index 9800c48df4..b4b9ae6861 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/g b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
index 35763b23e7..f99a2a8554 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
index d7309cb888..e8cd4446bc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict
index 5ebc3402e1..88c9a68e47 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/controlDict
index 2dd1cf041e..5e98128120 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createBafflesDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createBafflesDict
index 1c6f9f129b..4cf747c2a4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createBafflesDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createPatchDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createPatchDict
index 5aafd9aa4e..f0af03ebb0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createPatchDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/decomposeParDict
index 4642d57884..2a629c2662 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
index 8fa0876f2f..cae73015b1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
index dbb250c1ee..b6b2eb7520 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
index defca08b47..e348a2ba8c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict
index 028374ad1d..3bf6894be4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/surfaceFeatureExtractDict
index 77a3506d27..93d0d5a93c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
index e18422b1de..dd73de53a5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
index 70366ec29f..0a30f6e7e0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
index 66122dcff0..3da28764ab 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
index d02a77dba8..24b77dce7b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
deleted file mode 100644
index f1bde7bdce..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    walls
-    {
-        type            patch;
-        nFaces          148;
-        startFace       2646;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          1360;
-        startFace       2794;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          1360;
-        startFace       4154;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
index e0fdefd56e..40f6d8aa34 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
index 8285c3af96..298398efab 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 7b2b7ad994..53301c522b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
index 2d0ecbd0e1..511f4a723f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index c01eee358d..73a0c5bc89 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
index 75a2dfccb8..02f00a05b7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
index e18422b1de..dd73de53a5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
index 70366ec29f..0a30f6e7e0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
index 66122dcff0..3da28764ab 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/dynamicMeshDict
index 256d87cc3f..6b9c4d29e5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
deleted file mode 100644
index f1bde7bdce..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    walls
-    {
-        type            patch;
-        nFaces          148;
-        startFace       2646;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          1360;
-        startFace       2794;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          1360;
-        startFace       4154;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
index f746c06799..1057d7ff03 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4
index 8285c3af96..298398efab 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index 7420497d78..309652db18 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
index 2d0ecbd0e1..511f4a723f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index c01eee358d..73a0c5bc89 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
index 75a2dfccb8..02f00a05b7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
index 679e9be0fb..0e235a6570 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
index bdebcf1ab4..a33fee4505 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
index 439aab3c29..0cea697c2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/dynamicMeshDict
index d02a77dba8..24b77dce7b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
index e0fdefd56e..40f6d8aa34 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4
index 89b38ecd3d..4a12fbe105 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 108f05ca61..2967cbcef4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
index 2d0ecbd0e1..511f4a723f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index c01eee358d..73a0c5bc89 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
index 75a2dfccb8..02f00a05b7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
index 679e9be0fb..0e235a6570 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
index bdebcf1ab4..a33fee4505 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
index 439aab3c29..0cea697c2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/dynamicMeshDict
index 256d87cc3f..6b9c4d29e5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
index f746c06799..1057d7ff03 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4
index 89b38ecd3d..4a12fbe105 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 52325f532e..a566c51a58 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
index 2d0ecbd0e1..511f4a723f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index c01eee358d..73a0c5bc89 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
index 75a2dfccb8..02f00a05b7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
index 679e9be0fb..0e235a6570 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
index bdebcf1ab4..a33fee4505 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
index 439aab3c29..0cea697c2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
index 64c23c6512..a0aca9f14e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
index e0fdefd56e..40f6d8aa34 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4
index 89b38ecd3d..4a12fbe105 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 52325f532e..a566c51a58 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
index 2d0ecbd0e1..511f4a723f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index c01eee358d..73a0c5bc89 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
index 6ee6144d7b..134522bb3b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
index 679e9be0fb..0e235a6570 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
index bdebcf1ab4..a33fee4505 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
index 439aab3c29..0cea697c2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict
index c6fa67e326..f155926e5e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/g b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/g
index 9a3b78db7e..fdf2676466 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/boundary
deleted file mode 100644
index 833479f837..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/polyMesh/boundary
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-    walls
-    {
-        type            wall;
-        nFaces          1050;
-        startFace       3225;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
index f746c06799..1057d7ff03 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict
index 3e3063cfb6..7f7bbee20c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
index 9d279a2f7e..ff0727279b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
index 62f61b7350..b67df9f38f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
index 2d0ecbd0e1..511f4a723f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index 220b8425ce..962562b5c6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
index e2ad18ae7e..83e5bfacfb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U
index 5eac8e3fb3..d893809162 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
index 67a10a49fd..2a72c4eda6 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh
index e574d0ac74..eb3c4846fc 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
index 62299889c2..760716afd7 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
index 5d55891050..66f8f7df2b 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
index 04d4d94d4d..50ed263e1f 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
index 64536780d0..56dff370d1 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
index 0f2f40daa3..8fa9272bc8 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
index 40102d5cbe..f9025e7f6a 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
index 91bd115659..5425b9cce0 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/U b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
index 7ea3a0c323..e0f017a3e0 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
index b2319f1aa5..3dda27ea7c 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
index cfabea4db1..43ee64fbde 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict
index 0e07920965..8364fdb23a 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
index 577be61a90..8fbd17836b 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
index 77ec4eba87..e62219fc04 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
index 7486a2b3d7..91c2ec3f59 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index fa206f8f19..bf3d822329 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
index 2a577a3c7d..50735d89f5 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U
index 500a0fbea1..db40c3524b 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water.org b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water.org
index e1483e3c1e..415073881a 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/p_rgh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/p_rgh
index dd48a876bc..ec3ced0749 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
index 3a308661ec..195dd6e49a 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
index d182180d95..137232c3b4 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
index 63f9f40e96..5345aedb5b 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
index 59d2b2c2e2..6504daf330 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
index 9b84cf5a12..2238420849 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
index 26571a081c..853639fb64 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
index c5884201fc..8b089c7a95 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
index 8b03633eb9..2cd63e774d 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
index b6b34155c1..03aca9d997 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha.fuel
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
index 948e99914a..733f7d42a0 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
index bbbcc3b281..af92eb8ba0 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
index 7b34de6ad3..8d211346bc 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
index 7590b3df5d..77c48fcee3 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
index d3ee304bc3..2460dc30c7 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
index b0b4dcee0f..97a983fde1 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict
index a0f3c09a37..c830ef2f5d 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
index dac5b966d3..622e6552f7 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
index 54f63c4c27..96cf424e6e 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index 47a4540f6c..20bc48b3cb 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
index e0a00697aa..1ace498805 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
index e2f91c3444..37c5cdd04c 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
index 3befe42034..77f6578085 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/U b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/U
index 36ca5c09f7..9b76648d94 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/U
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/alpha.water b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/alpha.water
index 48e62daa04..ff2ea10208 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/k b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/k
index 651840bed6..ff43a4d9d2 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/k
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/nut b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/nut
index 06c3a53b30..c4ac906d3e 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/nut
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/omega b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/omega
index 9edeb123bb..728f715563 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/omega
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/p_rgh b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/p_rgh
index 5d264eace7..a610028b49 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/pointDisplacement b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/pointDisplacement
index d8cf1d57ce..f4ee802bcb 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.org/pointDisplacement
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.org/pointDisplacement
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/g b/tutorials/multiphase/interFoam/ras/DTCHull/constant/g
index a0d7102656..c925386e15 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/constant/g
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef b/tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef
index bda49ba883..ab21e7caee 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/constant/hRef
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
index 7e4c459f6a..37f2dc6c9a 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties
index 02fa2df1b9..9cf0f7ebd0 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict
index 8ac42309c3..22abed42ae 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
index 8678787a00..ab61ef549b 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes
index 194382fbd4..66c392b731 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution
index d93f832148..90a6f356dd 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict
index 46e33cde63..4b59971a44 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/meshQualityDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict
index 0168dd166f..4fd120c194 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/refineMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict
index c19c3b991d..b35425590a 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict
index 8d3ead9c5c..61811df2af 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict
index 64ef9b9205..fceb1a3a3f 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1
index 92ecf2d5bf..774f89ff1e 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2
index 06f0616542..b7368cd931 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3
index 04eaa8b97f..9459c41b8f 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.3
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4
index 23a54c9438..9262f056da 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5
index a2e19ca8c1..a8d7380443 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.5
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6
index 6af2ed95fb..31bd62ba99 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/topoSetDict.6
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/U b/tutorials/multiphase/interFoam/ras/angledDuct/0/U
index 454300ab0e..d7d5733437 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/U
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/alpha.water b/tutorials/multiphase/interFoam/ras/angledDuct/0/alpha.water
index b3c27f545c..8064add78f 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/epsilon b/tutorials/multiphase/interFoam/ras/angledDuct/0/epsilon
index 8c7abfb78f..269bf417ed 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/epsilon
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/k b/tutorials/multiphase/interFoam/ras/angledDuct/0/k
index acbc36ec25..06c5e568c5 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/k
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/nut b/tutorials/multiphase/interFoam/ras/angledDuct/0/nut
index 4170dde35c..9a78672d52 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/nut
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/0/p_rgh b/tutorials/multiphase/interFoam/ras/angledDuct/0/p_rgh
index 3113411834..500ef9c1dc 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/ras/angledDuct/constant/fvOptions
index 5b222b6937..3f386e96da 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/fvOptions
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -29,8 +29,8 @@ porosity1
 
         DarcyForchheimerCoeffs
         {
-            d   d [0 -2 0 0 0 0 0] (2e8 -1000 -1000);
-            f   f [0 -1 0 0 0 0 0] (0 0 0);
+            d   (2e8 -1000 -1000);
+            f   (0 0 0);
 
             coordinateSystem
             {
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/g b/tutorials/multiphase/interFoam/ras/angledDuct/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/g
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/angledDuct/constant/polyMesh/boundary
deleted file mode 100644
index 7a2d7d0e5e..0000000000
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    front
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       63400;
-    }
-    back
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          700;
-        startFace       64100;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1400;
-        startFace       64800;
-    }
-    porosityWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1600;
-        startFace       66200;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       67800;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          400;
-        startFace       68200;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
index 577be61a90..8fbd17836b 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4 b/tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4
index ce48c80996..9af34cc640 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/ras/angledDuct/system/controlDict
index a856eebf42..9960cd88ac 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
index ede1fafbde..56179c974a 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution
index f33f407fba..5e0fb6a946 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/U b/tutorials/multiphase/interFoam/ras/damBreak/0/U
index 7ea3a0c323..e0f017a3e0 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/U
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
index b2319f1aa5..3dda27ea7c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
index b2319f1aa5..3dda27ea7c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon
index b49a804284..a5f066e69f 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/0/k
index 8fd8f798ff..316df53145 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/k
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda b/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
index e4ce81c278..5de5f0a418 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nut b/tutorials/multiphase/interFoam/ras/damBreak/0/nut
index 0155d00b9b..6348ca1c32 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/nut
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
index cfabea4db1..43ee64fbde 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/g b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
deleted file mode 100644
index 79ef3a79e1..0000000000
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4432;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4482;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          62;
-        startFace       4532;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4594;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4640;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
index 577be61a90..8fbd17836b 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
index b507f78b95..b3a8539606 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
index e85c188cd5..d489502e37 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
index e9177a9ac0..e2b4393589 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
index 2a577a3c7d..50735d89f5 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
index a9f5e35e96..fd37cfce30 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
index e083c1f792..cd913d1337 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
index e083c1f792..cd913d1337 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
index ef8fe11aba..f86821a75a 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k
index dc8fe2b2d0..a1355b6438 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda
index ad8366577c..64028f56f8 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nuTilda
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut
index 53aeee97bf..b4fd0e811e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
index f24e6e1ede..3b6afffc82 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/g b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/g
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary
deleted file mode 100644
index 45396d4074..0000000000
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/polyMesh/boundary
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-7
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4419;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4469;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          62;
-        startFace       4519;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4581;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4627;
-    }
-    porous_half0
-    {
-        type            cyclic;
-        inGroups
-2
-(
-cyclic
-cyclicFaces
-)
-;
-        nFaces          13;
-        startFace       9163;
-        matchTolerance  0.0001;
-        transform       unknown;
-        neighbourPatch  porous_half1;
-    }
-    porous_half1
-    {
-        type            cyclic;
-        inGroups
-2
-(
-cyclic
-cyclicFaces
-)
-;
-        nFaces          13;
-        startFace       9176;
-        matchTolerance  0.0001;
-        transform       unknown;
-        neighbourPatch  porous_half0;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
index 577be61a90..8fbd17836b 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
index 4ffe687151..ab17c2285d 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
index f66e5d7c77..3851563c39 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
index 789f61dbc4..39df9b54d3 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
index e85c188cd5..d489502e37 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
index e9177a9ac0..e2b4393589 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
index 2a577a3c7d..50735d89f5 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
index 991ecb0dbe..25bba8e21d 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/U b/tutorials/multiphase/interFoam/ras/waterChannel/0/U
index 687c94d919..6ee8d65c10 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/U
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
index d5b5bc0ce7..a0b223ab5d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/k b/tutorials/multiphase/interFoam/ras/waterChannel/0/k
index 8025412250..598ab37a3c 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/k
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/nut b/tutorials/multiphase/interFoam/ras/waterChannel/0/nut
index 2498d72cf1..fdfb9cf1e3 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/nut
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/omega b/tutorials/multiphase/interFoam/ras/waterChannel/0/omega
index 1db5db7122..ab977bde5f 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/omega
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/omega
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh b/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
index d2958fafeb..c9f3d224b3 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/g b/tutorials/multiphase/interFoam/ras/waterChannel/constant/g
index a0d7102656..c925386e15 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/g
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
index 4c569fe731..6d8cf0afe2 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
index 02fa2df1b9..9cf0f7ebd0 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict
index ccbeabfc98..c8c5fae1a5 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
index fab971dcef..63f9bc03a7 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
index ffa39b334a..de56f323c6 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1 b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
index 18b6966a15..eb0ff7699d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2 b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
index 8ccc34c694..1f2cfd7114 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
index e16c29b74f..0835804228 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
index f578f5ddaa..e65da4a754 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
index 8b7d29694e..ff99d1c99d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
index 6c087afc7d..ed7f6dea49 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
index 180c83d03e..f0e3aa9ad3 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon
index 7d98d9ac02..74caddcf5d 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions
index 1d05333331..a882991ee5 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k
index 18dafe0a9a..3b38c7a7a6 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut
index 2d6b6f0067..d8395c0036 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh
index 026164723a..d2a012c08a 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
index 577be61a90..8fbd17836b 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict
index cc77285f11..ef05fc580d 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
index 85c6938c48..20d991917a 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
index ce7188c53d..855a6f1c81 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
index 046c25c42c..4600844781 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
index 76fa077e7f..0a6ada30f0 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
index 7ea3a0c323..e0f017a3e0 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.air.org b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.air.org
index 204afda941..b614a5e389 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.air.org
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.org b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.org
index 100d77c102..f6cc49c670 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.org
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.other.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.org b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.org
index 0797dc709d..347727e6ec 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.org
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
index cfabea4db1..43ee64fbde 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/dynamicMeshDict
index 0e07920965..8364fdb23a 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/boundary
deleted file mode 100644
index 1b4dbb60aa..0000000000
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/polyMesh/boundary
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        nFaces          50;
-        startFace       4432;
-    }
-    rightWall
-    {
-        type            wall;
-        nFaces          50;
-        startFace       4482;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          62;
-        startFace       4532;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4594;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4640;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
index 307bc1aba9..94b8aa790a 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
index ae83a18fdf..dd84a8b65c 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
index afd30008e3..60588092a8 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
index a1518045c8..da3e841c4e 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
index 3e8e2ec983..d87e718e8d 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
index 569f1d99df..85dd0ca47e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
index 32c29899e0..3cb74ff538 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon
index 611e624d8e..418e68d29f 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k
index 6b5c178b69..4983c7be3c 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut
index 366352e5f5..cd83676e9a 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/nut
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
index 03d383af53..94e6db3609 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
index e24e6e7821..ddd5a48b38 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/boundary b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/boundary
deleted file mode 100644
index 467e42fe8e..0000000000
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/boundary
+++ /dev/null
@@ -1,89 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-9
-(
-    inlet
-    {
-        type            patch;
-        nFaces          652;
-        startFace       1576984;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          112;
-        startFace       1577636;
-    }
-    outerCylinder
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          640;
-        startFace       1577748;
-    }
-    propellerTip
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          21703;
-        startFace       1578388;
-    }
-    propellerStem1
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       1600091;
-    }
-    propellerStem2
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          576;
-        startFace       1600283;
-    }
-    propellerStem3
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          1536;
-        startFace       1600859;
-    }
-    AMI1
-    {
-        type            cyclicAMI;
-        inGroups        1(cyclicAMI);
-        nFaces          18496;
-        startFace       1602395;
-        matchTolerance  0.0001;
-        transform       noOrdering;
-        neighbourPatch  AMI2;
-    }
-    AMI2
-    {
-        type            cyclicAMI;
-        inGroups        1(cyclicAMI);
-        nFaces          18720;
-        startFace       1620891;
-        matchTolerance  0.0001;
-        transform       noOrdering;
-        neighbourPatch  AMI1;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
index d3523579d4..e94e84a80e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
index cd2daf8229..f604016178 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
index 6aa1d41268..523318f821 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
index 3ff478fa50..293e7985fd 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
index ad10b2e643..d814083a85 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
index d83f0bc7c3..0f4141e74e 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict
index a850f68aef..1edc425c22 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
index 8f55f25eb7..226e348b20 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index 6fbe8482e0..6af72ac7af 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
index a6122210a1..93862d9d66 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict
index 156b5c88c7..adabd3059f 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/Phi b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/Phi
index 83377457b7..2044050353 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/Phi
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/Phi
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U
index 2929f0e586..713411ba4b 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/alpha.water b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/alpha.water
index c08ba3184e..829f82a6d8 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/alpha.water
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/p_rgh
index 1106c436ec..a6ba071779 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
deleted file mode 100644
index 178b615d78..0000000000
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          225;
-        startFace       1129981;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          225;
-        startFace       1130206;
-    }
-    walls
-    {
-        type            symmetry;
-        inGroups        1(symmetry);
-        nFaces          3000;
-        startFace       1130431;
-    }
-    bullet
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          37743;
-        startFace       1133431;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
index e5342b55c6..0ad50c8ea0 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
index b51662ccfd..2b6f650014 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
index a88ee223dc..ae36b1c315 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
index d1a8467089..f6cb2db973 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
index 868aa79f44..ee781462ba 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index e53ce0ba91..36f083ddb1 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 5190eadcd5..a32e6df49a 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air
index f704d27aa3..9ac7e4a775 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water
index d19f29f191..72e6caa64f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air
index 53d6ef460f..c48ddaba16 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org
index f4f9f0cf3b..a0c245dc3d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water
index 92b1a774aa..d1fed0b3d3 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org
index 75a49e4169..45dc23b046 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas
index b32a5dff46..7376584d3c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh
index ade3f71b27..c3b39fb14c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
index 49a895f4e9..ecb897a82e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
index d78ae2fd45..a80d882a0f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
index c861bbec90..5293a3318a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
index 4cb5ca0ad4..71e1e74b7c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
index 10cbadf00d..ab6950ce4b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U
index b82b7ce18a..f835286ef9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air
index abef789c9c..0ec593e547 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury
index c9a998697d..b0a1cf8ba2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil
index 1820dbd6d6..fd34e9217c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water
index 4977c8a6d5..a1f34ea9f8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air
index be8307fdf2..301f125b76 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury
index d224de9509..af29c86226 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil
index bfcff63aed..e941fa3301 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water
index cf96bb9d9f..8459958350 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphas b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphas
index 10e3ea7a07..3571b185b5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphas
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p_rgh
index 22671e295d..90607c8d13 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
index 93e0701984..4290c9fb04 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary
deleted file mode 100644
index 79ef3a79e1..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4432;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4482;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          62;
-        startFace       4532;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4594;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4640;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
index c74003969a..6197e8f180 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
index 5c1d344095..77381be840 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
index bed046cf3a..a5d0e44d9a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
index 831f8a3740..14f5c236d9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
index b277afb1c5..93677421e9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U
index b82b7ce18a..f835286ef9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air
index abef789c9c..0ec593e547 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury
index c9a998697d..b0a1cf8ba2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil
index 1820dbd6d6..fd34e9217c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water
index 4977c8a6d5..a1f34ea9f8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air
index be8307fdf2..301f125b76 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury
index d224de9509..af29c86226 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil
index bfcff63aed..e941fa3301 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water
index cf96bb9d9f..8459958350 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphas b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphas
index 10e3ea7a07..3571b185b5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphas
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p_rgh
index cfabea4db1..43ee64fbde 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
index 93e0701984..4290c9fb04 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary
deleted file mode 100644
index f1ec545053..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          195;
-        startFace       68014;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          195;
-        startFace       68209;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          206;
-        startFace       68404;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          176;
-        startFace       68610;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          68400;
-        startFace       68786;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
index c74003969a..6197e8f180 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
index fd11bf53fd..02d322bc84 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
index 9020d64f8c..3d81789deb 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
index bed046cf3a..a5d0e44d9a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
index 831f8a3740..14f5c236d9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
index b277afb1c5..93677421e9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta
index b18d202df8..19fecae11d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air
index 6c91343655..aa2fb60e81 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury
index 44441b84d8..a91dc8e979 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil
index 9f6f8f999c..7bdca265b8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water
index 65f9af410b..3f2b7cc92a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air
index 9296ad250a..71ef45c94d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury
index 810fc552ab..46ede42b07 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil
index d5d952a648..4278dde70a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water
index 6819da8b79..e4fe4a1482 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas
index ed12f62ed6..9477becd71 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
index 753f6303ef..bf8bff0dc5 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
index d611571ca1..ab2ddb51cf 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p_rgh
index 1e32488272..9b3c467b72 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
index c604aa7e2c..d25c9f545a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
index 41159fe9de..994230c76f 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
index 8036984702..e58948c280 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
index 189a9ea087..9f53d00ec2 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
index bed046cf3a..a5d0e44d9a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
index c454f0e63d..8be72fd310 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U
index 5efde4733d..72a784f6b5 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.air b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.air
index cce3525d7f..418506b199 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.mercury
index c3ab79a67b..eccc2f2657 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.oil b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.oil
index eb5baa112f..e5b269db4d 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.water b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.water
index dc51cfc462..9fd5f639e8 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/p_rgh b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/p_rgh
index c49f3db0d8..c97b663d49 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict
index 6536aa4658..d7fd66ff0f 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/g b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/g
index d182180d95..137232c3b4 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/g
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/polyMesh/boundary
deleted file mode 100644
index 21d8cf43a0..0000000000
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5856;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6048;
-    }
-    AMI1
-    {
-        type            cyclicAMI;
-        inGroups        1(cyclicAMI);
-        nFaces          96;
-        startFace       6240;
-        matchTolerance  0.0001;
-        transform       noOrdering;
-        neighbourPatch  AMI2;
-    }
-    AMI2
-    {
-        type            cyclicAMI;
-        inGroups        1(cyclicAMI);
-        nFaces          96;
-        startFace       6336;
-        matchTolerance  0.0001;
-        transform       noOrdering;
-        neighbourPatch  AMI1;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6432;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9504;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties
index fc103cc620..0a19a61ee9 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
index 61596b70af..3d41cd392b 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/controlDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/controlDict
index 9b6cbc6c4b..37b46c0667 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/decomposeParDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/decomposeParDict
index 8e9095ea0e..b59552df8d 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes
index e71dc816e6..131e2bf753 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSolution b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSolution
index 24baa02add..47e381de06 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/setFieldsDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/setFieldsDict
index 82d9ffc783..d96377ab85 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict
index de7ca6af92..5b10489a73 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
index 7ea3a0c323..e0f017a3e0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air
index be8307fdf2..301f125b76 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury
index d224de9509..af29c86226 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil
index bfcff63aed..e941fa3301 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water
index cf96bb9d9f..8459958350 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphas
index 10e3ea7a07..3571b185b5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
index cfabea4db1..43ee64fbde 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
index 93e0701984..4290c9fb04 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
deleted file mode 100644
index 79ef3a79e1..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4432;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4482;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          62;
-        startFace       4532;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4594;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4640;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
index fc103cc620..0a19a61ee9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
index 11344be6ac..185f8a7e88 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index f802cad2cf..efa8d7b97f 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
index ba7a3e3460..43d0be4502 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index fe2ad08db2..fc792c6fde 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
index b277afb1c5..93677421e9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
index 7ea3a0c323..e0f017a3e0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air
index be8307fdf2..301f125b76 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
index d224de9509..af29c86226 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
index bfcff63aed..e941fa3301 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water
index cf96bb9d9f..8459958350 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphas
index 10e3ea7a07..3571b185b5 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
index cfabea4db1..43ee64fbde 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
index 93e0701984..4290c9fb04 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
deleted file mode 100644
index a477fd3cba..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        nFaces          195;
-        startFace       68014;
-    }
-    rightWall
-    {
-        type            wall;
-        nFaces          195;
-        startFace       68209;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          206;
-        startFace       68404;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          176;
-        startFace       68610;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          68400;
-        startFace       68786;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
index fc103cc620..0a19a61ee9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
index fd11bf53fd..02d322bc84 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
index 793c8a9121..c339694151 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
index 652d42b195..0fb7fc1d8e 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
index ba7a3e3460..43d0be4502 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 17f0b28c01..8df3d6a177 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
index b277afb1c5..93677421e9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
index 500a0fbea1..db40c3524b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air
index 210222182a..c6985d7106 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury
index cbb4647b47..243e316f1c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil
index e8b4d42497..6e48406944 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water
index e1483e3c1e..415073881a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh
index dd48a876bc..ec3ced0749 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
index 500a0fbea1..db40c3524b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air
index a53034d33d..cd659c7e48 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury
index 76002901ed..6ae1080885 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil
index 56d642d0d9..192fa3adeb 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water
index 766d8c1462..4f70f1be45 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh
index dd48a876bc..ec3ced0749 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
index 3a308661ec..195dd6e49a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
index d182180d95..137232c3b4 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
index fc103cc620..0a19a61ee9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
index cb03e19294..3b19956638 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
index afd30008e3..60588092a8 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
index 26a94ec389..6d39aec2b3 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
index 82d9ffc783..d96377ab85 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U
index 9f290533e5..ced9d2d116 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p
index c49ab69780..b33dc83770 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p_gh b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p_gh
index 13da215ea5..c963b74147 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p_gh
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/p_gh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/pointDisplacement b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/pointDisplacement
index da80888f1d..a6a1d35a80 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/pointDisplacement
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.org/pointDisplacement
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
index c82e222658..b5c3fc5582 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/polyMesh/boundary b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/polyMesh/boundary
deleted file mode 100644
index 07baa2866a..0000000000
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/polyMesh/boundary
+++ /dev/null
@@ -1,71 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      binary;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-7
-(
-    freeSurface
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          181;
-        startFace       7429;
-    }
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          20;
-        startFace       7610;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          20;
-        startFace       7630;
-    }
-    bottomWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          200;
-        startFace       7650;
-    }
-    floatingObject
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          18;
-        startFace       7850;
-    }
-    frontAndBack
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          7658;
-        startFace       7868;
-    }
-    floatingObjectBottom
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          19;
-        startFace       15526;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
index 6455cd8dfd..075ff77879 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
index b29df0b1c0..b5ee0d2baa 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index dc617bd777..5b8f8be095 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
index fb68e2287e..a97dd0fc06 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
index 89c658b469..0ff13f5ab8 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
index 9a0ffe9d2d..27875e35dc 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
index 6bcf028ed4..f75424d3f3 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
index 258b21b911..018f1c56fe 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
index 4be67ee364..bf4eebb2c2 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p
index cf1239e637..a261368148 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p_gh b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p_gh
index 944805dcca..67d92b951f 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p_gh
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.org/p_gh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
index 6455cd8dfd..075ff77879 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
index c2c3b28a1b..d0a0998654 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
index 991f37048f..9afeb5966f 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index de8547f454..10bcbcde84 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
index 1435d5120c..710da86bfa 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
index 37bb8eff3a..7fa78e5e4a 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
index 6bcf028ed4..f75424d3f3 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
index 9c0fd4206c..c687cb56b5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
index e592c501d5..c657a1cac0 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water
index 92b1a774aa..d1fed0b3d3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org
index 75a49e4169..45dc23b046 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index d78578a440..dde08affa2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 98192e477f..e9966f70a2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
index c718db4669..ee1c4654ee 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 3560150851..271851949d 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index 06c5db7aee..f8c3b457e1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air
index 328ba98e8d..c7d0d25f51 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury
index 7e5ba636aa..6fe43fa61a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil
index bd22fff2fe..d8ca8ce0e8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water
index 0671cbf1ad..55c9d2c91d 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta
index b18d202df8..19fecae11d 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
index 6c91343655..aa2fb60e81 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
index 44441b84d8..a91dc8e979 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
index 9f6f8f999c..7bdca265b8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
index 65f9af410b..3f2b7cc92a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
index 1b2bf4793d..40c02d9678 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury
index a75393eb38..4f04a049f8 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil
index fe67cfa6ad..fab2d50c97 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water
index 8e47199187..0314c9c124 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p
index 515add92db..1273f3915b 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
index 1e32488272..9b3c467b72 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index c604aa7e2c..d25c9f545a 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 371c656ea3..cdda0a5e02 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
index 864b73f24e..2cb9f159fa 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
index 7c0d16aa90..97e32de5bf 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
index cf1ca5634d..401b717af5 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
index eb2604b78c..876447cdaa 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 8ac877bb69..2ea19fb7a2 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index 4cd730fdd3..195445ebaa 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index a49313e5c0..91c13f541e 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.air
index f704d27aa3..9ac7e4a775 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.water
index 3c62df75d0..768ad6beb0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
index 60979da94f..ff4b3efea5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
index 3ae0a65592..15c5b20244 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air
index ed94c59d53..c0667b6fa1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water
index 1cd27e448b..f3455fa5fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.air
index b4dd763108..355a8835da 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.water
index 3381282f9c..f522004ca0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/k.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
index 475091edaa..94056cb3d3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
index 475091edaa..94056cb3d3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
index de5ac9e437..34f585b9fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index db138464ed..03b40456a2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
index 9311885865..e667b89b6f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
index 9ca26ce033..54ec978c46 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 26877364f2..895e7d2cd6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index 7f00c9e2bc..ac9c2cf5c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
index de1aecacf9..d80fe019b2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.air
index f704d27aa3..9ac7e4a775 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.water
index 3c62df75d0..768ad6beb0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
index 60979da94f..ff4b3efea5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
index 3ae0a65592..15c5b20244 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air
index ee103be57f..3b8dde8bae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water
index cf8ea7bda7..bff009fc56 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm
index a3139ddbc1..da351317c0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.air
index 3b5244d4a3..2876cd2be7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.water
index 7cec6e66d0..aa435074db 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/k.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/km
index f6f89f4167..83272168ac 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/km
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/km
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air
index e3ce09a2cb..c5bbbb881b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water
index 376ed3f794..654723b666 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
index de5ac9e437..34f585b9fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index db138464ed..03b40456a2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
index fe69aba1ea..d39b66bb7d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
index b82e81c0cb..33df5f6f51 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 26877364f2..895e7d2cd6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index f037499679..70bce0e1d9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
index f6f72076f0..3d4837a956 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.gas
index 50dd609bc0..4d5d8f9d2e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.liquid
index 21d6b06a42..6d51bec779 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/AIR.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/CO.gas
index 3241a1ab52..219c366301 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/CO.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/CO.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.gas
index 4c75b36928..725f4dc423 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.liquid
index c7ad1c1c75..f5f19ecf1c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/H2O.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.gas
index 7c14c5ec5f..c38d46b7c7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.liquid
index 6f27c82d32..81443f7610 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/T.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas
index 48fc136a2d..d0833a5210 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid
index b041afd007..b132d0935e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/U.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/Ydefault b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/Ydefault
index cc22bdff91..1c9821ffac 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/Ydefault
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas
index 2d4796c433..1cc50fb0ce 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas.org
index 093bcdab07..4696fb329b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.gas.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid
index 60143dd533..a65ec6204d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid.org
index 4ba98f325e..8b632e35f0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alpha.liquid.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas
index de0de30191..9d64b67e4d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/epsilon.gas
index c85600904b..a0968f1b1b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/epsilon.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/k.gas
index a2a79829f3..77a85921b8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/k.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/nut.gas
index 634a29a38b..9837c5ebda 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/nut.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p
index ce57d66153..9e7ca9d149 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh
index 4b8924f06f..e7c0b32971 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
index 0e9eb6b63b..679601d7de 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
index 94555a9a7b..a8eec67f34 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
index 23358cfec5..4fa632483d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
index a06d0f8ddb..e4bbd9c07a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
index 90073f75ef..1ad1c5035c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
index fc0ab32ee8..aa3c2f1c02 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
index 8a2a00b53a..d4a6d83a5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
index 3414324b79..777321fd53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
index c98c387d4e..84a5101247 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
index 6c75d330b2..647af265ba 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
index a629762aba..b4354cddd7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
index 8afdc29c84..11031f6ba4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.air
index de0ac66f78..c81346a16e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
index 58313dfb2b..b34fc1020d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
index f417c38e3a..7d7c3fa9c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
index a9af55993e..cfd52f9dab 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles
index fa0397ae35..4d47947495 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air
index 288160cdf0..bda738e3fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org
index 6292e5ffc0..6b1738c6e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles
index cf55161b4a..35c2298115 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
index b28a5a97d9..24b7f560f7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
index 60979da94f..ff4b3efea5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
index b047d8d119..515adc6051 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air
index 0b5f62a356..b46c7bc85e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/k.air
index 307a3495c9..6d5b08a389 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air
index dcb65148ae..bc4243363e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles
index 6264a273f7..95275d1e5a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p
index b318305599..ecd66ab696 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh
index 955d523b83..f711cf992d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index 39a5e3d5df..9bf9f99af2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/boundary
deleted file mode 100644
index cda7f49514..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11770;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11800;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          400;
-        startFace       11830;
-    }
-    frontAndBackPlanes
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12000;
-        startFace       12230;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..21f45062dc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
index d702f90d3b..effc65fa12 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 6a26e64e58..d88723a0bc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
index 900f5a585b..95e1975252 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index fbbdb761ca..89b0bc98d4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index caf67c41e8..b770bdf8ab 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index 0965029f85..be351e54c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
index 6b0a740e5c..161a83fac6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas
similarity index 56%
rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/boundary
rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas
index 4564ccc46a..f79b9f93b2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas
@@ -2,47 +2,52 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "5";
+    object      T.gas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-4
-(
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 373.55;
+
+boundaryField
+{
     inlet
     {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
+        type            fixedValue;
+        value           uniform 373.55;
     }
     outlet
     {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
+        type            inletOutlet;
+        phi             phi.gas;
+        inletValue      uniform 373.55;
+        value           uniform 373.55;
     }
-    walls
+    wall1
     {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
+        type            zeroGradient;
+    }
+    wall2
+    {
+        type            copiedFixedValue;
+        sourceFieldName T.liquid;
+        value           uniform 373.55;
     }
     defaultFaces
     {
         type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
     }
-)
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.liquid
similarity index 54%
rename from tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary
rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.liquid
index 4b7a214d35..2e71b18b34 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.liquid
@@ -2,52 +2,54 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "5";
+    object      T.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
-(
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 370;
+
+boundaryField
+{
     inlet
     {
-        type            patch;
-        nFaces          44;
-        startFace       9981;
+        type            fixedValue;
+        value           uniform 370;
     }
     outlet
     {
-        type            patch;
-        nFaces          64;
-        startFace       10025;
+        type            inletOutlet;
+        phi             phi.liquid;
+        inletValue      uniform 370;
+        value           uniform 370;
     }
-    lowerWall
+    wall1
     {
-        type            wall;
-        nFaces          155;
-        startFace       10089;
+        type            zeroGradient;
     }
-    atmosphere
+    wall2
     {
-        type            patch;
-        nFaces          95;
-        startFace       10244;
+        type            fixedMultiPhaseHeatFlux;
+        relax           0.5;
+        q               uniform 100000;
+        phase           "liquid";
+        value           uniform 370;
     }
     defaultFaces
     {
         type            empty;
-        inGroups        1(empty);
-        nFaces          10160;
-        startFace       10339;
     }
-)
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas
new file mode 100644
index 0000000000..2eddfc721b
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.gas
@@ -0,0 +1,1989 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "5";
+    object      U.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   nonuniform List<vector>
+1875
+(
+(-2.07200459e-05 0.798405379 0)
+(-6.16079889e-05 0.901077118 0)
+(-0.000100459607 0.958064777 0)
+(-0.000136061113 0.999098094 0)
+(-0.000167937798 1.03180545 0)
+(-0.000195718176 1.05939051 0)
+(-0.000219145311 1.0833804 0)
+(-0.000238693351 1.10446613 0)
+(-0.000254760555 1.12292773 0)
+(-0.000289321169 1.13511702 0)
+(-0.000356129499 1.13720893 0)
+(-0.00043455057 1.13724099 0)
+(-0.00051260256 1.13724089 0)
+(-0.000591267078 1.13724249 0)
+(-0.000671441851 1.13721196 0)
+(-0.000740385775 1.13512091 0)
+(-0.000776247201 1.12293324 0)
+(-0.000793126098 1.10447489 0)
+(-0.000814089743 1.08339183 0)
+(-0.000839766144 1.05940461 0)
+(-0.00087061186 1.03182252 0)
+(-0.000906260571 0.999118603 0)
+(-0.000951892987 0.958089307 0)
+(-0.00545371801 0.901050215 0)
+(-0.00496443703 0.796967513 0)
+(-1.59927692e-05 0.836006443 0)
+(-4.8237448e-05 0.938677538 0)
+(-8.06008357e-05 0.995664368 0)
+(-0.000112654066 1.03669673 0)
+(-0.000144411391 1.06940302 0)
+(-0.000176010059 1.09698695 0)
+(-0.00020771336 1.12097572 0)
+(-0.000239948238 1.14206068 0)
+(-0.000273196473 1.16052185 0)
+(-0.000308352466 1.1727197 0)
+(-0.00034594518 1.17481678 0)
+(-0.000385286225 1.17484916 0)
+(-0.000425400176 1.17484948 0)
+(-0.000465430703 1.17485183 0)
+(-0.000504503322 1.17482214 0)
+(-0.00054159389 1.17272692 0)
+(-0.000575920589 1.16053155 0)
+(-0.000607916036 1.14207472 0)
+(-0.000638383999 1.12099354 0)
+(-0.00066766836 1.0970085 0)
+(-0.000695991979 1.06942851 0)
+(-0.000723413539 1.03672642 0)
+(-0.000755352851 0.995698457 0)
+(-0.00431068336 0.938646402 0)
+(-0.00392378147 0.833984403 0)
+(-1.63388634e-05 0.83129811 0)
+(-4.93987531e-05 0.933968903 0)
+(-8.2848163e-05 0.990955232 0)
+(-0.000116304626 1.03198709 0)
+(-0.000149786985 1.06469311 0)
+(-0.000183351696 1.09227724 0)
+(-0.000217066716 1.116267 0)
+(-0.000251001991 1.13735412 0)
+(-0.000285143971 1.15581884 0)
+(-0.000319560707 1.16802231 0)
+(-0.000354409443 1.17012433 0)
+(-0.000389617548 1.17015932 0)
+(-0.000424935005 1.17016022 0)
+(-0.000460104732 1.17016119 0)
+(-0.000494864145 1.17012798 0)
+(-0.00052895005 1.16802668 0)
+(-0.000562267409 1.15582425 0)
+(-0.000594944934 1.13736224 0)
+(-0.000627019516 1.11627703 0)
+(-0.00065844434 1.09228877 0)
+(-0.000689258449 1.06470582 0)
+(-0.000719602395 1.03200059 0)
+(-0.000755254769 0.990968857 0)
+(-0.0043387805 0.933949069 0)
+(-0.00395086884 0.830360982 0)
+(-1.63804805e-05 0.831935634 0)
+(-4.95309408e-05 0.934606494 0)
+(-8.30853129e-05 0.991592918 0)
+(-0.000116653677 1.03262493 0)
+(-0.000150233163 1.06533119 0)
+(-0.000183840687 1.09291563 0)
+(-0.000217486879 1.11690579 0)
+(-0.000251175545 1.13799335 0)
+(-0.000284812853 1.15645829 0)
+(-0.000318340403 1.168662 0)
+(-0.00035190634 1.17076436 0)
+(-0.000385588285 1.17079935 0)
+(-0.000419279579 1.17079999 0)
+(-0.000452858757 1.1708004 0)
+(-0.000486203318 1.17076635 0)
+(-0.000519205843 1.16866387 0)
+(-0.000551944017 1.15646032 0)
+(-0.000584565165 1.13799719 0)
+(-0.000617011063 1.11691058 0)
+(-0.000649192207 1.09292097 0)
+(-0.00068112214 1.06533676 0)
+(-0.000712923937 1.03263041 0)
+(-0.000750357403 0.991597789 0)
+(-0.00430455612 0.934572685 0)
+(-0.00391860902 0.831419472 0)
+(-1.63797644e-05 0.832001835 0)
+(-4.95271497e-05 0.934672739 0)
+(-8.30707105e-05 0.991659194 0)
+(-0.000116612268 1.03269126 0)
+(-0.00015013915 1.06539757 0)
+(-0.000183656575 1.09298208 0)
+(-0.000217163048 1.1169723 0)
+(-0.000250650984 1.13805994 0)
+(-0.000283993159 1.15652457 0)
+(-0.000317124716 1.16872828 0)
+(-0.000350252781 1.17083097 0)
+(-0.000383483675 1.17086587 0)
+(-0.000416723232 1.17086628 0)
+(-0.00044989238 1.17086636 0)
+(-0.000482911458 1.17083185 0)
+(-0.000515687547 1.16872848 0)
+(-0.000548331155 1.15652439 0)
+(-0.000581053649 1.13806102 0)
+(-0.000613795419 1.11697382 0)
+(-0.000646437928 1.09298366 0)
+(-0.000678984778 1.06539895 0)
+(-0.000711544071 1.03269216 0)
+(-0.000749832263 0.991659181 0)
+(-0.00430980364 0.934634392 0)
+(-0.00392389766 0.831885787 0)
+(-1.6358385e-05 0.832130287 0)
+(-4.94619094e-05 0.934801223 0)
+(-8.29573326e-05 0.991787679 0)
+(-0.000116442614 1.03281974 0)
+(-0.000149902786 1.06552605 0)
+(-0.000183340974 1.09311054 0)
+(-0.000216752989 1.11710072 0)
+(-0.000250129316 1.13818831 0)
+(-0.000283325451 1.15665234 0)
+(-0.000316282629 1.16885594 0)
+(-0.000349252027 1.17095904 0)
+(-0.000382347586 1.17099386 0)
+(-0.000415468412 1.17099411 0)
+(-0.000448548391 1.170994 0)
+(-0.000481521179 1.17095925 0)
+(-0.000514286513 1.16885514 0)
+(-0.000546961078 1.15665085 0)
+(-0.000579800815 1.13818779 0)
+(-0.000612751585 1.11710036 0)
+(-0.000645674492 1.09310999 0)
+(-0.000678567766 1.06552507 0)
+(-0.000711532534 1.03281811 0)
+(-0.000750266505 0.991784997 0)
+(-0.0042998245 0.934759973 0)
+(-0.00391358678 0.832427341 0)
+(-1.63455687e-05 0.832251917 0)
+(-4.94236668e-05 0.934922877 0)
+(-8.28926702e-05 0.991909321 0)
+(-0.000116349575 1.03294137 0)
+(-0.000149779562 1.06564765 0)
+(-0.000183185214 1.0932321 0)
+(-0.000216561729 1.11722221 0)
+(-0.000249898372 1.13830971 0)
+(-0.000283033923 1.15677297 0)
+(-0.000315916655 1.16897647 0)
+(-0.000348838064 1.17108016 0)
+(-0.000381913271 1.17111493 0)
+(-0.000415027737 1.1711151 0)
+(-0.000448120067 1.17111489 0)
+(-0.000481128089 1.17107999 0)
+(-0.000513936909 1.16897511 0)
+(-0.000546663524 1.15677075 0)
+(-0.000579602661 1.13830829 0)
+(-0.000612705699 1.11722081 0)
+(-0.000645815189 1.09323038 0)
+(-0.000678925126 1.06564539 0)
+(-0.000712132309 1.03293836 0)
+(-0.000751118393 0.991905202 0)
+(-0.00429083552 0.934880167 0)
+(-0.00390410933 0.832952165 0)
+(-1.63458438e-05 0.832374313 0)
+(-4.94246423e-05 0.935045293 0)
+(-8.28940432e-05 0.992031718 0)
+(-0.000116351004 1.03306374 0)
+(-0.000149781317 1.06576999 0)
+(-0.000183187772 1.09335441 0)
+(-0.000216564695 1.11734444 0)
+(-0.000249898724 1.13843181 0)
+(-0.00028301384 1.15689418 0)
+(-0.000315866757 1.16909762 0)
+(-0.000348783991 1.17120205 0)
+(-0.000381879381 1.17123681 0)
+(-0.000415023975 1.17123693 0)
+(-0.000448157523 1.17123667 0)
+(-0.000481218739 1.17120167 0)
+(-0.000514077628 1.16909596 0)
+(-0.000546849035 1.15689156 0)
+(-0.000579862156 1.13842992 0)
+(-0.00061307573 1.11734249 0)
+(-0.000646315321 1.09335207 0)
+(-0.000679570393 1.06576707 0)
+(-0.000712935118 1.03306004 0)
+(-0.000752079987 0.992026868 0)
+(-0.00428253218 0.935001819 0)
+(-0.00389528662 0.833472903 0)
+(-1.63557958e-05 0.832496731 0)
+(-4.94546968e-05 0.935167727 0)
+(-8.29443749e-05 0.992154129 0)
+(-0.000116421473 1.03318613 0)
+(-0.000149871934 1.06589236 0)
+(-0.000183298678 1.09347672 0)
+(-0.00021669539 1.11746666 0)
+(-0.000250045602 1.13855388 0)
+(-0.000283158393 1.15701523 0)
+(-0.000316000186 1.16921865 0)
+(-0.00034893047 1.17132396 0)
+(-0.000382058424 1.17135875 0)
+(-0.000415240628 1.17135885 0)
+(-0.000448418435 1.17135856 0)
+(-0.000481531681 1.17132349 0)
+(-0.000514435191 1.16921685 0)
+(-0.000547239004 1.15701243 0)
+(-0.000580304738 1.13855177 0)
+(-0.00061359969 1.11746446 0)
+(-0.000646934165 1.0934741 0)
+(-0.00068029337 1.06588913 0)
+(-0.000713769228 1.03318211 0)
+(-0.000753023404 0.992148953 0)
+(-0.00427480785 0.935123901 0)
+(-0.00388706453 0.833988553 0)
+(-1.63714424e-05 0.832619311 0)
+(-4.95020357e-05 0.935290317 0)
+(-8.30229947e-05 0.992276694 0)
+(-0.000116530624 1.03330868 0)
+(-0.000150011561 1.06601487 0)
+(-0.000183468375 1.09359919 0)
+(-0.000216893146 1.11758902 0)
+(-0.000250265817 1.13867604 0)
+(-0.000283382419 1.15713625 0)
+(-0.00031621997 1.16933971 0)
+(-0.000349168021 1.17144602 0)
+(-0.000382330387 1.17148086 0)
+(-0.000415550212 1.17148094 0)
+(-0.000448769288 1.17148064 0)
+(-0.00048192792 1.17144551 0)
+(-0.000514867537 1.16933785 0)
+(-0.000547692431 1.15713338 0)
+(-0.000580793955 1.13867385 0)
+(-0.000614149643 1.11758673 0)
+(-0.000647555741 1.09359647 0)
+(-0.000680993353 1.06601154 0)
+(-0.000714552293 1.03330455 0)
+(-0.000753886881 0.992271425 0)
+(-0.00426758403 0.935246374 0)
+(-0.00387939002 0.834499447 0)
+(-1.6389632e-05 0.832742071 0)
+(-4.95566841e-05 0.935413081 0)
+(-8.31134265e-05 0.992399424 0)
+(-0.00011665564 1.03343138 0)
+(-0.000150170578 1.06613754 0)
+(-0.000183660127 1.0937218 0)
+(-0.000217114701 1.11771152 0)
+(-0.000250510586 1.13879829 0)
+(-0.000283631276 1.15725725 0)
+(-0.00031646551 1.1694608 0)
+(-0.000349430865 1.17156822 0)
+(-0.000382624929 1.17160311 0)
+(-0.000415878195 1.17160319 0)
+(-0.000449132863 1.1716029 0)
+(-0.000482329808 1.17156771 0)
+(-0.000515297736 1.16945893 0)
+(-0.000548134036 1.15725438 0)
+(-0.000581257916 1.13879611 0)
+(-0.000614658842 1.11770923 0)
+(-0.00064812025 1.0937191 0)
+(-0.000681618881 1.06613424 0)
+(-0.000715242684 1.03342729 0)
+(-0.000754639675 0.992394201 0)
+(-0.00426080617 0.935369152 0)
+(-0.00387222118 0.835005819 0)
+(-1.64078978e-05 0.832865021 0)
+(-4.96116831e-05 0.935536029 0)
+(-8.3204517e-05 0.992522331 0)
+(-0.000116781371 1.03355426 0)
+(-0.000150329668 1.06626038 0)
+(-0.000183850877 1.09384457 0)
+(-0.00021733338 1.11783415 0)
+(-0.000250749028 1.13892063 0)
+(-0.000283870559 1.15737823 0)
+(-0.000316699691 1.16958191 0)
+(-0.000349679638 1.17169054 0)
+(-0.000382900718 1.1717255 0)
+(-0.000416181723 1.17172559 0)
+(-0.000449465251 1.1717253 0)
+(-0.000482692978 1.17169006 0)
+(-0.000515681565 1.16958007 0)
+(-0.000548521242 1.15737539 0)
+(-0.000581657104 1.1389185 0)
+(-0.000615091011 1.11783193 0)
+(-0.000648595173 1.09384195 0)
+(-0.000682141803 1.06625717 0)
+(-0.00071581708 1.03355027 0)
+(-0.000755263868 0.992517232 0)
+(-0.00425443463 0.935492189 0)
+(-0.00386552589 0.835507924 0)
+(-1.6425129e-05 0.83298816 0)
+(-4.96634179e-05 0.935659159 0)
+(-8.32899073e-05 0.992645413 0)
+(-0.000116898671 1.0336773 0)
+(-0.000150477101 1.06638338 0)
+(-0.000184025906 1.09396749 0)
+(-0.000217531679 1.1179569 0)
+(-0.000250962072 1.13904304 0)
+(-0.000284079949 1.15749917 0)
+(-0.000316900322 1.16970305 0)
+(-0.00034989019 1.17181299 0)
+(-0.000383132356 1.17184802 0)
+(-0.00041643494 1.17184811 0)
+(-0.000449740951 1.17184783 0)
+(-0.000482992317 1.17181253 0)
+(-0.000515994747 1.16970126 0)
+(-0.00054883078 1.1574964 0)
+(-0.000581969357 1.13904099 0)
+(-0.000615425471 1.11795478 0)
+(-0.000648961655 1.09396499 0)
+(-0.000682545809 1.0663803 0)
+(-0.000716261847 1.03367347 0)
+(-0.000755749031 0.992640484 0)
+(-0.00424843018 0.935615452 0)
+(-0.00385926918 0.836006007 0)
+(-1.64403521e-05 0.833111483 0)
+(-4.97091371e-05 0.935782463 0)
+(-8.33649132e-05 0.992768659 0)
+(-0.000117000798 1.03380051 0)
+(-0.000150604386 1.06650653 0)
+(-0.000184175695 1.09409055 0)
+(-0.000217699364 1.11807976 0)
+(-0.000251138336 1.1391655 0)
+(-0.000284246595 1.15762007 0)
+(-0.000317053724 1.16982421 0)
+(-0.000350048813 1.17193554 0)
+(-0.000383305941 1.17197064 0)
+(-0.000416623469 1.17197075 0)
+(-0.000449945076 1.17197048 0)
+(-0.000483212796 1.17193512 0)
+(-0.000516222409 1.16982247 0)
+(-0.000549048042 1.15761737 0)
+(-0.000582180794 1.13916355 0)
+(-0.000615650129 1.11807776 0)
+(-0.000649209481 1.09408818 0)
+(-0.000682821995 1.06650361 0)
+(-0.000716569898 1.03379685 0)
+(-0.000756089712 0.992763931 0)
+(-0.00424276508 0.935738911 0)
+(-0.0038534258 0.836500305 0)
+(-1.64530066e-05 0.833234976 0)
+(-4.97469804e-05 0.93590593 0)
+(-8.34267102e-05 0.992892057 0)
+(-0.000117084469 1.03392385 0)
+(-0.000150707681 1.06662981 0)
+(-0.000184295522 1.09421372 0)
+(-0.000217830292 1.1182027 0)
+(-0.000251270893 1.13928799 0)
+(-0.000284363494 1.15774091 0)
+(-0.00031715204 1.16994538 0)
+(-0.000350146454 1.17205817 0)
+(-0.000383412124 1.17209336 0)
+(-0.000416738024 1.17209347 0)
+(-0.000450068167 1.17209321 0)
+(-0.000483344964 1.1720578 0)
+(-0.000516355237 1.16994369 0)
+(-0.000549164409 1.1577383 0)
+(-0.000582283896 1.13928616 0)
+(-0.000615757784 1.11820083 0)
+(-0.000649331454 1.0942115 0)
+(-0.00068296391 1.06662707 0)
+(-0.000716735497 1.0339204 0)
+(-0.000756280626 0.992887547 0)
+(-0.00423741097 0.935862547 0)
+(-0.0038479699 0.836991042 0)
+(-1.64626706e-05 0.833358624 0)
+(-4.97760367e-05 0.936029543 0)
+(-8.34740809e-05 0.993015592 0)
+(-0.00011714767 1.03404733 0)
+(-0.0001507841 1.06675321 0)
+(-0.000184381571 1.09433699 0)
+(-0.000217920176 1.11832572 0)
+(-0.000251354819 1.1394105 0)
+(-0.000284425096 1.15786168 0)
+(-0.000317189904 1.17006653 0)
+(-0.000350177856 1.17218087 0)
+(-0.00038344538 1.17221614 0)
+(-0.00041677287 1.17221626 0)
+(-0.000450104746 1.17221602 0)
+(-0.000483384039 1.17218055 0)
+(-0.000516388883 1.17006492 0)
+(-0.000549175352 1.15785916 0)
+(-0.000582273836 1.13940878 0)
+(-0.000615743544 1.11832399 0)
+(-0.000649323287 1.09433493 0)
+(-0.00068296792 1.06675065 0)
+(-0.000716755406 1.03404408 0)
+(-0.000756319138 0.993011312 0)
+(-0.00423234341 0.935986336 0)
+(-0.00384287811 0.837478431 0)
+(-1.64691702e-05 0.833482412 0)
+(-4.97958323e-05 0.936153288 0)
+(-8.35058064e-05 0.993139246 0)
+(-0.000117188503 1.03417091 0)
+(-0.000150831175 1.0668767 0)
+(-0.000184431247 1.09446033 0)
+(-0.000217966765 1.11844877 0)
+(-0.000251388405 1.13953299 0)
+(-0.000284429684 1.15798236 0)
+(-0.00031716495 1.17018767 0)
+(-0.000350140201 1.17230362 0)
+(-0.000383402513 1.17233897 0)
+(-0.000416724643 1.17233911 0)
+(-0.00045005112 1.17233887 0)
+(-0.000483325477 1.17230334 0)
+(-0.000516318129 1.17018612 0)
+(-0.000549075776 1.15797993 0)
+(-0.000582146256 1.13953139 0)
+(-0.000615603984 1.11844719 0)
+(-0.000649181955 1.09445845 0)
+(-0.00068283092 1.06687433 0)
+(-0.000716626829 1.03416787 0)
+(-0.000756202989 0.993135203 0)
+(-0.00422754104 0.936110261 0)
+(-0.00383813019 0.837962671 0)
+(-1.64724888e-05 0.833606322 0)
+(-4.98057328e-05 0.936277146 0)
+(-8.35210773e-05 0.993263001 0)
+(-0.000117206427 1.03429458 0)
+(-0.000150848706 1.06700027 0)
+(-0.000184444194 1.09458373 0)
+(-0.000217968552 1.11857185 0)
+(-0.00025136899 1.13965545 0)
+(-0.000284374294 1.15810294 0)
+(-0.000317074218 1.17030878 0)
+(-0.000350030393 1.1724264 0)
+(-0.00038328038 1.17246184 0)
+(-0.000416590272 1.17246198 0)
+(-0.000449904736 1.17246176 0)
+(-0.000483167122 1.17242617 0)
+(-0.000516140996 1.1703073 0)
+(-0.000548863839 1.15810061 0)
+(-0.000581899296 1.13965398 0)
+(-0.000615337101 1.11857041 0)
+(-0.000648905079 1.09458202 0)
+(-0.000682550326 1.0669981 0)
+(-0.000716347061 1.03429176 0)
+(-0.000755929197 0.993259202 0)
+(-0.00422298381 0.9362343 0)
+(-0.00383370756 0.838443951 0)
+(-1.64724373e-05 0.833730336 0)
+(-4.98055369e-05 0.936401099 0)
+(-8.35193928e-05 0.99338684 0)
+(-0.000117200186 1.03441832 0)
+(-0.000150834453 1.0671239 0)
+(-0.000184417759 1.09470716 0)
+(-0.000217923523 1.11869492 0)
+(-0.000251295528 1.13977785 0)
+(-0.000284258465 1.15822339 0)
+(-0.000316916916 1.17042984 0)
+(-0.000349847475 1.17254918 0)
+(-0.000383078364 1.17258471 0)
+(-0.000416368677 1.17258487 0)
+(-0.000449663689 1.17258466 0)
+(-0.000482907112 1.17254901 0)
+(-0.000515855825 1.17042843 0)
+(-0.000548537612 1.15822116 0)
+(-0.000581530915 1.13977651 0)
+(-0.000614940792 1.11869364 0)
+(-0.000648490913 1.09470563 0)
+(-0.000682124942 1.06712192 0)
+(-0.000715914934 1.03441573 0)
+(-0.00075549627 0.993383288 0)
+(-0.00421865158 0.936358436 0)
+(-0.003829591 0.838922445 0)
+(-1.64687945e-05 0.833854435 0)
+(-4.97949501e-05 0.936525128 0)
+(-8.35003583e-05 0.993510741 0)
+(-0.000117169428 1.03454211 0)
+(-0.000150788456 1.06724755 0)
+(-0.000184351802 1.0948306 0)
+(-0.000217831202 1.11881797 0)
+(-0.000251166807 1.13990018 0)
+(-0.000284080031 1.15834372 0)
+(-0.000316691277 1.17055083 0)
+(-0.00034958978 1.17267196 0)
+(-0.000382794159 1.17270758 0)
+(-0.000416057918 1.17270775 0)
+(-0.000449326397 1.17270756 0)
+(-0.000482543728 1.17267183 0)
+(-0.000515460712 1.1705495 0)
+(-0.000548095558 1.15834159 0)
+(-0.000581039743 1.13989897 0)
+(-0.000614413587 1.11881685 0)
+(-0.000647937795 1.09482925 0)
+(-0.000681552602 1.06724578 0)
+(-0.000715328168 1.03453975 0)
+(-0.000754902627 0.993507441 0)
+(-0.00421452763 0.936482649 0)
+(-0.00382576423 0.839398319 0)
+(-1.64617439e-05 0.833978599 0)
+(-4.97738193e-05 0.936649215 0)
+(-8.34638496e-05 0.993634686 0)
+(-0.000117114164 1.03466593 0)
+(-0.000150710316 1.06737122 0)
+(-0.000184246095 1.09495403 0)
+(-0.000217690998 1.11894097 0)
+(-0.000250982227 1.14002241 0)
+(-0.000283839063 1.15846389 0)
+(-0.000316396695 1.17067175 0)
+(-0.000349256414 1.17279471 0)
+(-0.000382427334 1.17283042 0)
+(-0.000415657191 1.1728306 0)
+(-0.00044889184 1.17283042 0)
+(-0.000482075591 1.17279463 0)
+(-0.000514953749 1.17067049 0)
+(-0.000547535263 1.15846186 0)
+(-0.000580423501 1.14002133 0)
+(-0.000613753624 1.11894001 0)
+(-0.000647243875 1.09495286 0)
+(-0.000680831692 1.06736966 0)
+(-0.000714585556 1.0346638 0)
+(-0.00075414639 0.993631641 0)
+(-0.00421059733 0.936606918 0)
+(-0.00382221405 0.839871732 0)
+(-1.64509683e-05 0.834102809 0)
+(-4.9741685e-05 0.936773338 0)
+(-8.34088567e-05 0.993758654 0)
+(-0.000117032968 1.03478975 0)
+(-0.000150599132 1.06749488 0)
+(-0.00018409964 1.09507743 0)
+(-0.00021750219 1.1190639 0)
+(-0.000250741576 1.14014451 0)
+(-0.00028353505 1.1585839 0)
+(-0.000316032605 1.17079257 0)
+(-0.000348846485 1.1729174 0)
+(-0.000381976366 1.17295321 0)
+(-0.000415165212 1.1729534 0)
+(-0.000448358906 1.17295324 0)
+(-0.000481501874 1.17291738 0)
+(-0.000514334611 1.17079138 0)
+(-0.000546856372 1.15858197 0)
+(-0.000579681313 1.14014356 0)
+(-0.00061295991 1.1190631 0)
+(-0.00064640842 1.09507643 0)
+(-0.000679961381 1.06749352 0)
+(-0.000713685606 1.03478786 0)
+(-0.000753225952 0.993755867 0)
+(-0.00420684368 0.936731226 0)
+(-0.00381892399 0.840342832 0)
+(-1.64366021e-05 0.834227045 0)
+(-4.9698844e-05 0.936897479 0)
+(-8.33361402e-05 0.993882624 0)
+(-0.00011692661 1.03491357 0)
+(-0.000150454604 1.0676185 0)
+(-0.000183911645 1.09520076 0)
+(-0.000217264024 1.11918674 0)
+(-0.000250443887 1.14026647 0)
+(-0.000283166962 1.15870372 0)
+(-0.000315598312 1.17091328 0)
+(-0.000348359755 1.17304003 0)
+(-0.000381441146 1.17307593 0)
+(-0.000414581466 1.17307614 0)
+(-0.000447726839 1.17307598 0)
+(-0.000480821615 1.17304006 0)
+(-0.000513601825 1.17091217 0)
+(-0.000546057416 1.15870189 0)
+(-0.000578812208 1.14026566 0)
+(-0.000612031233 1.11918609 0)
+(-0.000645429881 1.09519995 0)
+(-0.000678940145 1.06761736 0)
+(-0.000712627217 1.0349119 0)
+(-0.000752140508 0.993880097 0)
+(-0.00420325469 0.936855551 0)
+(-0.00381588263 0.840811759 0)
+(-1.64183893e-05 0.834351286 0)
+(-4.96446142e-05 0.937021617 0)
+(-8.3244634e-05 0.994006576 0)
+(-0.000116793823 1.03503734 0)
+(-0.000150276078 1.06774207 0)
+(-0.000183682262 1.09532401 0)
+(-0.000216976308 1.11930945 0)
+(-0.000250088453 1.14038827 0)
+(-0.00028273451 1.15882334 0)
+(-0.000315093093 1.17103386 0)
+(-0.000347794709 1.17316256 0)
+(-0.000380820498 1.17319855 0)
+(-0.000413905042 1.17319878 0)
+(-0.000446994505 1.17319864 0)
+(-0.000480033409 1.17316265 0)
+(-0.000512754033 1.17103282 0)
+(-0.000545137258 1.15882162 0)
+(-0.000577815256 1.14038759 0)
+(-0.000610967144 1.11930897 0)
+(-0.000644307788 1.09532339 0)
+(-0.00067776731 1.06774114 0)
+(-0.000711409372 1.03503592 0)
+(-0.000750888699 0.994004311 0)
+(-0.00419981756 0.936979873 0)
+(-0.00381307776 0.841278646 0)
+(-1.63965671e-05 0.83447551 0)
+(-4.95792657e-05 0.93714573 0)
+(-8.31342067e-05 0.994130489 0)
+(-0.000116634653 1.03516106 0)
+(-0.000150063531 1.06786555 0)
+(-0.000183410648 1.09544715 0)
+(-0.000216638734 1.11943203 0)
+(-0.000249675761 1.14050988 0)
+(-0.000282237337 1.15894274 0)
+(-0.000314516475 1.1711543 0)
+(-0.000347151234 1.17328498 0)
+(-0.000380113791 1.17332107 0)
+(-0.000413135251 1.17332131 0)
+(-0.000446161517 1.17332119 0)
+(-0.000479137372 1.17328512 0)
+(-0.000511791365 1.17115333 0)
+(-0.000544095171 1.15894112 0)
+(-0.000576688939 1.14050934 0)
+(-0.000609765755 1.11943171 0)
+(-0.000643040546 1.09544673 0)
+(-0.000676441443 1.06786484 0)
+(-0.000710030436 1.03515988 0)
+(-0.00074946875 0.994128489 0)
+(-0.00419651955 0.937104171 0)
+(-0.00381049759 0.841743619 0)
+(-1.6370808e-05 0.834599697 0)
+(-4.95024525e-05 0.937269798 0)
+(-8.30049477e-05 0.994254341 0)
+(-0.000116448933 1.0352847 0)
+(-0.000149816706 1.06798894 0)
+(-0.000183096882 1.09557017 0)
+(-0.000216250544 1.11955444 0)
+(-0.000249204492 1.14063129 0)
+(-0.000281675006 1.15906191 0)
+(-0.000313868162 1.17127456 0)
+(-0.000346428984 1.17340727 0)
+(-0.000379320753 1.17344346 0)
+(-0.00041227108 1.17344371 0)
+(-0.000445226504 1.1734436 0)
+(-0.000478132029 1.17340747 0)
+(-0.000510712295 1.17127368 0)
+(-0.000542930071 1.1590604 0)
+(-0.0005754326 1.14063089 0)
+(-0.000608426619 1.11955428 0)
+(-0.000641627607 1.09556993 0)
+(-0.000674961749 1.06798844 0)
+(-0.000708490087 1.03528376 0)
+(-0.000747880399 0.994252608 0)
+(-0.00419335 0.937228425 0)
+(-0.00380813183 0.842206797 0)
+(-1.63412796e-05 0.834723825 0)
+(-4.9414176e-05 0.937393799 0)
+(-8.28565842e-05 0.99437811 0)
+(-0.000116236341 1.03540824 0)
+(-0.000149534734 1.0681122 0)
+(-0.000182739797 1.09569303 0)
+(-0.000215811418 1.11967666 0)
+(-0.000248674601 1.14075247 0)
+(-0.000281046831 1.15918083 0)
+(-0.000313147307 1.17139465 0)
+(-0.000345626959 1.17352941 0)
+(-0.000378440628 1.17356569 0)
+(-0.000411312734 1.17356596 0)
+(-0.000444189859 1.17356586 0)
+(-0.000477016934 1.17352966 0)
+(-0.000509516015 1.17139384 0)
+(-0.000541641368 1.15917942 0)
+(-0.00057404605 1.1407522 0)
+(-0.000606949498 1.11967667 0)
+(-0.000640068317 1.09569299 0)
+(-0.000673327692 1.06811192 0)
+(-0.000706787185 1.03540754 0)
+(-0.000746122413 0.994376646 0)
+(-0.00419029871 0.937352612 0)
+(-0.00380597054 0.842668293 0)
+(-1.63078139e-05 0.834847872 0)
+(-4.93141069e-05 0.937517712 0)
+(-8.26886068e-05 0.994501775 0)
+(-0.000115996456 1.03553165 0)
+(-0.000149217897 1.06823531 0)
+(-0.000182340122 1.09581572 0)
+(-0.000215321587 1.11979867 0)
+(-0.000248086238 1.1408734 0)
+(-0.000280353082 1.15929948 0)
+(-0.000312354014 1.17151453 0)
+(-0.000344745048 1.17365137 0)
+(-0.000377472759 1.17368775 0)
+(-0.000410259088 1.17368803 0)
+(-0.000443050456 1.17368795 0)
+(-0.000475791792 1.17365167 0)
+(-0.000508202331 1.1715138 0)
+(-0.000540228258 1.15929818 0)
+(-0.000572527675 1.14087327 0)
+(-0.000605332906 1.11979885 0)
+(-0.000638361977 1.09581587 0)
+(-0.000671538525 1.06823525 0)
+(-0.000704921539 1.03553119 0)
+(-0.000744194614 0.994500582 0)
+(-0.00418735584 0.937476712 0)
+(-0.0038040043 0.843128218 0)
+(-1.62702247e-05 0.834971815 0)
+(-4.92020455e-05 0.937641514 0)
+(-8.25009454e-05 0.994625314 0)
+(-0.000115729006 1.03565491 0)
+(-0.000148865483 1.06835826 0)
+(-0.000181896527 1.0959382 0)
+(-0.000214779733 1.11992045 0)
+(-0.000247438503 1.14099406 0)
+(-0.000279593184 1.15941785 0)
+(-0.000311487664 1.17163419 0)
+(-0.000343782899 1.17377313 0)
+(-0.000376417174 1.17380962 0)
+(-0.000409109898 1.17380991 0)
+(-0.000441807649 1.17380984 0)
+(-0.000474455603 1.17377349 0)
+(-0.000506770434 1.17163354 0)
+(-0.000538690041 1.15941666 0)
+(-0.00057087731 1.14099407 0)
+(-0.000603576516 1.11992079 0)
+(-0.000636507515 1.09593855 0)
+(-0.000669593336 1.06835842 0)
+(-0.000702891882 1.03565471 0)
+(-0.00074209562 0.994624393 0)
+(-0.00418451266 0.937600701 0)
+(-0.00380222489 0.843586671 0)
+(-1.62286482e-05 0.835095631 0)
+(-4.90780364e-05 0.937765183 0)
+(-8.22933879e-05 0.994748704 0)
+(-0.000115433553 1.03577801 0)
+(-0.00014847691 1.06848101 0)
+(-0.000181409069 1.09606047 0)
+(-0.000214186342 1.12004197 0)
+(-0.000246731094 1.14111443 0)
+(-0.000278766427 1.15953591 0)
+(-0.000310547734 1.17175361 0)
+(-0.000342739477 1.17389468 0)
+(-0.00037527271 1.17393126 0)
+(-0.000407864611 1.17393157 0)
+(-0.000440461431 1.17393152 0)
+(-0.000473008302 1.17389509 0)
+(-0.000505219789 1.17175304 0)
+(-0.000537026189 1.15953483 0)
+(-0.000569094251 1.14111458 0)
+(-0.000601679786 1.12004248 0)
+(-0.00063450509 1.09606101 0)
+(-0.000667492172 1.06848139 0)
+(-0.000700697985 1.03577805 0)
+(-0.000739824912 0.994748058 0)
+(-0.00418176018 0.93772456 0)
+(-0.00380062375 0.844043753 0)
+(-1.61831787e-05 0.835219297 0)
+(-4.89420821e-05 0.937888697 0)
+(-8.20657699e-05 0.994871923 0)
+(-0.000115110291 1.03590091 0)
+(-0.000148052603 1.06860354 0)
+(-0.000180877635 1.09618249 0)
+(-0.000213540943 1.12016321 0)
+(-0.000245964198 1.14123449 0)
+(-0.000277873057 1.15965366 0)
+(-0.000309533948 1.17187277 0)
+(-0.000341615004 1.17401598 0)
+(-0.00037403953 1.17405267 0)
+(-0.000406522331 1.17405299 0)
+(-0.000439010383 1.17405295 0)
+(-0.000471448687 1.17401646 0)
+(-0.000503549526 1.17187228 0)
+(-0.000535235742 1.15965268 0)
+(-0.000567177363 1.14123479 0)
+(-0.000599641658 1.1201639 0)
+(-0.0006323531 1.09618323 0)
+(-0.000665233371 1.06860414 0)
+(-0.000698338912 1.0359012 0)
+(-0.000737381652 0.994871552 0)
+(-0.00417909079 0.937848264 0)
+(-0.00379919376 0.844499558 0)
+(-1.61332719e-05 0.83534279 0)
+(-4.87934182e-05 0.938012032 0)
+(-8.18177732e-05 0.994994947 0)
+(-0.000114758625 1.0360236 0)
+(-0.000147591889 1.06872583 0)
+(-0.000180301631 1.09630424 0)
+(-0.000212842794 1.12028415 0)
+(-0.000245137029 1.14135421 0)
+(-0.000276912369 1.15977107 0)
+(-0.000308446111 1.17199165 0)
+(-0.000340408804 1.17413703 0)
+(-0.000372716733 1.17417382 0)
+(-0.000405083268 1.17417416 0)
+(-0.000437454774 1.17417413 0)
+(-0.000469776458 1.17413756 0)
+(-0.000501759076 1.17199124 0)
+(-0.00053331829 1.1597702 0)
+(-0.000565126585 1.14135466 0)
+(-0.000597461747 1.12028501 0)
+(-0.000630051291 1.09630518 0)
+(-0.000662816538 1.06872666 0)
+(-0.000695813536 1.03602415 0)
+(-0.000734765263 0.994994854 0)
+(-0.00417649659 0.937971791 0)
+(-0.00379792693 0.844954173 0)
+(-1.6079591e-05 0.835466086 0)
+(-4.86328377e-05 0.938135165 0)
+(-8.1549338e-05 0.995117756 0)
+(-0.000114378371 1.03614605 0)
+(-0.000147094419 1.06884786 0)
+(-0.000179681002 1.0964257 0)
+(-0.000212092339 1.12040478 0)
+(-0.000244249825 1.14147359 0)
+(-0.000275884606 1.15988812 0)
+(-0.00030728388 1.17211023 0)
+(-0.000339120455 1.1742578 0)
+(-0.000371304026 1.17429469 0)
+(-0.000403546193 1.17429504 0)
+(-0.000435793521 1.17429503 0)
+(-0.000467991104 1.17425838 0)
+(-0.000499847746 1.1721099 0)
+(-0.000531272486 1.15988737 0)
+(-0.00056294041 1.14147418 0)
+(-0.000595138991 1.12040581 0)
+(-0.000627598768 1.09642684 0)
+(-0.00066024116 1.06884892 0)
+(-0.000693121353 1.03614685 0)
+(-0.000731973988 0.995117942 0)
+(-0.00417396915 0.938095118 0)
+(-0.00379681622 0.845407682 0)
+(-1.60214283e-05 0.83558916 0)
+(-4.84594696e-05 0.938258072 0)
+(-8.12600961e-05 0.995240323 0)
+(-0.000113969116 1.03626824 0)
+(-0.00014655995 1.0689696 0)
+(-0.000179015245 1.09654685 0)
+(-0.000211288589 1.12052505 0)
+(-0.000243301606 1.1415926 0)
+(-0.000274788682 1.1600048 0)
+(-0.000306046458 1.17222849 0)
+(-0.000337749433 1.17437826 0)
+(-0.000369800812 1.17441526 0)
+(-0.000401910788 1.17441562 0)
+(-0.000434026106 1.17441563 0)
+(-0.000466091659 1.1743789 0)
+(-0.000497814841 1.17222824 0)
+(-0.000529098405 1.16000416 0)
+(-0.000560618635 1.14159333 0)
+(-0.000592672823 1.12052626 0)
+(-0.000624994711 1.09654819 0)
+(-0.00065750576 1.06897089 0)
+(-0.000690261112 1.03626929 0)
+(-0.000729007365 0.995240791 0)
+(-0.00417150305 0.938218221 0)
+(-0.00379585618 0.845860171 0)
+(-1.59591934e-05 0.835711989 0)
+(-4.82736009e-05 0.938380729 0)
+(-8.09500006e-05 0.995362626 0)
+(-0.000113530827 1.03639014 0)
+(-0.000145988195 1.06909103 0)
+(-0.000178304234 1.09666766 0)
+(-0.000210431646 1.12064496 0)
+(-0.000242292348 1.14171121 0)
+(-0.000273624491 1.1601211 0)
+(-0.000304733666 1.17234641 0)
+(-0.000336295483 1.1744984 0)
+(-0.000368206896 1.1745355 0)
+(-0.000400177073 1.17453588 0)
+(-0.000432152474 1.1745359 0)
+(-0.000464078013 1.1744991 0)
+(-0.000495660006 1.17234624 0)
+(-0.000526794775 1.16012056 0)
+(-0.000558160034 1.14171208 0)
+(-0.000590062052 1.12064634 0)
+(-0.000622238183 1.0966692 0)
+(-0.000654609969 1.06909255 0)
+(-0.000687232205 1.03639145 0)
+(-0.00072586441 0.995363378 0)
+(-0.00416909105 0.938341078 0)
+(-0.00379504022 0.846311719 0)
+(-1.58925986e-05 0.835834547 0)
+(-4.8074987e-05 0.938503113 0)
+(-8.06191333e-05 0.995484643 0)
+(-0.000113063806 1.03651174 0)
+(-0.000145379544 1.06921213 0)
+(-0.000177547739 1.0967881 0)
+(-0.000209521135 1.12076448 0)
+(-0.00024122207 1.14182941 0)
+(-0.000272392203 1.16023698 0)
+(-0.000303345526 1.17246397 0)
+(-0.000334758321 1.17461819 0)
+(-0.000366521969 1.17465539 0)
+(-0.00039834411 1.17465578 0)
+(-0.000430171464 1.17465582 0)
+(-0.000461949251 1.17461895 0)
+(-0.000493382243 1.17246388 0)
+(-0.000524361092 1.16023656 0)
+(-0.000555564373 1.14183043 0)
+(-0.000587306615 1.12076604 0)
+(-0.000619328868 1.09678985 0)
+(-0.000651553314 1.06921388 0)
+(-0.000684034239 1.0365133 0)
+(-0.000722544659 0.995485679 0)
+(-0.00416672733 0.938463662 0)
+(-0.00379436264 0.846762404 0)
+(-1.58216924e-05 0.83595681 0)
+(-4.78634803e-05 0.9386252 0)
+(-8.0266833e-05 0.995606348 0)
+(-0.000112566951 1.036633 0)
+(-0.000144733042 1.06933287 0)
+(-0.000176745786 1.09690817 0)
+(-0.000208557425 1.12088359 0)
+(-0.000240090948 1.14194718 0)
+(-0.000271091725 1.16035244 0)
+(-0.000301881712 1.17258115 0)
+(-0.000333137609 1.17473761 0)
+(-0.000364745397 1.17477492 0)
+(-0.000396411989 1.17477532 0)
+(-0.000428083791 1.17477537 0)
+(-0.000459705684 1.17473843 0)
+(-0.000490981931 1.17258115 0)
+(-0.000521797669 1.16035212 0)
+(-0.000552831366 1.14194834 0)
+(-0.00058440602 1.12088532 0)
+(-0.000616266334 1.09691012 0)
+(-0.0006483349 1.06933485 0)
+(-0.000680666356 1.03663482 0)
+(-0.000719047346 0.995607669 0)
+(-0.00416440679 0.93858595 0)
+(-0.00379381891 0.847212296 0)
+(-1.57464035e-05 0.836078751 0)
+(-4.7639011e-05 0.938746965 0)
+(-7.98933614e-05 0.99572772 0)
+(-0.000112040934 1.03675391 0)
+(-0.000144049122 1.06945324 0)
+(-0.000175898079 1.09702783 0)
+(-0.000207539982 1.12100227 0)
+(-0.000238898294 1.1420645 0)
+(-0.000269722467 1.16046745 0)
+(-0.000300341928 1.17269793 0)
+(-0.000331433385 1.17485664 0)
+(-0.000362877561 1.17489405 0)
+(-0.000394380461 1.17489447 0)
+(-0.000425888597 1.17489454 0)
+(-0.000457346746 1.17485751 0)
+(-0.000488458349 1.17269801 0)
+(-0.000519103536 1.16046725 0)
+(-0.000549960772 1.14206581 0)
+(-0.000581360333 1.12100418 0)
+(-0.000613050907 1.09702998 0)
+(-0.000644955599 1.06945545 0)
+(-0.000677128902 1.03675599 0)
+(-0.000715372315 0.995729325 0)
+(-0.0041621212 0.938707917 0)
+(-0.00379340082 0.847661461 0)
+(-1.56667972e-05 0.836200346 0)
+(-4.74015783e-05 0.938868382 0)
+(-7.9498464e-05 0.995848733 0)
+(-0.000111485039 1.03687444 0)
+(-0.000143327177 1.0695732 0)
+(-0.00017500447 1.09714706 0)
+(-0.000206468735 1.12112049 0)
+(-0.000237644423 1.14218134 0)
+(-0.000268284955 1.160582 0)
+(-0.000298726744 1.17281429 0)
+(-0.000329645798 1.17497525 0)
+(-0.00036091813 1.17501277 0)
+(-0.000392249617 1.17501321 0)
+(-0.000423586321 1.17501329 0)
+(-0.000454872939 1.17497619 0)
+(-0.000485812346 1.17281445 0)
+(-0.000516279488 1.16058191 0)
+(-0.000546952628 1.14218279 0)
+(-0.0005781691 1.12112257 0)
+(-0.000609681631 1.09714941 0)
+(-0.000641414436 1.06957564 0)
+(-0.000673422079 1.03687678 0)
+(-0.00071152083 0.995850622 0)
+(-0.00415986942 0.938829539 0)
+(-0.00379310648 0.848109973 0)
+(-1.55829355e-05 0.836321569 0)
+(-4.71514383e-05 0.938989429 0)
+(-7.90823079e-05 0.995969364 0)
+(-0.000110899699 1.03699456 0)
+(-0.00014256784 1.06969273 0)
+(-0.000174065254 1.09726584 0)
+(-0.00020534408 1.12123824 0)
+(-0.000236329428 1.14229769 0)
+(-0.000266778693 1.16069607 0)
+(-0.000297035142 1.1729302 0)
+(-0.00032777411 1.17509343 0)
+(-0.000358867177 1.17513106 0)
+(-0.000390019268 1.17513151 0)
+(-0.000421176573 1.1751316 0)
+(-0.000452283572 1.17509443 0)
+(-0.000483042644 1.17293044 0)
+(-0.000513324559 1.16069609 0)
+(-0.000543806628 1.14229929 0)
+(-0.000574832878 1.1212405 0)
+(-0.000606159896 1.0972684 0)
+(-0.000637712668 1.06969541 0)
+(-0.000669546108 1.03699716 0)
+(-0.00070749229 0.995971539 0)
+(-0.00415764634 0.938950791 0)
+(-0.00379293112 0.848557897 0)
+(-1.54945435e-05 0.836442394 0)
+(-4.68880338e-05 0.939110079 0)
+(-7.86446464e-05 0.996089588 0)
+(-0.00011028448 1.03711427 0)
+(-0.000141770248 1.06981182 0)
+(-0.000173080034 1.09738414 0)
+(-0.000204165461 1.12135549 0)
+(-0.000234952882 1.14241353 0)
+(-0.000265203853 1.16080963 0)
+(-0.000295267728 1.17304565 0)
+(-0.000325819025 1.17521116 0)
+(-0.000356724798 1.17524889 0)
+(-0.000387689546 1.17524935 0)
+(-0.000418659351 1.17524946 0)
+(-0.000449579098 1.17521221 0)
+(-0.000480150527 1.17304597 0)
+(-0.000510239892 1.16080976 0)
+(-0.000540523678 1.14241527 0)
+(-0.000571351702 1.12135792 0)
+(-0.000602485076 1.09738691 0)
+(-0.000633850064 1.06981472 0)
+(-0.00066550147 1.03711713 0)
+(-0.000703287192 0.996092049 0)
+(-0.00415544475 0.939071648 0)
+(-0.00379286754 0.849005291 0)
+(-1.54018389e-05 0.836562795 0)
+(-4.66115638e-05 0.939230308 0)
+(-7.8185228e-05 0.996209382 0)
+(-0.000109639339 1.03723352 0)
+(-0.000140934774 1.06993044 0)
+(-0.000172048717 1.09750195 0)
+(-0.000202932869 1.12147222 0)
+(-0.000233514775 1.14252883 0)
+(-0.000263560199 1.16092268 0)
+(-0.000293424176 1.17316061 0)
+(-0.000323779865 1.1753284 0)
+(-0.000354490352 1.17536624 0)
+(-0.000385260071 1.17536671 0)
+(-0.000416034987 1.17536684 0)
+(-0.000446759544 1.17532951 0)
+(-0.000477135421 1.17316102 0)
+(-0.000507024938 1.16092292 0)
+(-0.000537102842 1.14253072 0)
+(-0.000567725245 1.12147483 0)
+(-0.000598657679 1.09750492 0)
+(-0.000629826838 1.06993357 0)
+(-0.000661287739 1.03723664 0)
+(-0.000698905546 0.996212129 0)
+(-0.00415326377 0.939192087 0)
+(-0.00379291441 0.849452221 0)
+(-1.53045489e-05 0.836682746 0)
+(-4.63216695e-05 0.93935009 0)
+(-7.77040844e-05 0.996328722 0)
+(-0.000108964188 1.0373523 0)
+(-0.000140061148 1.07004856 0)
+(-0.000170971569 1.09761924 0)
+(-0.000201646989 1.12158841 0)
+(-0.000232015873 1.14264359 0)
+(-0.000261848384 1.16103519 0)
+(-0.000291504966 1.17327507 0)
+(-0.000321657175 1.17544515 0)
+(-0.000352164518 1.17548309 0)
+(-0.000382731351 1.17548358 0)
+(-0.000413303396 1.17548372 0)
+(-0.000443824831 1.17544631 0)
+(-0.000473997235 1.17327556 0)
+(-0.000503679127 1.16103554 0)
+(-0.000533544191 1.14264562 0)
+(-0.000563953551 1.1215912 0)
+(-0.000594676624 1.09762242 0)
+(-0.000625641935 1.07005193 0)
+(-0.0006569047 1.03735568 0)
+(-0.000694346839 0.996331756 0)
+(-0.00415109701 0.93931208 0)
+(-0.00379306598 0.849898746 0)
+(-1.52028875e-05 0.836802221 0)
+(-4.60186629e-05 0.939469401 0)
+(-7.72012934e-05 0.996447584 0)
+(-0.000108259258 1.03747059 0)
+(-0.000139149682 1.07016616 0)
+(-0.000169848399 1.097736 0)
+(-0.000200307065 1.12170404 0)
+(-0.000230455547 1.14275776 0)
+(-0.000260067918 1.16114714 0)
+(-0.000289509653 1.173389 0)
+(-0.000319450834 1.17556137 0)
+(-0.000349747338 1.17559942 0)
+(-0.000380103146 1.17559992 0)
+(-0.000410464197 1.17560007 0)
+(-0.000440774823 1.17556259 0)
+(-0.000470736023 1.17338958 0)
+(-0.000500202867 1.16114761 0)
+(-0.000529847385 1.14275995 0)
+(-0.000560036008 1.121707 0)
+(-0.000590542387 1.09773938 0)
+(-0.000621295846 1.07016977 0)
+(-0.000652352043 1.03747423 0)
+(-0.000689610606 0.996450903 0)
+(-0.00414894078 0.939431604 0)
+(-0.0037933187 0.850344919 0)
+(-1.50968375e-05 0.836921193 0)
+(-4.57025246e-05 0.939588214 0)
+(-7.66766552e-05 0.996565944 0)
+(-0.000107524125 1.03758836 0)
+(-0.000138199993 1.07028323 0)
+(-0.000168679191 1.09785219 0)
+(-0.000198913546 1.12181909 0)
+(-0.000228833952 1.14287135 0)
+(-0.000258218865 1.16125851 0)
+(-0.000287438364 1.17350239 0)
+(-0.000317160589 1.17567704 0)
+(-0.000347238179 1.1757152 0)
+(-0.000377375352 1.17571571 0)
+(-0.000407517909 1.17571589 0)
+(-0.00043760953 1.17567833 0)
+(-0.000467351654 1.17350304 0)
+(-0.000496596254 1.16125909 0)
+(-0.000526013251 1.14287368 0)
+(-0.000555973583 1.12182223 0)
+(-0.000586255084 1.09785577 0)
+(-0.000616788614 1.07028707 0)
+(-0.00064763008 1.03759226 0)
+(-0.000684697396 0.996569548 0)
+(-0.00414679178 0.939550634 0)
+(-0.00379366888 0.850790798 0)
+(-1.49861882e-05 0.837039635 0)
+(-4.53729412e-05 0.939706504 0)
+(-7.61301023e-05 0.996683775 0)
+(-0.000106758682 1.03770559 0)
+(-0.000137211753 1.07039974 0)
+(-0.000167463595 1.0979678 0)
+(-0.000197466051 1.12193354 0)
+(-0.000227151112 1.14298433 0)
+(-0.000256301376 1.16136929 0)
+(-0.000285291086 1.1736152 0)
+(-0.000314786494 1.17579216 0)
+(-0.000344637539 1.17583041 0)
+(-0.000374548461 1.17583094 0)
+(-0.000404464448 1.17583113 0)
+(-0.000434329346 1.1757935 0)
+(-0.000463844715 1.17361594 0)
+(-0.000492859288 1.16136998 0)
+(-0.000522041272 1.1429868 0)
+(-0.000551765978 1.12193685 0)
+(-0.000581815211 1.09797158 0)
+(-0.000612120938 1.0704038 0)
+(-0.000642739433 1.03770975 0)
+(-0.000679607469 0.996687666 0)
+(-0.00414464623 0.939669141 0)
+(-0.00379411282 0.851236437 0)
+(-1.48710905e-05 0.837157521 0)
+(-4.50300131e-05 0.939824246 0)
+(-7.55617916e-05 0.996801056 0)
+(-0.000105963517 1.03782225 0)
+(-0.000136186084 1.07051566 0)
+(-0.00016620269 1.0980828 0)
+(-0.000195965312 1.12204737 0)
+(-0.000225407491 1.14309667 0)
+(-0.000254315899 1.16147945 0)
+(-0.000283068586 1.17372743 0)
+(-0.000312329664 1.17590668 0)
+(-0.000341946117 1.17594504 0)
+(-0.000371622408 1.17594559 0)
+(-0.000401304041 1.17594579 0)
+(-0.000430934565 1.17590808 0)
+(-0.000460215481 1.17372825 0)
+(-0.000488992906 1.16148026 0)
+(-0.00051793271 1.14309928 0)
+(-0.000547413993 1.12205085 0)
+(-0.000577223131 1.09808679 0)
+(-0.000607293309 1.07051996 0)
+(-0.000637680736 1.03782667 0)
+(-0.000674341722 0.996805231 0)
+(-0.00414250136 0.939787102 0)
+(-0.00379464713 0.851681892 0)
+(-1.47516726e-05 0.837274824 0)
+(-4.46743231e-05 0.939941415 0)
+(-7.49722297e-05 0.996917762 0)
+(-0.000105138407 1.03793833 0)
+(-0.000135122181 1.07063098 0)
+(-0.000164895898 1.09819718 0)
+(-0.00019441131 1.12216055 0)
+(-0.000223603244 1.14320836 0)
+(-0.000252262279 1.16158898 0)
+(-0.000280770399 1.17383904 0)
+(-0.000309789447 1.17602059 0)
+(-0.000339163843 1.17605906 0)
+(-0.000368598065 1.17605962 0)
+(-0.000398037463 1.17605984 0)
+(-0.00042742571 1.17602205 0)
+(-0.000456464389 1.17383995 0)
+(-0.000484997073 1.1615899 0)
+(-0.000513687414 1.14321112 0)
+(-0.000542918263 1.1221642 0)
+(-0.000572479816 1.09820137 0)
+(-0.000602306311 1.0706355 0)
+(-0.000632454831 1.037943 0)
+(-0.000668901213 0.99692222 0)
+(-0.00414035493 0.939904489 0)
+(-0.0037952692 0.852127211 0)
+(-1.46277864e-05 0.837391519 0)
+(-4.43050591e-05 0.940057984 0)
+(-7.43602988e-05 0.997033868 0)
+(-0.000104283103 1.0380538 0)
+(-0.000134020355 1.07074567 0)
+(-0.000163543456 1.09831091 0)
+(-0.000192804173 1.12227307 0)
+(-0.000221738474 1.14331938 0)
+(-0.000250141175 1.16169786 0)
+(-0.00027839753 1.17395003 0)
+(-0.000307166807 1.17613387 0)
+(-0.000336291106 1.17617245 0)
+(-0.000365475696 1.17617302 0)
+(-0.000394665414 1.17617325 0)
+(-0.00042380352 1.17613539 0)
+(-0.000452592245 1.17395101 0)
+(-0.000480872734 1.16169888 0)
+(-0.000509306383 1.14332228 0)
+(-0.000538279198 1.12227689 0)
+(-0.000567585434 1.09831531 0)
+(-0.000597160946 1.07075042 0)
+(-0.000627062603 1.03805872 0)
+(-0.000663286417 0.997038607 0)
+(-0.00413820162 0.940021279 0)
+(-0.00379597332 0.852572439 0)
+(-1.44993314e-05 0.837507577 0)
+(-4.39225774e-05 0.940173928 0)
+(-7.37270042e-05 0.99714935 0)
+(-0.000103398196 1.03816863 0)
+(-0.000132880812 1.07085971 0)
+(-0.000162145283 1.09842398 0)
+(-0.000191143617 1.1223849 0)
+(-0.000219813296 1.14342971 0)
+(-0.000247952923 1.16180607 0)
+(-0.000275950075 1.17406036 0)
+(-0.000304461809 1.1762465 0)
+(-0.000333328602 1.17628518 0)
+(-0.000362255538 1.17628577 0)
+(-0.00039118742 1.17628602 0)
+(-0.000420067734 1.17624808 0)
+(-0.000448598993 1.17406143 0)
+(-0.000476620275 1.1618072 0)
+(-0.000504790273 1.14343276 0)
+(-0.000533497939 1.1223889 0)
+(-0.000562541472 1.09842857 0)
+(-0.000591858003 1.07086469 0)
+(-0.000621504936 1.03817381 0)
+(-0.000657498805 0.997154369 0)
+(-0.00413604177 0.940137447 0)
+(-0.0037967591 0.853017634 0)
+(-1.43666328e-05 0.837622974 0)
+(-4.35272484e-05 0.940289222 0)
+(-7.307217e-05 0.997264184 0)
+(-0.000102483275 1.0382828 0)
+(-0.000131703436 1.07097307 0)
+(-0.000160702044 1.09853636 0)
+(-0.000189430988 1.12249603 0)
+(-0.000217828743 1.14353934 0)
+(-0.000245697488 1.16191358 0)
+(-0.000273428112 1.17417002 0)
+(-0.000301675022 1.17635846 0)
+(-0.000330276317 1.17639724 0)
+(-0.000358938072 1.17639785 0)
+(-0.000387605099 1.17639811 0)
+(-0.000416220041 1.17636009 0)
+(-0.000444485908 1.17417117 0)
+(-0.000472240374 1.16191482 0)
+(-0.000500139455 1.14354252 0)
+(-0.000528574639 1.1225002 0)
+(-0.000557348017 1.09854115 0)
+(-0.00058639797 1.07097828 0)
+(-0.000615782037 1.03828824 0)
+(-0.000651537972 0.997269482 0)
+(-0.00413387154 0.940252966 0)
+(-0.00379762299 0.853462847 0)
+(-1.42294679e-05 0.837737682 0)
+(-4.31186806e-05 0.940403841 0)
+(-7.23956392e-05 0.997378345 0)
+(-0.000101538869 1.0383963 0)
+(-0.000130488846 1.07108575 0)
+(-0.000159213641 1.09864802 0)
+(-0.000187665439 1.12260644 0)
+(-0.000215783888 1.14364823 0)
+(-0.000243375218 1.16202039 0)
+(-0.000270832359 1.17427899 0)
+(-0.000298806603 1.17646972 0)
+(-0.000327134901 1.17650861 0)
+(-0.000355523848 1.17650923 0)
+(-0.000383917884 1.1765095 0)
+(-0.000412259716 1.17647141 0)
+(-0.000440253007 1.17428022 0)
+(-0.000467733656 1.16202174 0)
+(-0.00049535487 1.14365155 0)
+(-0.000523510659 1.12261078 0)
+(-0.000552006554 1.09865301 0)
+(-0.000580782012 1.07109118 0)
+(-0.000609895303 1.03840198 0)
+(-0.000645405895 0.997383921 0)
+(-0.00413168799 0.940367811 0)
+(-0.00379856095 0.853908117 0)
+(-1.40879672e-05 0.837851675 0)
+(-4.26970755e-05 0.940517759 0)
+(-7.16979173e-05 0.997491811 0)
+(-0.000100565047 1.03850909 0)
+(-0.000129236826 1.07119771 0)
+(-0.000157680617 1.09875896 0)
+(-0.00018584807 1.12271611 0)
+(-0.000213680355 1.14375638 0)
+(-0.000240987115 1.16212646 0)
+(-0.000268163138 1.17438725 0)
+(-0.000295857237 1.17658027 0)
+(-0.000323904925 1.17661926 0)
+(-0.000352013439 1.17661989 0)
+(-0.000380126988 1.17662018 0)
+(-0.00040818811 1.17658201 0)
+(-0.000435901103 1.17438856 0)
+(-0.000463100544 1.16212792 0)
+(-0.000490436865 1.14375984 0)
+(-0.000518305799 1.12272062 0)
+(-0.00054651676 1.09876414 0)
+(-0.000575010647 1.07120336 0)
+(-0.000603845467 1.03851503 0)
+(-0.000639102957 0.997497663 0)
+(-0.00412948882 0.940481957 0)
+(-0.00379957053 0.854353491 0)
+(-1.39421346e-05 0.837964928 0)
+(-4.22626661e-05 0.94063095 0)
+(-7.09787541e-05 0.997604556 0)
+(-9.95617868e-05 1.03862116 0)
+(-0.000127947902 1.07130893 0)
+(-0.000156102812 1.09886915 0)
+(-0.000183978415 1.12282501 0)
+(-0.000211517287 1.14386377 0)
+(-0.000238532645 1.1622318 0)
+(-0.000265420604 1.17449477 0)
+(-0.000292827175 1.17669008 0)
+(-0.000320586857 1.17672917 0)
+(-0.000348407429 1.17672982 0)
+(-0.000376232849 1.17673012 0)
+(-0.000404005769 1.17669188 0)
+(-0.000431431167 1.17449616 0)
+(-0.000458342206 1.16223336 0)
+(-0.000485386715 1.14386737 0)
+(-0.000512961908 1.12282969 0)
+(-0.000540880754 1.09887452 0)
+(-0.000569085413 1.07131481 0)
+(-0.000597634118 1.03862735 0)
+(-0.000632631026 0.997610682 0)
+(-0.00412727217 0.940595378 0)
+(-0.00380064901 0.85479902 0)
+(-1.37920241e-05 0.838077415 0)
+(-4.18154126e-05 0.940743389 0)
+(-7.02385351e-05 0.997716557 0)
+(-9.85291893e-05 1.03873249 0)
+(-0.000126621418 1.0714194 0)
+(-0.000154480224 1.09897856 0)
+(-0.000182057144 1.12293314 0)
+(-0.000209295533 1.14397037 0)
+(-0.000236012323 1.16233636 0)
+(-0.000262605221 1.17460154 0)
+(-0.000289716765 1.17679913 0)
+(-0.000317180645 1.17683833 0)
+(-0.000344705785 1.17683898 0)
+(-0.000372235936 1.1768393 0)
+(-0.000399713173 1.17680098 0)
+(-0.000426843428 1.17460301 0)
+(-0.000453459214 1.16233804 0)
+(-0.00048020504 1.14397411 0)
+(-0.000507479747 1.12293798 0)
+(-0.000535099545 1.09898414 0)
+(-0.000563007536 1.0714255 0)
+(-0.000591262372 1.03873892 0)
+(-0.000625991421 0.997722956 0)
+(-0.0041250364 0.94070805 0)
+(-0.00380179386 0.855244747 0)
+(-1.36376335e-05 0.838189109 0)
+(-4.13553332e-05 0.940855052 0)
+(-6.94769699e-05 0.99782779 0)
+(-9.74672345e-05 1.03884304 0)
+(-0.000125258073 1.07152909 0)
+(-0.000152813139 1.09908719 0)
+(-0.000180083915 1.12304046 0)
+(-0.000207014993 1.14407617 0)
+(-0.000233426417 1.16244015 0)
+(-0.000259716818 1.17470753 0)
+(-0.000286526014 1.1769074 0)
+(-0.000313686916 1.1769467 0)
+(-0.000340909123 1.17694737 0)
+(-0.000368136487 1.17694771 0)
+(-0.000395310844 1.17690931 0)
+(-0.000422138692 1.17470908 0)
+(-0.000448452129 1.16244193 0)
+(-0.000474892577 1.14408005 0)
+(-0.00050185963 1.12304547 0)
+(-0.000529173051 1.09909296 0)
+(-0.00055677715 1.07153541 0)
+(-0.000584730622 1.03884972 0)
+(-0.000619184389 0.997834462 0)
+(-0.00412277807 0.94081995 0)
+(-0.00380300165 0.855690724 0)
+(-1.34787229e-05 0.838299985 0)
+(-4.08820145e-05 0.940965913 0)
+(-6.86939359e-05 0.997938229 0)
+(-9.63758261e-05 1.0389528 0)
+(-0.000123857422 1.07163797 0)
+(-0.00015110117 1.099195 0)
+(-0.000178058524 1.12314696 0)
+(-0.000204674964 1.14418115 0)
+(-0.000230774049 1.16254313 0)
+(-0.000256755223 1.17481273 0)
+(-0.000283254798 1.17701487 0)
+(-0.000310105348 1.17705428 0)
+(-0.000337017561 1.17705496 0)
+(-0.000363934725 1.17705531 0)
+(-0.000390798492 1.17701684 0)
+(-0.000417316998 1.17481437 0)
+(-0.000443321451 1.16254502 0)
+(-0.00046944978 1.14418517 0)
+(-0.000496102567 1.12315214 0)
+(-0.000523102946 1.09920097 0)
+(-0.000550396306 1.07164452 0)
+(-0.00057804123 1.03895972 0)
+(-0.000612212753 0.997945178 0)
+(-0.00412049682 0.940931054 0)
+(-0.00380427046 0.856136995 0)
+(-1.33155563e-05 0.838410015 0)
+(-4.03957437e-05 0.941075946 0)
+(-6.78892576e-05 0.998047852 0)
+(-9.52544202e-05 1.03906174 0)
+(-0.000122418924 1.07174603 0)
+(-0.000149343847 1.09930198 0)
+(-0.000175980426 1.12325263 0)
+(-0.000202275437 1.14428529 0)
+(-0.000228055352 1.16264529 0)
+(-0.00025371995 1.17491712 0)
+(-0.000279902344 1.17712152 0)
+(-0.00030643486 1.17716104 0)
+(-0.00033302952 1.17716173 0)
+(-0.000359629512 1.1771621 0)
+(-0.000386176103 1.17712355 0)
+(-0.000412378052 1.17491884 0)
+(-0.000438066575 1.1626473 0)
+(-0.000463876494 1.14428945 0)
+(-0.000490208634 1.12325798 0)
+(-0.000516889342 1.09930815 0)
+(-0.000543864887 1.07175281 0)
+(-0.000571194072 1.03906892 0)
+(-0.000605076414 0.99805508 0)
+(-0.00411818754 0.941041338 0)
+(-0.00380559528 0.856583606 0)
+(-1.31478297e-05 0.838519172 0)
+(-3.9895767e-05 0.941185122 0)
+(-6.70619206e-05 0.998156631 0)
+(-9.41016529e-05 1.03916984 0)
+(-0.000120940631 1.07185325 0)
+(-0.000147538738 1.09940811 0)
+(-0.00017384684 1.12335743 0)
+(-0.000199812836 1.14438857 0)
+(-0.000225266365 1.16274662 0)
+(-0.000250607412 1.17502068 0)
+(-0.000276465746 1.17722734 0)
+(-0.000302673499 1.17726695 0)
+(-0.000328943595 1.17726767 0)
+(-0.000355219097 1.17726805 0)
+(-0.00038144115 1.17722942 0)
+(-0.000407319799 1.17502248 0)
+(-0.000432686325 1.16274874 0)
+(-0.000458171872 1.14439288 0)
+(-0.000484177483 1.12336296 0)
+(-0.000510532317 1.09941449 0)
+(-0.000537183662 1.07186026 0)
+(-0.000564190714 1.03917729 0)
+(-0.000597777488 0.998164149 0)
+(-0.00411584978 0.941150782 0)
+(-0.00380697445 0.857030618 0)
+(-1.29754324e-05 0.838627428 0)
+(-3.93819169e-05 0.941293415 0)
+(-6.62115022e-05 0.998264539 0)
+(-9.29168856e-05 1.03927707 0)
+(-0.000119421737 1.0719596 0)
+(-0.000145684574 1.09951336 0)
+(-0.000171656414 1.12346135 0)
+(-0.000197285904 1.14449097 0)
+(-0.000222405606 1.16284708 0)
+(-0.000247415491 1.17512338 0)
+(-0.000272941572 1.17733229 0)
+(-0.000298816706 1.17737201 0)
+(-0.00032475502 1.17737274 0)
+(-0.000350698982 1.17737314 0)
+(-0.000376589815 1.17733444 0)
+(-0.000402138617 1.17512528 0)
+(-0.000427176614 1.16284933 0)
+(-0.000452332011 1.14449545 0)
+(-0.000478005423 1.12346708 0)
+(-0.000504028801 1.09951996 0)
+(-0.000530350501 1.07196687 0)
+(-0.000557029229 1.0392848 0)
+(-0.000590314927 0.998272367 0)
+(-0.00411347906 0.941259366 0)
+(-0.00380840361 0.857478094 0)
+(-1.2797528e-05 0.838734749 0)
+(-3.88514887e-05 0.941400792 0)
+(-6.53337035e-05 0.998371545 0)
+(-9.16944982e-05 1.03938341 0)
+(-0.000117855431 1.07206505 0)
+(-0.000143773909 1.09961771 0)
+(-0.000169400694 1.12356437 0)
+(-0.000194685243 1.14459248 0)
+(-0.000219463005 1.16294667 0)
+(-0.000244134016 1.1752252 0)
+(-0.000269320926 1.17743635 0)
+(-0.000294856193 1.17747618 0)
+(-0.000320455674 1.17747693 0)
+(-0.000346061856 1.17747735 0)
+(-0.000371615136 1.17743859 0)
+(-0.000396828192 1.17522721 0)
+(-0.000421532971 1.16294906 0)
+(-0.000446353415 1.14459713 0)
+(-0.000471689844 1.12357032 0)
+(-0.000497377099 1.09962457 0)
+(-0.000523364165 1.0720726 0)
+(-0.000549710027 1.03939146 0)
+(-0.000582689973 0.99837972 0)
+(-0.00411106947 0.941367078 0)
+(-0.00380987636 0.857926099 0)
+(-1.26138682e-05 0.838841098 0)
+(-3.8303712e-05 0.941507215 0)
+(-6.44268137e-05 0.998477613 0)
+(-9.04311917e-05 1.03948882 0)
+(-0.000116236907 1.07216957 0)
+(-0.000141800102 1.09972113 0)
+(-0.000167071413 1.12366645 0)
+(-0.000192001466 1.14469305 0)
+(-0.000216428483 1.16304535 0)
+(-0.000240751814 1.17532613 0)
+(-0.000265590676 1.17753952 0)
+(-0.000290778281 1.17757946 0)
+(-0.00031603154 1.17758023 0)
+(-0.000341292689 1.17758067 0)
+(-0.000366501975 1.17754184 0)
+(-0.000391373539 1.17532827 0)
+(-0.000415739875 1.16304792 0)
+(-0.000440221315 1.14469793 0)
+(-0.000465217431 1.12367267 0)
+(-0.000490565587 1.0997283 0)
+(-0.000516215487 1.07217747 0)
+(-0.000542225719 1.03949725 0)
+(-0.00057489782 0.9984862 0)
+(-0.00410861163 0.941473909 0)
+(-0.00381138476 0.858374732 0)
+(-1.24220636e-05 0.838946424 0)
+(-3.77313161e-05 0.941612635 0)
+(-6.34790725e-05 0.998582694 0)
+(-8.91116782e-05 1.03959325 0)
+(-0.000114547675 1.07227311 0)
+(-0.000139742272 1.09982357 0)
+(-0.00016464577 1.12376756 0)
+(-0.000189209775 1.14479266 0)
+(-0.000213275408 1.16314309 0)
+(-0.000237241402 1.17542612 0)
+(-0.000261723571 1.17764175 0)
+(-0.000286555706 1.17768181 0)
+(-0.000311456097 1.17768261 0)
+(-0.000336366523 1.17768308 0)
+(-0.000361227177 1.1776442 0)
+(-0.000385753867 1.17542845 0)
+(-0.000409779639 1.16314591 0)
+(-0.000433920777 1.14479785 0)
+(-0.000458575724 1.12377414 0)
+(-0.000483584397 1.09983114 0)
+(-0.000508896785 1.07228147 0)
+(-0.000534571244 1.03960217 0)
+(-0.000566935818 0.998591811 0)
+(-0.00410609586 0.941579862 0)
+(-0.00381292001 0.858824136 0)
+(-1.22206236e-05 0.839050661 0)
+(-3.71295591e-05 0.941716986 0)
+(-6.24819932e-05 0.998686726 0)
+(-8.77232513e-05 1.03969664 0)
+(-0.000112770622 1.07237563 0)
+(-0.000137578556 1.09992499 0)
+(-0.000162097354 1.12386766 0)
+(-0.000186279585 1.14489128 0)
+(-0.00020996941 1.16323987 0)
+(-0.00023356516 1.17552515 0)
+(-0.00025767901 1.17774302 0)
+(-0.000282145423 1.17778321 0)
+(-0.00030668431 1.17778406 0)
+(-0.000331237535 1.17778457 0)
+(-0.000355744507 1.17774564 0)
+(-0.000379922754 1.17552774 0)
+(-0.00040360672 1.16324303 0)
+(-0.000427408823 1.14489688 0)
+(-0.000451725608 1.12387473 0)
+(-0.000476398805 1.09993313 0)
+(-0.000501379052 1.07238462 0)
+(-0.000526723979 1.03970625 0)
+(-0.000558788198 0.998696574 0)
+(-0.00410349556 0.941684961 0)
+(-0.00381446158 0.859274508 0)
+(-1.20033211e-05 0.839153709 0)
+(-3.64800757e-05 0.941820169 0)
+(-6.14054318e-05 0.998789613 0)
+(-8.62249795e-05 1.03979891 0)
+(-0.00011085527 1.07247704 0)
+(-0.000135249986 1.10002531 0)
+(-0.000159359765 1.12396667 0)
+(-0.000183138766 1.14498882 0)
+(-0.000206434143 1.16333562 0)
+(-0.000229643832 1.17562318 0)
+(-0.000253376609 1.17784329 0)
+(-0.000277467667 1.17788363 0)
+(-0.00030163821 1.17788455 0)
+(-0.000325829665 1.17788513 0)
+(-0.000349981762 1.17784618 0)
+(-0.000373813453 1.17562616 0)
+(-0.00039716054 1.16333929 0)
+(-0.000420631222 1.14499508 0)
+(-0.000444619676 1.1239745 0)
+(-0.000468969135 1.10003431 0)
+(-0.000493630015 1.07248697 0)
+(-0.00051865936 1.03980954 0)
+(-0.000550438291 0.998800544 0)
+(-0.00410077709 0.94178926 0)
+(-0.0038159822 0.859726167 0)
+(-1.1764555e-05 0.839255416 0)
+(-3.57650457e-05 0.941922033 0)
+(-6.02186868e-05 0.998891207 0)
+(-8.45728384e-05 1.03989991 0)
+(-0.000108743898 1.07257719 0)
+(-0.000132685701 1.1001244 0)
+(-0.000156349748 1.12406448 0)
+(-0.000179691944 1.14508521 0)
+(-0.000202562846 1.16343025 0)
+(-0.000225360797 1.17572012 0)
+(-0.000248691722 1.17794251 0)
+(-0.000272391313 1.17798304 0)
+(-0.000296182318 1.17798407 0)
+(-0.000320006154 1.17798476 0)
+(-0.000343802102 1.17794583 0)
+(-0.000367291486 1.17572374 0)
+(-0.000390312039 1.16343476 0)
+(-0.000413467121 1.14509248 0)
+(-0.000437147695 1.1240735 0)
+(-0.000461198279 1.10013475 0)
+(-0.000485568226 1.07258861 0)
+(-0.000510312981 1.03991214 0)
+(-0.000541840076 0.998903828 0)
+(-0.00409787169 0.941892876 0)
+(-0.00381743144 0.860179642 0)
+(-1.14886921e-05 0.839355535 0)
+(-3.49378301e-05 0.942022336 0)
+(-5.88443554e-05 0.998991275 0)
+(-8.26601822e-05 1.03999941 0)
+(-0.000106303089 1.0726759 0)
+(-0.000129727926 1.10022208 0)
+(-0.000152887965 1.12416093 0)
+(-0.000175741556 1.14518028 0)
+(-0.000198143155 1.16352365 0)
+(-0.000220493201 1.17581588 0)
+(-0.000243395324 1.17804059 0)
+(-0.000266684746 1.17808139 0)
+(-0.000290085922 1.17808259 0)
+(-0.00031354019 1.17808346 0)
+(-0.000336986411 1.17804462 0)
+(-0.000360148752 1.17582054 0)
+(-0.000382867012 1.16352953 0)
+(-0.000405739374 1.14518922 0)
+(-0.000429152493 1.12417189 0)
+(-0.000452950459 1.10023463 0)
+(-0.000477081278 1.07268972 0)
+(-0.00050159772 1.04001423 0)
+(-0.000532932388 0.99900663 0)
+(-0.00409467446 0.941996018 0)
+(-0.00381872832 0.860635816 0)
+(-1.11574191e-05 0.839453668 0)
+(-3.39410334e-05 0.942120685 0)
+(-5.7184142e-05 0.999089432 0)
+(-8.03486153e-05 1.04009706 0)
+(-0.000103354861 1.0727728 0)
+(-0.000126160174 1.10031803 0)
+(-0.000148721121 1.12425571 0)
+(-0.000170999933 1.14527379 0)
+(-0.000192856796 1.1636156 0)
+(-0.000214696178 1.17591029 0)
+(-0.00023712032 1.17813742 0)
+(-0.000259963838 1.17817859 0)
+(-0.000282952872 1.17818008 0)
+(-0.000306029693 1.17818124 0)
+(-0.000329133371 1.17814261 0)
+(-0.000351991536 1.17591668 0)
+(-0.000374448059 1.16362375 0)
+(-0.000397094962 1.14528551 0)
+(-0.000420312259 1.12426992 0)
+(-0.000443942211 1.10033422 0)
+(-0.000467929434 1.07279063 0)
+(-0.000492322524 1.04011619 0)
+(-0.000523576911 0.99910932 0)
+(-0.00409097995 0.942099076 0)
+(-0.00381972308 0.861096198 0)
+(-1.07317392e-05 0.839549162 0)
+(-3.26574325e-05 0.942216431 0)
+(-5.50431486e-05 0.99918505 0)
+(-7.73674332e-05 1.04019225 0)
+(-9.95562443e-05 1.07286733 0)
+(-0.000121571823 1.1004117 0)
+(-0.000143376088 1.12434835 0)
+(-0.00016493796 1.1453653 0)
+(-0.00018612629 1.16370572 0)
+(-0.000207352583 1.17600304 0)
+(-0.000229219651 1.17823276 0)
+(-0.000251561658 1.17827449 0)
+(-0.00027410661 1.17827647 0)
+(-0.000296797892 1.17827814 0)
+(-0.000319575652 1.17823992 0)
+(-0.000342173381 1.17601234 0)
+(-0.000364441702 1.16371771 0)
+(-0.000386965161 1.14538171 0)
+(-0.000410112866 1.12436803 0)
+(-0.000433722836 1.10043406 0)
+(-0.000457734432 1.07289191 0)
+(-0.00048218904 1.04021862 0)
+(-0.000513559759 0.999212561 0)
+(-0.00408644424 0.942202744 0)
+(-0.00382015726 0.861563431 0)
+(-1.0161217e-05 0.839640959 0)
+(-3.0931923e-05 0.942308531 0)
+(-5.21571486e-05 0.999277104 0)
+(-7.33436173e-05 1.04028398 0)
+(-9.44269558e-05 1.07295854 0)
+(-0.000115376839 1.10050223 0)
+(-0.00013616385 1.12443804 0)
+(-0.000156767106 1.14545408 0)
+(-0.000177066711 1.16379339 0)
+(-0.000197491339 1.17609359 0)
+(-0.00021865101 1.17832618 0)
+(-0.000240375507 1.17836879 0)
+(-0.000262396149 1.17837161 0)
+(-0.000284662604 1.17837412 0)
+(-0.000307119742 1.17833667 0)
+(-0.000329511413 1.17610784 0)
+(-0.000351698266 1.16381188 0)
+(-0.000374258597 1.14547844 0)
+(-0.000397548743 1.12446698 0)
+(-0.000421397939 1.10053503 0)
+(-0.000445734733 1.07299459 0)
+(-0.000470586556 1.04032265 0)
+(-0.000502436186 0.999317561 0)
+(-0.00408039973 0.942308295 0)
+(-0.00381954246 0.862042174 0)
+(-9.36108537e-06 0.839727374 0)
+(-2.85062589e-05 0.942395315 0)
+(-4.80906553e-05 0.999363953 0)
+(-6.766457e-05 1.04037066 0)
+(-8.71776648e-05 1.0730449 0)
+(-0.00010661267 1.10058813 0)
+(-0.000125953965 1.12452338 0)
+(-0.000145193721 1.14553885 0)
+(-0.000164227005 1.16387742 0)
+(-0.00018351618 1.17618094 0)
+(-0.000203688966 1.17841687 0)
+(-0.000224567101 1.17846087 0)
+(-0.000245889099 1.17846507 0)
+(-0.000267619394 1.17846902 0)
+(-0.000289717383 1.17843297 0)
+(-0.000311949492 1.17620354 0)
+(-0.000334196086 1.16390689 0)
+(-0.000357035966 1.14557665 0)
+(-0.000380813828 1.12456805 0)
+(-0.000405343329 1.1006387 0)
+(-0.00043053481 1.07310049 0)
+(-0.000456391869 1.04043034 0)
+(-0.000489386807 0.999426555 0)
+(-0.0040715684 0.942418111 0)
+(-0.0038169316 0.862541495 0)
+(-8.23629049e-06 0.839805898 0)
+(-2.50815923e-05 0.942474259 0)
+(-4.2323804e-05 0.999443086 0)
+(-5.9581926e-05 1.04044981 0)
+(-7.68223091e-05 1.07312395 0)
+(-9.40444842e-05 1.10066703 0)
+(-0.00011125046 1.12460209 0)
+(-0.000128453983 1.14561742 0)
+(-0.000145583959 1.16395578 0)
+(-0.000163137792 1.17626321 0)
+(-0.00018175518 1.17850313 0)
+(-0.000201266409 1.17854928 0)
+(-0.000221437532 1.17855571 0)
+(-0.000242263015 1.17856206 0)
+(-0.000263735112 1.17852845 0)
+(-0.000285684449 1.17629957 0)
+(-0.000308064062 1.16400348 0)
+(-0.000331458964 1.14567767 0)
+(-0.000356199427 1.12467317 0)
+(-0.000382108007 1.10074766 0)
+(-0.000409084545 1.07321281 0)
+(-0.000437095811 1.04054547 0)
+(-0.000472559647 0.999543771 0)
+(-0.00405718152 0.942536761 0)
+(-0.00381030562 0.863074815 0)
+(-6.64264715e-06 0.839872835 0)
+(-2.02355226e-05 0.942541681 0)
+(-3.41691811e-05 0.999510824 0)
+(-4.81431971e-05 1.04051773 0)
+(-6.21331829e-05 1.073192 0)
+(-7.61422937e-05 1.10073522 0)
+(-9.01826739e-05 1.12467043 0)
+(-0.000104296698 1.14568612 0)
+(-0.000118461015 1.1640249 0)
+(-0.000133218709 1.17633679 0)
+(-0.000149229313 1.17858141 0)
+(-0.000166334024 1.17863068 0)
+(-0.000184335365 1.17864047 0)
+(-0.000203288776 1.17865053 0)
+(-0.000223260436 1.1786209 0)
+(-0.000244205618 1.17639449 0)
+(-0.000266237604 1.16410117 0)
+(-0.000290022466 1.14578208 0)
+(-0.00031595847 1.12478429 0)
+(-0.000343999698 1.10086552 0)
+(-0.000374160467 1.07333713 0)
+(-0.000406454224 1.04067571 0)
+(-0.000447217796 0.999678996 0)
+(-0.00403033592 0.94267588 0)
+(-0.003794689 0.86371258 0)
+(-4.54216259e-06 0.839923835 0)
+(-1.38366636e-05 0.942593286 0)
+(-2.33649566e-05 0.99956284 0)
+(-3.29143099e-05 1.04057001 0)
+(-4.245319e-05 1.07324449 0)
+(-5.19712427e-05 1.10078791 0)
+(-6.1476771e-05 1.12472343 0)
+(-7.09983732e-05 1.14573964 0)
+(-8.04983553e-05 1.16407909 0)
+(-9.0676762e-05 1.17639604 0)
+(-0.000102309606 1.17864611 0)
+(-0.000115143877 1.17869929 0)
+(-0.00012896216 1.17871349 0)
+(-0.000143898645 1.17872863 0)
+(-0.000160123504 1.17870475 0)
+(-0.000177707114 1.17648287 0)
+(-0.000196909339 1.16419496 0)
+(-0.000218695765 1.14588611 0)
+(-0.000243828914 1.12489933 0)
+(-0.000272641127 1.1009924 0)
+(-0.000305693392 1.07347649 0)
+(-0.000343740987 1.04082774 0)
+(-0.000393988302 0.999843221 0)
+(-0.00396984124 0.942851868 0)
+(-0.00375791546 0.864323852 0)
+(-1.81935273e-06 0.839952852 0)
+(-5.5367566e-06 0.942622763 0)
+(-9.32350916e-06 0.999592511 0)
+(-1.30645218e-05 1.04059968 0)
+(-1.67172205e-05 1.07327403 0)
+(-2.02507623e-05 1.10081724 0)
+(-2.36289036e-05 1.12475252 0)
+(-2.68232649e-05 1.14576853 0)
+(-2.97687325e-05 1.16410773 0)
+(-3.31339419e-05 1.17642954 0)
+(-3.76182983e-05 1.1786847 0)
+(-4.29375529e-05 1.17874124 0)
+(-4.89090693e-05 1.17875947 0)
+(-5.57134847e-05 1.17877956 0)
+(-6.35971561e-05 1.17876171 0)
+(-7.26759562e-05 1.17654508 0)
+(-8.323067e-05 1.16426412 0)
+(-9.65458339e-05 1.14596937 0)
+(-0.00011404687 1.12499965 0)
+(-0.000136961917 1.10111401 0)
+(-0.00016722845 1.07362507 0)
+(-0.000207856064 1.04101109 0)
+(-0.000269356572 1.00007221 0)
+(-0.00372315467 0.943144241 0)
+(-0.00356940992 0.866332146 0)
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           nonuniform List<vector>
+25
+(
+(-4.60189677e-09 0.755456613 0)
+(-1.47587203e-08 0.858128651 0)
+(-2.64999003e-08 0.915116569 0)
+(-3.93587271e-08 0.956150227 0)
+(-5.31566889e-08 0.988858187 0)
+(-6.72937353e-08 1.01644433 0)
+(-8.00868045e-08 1.040436 0)
+(-9.25824699e-08 1.0615243 0)
+(-7.55567409e-08 1.07998962 0)
+(-2.38476164e-08 1.09217578 0)
+(4.79245648e-09 1.09426728 0)
+(3.60564309e-09 1.09430161 0)
+(-3.00982411e-11 1.0943018 0)
+(-3.66293544e-09 1.09430161 0)
+(-4.8368792e-09 1.09426724 0)
+(2.38985692e-08 1.09217496 0)
+(7.56902928e-08 1.07998866 0)
+(9.26355318e-08 1.06152443 0)
+(8.00265591e-08 1.04043643 0)
+(6.71951884e-08 1.01644477 0)
+(5.30665119e-08 0.988858534 0)
+(3.92930509e-08 0.956150446 0)
+(2.64590407e-08 0.915116673 0)
+(1.47368762e-08 0.858128676 0)
+(4.59480307e-09 0.755456597 0)
+)
+;
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        phi             phi.gas;
+        value           nonuniform List<vector>
+25
+(
+(-1.81935273e-06 0.839952852 0)
+(-5.5367566e-06 0.942622763 0)
+(-9.32350916e-06 0.999592511 0)
+(-1.30645218e-05 1.04059968 0)
+(-1.67172205e-05 1.07327403 0)
+(-2.02507623e-05 1.10081724 0)
+(-2.36289036e-05 1.12475252 0)
+(-2.68232649e-05 1.14576853 0)
+(-2.97687325e-05 1.16410773 0)
+(-3.31339419e-05 1.17642954 0)
+(-3.76182983e-05 1.1786847 0)
+(-4.29375529e-05 1.17874124 0)
+(-4.89090693e-05 1.17875947 0)
+(-5.57134847e-05 1.17877956 0)
+(-6.35971561e-05 1.17876171 0)
+(-7.26759562e-05 1.17654508 0)
+(-8.323067e-05 1.16426412 0)
+(-9.65458339e-05 1.14596937 0)
+(-0.00011404687 1.12499965 0)
+(-0.000136961917 1.10111401 0)
+(-0.00016722845 1.07362507 0)
+(-0.000207856064 1.04101109 0)
+(-0.000269356572 1.00007221 0)
+(-0.00372315467 0.943144241 0)
+(-0.00356940992 0.866332146 0)
+)
+;
+    }
+    wall1
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    wall2
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid
new file mode 100644
index 0000000000..41ee729104
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/U.liquid
@@ -0,0 +1,1989 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "5";
+    object      U.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   nonuniform List<vector>
+1875
+(
+(-8.16162354e-06 0.755492887 0)
+(-2.43594806e-05 0.858164368 0)
+(-4.02824185e-05 0.915151621 0)
+(-5.58902387e-05 0.956184543 0)
+(-7.11523962e-05 0.988891703 0)
+(-8.60406985e-05 1.01647698 0)
+(-0.000100536643 1.04046777 0)
+(-0.000114681431 1.06155539 0)
+(-0.000128545545 1.08002014 0)
+(-0.000144066614 1.09221424 0)
+(-0.000162388753 1.09431025 0)
+(-0.000181689971 1.09434442 0)
+(-0.000200945016 1.09434457 0)
+(-0.000220246125 1.09434462 0)
+(-0.000239683289 1.09431061 0)
+(-0.000258198276 1.09221388 0)
+(-0.000273910992 1.08001958 0)
+(-0.000287995441 1.06155611 0)
+(-0.000302455446 1.04046902 0)
+(-0.000317377156 1.0164785 0)
+(-0.00033281234 0.988893404 0)
+(-0.000348747247 0.956186398 0)
+(-0.000365138708 0.915153572 0)
+(-0.000381693555 0.858165992 0)
+(-0.000194973061 0.755495669 0)
+(-8.22220542e-06 0.755565704 0)
+(-2.46552481e-05 0.858236577 0)
+(-4.10578185e-05 0.915223081 0)
+(-5.74205426e-05 0.956255175 0)
+(-7.37467331e-05 0.988961464 0)
+(-9.00515707e-05 1.01654586 0)
+(-0.000106365381 1.04053583 0)
+(-0.000122740763 1.06162298 0)
+(-0.000139248834 1.08008754 0)
+(-0.00015600482 1.09229029 0)
+(-0.000173064132 1.09439145 0)
+(-0.000190332593 1.09442575 0)
+(-0.000207686401 1.09442594 0)
+(-0.000225027701 1.09442611 0)
+(-0.000242256784 1.09439209 0)
+(-0.00025924428 1.09229019 0)
+(-0.000275885853 1.08008706 0)
+(-0.000292225552 1.06162384 0)
+(-0.000308367369 1.04053729 0)
+(-0.000324366617 1.01654765 0)
+(-0.000340252332 0.988963456 0)
+(-0.000356020944 0.95625725 0)
+(-0.00037163987 0.915224988 0)
+(-0.000386932841 0.85823727 0)
+(-0.000197229759 0.755568445 0)
+(-8.24326136e-06 0.755638884 0)
+(-2.47320287e-05 0.858309716 0)
+(-4.12231165e-05 0.915296135 0)
+(-5.7715637e-05 0.956328143 0)
+(-7.42125538e-05 0.989034376 0)
+(-9.07198976e-05 1.01661878 0)
+(-0.000107246362 1.04060887 0)
+(-0.000123802063 1.06169631 0)
+(-0.000140381906 1.08016128 0)
+(-0.000156992888 1.09236486 0)
+(-0.000173661658 1.09446679 0)
+(-0.00019037303 1.09450144 0)
+(-0.000207090449 1.09450168 0)
+(-0.000223788882 1.09450165 0)
+(-0.000240442579 1.09446714 0)
+(-0.000257013343 1.09236429 0)
+(-0.000273483623 1.08016013 0)
+(-0.000289876952 1.06169626 0)
+(-0.000306196782 1.04060915 0)
+(-0.000322434469 1.01661907 0)
+(-0.000338596637 0.989034473 0)
+(-0.000354688902 0.956327837 0)
+(-0.000370717133 0.915295055 0)
+(-0.000386572895 0.858306665 0)
+(-0.000197214927 0.755637505 0)
+(-8.26498873e-06 0.755712254 0)
+(-2.4798754e-05 0.858383113 0)
+(-4.13376351e-05 0.915369539 0)
+(-5.78795182e-05 0.95640156 0)
+(-7.44255068e-05 0.989107817 0)
+(-9.09764484e-05 1.01669226 0)
+(-0.000107531711 1.04068241 0)
+(-0.000124093126 1.06176995 0)
+(-0.000140631835 1.08023483 0)
+(-0.000157141468 1.09243851 0)
+(-0.000173677339 1.09454071 0)
+(-0.000190241909 1.09457541 0)
+(-0.000206801411 1.09457561 0)
+(-0.000223346398 1.09457547 0)
+(-0.000239867563 1.09454076 0)
+(-0.000256330862 1.09243748 0)
+(-0.000272738478 1.08023306 0)
+(-0.00028914597 1.06176911 0)
+(-0.000305547296 1.04068173 0)
+(-0.000321914102 1.0166914 0)
+(-0.000338249471 0.989106574 0)
+(-0.000354555155 0.956399727 0)
+(-0.000370835107 0.915366757 0)
+(-0.000386979455 0.85837821 0)
+(-0.000197494825 0.755708943 0)
+(-8.28210392e-06 0.755785796 0)
+(-2.48500137e-05 0.858456689 0)
+(-4.14220929e-05 0.915443122 0)
+(-5.79953078e-05 0.956475154 0)
+(-7.45691506e-05 0.989181421 0)
+(-9.11424741e-05 1.01676588 0)
+(-0.000107713202 1.04075602 0)
+(-0.000124280557 1.06184357 0)
+(-0.000140791634 1.08030809 0)
+(-0.00015724006 1.09251173 0)
+(-0.000173729102 1.09461427 0)
+(-0.000190266353 1.09464897 0)
+(-0.000206799249 1.09464913 0)
+(-0.000223322796 1.09464893 0)
+(-0.000239831897 1.09461411 0)
+(-0.000256274142 1.09251038 0)
+(-0.000272657947 1.0803059 0)
+(-0.000289087042 1.06184221 0)
+(-0.000305555593 1.04075471 0)
+(-0.000322012113 1.0167643 0)
+(-0.000338457214 0.989179371 0)
+(-0.000354890204 0.956472435 0)
+(-0.000371312128 0.915439391 0)
+(-0.000387609529 0.858450784 0)
+(-0.000197849278 0.755781465 0)
+(-8.29934701e-06 0.755859492 0)
+(-2.49012191e-05 0.858530415 0)
+(-4.15058752e-05 0.915516849 0)
+(-5.81092903e-05 0.95654888 0)
+(-7.47108552e-05 0.989255142 0)
+(-9.1309327e-05 1.01683959 0)
+(-0.000107901371 1.0408297 0)
+(-0.000124483589 1.06191722 0)
+(-0.000140987413 1.08038117 0)
+(-0.000157411258 1.09258474 0)
+(-0.000173891797 1.09468779 0)
+(-0.000190437407 1.09472249 0)
+(-0.000206981643 1.09472262 0)
+(-0.000223520007 1.09472238 0)
+(-0.000240048411 1.09468749 0)
+(-0.000256500542 1.0925832 0)
+(-0.000272884849 1.08037872 0)
+(-0.000289339238 1.06191554 0)
+(-0.000305862673 1.04082802 0)
+(-0.000322386704 1.01683758 0)
+(-0.000338908877 0.989252614 0)
+(-0.000355427248 0.956545643 0)
+(-0.000371941698 0.915512567 0)
+(-0.000388337456 0.858523935 0)
+(-0.000198238477 0.755854577 0)
+(-8.31802678e-06 0.755933347 0)
+(-2.49570358e-05 0.858604297 0)
+(-4.15978184e-05 0.915590724 0)
+(-5.82363094e-05 0.956622746 0)
+(-7.48720951e-05 0.989328997 0)
+(-9.15032559e-05 1.01691342 0)
+(-0.00010812541 1.04090349 0)
+(-0.000124732299 1.06199095 0)
+(-0.000141239685 1.08045417 0)
+(-0.000157651789 1.09265768 0)
+(-0.000174138213 1.09476137 0)
+(-0.000190706689 1.09479608 0)
+(-0.000207276173 1.0947962 0)
+(-0.000223842227 1.09479593 0)
+(-0.000240400467 1.09476099 0)
+(-0.00025686974 1.09265602 0)
+(-0.00027325807 1.08045155 0)
+(-0.000289735636 1.06198907 0)
+(-0.000306306962 1.04090157 0)
+(-0.000322888246 1.01691115 0)
+(-0.000339473775 0.989326184 0)
+(-0.000356059793 0.956619203 0)
+(-0.000372644993 0.915586116 0)
+(-0.000389114086 0.858597476 0)
+(-0.000198645416 0.755928088 0)
+(-8.33935578e-06 0.75600738 0)
+(-2.50203218e-05 0.858678353 0)
+(-4.17016683e-05 0.915664766 0)
+(-5.837972e-05 0.956696777 0)
+(-7.50542836e-05 0.989403012 0)
+(-9.17231206e-05 1.01698741 0)
+(-0.000108380285 1.04097741 0)
+(-0.000125015525 1.06206477 0)
+(-0.000141531175 1.08052712 0)
+(-0.00015793917 1.0927306 0)
+(-0.000174438776 1.09483505 0)
+(-0.000191036651 1.0948698 0)
+(-0.000207638195 1.0948699 0)
+(-0.000224237659 1.09486963 0)
+(-0.000240829304 1.09483462 0)
+(-0.000257318335 1.09272886 0)
+(-0.000273711608 1.08052441 0)
+(-0.000290209177 1.06206277 0)
+(-0.000306823149 1.04097536 0)
+(-0.000323455452 1.01698498 0)
+(-0.000340096167 0.989400027 0)
+(-0.000356740024 0.956693049 0)
+(-0.000373385073 0.915659961 0)
+(-0.000389916113 0.858671321 0)
+(-0.000199062231 0.75600191 0)
+(-8.36256027e-06 0.75608161 0)
+(-2.50892094e-05 0.858752601 0)
+(-4.18151568e-05 0.915738996 0)
+(-5.85368045e-05 0.956770991 0)
+(-7.52536902e-05 0.989477205 0)
+(-9.19632506e-05 1.01706156 0)
+(-0.000108658429 1.04105149 0)
+(-0.000125324926 1.0621387 0)
+(-0.00014185174 1.08060004 0)
+(-0.000158259985 1.09280353 0)
+(-0.000174777468 1.09490887 0)
+(-0.000191407103 1.09494366 0)
+(-0.0002080412 1.09494376 0)
+(-0.000224674179 1.09494347 0)
+(-0.00024130012 1.09490841 0)
+(-0.000257810764 1.09280174 0)
+(-0.000274209532 1.08059727 0)
+(-0.000290724945 1.06213663 0)
+(-0.000307377798 1.04104935 0)
+(-0.00032405721 1.01705904 0)
+(-0.000340749057 0.989474112 0)
+(-0.000357446294 0.956767146 0)
+(-0.000374146484 0.915734065 0)
+(-0.000390734156 0.858745435 0)
+(-0.000199485592 0.756076006 0)
+(-8.3872544e-06 0.756156054 0)
+(-2.51627398e-05 0.858827055 0)
+(-4.19359115e-05 0.915813426 0)
+(-5.87033898e-05 0.956845401 0)
+(-7.54651028e-05 0.989551588 0)
+(-9.22177966e-05 1.0171359 0)
+(-0.000108952441 1.04112573 0)
+(-0.000125650466 1.06221274 0)
+(-0.000142189607 1.08067295 0)
+(-0.00015860105 1.09287648 0)
+(-0.000175138735 1.09498283 0)
+(-0.000191801556 1.09501767 0)
+(-0.000208469824 1.09501776 0)
+(-0.000225137275 1.09501747 0)
+(-0.000241797444 1.09498235 0)
+(-0.000258330369 1.09287466 0)
+(-0.000274735394 1.08067014 0)
+(-0.000291267129 1.06221063 0)
+(-0.000307956409 1.04112354 0)
+(-0.000324680535 1.01713331 0)
+(-0.000341421201 0.989548426 0)
+(-0.000358169434 0.956841479 0)
+(-0.000374922163 0.915808411 0)
+(-0.000391564191 0.858819799 0)
+(-0.000199914445 0.75615036 0)
+(-8.41314402e-06 0.756230722 0)
+(-2.52395082e-05 0.858901728 0)
+(-4.20617507e-05 0.915888066 0)
+(-5.8876695e-05 0.956920017 0)
+(-7.56846524e-05 0.989626171 0)
+(-9.24814623e-05 1.01721042 0)
+(-0.000109256223 1.04120013 0)
+(-0.000125986248 1.06228691 0)
+(-0.000142538482 1.08074586 0)
+(-0.000158955144 1.09294948 0)
+(-0.000175514752 1.09505693 0)
+(-0.000192211566 1.09509183 0)
+(-0.000208914619 1.09509192 0)
+(-0.000225617088 1.09509163 0)
+(-0.000242312147 1.09505644 0)
+(-0.000258868577 1.09294763 0)
+(-0.000275280571 1.08074302 0)
+(-0.000291827298 1.06228477 0)
+(-0.000308551084 1.04119791 0)
+(-0.000325318526 1.0172078 0)
+(-0.000342106812 0.98962296 0)
+(-0.000358905078 0.95691604 0)
+(-0.000375709311 0.915882992 0)
+(-0.000392404282 0.858894405 0)
+(-0.000200347924 0.756224963 0)
+(-8.43964101e-06 0.756305624 0)
+(-2.53182438e-05 0.858976627 0)
+(-4.21910321e-05 0.915962923 0)
+(-5.90548441e-05 0.956994843 0)
+(-7.59100193e-05 0.989700959 0)
+(-9.27518396e-05 1.01728514 0)
+(-0.000109567207 1.04127471 0)
+(-0.000126328627 1.06236119 0)
+(-0.000142894027 1.08081877 0)
+(-0.000159317896 1.09302252 0)
+(-0.000175901299 1.09513119 0)
+(-0.000192632801 1.09516614 0)
+(-0.000209370928 1.09516623 0)
+(-0.000226108467 1.09516594 0)
+(-0.000242838546 1.09513069 0)
+(-0.000259419223 1.09302066 0)
+(-0.000275839282 1.08081591 0)
+(-0.000292400771 1.06235903 0)
+(-0.000309157776 1.04127245 0)
+(-0.000325967534 1.01728248 0)
+(-0.000342802564 0.989697712 0)
+(-0.0003596501 0.956990826 0)
+(-0.000376505171 0.915957804 0)
+(-0.000393252834 0.858969251 0)
+(-0.000200785687 0.756299813 0)
+(-8.46687798e-06 0.756380764 0)
+(-2.53990344e-05 0.859051757 0)
+(-4.23235276e-05 0.916038003 0)
+(-5.9237212e-05 0.957069885 0)
+(-7.61402809e-05 0.989775954 0)
+(-9.30271073e-05 1.01736005 0)
+(-0.000109882696 1.04134944 0)
+(-0.00012667521 1.06243558 0)
+(-0.000143254341 1.08089169 0)
+(-0.000159686936 1.09309563 0)
+(-0.000176295076 1.0952056 0)
+(-0.000193061522 1.09524062 0)
+(-0.000209835191 1.0952407 0)
+(-0.000226608503 1.0952404 0)
+(-0.000243374059 1.09520509 0)
+(-0.000259980139 1.09309376 0)
+(-0.000276409594 1.08088882 0)
+(-0.000292985515 1.0624334 0)
+(-0.00030977431 1.04134717 0)
+(-0.000326625294 1.01735737 0)
+(-0.000343506628 0.989772677 0)
+(-0.000360403123 0.957065834 0)
+(-0.000377309221 0.916032845 0)
+(-0.000394109747 0.859044336 0)
+(-0.000201227541 0.756374912 0)
+(-8.4946528e-06 0.756456148 0)
+(-2.5481431e-05 0.859127123 0)
+(-4.2458331e-05 0.91611331 0)
+(-5.94222049e-05 0.957145145 0)
+(-7.63734029e-05 0.989851157 0)
+(-9.33055292e-05 1.01743516 0)
+(-0.000110201533 1.04142435 0)
+(-0.000127024754 1.06251008 0)
+(-0.000143617586 1.08096462 0)
+(-0.000160060462 1.09316881 0)
+(-0.000176695003 1.09528016 0)
+(-0.000193496958 1.09531525 0)
+(-0.000210306405 1.09531533 0)
+(-0.000227115741 1.09531503 0)
+(-0.000243917007 1.09527965 0)
+(-0.000260549465 1.09316693 0)
+(-0.000276989278 1.08096174 0)
+(-0.000293579216 1.06250789 0)
+(-0.000310399251 1.04142206 0)
+(-0.000327291219 1.01743245 0)
+(-0.000344218454 0.989847854 0)
+(-0.000361163874 0.957141065 0)
+(-0.000378121164 0.916108118 0)
+(-0.000394974898 0.859119662 0)
+(-0.000201673685 0.756450258 0)
+(-8.52284997e-06 0.756531782 0)
+(-2.5564911e-05 0.859202729 0)
+(-4.25948495e-05 0.916188845 0)
+(-5.96096787e-05 0.957220626 0)
+(-7.66095757e-05 0.98992657 0)
+(-9.3587224e-05 1.01751045 0)
+(-0.00011052317 1.04149942 0)
+(-0.000127376632 1.06258468 0)
+(-0.000143983648 1.08103757 0)
+(-0.000160437942 1.09324208 0)
+(-0.000177099678 1.09535488 0)
+(-0.000193937687 1.09539004 0)
+(-0.000210783411 1.09539012 0)
+(-0.000227628883 1.09538982 0)
+(-0.000244465925 1.09535437 0)
+(-0.000261125662 1.09324018 0)
+(-0.000277577344 1.08103467 0)
+(-0.000294181783 1.06258248 0)
+(-0.000311032443 1.04149711 0)
+(-0.000327964623 1.01750773 0)
+(-0.000344937517 0.989923244 0)
+(-0.00036193197 0.957216519 0)
+(-0.000378940558 0.916183623 0)
+(-0.000395847765 0.85919523 0)
+(-0.000202123793 0.756525855 0)
+(-8.55133793e-06 0.756607667 0)
+(-2.56494377e-05 0.859278578 0)
+(-4.27333431e-05 0.916264613 0)
+(-5.97997164e-05 0.95729633 0)
+(-7.68485688e-05 0.990002194 0)
+(-9.38714843e-05 1.01758594 0)
+(-0.000110846751 1.04157464 0)
+(-0.000127729608 1.0626594 0)
+(-0.000144350973 1.08111054 0)
+(-0.000160818375 1.09331543 0)
+(-0.000177508541 1.09542976 0)
+(-0.000194383051 1.09546499 0)
+(-0.000211265455 1.09546507 0)
+(-0.0002281476 1.09546477 0)
+(-0.000245021322 1.09542924 0)
+(-0.000261709713 1.09331351 0)
+(-0.000278174427 1.08110763 0)
+(-0.000294793168 1.06265718 0)
+(-0.000311673372 1.04157232 0)
+(-0.000328645215 1.0175832 0)
+(-0.000345663753 0.989998846 0)
+(-0.000362707229 0.957292197 0)
+(-0.000379767267 0.916259362 0)
+(-0.000396728412 0.859271043 0)
+(-0.0002025779 0.756601706 0)
+(-8.58015674e-06 0.756683807 0)
+(-2.57351406e-05 0.859354674 0)
+(-4.2873519e-05 0.916340617 0)
+(-5.99915681e-05 0.957372258 0)
+(-7.7089263e-05 0.990078028 0)
+(-9.41573911e-05 1.01766162 0)
+(-0.00011117217 1.04165003 0)
+(-0.000128084601 1.06273421 0)
+(-0.000144720797 1.08118354 0)
+(-0.0001612025 1.09338887 0)
+(-0.000177922006 1.09550481 0)
+(-0.000194833251 1.0955401 0)
+(-0.00021175263 1.09554018 0)
+(-0.000228671605 1.09553988 0)
+(-0.000245581976 1.09550428 0)
+(-0.000262299658 1.09338695 0)
+(-0.000278778646 1.08118061 0)
+(-0.000295412217 1.06273199 0)
+(-0.000312321828 1.0416477 0)
+(-0.000329333168 1.01765886 0)
+(-0.000346397201 0.99007466 0)
+(-0.000363489938 0.957368099 0)
+(-0.00038060207 0.916335336 0)
+(-0.00039761769 0.859347104 0)
+(-0.000203036465 0.756677812 0)
+(-8.6093761e-06 0.756760205 0)
+(-2.58216888e-05 0.859431019 0)
+(-4.30151408e-05 0.916416857 0)
+(-6.01856321e-05 0.957448411 0)
+(-7.73328e-05 0.990154075 0)
+(-9.44461794e-05 1.0177375 0)
+(-0.000111499577 1.04172557 0)
+(-0.000128440566 1.06280913 0)
+(-0.000145091805 1.08125656 0)
+(-0.000161589205 1.09346242 0)
+(-0.000178338982 1.09558001 0)
+(-0.000195287239 1.09561538 0)
+(-0.000212244129 1.09561546 0)
+(-0.00022920076 1.09561516 0)
+(-0.000246148238 1.09557948 0)
+(-0.000262896067 1.09346048 0)
+(-0.000279390758 1.08125363 0)
+(-0.000296039699 1.0628069 0)
+(-0.000312978374 1.04172323 0)
+(-0.00033002854 1.01773472 0)
+(-0.000347137578 0.990150686 0)
+(-0.00036427958 0.957444228 0)
+(-0.000381444118 0.916411548 0)
+(-0.000398514625 0.859423413 0)
+(-0.000203498907 0.756754177 0)
+(-8.63890968e-06 0.756836864 0)
+(-2.59091795e-05 0.859507616 0)
+(-4.31581617e-05 0.916493337 0)
+(-6.03811897e-05 0.95752479 0)
+(-7.75775175e-05 0.990230333 0)
+(-9.47358902e-05 1.01781356 0)
+(-0.000111827869 1.04180127 0)
+(-0.00012879767 1.06288415 0)
+(-0.000145464984 1.08132963 0)
+(-0.00016197925 1.09353607 0)
+(-0.000178760165 1.09565538 0)
+(-0.000195746164 1.09569083 0)
+(-0.00021274068 1.09569091 0)
+(-0.000229734971 1.09569061 0)
+(-0.000246720103 1.09565485 0)
+(-0.000263499198 1.09353412 0)
+(-0.000280010749 1.08132668 0)
+(-0.000296675449 1.0628819 0)
+(-0.000313642802 1.04179891 0)
+(-0.00033073156 1.01781076 0)
+(-0.00034788574 0.990226923 0)
+(-0.000365077043 0.957520583 0)
+(-0.000382293924 0.916487999 0)
+(-0.000399419816 0.859499974 0)
+(-0.000203965775 0.756830802 0)
+(-8.66860344e-06 0.756913786 0)
+(-2.59974964e-05 0.859584468 0)
+(-4.33024845e-05 0.916570059 0)
+(-6.05783182e-05 0.957601397 0)
+(-7.78240451e-05 0.990306802 0)
+(-9.50271294e-05 1.0178898 0)
+(-0.000112157423 1.04187712 0)
+(-0.00012915561 1.06295926 0)
+(-0.000145839125 1.08140274 0)
+(-0.000162371935 1.09360984 0)
+(-0.000179185062 1.09573092 0)
+(-0.000196208921 1.09576645 0)
+(-0.000213241626 1.09576652 0)
+(-0.000230274086 1.09576622 0)
+(-0.000247297371 1.09573038 0)
+(-0.000264108785 1.09360788 0)
+(-0.00028063882 1.08139977 0)
+(-0.000297319852 1.06295701 0)
+(-0.000314315397 1.04187475 0)
+(-0.000331442289 1.017887 0)
+(-0.000348641179 0.990303371 0)
+(-0.000365881682 0.957597166 0)
+(-0.000383151649 0.916564692 0)
+(-0.000400333665 0.859576791 0)
+(-0.000204436985 0.756907691 0)
+(-8.69869861e-06 0.756990974 0)
+(-2.60866827e-05 0.859661577 0)
+(-4.34483435e-05 0.916647024 0)
+(-6.07775228e-05 0.957678232 0)
+(-7.80725463e-05 0.990383481 0)
+(-9.53202651e-05 1.01796624 0)
+(-0.000112488291 1.04195312 0)
+(-0.000129514471 1.06303448 0)
+(-0.000146215066 1.08147589 0)
+(-0.000162767539 1.09368373 0)
+(-0.000179613802 1.09580663 0)
+(-0.000196676259 1.09584224 0)
+(-0.00021374742 1.09584231 0)
+(-0.000230818351 1.09584201 0)
+(-0.00024787993 1.09580608 0)
+(-0.000264724163 1.09368176 0)
+(-0.000281273844 1.08147292 0)
+(-0.000297972061 1.06303222 0)
+(-0.000314995832 1.04195074 0)
+(-0.000332160493 1.01796341 0)
+(-0.000349404043 0.99038003 0)
+(-0.000366694228 0.957673977 0)
+(-0.000384017456 0.916641628 0)
+(-0.000401255604 0.859653864 0)
+(-0.000204912368 0.756984844 0)
+(-8.72888995e-06 0.75706843 0)
+(-2.61763116e-05 0.859738945 0)
+(-4.35947664e-05 0.916724234 0)
+(-6.0977489e-05 0.957755297 0)
+(-7.83224172e-05 0.990460371 0)
+(-9.56147962e-05 1.01804286 0)
+(-0.000112820393 1.04202927 0)
+(-0.000129874787 1.0631098 0)
+(-0.000146593125 1.0815491 0)
+(-0.000163166344 1.09375774 0)
+(-0.000180046289 1.09588251 0)
+(-0.000197147477 1.0959182 0)
+(-0.000214257697 1.09591827 0)
+(-0.00023136767 1.09591796 0)
+(-0.000248468092 1.09588196 0)
+(-0.000265346264 1.09375576 0)
+(-0.000281916788 1.08154611 0)
+(-0.000298632525 1.06310753 0)
+(-0.000315684486 1.04202687 0)
+(-0.000332886894 1.01804002 0)
+(-0.000350174957 0.9904569 0)
+(-0.000367514545 0.957751017 0)
+(-0.000384891091 0.916718809 0)
+(-0.000402186087 0.859731196 0)
+(-0.000205392198 0.757062266 0)
+(-8.75939513e-06 0.757146156 0)
+(-2.62669074e-05 0.859816575 0)
+(-4.37428645e-05 0.916801691 0)
+(-6.11793925e-05 0.957832593 0)
+(-7.8573692e-05 0.990537473 0)
+(-9.59102052e-05 1.01811967 0)
+(-0.000113153327 1.04210557 0)
+(-0.00013023605 1.06318522 0)
+(-0.000146972797 1.08162237 0)
+(-0.000163568312 1.09383189 0)
+(-0.000180483114 1.09595856 0)
+(-0.000197623356 1.09599433 0)
+(-0.000214772839 1.0959944 0)
+(-0.000231922264 1.09599409 0)
+(-0.000249061966 1.095958 0)
+(-0.000265974747 1.0938299 0)
+(-0.000282567347 1.08161937 0)
+(-0.000299301445 1.06318294 0)
+(-0.00031638133 1.04210316 0)
+(-0.000333621172 1.01811681 0)
+(-0.000350953748 0.99053398 0)
+(-0.000368343071 0.957828287 0)
+(-0.00038577347 0.916796236 0)
+(-0.000403125544 0.859808789 0)
+(-0.000205876576 0.757139958 0)
+(-8.78995185e-06 0.757224153 0)
+(-2.63578145e-05 0.859894468 0)
+(-4.38916649e-05 0.916879396 0)
+(-6.13821503e-05 0.957910118 0)
+(-7.88260757e-05 0.990614784 0)
+(-9.62071341e-05 1.01819666 0)
+(-0.000113487355 1.04218202 0)
+(-0.000130597993 1.06326074 0)
+(-0.000147354323 1.08169571 0)
+(-0.00016397333 1.09390618 0)
+(-0.00018092344 1.09603478 0)
+(-0.000198103471 1.09607064 0)
+(-0.000215292753 1.09607071 0)
+(-0.000232481794 1.0960704 0)
+(-0.000249660896 1.09603423 0)
+(-0.00026660906 1.09390417 0)
+(-0.000283225354 1.08169269 0)
+(-0.000299979031 1.06325845 0)
+(-0.000317087156 1.0421796 0)
+(-0.000334364102 1.01819378 0)
+(-0.000351740924 0.990611271 0)
+(-0.000369179933 0.957905789 0)
+(-0.000386664342 0.916873912 0)
+(-0.000404074 0.859886646 0)
+(-0.000206365577 0.75721792 0)
+(-8.82084923e-06 0.757302423 0)
+(-2.64494097e-05 0.859972627 0)
+(-4.404117e-05 0.916957352 0)
+(-6.1585978e-05 0.957987875 0)
+(-7.90797208e-05 0.990692305 0)
+(-9.65049757e-05 1.01827383 0)
+(-0.000113822605 1.04225861 0)
+(-0.00013096168 1.06333637 0)
+(-0.000147737888 1.08176911 0)
+(-0.000164381428 1.0939806 0)
+(-0.000181367672 1.09611119 0)
+(-0.000198587777 1.09614712 0)
+(-0.000215817482 1.09614719 0)
+(-0.000233046784 1.09614689 0)
+(-0.000250265998 1.09611062 0)
+(-0.000267250366 1.09397858 0)
+(-0.0002838911 1.08176609 0)
+(-0.000300664757 1.06333407 0)
+(-0.000317801107 1.04225618 0)
+(-0.000335115245 1.01827094 0)
+(-0.000352536365 0.990688773 0)
+(-0.000370024925 0.957983521 0)
+(-0.000387563534 0.916951838 0)
+(-0.000405031099 0.859964767 0)
+(-0.000206858931 0.757296155 0)
+(-8.85176879e-06 0.757380968 0)
+(-2.65414081e-05 0.860051052 0)
+(-4.41916181e-05 0.917035558 0)
+(-6.17909431e-05 0.958065865 0)
+(-7.93347016e-05 0.990770037 0)
+(-9.68041973e-05 1.01835118 0)
+(-0.000114158635 1.04233536 0)
+(-0.000131326077 1.0634121 0)
+(-0.000148123489 1.0818426 0)
+(-0.000164792917 1.09405517 0)
+(-0.000181816134 1.09618777 0)
+(-0.000199076635 1.09622379 0)
+(-0.000216346566 1.09622386 0)
+(-0.000233616409 1.09622355 0)
+(-0.000250876473 1.0961872 0)
+(-0.000267897921 1.09405314 0)
+(-0.000284564312 1.08183956 0)
+(-0.000301358766 1.06340979 0)
+(-0.000318523566 1.04233291 0)
+(-0.000335874925 1.01834827 0)
+(-0.000353340199 0.990766484 0)
+(-0.000370878702 0.958061485 0)
+(-0.000388471783 0.917030014 0)
+(-0.000405997404 0.860043155 0)
+(-0.00020735706 0.757374665 0)
+(-8.88292035e-06 0.757459789 0)
+(-2.66339399e-05 0.860129745 0)
+(-4.43429215e-05 0.917114017 0)
+(-6.19969176e-05 0.958144088 0)
+(-7.95903075e-05 0.99084798 0)
+(-9.71037764e-05 1.01842872 0)
+(-0.000114495367 1.04241225 0)
+(-0.000131691494 1.06348794 0)
+(-0.000148510808 1.08191617 0)
+(-0.000165207325 1.0941299 0)
+(-0.000182268289 1.09626453 0)
+(-0.000199569904 1.09630064 0)
+(-0.000216880961 1.09630071 0)
+(-0.000234191784 1.0963004 0)
+(-0.000251492491 1.09626396 0)
+(-0.000268551533 1.09412785 0)
+(-0.00028524516 1.08191311 0)
+(-0.000302061809 1.06348561 0)
+(-0.000319255251 1.04240978 0)
+(-0.000336643366 1.0184258 0)
+(-0.000354152684 0.990844405 0)
+(-0.000371740846 0.958139682 0)
+(-0.000389388594 0.917108443 0)
+(-0.000406972925 0.860121811 0)
+(-0.000207859867 0.75745345 0)
+(-8.91415135e-06 0.757538887 0)
+(-2.67267097e-05 0.860208707 0)
+(-4.4494616e-05 0.91719273 0)
+(-6.22035889e-05 0.958222544 0)
+(-7.98470762e-05 0.990926132 0)
+(-9.74048531e-05 1.01850644 0)
+(-0.00011483351 1.04248928 0)
+(-0.00013205852 1.06356388 0)
+(-0.00014890055 1.08198983 0)
+(-0.000165625208 1.09420478 0)
+(-0.000182724448 1.09634147 0)
+(-0.00020006734 1.09637767 0)
+(-0.000217420004 1.09637774 0)
+(-0.000234772418 1.09637742 0)
+(-0.000252114535 1.0963409 0)
+(-0.000269211817 1.09420272 0)
+(-0.000285933566 1.08198676 0)
+(-0.000302772922 1.06356155 0)
+(-0.00031999541 1.04248681 0)
+(-0.000337420781 1.0185035 0)
+(-0.00035497413 0.990922536 0)
+(-0.000372612322 0.958218113 0)
+(-0.000390314996 0.917187125 0)
+(-0.000407957815 0.860200736 0)
+(-0.000208367301 0.757532512 0)
+(-8.94529811e-06 0.757618262 0)
+(-2.68195792e-05 0.86028794 0)
+(-4.46467675e-05 0.917271697 0)
+(-6.24109008e-05 0.958301234 0)
+(-8.01045008e-05 0.991004495 0)
+(-9.77062316e-05 1.01858434 0)
+(-0.000115171884 1.04256647 0)
+(-0.000132426518 1.06363994 0)
+(-0.000149292538 1.08206358 0)
+(-0.000166046445 1.09427981 0)
+(-0.000183184875 1.0964186 0)
+(-0.000200569632 1.09645488 0)
+(-0.000217964025 1.09645495 0)
+(-0.000235358163 1.09645464 0)
+(-0.000252742144 1.09641802 0)
+(-0.000269878617 1.09427775 0)
+(-0.00028662962 1.0820605 0)
+(-0.000303492801 1.0636376 0)
+(-0.000320744565 1.04256398 0)
+(-0.000338206893 1.01858138 0)
+(-0.000355804446 0.991000878 0)
+(-0.0003734928 0.958296778 0)
+(-0.000391250676 0.917266063 0)
+(-0.000408952589 0.860279931 0)
+(-0.000208879829 0.757611852 0)
+(-8.97651328e-06 0.757697915 0)
+(-2.69126577e-05 0.860367445 0)
+(-4.47992689e-05 0.91735092 0)
+(-6.26185173e-05 0.95838016 0)
+(-8.03621487e-05 0.991083069 0)
+(-9.80082398e-05 1.01866243 0)
+(-0.000115511308 1.0426438 0)
+(-0.000132795509 1.06371612 0)
+(-0.00014968636 1.08213744 0)
+(-0.00016647085 1.09435502 0)
+(-0.000183648868 1.09649592 0)
+(-0.000201075991 1.09653229 0)
+(-0.000218513079 1.09653235 0)
+(-0.000235949751 1.09653204 0)
+(-0.00025337595 1.09649533 0)
+(-0.000270552035 1.09435294 0)
+(-0.000287333458 1.08213435 0)
+(-0.000304221465 1.06371376 0)
+(-0.000321502964 1.0426413 0)
+(-0.000339002719 1.01865945 0)
+(-0.000356644495 0.99107943 0)
+(-0.000374382742 0.958375678 0)
+(-0.000392195747 0.917345256 0)
+(-0.00040995685 0.860359397 0)
+(-0.000209397166 0.757691468 0)
+(-9.00795101e-06 0.757777846 0)
+(-2.70060776e-05 0.860447222 0)
+(-4.49520952e-05 0.917430399 0)
+(-6.28268128e-05 0.95845932 0)
+(-8.06206849e-05 0.991161853 0)
+(-9.8311042e-05 1.01874069 0)
+(-0.000115851642 1.04272128 0)
+(-0.000133166085 1.06379241 0)
+(-0.000150082702 1.08221141 0)
+(-0.00016689859 1.09443039 0)
+(-0.000184117174 1.09657342 0)
+(-0.000201587139 1.09660988 0)
+(-0.000219066727 1.09660995 0)
+(-0.000236546218 1.09660963 0)
+(-0.000254015365 1.09657283 0)
+(-0.000271231936 1.09442829 0)
+(-0.000288044839 1.0822083 0)
+(-0.00030495851 1.06379004 0)
+(-0.00032227032 1.04271877 0)
+(-0.000339807493 1.0187377 0)
+(-0.000357493589 0.991158193 0)
+(-0.000375282311 0.958454812 0)
+(-0.000393150508 0.917424704 0)
+(-0.000410970669 0.860439136 0)
+(-0.000209919286 0.757771362 0)
+(-9.03901406e-06 0.757858055 0)
+(-2.7099035e-05 0.860527271 0)
+(-4.51050172e-05 0.917510136 0)
+(-6.3035391e-05 0.958538717 0)
+(-8.08796723e-05 0.991240848 0)
+(-9.86142703e-05 1.01881914 0)
+(-0.000116192357 1.04279892 0)
+(-0.000133537671 1.06386881 0)
+(-0.000150481179 1.08228549 0)
+(-0.000167329904 1.09450593 0)
+(-0.000184589585 1.09665112 0)
+(-0.00020210272 1.09668767 0)
+(-0.000219625832 1.09668773 0)
+(-0.000237148521 1.09668741 0)
+(-0.000254660707 1.09665052 0)
+(-0.000271918412 1.09450382 0)
+(-0.000288764184 1.08228236 0)
+(-0.000305704776 1.06386644 0)
+(-0.000323047134 1.04279639 0)
+(-0.0003406218 1.01881613 0)
+(-0.000358352132 0.991237167 0)
+(-0.000376191238 0.958534184 0)
+(-0.000394115387 0.91750441 0)
+(-0.000411995039 0.860519147 0)
+(-0.000210446578 0.757851535 0)
+(-9.07045578e-06 0.757938541 0)
+(-2.71924774e-05 0.860607594 0)
+(-4.52580796e-05 0.917590132 0)
+(-6.32441409e-05 0.95861835 0)
+(-8.11388683e-05 0.991320055 0)
+(-9.89180899e-05 1.01889777 0)
+(-0.000116534252 1.0428767 0)
+(-0.00013391094 1.06394535 0)
+(-0.000150882468 1.08235969 0)
+(-0.00016776487 1.09458164 0)
+(-0.000185066128 1.09672901 0)
+(-0.000202622912 1.09676564 0)
+(-0.000220189681 1.09676571 0)
+(-0.000237756197 1.09676539 0)
+(-0.000255312208 1.09672841 0)
+(-0.000272611509 1.09457952 0)
+(-0.000289490814 1.08235655 0)
+(-0.000306459455 1.06394296 0)
+(-0.000323833207 1.04287416 0)
+(-0.000341445811 1.01889475 0)
+(-0.000359220821 0.991316353 0)
+(-0.000377110271 0.958613791 0)
+(-0.000395089847 0.917584374 0)
+(-0.000413029117 0.86059943 0)
+(-0.000210978961 0.757931984 0)
+(-9.10154751e-06 0.758019306 0)
+(-2.72855374e-05 0.86068819 0)
+(-4.54110298e-05 0.917670386 0)
+(-6.34528583e-05 0.95869822 0)
+(-8.13982862e-05 0.991399474 0)
+(-9.92222235e-05 1.01897659 0)
+(-0.000116876538 1.04295464 0)
+(-0.000134285168 1.06402201 0)
+(-0.000151285797 1.08243402 0)
+(-0.000168203089 1.09465754 0)
+(-0.000185546738 1.09680709 0)
+(-0.000203147607 1.09684382 0)
+(-0.000220758457 1.09684388 0)
+(-0.000238369212 1.09684356 0)
+(-0.000255969431 1.09680648 0)
+(-0.000273311209 1.09465541 0)
+(-0.000290225652 1.08243086 0)
+(-0.000307223303 1.06401961 0)
+(-0.000324628923 1.04295209 0)
+(-0.000342279614 1.01897355 0)
+(-0.0003600991 0.991395752 0)
+(-0.00037803918 0.958693636 0)
+(-0.000396074622 0.917664597 0)
+(-0.000414073447 0.860679988 0)
+(-0.000211516329 0.758012711 0)
+(-9.13273863e-06 0.758100347 0)
+(-2.73785735e-05 0.860769059 0)
+(-4.55638635e-05 0.917750898 0)
+(-6.36615376e-05 0.958778328 0)
+(-8.16577187e-05 0.991479107 0)
+(-9.95267448e-05 1.01905559 0)
+(-0.000117219596 1.04303274 0)
+(-0.000134660593 1.0640988 0)
+(-0.000151691316 1.08250847 0)
+(-0.000168644663 1.09473361 0)
+(-0.000186031478 1.09688537 0)
+(-0.000203677016 1.09692219 0)
+(-0.00022133271 1.09692225 0)
+(-0.000238988161 1.09692193 0)
+(-0.000256632938 1.09688476 0)
+(-0.000274017791 1.09473147 0)
+(-0.000290968028 1.08250531 0)
+(-0.000307995668 1.06409638 0)
+(-0.000325433709 1.04303017 0)
+(-0.000343122974 1.01905253 0)
+(-0.000360987383 0.991475362 0)
+(-0.000378978185 0.958773718 0)
+(-0.000397069576 0.917745079 0)
+(-0.000415128001 0.860760818 0)
+(-0.000212058855 0.758093715 0)
+(-9.16374498e-06 0.758181664 0)
+(-2.74714026e-05 0.860850201 0)
+(-4.57168338e-05 0.91783167 0)
+(-6.38707459e-05 0.958858674 0)
+(-8.19177974e-05 0.991558953 0)
+(-9.98315699e-05 1.01913478 0)
+(-0.00011756315 1.04311099 0)
+(-0.000135037397 1.06417573 0)
+(-0.000152099462 1.08258307 0)
+(-0.000169089948 1.09480988 0)
+(-0.000186520478 1.09696385 0)
+(-0.000204211244 1.09700076 0)
+(-0.000221911831 1.09700082 0)
+(-0.000239612156 1.09700049 0)
+(-0.000257302116 1.09696324 0)
+(-0.000274730614 1.09480772 0)
+(-0.000291717876 1.08257989 0)
+(-0.000308776882 1.0641733 0)
+(-0.00032624817 1.04310841 0)
+(-0.000343976319 1.0191317 0)
+(-0.000361885988 0.991555186 0)
+(-0.000379927709 0.958854038 0)
+(-0.0003980751 0.91782582 0)
+(-0.000416193186 0.860841921 0)
+(-0.000212606626 0.758174995 0)
+(-9.1946296e-06 0.758263257 0)
+(-2.75638777e-05 0.860931617 0)
+(-4.586922e-05 0.917912702 0)
+(-6.40792726e-05 0.95893926 0)
+(-8.21775369e-05 0.991639013 0)
+(-0.000100136858 1.01921416 0)
+(-0.000117907816 1.04318941 0)
+(-0.000135416031 1.06425279 0)
+(-0.000152510401 1.08265781 0)
+(-0.000169538839 1.09488633 0)
+(-0.000187013529 1.09704253 0)
+(-0.000204749766 1.09707953 0)
+(-0.000222496148 1.09707959 0)
+(-0.000240242268 1.09707926 0)
+(-0.000257977699 1.09704191 0)
+(-0.000275450555 1.09488416 0)
+(-0.000292476017 1.08265462 0)
+(-0.000309567106 1.06425035 0)
+(-0.000327072178 1.04318681 0)
+(-0.000344839531 1.01921106 0)
+(-0.000362794375 0.991635226 0)
+(-0.000380887381 0.958934597 0)
+(-0.000399091097 0.917906821 0)
+(-0.000417268807 0.860923297 0)
+(-0.000213159647 0.75825655 0)
+(-9.22532416e-06 0.758345124 0)
+(-2.76559622e-05 0.861013305 0)
+(-4.60213831e-05 0.917993995 0)
+(-6.42879602e-05 0.959020086 0)
+(-8.24375441e-05 0.991719289 0)
+(-0.000100442411 1.01929372 0)
+(-0.000118253107 1.04326798 0)
+(-0.000135795817 1.06433 0)
+(-0.000152923524 1.08273271 0)
+(-0.000169991063 1.09496298 0)
+(-0.000187510817 1.09712142 0)
+(-0.000205293233 1.09715851 0)
+(-0.000223085634 1.09715856 0)
+(-0.000240877769 1.09715824 0)
+(-0.000258659187 1.09712079 0)
+(-0.000276176873 1.0949608 0)
+(-0.000293241473 1.08272949 0)
+(-0.00031036621 1.06432754 0)
+(-0.000327906068 1.04326537 0)
+(-0.000345713305 1.01929061 0)
+(-0.000363713729 0.99171548 0)
+(-0.000381857647 0.959015396 0)
+(-0.000400117331 0.917988081 0)
+(-0.000418354769 0.861004946 0)
+(-0.000213717898 0.75833838 0)
+(-9.25588523e-06 0.758427262 0)
+(-2.77476468e-05 0.861095266 0)
+(-4.61730531e-05 0.918075549 0)
+(-6.44960452e-05 0.959101152 0)
+(-8.2697138e-05 0.991799781 0)
+(-0.000100748032 1.01937348 0)
+(-0.000118598926 1.04334672 0)
+(-0.000136177112 1.06440735 0)
+(-0.00015333952 1.08280775 0)
+(-0.000170447404 1.09503982 0)
+(-0.000188012635 1.09720051 0)
+(-0.000205841328 1.09723769 0)
+(-0.000223680367 1.09723774 0)
+(-0.000241519146 1.09723742 0)
+(-0.000259347219 1.09719988 0)
+(-0.00027691065 1.09503763 0)
+(-0.000294015259 1.08280453 0)
+(-0.000311174265 1.06440488 0)
+(-0.000328749178 1.0433441 0)
+(-0.000346596314 1.01937035 0)
+(-0.000364642727 0.99179595 0)
+(-0.000382838551 0.959096436 0)
+(-0.000401155016 0.918069603 0)
+(-0.000419452004 0.861086868 0)
+(-0.000214281574 0.758420482 0)
+(-9.28640715e-06 0.758509673 0)
+(-2.78392347e-05 0.861177498 0)
+(-4.63244357e-05 0.918157363 0)
+(-6.4704039e-05 0.95918246 0)
+(-8.29570726e-05 0.991880492 0)
+(-0.000101054152 1.01945343 0)
+(-0.00011894581 1.04342563 0)
+(-0.000136560103 1.06448485 0)
+(-0.000153757886 1.08288296 0)
+(-0.000170906747 1.09511686 0)
+(-0.000188518168 1.09727981 0)
+(-0.000206394129 1.09731708 0)
+(-0.000224280249 1.09731713 0)
+(-0.000242166101 1.0973168 0)
+(-0.000260041068 1.09727917 0)
+(-0.000277650432 1.09511466 0)
+(-0.000294796195 1.08287972 0)
+(-0.000311990857 1.06448237 0)
+(-0.000329602128 1.04342299 0)
+(-0.000347490121 1.01945028 0)
+(-0.000365582692 0.991876639 0)
+(-0.00038383013 0.959177718 0)
+(-0.000402203232 0.918151386 0)
+(-0.000420560067 0.86116906 0)
+(-0.00021485077 0.758502855 0)
+(-9.31658662e-06 0.758592353 0)
+(-2.79301354e-05 0.861260002 0)
+(-4.64752931e-05 0.918239439 0)
+(-6.49114953e-05 0.95926401 0)
+(-8.32164406e-05 0.991961421 0)
+(-0.000101360331 1.01953357 0)
+(-0.000119293188 1.04350471 0)
+(-0.000136944364 1.06456251 0)
+(-0.000154178826 1.08295834 0)
+(-0.000171369811 1.09519411 0)
+(-0.000189028249 1.09735932 0)
+(-0.000206951834 1.09739668 0)
+(-0.000224885423 1.09739673 0)
+(-0.000242818577 1.0973964 0)
+(-0.000260741188 1.09735867 0)
+(-0.000278397615 1.09519189 0)
+(-0.00029558559 1.08295508 0)
+(-0.000312817057 1.06456002 0)
+(-0.000330465018 1.04350205 0)
+(-0.000348394034 1.0195304 0)
+(-0.000366533395 0.991957546 0)
+(-0.000384833048 0.959259242 0)
+(-0.000403262725 0.91823343 0)
+(-0.000421678855 0.861251525 0)
+(-0.000215425235 0.758585496 0)
+(-9.34666619e-06 0.7586753 0)
+(-2.80205854e-05 0.861342777 0)
+(-4.6625388e-05 0.918321775 0)
+(-6.51184135e-05 0.959345803 0)
+(-8.34756885e-05 0.992042571 0)
+(-0.000101666497 1.01961391 0)
+(-0.000119641004 1.04358396 0)
+(-0.000137329845 1.06464032 0)
+(-0.000154602099 1.08303389 0)
+(-0.000171836269 1.09527156 0)
+(-0.000189542189 1.09743904 0)
+(-0.000207513792 1.09747649 0)
+(-0.000225495542 1.09747654 0)
+(-0.000243477007 1.09747621 0)
+(-0.000261447748 1.09743839 0)
+(-0.000279151742 1.09526933 0)
+(-0.000296382964 1.08303061 0)
+(-0.000313651903 1.06463782 0)
+(-0.000331337504 1.04358129 0)
+(-0.000349308626 1.01961072 0)
+(-0.000367495019 0.992038674 0)
+(-0.000385846617 0.959341008 0)
+(-0.000404333069 0.918315735 0)
+(-0.000422808806 0.861334259 0)
+(-0.000216005223 0.758668406 0)
+(-9.3763513e-06 0.758758514 0)
+(-2.81101938e-05 0.86142582 0)
+(-4.67747138e-05 0.918404374 0)
+(-6.53246388e-05 0.959427841 0)
+(-8.37344831e-05 0.992123943 0)
+(-0.00010197296 1.01969444 0)
+(-0.00011999008 1.04366339 0)
+(-0.00013771746 1.0647183 0)
+(-0.00015502847 1.08310961 0)
+(-0.000172306666 1.09534922 0)
+(-0.00019006058 1.09751897 0)
+(-0.000208080742 1.09755652 0)
+(-0.00022611123 1.09755657 0)
+(-0.000244141443 1.09755624 0)
+(-0.000262160768 1.09751832 0)
+(-0.000279912786 1.09534698 0)
+(-0.000297187891 1.08310632 0)
+(-0.0003144958 1.06471578 0)
+(-0.000332220028 1.0436607 0)
+(-0.000350233205 1.01969124 0)
+(-0.000368467043 0.992120024 0)
+(-0.000386871469 0.959423019 0)
+(-0.00040541489 0.918398301 0)
+(-0.000423949742 0.861417262 0)
+(-0.000216590578 0.758751581 0)
+(-9.40585791e-06 0.75884199 0)
+(-2.81992821e-05 0.861509131 0)
+(-4.69233873e-05 0.918487234 0)
+(-6.55304669e-05 0.959510123 0)
+(-8.39931797e-05 0.992205539 0)
+(-0.000102279487 1.01977518 0)
+(-0.000120339561 1.04374299 0)
+(-0.000138106484 1.06479645 0)
+(-0.000155457398 1.08318552 0)
+(-0.00017278056 1.0954271 0)
+(-0.000190583374 1.09759913 0)
+(-0.000208652831 1.09763676 0)
+(-0.00022673229 1.09763681 0)
+(-0.00024481149 1.09763648 0)
+(-0.000262880145 1.09759847 0)
+(-0.000280680934 1.09542485 0)
+(-0.000298000882 1.08318222 0)
+(-0.000315348393 1.06479391 0)
+(-0.000333111994 1.04374029 0)
+(-0.00035116842 1.01977196 0)
+(-0.000369450206 0.992201597 0)
+(-0.000387907469 0.959505275 0)
+(-0.000406507844 0.918481129 0)
+(-0.000425101919 0.861500533 0)
+(-0.000217181619 0.75883502 0)
+(-9.43517799e-06 0.758925728 0)
+(-2.82878229e-05 0.861592709 0)
+(-4.7071172e-05 0.918570356 0)
+(-6.57354284e-05 0.959592651 0)
+(-8.42513847e-05 0.992287361 0)
+(-0.000102586087 1.01985612 0)
+(-0.000120689894 1.04382278 0)
+(-0.000138497017 1.06487477 0)
+(-0.000155888867 1.08326161 0)
+(-0.000173258017 1.09550519 0)
+(-0.000191110215 1.0976795 0)
+(-0.000209229259 1.09771723 0)
+(-0.000227358465 1.09771727 0)
+(-0.000245487574 1.09771694 0)
+(-0.000263605787 1.09767884 0)
+(-0.000281455925 1.09550293 0)
+(-0.000298821999 1.0832583 0)
+(-0.000316210594 1.06487222 0)
+(-0.000334014409 1.04382007 0)
+(-0.00035211428 1.01985288 0)
+(-0.000370444364 0.992283396 0)
+(-0.000388954773 0.959587777 0)
+(-0.000407612388 0.918564218 0)
+(-0.000426265616 0.861584071 0)
+(-0.00021777827 0.75891872 0)
+(-9.46409259e-06 0.759009725 0)
+(-2.83754982e-05 0.861676553 0)
+(-4.7217987e-05 0.918653738 0)
+(-6.59393241e-05 0.959675427 0)
+(-8.45085824e-05 0.992369408 0)
+(-0.000102892205 1.01993726 0)
+(-0.000121040563 1.04390276 0)
+(-0.000138889014 1.06495326 0)
+(-0.000156322926 1.0833379 0)
+(-0.000173738816 1.09558351 0)
+(-0.000191640913 1.0977601 0)
+(-0.000209810361 1.09779791 0)
+(-0.000227990137 1.09779796 0)
+(-0.000246169479 1.09779763 0)
+(-0.000264337928 1.09775943 0)
+(-0.000282238124 1.09558123 0)
+(-0.000299650888 1.08333457 0)
+(-0.000317081455 1.0649507 0)
+(-0.000334926639 1.04390003 0)
+(-0.000353071057 1.019934 0)
+(-0.000371450032 0.992365422 0)
+(-0.000390013852 0.959670525 0)
+(-0.000408728652 0.918647569 0)
+(-0.000427440621 0.861667875 0)
+(-0.000218380467 0.759002679 0)
+(-9.49270694e-06 0.759093977 0)
+(-2.84622781e-05 0.86176066 0)
+(-4.73638324e-05 0.918737382 0)
+(-6.61426965e-05 0.959758451 0)
+(-8.47659321e-05 0.992451684 0)
+(-0.000103198906 1.02001861 0)
+(-0.000121392162 1.04398292 0)
+(-0.000139282702 1.06503193 0)
+(-0.000156759815 1.08341439 0)
+(-0.000174223607 1.09566204 0)
+(-0.000192176469 1.09784092 0)
+(-0.000210396562 1.09787882 0)
+(-0.000228626821 1.09787887 0)
+(-0.000246856978 1.09787853 0)
+(-0.000265076405 1.09784024 0)
+(-0.000283027386 1.09565975 0)
+(-0.000300488115 1.08341104 0)
+(-0.000317961812 1.06502936 0)
+(-0.000335848871 1.04398018 0)
+(-0.000354038342 1.02001534 0)
+(-0.000372466839 0.992447676 0)
+(-0.000391084316 0.959753521 0)
+(-0.000409856325 0.918731181 0)
+(-0.000428627002 0.861751942 0)
+(-0.000218988295 0.759086893 0)
+(-9.52118544e-06 0.759178484 0)
+(-2.85488501e-05 0.861845031 0)
+(-4.75093049e-05 0.918821287 0)
+(-6.63452717e-05 0.959841722 0)
+(-8.50224403e-05 0.992534192 0)
+(-0.00010350539 1.02010018 0)
+(-0.000121744487 1.04406328 0)
+(-0.000139678054 1.06511079 0)
+(-0.000157199131 1.08349107 0)
+(-0.000174711552 1.0957408 0)
+(-0.000192715821 1.09792196 0)
+(-0.00021098747 1.09795996 0)
+(-0.000229269103 1.09796001 0)
+(-0.000247550466 1.09795967 0)
+(-0.000265821269 1.09792128 0)
+(-0.000283823603 1.0957385 0)
+(-0.000301333034 1.08348771 0)
+(-0.000318850912 1.0651082 0)
+(-0.000336781198 1.04406052 0)
+(-0.000355016553 1.02009688 0)
+(-0.000373494732 0.992530161 0)
+(-0.000392166367 0.959836766 0)
+(-0.000410995909 0.918815054 0)
+(-0.000429824939 0.861836272 0)
+(-0.000219601813 0.759171361 0)
+(-9.54933134e-06 0.759263241 0)
+(-2.86342429e-05 0.861929662 0)
+(-4.76530582e-05 0.918905453 0)
+(-6.65465692e-05 0.959925244 0)
+(-8.52782531e-05 0.992616932 0)
+(-0.000103811776 1.02018195 0)
+(-0.000122097525 1.04414384 0)
+(-0.000140074972 1.06518984 0)
+(-0.000157641245 1.08356797 0)
+(-0.000175203358 1.0958198 0)
+(-0.000193259587 1.09800324 0)
+(-0.000211583028 1.09804133 0)
+(-0.000229916795 1.09804138 0)
+(-0.000248250296 1.09804104 0)
+(-0.000266572932 1.09800256 0)
+(-0.000284627146 1.09581748 0)
+(-0.000302186048 1.08356459 0)
+(-0.000319749087 1.06518724 0)
+(-0.000337723226 1.04414106 0)
+(-0.000356005023 1.02017864 0)
+(-0.000374533891 0.992612878 0)
+(-0.000393259969 0.959920261 0)
+(-0.00041214676 0.918899188 0)
+(-0.000431033944 0.861920863 0)
+(-0.000220220759 0.759256081 0)
+(-9.57701166e-06 0.759348247 0)
+(-2.87187637e-05 0.862014552 0)
+(-4.77960851e-05 0.918989878 0)
+(-6.67471804e-05 0.960009016 0)
+(-8.55334846e-05 0.992699907 0)
+(-0.000104117716 1.02026395 0)
+(-0.000122450579 1.04422459 0)
+(-0.000140473176 1.06526909 0)
+(-0.000158086221 1.08364508 0)
+(-0.000175698885 1.09589902 0)
+(-0.000193807573 1.09808475 0)
+(-0.000212183647 1.09812293 0)
+(-0.000230569714 1.09812298 0)
+(-0.000248955332 1.09812263 0)
+(-0.00026733038 1.09808406 0)
+(-0.000285437306 1.09589669 0)
+(-0.000303046988 1.08364168 0)
+(-0.000320656495 1.06526647 0)
+(-0.000338675628 1.0442218 0)
+(-0.000357004705 1.02026062 0)
+(-0.000375584455 0.99269583 0)
+(-0.000394365346 0.960004006 0)
+(-0.000413309769 0.918983581 0)
+(-0.000432255018 0.862005713 0)
+(-0.000220845682 0.759341049 0)
+(-9.60457117e-06 0.759433499 0)
+(-2.88027771e-05 0.862099701 0)
+(-4.79380884e-05 0.919074564 0)
+(-6.69464425e-05 0.960093039 0)
+(-8.5787723e-05 0.992783117 0)
+(-0.000104423705 1.02034616 0)
+(-0.000122804961 1.04430555 0)
+(-0.000140873593 1.06534853 0)
+(-0.000158533697 1.0837224 0)
+(-0.000176197724 1.09597848 0)
+(-0.000194359819 1.09816649 0)
+(-0.000212788763 1.09820476 0)
+(-0.000231227868 1.09820481 0)
+(-0.000249666885 1.09820447 0)
+(-0.000268095033 1.0981658 0)
+(-0.000286254956 1.09597614 0)
+(-0.000303915973 1.08371899 0)
+(-0.000321572873 1.0653459 0)
+(-0.00033963789 1.04430275 0)
+(-0.000358015063 1.02034281 0)
+(-0.000376646432 0.992779019 0)
+(-0.00039548231 0.960088003 0)
+(-0.000414484144 0.919068234 0)
+(-0.000433487143 0.862090821 0)
+(-0.000221476037 0.759426263 0)
+(-9.63174078e-06 0.759518994 0)
+(-2.88857845e-05 0.862185105 0)
+(-4.80788038e-05 0.919159508 0)
+(-6.71448292e-05 0.960177315 0)
+(-8.60415373e-05 0.992866566 0)
+(-0.000104729421 1.0204286 0)
+(-0.000123159374 1.04438673 0)
+(-0.000141274768 1.06542818 0)
+(-0.00015898359 1.08379995 0)
+(-0.000176700238 1.09605818 0)
+(-0.0001949161 1.09824847 0)
+(-0.000213398607 1.09828684 0)
+(-0.000231891277 1.09828688 0)
+(-0.000250383687 1.09828653 0)
+(-0.000268865377 1.09824777 0)
+(-0.000287079358 1.09605583 0)
+(-0.000304792929 1.08379653 0)
+(-0.000322498472 1.06542553 0)
+(-0.00034061067 1.0443839 0)
+(-0.00035903679 1.02042523 0)
+(-0.000377720003 0.992862446 0)
+(-0.000396611122 0.960172252 0)
+(-0.000415670639 0.919153147 0)
+(-0.000434731167 0.862176185 0)
+(-0.000222112203 0.75951172 0)
+(-9.65861522e-06 0.759604729 0)
+(-2.89679165e-05 0.862270762 0)
+(-4.82186216e-05 0.919244711 0)
+(-6.73421796e-05 0.960261843 0)
+(-8.62943758e-05 0.992950255 0)
+(-0.000105035093 1.02051126 0)
+(-0.000123514726 1.04446811 0)
+(-0.00014167816 1.06550804 0)
+(-0.000159436602 1.08387773 0)
+(-0.000177206316 1.09613812 0)
+(-0.000195476584 1.09833069 0)
+(-0.000214013142 1.09836915 0)
+(-0.000232559871 1.09836919 0)
+(-0.00025110634 1.09836884 0)
+(-0.000269642105 1.09832999 0)
+(-0.000287910548 1.09613576 0)
+(-0.000305677433 1.08387429 0)
+(-0.000323432701 1.06550537 0)
+(-0.000341592744 1.04446527 0)
+(-0.000360068535 1.02050787 0)
+(-0.000378804729 0.992946113 0)
+(-0.000397751637 0.960256754 0)
+(-0.000416868821 0.919238319 0)
+(-0.000435986639 0.862261804 0)
+(-0.000222753981 0.759597418 0)
+(-9.68518933e-06 0.759690701 0)
+(-2.90493273e-05 0.862356672 0)
+(-4.83571319e-05 0.919330173 0)
+(-6.75383176e-05 0.960346624 0)
+(-8.65466285e-05 0.993034187 0)
+(-0.000105340327 1.02059414 0)
+(-0.000123870128 1.04454971 0)
+(-0.00014208238 1.06558811 0)
+(-0.000159891651 1.08395573 0)
+(-0.000177715556 1.09621831 0)
+(-0.000196040952 1.09841315 0)
+(-0.000214632268 1.0984517 0)
+(-0.000233233605 1.09845174 0)
+(-0.000251834536 1.09845139 0)
+(-0.000270424966 1.09841244 0)
+(-0.000288748662 1.09621593 0)
+(-0.000306569715 1.08395228 0)
+(-0.000324375803 1.06558543 0)
+(-0.00034258483 1.04454685 0)
+(-0.000361111135 1.02059074 0)
+(-0.000379900672 0.993030023 0)
+(-0.000398903733 0.96034151 0)
+(-0.000418078579 0.91932375 0)
+(-0.000437253294 0.862347674 0)
+(-0.000223401291 0.759683355 0)
+(-9.71148121e-06 0.759776908 0)
+(-2.91298998e-05 0.862442831 0)
+(-4.84946217e-05 0.919415891 0)
+(-6.77331403e-05 0.96043166 0)
+(-8.67973138e-05 0.993118362 0)
+(-0.000105644786 1.02067726 0)
+(-0.000124225934 1.04463152 0)
+(-0.00014248791 1.0656684 0)
+(-0.000160348817 1.08403398 0)
+(-0.000178227933 1.09629874 0)
+(-0.000196608978 1.09849586 0)
+(-0.000215255238 1.09853449 0)
+(-0.000233911706 1.09853453 0)
+(-0.000252567956 1.09853418 0)
+(-0.00027121355 1.09849514 0)
+(-0.000289592975 1.09629636 0)
+(-0.000307469352 1.08403051 0)
+(-0.000325327395 1.06566571 0)
+(-0.000343586687 1.04462866 0)
+(-0.000362164596 1.02067384 0)
+(-0.000381008048 0.993114178 0)
+(-0.000400067506 0.960426522 0)
+(-0.000419300277 0.919409439 0)
+(-0.000438532013 0.862433797 0)
+(-0.000224054584 0.759769528 0)
+(-9.7374743e-06 0.759863348 0)
+(-2.92095839e-05 0.862529238 0)
+(-4.86306448e-05 0.919501866 0)
+(-6.79264292e-05 0.96051695 0)
+(-8.70469152e-05 0.993202782 0)
+(-0.000105948464 1.02076062 0)
+(-0.000124581443 1.04471357 0)
+(-0.000142894297 1.06574891 0)
+(-0.000160807986 1.08411246 0)
+(-0.000178742766 1.09637943 0)
+(-0.000197180055 1.09857881 0)
+(-0.000215882012 1.09861753 0)
+(-0.000234594031 1.09861757 0)
+(-0.000253306041 1.09861722 0)
+(-0.000272007609 1.09857809 0)
+(-0.00029044347 1.09637704 0)
+(-0.000308375974 1.08410898 0)
+(-0.000326287191 1.06574621 0)
+(-0.00034459749 1.04471069 0)
+(-0.000363227579 1.02075718 0)
+(-0.000382125654 0.993198581 0)
+(-0.000401241983 0.96051179 0)
+(-0.000420532738 0.919495387 0)
+(-0.000439821286 0.86252017 0)
+(-0.000224713086 0.759855935 0)
+(-9.76287488e-06 0.759950016 0)
+(-2.92878429e-05 0.862615891 0)
+(-4.87649552e-05 0.919588094 0)
+(-6.81179587e-05 0.960602493 0)
+(-8.72948037e-05 0.993287449 0)
+(-0.000106250731 1.0208442 0)
+(-0.000124936106 1.04479584 0)
+(-0.000143300315 1.06582965 0)
+(-0.000161267644 1.0841912 0)
+(-0.00017925928 1.09646037 0)
+(-0.000197753507 1.09866201 0)
+(-0.000216511737 1.09870082 0)
+(-0.000235280131 1.09870086 0)
+(-0.000254048278 1.09870051 0)
+(-0.00027280589 1.09866129 0)
+(-0.000291299105 1.09645797 0)
+(-0.00030928898 1.08418771 0)
+(-0.000327254427 1.06582694 0)
+(-0.000345616919 1.04479295 0)
+(-0.000364300338 1.02084076 0)
+(-0.000383254004 0.993283233 0)
+(-0.000402427832 0.960597315 0)
+(-0.000421776877 0.919581593 0)
+(-0.000441122054 0.862606791 0)
+(-0.000225377207 0.759942575 0)
+(-9.78793409e-06 0.760036909 0)
+(-2.93649112e-05 0.862702785 0)
+(-4.88972411e-05 0.919674576 0)
+(-6.83069753e-05 0.960688291 0)
+(-8.75401957e-05 0.993372363 0)
+(-0.00010655086 1.02092803 0)
+(-0.000125289169 1.04487834 0)
+(-0.000143705832 1.06591062 0)
+(-0.00016172782 1.08427018 0)
+(-0.000179776743 1.09654157 0)
+(-0.000198328061 1.09874546 0)
+(-0.000217142581 1.09878436 0)
+(-0.000235967545 1.0987844 0)
+(-0.000254792712 1.09878405 0)
+(-0.000273607657 1.09874473 0)
+(-0.0002921588 1.09653916 0)
+(-0.000310206794 1.08426668 0)
+(-0.000328227881 1.0659079 0)
+(-0.000346643921 1.04487544 0)
+(-0.000365381784 1.02092458 0)
+(-0.000384391715 0.993368139 0)
+(-0.000403623594 0.960683102 0)
+(-0.000423031309 0.91966806 0)
+(-0.000442433475 0.862693662 0)
+(-0.000226046786 0.760029448 0)
+(-9.81232255e-06 0.760124021 0)
+(-2.94399789e-05 0.862789915 0)
+(-4.90264128e-05 0.919761306 0)
+(-6.84920105e-05 0.960774339 0)
+(-8.77810023e-05 0.993457524 0)
+(-0.000106846233 1.0210121 0)
+(-0.000125637563 1.04496107 0)
+(-0.000144106832 1.06599182 0)
+(-0.000162183987 1.08434942 0)
+(-0.000180291023 1.09662302 0)
+(-0.000198900424 1.09882916 0)
+(-0.000217772311 1.09886816 0)
+(-0.000236654543 1.0988682 0)
+(-0.000255537056 1.09886785 0)
+(-0.000274409577 1.09882844 0)
+(-0.000293019583 1.09662062 0)
+(-0.000311127323 1.08434592 0)
+(-0.000329205706 1.06598911 0)
+(-0.000347676969 1.04495818 0)
+(-0.000366470603 1.02100865 0)
+(-0.00038553795 0.993453303 0)
+(-0.000404829028 0.960769151 0)
+(-0.000424296062 0.919754786 0)
+(-0.00044375536 0.862780782 0)
+(-0.000226721589 0.760116553 0)
+(-9.83594794e-06 0.760211347 0)
+(-2.95129435e-05 0.862877277 0)
+(-4.91521855e-05 0.919848281 0)
+(-6.86726063e-05 0.960860636 0)
+(-8.80166056e-05 0.99354293 0)
+(-0.00010713576 1.0210964 0)
+(-0.000125980121 1.04504404 0)
+(-0.000144502329 1.06607326 0)
+(-0.000162635012 1.08442891 0)
+(-0.000180800229 1.09670474 0)
+(-0.000199467126 1.09891311 0)
+(-0.000218396122 1.09895221 0)
+(-0.000237336013 1.09895225 0)
+(-0.000256276405 1.0989519 0)
+(-0.000275207388 1.0989124 0)
+(-0.000293877218 1.09670234 0)
+(-0.000312045577 1.08442542 0)
+(-0.000330182847 1.06607056 0)
+(-0.000348711067 1.04504117 0)
+(-0.00036756232 1.02109297 0)
+(-0.000386689039 0.99353873 0)
+(-0.000406040504 0.960855469 0)
+(-0.000425568271 0.919841779 0)
+(-0.000445086321 0.862868156 0)
+(-0.000227401252 0.760203894 0)
+(-9.8579238e-06 0.760298875 0)
+(-2.95809788e-05 0.86296486 0)
+(-4.92701377e-05 0.919935491 0)
+(-6.88430831e-05 0.960947174 0)
+(-8.82402569e-05 0.993628574 0)
+(-0.000107412196 1.02118094 0)
+(-0.000126308686 1.04512724 0)
+(-0.000144883197 1.06615493 0)
+(-0.00016307102 1.08450866 0)
+(-0.000181294419 1.09678672 0)
+(-0.000200019558 1.09899732 0)
+(-0.000219005999 1.09903651 0)
+(-0.000238004014 1.09903656 0)
+(-0.000257003544 1.09903621 0)
+(-0.00027599415 1.09899663 0)
+(-0.000294725367 1.09678434 0)
+(-0.00031295702 1.0845052 0)
+(-0.000331155601 1.06615228 0)
+(-0.00034974311 1.04512441 0)
+(-0.000368654365 1.02117756 0)
+(-0.000387842485 0.993624429 0)
+(-0.000407256813 0.960942062 0)
+(-0.00042684718 0.919929044 0)
+(-0.000446425375 0.862955789 0)
+(-0.000228085397 0.760291477 0)
+(-9.87812237e-06 0.760386591 0)
+(-2.96437225e-05 0.863052649 0)
+(-4.93792503e-05 0.920022922 0)
+(-6.90010542e-05 0.961033942 0)
+(-8.84481887e-05 0.993714448 0)
+(-0.000107669999 1.0212657 0)
+(-0.000126616166 1.04521066 0)
+(-0.00014524135 1.06623684 0)
+(-0.000163483374 1.08458866 0)
+(-0.000181763897 1.09686896 0)
+(-0.000200545979 1.09908179 0)
+(-0.00021958955 1.09912107 0)
+(-0.000238645711 1.09912113 0)
+(-0.000257704434 1.09912079 0)
+(-0.000276755452 1.09908113 0)
+(-0.000295549408 1.09686662 0)
+(-0.00031384606 1.08458526 0)
+(-0.000332108773 1.06623426 0)
+(-0.000350759088 1.04520793 0)
+(-0.000369734174 1.02126243 0)
+(-0.000388987974 0.993710414 0)
+(-0.000408469187 0.961028946 0)
+(-0.000428126391 0.920016594 0)
+(-0.000447768959 0.863043694 0)
+(-0.000228772754 0.760379314 0)
+(-9.89413637e-06 0.760474468 0)
+(-2.96939598e-05 0.863140619 0)
+(-4.94680178e-05 0.920110551 0)
+(-6.91317502e-05 0.961120916 0)
+(-8.86227589e-05 0.993800533 0)
+(-0.00010788949 1.02135068 0)
+(-0.000126881304 1.0452943 0)
+(-0.000145553822 1.06631897 0)
+(-0.000163847473 1.08466891 0)
+(-0.000182183333 1.09695144 0)
+(-0.000201021383 1.0991665 0)
+(-0.000220121798 1.09920589 0)
+(-0.000239236843 1.09920596 0)
+(-0.000258356328 1.09920564 0)
+(-0.000277470311 1.0991659 0)
+(-0.00029633071 1.0969492 0)
+(-0.000314697065 1.08466563 0)
+(-0.000333029115 1.06631654 0)
+(-0.00035174771 1.04529174 0)
+(-0.000370792459 1.02134759 0)
+(-0.000390117689 0.993796709 0)
+(-0.000409671671 0.961116141 0)
+(-0.000429401604 0.920104453 0)
+(-0.000449114495 0.863131893 0)
+(-0.000229462638 0.760467429 0)
+(-9.90471484e-06 0.760562463 0)
+(-2.97278116e-05 0.863228726 0)
+(-4.95295946e-05 0.920198336 0)
+(-6.92248358e-05 0.961208059 0)
+(-8.8749877e-05 0.993886794 0)
+(-0.000108052423 1.02143584 0)
+(-0.000127081808 1.04537813 0)
+(-0.000145794549 1.0664013 0)
+(-0.000164133771 1.08474939 0)
+(-0.000182520055 1.09703417 0)
+(-0.000201410029 1.09925145 0)
+(-0.000220564336 1.09929096 0)
+(-0.000239736795 1.09929106 0)
+(-0.00025891761 1.09929077 0)
+(-0.000278096329 1.09925096 0)
+(-0.000297026129 1.0970321 0)
+(-0.000315467116 1.08474633 0)
+(-0.00033387562 1.06639913 0)
+(-0.000352671145 1.04537587 0)
+(-0.000371795087 1.0214331 0)
+(-0.000391202547 0.993883349 0)
+(-0.000410840901 0.961203689 0)
+(-0.00043065566 0.92019266 0)
+(-0.000450451314 0.863220428 0)
+(-0.000230151283 0.760555861 0)
+(-9.90370794e-06 0.7606505 0)
+(-2.97274195e-05 0.863316896 0)
+(-4.95350845e-05 0.920286208 0)
+(-6.92414211e-05 0.961295305 0)
+(-8.87819509e-05 0.993973172 0)
+(-0.000108103566 1.02152112 0)
+(-0.000127155851 1.04546209 0)
+(-0.000145896811 1.0664838 0)
+(-0.000164272158 1.08483008 0)
+(-0.000182701685 1.09711712 0)
+(-0.00020163884 1.09933663 0)
+(-0.000220845037 1.09937627 0)
+(-0.000240075388 1.09937642 0)
+(-0.000259319983 1.09937618 0)
+(-0.000278569011 1.09933634 0)
+(-0.000297576493 1.09711533 0)
+(-0.000316102723 1.08482739 0)
+(-0.000334600324 1.0664821 0)
+(-0.000353487246 1.04546038 0)
+(-0.000372706458 1.021519 0)
+(-0.000392213056 0.993970401 0)
+(-0.000411953741 0.961291655 0)
+(-0.000431872022 0.920281284 0)
+(-0.000451769548 0.863309369 0)
+(-0.000230835447 0.760644685 0)
+(-9.88595473e-06 0.760738454 0)
+(-2.96766956e-05 0.863405007 0)
+(-4.94572825e-05 0.920374045 0)
+(-6.91427868e-05 0.961382543 0)
+(-8.86682808e-05 0.994059562 0)
+(-0.000107980676 1.02160644 0)
+(-0.000127030252 1.04554612 0)
+(-0.000145776552 1.06656638 0)
+(-0.000164168189 1.0849109 0)
+(-0.000182624455 1.09720023 0)
+(-0.000201596033 1.099422 0)
+(-0.000220845426 1.09946181 0)
+(-0.000240129512 1.09946205 0)
+(-0.0002594387 1.0994619 0)
+(-0.000278763022 1.09942206 0)
+(-0.000297858027 1.09719896 0)
+(-0.000316484431 1.08490889 0)
+(-0.000335090577 1.06656551 0)
+(-0.000354092384 1.04554537 0)
+(-0.000373434372 1.0216054 0)
+(-0.000393070881 0.994057972 0)
+(-0.00041294697 0.961380158 0)
+(-0.00043300398 0.920370449 0)
+(-0.000453040333 0.863398844 0)
+(-0.000231505372 0.760734029 0)
+(-9.83591733e-06 0.760826107 0)
+(-2.95301323e-05 0.863492842 0)
+(-4.92218675e-05 0.920461642 0)
+(-6.88274009e-05 0.961469573 0)
+(-8.82826714e-05 0.99414578 0)
+(-0.000107535392 1.02169162 0)
+(-0.000126537293 1.04563005 0)
+(-0.000145249993 1.06664893 0)
+(-0.000163625303 1.08499176 0)
+(-0.000182082847 1.09728343 0)
+(-0.000201070887 1.0995075 0)
+(-0.000220352981 1.09954756 0)
+(-0.000239688211 1.09954795 0)
+(-0.000259067135 1.09954795 0)
+(-0.000278479644 1.09950817 0)
+(-0.000297682761 1.09728306 0)
+(-0.000316437076 1.08499093 0)
+(-0.000335186452 1.06664949 0)
+(-0.000354344263 1.04563098 0)
+(-0.000373855255 1.02169247 0)
+(-0.000393672939 0.994146255 0)
+(-0.000413739869 0.9614694 0)
+(-0.000433993971 0.920460368 0)
+(-0.000454229652 0.863489072 0)
+(-0.000232149829 0.760824117 0)
+(-9.73564481e-06 0.760913091 0)
+(-2.92326537e-05 0.863580041 0)
+(-4.87362198e-05 0.920548645 0)
+(-6.81661401e-05 0.961556061 0)
+(-8.74601044e-05 0.99423151 0)
+(-0.000106567832 1.02177638 0)
+(-0.000125443793 1.04571364 0)
+(-0.000144052875 1.06673122 0)
+(-0.000162351532 1.08507247 0)
+(-0.000180760292 1.09736658 0)
+(-0.000199725584 1.09959304 0)
+(-0.000219013229 1.09963344 0)
+(-0.00023838507 1.0996341 0)
+(-0.000257832881 1.09963436 0)
+(-0.000277346971 1.09959476 0)
+(-0.00029668556 1.09736776 0)
+(-0.000315609821 1.08507368 0)
+(-0.000334558431 1.06673428 0)
+(-0.00035394104 1.04571748 0)
+(-0.000373701774 1.02178051 0)
+(-0.000393791417 0.99423558 0)
+(-0.000414148751 0.961559739 0)
+(-0.000434706772 0.920551417 0)
+(-0.000455254071 0.863580444 0)
+(-0.00023274052 0.760915347 0)
+(-9.54535617e-06 0.760998785 0)
+(-2.86669576e-05 0.863665986 0)
+(-4.7808607e-05 0.920634456 0)
+(-6.68951252e-05 0.961641434 0)
+(-8.58683985e-05 0.994316214 0)
+(-0.00010468256 1.02186022 0)
+(-0.000123296722 1.04579642 0)
+(-0.000141681478 1.06681285 0)
+(-0.000159800118 1.08515269 0)
+(-0.00017807462 1.09744939 0)
+(-0.000196950933 1.09967841 0)
+(-0.000216199761 1.09971934 0)
+(-0.000235586799 1.09972046 0)
+(-0.000255104857 1.09972119 0)
+(-0.000274745184 1.09968196 0)
+(-0.000294268126 1.09745328 0)
+(-0.000313435869 1.08515746 0)
+(-0.000332680882 1.06682026 0)
+(-0.000352406615 1.04580532 0)
+(-0.000372554993 1.02187004 0)
+(-0.000393072824 0.994326526 0)
+(-0.000413892677 0.961651802 0)
+(-0.000434938898 0.920644261 0)
+(-0.000455990863 0.863673652 0)
+(-0.000233236574 0.761008426 0)
+(-9.2127241e-06 0.761082154 0)
+(-2.76754138e-05 0.863749658 0)
+(-4.61753867e-05 0.92071808 0)
+(-6.46460689e-05 0.96172473 0)
+(-8.30369917e-05 0.994398981 0)
+(-0.000101309026 1.02194228 0)
+(-0.000119428991 1.04587763 0)
+(-0.000137376453 1.06689313 0)
+(-0.00015512366 1.08523182 0)
+(-0.000173099326 1.09753137 0)
+(-0.000191753709 1.09976323 0)
+(-0.000210863254 1.09980501 0)
+(-0.000230200682 1.09980691 0)
+(-0.000249764165 1.09980844 0)
+(-0.000269548489 1.09976993 0)
+(-0.000289317808 1.09753994 0)
+(-0.00030883529 1.08524273 0)
+(-0.000328527994 1.06690804 0)
+(-0.000348793469 1.04589528 0)
+(-0.000369568919 1.02196197 0)
+(-0.000390792701 0.994420117 0)
+(-0.000412385604 0.961746712 0)
+(-0.000434258794 0.920740104 0)
+(-0.000456175767 0.863769953 0)
+(-0.00023354891 0.761104635 0)
+(-8.64560388e-06 0.761161524 0)
+(-2.59832213e-05 0.8638294 0)
+(-4.33821172e-05 0.920797889 0)
+(-6.07871098e-05 0.961804369 0)
+(-7.81591307e-05 0.994478288 0)
+(-9.54714305e-05 1.02202112 0)
+(-0.000112703359 1.0459559 0)
+(-0.00012984566 1.06697081 0)
+(-0.000146882352 1.08530873 0)
+(-0.00016425954 1.09761158 0)
+(-0.0001824416 1.09984674 0)
+(-0.000201213667 1.09988986 0)
+(-0.000220360034 1.09989309 0)
+(-0.000239891152 1.099896 0)
+(-0.000259813079 1.09985884 0)
+(-0.00027989833 1.09762817 0)
+(-0.000299912507 1.0853302 0)
+(-0.000320284239 1.06699864 0)
+(-0.000341410757 1.04598865 0)
+(-0.000363220094 1.02205786 0)
+(-0.000385636189 0.994518175 0)
+(-0.000408560878 0.96184651 0)
+(-0.000431879946 0.92084116 0)
+(-0.000455326381 0.863871685 0)
+(-0.000233515029 0.761206376 0)
+(-7.73751539e-06 0.761234338 0)
+(-2.32626358e-05 0.863902643 0)
+(-3.88675049e-05 0.92087133 0)
+(-5.45156054e-05 0.961877831 0)
+(-7.01829435e-05 0.994551668 0)
+(-8.58611424e-05 1.02209437 0)
+(-0.000101547692 1.04602896 0)
+(-0.000117252459 1.06704374 0)
+(-0.000132986098 1.08538145 0)
+(-0.000149208149 1.09768819 0)
+(-0.000166394454 1.09992732 0)
+(-0.000184363961 1.09997257 0)
+(-0.00020293476 1.09997801 0)
+(-0.000222142651 1.09998326 0)
+(-0.000242019347 1.09994846 0)
+(-0.00026237279 1.09771827 0)
+(-0.00028300444 1.08542075 0)
+(-0.00030434868 1.06709349 0)
+(-0.000326802523 1.04608748 0)
+(-0.000350301715 1.0221604 0)
+(-0.000374759124 0.994623964 0)
+(-0.000400050098 0.961955013 0)
+(-0.000426017367 0.920951707 0)
+(-0.000452329812 0.863983464 0)
+(-0.000232755932 0.761318456 0)
+(-6.32053283e-06 0.761296819 0)
+(-1.90244639e-05 0.863965625 0)
+(-3.18381564e-05 0.920934652 0)
+(-4.47336033e-05 0.961941369 0)
+(-5.7696611e-05 0.994615376 0)
+(-7.07272865e-05 1.02215826 0)
+(-8.38377049e-05 1.04609306 0)
+(-9.70707761e-05 1.06710825 0)
+(-0.000110477699 1.08544645 0)
+(-0.000124524368 1.09775772 0)
+(-0.000139701004 1.10000163 0)
+(-0.000155886335 1.10005007 0)
+(-0.000172958769 1.10005893 0)
+(-0.000191013707 1.10006795 0)
+(-0.00021015127 1.10003717 0)
+(-0.000230267415 1.09780943 0)
+(-0.000251266163 1.08551461 0)
+(-0.000273641504 1.06719394 0)
+(-0.000297843877 1.0461944 0)
+(-0.000323895993 1.02227371 0)
+(-0.000351772068 0.994743247 0)
+(-0.000381353568 0.962079607 0)
+(-0.000412423894 0.921080614 0)
+(-0.000444509707 0.864115282 0)
+(-0.000230360978 0.761451406 0)
+(-4.33583866e-06 0.76134418 0)
+(-1.3081145e-05 0.864013593 0)
+(-2.19463445e-05 0.920983034 0)
+(-3.08843128e-05 0.961990024 0)
+(-3.98669995e-05 0.994664257 0)
+(-4.88846542e-05 1.02220737 0)
+(-5.79527824e-05 1.04614252 0)
+(-6.7109327e-05 1.0671583 0)
+(-7.63946005e-05 1.08549726 0)
+(-8.63781067e-05 1.09781372 0)
+(-9.76618049e-05 1.10006324 0)
+(-0.000110119552 1.10011576 0)
+(-0.000123653578 1.10012926 0)
+(-0.000138450753 1.10014363 0)
+(-0.000154732211 1.10011891 0)
+(-0.000172510024 1.09789611 0)
+(-0.000191840729 1.08560718 0)
+(-0.000213545375 1.06729728 0)
+(-0.000238458906 1.04630935 0)
+(-0.000266944421 1.02240115 0)
+(-0.000299373953 0.994883829 0)
+(-0.000336050593 0.962233506 0)
+(-0.000377102168 0.921247257 0)
+(-0.000422173078 0.864292732 0)
+(-0.000222811426 0.761635468 0)
+(-1.76761613e-06 0.761371307 0)
+(-5.33310267e-06 0.864041182 0)
+(-8.92743679e-06 0.921010822 0)
+(-1.24963885e-05 0.962017823 0)
+(-1.60004861e-05 0.994691955 0)
+(-1.94087877e-05 1.0222349 0)
+(-2.26876727e-05 1.04616987 0)
+(-2.58124427e-05 1.06718553 0)
+(-2.87555754e-05 1.08552437 0)
+(-3.21065515e-05 1.09784587 0)
+(-3.64820549e-05 1.10010068 0)
+(-4.16801534e-05 1.10015679 0)
+(-4.75689068e-05 1.10017456 0)
+(-5.43362556e-05 1.10019417 0)
+(-6.22389053e-05 1.10017585 0)
+(-7.13632155e-05 1.09795873 0)
+(-8.18995544e-05 1.0856773 0)
+(-9.50602258e-05 1.06738212 0)
+(-0.000112323121 1.04641196 0)
+(-0.00013497953 1.02252584 0)
+(-0.000164929301 0.995036384 0)
+(-0.000204946521 0.962421813 0)
+(-0.00025911209 0.921482138 0)
+(-0.000333327289 0.864589158 0)
+(-0.000188157744 0.762014 0)
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           nonuniform List<vector>
+25
+(
+(-4.60189422e-09 0.755456613 0)
+(-1.47587101e-08 0.858128651 0)
+(-2.64998953e-08 0.915116569 0)
+(-3.93587246e-08 0.956150227 0)
+(-5.31566785e-08 0.988858187 0)
+(-6.72937327e-08 1.01644433 0)
+(-8.00868124e-08 1.040436 0)
+(-9.25824754e-08 1.0615243 0)
+(-7.55567466e-08 1.07998962 0)
+(-2.38476194e-08 1.09217578 0)
+(4.79245631e-09 1.09426728 0)
+(3.60563521e-09 1.09430161 0)
+(-3.0103456e-11 1.0943018 0)
+(-3.66293544e-09 1.09430161 0)
+(-4.83687405e-09 1.09426724 0)
+(2.3898577e-08 1.09217496 0)
+(7.56902956e-08 1.07998866 0)
+(9.26355268e-08 1.06152443 0)
+(8.00265515e-08 1.04043643 0)
+(6.71951781e-08 1.01644477 0)
+(5.30664989e-08 0.988858534 0)
+(3.92930458e-08 0.956150446 0)
+(2.64590434e-08 0.915116673 0)
+(1.47368814e-08 0.858128676 0)
+(4.59480563e-09 0.755456597 0)
+)
+;
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        phi             phi.liquid;
+        value           nonuniform List<vector>
+25
+(
+(-1.76761613e-06 0.761371307 0)
+(-5.33310267e-06 0.864041182 0)
+(-8.92743679e-06 0.921010822 0)
+(-1.24963885e-05 0.962017823 0)
+(-1.60004861e-05 0.994691955 0)
+(-1.94087877e-05 1.0222349 0)
+(-2.26876727e-05 1.04616987 0)
+(-2.58124427e-05 1.06718553 0)
+(-2.87555754e-05 1.08552437 0)
+(-3.21065515e-05 1.09784587 0)
+(-3.64820549e-05 1.10010068 0)
+(-4.16801534e-05 1.10015679 0)
+(-4.75689068e-05 1.10017456 0)
+(-5.43362556e-05 1.10019417 0)
+(-6.22389053e-05 1.10017585 0)
+(-7.13632155e-05 1.09795873 0)
+(-8.18995544e-05 1.0856773 0)
+(-9.50602258e-05 1.06738212 0)
+(-0.000112323121 1.04641196 0)
+(-0.00013497953 1.02252584 0)
+(-0.000164929301 0.995036384 0)
+(-0.000204946521 0.962421813 0)
+(-0.00025911209 0.921482138 0)
+(-0.000333327289 0.864589158 0)
+(-0.000188157744 0.762014 0)
+)
+;
+    }
+    wall1
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    wall2
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alpha.gas
new file mode 100644
index 0000000000..bae022b0a6
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alpha.gas
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "5";
+    object      alpha.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.gas;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    wall1
+    {
+        type            zeroGradient;
+    }
+    wall2
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alpha.liquid
new file mode 100644
index 0000000000..1876d99c0e
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alpha.liquid
@@ -0,0 +1,2038 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      alpha.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999949
+0.999938287
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999937231
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.99993711
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936975
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.99993684
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936705
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936569
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936432
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936295
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936157
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999936018
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999935878
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999935738
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999935597
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999935455
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999935312
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999935169
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999935025
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.99993488
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999934734
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999934587
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.99993444
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999934292
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999934143
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933993
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933843
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933691
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933539
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933386
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933232
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999933077
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999932922
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999932765
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.999932608
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.99993245
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.99993229
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.99993213
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999963
+0.99993197
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999931808
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999931645
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999931482
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999931317
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999931152
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999930985
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999930818
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.99993065
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999930481
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999930311
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.99993014
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999929968
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999929795
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999929621
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999929446
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999929271
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999929094
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999928916
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999928738
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999928558
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999928377
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999928196
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999928013
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999927829
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999927645
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999927459
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999927272
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999927085
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999926896
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999926706
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999926516
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999926324
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999926131
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999925937
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999961
+0.999925716
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999962
+0.999925475
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999965
+0.999925447
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0.999999965
+0.999925447
+)
+;
+    }
+    wall1
+    {
+        type            calculated;
+        value           uniform 1;
+    }
+    wall2
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+75
+(
+0.999938287
+0.999937231
+0.99993711
+0.999936975
+0.99993684
+0.999936705
+0.999936569
+0.999936432
+0.999936295
+0.999936157
+0.999936018
+0.999935878
+0.999935738
+0.999935597
+0.999935455
+0.999935312
+0.999935169
+0.999935025
+0.99993488
+0.999934734
+0.999934587
+0.99993444
+0.999934292
+0.999934143
+0.999933993
+0.999933843
+0.999933691
+0.999933539
+0.999933386
+0.999933232
+0.999933077
+0.999932922
+0.999932765
+0.999932608
+0.99993245
+0.99993229
+0.99993213
+0.99993197
+0.999931808
+0.999931645
+0.999931482
+0.999931317
+0.999931152
+0.999930985
+0.999930818
+0.99993065
+0.999930481
+0.999930311
+0.99993014
+0.999929968
+0.999929795
+0.999929621
+0.999929446
+0.999929271
+0.999929094
+0.999928916
+0.999928738
+0.999928558
+0.999928377
+0.999928196
+0.999928013
+0.999927829
+0.999927645
+0.999927459
+0.999927272
+0.999927085
+0.999926896
+0.999926706
+0.999926516
+0.999926324
+0.999926131
+0.999925937
+0.999925716
+0.999925475
+0.999925447
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alphat.gas
new file mode 100644
index 0000000000..03e38e98a1
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alphat.gas
@@ -0,0 +1,1996 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      alphat.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+3.28970404e-05
+7.47455994e-05
+0.000100960341
+0.000115723925
+0.000119293672
+0.000112626917
+9.68161763e-05
+7.28064561e-05
+4.06095467e-05
+7.99274239e-06
+5.79803079e-07
+4.76668732e-07
+4.7633382e-07
+4.76673332e-07
+5.80190819e-07
+7.99904855e-06
+4.06184772e-05
+7.28114304e-05
+9.68195079e-05
+0.000112629634
+0.000119296061
+0.000115725716
+0.000100960665
+7.47362552e-05
+3.27323e-05
+3.28277161e-05
+7.45887374e-05
+0.000100749542
+0.000115483835
+0.000119048295
+0.000112398157
+9.66235093e-05
+7.2667097e-05
+4.05430166e-05
+7.9858249e-06
+5.78913196e-07
+4.75663289e-07
+4.75328143e-07
+4.7566789e-07
+5.79307113e-07
+7.99214243e-06
+4.05517894e-05
+7.26716932e-05
+9.66263036e-05
+0.000112400222
+0.000119049971
+0.000115484906
+0.000100749208
+7.45796321e-05
+3.2662318e-05
+3.2758329e-05
+7.44318572e-05
+0.00010053887
+0.000115244133
+0.000118803663
+0.000112170579
+9.64325241e-05
+7.25299402e-05
+4.04795314e-05
+7.98062062e-06
+5.78081766e-07
+4.74656299e-07
+4.74320733e-07
+4.74660898e-07
+5.78482334e-07
+7.98697111e-06
+4.04883161e-05
+7.25344987e-05
+9.6435247e-05
+0.000112172552
+0.000118805235
+0.000115245099
+0.000100538443
+7.44226577e-05
+3.25929085e-05
+3.26888751e-05
+7.42748691e-05
+0.000100328051
+0.000115004258
+0.000118558846
+0.000111942811
+9.6241345e-05
+7.23925816e-05
+4.04157718e-05
+7.97536006e-06
+5.77249565e-07
+4.73648208e-07
+4.73312219e-07
+4.73652818e-07
+5.77656399e-07
+7.98174682e-06
+4.04245795e-05
+7.23971252e-05
+9.62440309e-05
+0.000111944735
+0.000118560364
+0.000115005172
+0.000100327577
+7.42656607e-05
+3.25234222e-05
+3.26193547e-05
+7.41177712e-05
+0.000100117079
+0.000114764203
+0.00011831383
+0.000111714832
+9.60499422e-05
+7.22549729e-05
+4.03516952e-05
+7.97001509e-06
+5.76415717e-07
+4.72639087e-07
+4.72302679e-07
+4.72643722e-07
+5.76828352e-07
+7.97643865e-06
+4.03605294e-05
+7.22595113e-05
+9.60526048e-05
+0.000111716726
+0.000118315317
+0.000114765087
+0.000100116581
+7.41085404e-05
+3.24538802e-05
+3.25497681e-05
+7.39605644e-05
+9.99059567e-05
+0.000114523969
+0.000118068621
+0.00011148665
+9.58583249e-05
+7.21171212e-05
+4.02873285e-05
+7.96459529e-06
+5.75580499e-07
+4.71628958e-07
+4.71292147e-07
+4.71633621e-07
+5.75998496e-07
+7.97105544e-06
+4.02961914e-05
+7.21216595e-05
+9.58609736e-05
+0.000111488524
+0.000118070089
+0.000114524837
+9.99054452e-05
+7.39513315e-05
+3.23842769e-05
+3.24801163e-05
+7.38032466e-05
+9.9694682e-05
+0.000114283557
+0.000117823217
+0.000111258263
+9.56664911e-05
+7.1979025e-05
+4.02226883e-05
+7.95910563e-06
+5.74744101e-07
+4.70617835e-07
+4.70280615e-07
+4.70622531e-07
+5.7516706e-07
+7.96560166e-06
+4.02315806e-05
+7.19835663e-05
+9.56691296e-05
+0.000111260125
+0.000117824673
+0.000114284415
+9.96941635e-05
+7.37940163e-05
+3.2314611e-05
+3.24103997e-05
+7.36458157e-05
+9.94832535e-05
+0.000114042961
+0.000117577613
+0.000111029665
+9.54744308e-05
+7.18406726e-05
+4.01577768e-05
+7.95354401e-06
+5.7390643e-07
+4.6960572e-07
+4.69268092e-07
+4.69610444e-07
+5.74333999e-07
+7.960075e-06
+4.01666984e-05
+7.18452189e-05
+9.54770614e-05
+0.000111031518
+0.000117579062
+0.000114043813
+9.94827315e-05
+7.36365894e-05
+3.22448818e-05
+3.23406185e-05
+7.34882689e-05
+9.92716675e-05
+0.000113802176
+0.0001173318
+0.000110800843
+9.5282127e-05
+7.17020524e-05
+4.00925882e-05
+7.94790393e-06
+5.73067234e-07
+4.68592614e-07
+4.68254579e-07
+4.68597362e-07
+5.73499091e-07
+7.95446879e-06
+4.01015387e-05
+7.17066044e-05
+9.52847515e-05
+0.000110802689
+0.000117333242
+0.000113803024
+9.92711426e-05
+7.34790473e-05
+3.21750887e-05
+3.22707728e-05
+7.33306037e-05
+9.90599195e-05
+0.000113561197
+0.00011708577
+0.000110571785
+9.50895613e-05
+7.15631454e-05
+4.00271136e-05
+7.94217804e-06
+5.72226208e-07
+4.67578508e-07
+4.67240067e-07
+4.67583285e-07
+5.72662073e-07
+7.94877566e-06
+4.00360924e-05
+7.15677034e-05
+9.50921824e-05
+0.000110573624
+0.000117087206
+0.000113562041
+9.90593928e-05
+7.33213863e-05
+3.21052317e-05
+3.22008629e-05
+7.31728172e-05
+9.8848008e-05
+0.000113320018
+0.000116839514
+0.000110342479
+9.48967224e-05
+7.1423942e-05
+3.99613478e-05
+7.93636051e-06
+5.71383109e-07
+4.66563412e-07
+4.66224571e-07
+4.66568213e-07
+5.7182272e-07
+7.94298963e-06
+3.99703536e-05
+7.14285045e-05
+9.48993378e-05
+0.000110344311
+0.000116840944
+0.000113320858
+9.88474783e-05
+7.31636035e-05
+3.20353105e-05
+3.21308886e-05
+7.30149074e-05
+9.86359289e-05
+0.000113078636
+0.000116593027
+0.000110112916
+9.47035956e-05
+7.12844344e-05
+3.98952881e-05
+7.93044767e-06
+5.70537752e-07
+4.6554732e-07
+4.65208081e-07
+4.65552145e-07
+5.70980877e-07
+7.9371071e-06
+3.99043203e-05
+7.12890009e-05
+9.47062073e-05
+0.000110114742
+0.000116594452
+0.000113079471
+9.8635397e-05
+7.30056961e-05
+3.19653251e-05
+3.206085e-05
+7.28568713e-05
+9.84236808e-05
+0.000112837046
+0.000116346302
+0.000109883088
+9.45101738e-05
+7.1144616e-05
+3.98289357e-05
+7.92443758e-06
+5.69690024e-07
+4.64530233e-07
+4.641906e-07
+4.64535079e-07
+5.70136455e-07
+7.93112617e-06
+3.98379929e-05
+7.11491863e-05
+9.45127809e-05
+0.000109884906
+0.000116347719
+0.000112837876
+9.84231448e-05
+7.28476619e-05
+3.18952753e-05
+3.19907471e-05
+7.26987066e-05
+9.82112594e-05
+0.000112595245
+0.000116099333
+0.000109652984
+9.43164477e-05
+7.10044827e-05
+3.97622926e-05
+7.91832949e-06
+5.68839832e-07
+4.63512155e-07
+4.63172126e-07
+4.63517018e-07
+5.69289386e-07
+7.92504606e-06
+3.97713736e-05
+7.10090573e-05
+9.43190489e-05
+0.000109654796
+0.000116100744
+0.000112596069
+9.82107184e-05
+7.26894979e-05
+3.18251611e-05
+3.19205799e-05
+7.25404109e-05
+9.79986628e-05
+0.000112353228
+0.000115852115
+0.000109422601
+9.41224104e-05
+7.08640327e-05
+3.96953614e-05
+7.91212312e-06
+5.6798712e-07
+4.62493082e-07
+4.62152664e-07
+4.62497962e-07
+5.68439624e-07
+7.91886653e-06
+3.9704465e-05
+7.08686097e-05
+9.41250053e-05
+0.000109424404
+0.000115853517
+0.000112354045
+9.79981163e-05
+7.25312012e-05
+3.17549825e-05
+3.18503483e-05
+7.23819822e-05
+9.77858864e-05
+0.000112110992
+0.00011560464
+0.000109191928
+9.3928055e-05
+7.07232646e-05
+3.96281446e-05
+7.90581826e-06
+5.67131829e-07
+4.61473015e-07
+4.61132215e-07
+4.61477917e-07
+5.67587138e-07
+7.91258747e-06
+3.96372696e-05
+7.07278448e-05
+9.39306445e-05
+0.000109193722
+0.000115606033
+0.000112111801
+9.77853334e-05
+7.23727701e-05
+3.16847393e-05
+3.17800524e-05
+7.22234176e-05
+9.7572928e-05
+0.000111868531
+0.000115356902
+0.000108960957
+9.37333744e-05
+7.05821756e-05
+3.95606438e-05
+7.89941459e-06
+5.66273895e-07
+4.60451968e-07
+4.60110778e-07
+4.60456876e-07
+5.66731877e-07
+7.90620853e-06
+3.95697892e-05
+7.05867568e-05
+9.37359574e-05
+0.000108962743
+0.000115358286
+0.00011186933
+9.75723663e-05
+7.22142025e-05
+3.16144318e-05
+3.17096922e-05
+7.20647145e-05
+9.73597831e-05
+0.00011162584
+0.000115108896
+0.000108729682
+9.35383624e-05
+7.04407624e-05
+3.94928608e-05
+7.89291158e-06
+5.65413258e-07
+4.59429923e-07
+4.59088358e-07
+4.59434849e-07
+5.65873782e-07
+7.89972922e-06
+3.95020251e-05
+7.04453453e-05
+9.35409393e-05
+0.000108731459
+0.000115110269
+0.000111626628
+9.73592126e-05
+7.20554945e-05
+3.15440597e-05
+3.16392677e-05
+7.19058702e-05
+9.71464479e-05
+0.000111382913
+0.000114860613
+0.000108498095
+9.33430133e-05
+7.02990252e-05
+3.94247959e-05
+7.8863086e-06
+5.6454985e-07
+4.584069e-07
+4.58064953e-07
+4.58411835e-07
+5.65012802e-07
+7.89314896e-06
+3.94339784e-05
+7.03036091e-05
+9.3345583e-05
+0.000108499861
+0.000114861975
+0.000111383691
+9.71458674e-05
+7.18966451e-05
+3.14736232e-05
+3.15687791e-05
+7.17468834e-05
+9.69329184e-05
+0.000111139746
+0.000114612046
+0.000108266187
+9.31473226e-05
+7.01569615e-05
+3.93564506e-05
+7.87960493e-06
+5.63683595e-07
+4.57382888e-07
+4.57040573e-07
+4.57387839e-07
+5.64148875e-07
+7.88646702e-06
+3.93656494e-05
+7.01615457e-05
+9.31498848e-05
+0.000108267942
+0.000114613396
+0.000111140511
+9.69323266e-05
+7.17376512e-05
+3.14031224e-05
+3.14982263e-05
+7.15877505e-05
+9.67191908e-05
+0.000110896333
+0.000114363189
+0.000108033953
+9.29512855e-05
+7.00145702e-05
+3.92878247e-05
+7.87279991e-06
+5.62814435e-07
+4.56357903e-07
+4.56015223e-07
+4.56362861e-07
+5.63281946e-07
+7.87968279e-06
+3.92970392e-05
+7.00191537e-05
+9.29538396e-05
+0.000108035696
+0.000114364527
+0.000110897085
+9.67185864e-05
+7.15785101e-05
+3.13325572e-05
+3.14276096e-05
+7.14284697e-05
+9.65052607e-05
+0.000110652667
+0.000114114037
+0.000107801386
+9.27548961e-05
+6.98718501e-05
+3.9218919e-05
+7.86589287e-06
+5.61942301e-07
+4.55331945e-07
+4.54988897e-07
+4.55336903e-07
+5.6241195e-07
+7.87279559e-06
+3.92281478e-05
+6.98764311e-05
+9.2757443e-05
+0.000107803117
+0.00011411536
+0.000110653404
+9.65046429e-05
+7.14192204e-05
+3.12619279e-05
+3.13569292e-05
+7.12690393e-05
+9.62911242e-05
+0.000110408744
+0.00011386458
+0.000107568479
+9.25581532e-05
+6.97288001e-05
+3.91497342e-05
+7.85888331e-06
+5.61067141e-07
+4.54305013e-07
+4.53961611e-07
+4.54309977e-07
+5.61538847e-07
+7.865805e-06
+3.91589762e-05
+6.97333802e-05
+9.25606901e-05
+0.000107570198
+0.000113865887
+0.000110409465
+9.62904911e-05
+7.12597793e-05
+3.11912346e-05
+3.1286185e-05
+7.11094561e-05
+9.6076777e-05
+0.000110164558
+0.000113614814
+0.000107335227
+9.23610528e-05
+6.95854214e-05
+3.90802715e-05
+7.85177085e-06
+5.60188905e-07
+4.53277114e-07
+4.52933362e-07
+4.53282088e-07
+5.60662588e-07
+7.8587106e-06
+3.90895255e-05
+6.95899986e-05
+9.23635805e-05
+0.000107336932
+0.000113616105
+0.000110165263
+9.60761282e-05
+7.11001848e-05
+3.11204774e-05
+3.12153774e-05
+7.09497183e-05
+9.58622149e-05
+0.000109920104
+0.000113364732
+0.000107101625
+9.21635924e-05
+6.9441713e-05
+3.90105314e-05
+7.84455531e-06
+5.59307551e-07
+4.52248262e-07
+4.51904158e-07
+4.52253233e-07
+5.59783138e-07
+7.85151224e-06
+3.90197964e-05
+6.94462879e-05
+9.21661107e-05
+0.000107103317
+0.000113366007
+0.000109920791
+9.58615491e-05
+7.09404341e-05
+3.10496564e-05
+3.11445066e-05
+7.07898232e-05
+9.56474334e-05
+0.000109675376
+0.00011311433
+0.00010686767
+9.19657712e-05
+6.92976772e-05
+3.89405161e-05
+7.83723653e-06
+5.5842304e-07
+4.51218446e-07
+4.50874001e-07
+4.51223426e-07
+5.58900464e-07
+7.8442098e-06
+3.89497907e-05
+6.93022491e-05
+9.1968279e-05
+0.000106869347
+0.000113115586
+0.000109676043
+9.56467497e-05
+7.07805252e-05
+3.09787721e-05
+3.10735727e-05
+7.06297697e-05
+9.54324294e-05
+0.000109430368
+0.0001128636
+0.000106633357
+9.17675876e-05
+6.91533132e-05
+3.88702261e-05
+7.82981457e-06
+5.57535347e-07
+4.50187689e-07
+4.4984291e-07
+4.50192671e-07
+5.5801454e-07
+7.83680338e-06
+3.88795094e-05
+6.91578812e-05
+9.1770084e-05
+0.000106635017
+0.000112864838
+0.000109431016
+9.54317263e-05
+7.06204566e-05
+3.09078245e-05
+3.10025762e-05
+7.04695546e-05
+9.52171983e-05
+0.000109185078
+0.000112612541
+0.000106398682
+9.15690396e-05
+6.90086239e-05
+3.87996633e-05
+7.82228948e-06
+5.56644443e-07
+4.49155991e-07
+4.48810877e-07
+4.49160974e-07
+5.57125345e-07
+7.82929304e-06
+3.88089542e-05
+6.90131875e-05
+9.15715254e-05
+0.000106400326
+0.000112613759
+0.000109185704
+9.52164743e-05
+7.04602255e-05
+3.08368139e-05
+3.09315172e-05
+7.0309177e-05
+9.50017357e-05
+0.000108939497
+0.000112361144
+0.000106163643
+9.13701284e-05
+6.88636102e-05
+3.87288294e-05
+7.81466136e-06
+5.55750307e-07
+4.48123355e-07
+4.4777792e-07
+4.48128344e-07
+5.56232861e-07
+7.8216789e-06
+3.87381268e-05
+6.88681683e-05
+9.13726019e-05
+0.000106165269
+0.000112362342
+0.000108940101
+9.50009898e-05
+7.02998299e-05
+3.07657407e-05
+3.08603961e-05
+7.01486339e-05
+9.47860379e-05
+0.000108693622
+0.000112109408
+0.000105928236
+9.1170854e-05
+6.87182731e-05
+3.86577257e-05
+7.80693035e-06
+5.54852915e-07
+4.47089797e-07
+4.4674404e-07
+4.47094781e-07
+5.55337063e-07
+7.81396107e-06
+3.86670287e-05
+6.87228251e-05
+9.11733138e-05
+0.000105929844
+0.000112110583
+0.000108694202
+9.47852692e-05
+7.01392682e-05
+3.06946051e-05
+3.07892131e-05
+6.99879235e-05
+9.45701009e-05
+0.000108447449
+0.000111857325
+0.000105692459
+9.09712143e-05
+6.85726148e-05
+3.85863533e-05
+7.79909644e-06
+5.53952247e-07
+4.46055322e-07
+4.45709255e-07
+4.46060304e-07
+5.54437935e-07
+7.80613963e-06
+3.8595661e-05
+6.85771598e-05
+9.09736607e-05
+0.000105694048
+0.000111858478
+0.000108448004
+9.45693083e-05
+6.99785384e-05
+3.06234074e-05
+3.07179689e-05
+6.98270438e-05
+9.43539214e-05
+0.000108200973
+0.000111604895
+0.000105456309
+9.077121e-05
+6.84266359e-05
+3.85147136e-05
+7.7911596e-06
+5.53048272e-07
+4.45019939e-07
+4.4467356e-07
+4.45024919e-07
+5.53535456e-07
+7.79821452e-06
+3.85240248e-05
+6.84311746e-05
+9.07736423e-05
+0.000105457878
+0.000111606023
+0.000108201501
+9.43531028e-05
+6.98176381e-05
+3.05521481e-05
+3.06466635e-05
+6.96659937e-05
+9.41374948e-05
+0.000107954189
+0.000111352112
+0.000105219786
+9.05708422e-05
+6.82803384e-05
+3.84428073e-05
+7.78311959e-06
+5.52140972e-07
+4.43983652e-07
+4.4363698e-07
+4.43988636e-07
+5.52629599e-07
+7.79018556e-06
+3.84521209e-05
+6.828487e-05
+9.05732607e-05
+0.000105221334
+0.000111353215
+0.000107954689
+9.41366497e-05
+6.96565655e-05
+3.04808274e-05
+3.05752975e-05
+6.95047716e-05
+9.39208188e-05
+0.000107707092
+0.000111098973
+0.000104982886
+9.03701108e-05
+6.81337234e-05
+3.83706353e-05
+7.77497621e-06
+5.51230312e-07
+4.42946481e-07
+4.42599509e-07
+4.42951456e-07
+5.51720339e-07
+7.78205255e-06
+3.83799505e-05
+6.81382471e-05
+9.03725131e-05
+0.000104984412
+0.00011110005
+0.000107707565
+9.39199459e-05
+6.94953202e-05
+3.04094459e-05
+3.05038714e-05
+6.93433753e-05
+9.37038892e-05
+0.000107459681
+0.000110845475
+0.000104745609
+9.01690165e-05
+6.79867923e-05
+3.82981977e-05
+7.76672907e-06
+5.50316261e-07
+4.41908429e-07
+4.41561172e-07
+4.41913397e-07
+5.5080764e-07
+7.77381506e-06
+3.83075137e-05
+6.79913074e-05
+9.01714017e-05
+0.000104747113
+0.000110846524
+0.000107460124
+9.37029872e-05
+6.93338997e-05
+3.03380039e-05
+3.04323858e-05
+6.91818043e-05
+9.34867035e-05
+0.000107211951
+0.000110591615
+0.000104507954
+8.99675585e-05
+6.78395474e-05
+3.82254953e-05
+7.75837777e-06
+5.49398785e-07
+4.4086951e-07
+4.40521969e-07
+4.40874475e-07
+5.49891476e-07
+7.76547281e-06
+3.82348109e-05
+6.78440518e-05
+8.99699274e-05
+0.000104509434
+0.000110592637
+0.000107212363
+9.34857719e-05
+6.91723028e-05
+3.02665021e-05
+3.0360841e-05
+6.9020057e-05
+9.32692599e-05
+0.0001069639
+0.000110337393
+0.00010426992
+8.97657388e-05
+6.76919879e-05
+3.81525285e-05
+7.74992183e-06
+5.48477854e-07
+4.39829734e-07
+4.39481918e-07
+4.39834687e-07
+5.48971811e-07
+7.7570253e-06
+3.81618429e-05
+6.76964835e-05
+8.97680902e-05
+0.000104271376
+0.000110338383
+0.000106964278
+9.32682966e-05
+6.90105292e-05
+3.01949409e-05
+3.02892376e-05
+6.88581335e-05
+9.30515556e-05
+0.000106715524
+0.000110082805
+0.000104031507
+8.95635591e-05
+6.75441181e-05
+3.80792976e-05
+7.74136092e-06
+5.47553428e-07
+4.38789112e-07
+4.3844103e-07
+4.38794059e-07
+5.4804862e-07
+7.74847216e-06
+3.808861e-05
+6.75486028e-05
+8.95658927e-05
+0.000104032937
+0.000110083764
+0.000106715868
+9.30505591e-05
+6.88485777e-05
+3.01233208e-05
+3.02175765e-05
+6.86960322e-05
+9.28335886e-05
+0.000106466822
+0.00010982785
+0.000103792715
+8.93610206e-05
+6.73959367e-05
+3.80058034e-05
+7.73269466e-06
+5.46625492e-07
+4.37747658e-07
+4.37399315e-07
+4.377526e-07
+5.47121871e-07
+7.73981303e-06
+3.80151129e-05
+6.74004111e-05
+8.93633349e-05
+0.000103794119
+0.000109828778
+0.000106467132
+9.28325579e-05
+6.86864478e-05
+3.00516426e-05
+3.0145858e-05
+6.85337546e-05
+9.26153577e-05
+0.000106217792
+0.000109572528
+0.000103553546
+8.91581247e-05
+6.72474484e-05
+3.79320465e-05
+7.72392278e-06
+5.4569401e-07
+4.36705383e-07
+4.36356792e-07
+4.36710316e-07
+5.46191541e-07
+7.73104773e-06
+3.79413522e-05
+6.72519103e-05
+8.91604196e-05
+0.000103554922
+0.000109573423
+0.000106218066
+9.26142916e-05
+6.85241396e-05
+2.99799069e-05
+3.00740829e-05
+6.83712988e-05
+9.23968622e-05
+0.000105968434
+0.00010931684
+0.000103313999
+8.89548728e-05
+6.70986549e-05
+3.78580279e-05
+7.71504511e-06
+5.44758966e-07
+4.35662309e-07
+4.35313468e-07
+4.35667228e-07
+5.45257614e-07
+7.72217602e-06
+3.7867329e-05
+6.71031038e-05
+8.89571475e-05
+0.000103315347
+0.000109317701
+0.000105968669
+9.23957597e-05
+6.83616531e-05
+2.99081142e-05
+3.0002252e-05
+6.82086663e-05
+9.21781017e-05
+0.000105718746
+0.000109060784
+0.000103074078
+8.87512696e-05
+6.69495566e-05
+3.77837488e-05
+7.70606158e-06
+5.43820347e-07
+4.34618436e-07
+4.34269358e-07
+4.34623347e-07
+5.44320074e-07
+7.71319792e-06
+3.77930443e-05
+6.69539928e-05
+8.87535226e-05
+0.000103075397
+0.000109061609
+0.000105718943
+9.2176961e-05
+6.81989883e-05
+2.98362654e-05
+2.9930366e-05
+6.80458579e-05
+9.19590754e-05
+0.00010546873
+0.000108804364
+0.000102833784
+8.85473174e-05
+6.6800158e-05
+3.77092102e-05
+7.69697223e-06
+5.42878137e-07
+4.33573788e-07
+4.33224478e-07
+4.33578691e-07
+5.43378907e-07
+7.70411342e-06
+3.77184995e-05
+6.68045797e-05
+8.8549548e-05
+0.000102835073
+0.000108805152
+0.000105468887
+9.19578953e-05
+6.80361458e-05
+2.97643612e-05
+2.98584257e-05
+6.78828739e-05
+9.17397843e-05
+0.000105218384
+0.000108547578
+0.00010259312
+8.83430178e-05
+6.66504603e-05
+3.76344137e-05
+7.68777717e-06
+5.41932334e-07
+4.32528381e-07
+4.3217885e-07
+4.32533272e-07
+5.42434111e-07
+7.69492264e-06
+3.7643696e-05
+6.66548678e-05
+8.8345225e-05
+0.000102594377
+0.000108548329
+0.0001052185
+9.17385632e-05
+6.78731273e-05
+2.96924024e-05
+2.9786432e-05
+6.7719716e-05
+9.15202282e-05
+0.000104967712
+0.00010829043
+0.000102352087
+8.81383738e-05
+6.65004675e-05
+3.75593607e-05
+7.67847651e-06
+5.40982926e-07
+4.31482228e-07
+4.31132475e-07
+4.31487103e-07
+5.4148568e-07
+7.68562573e-06
+3.7568635e-05
+6.65048602e-05
+8.8140558e-05
+0.000102353313
+0.000108291142
+0.000104967784
+9.15189656e-05
+6.77099332e-05
+2.962039e-05
+2.97143858e-05
+6.75563849e-05
+9.13004094e-05
+0.000104716712
+0.000108032923
+0.000102110691
+8.79333912e-05
+6.63501823e-05
+3.74840528e-05
+7.66907038e-06
+5.40029915e-07
+4.30435339e-07
+4.30085382e-07
+4.30440204e-07
+5.40533615e-07
+7.67622285e-06
+3.74933183e-05
+6.63545594e-05
+8.79355505e-05
+0.000102111883
+0.000108033593
+0.000104716739
+9.12991034e-05
+6.75465655e-05
+2.95483247e-05
+2.96422881e-05
+6.73928837e-05
+9.10803289e-05
+0.000104465388
+0.000107775056
+0.000101868933
+8.77280712e-05
+6.61996072e-05
+3.74084912e-05
+7.65955893e-06
+5.39073293e-07
+4.29387737e-07
+4.29037583e-07
+4.29392584e-07
+5.39577903e-07
+7.66671413e-06
+3.74177476e-05
+6.62039682e-05
+8.77302058e-05
+0.00010187009
+0.000107775686
+0.00010446537
+9.1078978e-05
+6.73830254e-05
+2.94762075e-05
+2.95701397e-05
+6.72292129e-05
+9.08599883e-05
+0.000104213742
+0.000107516836
+0.000101626817
+8.75224179e-05
+6.60487448e-05
+3.73326773e-05
+7.64994219e-06
+5.38113055e-07
+4.28339445e-07
+4.27989095e-07
+4.28344273e-07
+5.38618549e-07
+7.65709961e-06
+3.73419235e-05
+6.60530887e-05
+8.75245276e-05
+0.000101627939
+0.000107517421
+0.000104213676
+9.08585916e-05
+6.72193155e-05
+2.94040395e-05
+2.94979418e-05
+6.70653759e-05
+9.06393906e-05
+0.000103961776
+0.000107258264
+0.000101384348
+8.73164369e-05
+6.58975981e-05
+3.72566126e-05
+7.64022022e-06
+5.37149197e-07
+4.27290468e-07
+4.26939934e-07
+4.27295282e-07
+5.37655536e-07
+7.64737938e-06
+3.72658479e-05
+6.59019244e-05
+8.73185197e-05
+0.000101385434
+0.000107258805
+0.000103961661
+9.06379466e-05
+6.70554375e-05
+2.93318216e-05
+2.94256954e-05
+6.69013749e-05
+9.04185382e-05
+0.000103709493
+0.000106999345
+0.00010114153
+8.71101292e-05
+6.57461699e-05
+3.71802977e-05
+7.63039283e-06
+5.36181707e-07
+4.26240832e-07
+4.25890123e-07
+4.26245628e-07
+5.36688867e-07
+7.63755329e-06
+3.71895216e-05
+6.57504791e-05
+8.71121844e-05
+0.000101142578
+0.000106999841
+0.000103709329
+9.04170455e-05
+6.68913946e-05
+2.92595549e-05
+2.93534017e-05
+6.67372131e-05
+9.01974346e-05
+0.000103456898
+0.000106740083
+0.000100898366
+8.69035015e-05
+6.55944638e-05
+3.71037342e-05
+7.62045994e-06
+5.35210571e-07
+4.25190552e-07
+4.24839674e-07
+4.25195334e-07
+5.35718518e-07
+7.62762122e-06
+3.71129457e-05
+6.55987539e-05
+8.69055283e-05
+0.000100899377
+0.000106740531
+0.000103456682
+9.01958917e-05
+6.67271896e-05
+2.91872406e-05
+2.92810618e-05
+6.65728926e-05
+8.99760833e-05
+0.000103203994
+0.000106480481
+0.000100654862
+8.66965571e-05
+6.54424822e-05
+3.70269225e-05
+7.6104212e-06
+5.34235771e-07
+4.2413965e-07
+4.23788612e-07
+4.24144411e-07
+5.34744486e-07
+7.61758285e-06
+3.70361212e-05
+6.54467526e-05
+8.66985551e-05
+0.000100655834
+0.000106480881
+0.000103203726
+8.99744889e-05
+6.65628249e-05
+2.91148798e-05
+2.92086771e-05
+6.6408418e-05
+8.97544878e-05
+0.000102950785
+0.000106220545
+0.000100411024
+8.64892988e-05
+6.5290226e-05
+3.69498635e-05
+7.60027633e-06
+5.33257292e-07
+4.23088144e-07
+4.22736954e-07
+4.23092883e-07
+5.3376674e-07
+7.60743795e-06
+3.69590487e-05
+6.52944772e-05
+8.64912678e-05
+0.000100411954
+0.000106220897
+0.000102950463
+8.97528409e-05
+6.63983051e-05
+2.90424739e-05
+2.91362486e-05
+6.62437931e-05
+8.95326533e-05
+0.000102697277
+0.00010596028
+0.000100166854
+8.62817328e-05
+6.51377016e-05
+3.68725581e-05
+7.59002489e-06
+5.32275112e-07
+4.22036057e-07
+4.21684718e-07
+4.22040778e-07
+5.32785263e-07
+7.59718602e-06
+3.6881729e-05
+6.51419317e-05
+8.6283671e-05
+0.000100167743
+0.000105960581
+0.000102696899
+8.95309522e-05
+6.62336333e-05
+2.89700239e-05
+2.90637778e-05
+6.60790206e-05
+8.93105848e-05
+0.000102443475
+0.000105699692
+9.992236e-05
+8.60738626e-05
+6.49849095e-05
+3.67950065e-05
+7.57966642e-06
+5.31289206e-07
+4.20983405e-07
+4.20631935e-07
+4.20988105e-07
+5.31800035e-07
+7.58682664e-06
+3.68041626e-05
+6.49891178e-05
+8.60757691e-05
+9.99232069e-05
+0.000105699942
+0.000102443041
+8.93088277e-05
+6.60688134e-05
+2.88975313e-05
+2.8991266e-05
+6.59141052e-05
+8.90882863e-05
+0.000102189385
+0.000105438787
+9.96775469e-05
+8.58656932e-05
+6.48318533e-05
+3.67172097e-05
+7.5692004e-06
+5.3029955e-07
+4.1993021e-07
+4.19578616e-07
+4.19934892e-07
+5.3081103e-07
+7.57635928e-06
+3.67263504e-05
+6.48360403e-05
+8.58675688e-05
+9.96783502e-05
+0.000105438983
+0.000102188892
+8.90864728e-05
+6.59038492e-05
+2.88249975e-05
+2.89187148e-05
+6.5749052e-05
+8.88657644e-05
+0.000101935012
+0.000105177571
+9.94324207e-05
+8.56572304e-05
+6.46785349e-05
+3.66391682e-05
+7.55862633e-06
+5.29306117e-07
+4.18876498e-07
+4.18524785e-07
+4.18881152e-07
+5.2981822e-07
+7.56578348e-06
+3.66482928e-05
+6.46827002e-05
+8.56590718e-05
+9.94331797e-05
+0.000105177713
+0.000101934459
+8.88638932e-05
+6.5738746e-05
+2.8752424e-05
+2.88461254e-05
+6.55838649e-05
+8.86430253e-05
+0.000101680364
+0.000104916051
+9.91869882e-05
+8.54484777e-05
+6.45249599e-05
+3.65608827e-05
+7.54794358e-06
+5.28308883e-07
+4.1782229e-07
+4.17470467e-07
+4.17826919e-07
+5.28821581e-07
+7.55509862e-06
+3.65699905e-05
+6.45291014e-05
+8.5450286e-05
+9.91877011e-05
+0.000104916138
+0.000101679751
+8.86410941e-05
+6.55735078e-05
+2.86798119e-05
+2.87734995e-05
+6.54185492e-05
+8.8420075e-05
+0.000101425447
+0.000104654234
+9.89412549e-05
+8.52394414e-05
+6.43711298e-05
+3.64823542e-05
+7.53715175e-06
+5.27307822e-07
+4.16767605e-07
+4.16415679e-07
+4.1677221e-07
+5.27821089e-07
+7.54430424e-06
+3.64914448e-05
+6.4375248e-05
+8.52412144e-05
+9.89419213e-05
+0.000104654264
+0.000101424772
+8.84180831e-05
+6.54081399e-05
+2.86071631e-05
+2.87008386e-05
+6.525311e-05
+8.81969205e-05
+0.00010117027
+0.000104392129
+9.86952292e-05
+8.50301252e-05
+6.42170491e-05
+3.6403583e-05
+7.52625019e-06
+5.26302906e-07
+4.1571247e-07
+4.15360453e-07
+4.15717054e-07
+5.26816711e-07
+7.53339975e-06
+3.64126556e-05
+6.42211422e-05
+8.50318652e-05
+9.86958478e-05
+0.000104392101
+0.000101169531
+8.81948663e-05
+6.52426471e-05
+2.8534479e-05
+2.86281445e-05
+6.50875519e-05
+8.79735684e-05
+0.00010091484
+0.000104129742
+9.84489171e-05
+8.4820538e-05
+6.40627192e-05
+3.63245704e-05
+7.51523846e-06
+5.2529411e-07
+4.14656903e-07
+4.14304808e-07
+4.1466146e-07
+5.25808418e-07
+7.52238459e-06
+3.63336243e-05
+6.40667888e-05
+8.48222411e-05
+9.84494875e-05
+0.000104129655
+0.000100914036
+8.7971451e-05
+6.50770351e-05
+2.84617614e-05
+2.85554185e-05
+6.49218819e-05
+8.77500272e-05
+0.000100659165
+0.000103867082
+9.82023266e-05
+8.46106842e-05
+6.3908146e-05
+3.62453171e-05
+7.50411603e-06
+5.24281412e-07
+4.13600937e-07
+4.13248771e-07
+4.13605467e-07
+5.24796188e-07
+7.51125828e-06
+3.62543516e-05
+6.39121901e-05
+8.46123492e-05
+9.82028478e-05
+0.000103866934
+0.000100658294
+8.7747845e-05
+6.49113094e-05
+2.83890116e-05
+2.84826625e-05
+6.47561042e-05
+8.75263035e-05
+0.000100403254
+0.000103604158
+9.79554662e-05
+8.44005688e-05
+6.37533338e-05
+3.61658245e-05
+7.49288245e-06
+5.23264786e-07
+4.12544585e-07
+4.12192363e-07
+4.12549093e-07
+5.23779984e-07
+7.50002024e-06
+3.61748387e-05
+6.37573513e-05
+8.44021968e-05
+9.7955936e-05
+0.000103603948
+0.000100402316
+8.75240555e-05
+6.47454755e-05
+2.83162316e-05
+2.84098782e-05
+6.45902254e-05
+8.73024063e-05
+0.000100147116
+0.000103340978
+9.77083436e-05
+8.41902001e-05
+6.35982857e-05
+3.60860936e-05
+7.48153732e-06
+5.22244207e-07
+4.11487888e-07
+4.11135608e-07
+4.1149236e-07
+5.22759769e-07
+7.48866987e-06
+3.60950864e-05
+6.36022741e-05
+8.41917893e-05
+9.77087609e-05
+0.000103340705
+0.000100146108
+8.73000907e-05
+6.45795391e-05
+2.8243423e-05
+2.83370675e-05
+6.44242511e-05
+8.70783432e-05
+9.9890761e-05
+0.000103077553
+9.7460967e-05
+8.39795845e-05
+6.34430058e-05
+3.60061265e-05
+7.47008025e-06
+5.21219661e-07
+4.10430856e-07
+4.10078536e-07
+4.10435302e-07
+5.21735501e-07
+7.47720652e-06
+3.60150955e-05
+6.34469644e-05
+8.39811316e-05
+9.74613298e-05
+0.000103077214
+9.98896828e-05
+8.70759594e-05
+6.44135069e-05
+2.81705878e-05
+2.82642321e-05
+6.42581882e-05
+8.68541236e-05
+9.96341981e-05
+0.000102813891
+9.72133449e-05
+8.37687278e-05
+6.32874987e-05
+3.59259242e-05
+7.45851089e-06
+5.20191122e-07
+4.09373521e-07
+4.09021173e-07
+4.09377932e-07
+5.20707109e-07
+7.4656293e-06
+3.59348669e-05
+6.32914259e-05
+8.37702318e-05
+9.72136521e-05
+0.000102813486
+9.96330474e-05
+8.685167e-05
+6.4247385e-05
+2.80977275e-05
+2.81913739e-05
+6.40920419e-05
+8.66297557e-05
+9.93774376e-05
+0.000102550004
+9.69654882e-05
+8.35576403e-05
+6.31317713e-05
+3.58454896e-05
+7.44682913e-06
+5.19158575e-07
+4.08315914e-07
+4.07963537e-07
+4.08320283e-07
+5.1967451e-07
+7.45393726e-06
+3.58544018e-05
+6.31356616e-05
+8.35590959e-05
+9.69657351e-05
+0.000102549529
+9.93762127e-05
+8.66272314e-05
+6.40811795e-05
+2.80248441e-05
+2.81184947e-05
+6.39258197e-05
+8.64052495e-05
+9.912049e-05
+0.000102285901
+9.67174046e-05
+8.33463269e-05
+6.29758278e-05
+3.57648251e-05
+7.43503481e-06
+5.18122009e-07
+4.07258052e-07
+4.06905669e-07
+4.07262381e-07
+5.18637537e-07
+7.4421286e-06
+3.57736992e-05
+6.29796742e-05
+8.33477299e-05
+9.67175876e-05
+0.000102285355
+9.91191889e-05
+8.64026533e-05
+6.39148979e-05
+2.79519396e-05
+2.80455967e-05
+6.37595269e-05
+8.61806136e-05
+9.88633665e-05
+0.000102021596
+9.64691072e-05
+8.31347997e-05
+6.2819678e-05
+3.56839356e-05
+7.42312837e-06
+5.1708141e-07
+4.06199971e-07
+4.05847581e-07
+4.06204243e-07
+5.17595963e-07
+7.43020105e-06
+3.56927596e-05
+6.28234685e-05
+8.31361406e-05
+9.64692193e-05
+0.000102020971
+9.88619868e-05
+8.61779452e-05
+6.37485473e-05
+2.7879016e-05
+2.79726814e-05
+6.35931712e-05
+8.59558583e-05
+9.86060783e-05
+0.000101757098
+9.62206068e-05
+8.29230689e-05
+6.26633281e-05
+3.56028259e-05
+7.41111026e-06
+5.16036782e-07
+4.05141696e-07
+4.04789316e-07
+4.05145885e-07
+5.16549355e-07
+7.41815022e-06
+3.56115791e-05
+6.26670432e-05
+8.29243307e-05
+9.6220636e-05
+0.00010175639
+9.8604618e-05
+8.59531187e-05
+6.35821377e-05
+2.78060752e-05
+2.78997509e-05
+6.34267577e-05
+8.57309928e-05
+9.83486379e-05
+0.000101492423
+9.59719168e-05
+8.27111453e-05
+6.25067913e-05
+3.55215065e-05
+7.39898246e-06
+5.14988155e-07
+4.04083255e-07
+4.03730891e-07
+4.04087334e-07
+5.1549701e-07
+7.40596961e-06
+3.55301543e-05
+6.25103977e-05
+8.27123037e-05
+9.5971845e-05
+0.00010149162
+9.83470939e-05
+8.57281848e-05
+6.34156782e-05
+2.77331196e-05
+2.7826807e-05
+6.32602935e-05
+8.55060269e-05
+9.80910565e-05
+0.000101227582
+9.57230501e-05
+8.24990435e-05
+6.23500796e-05
+3.54399848e-05
+7.38674621e-06
+5.1393555e-07
+4.03024683e-07
+4.02672341e-07
+4.03028592e-07
+5.14437606e-07
+7.39364509e-06
+3.54484674e-05
+6.235352e-05
+8.2500054e-05
+9.57228486e-05
+0.000101226668
+9.80894259e-05
+8.55031595e-05
+6.32491861e-05
+2.76601519e-05
+2.77538511e-05
+6.30937814e-05
+8.52809663e-05
+9.78333419e-05
+0.000100962584
+9.54740196e-05
+8.22867819e-05
+6.21932152e-05
+3.5358276e-05
+7.37440434e-06
+5.12879034e-07
+4.01966005e-07
+4.01613704e-07
+4.0196965e-07
+5.13368891e-07
+7.38115276e-06
+3.53664931e-05
+6.2196396e-05
+8.22875704e-05
+9.54736368e-05
+0.000100961535
+9.78316247e-05
+8.527806e-05
+6.30826852e-05
+2.75871766e-05
+2.76808845e-05
+6.29272352e-05
+8.50558236e-05
+9.75754993e-05
+0.000100697427
+9.5224813e-05
+8.20743419e-05
+6.20361888e-05
+3.52764015e-05
+7.36196497e-06
+5.11818762e-07
+4.00907268e-07
+4.00555014e-07
+4.00910501e-07
+5.12287263e-07
+7.36845598e-06
+3.52841899e-05
+6.2038955e-05
+8.20747847e-05
+9.52241581e-05
+0.000100696192
+9.75736927e-05
+8.50529257e-05
+6.29162553e-05
+2.75142012e-05
+2.76079083e-05
+6.27606524e-05
+8.48305973e-05
+9.73175296e-05
+0.000100432105
+9.49754131e-05
+8.18616896e-05
+6.18789477e-05
+3.51943299e-05
+7.34942441e-06
+5.10754778e-07
+3.99848483e-07
+3.99496289e-07
+3.99851086e-07
+5.11187842e-07
+7.35549444e-06
+3.52014985e-05
+6.18811646e-05
+8.18617332e-05
+9.49745331e-05
+0.000100430849
+9.73159371e-05
+8.48281616e-05
+6.27505194e-05
+2.74412453e-05
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+6.06722125e-07
+6.06722197e-07
+6.0672234e-07
+6.06722546e-07
+6.06722805e-07
+6.06723108e-07
+6.06723444e-07
+6.06723801e-07
+6.06724171e-07
+6.06724546e-07
+6.06725027e-07
+6.06725677e-07
+6.06726494e-07
+6.06727478e-07
+6.06728632e-07
+6.06729961e-07
+6.06731402e-07
+6.06732848e-07
+6.06734309e-07
+6.06735796e-07
+6.06737321e-07
+6.06738899e-07
+6.0674054e-07
+6.06742256e-07
+6.06743938e-07
+)
+;
+    }
+    outlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+2.75713964e-05
+6.26776504e-05
+8.47184073e-05
+9.71888251e-05
+0.000100299281
+9.4849805e-05
+8.17534242e-05
+6.17971099e-05
+3.51477834e-05
+7.33970433e-06
+5.10079268e-07
+3.99319651e-07
+3.98967919e-07
+3.99322242e-07
+5.10511738e-07
+7.34576588e-06
+3.51549398e-05
+6.17993177e-05
+8.17534581e-05
+9.48489128e-05
+0.00010029801
+9.71872163e-05
+8.47159563e-05
+6.26675137e-05
+2.7404942e-05
+)
+;
+    }
+    wall1
+    {
+        type            compressible::alphatPhaseChangeJayatillekeWallFunction;
+        Prt             0.85;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+    wall2
+    {
+        type            compressible::alphatPhaseChangeJayatillekeWallFunction;
+        Prt             0.85;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alphat.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alphat.liquid
new file mode 100644
index 0000000000..c04002047e
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/alphat.liquid
@@ -0,0 +1,2078 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      alphat.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+0.0439193299
+0.0997894082
+0.13478747
+0.154497593
+0.159263326
+0.150362782
+0.12925455
+0.0972002875
+0.0542157578
+0.0106707007
+0.000774064757
+0.000636374804
+0.000635926823
+0.000636379054
+0.000774577802
+0.0106790243
+0.0542270337
+0.0972054776
+0.129256681
+0.150363262
+0.159262702
+0.154495816
+0.134783858
+0.0997813485
+0.0439191015
+0.0439193692
+0.0997903706
+0.134790215
+0.154502799
+0.159271531
+0.150374411
+0.129269862
+0.0972191851
+0.0542412719
+0.0106839828
+0.000774508841
+0.000636373429
+0.000635924183
+0.000636377758
+0.000775031399
+0.0106923427
+0.0542523862
+0.0972239406
+0.129271379
+0.150374162
+0.159270133
+0.154500269
+0.13478594
+0.099781772
+0.0439198055
+0.043919415
+0.0997915151
+0.134793413
+0.154508847
+0.159281073
+0.150387961
+0.129287745
+0.0972413137
+0.0542710964
+0.0106996447
+0.000775035306
+0.000636371815
+0.000635921073
+0.000636376205
+0.000775568024
+0.0107080694
+0.0542822696
+0.0972460727
+0.12928924
+0.150387684
+0.159279651
+0.154506298
+0.134789123
+0.0997828992
+0.0439197832
+0.0439194647
+0.0997927318
+0.134796712
+0.15451502
+0.15929075
+0.150401638
+0.129305726
+0.0972634807
+0.0543008015
+0.0107153222
+0.000775564772
+0.000636370203
+0.000635917949
+0.000636374655
+0.000776107127
+0.0107238151
+0.0543120411
+0.0972682562
+0.129307216
+0.150401352
+0.159289318
+0.154512463
+0.134792414
+0.0997840998
+0.0439198522
+0.0439195191
+0.09979402
+0.134800109
+0.154521309
+0.159300544
+0.150415415
+0.129323763
+0.0972856173
+0.0543303249
+0.0107309763
+0.00077609598
+0.000636368591
+0.000635914819
+0.000636373106
+0.000776647348
+0.0107395378
+0.0543416306
+0.0972904103
+0.129325248
+0.150415117
+0.159299101
+0.154518742
+0.134795801
+0.0997853714
+0.0439199151
+0.0439195791
+0.0997953813
+0.134803608
+0.154527715
+0.159310461
+0.1504293
+0.129341866
+0.0973077294
+0.0543596999
+0.0107466194
+0.000776629274
+0.000636366974
+0.000635911691
+0.000636371546
+0.00077718908
+0.010755249
+0.0543710716
+0.0973125401
+0.129343347
+0.150428989
+0.159309007
+0.154525139
+0.134799289
+0.0997867132
+0.0439199852
+0.0439196452
+0.0997968122
+0.134807204
+0.154534239
+0.1593205
+0.15044329
+0.129360031
+0.0973298144
+0.0543889472
+0.0107622581
+0.000777164918
+0.00063636536
+0.000635908551
+0.000636369994
+0.000777732646
+0.0107709549
+0.0544003845
+0.0973346429
+0.129361506
+0.15044297
+0.159319034
+0.154531652
+0.134802874
+0.0997881253
+0.043920061
+0.0439197177
+0.0997983094
+0.134810896
+0.154540873
+0.15933065
+0.150457375
+0.129378243
+0.0973518552
+0.0544180691
+0.0107778896
+0.000777702798
+0.000636363751
+0.000635905406
+0.000636368434
+0.000778277997
+0.0107866524
+0.0544295712
+0.0973567021
+0.129379713
+0.150457045
+0.159329174
+0.154538276
+0.134806554
+0.0997896028
+0.0439201434
+0.0439197969
+0.0997998696
+0.134814679
+0.154547609
+0.159340902
+0.15047154
+0.12939648
+0.0973738353
+0.0544470564
+0.010793505
+0.00077824259
+0.000636362148
+0.000635902261
+0.000636366876
+0.000778824854
+0.0108023327
+0.0544586226
+0.0973787008
+0.129397945
+0.1504712
+0.159339414
+0.154545001
+0.134810324
+0.0997911432
+0.0439202323
+0.0439198829
+0.0998014894
+0.134818546
+0.154554441
+0.159351243
+0.150485767
+0.129414717
+0.0973957291
+0.0544758968
+0.0108090943
+0.000778783894
+0.000636360538
+0.000635899103
+0.000636365315
+0.000779372872
+0.0108179856
+0.0544875263
+0.0974006133
+0.129416181
+0.150485416
+0.159349746
+0.154551822
+0.13481418
+0.0997927426
+0.043920328
+0.0439199757
+0.0998031646
+0.134822497
+0.154561363
+0.159361665
+0.150500041
+0.129432938
+0.0974175226
+0.0545045821
+0.0108246496
+0.000779326395
+0.000636358936
+0.000635895953
+0.000636363758
+0.00077992176
+0.0108336031
+0.0545162736
+0.0974224236
+0.129434397
+0.15049968
+0.159360155
+0.154558733
+0.134818117
+0.0997943978
+0.0439204305
+0.0439200755
+0.0998048932
+0.134826525
+0.154568369
+0.159372157
+0.150514348
+0.129451123
+0.0974392047
+0.0545331078
+0.0108401657
+0.000779869848
+0.000636357333
+0.000635892798
+0.000636362198
+0.000780471314
+0.01084918
+0.0545448609
+0.0974441223
+0.129452581
+0.150513979
+0.159370638
+0.154565728
+0.134822134
+0.0997961059
+0.04392054
+0.0439201821
+0.0998066715
+0.13483063
+0.154575453
+0.159382713
+0.150528678
+0.129469262
+0.0974607656
+0.0545614748
+0.0108556397
+0.000780414108
+0.000636355734
+0.000635889642
+0.00063636064
+0.000781021418
+0.0108647136
+0.0545732879
+0.0974656996
+0.129470718
+0.1505283
+0.159381183
+0.154572803
+0.134826226
+0.099797864
+0.0439206562
+0.0439202956
+0.0998084957
+0.134834806
+0.154582612
+0.159393324
+0.15054302
+0.129487342
+0.0974821989
+0.0545896848
+0.0108710704
+0.000780959058
+0.000636354139
+0.000635886483
+0.000636359081
+0.000781571989
+0.0108802027
+0.0546015569
+0.0974871509
+0.129488796
+0.150542634
+0.159391785
+0.154579951
+0.134830389
+0.099799668
+0.0439207793
+0.0439204158
+0.0998103634
+0.134839049
+0.15458984
+0.159403982
+0.150557362
+0.129505353
+0.0975035014
+0.0546177402
+0.0108864573
+0.000781504622
+0.000636352542
+0.000635883322
+0.000636357522
+0.000782122966
+0.0108956466
+0.0546296702
+0.0975084694
+0.129506804
+0.150556969
+0.159402433
+0.154587168
+0.13483462
+0.0998015148
+0.0439209092
+0.0439205427
+0.0998122715
+0.134843355
+0.15459713
+0.159414679
+0.150571695
+0.129523285
+0.0975246698
+0.0546456438
+0.0109017999
+0.00078205073
+0.000636350945
+0.000635880164
+0.000636355969
+0.000782674312
+0.010911045
+0.0546576304
+0.0975296551
+0.129524735
+0.150571293
+0.15941312
+0.154594448
+0.134838915
+0.0998034015
+0.0439210456
+0.0439206761
+0.0998142155
+0.13484772
+0.154604476
+0.159425403
+0.150586005
+0.129541127
+0.0975456992
+0.0546733967
+0.0109170974
+0.000782597294
+0.000636349362
+0.000635877001
+0.000636354409
+0.000783225958
+0.0109263973
+0.054685439
+0.0975507
+0.129542576
+0.150585597
+0.159423837
+0.154601784
+0.134843266
+0.0998053249
+0.0439211886
+0.0439208159
+0.0998161922
+0.134852137
+0.15461187
+0.159436148
+0.150600282
+0.129558868
+0.0975665839
+0.0547009998
+0.0109323488
+0.000783144235
+0.000636347767
+0.000635873839
+0.000636352854
+0.000783777825
+0.0109417023
+0.0547130965
+0.0975716016
+0.129560318
+0.150599869
+0.159434572
+0.154609168
+0.134847671
+0.09980728
+0.043921338
+0.0439209619
+0.0998181972
+0.1348566
+0.154619304
+0.159446901
+0.150614516
+0.129576501
+0.0975873224
+0.0547284532
+0.010947553
+0.000783691457
+0.000636346181
+0.000635870669
+0.000636351298
+0.000784329841
+0.0109569591
+0.0547406037
+0.0975923567
+0.129577951
+0.150614095
+0.159445317
+0.154616592
+0.134852122
+0.0998092647
+0.0439214936
+0.0439211141
+0.0998202278
+0.134861105
+0.15462677
+0.159457651
+0.150628691
+0.129594017
+0.0976079102
+0.0547557571
+0.0109627088
+0.000784238858
+0.000636344588
+0.000635867504
+0.000636349745
+0.000784881923
+0.0109721664
+0.0547679594
+0.0976129607
+0.129595467
+0.150628265
+0.159456059
+0.154624049
+0.134856614
+0.0998112739
+0.0439216552
+0.0439212721
+0.099822279
+0.134865643
+0.154634258
+0.159468388
+0.150642799
+0.129611407
+0.0976283438
+0.0547829101
+0.0109778148
+0.000784786353
+0.000636343002
+0.000635864342
+0.000636348187
+0.000785433985
+0.0109873229
+0.0547951639
+0.09763341
+0.129612858
+0.150642368
+0.159466789
+0.154631529
+0.13486114
+0.0998133036
+0.0439218228
+0.0439214358
+0.0998243473
+0.134870209
+0.154641761
+0.159479102
+0.150656829
+0.129628662
+0.0976486198
+0.0548099122
+0.0109928699
+0.000785333846
+0.000636341419
+0.000635861172
+0.000636346626
+0.00078598594
+0.0110024273
+0.0548222161
+0.0976536998
+0.129630116
+0.150656392
+0.159477496
+0.154639023
+0.134865694
+0.0998153512
+0.0439219961
+0.043921605
+0.099826429
+0.134874795
+0.154649269
+0.159489781
+0.150670769
+0.129645778
+0.0976687342
+0.0548367628
+0.0110078729
+0.000785881255
+0.000636339831
+0.000635858008
+0.000636345066
+0.000786537722
+0.0110174788
+0.0548491158
+0.0976738312
+0.129647231
+0.150670329
+0.159488167
+0.154646521
+0.134870268
+0.0998174112
+0.0439221749
+0.0439217795
+0.0998285194
+0.134879394
+0.154656772
+0.159500415
+0.150684611
+0.129662746
+0.0976886876
+0.0548634622
+0.0110228229
+0.000786428508
+0.00063633824
+0.00063585484
+0.000636343512
+0.000787089259
+0.0110324763
+0.054875863
+0.0976937994
+0.129664202
+0.150684167
+0.159498794
+0.154654015
+0.134874856
+0.0998194807
+0.043922359
+0.043921959
+0.0998306143
+0.134884
+0.15466426
+0.159510992
+0.150698345
+0.129679562
+0.0977084759
+0.0548900095
+0.0110377193
+0.000786975535
+0.000636336659
+0.000635851669
+0.000636341949
+0.00078764049
+0.0110474193
+0.0549024574
+0.097713604
+0.12968102
+0.150697897
+0.159509367
+0.154661496
+0.134879449
+0.099821554
+0.0439225481
+0.0439221433
+0.0998327086
+0.134888603
+0.154671725
+0.159521505
+0.150711962
+0.12969622
+0.0977280998
+0.054916406
+0.0110525614
+0.000787522278
+0.000636335065
+0.000635848494
+0.00063634039
+0.000788191366
+0.0110623071
+0.0549288996
+0.0977332441
+0.129697681
+0.150711512
+0.159519873
+0.154668952
+0.134884041
+0.0998236272
+0.0439227421
+0.0439223322
+0.0998347993
+0.134893197
+0.154679156
+0.15953194
+0.150725453
+0.129712717
+0.0977475563
+0.0549426513
+0.0110673489
+0.000788068685
+0.000636333477
+0.000635845326
+0.000636338829
+0.000788741831
+0.0110771394
+0.0549551897
+0.0977527162
+0.12971418
+0.150725
+0.159530303
+0.154676376
+0.134888624
+0.0998256964
+0.0439229407
+0.0439225254
+0.0998368805
+0.134897774
+0.154686544
+0.159542291
+0.150738811
+0.129729045
+0.0977668468
+0.0549687459
+0.0110820815
+0.000788614709
+0.000636331888
+0.000635842151
+0.000636337269
+0.000789291852
+0.0110919158
+0.0549813284
+0.0977720221
+0.129730513
+0.150738356
+0.159540648
+0.154683756
+0.13489319
+0.0998277567
+0.0439231436
+0.0439227226
+0.0998389491
+0.134902326
+0.154693878
+0.159552543
+0.150752028
+0.129745204
+0.0977859693
+0.0549946904
+0.0110967587
+0.000789160305
+0.000636330293
+0.000635838978
+0.000636335708
+0.000789841384
+0.0111066361
+0.0550073158
+0.0977911596
+0.129746675
+0.15075157
+0.159550897
+0.154691084
+0.13489773
+0.0998298031
+0.0439233505
+0.0439229234
+0.0998409987
+0.134906843
+0.154701149
+0.159562692
+0.150765096
+0.12976119
+0.0978049234
+0.0550204852
+0.0111113802
+0.000789705427
+0.000636328701
+0.000635835802
+0.000636334138
+0.000790390384
+0.0111213
+0.0550331527
+0.0978101284
+0.129762664
+0.150764636
+0.159561039
+0.154698347
+0.134902236
+0.0998318313
+0.0439235611
+0.0439231276
+0.0998430253
+0.134911319
+0.154708346
+0.159572722
+0.150778007
+0.129776997
+0.0978237087
+0.0550461296
+0.0111259457
+0.00079025003
+0.000636327107
+0.00063583263
+0.00063633257
+0.000790938808
+0.0111359069
+0.0550588385
+0.0978289283
+0.129778474
+0.150777546
+0.159571066
+0.154705537
+0.134906702
+0.099833837
+0.0439237751
+0.0439233347
+0.0998450236
+0.134915745
+0.15471546
+0.159582629
+0.150790755
+0.129792622
+0.0978423232
+0.0550716237
+0.0111404544
+0.000790794055
+0.000636325513
+0.00063582945
+0.000636331003
+0.000791486613
+0.0111504563
+0.0550843727
+0.0978475587
+0.129794103
+0.150790292
+0.159580968
+0.154712645
+0.134911116
+0.0998358141
+0.0439239921
+0.0439235446
+0.0998469893
+0.134920111
+0.15472248
+0.159592399
+0.150803332
+0.129808062
+0.0978607666
+0.0550969665
+0.0111549055
+0.000791337458
+0.000636323908
+0.000635826277
+0.000636329434
+0.000792033741
+0.0111649474
+0.0551097548
+0.0978660178
+0.129809549
+0.150802867
+0.159590735
+0.154719658
+0.134915471
+0.0998377579
+0.0439242119
+0.0439237568
+0.0998489184
+0.13492441
+0.154729396
+0.159602025
+0.150815731
+0.129823313
+0.0978790372
+0.0551221568
+0.0111692981
+0.000791880169
+0.000636322312
+0.000635823094
+0.000636327857
+0.000792580137
+0.0111793794
+0.0551349837
+0.0978843039
+0.129824803
+0.150815265
+0.159600358
+0.154726569
+0.13491976
+0.0998396654
+0.043924434
+0.0439239709
+0.0998508045
+0.134928634
+0.154736199
+0.159611498
+0.150827945
+0.129838372
+0.0978971335
+0.0551471931
+0.0111836312
+0.000792422124
+0.000636320706
+0.000635819918
+0.000636326275
+0.000793125728
+0.011193751
+0.0551600579
+0.0979024153
+0.129839866
+0.15082748
+0.159609827
+0.154733366
+0.134923974
+0.0998415304
+0.043924658
+0.0439241865
+0.0998526441
+0.134932774
+0.154742879
+0.159620808
+0.150839969
+0.129853233
+0.0979150554
+0.0551720738
+0.0111979035
+0.000792963253
+0.000636319102
+0.000635816734
+0.000636324701
+0.000793670457
+0.0112080611
+0.0551849753
+0.0979203503
+0.129854732
+0.150839503
+0.159619135
+0.154740041
+0.134928105
+0.0998433481
+0.0439248838
+0.0439244035
+0.0998544326
+0.134936823
+0.154749429
+0.159629949
+0.150851797
+0.129867895
+0.097932798
+0.0551967971
+0.0112121136
+0.000793503488
+0.000636317494
+0.000635813553
+0.000636323111
+0.000794214245
+0.0112223085
+0.0552097349
+0.0979381093
+0.129869399
+0.150851331
+0.159628271
+0.154746584
+0.134932144
+0.0998451156
+0.0439251108
+0.0439246212
+0.0998561664
+0.134940774
+0.154755836
+0.159638911
+0.15086342
+0.129882355
+0.0979503634
+0.0552213613
+0.0112262605
+0.000794042744
+0.00063631588
+0.00063581037
+0.000636321524
+0.00079475703
+0.0112364919
+0.0552343345
+0.0979556891
+0.129883864
+0.150862955
+0.15963723
+0.154752985
+0.134936085
+0.0998468276
+0.0439253387
+0.0439248395
+0.0998578402
+0.134944619
+0.154762095
+0.159647686
+0.150874838
+0.129896609
+0.0979677463
+0.0552457645
+0.0112403428
+0.000794580976
+0.000636314265
+0.000635807185
+0.000636319938
+0.000795298743
+0.0112506101
+0.0552587725
+0.0979730879
+0.129898124
+0.150874372
+0.159646004
+0.15475924
+0.13493992
+0.0998484805
+0.0439255672
+0.0439250579
+0.0998594523
+0.134948352
+0.154768197
+0.159656269
+0.150886041
+0.129910654
+0.0979849489
+0.0552700053
+0.0112543595
+0.000795118099
+0.000636312641
+0.000635804004
+0.000636318341
+0.000795839317
+0.0112646621
+0.0552830472
+0.0979903043
+0.129912175
+0.150885576
+0.159654584
+0.154765337
+0.134943642
+0.0998500706
+0.0439257958
+0.043925276
+0.0998609972
+0.134951965
+0.154774135
+0.159664653
+0.150897027
+0.129924488
+0.0980019695
+0.0552940822
+0.0112683096
+0.000795654067
+0.000636311026
+0.00063580082
+0.000636316745
+0.000796378703
+0.0112786468
+0.0553071575
+0.0980073385
+0.129926015
+0.150896563
+0.159662967
+0.15477127
+0.134947247
+0.0998515948
+0.0439260243
+0.0439254935
+0.0998624729
+0.134955454
+0.154779903
+0.15967283
+0.150907794
+0.129938111
+0.0980188046
+0.0553179941
+0.0112821922
+0.000796188821
+0.000636309394
+0.00063579763
+0.000636315142
+0.000796916842
+0.0112925635
+0.0553311017
+0.0980241886
+0.129939642
+0.150907331
+0.159671143
+0.154777032
+0.134950726
+0.0998530491
+0.0439262522
+0.04392571
+0.0998638764
+0.134958812
+0.154785492
+0.159680798
+0.150918335
+0.12995152
+0.0980354561
+0.0553417397
+0.0112960066
+0.000796722313
+0.000636307764
+0.00063579444
+0.000636313541
+0.000797453685
+0.0113064114
+0.0553548793
+0.0980408532
+0.129953057
+0.150917873
+0.159679109
+0.154782618
+0.134954074
+0.0998544305
+0.0439264792
+0.0439259253
+0.0998652049
+0.134962035
+0.154790897
+0.15968855
+0.150928649
+0.129964713
+0.0980519207
+0.0553653182
+0.0113097521
+0.000797254501
+0.000636306131
+0.000635791258
+0.000636311935
+0.000797989192
+0.0113201898
+0.0553784891
+0.0980573324
+0.129966254
+0.150928187
+0.159686859
+0.154788019
+0.134957287
+0.0998557377
+0.0439267049
+0.0439261388
+0.0998664561
+0.134965116
+0.154796115
+0.159696081
+0.150938732
+0.129977687
+0.0980682001
+0.0553887285
+0.011323428
+0.000797785333
+0.000636304496
+0.000635788063
+0.000636310322
+0.000798523318
+0.011333898
+0.05540193
+0.0980736262
+0.129979235
+0.150938272
+0.159694389
+0.154793232
+0.13496036
+0.0998569671
+0.0439269291
+0.0439263504
+0.0998676272
+0.134968053
+0.154801138
+0.159703388
+0.150948582
+0.129990443
+0.098084293
+0.0554119701
+0.0113370338
+0.000798314775
+0.000636302848
+0.000635784873
+0.000636308703
+0.000799056026
+0.0113475356
+0.0554252013
+0.0980897333
+0.129991996
+0.150948123
+0.159701695
+0.15479825
+0.134963287
+0.0998581172
+0.0439271513
+0.0439265596
+0.0998687176
+0.134970841
+0.154805961
+0.159710465
+0.150958195
+0.130002979
+0.0981001979
+0.0554350411
+0.0113505686
+0.000798842777
+0.000636301198
+0.000635781685
+0.000636307073
+0.000799587263
+0.0113611017
+0.0554483022
+0.0981056521
+0.130004539
+0.150957738
+0.159708771
+0.15480307
+0.134966066
+0.099859185
+0.0439273713
+0.0439267662
+0.0998697243
+0.134973476
+0.154810582
+0.159717311
+0.15096757
+0.130015293
+0.0981159137
+0.0554579405
+0.0113640317
+0.000799369289
+0.00063629955
+0.000635778492
+0.000636305446
+0.000800116989
+0.0113745955
+0.0554712304
+0.0981213816
+0.13001686
+0.150967114
+0.159715615
+0.154807686
+0.134968692
+0.0998601703
+0.0439275887
+0.0439269699
+0.0998706472
+0.134975956
+0.154814995
+0.159723921
+0.150976705
+0.130027385
+0.0981314391
+0.0554806669
+0.0113774221
+0.000799894267
+0.000636297891
+0.000635775297
+0.000636303813
+0.000800645144
+0.0113880163
+0.0554939849
+0.0981369205
+0.130028958
+0.150976251
+0.159722224
+0.154812094
+0.134971162
+0.0998610706
+0.0439278032
+0.0439271703
+0.0998714844
+0.134978277
+0.154819197
+0.159730292
+0.150985597
+0.130039251
+0.0981467733
+0.0555032179
+0.0113907388
+0.000800417647
+0.000636296227
+0.000635772104
+0.000636302173
+0.000801171684
+0.0114013628
+0.0555165638
+0.0981522698
+0.130040831
+0.150985146
+0.159728595
+0.154816294
+0.134973474
+0.0998618856
+0.0439280146
+0.0439273672
+0.0998722361
+0.134980437
+0.154823186
+0.159736423
+0.150994245
+0.130050894
+0.0981619156
+0.0555255919
+0.0114039805
+0.000800939365
+0.000636294557
+0.000635768904
+0.000636300532
+0.000801696532
+0.0114146338
+0.0555389648
+0.0981674253
+0.130052479
+0.150993796
+0.159734723
+0.154820278
+0.134975625
+0.099862615
+0.0439282226
+0.0439275604
+0.0998729002
+0.134982435
+0.15482696
+0.15974231
+0.151002647
+0.13006231
+0.0981768636
+0.0555477859
+0.0114171457
+0.000801459346
+0.00063629288
+0.000635765705
+0.000636298877
+0.000802219631
+0.0114278279
+0.0555611857
+0.0981823862
+0.130063902
+0.151002201
+0.159740609
+0.154824048
+0.134977613
+0.0998632567
+0.0439284268
+0.0439277496
+0.0998734783
+0.134984268
+0.154830514
+0.159747951
+0.151010802
+0.130073496
+0.0981916133
+0.0555697977
+0.0114302329
+0.000801977522
+0.000636291198
+0.000635762503
+0.000636297216
+0.000802740893
+0.0114409436
+0.0555832237
+0.0981971502
+0.130075096
+0.151010357
+0.159746251
+0.154827599
+0.134979437
+0.0998638126
+0.0439286272
+0.0439279345
+0.0998739702
+0.134985936
+0.154833849
+0.159753344
+0.151018708
+0.130084454
+0.0982061676
+0.0555916242
+0.0114432405
+0.000802493807
+0.000636289511
+0.000635759294
+0.000636295557
+0.000803260236
+0.0114539792
+0.0556050759
+0.0982117172
+0.13008606
+0.151018266
+0.159751644
+0.154830929
+0.134981096
+0.0998642813
+0.0439288234
+0.043928115
+0.0998743751
+0.134987438
+0.154836962
+0.159758491
+0.151026365
+0.130095181
+0.0982205211
+0.0556132621
+0.0114561665
+0.000803008115
+0.000636287816
+0.000635756096
+0.000636293885
+0.000803777584
+0.0114669328
+0.0556267391
+0.098226083
+0.130096793
+0.151025925
+0.15975679
+0.154834039
+0.134982588
+0.0998646639
+0.0439290153
+0.043928291
+0.0998746942
+0.134988774
+0.154839854
+0.159763388
+0.151033771
+0.130105675
+0.0982346733
+0.0556347085
+0.0114690092
+0.000803520349
+0.000636286108
+0.00063575289
+0.000636292207
+0.000804292838
+0.0114798026
+0.0556482104
+0.0982402491
+0.130107296
+0.151033334
+0.159761686
+0.154836926
+0.134983915
+0.09986496
+0.0439292027
+0.0439284622
+0.0998749292
+0.134989945
+0.154842523
+0.159768036
+0.151040926
+0.130115938
+0.0982486201
+0.05565596
+0.0114817664
+0.000804030422
+0.0006362844
+0.000635749682
+0.000636290515
+0.000804805904
+0.0114925866
+0.0556694862
+0.0982542098
+0.130117564
+0.151040492
+0.159766332
+0.154839591
+0.134985077
+0.0998651718
+0.0439293854
+0.0439286285
+0.09987508
+0.134990951
+0.15484497
+0.159772433
+0.151047831
+0.130125966
+0.0982623632
+0.0556770133
+0.0114944361
+0.000804538233
+0.000636282684
+0.000635746471
+0.000636288821
+0.000805316686
+0.0115052827
+0.0556905634
+0.0982679646
+0.130127599
+0.151047398
+0.15977073
+0.154842035
+0.134986072
+0.0998652993
+0.0439295633
+0.0439287898
+0.099875149
+0.134991793
+0.154847197
+0.159776582
+0.151054482
+0.13013576
+0.0982758983
+0.0556978653
+0.0115070164
+0.000805043687
+0.00063628096
+0.000635743256
+0.00063628712
+0.000805825089
+0.0115178889
+0.0557114389
+0.0982815128
+0.130137398
+0.151054052
+0.159774878
+0.154844257
+0.134986905
+0.0998653449
+0.0439297363
+0.0439289459
+0.0998751375
+0.134992473
+0.154849203
+0.159780484
+0.151060884
+0.130145317
+0.0982892248
+0.0557185123
+0.0115195051
+0.000805546676
+0.000636279228
+0.000635740044
+0.000636285417
+0.000806330997
+0.0115304031
+0.0557321088
+0.0982948507
+0.130146965
+0.151060456
+0.159778778
+0.154846259
+0.134987575
+0.0998653095
+0.0439299043
+0.0439290969
+0.0998750464
+0.134992992
+0.15485099
+0.159784137
+0.151067035
+0.13015464
+0.0983023384
+0.055738951
+0.0115319001
+0.000806047103
+0.000636277484
+0.000635736831
+0.000636283694
+0.000806834309
+0.0115428231
+0.0557525698
+0.0983079787
+0.130156293
+0.15106661
+0.159782431
+0.154848043
+0.134988085
+0.0998651953
+0.0439300671
+0.0439292426
+0.0998748796
+0.134993355
+0.154852562
+0.159787544
+0.151072936
+0.130163727
+0.0983152404
+0.0557591783
+0.0115441992
+0.000806544866
+0.000636275737
+0.000635733618
+0.000636281971
+0.000807334921
+0.0115551467
+0.0557728187
+0.0983208931
+0.130165385
+0.151072514
+0.159785837
+0.154849609
+0.134988437
+0.0998650044
+0.0439302248
+0.043929383
+0.0998746376
+0.134993561
+0.154853919
+0.159790708
+0.151078589
+0.130172577
+0.0983279296
+0.0557791911
+0.0115564005
+0.000807039857
+0.000636273973
+0.000635730404
+0.000636280236
+0.000807832707
+0.0115673717
+0.0557928522
+0.0983335936
+0.130174243
+0.151078168
+0.159789001
+0.154850962
+0.134988633
+0.0998647389
+0.0439303774
+0.043929518
+0.0998743235
+0.134993616
+0.154855064
+0.15979363
+0.151083995
+0.130181192
+0.098340404
+0.0557989858
+0.0115685018
+0.00080753197
+0.000636272213
+0.000635727186
+0.000636278489
+0.000808327543
+0.0115794957
+0.0558126665
+0.0983460764
+0.130182864
+0.151083576
+0.159791922
+0.154852103
+0.134988678
+0.0998644008
+0.0439305246
+0.0439296476
+0.0998739394
+0.134993522
+0.154856003
+0.159796315
+0.151089156
+0.130189573
+0.0983526616
+0.055818561
+0.011580501
+0.000808021109
+0.000636270435
+0.000635723968
+0.000636276738
+0.000808819291
+0.0115915163
+0.0558322581
+0.0983583423
+0.130191247
+0.151088737
+0.159794603
+0.154853038
+0.134988575
+0.0998639938
+0.0439306668
+0.0439297718
+0.0998734885
+0.134993283
+0.154856737
+0.159798763
+0.151094073
+0.130197718
+0.0983647015
+0.0558379125
+0.0115923961
+0.000808507165
+0.000636268648
+0.000635720753
+0.000636274966
+0.000809307769
+0.0116034305
+0.0558516227
+0.0983703889
+0.130199394
+0.151093654
+0.159797049
+0.154853767
+0.134988326
+0.0998635201
+0.0439308037
+0.0439298906
+0.0998729727
+0.134992902
+0.154857271
+0.159800979
+0.151098751
+0.130205633
+0.0983765269
+0.0558570401
+0.0116041855
+0.000808990035
+0.000636266856
+0.000635717525
+0.00063627318
+0.000809792766
+0.0116152354
+0.055870757
+0.0983822136
+0.130207304
+0.151098328
+0.159799262
+0.154854296
+0.134987937
+0.0998629827
+0.0439309356
+0.0439300038
+0.099872396
+0.134992385
+0.154857609
+0.159802967
+0.151103191
+0.130213315
+0.0983881357
+0.0558759414
+0.0116158673
+0.000809469626
+0.000636265049
+0.000635714309
+0.000636271382
+0.000810273948
+0.0116269264
+0.0558896542
+0.0983938117
+0.130214978
+0.15110276
+0.159801245
+0.154854629
+0.134987413
+0.0998623862
+0.0439310625
+0.0439301115
+0.0998717594
+0.134991735
+0.154857756
+0.159804734
+0.151107401
+0.130220773
+0.0983995349
+0.0558946192
+0.0116274406
+0.000809945836
+0.000636263234
+0.000635711079
+0.000636269552
+0.000810750871
+0.0116384986
+0.0559083097
+0.0984051835
+0.130222414
+0.151106954
+0.159803002
+0.154854772
+0.134986759
+0.0998617342
+0.0439311848
+0.0439302134
+0.099871067
+0.134990956
+0.154857718
+0.159806283
+0.151111384
+0.130228011
+0.098410726
+0.0559130749
+0.0116389043
+0.00081041859
+0.000636261412
+0.000635707862
+0.000636267678
+0.000811222771
+0.0116499431
+0.0559267115
+0.098416318
+0.130229606
+0.151110907
+0.159804536
+0.154854732
+0.134985982
+0.0998610346
+0.043931303
+0.0439303092
+0.0998703198
+0.134990054
+0.154857501
+0.159807623
+0.15111515
+0.130235035
+0.0984217202
+0.0559313194
+0.01165026
+0.000810887847
+0.000636259575
+0.000635704632
+0.000636265749
+0.000811688443
+0.0116612481
+0.0559448483
+0.0984272055
+0.130236551
+0.151114618
+0.15980585
+0.154854513
+0.134985092
+0.0998602944
+0.0439314178
+0.0439303986
+0.0998695211
+0.134989032
+0.154857111
+0.159808761
+0.151118706
+0.130241857
+0.0984325284
+0.0559493587
+0.0116615079
+0.000811353555
+0.000636257734
+0.000635701403
+0.000636263726
+0.000812145693
+0.0116723893
+0.0559626863
+0.0984378187
+0.130243227
+0.15111808
+0.159806944
+0.154854125
+0.134984103
+0.0998595313
+0.0439315308
+0.0439304809
+0.0998686682
+0.13498789
+0.154856548
+0.159809698
+0.151122059
+0.130248494
+0.0984431765
+0.0559672104
+0.0116726508
+0.000811815722
+0.000636255873
+0.000635698177
+0.000636261531
+0.000812590811
+0.0116833264
+0.0559801776
+0.0984481244
+0.130249604
+0.151121263
+0.159807804
+0.154853571
+0.134983035
+0.0998587733
+0.0439316472
+0.0439305551
+0.0998677759
+0.134986637
+0.154855808
+0.159810416
+0.151125179
+0.130254908
+0.0984536409
+0.0559849033
+0.0116836996
+0.0008122745
+0.000636254008
+0.000635694943
+0.000636259086
+0.000813017896
+0.0116939982
+0.0559972462
+0.0984579931
+0.130255551
+0.15112406
+0.159808362
+0.154852838
+0.134981939
+0.099858128
+0.0439317705
+0.0439306217
+0.0998668369
+0.134985267
+0.154854888
+0.159810904
+0.151128033
+0.130261039
+0.0984638351
+0.0560023846
+0.0116946475
+0.000812729908
+0.000636252135
+0.000635691705
+0.000636256263
+0.00081341898
+0.0117043057
+0.0560137871
+0.098467353
+0.130261093
+0.151126611
+0.159808879
+0.154852325
+0.134981363
+0.0998583094
+0.0439319638
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+0.0439194645
+0.099792728
+0.134796701
+0.154515
+0.159290719
+0.150401594
+0.129305668
+0.0972634083
+0.054300703
+0.0107152702
+0.000775563016
+0.000636370209
+0.00063591796
+0.000636374658
+0.00077610525
+0.0107237613
+0.0543119398
+0.0972681814
+0.129307156
+0.150401307
+0.159289287
+0.154512446
+0.134792408
+0.0997841046
+0.0439186172
+)
+;
+    }
+    outlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+0.0439306217
+0.0998668369
+0.134985267
+0.154854888
+0.159810904
+0.151128033
+0.130261039
+0.0984638351
+0.0560023846
+0.0116946475
+0.000812729908
+0.000636252135
+0.000635691705
+0.000636256263
+0.00081341898
+0.0117043057
+0.0560137871
+0.098467353
+0.130261093
+0.151126611
+0.159808879
+0.154852325
+0.134981363
+0.0998583094
+0.0439319638
+)
+;
+    }
+    wall1
+    {
+        type            compressible::alphatPhaseChangeJayatillekeWallFunction;
+        Prt             0.85;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+
+        value           nonuniform List<scalar>
+75
+(
+0.00506074943
+0.00506075362
+0.00506075851
+0.00506076381
+0.00506076963
+0.00506077603
+0.00506078309
+0.00506079083
+0.00506079928
+0.00506080847
+0.00506081838
+0.00506082903
+0.00506084043
+0.00506085255
+0.00506086539
+0.00506087894
+0.00506089319
+0.00506090813
+0.00506092372
+0.00506093997
+0.00506095685
+0.00506097434
+0.00506099242
+0.00506101106
+0.00506103024
+0.00506104993
+0.00506107011
+0.00506109075
+0.00506111181
+0.00506113327
+0.00506115508
+0.00506117721
+0.00506119963
+0.0050612223
+0.00506124517
+0.00506126821
+0.00506129139
+0.00506131465
+0.00506133797
+0.0050613613
+0.0050613846
+0.00506140784
+0.00506143097
+0.00506145396
+0.00506147678
+0.00506149938
+0.00506152174
+0.00506154381
+0.00506156557
+0.00506158697
+0.00506160801
+0.00506162864
+0.00506164885
+0.00506166861
+0.0050616879
+0.00506170669
+0.00506172498
+0.00506174274
+0.00506175997
+0.00506177665
+0.00506179278
+0.00506180834
+0.00506182334
+0.00506183776
+0.0050618516
+0.00506186487
+0.00506187755
+0.00506188964
+0.00506190114
+0.00506191203
+0.00506192226
+0.00506193181
+0.0050619406
+0.00506194852
+0.00506195564
+)
+;
+    }
+    wall2
+    {
+        type            compressible::alphatWallBoilingWallFunction;
+        Prt             0.85;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        relax       0.001;
+        dmdt            uniform 0;
+        value           uniform 0.01;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.gas
new file mode 100644
index 0000000000..be9600ba41
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.gas
@@ -0,0 +1,2125 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      epsilon.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+0.0419653487
+0.0166405358
+0.00900207344
+0.005683038
+0.00380594589
+0.00255249533
+0.00162012472
+0.000886859793
+0.000304605708
+3.0915414e-05
+6.71918179e-07
+3.20714194e-07
+3.20043739e-07
+3.20726797e-07
+6.73305006e-07
+3.09349773e-05
+0.000304649669
+0.000886891149
+0.00162018133
+0.00255259503
+0.00380611021
+0.00568331982
+0.00900266053
+0.0166436526
+0.0412932979
+0.0419654611
+0.0166405729
+0.00900213286
+0.00568312127
+0.00380605591
+0.00255263535
+0.00162029714
+0.000887055327
+0.000304796843
+3.09603236e-05
+6.72865031e-07
+3.20684035e-07
+3.20011544e-07
+3.2069672e-07
+6.74247547e-07
+3.09795062e-05
+0.000304836927
+0.000887075749
+0.00162033422
+0.00255270456
+0.00380617519
+0.00568333671
+0.00900261669
+0.0166433192
+0.0412946744
+0.0419655923
+0.0166406294
+0.00900220696
+0.00568321909
+0.00380618301
+0.00255279676
+0.00162049631
+0.000887282427
+0.000305017818
+3.10130221e-05
+6.73985809e-07
+3.20648389e-07
+3.19973494e-07
+3.20661053e-07
+6.75359597e-07
+3.10320002e-05
+0.000305057356
+0.000887302372
+0.00162053294
+0.00255286542
+0.00380630151
+0.00568343343
+0.00900268938
+0.0166433822
+0.0412931691
+0.0419657345
+0.0166407085
+0.00900229636
+0.00568332742
+0.00380631734
+0.00255296286
+0.00162069785
+0.00088750996
+0.000305236521
+3.10656132e-05
+6.75110969e-07
+3.20612648e-07
+3.19935334e-07
+3.20625325e-07
+6.76481143e-07
+3.10844531e-05
+0.000305275709
+0.000887529772
+0.00162073462
+0.0025530318
+0.00380643624
+0.0056835423
+0.00900277974
+0.0166434609
+0.041291993
+0.0419658904
+0.0166408076
+0.00900240005
+0.00568344579
+0.00380645859
+0.00255313329
+0.00162090137
+0.000887737056
+0.000305452579
+3.11179752e-05
+6.76237718e-07
+3.20576898e-07
+3.19897156e-07
+3.20589606e-07
+6.7760707e-07
+3.11367139e-05
+0.00030549148
+0.000887756758
+0.00162093827
+0.00255320253
+0.00380657788
+0.00568366122
+0.00900288445
+0.0166435668
+0.0412907793
+0.0419660621
+0.0166409246
+0.0090025172
+0.0056835739
+0.00380660666
+0.00255330811
+0.00162110694
+0.000887963559
+0.0003056663
+3.11701565e-05
+6.77365951e-07
+3.20541095e-07
+3.19858921e-07
+3.20553846e-07
+6.7873619e-07
+3.11888214e-05
+0.000305704959
+0.000887983162
+0.00162114396
+0.00255337762
+0.00380672632
+0.00568378985
+0.0090030026
+0.0166436878
+0.0412895822
+0.0419662513
+0.0166410579
+0.00900264693
+0.0056837113
+0.00380676134
+0.00255348717
+0.00162131442
+0.00088818924
+0.000305877902
+3.12221844e-05
+6.7849642e-07
+3.20505222e-07
+3.19820609e-07
+3.20518022e-07
+6.79868791e-07
+3.12407973e-05
+0.000305916355
+0.000888208747
+0.00162135157
+0.00255355695
+0.00380688137
+0.00568392776
+0.00900313335
+0.0166438253
+0.0412883945
+0.0419664589
+0.0166412061
+0.00900278836
+0.00568385749
+0.00380692231
+0.00255367021
+0.00162152353
+0.000888413763
+0.000306087469
+3.12740556e-05
+6.79628744e-07
+3.20469282e-07
+3.19782221e-07
+3.20482137e-07
+6.81004194e-07
+3.12926352e-05
+0.000306125746
+0.000888433176
+0.0016215608
+0.00255374023
+0.00380704267
+0.00568407445
+0.00900327577
+0.016643978
+0.0412872181
+0.0419666856
+0.0166413681
+0.0090029406
+0.00568401194
+0.00380708916
+0.00255385689
+0.00162173389
+0.000888636741
+0.00030629499
+3.13257463e-05
+6.80762109e-07
+3.20433291e-07
+3.19743772e-07
+3.20446204e-07
+6.8214137e-07
+3.1344309e-05
+0.000306333119
+0.000888656065
+0.00162177127
+0.00255392715
+0.00380720985
+0.00568422938
+0.009003429
+0.0166441443
+0.0412860534
+0.0419669319
+0.0166415426
+0.00900310289
+0.0056841741
+0.00380726151
+0.00255404684
+0.00162194509
+0.000888857809
+0.000306500435
+3.13772288e-05
+6.81895634e-07
+3.20397266e-07
+3.19705286e-07
+3.20410241e-07
+6.83279298e-07
+3.13957891e-05
+0.000306538441
+0.000888877045
+0.00162198256
+0.00255411732
+0.00380738251
+0.005684392
+0.00900359225
+0.0166443235
+0.0412849008
+0.0419671978
+0.0166417288
+0.00900327445
+0.00568434348
+0.00380743896
+0.0025542397
+0.00162215675
+0.000889076664
+0.000306703794
+3.14284822e-05
+6.83028595e-07
+3.20361222e-07
+3.19666776e-07
+3.20374262e-07
+6.84417151e-07
+3.14470531e-05
+0.0003067417
+0.000889095813
+0.00162219432
+0.00255431038
+0.00380756026
+0.00568456183
+0.00900376479
+0.0166445144
+0.0412837604
+0.0419674835
+0.0166419258
+0.00900345465
+0.00568451959
+0.00380762115
+0.00255443512
+0.00162236851
+0.000889293068
+0.000306905089
+3.14794945e-05
+6.84160494e-07
+3.20325168e-07
+3.19628254e-07
+3.20338273e-07
+6.85554343e-07
+3.14980876e-05
+0.000306942915
+0.000889312134
+0.00162240616
+0.00255450601
+0.00380774272
+0.00568473838
+0.00900394595
+0.0166447163
+0.0412826323
+0.0419677891
+0.0166421329
+0.00900364284
+0.00568470198
+0.0038078077
+0.00255463275
+0.00162258005
+0.000889506842
+0.000307104361
+3.15302619e-05
+6.85291023e-07
+3.20289106e-07
+3.19589721e-07
+3.20302278e-07
+6.86690504e-07
+3.15488876e-05
+0.000307142128
+0.000889525826
+0.00162261778
+0.00255470383
+0.00380792955
+0.00568492119
+0.00900413508
+0.0166449283
+0.0412815163
+0.0419681141
+0.0166423493
+0.00900383839
+0.00568489015
+0.00380799822
+0.00255483227
+0.00162279107
+0.000889717845
+0.000307301666
+3.15807852e-05
+6.86420002e-07
+3.20253035e-07
+3.1955118e-07
+3.20266277e-07
+6.878254e-07
+3.15994528e-05
+0.000307339392
+0.000889736752
+0.00162282887
+0.00255490354
+0.00380812034
+0.00568510979
+0.00900433158
+0.0166451498
+0.0412804123
+0.0419684586
+0.0166425744
+0.00900404069
+0.00568508364
+0.00380819233
+0.00255503331
+0.00162300124
+0.000889925965
+0.00030749706
+3.16310672e-05
+6.87547314e-07
+3.20216954e-07
+3.19512629e-07
+3.20230267e-07
+6.88958867e-07
+3.16497849e-05
+0.000307534764
+0.000889944798
+0.00162303912
+0.00255510476
+0.00380831472
+0.00568530369
+0.00900453483
+0.0166453801
+0.04127932
+0.0419688221
+0.0166428074
+0.00900424914
+0.00568528194
+0.0038083896
+0.0025552355
+0.0016232103
+0.000890131107
+0.000307690595
+3.1681111e-05
+6.88672861e-07
+3.20180863e-07
+3.19474067e-07
+3.20194247e-07
+6.90090779e-07
+3.16998861e-05
+0.000307728292
+0.000890149869
+0.00162324825
+0.00255530714
+0.00380851226
+0.00568550241
+0.00900474423
+0.0166456184
+0.041278239
+0.0419692042
+0.0166430477
+0.00900446312
+0.00568548454
+0.0038085896
+0.00255543847
+0.00162341796
+0.00089033319
+0.000307882317
+3.17309187e-05
+6.89796545e-07
+3.20144759e-07
+3.19435493e-07
+3.20158216e-07
+6.91220997e-07
+3.17497576e-05
+0.00030792002
+0.000890351884
+0.00162345596
+0.00255551027
+0.00380871251
+0.00568570543
+0.00900495916
+0.0166458639
+0.0412771691
+0.0419696049
+0.0166432945
+0.00900468203
+0.00568569093
+0.00380879187
+0.00255564181
+0.00162362392
+0.000890532143
+0.00030807226
+3.17804915e-05
+6.90918254e-07
+3.20108642e-07
+3.19396907e-07
+3.20122173e-07
+6.92349389e-07
+3.17993998e-05
+0.000308109987
+0.000890550773
+0.00162366198
+0.0025557138
+0.00380891505
+0.00568591223
+0.00900517902
+0.0166461163
+0.0412761096
+0.0419700232
+0.0166435474
+0.00900490525
+0.00568590055
+0.00380899594
+0.00255584514
+0.0016238279
+0.000890727907
+0.000308260459
+3.18298295e-05
+6.92037871e-07
+3.20072514e-07
+3.19358312e-07
+3.2008612e-07
+6.93475813e-07
+3.1848812e-05
+0.000308298219
+0.000890746477
+0.00162386604
+0.0025559173
+0.00380911939
+0.00568612229
+0.0090054032
+0.0166463746
+0.0412750601
+0.0419704591
+0.0166438054
+0.00900513215
+0.00568611288
+0.00380920137
+0.00255604807
+0.00162402966
+0.000890920435
+0.000308446939
+3.18789325e-05
+6.93155274e-07
+3.20036374e-07
+3.19319707e-07
+3.20050055e-07
+6.9460013e-07
+3.18979936e-05
+0.000308484745
+0.000890938949
+0.00162406786
+0.00255612039
+0.00380932507
+0.00568633505
+0.00900563108
+0.0166466384
+0.0412740201
+0.0419709118
+0.0166440681
+0.00900536211
+0.00568632735
+0.00380940764
+0.00255625019
+0.00162422893
+0.000891109688
+0.000308631726
+3.19277999e-05
+6.94270346e-07
+3.20000225e-07
+3.19281095e-07
+3.20013982e-07
+6.95722204e-07
+3.19469431e-05
+0.000308669588
+0.000891128151
+0.00162426719
+0.00255632269
+0.00380953161
+0.00568654995
+0.00900586202
+0.0166469069
+0.0412729893
+0.0419713809
+0.0166443347
+0.0090055945
+0.0056865434
+0.00380961428
+0.00255645112
+0.0016244255
+0.000891295641
+0.000308814845
+3.19764314e-05
+6.95382983e-07
+3.19964067e-07
+3.19242476e-07
+3.199779e-07
+6.96841916e-07
+3.19956601e-05
+0.000308852773
+0.000891314056
+0.00162446381
+0.0025565238
+0.00380973853
+0.00568676645
+0.00900609542
+0.0166471793
+0.0412719668
+0.0419718657
+0.0166446046
+0.00900582869
+0.00568676048
+0.00380982081
+0.00255665049
+0.00162461912
+0.000891478278
+0.000308996319
+3.2024827e-05
+6.96493092e-07
+3.19927902e-07
+3.19203853e-07
+3.19941812e-07
+6.97959164e-07
+3.20441436e-05
+0.000309034322
+0.000891496649
+0.00162465751
+0.00255672334
+0.00380994534
+0.00568698397
+0.00900633062
+0.0166474552
+0.041270952
+0.0419723657
+0.0166448771
+0.00900606403
+0.00568697799
+0.00381002675
+0.00255684792
+0.00162480962
+0.000891657593
+0.000309176173
+3.20729868e-05
+6.97600597e-07
+3.19891727e-07
+3.19165225e-07
+3.19905715e-07
+6.99073855e-07
+3.20923937e-05
+0.000309214261
+0.000891675925
+0.00162484807
+0.00255692095
+0.00381015155
+0.00568720196
+0.009006567
+0.0166477336
+0.0412699444
+0.0419728802
+0.0166451514
+0.00900629988
+0.00568719538
+0.00381023162
+0.00255704307
+0.0016249968
+0.000891833587
+0.000309354434
+3.21209118e-05
+6.98705438e-07
+3.19855546e-07
+3.19126593e-07
+3.19869612e-07
+7.00185927e-07
+3.2140411e-05
+0.000309392612
+0.000891851884
+0.0016250353
+0.00255711627
+0.00381035671
+0.00568741982
+0.0090068039
+0.0166480141
+0.0412689431
+0.0419734084
+0.0166454271
+0.0090065356
+0.00568741207
+0.00381043493
+0.00255723558
+0.00162518048
+0.00089200627
+0.000309531124
+3.21686031e-05
+6.99807567e-07
+3.19819356e-07
+3.19087956e-07
+3.198335e-07
+7.01295323e-07
+3.21881961e-05
+0.000309569401
+0.000892024535
+0.00162521905
+0.00255730896
+0.00381056033
+0.00568763699
+0.00900704068
+0.016648296
+0.0412679477
+0.0419739497
+0.0166457031
+0.00900677053
+0.00568762748
+0.00381063624
+0.00255742512
+0.00162536052
+0.000892175654
+0.000309706271
+3.22160623e-05
+7.00906952e-07
+3.19783156e-07
+3.19049313e-07
+3.1979738e-07
+7.02401996e-07
+3.22357503e-05
+0.000309744653
+0.000892193893
+0.00162539915
+0.00255749869
+0.00381076194
+0.00568785291
+0.00900727669
+0.0166485784
+0.0412669571
+0.0419745034
+0.0166459791
+0.009007004
+0.00568784104
+0.00381083506
+0.00255761137
+0.00162553676
+0.00089234176
+0.0003098799
+3.22632908e-05
+7.02003564e-07
+3.19746947e-07
+3.19010665e-07
+3.19761249e-07
+7.03505921e-07
+3.22830747e-05
+0.000309918392
+0.000892359974
+0.00162557545
+0.00255768512
+0.00381096108
+0.00568806698
+0.00900751128
+0.0166488607
+0.0412659706
+0.0419750684
+0.016646254
+0.00900723537
+0.00568805218
+0.00381103096
+0.00255779404
+0.00162570907
+0.000892504604
+0.000310052035
+3.23102903e-05
+7.03097379e-07
+3.19710726e-07
+3.18972008e-07
+3.19725108e-07
+7.04607064e-07
+3.2330171e-05
+0.000310090642
+0.000892522799
+0.00162574782
+0.00255786797
+0.00381115728
+0.00568827864
+0.00900774378
+0.0166491423
+0.0412649874
+0.0419756439
+0.0166465274
+0.00900746397
+0.00568826031
+0.00381122345
+0.00255797279
+0.00162587731
+0.000892664211
+0.000310222695
+3.23570618e-05
+7.0418837e-07
+3.19674492e-07
+3.18933344e-07
+3.19688953e-07
+7.05705395e-07
+3.237704e-05
+0.000310261422
+0.00089268239
+0.00162591613
+0.00255804692
+0.00381135011
+0.00568848731
+0.00900797353
+0.0166494223
+0.0412640063
+0.041976229
+0.0166467985
+0.00900768913
+0.00568846487
+0.00381141212
+0.00255814736
+0.00162604138
+0.000892820599
+0.000310391899
+3.24036062e-05
+7.05276502e-07
+3.19638245e-07
+3.18894671e-07
+3.19652787e-07
+7.06800875e-07
+3.24236821e-05
+0.00031043075
+0.000892838765
+0.00162608027
+0.00255822168
+0.00381153911
+0.00568869244
+0.00900819987
+0.0166497
+0.0412630267
+0.0419768227
+0.0166470665
+0.0090079102
+0.00568866529
+0.00381159651
+0.00255831745
+0.00162620116
+0.000892973789
+0.000310559663
+3.24499234e-05
+7.06361729e-07
+3.19601984e-07
+3.18855987e-07
+3.19616606e-07
+7.07893455e-07
+3.24700974e-05
+0.000310598642
+0.000892991947
+0.00162624012
+0.00255839197
+0.00381172384
+0.00568889342
+0.00900842214
+0.0166499748
+0.0412620473
+0.0419774241
+0.0166473307
+0.00900812653
+0.00568886101
+0.00381177619
+0.0025584828
+0.00162635655
+0.0008931238
+0.000310725997
+3.24960131e-05
+7.07443992e-07
+3.19565709e-07
+3.18817294e-07
+3.19580411e-07
+7.08983076e-07
+3.25162852e-05
+0.000310765107
+0.000893141952
+0.00162639558
+0.00255855752
+0.00381190388
+0.00568908972
+0.0090086397
+0.016650246
+0.0412610673
+0.0419780322
+0.0166475903
+0.00900833747
+0.00568905149
+0.00381195077
+0.00255864315
+0.00162650743
+0.000893270647
+0.000310890909
+3.25418737e-05
+7.08523221e-07
+3.19529419e-07
+3.18778591e-07
+3.19544202e-07
+7.10069658e-07
+3.2562244e-05
+0.000310930153
+0.000893288799
+0.00162654654
+0.00255871808
+0.0038120788
+0.00568928079
+0.00900885188
+0.0166505127
+0.0412600856
+0.0419786458
+0.0166478448
+0.00900854241
+0.00568923617
+0.00381211981
+0.00255879826
+0.00162665374
+0.000893414347
+0.000311054405
+3.25875035e-05
+7.09599331e-07
+3.19493115e-07
+3.18739879e-07
+3.19507981e-07
+7.11153122e-07
+3.26079719e-05
+0.000311093784
+0.000893432501
+0.00162669292
+0.00255887339
+0.00381224821
+0.00568946609
+0.00900905809
+0.0166507742
+0.0412591009
+0.0419792639
+0.0166480934
+0.00900874074
+0.00568941457
+0.00381228295
+0.00255894788
+0.00162679538
+0.000893554915
+0.000311216487
+3.26329001e-05
+7.10672229e-07
+3.19456799e-07
+3.18701161e-07
+3.19471746e-07
+7.12233365e-07
+3.26534663e-05
+0.000311256005
+0.000893573074
+0.00162683463
+0.00255902321
+0.00381241172
+0.00568964511
+0.00900925772
+0.0166510302
+0.0412581125
+0.0419798857
+0.0166483356
+0.00900893189
+0.00568958618
+0.0038124398
+0.00255909178
+0.00162693227
+0.000893692361
+0.000311377155
+3.26780611e-05
+7.11741815e-07
+3.19420471e-07
+3.18662434e-07
+3.194355e-07
+7.13310293e-07
+3.26987246e-05
+0.000311416813
+0.00089371053
+0.0016269716
+0.00255916733
+0.00381256896
+0.00568981737
+0.00900945018
+0.0166512796
+0.0412571191
+0.0419805098
+0.0166485706
+0.00900911532
+0.00568975054
+0.00381259002
+0.00255922977
+0.00162706434
+0.000893826703
+0.000311536411
+3.27229835e-05
+7.12807993e-07
+3.19384131e-07
+3.18623703e-07
+3.19399242e-07
+7.14383803e-07
+3.27437441e-05
+0.00031157621
+0.000893844884
+0.00162710375
+0.00255930553
+0.00381271956
+0.00568998238
+0.00900963495
+0.0166515221
+0.0412561197
+0.0419811354
+0.0166487981
+0.00900929053
+0.0056899072
+0.00381273328
+0.00255936165
+0.00162719153
+0.000893957954
+0.000311694253
+3.27676647e-05
+7.13870664e-07
+3.1934778e-07
+3.18584966e-07
+3.19362973e-07
+7.15453799e-07
+3.27885221e-05
+0.000311734195
+0.00089397615
+0.00162723102
+0.00255943764
+0.0038128632
+0.0056901397
+0.00900981152
+0.0166517571
+0.041255113
+0.0419817613
+0.0166490174
+0.00900945705
+0.00569005576
+0.00381286925
+0.00255948725
+0.00162731379
+0.000894086126
+0.000311850682
+3.28121026e-05
+7.14929738e-07
+3.1931142e-07
+3.18546226e-07
+3.19326695e-07
+7.16520184e-07
+3.28330559e-05
+0.000311890767
+0.000894104343
+0.00162735336
+0.00255956345
+0.00381299958
+0.00569028893
+0.00900997942
+0.0166519839
+0.0412540982
+0.0419823865
+0.0166492282
+0.00900961445
+0.00569019583
+0.00381299768
+0.0025596064
+0.00162743107
+0.000894211238
+0.000312005699
+3.28562946e-05
+7.15985132e-07
+3.19275049e-07
+3.1850748e-07
+3.19290407e-07
+7.1758288e-07
+3.28773436e-05
+0.000312045928
+0.000894229477
+0.00162747072
+0.00255968282
+0.00381312841
+0.00569042969
+0.00901013822
+0.0166522023
+0.0412530742
+0.0419830099
+0.0166494298
+0.00900976233
+0.00569032707
+0.00381311829
+0.00255971895
+0.00162754332
+0.000894333303
+0.000312159303
+3.29002394e-05
+7.17036773e-07
+3.19238667e-07
+3.18468731e-07
+3.19254108e-07
+7.18641811e-07
+3.29213831e-05
+0.000312199678
+0.000894351568
+0.00162758306
+0.0025597956
+0.00381324944
+0.00569056163
+0.00901028752
+0.0166524117
+0.0412520397
+0.0419836305
+0.016649622
+0.00900990036
+0.00569044916
+0.00381323085
+0.00255982478
+0.00162765052
+0.000894452337
+0.000312311497
+3.2943935e-05
+7.18084591e-07
+3.19202273e-07
+3.18429977e-07
+3.19217797e-07
+7.19696908e-07
+3.2965173e-05
+0.000312352017
+0.000894470632
+0.00162769034
+0.00255990165
+0.0038133624
+0.00569068443
+0.00901042698
+0.0166526118
+0.0412509939
+0.0419842474
+0.0166498045
+0.00901002821
+0.00569056182
+0.00381333514
+0.00255992377
+0.00162775263
+0.000894568357
+0.000312462282
+3.29873802e-05
+7.19128525e-07
+3.19165867e-07
+3.18391216e-07
+3.19181474e-07
+7.2074811e-07
+3.30087117e-05
+0.000312502946
+0.000894586684
+0.00162779255
+0.00256000087
+0.0038134671
+0.00569079781
+0.00901055629
+0.0166528021
+0.0412499356
+0.0419848596
+0.0166499769
+0.00901014562
+0.0056906648
+0.00381343096
+0.00256001581
+0.00162784965
+0.000894681378
+0.000312611657
+3.30305735e-05
+7.20168516e-07
+3.19129446e-07
+3.18352448e-07
+3.19145137e-07
+7.21795354e-07
+3.30519979e-05
+0.000312652467
+0.000894699741
+0.00162788965
+0.00256009313
+0.00381356335
+0.00569090152
+0.00901067518
+0.0166529825
+0.041248864
+0.0419854659
+0.016650139
+0.00901025235
+0.00569075787
+0.00381351816
+0.00256010082
+0.00162794154
+0.000894791415
+0.000312759622
+3.30735134e-05
+7.21204501e-07
+3.1909301e-07
+3.18313671e-07
+3.19108784e-07
+7.22838582e-07
+3.309503e-05
+0.000312800578
+0.000894809817
+0.00162798164
+0.00256017837
+0.00381365097
+0.00569099532
+0.0090107834
+0.0166531526
+0.0412477777
+0.0419860657
+0.0166502905
+0.00901034823
+0.00569084085
+0.00381359658
+0.00256017871
+0.00162802831
+0.000894898481
+0.000312906175
+3.31161981e-05
+7.22236414e-07
+3.19056555e-07
+3.18274882e-07
+3.19072414e-07
+7.23877725e-07
+3.31378062e-05
+0.000312947276
+0.000894916925
+0.0016280685
+0.0025602565
+0.00381372983
+0.00569107904
+0.00901088077
+0.0166533123
+0.0412466761
+0.0419866579
+0.0166504314
+0.00901043308
+0.00569091357
+0.0038136661
+0.00256024944
+0.00162810994
+0.000895002587
+0.000313051311
+3.31586255e-05
+7.23264179e-07
+3.1902008e-07
+3.18236082e-07
+3.19036023e-07
+7.24912707e-07
+3.31803244e-05
+0.000313092559
+0.000895021076
+0.00162815023
+0.00256032745
+0.00381379978
+0.00569115251
+0.00901096713
+0.0166534614
+0.0412455581
+0.0419872417
+0.0166505614
+0.0090105068
+0.00569097591
+0.00381372661
+0.00256031294
+0.00162818644
+0.000895103743
+0.000313195025
+3.32007929e-05
+7.24287712e-07
+3.18983585e-07
+3.18197269e-07
+3.18999613e-07
+7.25943447e-07
+3.32225818e-05
+0.000313236419
+0.00089512228
+0.00162822681
+0.00256039119
+0.00381386073
+0.00569121561
+0.00901104237
+0.0166535998
+0.0412444229
+0.0419878161
+0.0166506805
+0.00901056931
+0.00569102778
+0.00381377805
+0.00256036917
+0.00162825778
+0.000895201958
+0.000313337309
+3.32426969e-05
+7.25306912e-07
+3.18947068e-07
+3.1815844e-07
+3.18963179e-07
+7.2696984e-07
+3.32645752e-05
+0.000313378847
+0.000895220546
+0.00162829827
+0.00256044766
+0.00381391259
+0.00569126823
+0.00901110643
+0.0166537273
+0.0412432696
+0.0419883805
+0.0166507887
+0.00901062059
+0.00569106912
+0.00381382033
+0.00256041811
+0.00162832399
+0.000895297238
+0.000313478149
+3.3284334e-05
+7.26321669e-07
+3.18910527e-07
+3.18119596e-07
+3.18926723e-07
+7.2799178e-07
+3.33063008e-05
+0.000313519833
+0.00089531588
+0.00162836458
+0.00256049683
+0.00381395531
+0.00569131033
+0.00901115925
+0.0166538439
+0.0412420973
+0.0419889341
+0.016650886
+0.00901066063
+0.00569109988
+0.00381385343
+0.00256045975
+0.00162838508
+0.000895389589
+0.000313617534
+3.33256994e-05
+7.27331857e-07
+3.18873962e-07
+3.18080737e-07
+3.18890244e-07
+7.29009136e-07
+3.33477543e-05
+0.000313659362
+0.000895408286
+0.00162842577
+0.0025605387
+0.00381398886
+0.00569134186
+0.00901120085
+0.0166539498
+0.0412409054
+0.0419894764
+0.0166509724
+0.00901068949
+0.00569112008
+0.00381387734
+0.00256049407
+0.00162844104
+0.000895479012
+0.000313755448
+3.33667886e-05
+7.28337334e-07
+3.18837373e-07
+3.18041861e-07
+3.1885374e-07
+7.3002177e-07
+3.33889305e-05
+0.00031379742
+0.00089549777
+0.00162848183
+0.00256057327
+0.0038140132
+0.00569136282
+0.00901123127
+0.0166540447
+0.0412396931
+0.0419900064
+0.016651048
+0.00901070722
+0.00569112973
+0.00381389206
+0.00256052109
+0.0016284919
+0.000895565512
+0.000313891873
+3.34075958e-05
+7.29337951e-07
+3.18800759e-07
+3.1800297e-07
+3.18817212e-07
+7.31029531e-07
+3.34298241e-05
+0.000313933989
+0.000895584331
+0.0016285328
+0.00256060053
+0.00381402836
+0.00569137325
+0.00901125058
+0.016654129
+0.0412384599
+0.041990524
+0.0166511129
+0.00901071398
+0.00569112891
+0.00381389762
+0.00256054084
+0.00162853768
+0.000895649091
+0.000314026791
+3.34481152e-05
+7.30333544e-07
+3.18764122e-07
+3.17964063e-07
+3.1878066e-07
+7.32032253e-07
+3.34704293e-05
+0.000314069051
+0.000895667974
+0.00162857869
+0.00256062051
+0.00381403435
+0.0056913732
+0.00901125891
+0.0166542026
+0.0412372049
+0.0419910282
+0.0166511674
+0.0090107099
+0.0056911177
+0.00381389407
+0.00256055335
+0.0016285784
+0.00089572975
+0.000314160183
+3.34883407e-05
+7.31323943e-07
+3.1872746e-07
+3.17925142e-07
+3.18744083e-07
+7.33029764e-07
+3.35107398e-05
+0.000314202586
+0.000895748701
+0.00162861951
+0.00256063324
+0.00381403125
+0.00569136277
+0.00901125641
+0.0166542658
+0.0412359278
+0.0419915189
+0.0166512115
+0.00901069518
+0.00569109625
+0.00381388148
+0.00256055865
+0.00162861408
+0.000895807494
+0.000314292028
+3.35282658e-05
+7.32308971e-07
+3.18690775e-07
+3.17886207e-07
+3.18707483e-07
+7.34021882e-07
+3.35507493e-05
+0.000314334572
+0.000895826512
+0.0016286553
+0.00256063878
+0.0038140191
+0.00569134208
+0.00901124326
+0.0166543187
+0.0412346282
+0.0419919955
+0.0166512456
+0.00901067002
+0.00569106469
+0.00381385996
+0.00256055681
+0.00162864477
+0.000895882323
+0.000314422304
+3.3567884e-05
+7.33288441e-07
+3.18654066e-07
+3.17847259e-07
+3.1867086e-07
+7.35008417e-07
+3.35904508e-05
+0.00031446499
+0.000895901412
+0.0016286861
+0.00256063718
+0.003813998
+0.00569131129
+0.0090112197
+0.0166543617
+0.0412333052
+0.0419924579
+0.0166512698
+0.00901063471
+0.0056910232
+0.00381382962
+0.00256054792
+0.0016286705
+0.000895954243
+0.000314550992
+3.36071884e-05
+7.34262167e-07
+3.18617334e-07
+3.17808299e-07
+3.18634214e-07
+7.35989164e-07
+3.36298377e-05
+0.000314593817
+0.000895973405
+0.00162871194
+0.00256062852
+0.00381396809
+0.00569127057
+0.00901118597
+0.0166543949
+0.041231959
+0.0419929055
+0.0166512846
+0.00901058952
+0.00569097199
+0.00381379057
+0.00256053205
+0.00162869132
+0.000896023258
+0.000314678068
+3.36461721e-05
+7.35229953e-07
+3.1858058e-07
+3.17769326e-07
+3.18597544e-07
+7.3696391e-07
+3.36689027e-05
+0.000314721032
+0.000896042493
+0.00162873286
+0.00256061287
+0.00381392948
+0.00569122011
+0.00901114234
+0.0166544187
+0.0412305889
+0.0419933381
+0.0166512903
+0.00901053476
+0.0056909113
+0.00381374302
+0.00256050929
+0.00162870728
+0.000896089378
+0.000314803513
+3.36848282e-05
+7.36191607e-07
+3.18543804e-07
+3.17730344e-07
+3.18560852e-07
+7.37932428e-07
+3.37076388e-05
+0.000314846613
+0.000896108683
+0.00162874893
+0.00256059034
+0.00381388233
+0.00569116017
+0.00901108916
+0.0166544334
+0.0412291949
+0.0419937558
+0.0166512871
+0.00901047076
+0.00569084139
+0.0038136871
+0.00256047977
+0.00162871841
+0.000896152606
+0.000314927306
+3.37231497e-05
+7.37146929e-07
+3.18507006e-07
+3.17691352e-07
+3.18524136e-07
+7.38894444e-07
+3.37460381e-05
+0.000314970536
+0.000896171977
+0.00162876017
+0.00256056102
+0.00381382681
+0.00569109098
+0.0090110267
+0.0166544392
+0.0412277766
+0.041994158
+0.0166512754
+0.00901039791
+0.00569076255
+0.00381362303
+0.00256044361
+0.00162872483
+0.00089621296
+0.000315049428
+3.37611299e-05
+7.38095723e-07
+3.18470185e-07
+3.1765235e-07
+3.18487394e-07
+7.39849664e-07
+3.3784093e-05
+0.00031509278
+0.000896232388
+0.00162876666
+0.00256052506
+0.00381376312
+0.00569101283
+0.00901095536
+0.0166544366
+0.041226334
+0.041994545
+0.0166512557
+0.00901031656
+0.00569067506
+0.00381355102
+0.00256040093
+0.00162872656
+0.000896270446
+0.000315169856
+3.37987613e-05
+7.39037784e-07
+3.18433343e-07
+3.17613339e-07
+3.18450625e-07
+7.40797667e-07
+3.38217942e-05
+0.000315213317
+0.000896289912
+0.00162876845
+0.00256048253
+0.00381369144
+0.00569092598
+0.00901087545
+0.0166544259
+0.0412248668
+0.0419949164
+0.0166512284
+0.00901022717
+0.00569057928
+0.00381347132
+0.00256035191
+0.00162872371
+0.000896325094
+0.000315288577
+3.3836038e-05
+7.39972917e-07
+3.1839648e-07
+3.17574319e-07
+3.18413824e-07
+7.41737948e-07
+3.38591328e-05
+0.000315332127
+0.000896344565
+0.00162876562
+0.00256043362
+0.00381361201
+0.00569083077
+0.0090107874
+0.0166544074
+0.0412233754
+0.0419952723
+0.0166511939
+0.00901013012
+0.00569047554
+0.00381338417
+0.00256029669
+0.00162871634
+0.000896376914
+0.000315405571
+3.38729524e-05
+7.40900915e-07
+3.18359593e-07
+3.17535291e-07
+3.18376983e-07
+7.42669666e-07
+3.38960955e-05
+0.00031544917
+0.000896396331
+0.00162875819
+0.00256037841
+0.00381352501
+0.00569072744
+0.00901069149
+0.0166543814
+0.0412218594
+0.0419956127
+0.0166511527
+0.00901002598
+0.00569036429
+0.0038132899
+0.00256023551
+0.0016287046
+0.000896425963
+0.000315520837
+3.39094997e-05
+7.4182159e-07
+3.18322685e-07
+3.17496254e-07
+3.18340087e-07
+7.43591657e-07
+3.39326683e-05
+0.000315564418
+0.000896445223
+0.00162874626
+0.00256031708
+0.00381343069
+0.00569061636
+0.00901058816
+0.0166543484
+0.0412203195
+0.0419959371
+0.0166511053
+0.00900991514
+0.00569024587
+0.00381318878
+0.00256016854
+0.00162868857
+0.000896472266
+0.000315634361
+3.39456733e-05
+7.42734742e-07
+3.18285755e-07
+3.1745721e-07
+3.18303114e-07
+7.44501851e-07
+3.39688272e-05
+0.000315677806
+0.000896491185
+0.00162872981
+0.00256024967
+0.00381332918
+0.00569049769
+0.00901047756
+0.0166543083
+0.0412187557
+0.0419962458
+0.0166510526
+0.00900979836
+0.0056901209
+0.00381308126
+0.0025600961
+0.00162866848
+0.00089651594
+0.000315746163
+3.39814703e-05
+7.43640212e-07
+3.18248801e-07
+3.17418158e-07
+3.18266022e-07
+7.45396991e-07
+3.40045409e-05
+0.000315789273
+0.000896534199
+0.00162870889
+0.00256017631
+0.00381322068
+0.0056903717
+0.00901036
+0.0166542612
+0.0412171691
+0.0419965377
+0.016650995
+0.00900967616
+0.00568998982
+0.0038129677
+0.00256001845
+0.00162864446
+0.000896557059
+0.000315856257
+3.40168876e-05
+7.44537835e-07
+3.18211824e-07
+3.17379097e-07
+3.18228739e-07
+7.46271215e-07
+3.40397532e-05
+0.000315898679
+0.000896574101
+0.00162868335
+0.00256009687
+0.00381310507
+0.00569023828
+0.00901023521
+0.0166542063
+0.0412155606
+0.0419968125
+0.0166509339
+0.00900954947
+0.00568985338
+0.00381284871
+0.00255993604
+0.00162861684
+0.000896595796
+0.000315964725
+3.40519304e-05
+7.45427537e-07
+3.18174824e-07
+3.17340028e-07
+3.18191138e-07
+7.47114576e-07
+3.40743767e-05
+0.000316005838
+0.000896610644
+0.00162865296
+0.00256001116
+0.00381298217
+0.00569009715
+0.00901010271
+0.0166541427
+0.0412139328
+0.0419970686
+0.0166508687
+0.00900941854
+0.00568971205
+0.0038127248
+0.00255984932
+0.0016285859
+0.000896632348
+0.000316071604
+3.40865984e-05
+7.46309235e-07
+3.181378e-07
+3.1730095e-07
+3.18152996e-07
+7.47908727e-07
+3.41082385e-05
+0.000316110314
+0.000896643275
+0.00162861702
+0.00255991834
+0.00381285086
+0.00568994661
+0.00900995968
+0.0166540648
+0.04121229
+0.0419973043
+0.0166508018
+0.00900928455
+0.00568956642
+0.00381259627
+0.00255975853
+0.00162855206
+0.000896667166
+0.000316177005
+3.41208975e-05
+7.47182933e-07
+3.18100754e-07
+3.17261863e-07
+3.18113939e-07
+7.48621909e-07
+3.41410358e-05
+0.000316211369
+0.000896671089
+0.00162857406
+0.00255981602
+0.00381270778
+0.00568978206
+0.00900979962
+0.0166539623
+0.0412106492
+0.041997517
+0.0166507326
+0.00900914549
+0.0056894146
+0.00381246145
+0.00255966244
+0.00162851445
+0.000896699778
+0.000316281113
+3.41548671e-05
+7.48048951e-07
+3.18063685e-07
+3.17222766e-07
+3.18073393e-07
+7.4920242e-07
+3.41722734e-05
+0.000316307709
+0.000896691165
+0.00162851935
+0.00255969684
+0.00381254124
+0.00568958501
+0.00900959175
+0.0166537809
+0.0412090349
+0.0419977079
+0.0166506555
+0.00900899996
+0.00568925657
+0.00381232044
+0.00255956051
+0.00162847181
+0.000896728745
+0.000316383532
+3.41884911e-05
+7.48908442e-07
+3.18026611e-07
+3.17183655e-07
+3.18030695e-07
+7.49580019e-07
+3.42012183e-05
+0.000316398017
+0.000896702127
+0.00162845218
+0.00255955973
+0.00381234539
+0.00568933203
+0.00900925766
+0.016653236
+0.0412075111
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.00015;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.gas;
+        inletValue      uniform 0.00015;
+        value           nonuniform List<scalar>
+25
+(
+0.0419977079
+0.0166506555
+0.00900899996
+0.00568925657
+0.00381232044
+0.00255956051
+0.00162847181
+0.000896728745
+0.000316383532
+3.41884911e-05
+7.48908442e-07
+3.18026611e-07
+3.17183655e-07
+3.18030695e-07
+7.49580019e-07
+3.42012183e-05
+0.000316398017
+0.000896702127
+0.00162845218
+0.00255955973
+0.00381234539
+0.00568933203
+0.00900925766
+0.016653236
+0.0412075111
+)
+;
+    }
+    wall1
+    {
+        type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           nonuniform List<scalar>
+75
+(
+0.0419653487
+0.0419654611
+0.0419655923
+0.0419657345
+0.0419658904
+0.0419660621
+0.0419662513
+0.0419664589
+0.0419666856
+0.0419669319
+0.0419671978
+0.0419674835
+0.0419677891
+0.0419681141
+0.0419684586
+0.0419688221
+0.0419692042
+0.0419696049
+0.0419700232
+0.0419704591
+0.0419709118
+0.0419713809
+0.0419718657
+0.0419723657
+0.0419728802
+0.0419734084
+0.0419739497
+0.0419745034
+0.0419750684
+0.0419756439
+0.041976229
+0.0419768227
+0.0419774241
+0.0419780322
+0.0419786458
+0.0419792639
+0.0419798857
+0.0419805098
+0.0419811354
+0.0419817613
+0.0419823865
+0.0419830099
+0.0419836305
+0.0419842474
+0.0419848596
+0.0419854659
+0.0419860657
+0.0419866579
+0.0419872417
+0.0419878161
+0.0419883805
+0.0419889341
+0.0419894764
+0.0419900064
+0.041990524
+0.0419910282
+0.0419915189
+0.0419919955
+0.0419924579
+0.0419929055
+0.0419933381
+0.0419937558
+0.041994158
+0.041994545
+0.0419949164
+0.0419952723
+0.0419956127
+0.0419959371
+0.0419962458
+0.0419965377
+0.0419968125
+0.0419970686
+0.0419973043
+0.041997517
+0.0419977079
+)
+;
+    }
+    wall2
+    {
+        type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           nonuniform List<scalar>
+75
+(
+0.0412932979
+0.0412946744
+0.0412931691
+0.041291993
+0.0412907793
+0.0412895822
+0.0412883945
+0.0412872181
+0.0412860534
+0.0412849008
+0.0412837604
+0.0412826323
+0.0412815163
+0.0412804123
+0.04127932
+0.041278239
+0.0412771691
+0.0412761096
+0.0412750601
+0.0412740201
+0.0412729893
+0.0412719668
+0.041270952
+0.0412699444
+0.0412689431
+0.0412679477
+0.0412669571
+0.0412659706
+0.0412649874
+0.0412640063
+0.0412630267
+0.0412620473
+0.0412610673
+0.0412600856
+0.0412591009
+0.0412581125
+0.0412571191
+0.0412561197
+0.041255113
+0.0412540982
+0.0412530742
+0.0412520397
+0.0412509939
+0.0412499356
+0.041248864
+0.0412477777
+0.0412466761
+0.0412455581
+0.0412444229
+0.0412432696
+0.0412420973
+0.0412409054
+0.0412396931
+0.0412384599
+0.0412372049
+0.0412359278
+0.0412346282
+0.0412333052
+0.041231959
+0.0412305889
+0.0412291949
+0.0412277766
+0.041226334
+0.0412248668
+0.0412233754
+0.0412218594
+0.0412203195
+0.0412187557
+0.0412171691
+0.0412155606
+0.0412139328
+0.04121229
+0.0412106492
+0.0412090349
+0.0412075111
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid
new file mode 100644
index 0000000000..fcbfddee2a
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid
@@ -0,0 +1,2158 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      epsilon.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+0.041965349
+0.0166405359
+0.00900207363
+0.00568303829
+0.00380594629
+0.00255249587
+0.00162012539
+0.000886860569
+0.000304606476
+3.09155969e-05
+6.71922052e-07
+3.2071407e-07
+3.20043607e-07
+3.20726687e-07
+6.73310152e-07
+3.09351735e-05
+0.000304650474
+0.000886891984
+0.00162018209
+0.00255259568
+0.00380611079
+0.00568332041
+0.00900266103
+0.0166422991
+0.0419627924
+0.0419654615
+0.016640573
+0.00900213306
+0.00568312156
+0.00380605631
+0.00255263587
+0.00162029779
+0.000887056071
+0.000304797579
+3.09604988e-05
+6.72868744e-07
+3.20683916e-07
+3.20011417e-07
+3.20696615e-07
+6.74252542e-07
+3.09796945e-05
+0.000304837697
+0.000887076543
+0.00162033493
+0.00255270516
+0.00380617572
+0.00568333722
+0.00900261716
+0.0166421418
+0.0419630659
+0.0419655927
+0.0166406295
+0.00900220716
+0.00568321938
+0.0038061834
+0.00255279727
+0.00162049695
+0.00088728317
+0.000305018552
+3.10131972e-05
+6.73989526e-07
+3.2064827e-07
+3.19973367e-07
+3.20660948e-07
+6.75364589e-07
+3.10321883e-05
+0.000305058124
+0.000887303164
+0.00162053365
+0.00255286602
+0.00380630203
+0.00568343395
+0.00900268985
+0.0166421971
+0.0419631668
+0.041965735
+0.0166407086
+0.00900229656
+0.00568332771
+0.00380631774
+0.00255296338
+0.0016206985
+0.000887510703
+0.000305237255
+3.10657885e-05
+6.75114698e-07
+3.2061253e-07
+3.19935208e-07
+3.2062522e-07
+6.76486145e-07
+3.10846414e-05
+0.000305276477
+0.000887530563
+0.00162073533
+0.0025530324
+0.00380643676
+0.00568354281
+0.00900278021
+0.0166422793
+0.0419633108
+0.0419658909
+0.0166408077
+0.00900240025
+0.00568344608
+0.00380645898
+0.00255313381
+0.00162090202
+0.000887737799
+0.000305453313
+3.11181507e-05
+6.76241459e-07
+3.20576779e-07
+3.1989703e-07
+3.20589501e-07
+6.77612085e-07
+3.11369025e-05
+0.000305492248
+0.00088775755
+0.00162093898
+0.00255320313
+0.0038065784
+0.00568366173
+0.00900288492
+0.0166423814
+0.0419634652
+0.0419660627
+0.0166409247
+0.0090025174
+0.00568357419
+0.00380660706
+0.00255330862
+0.00162110758
+0.000887964302
+0.000305667034
+3.11703323e-05
+6.77369703e-07
+3.20540977e-07
+3.19858795e-07
+3.20553742e-07
+6.7874122e-07
+3.11890102e-05
+0.000305705727
+0.000887983953
+0.00162114467
+0.00255337822
+0.00380672685
+0.00568379036
+0.00900300308
+0.0166425017
+0.0419636361
+0.041966252
+0.016641058
+0.00900264713
+0.00568371159
+0.00380676174
+0.00255348768
+0.00162131506
+0.000888189982
+0.000305878637
+3.12223604e-05
+6.78500184e-07
+3.20505104e-07
+3.19820482e-07
+3.20517918e-07
+6.79873836e-07
+3.12409863e-05
+0.000305917124
+0.000888209538
+0.00162135228
+0.00255355755
+0.00380688189
+0.00568392827
+0.00900313382
+0.0166426382
+0.0419638245
+0.0419664596
+0.0166412062
+0.00900278855
+0.00568385778
+0.0038069227
+0.00255367073
+0.00162152417
+0.000888414504
+0.000306088204
+3.12742317e-05
+6.79632519e-07
+3.20469164e-07
+3.19782095e-07
+3.20482033e-07
+6.81009255e-07
+3.12928244e-05
+0.000306126515
+0.000888433968
+0.00162156151
+0.00255374083
+0.0038070432
+0.00568407496
+0.00900327624
+0.0166427898
+0.0419640315
+0.0419666864
+0.0166413682
+0.0090029408
+0.00568401223
+0.00380708956
+0.00255385741
+0.00162173453
+0.000888637483
+0.000306295724
+3.13259227e-05
+6.80765895e-07
+3.20433172e-07
+3.19743646e-07
+3.204461e-07
+6.82146447e-07
+3.13444985e-05
+0.000306333888
+0.000888656856
+0.00162177198
+0.00255392775
+0.00380721038
+0.00568422989
+0.00900342948
+0.0166429549
+0.0419642575
+0.0419669327
+0.0166415427
+0.00900310308
+0.00568417439
+0.00380726191
+0.00255404736
+0.00162194574
+0.000888858551
+0.00030650117
+3.13774054e-05
+6.81899432e-07
+3.20397148e-07
+3.1970516e-07
+3.20410137e-07
+6.83284392e-07
+3.13959788e-05
+0.00030653921
+0.000888877836
+0.00162198327
+0.00255411792
+0.00380738303
+0.00568439251
+0.00900359273
+0.0166431327
+0.041964503
+0.0419671986
+0.0166417289
+0.00900327465
+0.00568434377
+0.00380743936
+0.00255424022
+0.0016221574
+0.000889077406
+0.000306704529
+3.1428659e-05
+6.83032405e-07
+3.20361104e-07
+3.1966665e-07
+3.20374158e-07
+6.84422262e-07
+3.1447243e-05
+0.000306742469
+0.000889096605
+0.00162219503
+0.00255431098
+0.00380756078
+0.00568456234
+0.00900376527
+0.0166433222
+0.0419647682
+0.0419674844
+0.0166419259
+0.00900345485
+0.00568451988
+0.00380762154
+0.00255443563
+0.00162236916
+0.000889293809
+0.000306905824
+3.14796715e-05
+6.84164315e-07
+3.2032505e-07
+3.19628128e-07
+3.2033817e-07
+6.8555947e-07
+3.14982779e-05
+0.000306943685
+0.000889312925
+0.00162240687
+0.00255450661
+0.00380774325
+0.00568473889
+0.00900394643
+0.0166435226
+0.0419650533
+0.04196779
+0.016642133
+0.00900364303
+0.00568470227
+0.00380780809
+0.00255463327
+0.0016225807
+0.000889507583
+0.000307105096
+3.15304391e-05
+6.85294856e-07
+3.20288988e-07
+3.19589595e-07
+3.20302175e-07
+6.86695647e-07
+3.1549078e-05
+0.000307142898
+0.000889526617
+0.00162261849
+0.00255470444
+0.00380793007
+0.00568492171
+0.00900413556
+0.0166437329
+0.0419653581
+0.0419681151
+0.0166423494
+0.00900383858
+0.00568489044
+0.00380799862
+0.00255483279
+0.00162279171
+0.000889718586
+0.000307302401
+3.15809626e-05
+6.86423846e-07
+3.20252917e-07
+3.19551054e-07
+3.20266174e-07
+6.8783056e-07
+3.15996435e-05
+0.000307340162
+0.000889737543
+0.00162282958
+0.00255490414
+0.00380812087
+0.00568511031
+0.00900433207
+0.0166439527
+0.0419656824
+0.0419684596
+0.0166425745
+0.00900404088
+0.00568508393
+0.00380819272
+0.00255503383
+0.00162300189
+0.000889926706
+0.000307497795
+3.16312448e-05
+6.8755117e-07
+3.20216837e-07
+3.19512503e-07
+3.20230164e-07
+6.88964044e-07
+3.16499759e-05
+0.000307535534
+0.000889945589
+0.00162303983
+0.00255510536
+0.00380831524
+0.0056853042
+0.00900453531
+0.0166441811
+0.0419660261
+0.0419688232
+0.0166428075
+0.00900424934
+0.00568528222
+0.00380838999
+0.00255523602
+0.00162321095
+0.000890131848
+0.00030769133
+3.16812888e-05
+6.88676728e-07
+3.20180745e-07
+3.19473941e-07
+3.20194144e-07
+6.90095972e-07
+3.17000773e-05
+0.000307729062
+0.00089015066
+0.00162324896
+0.00255530774
+0.00380851278
+0.00568550292
+0.00900474471
+0.0166444175
+0.0419663889
+0.0419692054
+0.0166430478
+0.00900446332
+0.00568548483
+0.00380858999
+0.00255543898
+0.0016234186
+0.000890333931
+0.000307883052
+3.17310967e-05
+6.89800424e-07
+3.20144641e-07
+3.19435367e-07
+3.20158113e-07
+6.91226207e-07
+3.1749949e-05
+0.00030792079
+0.000890352675
+0.00162345667
+0.00255551088
+0.00380871304
+0.00568570595
+0.00900495965
+0.0166446611
+0.0419667705
+0.0419696061
+0.0166432946
+0.00900468223
+0.00568569121
+0.00380879227
+0.00255564233
+0.00162362456
+0.000890532884
+0.000308072995
+3.17806697e-05
+6.90922145e-07
+3.20108524e-07
+3.19396781e-07
+3.2012207e-07
+6.92354615e-07
+3.17995914e-05
+0.000308110757
+0.000890551564
+0.00162366269
+0.0025557144
+0.00380891557
+0.00568591275
+0.00900517951
+0.0166449114
+0.0419671703
+0.0419700245
+0.0166435475
+0.00900490544
+0.00568590084
+0.00380899634
+0.00255584566
+0.00162382855
+0.000890728648
+0.000308261194
+3.18300079e-05
+6.92041772e-07
+3.20072396e-07
+3.19358186e-07
+3.20086017e-07
+6.93481056e-07
+3.18490039e-05
+0.000308298989
+0.000890747268
+0.00162386675
+0.0025559179
+0.00380911991
+0.00568612281
+0.00900540369
+0.0166451675
+0.0419675879
+0.0419704604
+0.0166438055
+0.00900513234
+0.00568611317
+0.00380920176
+0.00255604858
+0.0016240303
+0.000890921175
+0.000308447674
+3.18791111e-05
+6.93159187e-07
+3.20036257e-07
+3.19319581e-07
+3.20049952e-07
+6.9460539e-07
+3.18981857e-05
+0.000308485515
+0.00089093974
+0.00162406857
+0.00255612099
+0.00380932559
+0.00568633556
+0.00900563157
+0.016645429
+0.0419680229
+0.0419709132
+0.0166440682
+0.00900536231
+0.00568632764
+0.00380940803
+0.0025562507
+0.00162422958
+0.000891110428
+0.000308632461
+3.19279787e-05
+6.94274271e-07
+3.20000107e-07
+3.19280969e-07
+3.20013879e-07
+6.9572748e-07
+3.19471355e-05
+0.000308670358
+0.000891128942
+0.0016242679
+0.00255632329
+0.00380953213
+0.00568655047
+0.00900586252
+0.0166456952
+0.041968475
+0.0419713823
+0.0166443349
+0.00900559469
+0.00568654369
+0.00380961467
+0.00255645164
+0.00162442615
+0.000891296381
+0.00030881558
+3.19766104e-05
+6.95386919e-07
+3.1996395e-07
+3.1924235e-07
+3.19977798e-07
+6.9684721e-07
+3.19958527e-05
+0.000308853544
+0.000891314847
+0.00162446452
+0.0025565244
+0.00380973905
+0.00568676697
+0.00900609591
+0.0166459653
+0.0419689435
+0.0419718673
+0.0166446047
+0.00900582888
+0.00568676077
+0.0038098212
+0.002556651
+0.00162461977
+0.000891479017
+0.000308997054
+3.20250062e-05
+6.9649704e-07
+3.19927784e-07
+3.19203727e-07
+3.1994171e-07
+6.97964474e-07
+3.20443364e-05
+0.000309035093
+0.00089149744
+0.00162465822
+0.00255672394
+0.00380994586
+0.00568698449
+0.00900633111
+0.0166462387
+0.0419694276
+0.0419723673
+0.0166448772
+0.00900606423
+0.00568697828
+0.00381002714
+0.00255684843
+0.00162481026
+0.000891658332
+0.000309176908
+3.20731662e-05
+6.97604555e-07
+3.1989161e-07
+3.19165099e-07
+3.19905613e-07
+6.99079182e-07
+3.20925868e-05
+0.000309215031
+0.000891676716
+0.00162484878
+0.00255692155
+0.00381015208
+0.00568720248
+0.00900656749
+0.0166465146
+0.0419699269
+0.0419728818
+0.0166451515
+0.00900630007
+0.00568719567
+0.00381023201
+0.00255704358
+0.00162499744
+0.000891834326
+0.000309355169
+3.21210914e-05
+6.98709408e-07
+3.19855428e-07
+3.19126467e-07
+3.1986951e-07
+7.0019127e-07
+3.21406043e-05
+0.000309393383
+0.000891852675
+0.00162503601
+0.00255711687
+0.00381035724
+0.00568742034
+0.00900680439
+0.0166467925
+0.0419704407
+0.0419734101
+0.0166454272
+0.0090065358
+0.00568741236
+0.00381043533
+0.00255723609
+0.00162518113
+0.000892007009
+0.000309531859
+3.21687829e-05
+6.99811548e-07
+3.19819239e-07
+3.1908783e-07
+3.19833398e-07
+7.01300683e-07
+3.21883896e-05
+0.000309570172
+0.000892025326
+0.00162521976
+0.00255730956
+0.00381056085
+0.00568763751
+0.00900704118
+0.0166470718
+0.0419709684
+0.0419739515
+0.0166457032
+0.00900677072
+0.00568762777
+0.00381063663
+0.00255742564
+0.00162536116
+0.000892176394
+0.000309707007
+3.22162423e-05
+7.00910944e-07
+3.19783039e-07
+3.19049188e-07
+3.19797278e-07
+7.02407372e-07
+3.2235944e-05
+0.000309745424
+0.000892194684
+0.00162539986
+0.00255749929
+0.00381076246
+0.00568785343
+0.00900727719
+0.0166473515
+0.0419715092
+0.0419745052
+0.0166459792
+0.0090070042
+0.00568784133
+0.00381083546
+0.00255761189
+0.0016255374
+0.000892342499
+0.000309880636
+3.2263471e-05
+7.02007568e-07
+3.19746829e-07
+3.19010539e-07
+3.19761147e-07
+7.03511314e-07
+3.22832687e-05
+0.000309919163
+0.000892360765
+0.00162557616
+0.00255768572
+0.0038109616
+0.0056880675
+0.00900751177
+0.0166476311
+0.0419720623
+0.0419750703
+0.0166462541
+0.00900723556
+0.00568805247
+0.00381103135
+0.00255779455
+0.00162570971
+0.000892505344
+0.00031005277
+3.23104706e-05
+7.03101393e-07
+3.19710609e-07
+3.18971883e-07
+3.19725006e-07
+7.04612473e-07
+3.23303653e-05
+0.000310091414
+0.00089252359
+0.00162574853
+0.00255786857
+0.0038111578
+0.00568827916
+0.00900774428
+0.0166479098
+0.0419726268
+0.0419756458
+0.0166465275
+0.00900746416
+0.0056882606
+0.00381122384
+0.0025579733
+0.00162587796
+0.00089266495
+0.00031022343
+3.23572424e-05
+7.04192395e-07
+3.19674375e-07
+3.18933218e-07
+3.19688852e-07
+7.05710821e-07
+3.23772344e-05
+0.000310262193
+0.000892683181
+0.00162591684
+0.00255804752
+0.00381135063
+0.00568848784
+0.00900797404
+0.016648187
+0.0419732019
+0.041976231
+0.0166467986
+0.00900768933
+0.00568846516
+0.00381141251
+0.00255814787
+0.00162604203
+0.000892821338
+0.000310392635
+3.24037869e-05
+7.05280538e-07
+3.19638128e-07
+3.18894545e-07
+3.19652686e-07
+7.06806318e-07
+3.24238767e-05
+0.000310431522
+0.000892839556
+0.00162608098
+0.00255822228
+0.00381153963
+0.00568869296
+0.00900820037
+0.0166484618
+0.0419737866
+0.0419768248
+0.0166470666
+0.00900791039
+0.00568866557
+0.00381159691
+0.00255831796
+0.00162620181
+0.000892974528
+0.000310560398
+3.24501043e-05
+7.06365776e-07
+3.19601867e-07
+3.18855862e-07
+3.19616505e-07
+7.07898915e-07
+3.24702923e-05
+0.000310599413
+0.000892992738
+0.00162624083
+0.00255839257
+0.00381172437
+0.00568889394
+0.00900842265
+0.0166487336
+0.04197438
+0.0419774262
+0.0166473308
+0.00900812672
+0.00568886129
+0.00381177659
+0.00255848332
+0.00162635719
+0.000893124538
+0.000310726732
+3.24961941e-05
+7.07448051e-07
+3.19565592e-07
+3.18817168e-07
+3.1958031e-07
+7.08988552e-07
+3.25164803e-05
+0.000310765879
+0.000893142744
+0.00162639629
+0.00255855812
+0.00381190441
+0.00568909025
+0.0090086402
+0.0166490018
+0.0419749811
+0.0419780344
+0.0166475904
+0.00900833766
+0.00568905177
+0.00381195116
+0.00255864367
+0.00162650808
+0.000893271386
+0.000310891644
+3.25420549e-05
+7.08527291e-07
+3.19529302e-07
+3.18778466e-07
+3.19544102e-07
+7.10075151e-07
+3.25624393e-05
+0.000310930925
+0.00089328959
+0.00162654725
+0.00255871868
+0.00381207933
+0.00568928132
+0.00900885239
+0.0166492653
+0.0419755889
+0.0419786481
+0.0166478449
+0.0090085426
+0.00568923646
+0.0038121202
+0.00255879877
+0.00162665439
+0.000893415085
+0.00031105514
+3.25876849e-05
+7.09603412e-07
+3.19492998e-07
+3.18739753e-07
+3.1950788e-07
+7.11158631e-07
+3.26081675e-05
+0.000311094556
+0.000893433292
+0.00162669363
+0.00255887399
+0.00381224874
+0.00568946662
+0.00900905859
+0.0166495238
+0.0419762023
+0.0419792662
+0.0166480935
+0.00900874093
+0.00568941486
+0.00381228334
+0.00255894839
+0.00162679603
+0.000893555653
+0.000311217222
+3.26330818e-05
+7.1067632e-07
+3.19456682e-07
+3.18701035e-07
+3.19471645e-07
+7.12238891e-07
+3.26536621e-05
+0.000311256777
+0.000893573865
+0.00162683534
+0.00255902381
+0.00381241225
+0.00568964564
+0.00900925822
+0.0166497765
+0.0419768204
+0.041979888
+0.0166483357
+0.00900893208
+0.00568958646
+0.00381244019
+0.00255909229
+0.00162693291
+0.0008936931
+0.000311377891
+3.26782429e-05
+7.11745917e-07
+3.19420354e-07
+3.18662309e-07
+3.19435399e-07
+7.13315836e-07
+3.26989207e-05
+0.000311417585
+0.000893711321
+0.00162697231
+0.00255916793
+0.00381256948
+0.00568981789
+0.00900945069
+0.0166500227
+0.041977442
+0.0419805122
+0.0166485707
+0.00900911551
+0.00568975082
+0.00381259041
+0.00255923028
+0.00162706499
+0.000893827441
+0.000311537146
+3.27231654e-05
+7.12812106e-07
+3.19384014e-07
+3.18623577e-07
+3.19399142e-07
+7.14389362e-07
+3.27439404e-05
+0.000311576982
+0.000893845675
+0.00162710446
+0.00255930614
+0.00381272009
+0.0056899829
+0.00900963545
+0.0166502619
+0.0419780662
+0.0419811378
+0.0166487982
+0.00900929072
+0.00568990749
+0.00381273367
+0.00255936217
+0.00162719217
+0.000893958692
+0.000311694989
+3.27678469e-05
+7.13874788e-07
+3.19347664e-07
+3.18584841e-07
+3.19362873e-07
+7.15459375e-07
+3.27887185e-05
+0.000311734967
+0.000893976941
+0.00162723173
+0.00255943824
+0.00381286373
+0.00569014023
+0.00900981202
+0.0166504935
+0.0419786917
+0.0419817638
+0.0166490175
+0.00900945724
+0.00569005604
+0.00381286965
+0.00255948777
+0.00162731443
+0.000894086864
+0.000311851418
+3.28122849e-05
+7.14933872e-07
+3.19311303e-07
+3.185461e-07
+3.19326596e-07
+7.16525777e-07
+3.28332526e-05
+0.00031189154
+0.000894105134
+0.00162735407
+0.00255956406
+0.00381300011
+0.00569028945
+0.00900997993
+0.016650717
+0.0419793177
+0.041982389
+0.0166492283
+0.00900961464
+0.00569019612
+0.00381299808
+0.00255960692
+0.00162743171
+0.000894211975
+0.000312006434
+3.28564772e-05
+7.15989277e-07
+3.19274932e-07
+3.18507355e-07
+3.19290307e-07
+7.1758849e-07
+3.28775405e-05
+0.0003120467
+0.000894230268
+0.00162747143
+0.00255968343
+0.00381312894
+0.00569043022
+0.00901013873
+0.0166509319
+0.0419799431
+0.0419830126
+0.0166494299
+0.00900976252
+0.00569032736
+0.00381311869
+0.00255971946
+0.00162754397
+0.00089433404
+0.000312160039
+3.29004221e-05
+7.17040928e-07
+3.19238551e-07
+3.18468606e-07
+3.19254008e-07
+7.18647436e-07
+3.29215802e-05
+0.00031220045
+0.000894352359
+0.00162758377
+0.00255979621
+0.00381324997
+0.00569056216
+0.00901028803
+0.0166511379
+0.0419805667
+0.0419836332
+0.0166496221
+0.00900990055
+0.00569044944
+0.00381323124
+0.0025598253
+0.00162765116
+0.000894453075
+0.000312312233
+3.29441179e-05
+7.18088757e-07
+3.19202157e-07
+3.18429851e-07
+3.19217698e-07
+7.1970255e-07
+3.29653703e-05
+0.000312352789
+0.000894471423
+0.00162769105
+0.00255990226
+0.00381336293
+0.00569068496
+0.0090104275
+0.0166513345
+0.0419811878
+0.0419842502
+0.0166498046
+0.0090100284
+0.00569056211
+0.00381333553
+0.00255992428
+0.00162775328
+0.000894569094
+0.000312463017
+3.29875632e-05
+7.19132702e-07
+3.1916575e-07
+3.18391091e-07
+3.19181375e-07
+7.20753769e-07
+3.30089092e-05
+0.000312503719
+0.000894587475
+0.00162779326
+0.00256000147
+0.00381346764
+0.00569079834
+0.00901055681
+0.0166515213
+0.0419818051
+0.0419848624
+0.016649977
+0.00901014581
+0.00569066508
+0.00381343136
+0.00256001633
+0.00162785029
+0.000894682115
+0.000312612392
+3.30307567e-05
+7.20172703e-07
+3.1912933e-07
+3.18352323e-07
+3.19145038e-07
+7.21801029e-07
+3.30521956e-05
+0.00031265324
+0.000894700533
+0.00162789036
+0.00256009374
+0.00381356389
+0.00569090205
+0.00901067569
+0.016651698
+0.0419824178
+0.0419854688
+0.0166501391
+0.00901025254
+0.00569075815
+0.00381351855
+0.00256010133
+0.00162794219
+0.000894792152
+0.000312760357
+3.30736967e-05
+7.21208699e-07
+3.19092893e-07
+3.18313545e-07
+3.19108685e-07
+7.22844274e-07
+3.3095228e-05
+0.000312801351
+0.000894810608
+0.00162798235
+0.00256017897
+0.0038136515
+0.00569099585
+0.00901078392
+0.0166518645
+0.0419830247
+0.0419860687
+0.0166502906
+0.00901034842
+0.00569084113
+0.00381359697
+0.00256017922
+0.00162802895
+0.000894899218
+0.00031290691
+3.31163817e-05
+7.22240622e-07
+3.19056439e-07
+3.18274757e-07
+3.19072315e-07
+7.23883433e-07
+3.31380044e-05
+0.000312948049
+0.000894917716
+0.00162806921
+0.0025602571
+0.00381373036
+0.00569107957
+0.00901088129
+0.0166520205
+0.041983625
+0.0419866609
+0.0166504315
+0.00901043327
+0.00569091386
+0.00381366649
+0.00256024995
+0.00162811058
+0.000895003323
+0.000313052047
+3.31588092e-05
+7.23268398e-07
+3.19019964e-07
+3.18235957e-07
+3.19035924e-07
+7.24918432e-07
+3.31805228e-05
+0.000313093332
+0.000895021867
+0.00162815094
+0.00256032806
+0.00381380031
+0.00569115304
+0.00901096765
+0.0166521659
+0.0419842179
+0.0419872448
+0.0166505615
+0.00901050699
+0.0056909762
+0.00381372701
+0.00256031345
+0.00162818708
+0.00089510448
+0.000313195761
+3.32009767e-05
+7.24291941e-07
+3.18983468e-07
+3.18197144e-07
+3.18999514e-07
+7.25949189e-07
+3.32227804e-05
+0.000313237192
+0.000895123071
+0.00162822753
+0.0025603918
+0.00381386126
+0.00569121614
+0.0090110429
+0.0166523005
+0.0419848024
+0.0419878192
+0.0166506806
+0.0090105695
+0.00569102807
+0.00381377844
+0.00256036969
+0.00162825843
+0.000895202695
+0.000313338044
+3.3242881e-05
+7.25311152e-07
+3.18946952e-07
+3.18158315e-07
+3.18963081e-07
+7.26975598e-07
+3.32647741e-05
+0.00031337962
+0.000895221337
+0.00162829898
+0.00256044826
+0.00381391312
+0.00569126877
+0.00901110695
+0.0166524242
+0.0419853777
+0.0419883837
+0.0166507888
+0.00901062078
+0.0056910694
+0.00381382072
+0.00256041862
+0.00162832464
+0.000895297975
+0.000313478885
+3.32845181e-05
+7.26325919e-07
+3.18910411e-07
+3.18119471e-07
+3.18926625e-07
+7.27997555e-07
+3.33064999e-05
+0.000313520606
+0.000895316672
+0.00162836529
+0.00256049744
+0.00381395584
+0.00569131087
+0.00901115978
+0.0166525369
+0.041985943
+0.0419889374
+0.0166508861
+0.00901066082
+0.00569110016
+0.00381385382
+0.00256046026
+0.00162838572
+0.000895390325
+0.000313618269
+3.33258838e-05
+7.27336117e-07
+3.18873846e-07
+3.18080612e-07
+3.18890145e-07
+7.29014927e-07
+3.33479536e-05
+0.000313660135
+0.000895409077
+0.00162842648
+0.00256053931
+0.00381398939
+0.00569134239
+0.00901120137
+0.0166526389
+0.0419864976
+0.0419894797
+0.0166509725
+0.00901068968
+0.00569112036
+0.00381387773
+0.00256049458
+0.00162844168
+0.000895479748
+0.000313756183
+3.33669731e-05
+7.28341604e-07
+3.18837257e-07
+3.18041736e-07
+3.18853642e-07
+7.30027578e-07
+3.338913e-05
+0.000313798194
+0.000895498561
+0.00162848255
+0.00256057388
+0.00381401373
+0.00569136335
+0.0090112318
+0.0166527299
+0.0419870409
+0.0419900098
+0.0166510481
+0.00901070741
+0.00569113001
+0.00381389245
+0.00256052161
+0.00162849254
+0.000895566248
+0.000313892608
+3.34077804e-05
+7.29342231e-07
+3.18800643e-07
+3.18002845e-07
+3.18817114e-07
+7.31035356e-07
+3.34300238e-05
+0.000313934763
+0.000895585122
+0.00162853351
+0.00256060113
+0.0038140289
+0.00569137379
+0.0090112511
+0.0166528102
+0.0419875722
+0.0419905274
+0.016651113
+0.00901071417
+0.00569112919
+0.00381389801
+0.00256054135
+0.00162853832
+0.000895649826
+0.000314027526
+3.34483e-05
+7.30337834e-07
+3.18764006e-07
+3.17963938e-07
+3.18780562e-07
+7.32038094e-07
+3.34706292e-05
+0.000314069825
+0.000895668765
+0.0016285794
+0.00256062112
+0.00381403489
+0.00569137374
+0.00901125943
+0.0166528798
+0.0419880908
+0.0419910317
+0.0166511675
+0.00901071009
+0.00569111799
+0.00381389446
+0.00256055386
+0.00162857904
+0.000895730486
+0.000314160918
+3.34885256e-05
+7.31328244e-07
+3.18727344e-07
+3.17925017e-07
+3.18743986e-07
+7.33035622e-07
+3.35109399e-05
+0.000314203359
+0.000895749492
+0.00162862022
+0.00256063385
+0.00381403178
+0.00569136331
+0.00901125694
+0.016652939
+0.0419885965
+0.0419915225
+0.0166512116
+0.00901069537
+0.00569109654
+0.00381388188
+0.00256055916
+0.00162861473
+0.000895808229
+0.000314292763
+3.3528451e-05
+7.32313281e-07
+3.18690659e-07
+3.17886082e-07
+3.18707386e-07
+7.34027755e-07
+3.35509496e-05
+0.000314335346
+0.000895827303
+0.00162865601
+0.00256063939
+0.00381401963
+0.00569134262
+0.00901124379
+0.0166529878
+0.0419890886
+0.0419919992
+0.0166512457
+0.00901067021
+0.00569106497
+0.00381386035
+0.00256055733
+0.00162864542
+0.000895883058
+0.000314423039
+3.35680693e-05
+7.33292761e-07
+3.1865395e-07
+3.17847134e-07
+3.18670763e-07
+7.35014307e-07
+3.35906514e-05
+0.000314465764
+0.000895902203
+0.00162868681
+0.00256063779
+0.00381399854
+0.00569131183
+0.00901122023
+0.0166530267
+0.0419895666
+0.0419924616
+0.0166512699
+0.0090106349
+0.00569102348
+0.00381383001
+0.00256054843
+0.00162867114
+0.000895954978
+0.000314551727
+3.36073739e-05
+7.34266497e-07
+3.18617219e-07
+3.17808173e-07
+3.18634116e-07
+7.35995071e-07
+3.36300384e-05
+0.000314594591
+0.000895974197
+0.00162871266
+0.00256062913
+0.00381396863
+0.00569127111
+0.00901118651
+0.0166530557
+0.0419900304
+0.0419929092
+0.0166512847
+0.00901058971
+0.00569097228
+0.00381379097
+0.00256053256
+0.00162869196
+0.000896023993
+0.000314678802
+3.36463577e-05
+7.35234293e-07
+3.18580464e-07
+3.17769201e-07
+3.18597447e-07
+7.36969833e-07
+3.36691036e-05
+0.000314721806
+0.000896043284
+0.00162873358
+0.00256061348
+0.00381393002
+0.00569122065
+0.00901114288
+0.0166530753
+0.0419904796
+0.0419933419
+0.0166512904
+0.00901053495
+0.00569091159
+0.00381374341
+0.0025605098
+0.00162870792
+0.000896090113
+0.000314804248
+3.3685014e-05
+7.36195956e-07
+3.18543688e-07
+3.17730219e-07
+3.18560756e-07
+7.37938366e-07
+3.37078399e-05
+0.000314847388
+0.000896109474
+0.00162874964
+0.00256059095
+0.00381388287
+0.00569116071
+0.0090110897
+0.0166530857
+0.041990914
+0.0419937597
+0.0166512872
+0.00901047095
+0.00569084168
+0.00381368749
+0.00256048028
+0.00162871906
+0.000896153341
+0.000314928041
+3.37233356e-05
+7.37151288e-07
+3.1850689e-07
+3.17691227e-07
+3.18524039e-07
+7.38900399e-07
+3.37462394e-05
+0.00031497131
+0.000896172768
+0.00162876089
+0.00256056164
+0.00381382735
+0.00569109152
+0.00901102724
+0.0166530873
+0.0419913335
+0.041994162
+0.0166512755
+0.0090103981
+0.00569076284
+0.00381362342
+0.00256044412
+0.00162872547
+0.000896213694
+0.000315050163
+3.37613159e-05
+7.38100092e-07
+3.1847007e-07
+3.17652225e-07
+3.18487298e-07
+7.39855634e-07
+3.37842945e-05
+0.000315093555
+0.000896233179
+0.00162876738
+0.00256052567
+0.00381376366
+0.00569101338
+0.0090109559
+0.0166530803
+0.0419917378
+0.041994549
+0.0166512558
+0.00901031675
+0.00569067534
+0.00381355141
+0.00256040144
+0.0016287272
+0.00089627118
+0.00031517059
+3.37989475e-05
+7.39042163e-07
+3.18433228e-07
+3.17613215e-07
+3.18450529e-07
+7.40803653e-07
+3.3821996e-05
+0.000315214092
+0.000896290703
+0.00162876916
+0.00256048314
+0.00381369198
+0.00569092653
+0.00901087599
+0.0166530653
+0.041992127
+0.0419949205
+0.0166512285
+0.00901022736
+0.00569057957
+0.00381347172
+0.00256035242
+0.00162872435
+0.000896325828
+0.000315289311
+3.38362243e-05
+7.39977305e-07
+3.18396364e-07
+3.17574194e-07
+3.18413728e-07
+7.41743948e-07
+3.38593347e-05
+0.000315332901
+0.000896345356
+0.00162876633
+0.00256043423
+0.00381361255
+0.00569083132
+0.00901078794
+0.0166530424
+0.0419925011
+0.0419952765
+0.016651194
+0.00901013031
+0.00569047582
+0.00381338456
+0.0025602972
+0.00162871698
+0.000896377648
+0.000315406306
+3.38731389e-05
+7.40905313e-07
+3.18359478e-07
+3.17535166e-07
+3.18376886e-07
+7.42675678e-07
+3.38962976e-05
+0.000315449944
+0.000896397123
+0.00162875891
+0.00256037903
+0.00381352555
+0.00569072799
+0.00901069203
+0.0166530121
+0.04199286
+0.0419956169
+0.0166511528
+0.00901002617
+0.00569036458
+0.00381329029
+0.00256023602
+0.00162870524
+0.000896426697
+0.000315521572
+3.39096863e-05
+7.41825997e-07
+3.1832257e-07
+3.1749613e-07
+3.18339991e-07
+7.4359768e-07
+3.39328705e-05
+0.000315565192
+0.000896446014
+0.00162874698
+0.00256031769
+0.00381343123
+0.00569061691
+0.0090105887
+0.0166529747
+0.0419932043
+0.0419959414
+0.0166511054
+0.00900991534
+0.00569024616
+0.00381318918
+0.00256016905
+0.00162868921
+0.000896473
+0.000315635096
+3.39458601e-05
+7.42739159e-07
+3.18285639e-07
+3.17457085e-07
+3.18303018e-07
+7.44507878e-07
+3.39690295e-05
+0.000315678581
+0.000896491975
+0.00162873052
+0.00256025028
+0.00381332972
+0.00569049823
+0.0090104781
+0.0166529303
+0.041993534
+0.0419962501
+0.0166510527
+0.00900979856
+0.00569012119
+0.00381308166
+0.00256009662
+0.00162866912
+0.000896516674
+0.000315746898
+3.39816572e-05
+7.43644637e-07
+3.18248686e-07
+3.17418033e-07
+3.18265926e-07
+7.45403016e-07
+3.40047432e-05
+0.000315790047
+0.000896534989
+0.0016287096
+0.00256017692
+0.00381322122
+0.00569037224
+0.00901036054
+0.016652879
+0.04199385
+0.0419965422
+0.0166509951
+0.00900967635
+0.00568999011
+0.0038129681
+0.00256001896
+0.00162864511
+0.000896557794
+0.000315856992
+3.40170748e-05
+7.4454227e-07
+3.18211709e-07
+3.17378972e-07
+3.18228643e-07
+7.46277223e-07
+3.40399555e-05
+0.000315899452
+0.00089657489
+0.00162868406
+0.00256009748
+0.00381310561
+0.00569023882
+0.00901023575
+0.0166528202
+0.0419941534
+0.0419968169
+0.016650934
+0.00900954967
+0.00568985367
+0.00381284911
+0.00255993656
+0.00162861749
+0.000896596532
+0.00031596546
+3.40521177e-05
+7.45431983e-07
+3.18174709e-07
+3.17339903e-07
+3.18191041e-07
+7.47120542e-07
+3.40745787e-05
+0.000316006611
+0.000896611432
+0.00162865367
+0.00256001177
+0.00381298271
+0.0056900977
+0.00901010325
+0.016652753
+0.0419944463
+0.0419970731
+0.0166508688
+0.00900941874
+0.00568971235
+0.0038127252
+0.00255984984
+0.00162858655
+0.000896633085
+0.000316072341
+3.4086786e-05
+7.4631369e-07
+3.18137685e-07
+3.17300825e-07
+3.18152898e-07
+7.47914607e-07
+3.41084398e-05
+0.000316111085
+0.00089664406
+0.00162861773
+0.00255991894
+0.00381285139
+0.00568994714
+0.00900996021
+0.0166526724
+0.0419947325
+0.0419973089
+0.0166508019
+0.00900928476
+0.00568956672
+0.00381259668
+0.00255975906
+0.00162855271
+0.000896667906
+0.000316177743
+3.41210853e-05
+7.47187399e-07
+3.18100639e-07
+3.17261738e-07
+3.18113838e-07
+7.48627622e-07
+3.41412358e-05
+0.000316212136
+0.000896671869
+0.00162857476
+0.00255981662
+0.0038127083
+0.00568978258
+0.00900980013
+0.0166525687
+0.0419950215
+0.0419975216
+0.0166507327
+0.00900914571
+0.00568941491
+0.00381246186
+0.00255966297
+0.0016285151
+0.000896700522
+0.000316281853
+3.41550553e-05
+7.4805343e-07
+3.1806357e-07
+3.17222641e-07
+3.18073289e-07
+7.49207832e-07
+3.41724707e-05
+0.000316308469
+0.000896691936
+0.00162852004
+0.00255969742
+0.00381254173
+0.00568958549
+0.0090095922
+0.0166523905
+0.0419953325
+0.0419977126
+0.0166506557
+0.00900900019
+0.00568925688
+0.00381232086
+0.00255956104
+0.00162847246
+0.000896729492
+0.000316384275
+3.41886798e-05
+7.48912934e-07
+3.18026496e-07
+3.1718353e-07
+3.18030584e-07
+7.49584909e-07
+3.42014108e-05
+0.000316398767
+0.000896702882
+0.00162845285
+0.00255956027
+0.00381234582
+0.00568933241
+0.00900925793
+0.0166518875
+0.0419957943
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            mapped;
+        fieldName       epsilon.liquid;
+        setAverage      0;
+        average         0;
+        interpolationScheme cell;
+        value           nonuniform List<scalar>
+25
+(
+0.0419657345
+0.0166407085
+0.00900229636
+0.00568332742
+0.00380631734
+0.00255296286
+0.00162069785
+0.00088750996
+0.000305236521
+3.10656132e-05
+6.75110969e-07
+3.20612648e-07
+3.19935334e-07
+3.20625325e-07
+6.76481143e-07
+3.10844531e-05
+0.000305275709
+0.000887529772
+0.00162073462
+0.0025530318
+0.00380643624
+0.0056835423
+0.00900277951
+0.0166422775
+0.0419633128
+)
+;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.liquid;
+        inletValue      uniform 0.00015;
+        value           nonuniform List<scalar>
+25
+(
+0.0419977126
+0.0166506557
+0.00900900019
+0.00568925688
+0.00381232086
+0.00255956104
+0.00162847246
+0.000896729492
+0.000316384275
+3.41886798e-05
+7.48912934e-07
+3.18026496e-07
+3.1718353e-07
+3.18030584e-07
+7.49584909e-07
+3.42014108e-05
+0.000316398767
+0.000896702882
+0.00162845285
+0.00255956027
+0.00381234582
+0.00568933241
+0.00900925793
+0.0166518875
+0.0419957943
+)
+;
+    }
+    wall1
+    {
+        type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           nonuniform List<scalar>
+75
+(
+0.041965349
+0.0419654615
+0.0419655927
+0.041965735
+0.0419658909
+0.0419660627
+0.041966252
+0.0419664596
+0.0419666864
+0.0419669327
+0.0419671986
+0.0419674844
+0.04196779
+0.0419681151
+0.0419684596
+0.0419688232
+0.0419692054
+0.0419696061
+0.0419700245
+0.0419704604
+0.0419709132
+0.0419713823
+0.0419718673
+0.0419723673
+0.0419728818
+0.0419734101
+0.0419739515
+0.0419745052
+0.0419750703
+0.0419756458
+0.041976231
+0.0419768248
+0.0419774262
+0.0419780344
+0.0419786481
+0.0419792662
+0.041979888
+0.0419805122
+0.0419811378
+0.0419817638
+0.041982389
+0.0419830126
+0.0419836332
+0.0419842502
+0.0419848624
+0.0419854688
+0.0419860687
+0.0419866609
+0.0419872448
+0.0419878192
+0.0419883837
+0.0419889374
+0.0419894797
+0.0419900098
+0.0419905274
+0.0419910317
+0.0419915225
+0.0419919992
+0.0419924616
+0.0419929092
+0.0419933419
+0.0419937597
+0.041994162
+0.041994549
+0.0419949205
+0.0419952765
+0.0419956169
+0.0419959414
+0.0419962501
+0.0419965422
+0.0419968169
+0.0419970731
+0.0419973089
+0.0419975216
+0.0419977126
+)
+;
+    }
+    wall2
+    {
+        type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           nonuniform List<scalar>
+75
+(
+0.0419627924
+0.0419630659
+0.0419631668
+0.0419633108
+0.0419634652
+0.0419636361
+0.0419638245
+0.0419640315
+0.0419642575
+0.041964503
+0.0419647682
+0.0419650533
+0.0419653581
+0.0419656824
+0.0419660261
+0.0419663889
+0.0419667705
+0.0419671703
+0.0419675879
+0.0419680229
+0.041968475
+0.0419689435
+0.0419694276
+0.0419699269
+0.0419704407
+0.0419709684
+0.0419715092
+0.0419720623
+0.0419726268
+0.0419732019
+0.0419737866
+0.04197438
+0.0419749811
+0.0419755889
+0.0419762023
+0.0419768204
+0.041977442
+0.0419780662
+0.0419786917
+0.0419793177
+0.0419799431
+0.0419805667
+0.0419811878
+0.0419818051
+0.0419824178
+0.0419830247
+0.041983625
+0.0419842179
+0.0419848024
+0.0419853777
+0.041985943
+0.0419864976
+0.0419870409
+0.0419875722
+0.0419880908
+0.0419885965
+0.0419890886
+0.0419895666
+0.0419900304
+0.0419904796
+0.041990914
+0.0419913335
+0.0419917378
+0.041992127
+0.0419925011
+0.04199286
+0.0419932043
+0.041993534
+0.04199385
+0.0419941534
+0.0419944463
+0.0419947325
+0.0419950215
+0.0419953325
+0.0419957943
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.gas
new file mode 100644
index 0000000000..6096e76195
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.gas
@@ -0,0 +1,2119 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      k.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+0.00462107176
+0.00438626956
+0.00374943197
+0.00318948512
+0.00265007788
+0.00210873544
+0.00155763819
+0.000999380105
+0.000437422609
+6.18234795e-05
+2.45480096e-06
+1.53774747e-06
+1.53559851e-06
+1.53778282e-06
+2.4581472e-06
+6.18671529e-05
+0.000437499661
+0.000999424453
+0.00155767824
+0.00210877998
+0.00265012989
+0.00318954586
+0.00374950396
+0.00438633354
+0.004571605
+0.00462108001
+0.0043862956
+0.00374948253
+0.00318956223
+0.00265018444
+0.00210887482
+0.00155781334
+0.000999587425
+0.000437662772
+6.19068601e-05
+2.45723454e-06
+1.5376735e-06
+1.53551808e-06
+1.53770914e-06
+2.4605873e-06
+6.19502584e-05
+0.00043773639
+0.000999623379
+0.0015578403
+0.00210890166
+0.00265021434
+0.00318959656
+0.00374952379
+0.0043863214
+0.00457170683
+0.00462108965
+0.00438632821
+0.00374954243
+0.00318965211
+0.00265030808
+0.00210903651
+0.00155801683
+0.000999829141
+0.000437941745
+6.20049219e-05
+2.46011586e-06
+1.53758609e-06
+1.53542303e-06
+1.53762176e-06
+2.46346801e-06
+6.20483039e-05
+0.00043801521
+0.000999864844
+0.00155804345
+0.00210906293
+0.00265033751
+0.00318968594
+0.00374958321
+0.00438635348
+0.00457159572
+0.00462110009
+0.00438636537
+0.00374960694
+0.00318974621
+0.00265043536
+0.00210920102
+0.00155822206
+0.0010000713
+0.000438218602
+6.21029206e-05
+2.46300935e-06
+1.53749845e-06
+1.53532771e-06
+1.53753422e-06
+2.46636941e-06
+6.21463629e-05
+0.000438292085
+0.00100010701
+0.00155824872
+0.00210922749
+0.00265046484
+0.00318978013
+0.0037496478
+0.00438639067
+0.00457150893
+0.00462111154
+0.00438640674
+0.00374967579
+0.00318984435
+0.00265056602
+0.00210936803
+0.00155842858
+0.00100031305
+0.000438492824
+6.22006216e-05
+2.46590791e-06
+1.53741078e-06
+1.53523232e-06
+1.5374467e-06
+2.46927999e-06
+6.22441621e-05
+0.000438566369
+0.00100034879
+0.00155845526
+0.00210939454
+0.00265059555
+0.00318987831
+0.00374971672
+0.0043864321
+0.00457141936
+0.00462112415
+0.00438645207
+0.00374974884
+0.00318994642
+0.00265070008
+0.0021095376
+0.00155863647
+0.00100055435
+0.000438764767
+6.22981095e-05
+2.46881189e-06
+1.53732297e-06
+1.53513679e-06
+1.53735907e-06
+2.47219822e-06
+6.23417743e-05
+0.000438838407
+0.00100059012
+0.00155866319
+0.00210956414
+0.00265072965
+0.00318998044
+0.00374978983
+0.00438647745
+0.00457133101
+0.00462113804
+0.0043865011
+0.00374982588
+0.00319005232
+0.00265083745
+0.00210970966
+0.00155884566
+0.00100079504
+0.000439034672
+6.23954306e-05
+2.4717231e-06
+1.53723499e-06
+1.53504106e-06
+1.53727129e-06
+2.47512513e-06
+6.24392387e-05
+0.00043910843
+0.00100083085
+0.00155887241
+0.00210973624
+0.00265086704
+0.00319008636
+0.00374986692
+0.00438652648
+0.00457124337
+0.00462115329
+0.00438655354
+0.00374990668
+0.00319016182
+0.00265097793
+0.00210988405
+0.00155905592
+0.00100103485
+0.000439302607
+6.24925733e-05
+2.47464064e-06
+1.53714686e-06
+1.53494514e-06
+1.53718335e-06
+2.47805939e-06
+6.25365405e-05
+0.000439376502
+0.00100107071
+0.0015590827
+0.00210991065
+0.00265100756
+0.00319019589
+0.00374994777
+0.00438657893
+0.00457115655
+0.00462116993
+0.00438660917
+0.00374999099
+0.00319027469
+0.00265112131
+0.00211006048
+0.00155926693
+0.00100127348
+0.000439568528
+6.25894886e-05
+2.47756254e-06
+1.5370586e-06
+1.53484906e-06
+1.53709528e-06
+2.4809987e-06
+6.26336275e-05
+0.000439642576
+0.00100130938
+0.00155929373
+0.00211008711
+0.00265115096
+0.00319030879
+0.00375003211
+0.00438663457
+0.00457107059
+0.00462118802
+0.00438666776
+0.00375007858
+0.00319039071
+0.00265126735
+0.0021102387
+0.00155947834
+0.00100151059
+0.000439832365
+6.26861197e-05
+2.48048655e-06
+1.53697026e-06
+1.53475288e-06
+1.53700714e-06
+2.48394065e-06
+6.27304413e-05
+0.000439906582
+0.00100154653
+0.00155950518
+0.00211026536
+0.00265129702
+0.00319042483
+0.00375011974
+0.00438669316
+0.00457098553
+0.00462120754
+0.00438672912
+0.00375016926
+0.00319050969
+0.00265141584
+0.00211041845
+0.00155968988
+0.00100174593
+0.000440094076
+6.27824226e-05
+2.48341087e-06
+1.53688187e-06
+1.53465664e-06
+1.53691897e-06
+2.48688328e-06
+6.28269358e-05
+0.000440168473
+0.00100178192
+0.00155971674
+0.00211044513
+0.00265144551
+0.00319054382
+0.00375021044
+0.00438675452
+0.00457090136
+0.00462122852
+0.00438679308
+0.00375026281
+0.00319063142
+0.00265156656
+0.0021105995
+0.00155990126
+0.00100197933
+0.000440353661
+6.28783702e-05
+2.4863342e-06
+1.53679345e-06
+1.53456036e-06
+1.53683076e-06
+2.4898252e-06
+6.29230829e-05
+0.00044042825
+0.00100201535
+0.00155992814
+0.0021106262
+0.00265159625
+0.00319066556
+0.00375030403
+0.00438681847
+0.0045708181
+0.00462125095
+0.00438685945
+0.00375035909
+0.00319075572
+0.00265171932
+0.00211078162
+0.00156011224
+0.00100221061
+0.000440611151
+6.29739509e-05
+2.48925575e-06
+1.53670501e-06
+1.53446405e-06
+1.53674253e-06
+2.49276555e-06
+6.30188696e-05
+0.000440685942
+0.00100224668
+0.00156013915
+0.00211080833
+0.00265174902
+0.00319078989
+0.00375040033
+0.00438688484
+0.00457073574
+0.00462127482
+0.00438692807
+0.0037504579
+0.00319088242
+0.00265187393
+0.0021109646
+0.00156032262
+0.00100243968
+0.000440866594
+6.30691617e-05
+2.49217503e-06
+1.53661655e-06
+1.53436771e-06
+1.53665428e-06
+2.4957038e-06
+6.3114292e-05
+0.000440941595
+0.0010024758
+0.00156034955
+0.00211099134
+0.00265190365
+0.00319091659
+0.00375049916
+0.00438695346
+0.00457065426
+0.00462130011
+0.00438699878
+0.00375055905
+0.00319101132
+0.00265203018
+0.00211114821
+0.00156053218
+0.00100266646
+0.000441120041
+6.31640039e-05
+2.4950917e-06
+1.53652806e-06
+1.53427134e-06
+1.53656601e-06
+2.49863954e-06
+6.32093505e-05
+0.000441195261
+0.00100270261
+0.00156055913
+0.00211117497
+0.00265205991
+0.0031910455
+0.00375060034
+0.00438702417
+0.00457057363
+0.0046213268
+0.00438707142
+0.00375066235
+0.00319114221
+0.00265218785
+0.00211133223
+0.00156074072
+0.00100289086
+0.00044137154
+6.32584791e-05
+2.49800549e-06
+1.53643954e-06
+1.53417494e-06
+1.53647771e-06
+2.5015725e-06
+6.33040458e-05
+0.000441446985
+0.00100292707
+0.00156076771
+0.00211135901
+0.00265221759
+0.00319117641
+0.00375070367
+0.0043870968
+0.00457049385
+0.00462135486
+0.00438714581
+0.00375076761
+0.00319127489
+0.0026523467
+0.00211151641
+0.00156094805
+0.00100311283
+0.000441621128
+6.33525874e-05
+2.50091609e-06
+1.536351e-06
+1.53407851e-06
+1.53638938e-06
+2.50450232e-06
+6.33983772e-05
+0.000441696804
+0.00100314908
+0.00156097505
+0.00211154322
+0.00265237647
+0.0031913091
+0.00375080895
+0.00438717119
+0.00457041488
+0.00462138427
+0.00438722179
+0.00375087463
+0.00319140912
+0.00265250651
+0.00211170052
+0.00156115396
+0.00100333229
+0.000441868834
+6.34463271e-05
+2.50382316e-06
+1.53626241e-06
+1.53398204e-06
+1.53630102e-06
+2.50742865e-06
+6.34923425e-05
+0.000441944747
+0.00100336859
+0.00156118099
+0.00211172736
+0.00265253629
+0.00319144334
+0.00375091601
+0.00438724717
+0.00457033668
+0.00462141498
+0.00438729918
+0.0037509832
+0.00319154468
+0.00265266702
+0.00211188432
+0.00156135826
+0.00100354921
+0.000442114683
+6.35396952e-05
+2.50672636e-06
+1.5361738e-06
+1.53388553e-06
+1.53621262e-06
+2.51035112e-06
+6.35859378e-05
+0.000442190839
+0.00100358555
+0.00156138533
+0.00211191118
+0.00265269683
+0.00319157892
+0.00375102461
+0.00438732456
+0.00457025921
+0.00462144698
+0.00438737782
+0.0037510931
+0.00319168132
+0.00265282797
+0.00211206753
+0.00156156079
+0.00100376352
+0.000442358695
+6.36326876e-05
+2.50962531e-06
+1.53608515e-06
+1.533789e-06
+1.5361242e-06
+2.51326935e-06
+6.36791586e-05
+0.000442435094
+0.00100379992
+0.00156158789
+0.00211209443
+0.0026528578
+0.00319171559
+0.00375113454
+0.0043874032
+0.00457018245
+0.00462148022
+0.00438745752
+0.00375120411
+0.0031918188
+0.00265298911
+0.00211224995
+0.00156176137
+0.0010039752
+0.000442600882
+6.37253e-05
+2.51251967e-06
+1.53599648e-06
+1.53369245e-06
+1.53603575e-06
+2.51618297e-06
+6.37720002e-05
+0.00044267753
+0.00100401165
+0.0015617885
+0.00211227688
+0.00265301898
+0.0031918531
+0.00375124558
+0.00438748291
+0.00457010636
+0.00462151466
+0.00438753811
+0.00375131601
+0.00319195687
+0.00265315019
+0.00211243133
+0.00156195983
+0.00100418421
+0.000442841262
+6.38175288e-05
+2.51540911e-06
+1.53590779e-06
+1.53359587e-06
+1.53594727e-06
+2.51909162e-06
+6.38644584e-05
+0.000442918161
+0.0010042207
+0.00156198701
+0.00211245829
+0.00265318009
+0.0031919912
+0.00375135753
+0.00438756352
+0.00457003089
+0.00462155026
+0.00438761943
+0.00375142857
+0.00319209528
+0.00265331094
+0.00211261143
+0.00156215603
+0.00100439052
+0.000443079849
+6.39093706e-05
+2.51829332e-06
+1.53581907e-06
+1.53349928e-06
+1.53585877e-06
+2.52199503e-06
+6.39565293e-05
+0.000443157002
+0.00100442707
+0.00156218324
+0.00211263844
+0.00265334088
+0.00319212964
+0.00375147012
+0.00438764485
+0.00456995598
+0.00462158696
+0.00438770128
+0.00375154154
+0.00319223376
+0.0026534711
+0.00211279004
+0.00156234985
+0.00100459413
+0.000443316663
+6.40008232e-05
+2.52117207e-06
+1.53573032e-06
+1.53340267e-06
+1.53577025e-06
+2.52489292e-06
+6.40482105e-05
+0.00044339407
+0.00100463074
+0.00156237711
+0.0021128171
+0.00265350108
+0.00319226816
+0.00375158316
+0.00438772672
+0.0045698816
+0.00462162473
+0.00438778348
+0.00375165471
+0.00319237205
+0.00265363043
+0.00211296695
+0.00156254115
+0.00100479502
+0.000443551719
+6.40918853e-05
+2.52404515e-06
+1.53564155e-06
+1.53330604e-06
+1.5356817e-06
+2.52778509e-06
+6.41395005e-05
+0.000443629383
+0.00100483169
+0.00156256845
+0.00211299406
+0.00265366047
+0.00319240651
+0.00375169638
+0.00438780894
+0.00456980769
+0.00462166351
+0.00438786584
+0.00375176783
+0.00319250991
+0.00265378867
+0.00211314195
+0.00156272982
+0.0010049932
+0.000443785039
+6.41825566e-05
+2.52691238e-06
+1.53555275e-06
+1.53320939e-06
+1.53559314e-06
+2.53067136e-06
+6.42303984e-05
+0.000443862959
+0.00100502994
+0.00156275717
+0.00211316911
+0.00265381876
+0.00319254442
+0.00375180956
+0.00438789133
+0.00456973421
+0.00462170325
+0.00438794816
+0.00375188065
+0.00319264705
+0.00265394557
+0.00211331485
+0.00156291577
+0.00100518866
+0.000444016642
+6.42728372e-05
+2.52977363e-06
+1.53546393e-06
+1.53311273e-06
+1.53550454e-06
+2.53355156e-06
+6.43209045e-05
+0.000444094819
+0.00100522546
+0.00156294316
+0.00211334206
+0.00265397573
+0.00319268163
+0.00375192245
+0.00438797369
+0.00456966109
+0.0046217439
+0.00438803027
+0.00375199293
+0.00319278324
+0.0026541009
+0.00211348545
+0.00156309887
+0.00100538142
+0.000444246546
+6.43627279e-05
+2.53262878e-06
+1.53537508e-06
+1.53301604e-06
+1.53541591e-06
+2.53642561e-06
+6.44110191e-05
+0.000444324981
+0.00100541829
+0.00156312632
+0.00211351273
+0.00265413112
+0.00319281789
+0.0037520348
+0.00438805584
+0.00456958827
+0.00462178538
+0.00438811198
+0.00375210442
+0.00319291819
+0.0026542544
+0.00211365358
+0.00156327907
+0.00100557148
+0.000444474772
+6.44522291e-05
+2.53547771e-06
+1.53528619e-06
+1.53291933e-06
+1.53532726e-06
+2.53929338e-06
+6.45007426e-05
+0.000444553464
+0.00100560842
+0.00156330656
+0.00211368091
+0.00265428469
+0.00319295291
+0.00375214637
+0.00438813758
+0.00456951568
+0.00462182763
+0.00438819305
+0.00375221485
+0.00319305164
+0.00265440584
+0.00211381904
+0.00156345627
+0.00100575885
+0.000444701335
+6.45413412e-05
+2.53832032e-06
+1.53519727e-06
+1.5328226e-06
+1.53523855e-06
+2.54215475e-06
+6.45900751e-05
+0.000444780283
+0.00100579585
+0.00156348381
+0.00211384644
+0.0026544362
+0.00319308644
+0.0037522569
+0.00438821871
+0.00456944326
+0.00462187058
+0.00438827331
+0.00375232399
+0.00319318333
+0.00265455497
+0.00211398169
+0.00156363038
+0.00100594354
+0.000444926246
+6.46300633e-05
+2.54115648e-06
+1.53510831e-06
+1.53272584e-06
+1.53514982e-06
+2.54500959e-06
+6.46790159e-05
+0.000445005452
+0.00100598061
+0.00156365797
+0.00211400916
+0.00265458542
+0.00319321822
+0.00375236614
+0.00438829903
+0.00456937094
+0.00462191417
+0.00438835255
+0.00375243159
+0.003193313
+0.00265470159
+0.00211414133
+0.00156380133
+0.00100612554
+0.000445149516
+6.4718394e-05
+2.54398602e-06
+1.53501931e-06
+1.53262904e-06
+1.53506105e-06
+2.54785775e-06
+6.47675633e-05
+0.000445228977
+0.00100616269
+0.00156382898
+0.00211416887
+0.00265473211
+0.00319334797
+0.00375247382
+0.00438837834
+0.00456929863
+0.00462195831
+0.00438843057
+0.00375253736
+0.00319344038
+0.00265484542
+0.00211429782
+0.00156396905
+0.00100630488
+0.00044537115
+6.48063303e-05
+2.54680876e-06
+1.53493026e-06
+1.53253222e-06
+1.53497223e-06
+2.55069903e-06
+6.48557141e-05
+0.000445450864
+0.00100634211
+0.00156399678
+0.00211432543
+0.00265487605
+0.00319347545
+0.0037525797
+0.00438845643
+0.00456922628
+0.00462200296
+0.00438850718
+0.00375264109
+0.00319356521
+0.00265498628
+0.00211445099
+0.00156413348
+0.00100648155
+0.000445591147
+6.4893868e-05
+2.54962448e-06
+1.53484118e-06
+1.53243536e-06
+1.53488337e-06
+2.55353322e-06
+6.49434643e-05
+0.000445671115
+0.00100651885
+0.00156416126
+0.00211447869
+0.002655017
+0.00319360039
+0.00375268354
+0.00438853312
+0.00456915381
+0.004622048
+0.00438858217
+0.00375274251
+0.00319368726
+0.00265512395
+0.0021146007
+0.00156429455
+0.00100665555
+0.000445809507
+6.49810023e-05
+2.55243292e-06
+1.53475205e-06
+1.53233848e-06
+1.53479447e-06
+2.55636004e-06
+6.50308089e-05
+0.000445889726
+0.00100669293
+0.00156432238
+0.00211462848
+0.00265515476
+0.00319372255
+0.00375278509
+0.0043886082
+0.00456908111
+0.00462209338
+0.00438865537
+0.00375284139
+0.00319380627
+0.00265525819
+0.00211474681
+0.00156445217
+0.00100682688
+0.000446026224
+6.50677272e-05
+2.55523381e-06
+1.53466288e-06
+1.53224157e-06
+1.53470554e-06
+2.55917925e-06
+6.51177418e-05
+0.000446106691
+0.00100686433
+0.00156448008
+0.00211477467
+0.00265528912
+0.00319384168
+0.00375288411
+0.00438868149
+0.00456900814
+0.00462213902
+0.0043887266
+0.00375293752
+0.00319392202
+0.00265538884
+0.00211488918
+0.00156460631
+0.00100699554
+0.000446241292
+6.51540365e-05
+2.55802687e-06
+1.53457368e-06
+1.53214464e-06
+1.53461656e-06
+2.56199055e-06
+6.52042569e-05
+0.000446322006
+0.00100703308
+0.00156463429
+0.00211491714
+0.00265541987
+0.00319395755
+0.00375298038
+0.00438875281
+0.00456893479
+0.00462218483
+0.00438879568
+0.00375303067
+0.00319403428
+0.0026555157
+0.00211502768
+0.00156475693
+0.00100716153
+0.000446454703
+6.52399238e-05
+2.5608118e-06
+1.53448444e-06
+1.53204769e-06
+1.53452755e-06
+2.56479365e-06
+6.52903477e-05
+0.000446535662
+0.00100719916
+0.00156478497
+0.00211505572
+0.00265554683
+0.00319406993
+0.00375307366
+0.004388822
+0.00456886101
+0.00462223076
+0.00438886245
+0.00375312064
+0.00319414284
+0.00265563858
+0.00211516221
+0.00156490395
+0.00100732485
+0.00044666645
+6.53253831e-05
+2.56358836e-06
+1.53439517e-06
+1.53195072e-06
+1.53443851e-06
+2.56758829e-06
+6.53760081e-05
+0.000446747653
+0.00100736256
+0.00156493206
+0.00211519034
+0.00265566983
+0.00319417863
+0.00375316377
+0.00438888889
+0.00456878668
+0.0046222767
+0.00438892678
+0.00375320722
+0.0031942475
+0.00265575732
+0.00211529264
+0.00156504734
+0.0010074855
+0.000446876528
+6.54104089e-05
+2.56635625e-06
+1.53430586e-06
+1.53185374e-06
+1.53434943e-06
+2.57037419e-06
+6.54612326e-05
+0.000446957972
+0.0010075233
+0.00156507553
+0.00211532087
+0.00265578869
+0.00319428344
+0.00375325051
+0.00438895333
+0.00456871176
+0.0046223226
+0.0043889885
+0.00375329026
+0.0031943481
+0.00265587177
+0.00211541889
+0.00156518707
+0.00100764349
+0.000447084931
+6.54949959e-05
+2.56911525e-06
+1.53421652e-06
+1.53175675e-06
+1.53426032e-06
+2.57315113e-06
+6.55460161e-05
+0.000447166613
+0.00100768137
+0.00156521533
+0.00211544721
+0.00265590328
+0.00319438418
+0.00375333371
+0.00438901519
+0.00456863615
+0.00462236836
+0.00438904751
+0.00375336958
+0.00319444445
+0.00265598179
+0.00211554086
+0.0015653231
+0.00100779882
+0.000447291654
+6.55791401e-05
+2.57186515e-06
+1.53412714e-06
+1.53165973e-06
+1.53417117e-06
+2.5759189e-06
+6.56303543e-05
+0.000447373573
+0.00100783679
+0.00156535143
+0.00211556929
+0.00265601343
+0.00319448067
+0.00375341319
+0.00438907433
+0.00456855977
+0.00462241392
+0.00438910369
+0.00375344503
+0.0031945364
+0.00265608726
+0.00211565848
+0.00156545542
+0.00100795149
+0.000447496695
+6.56628376e-05
+2.57460575e-06
+1.53403773e-06
+1.53156269e-06
+1.53408199e-06
+2.57867729e-06
+6.57142435e-05
+0.000447578847
+0.00100798954
+0.00156548382
+0.00211568701
+0.00265611902
+0.00319457278
+0.00375348881
+0.00438913064
+0.00456848255
+0.00462245921
+0.00438915693
+0.00375351647
+0.00319462381
+0.00265618805
+0.00211577168
+0.00156558399
+0.0010081015
+0.000447700049
+6.57460851e-05
+2.57733689e-06
+1.53394827e-06
+1.53146564e-06
+1.53399278e-06
+2.58142613e-06
+6.57976802e-05
+0.000447782433
+0.00100813964
+0.00156561246
+0.00211580031
+0.00265621994
+0.00319466035
+0.00375356042
+0.00438918403
+0.00456840441
+0.00462250414
+0.00438920715
+0.00375358377
+0.00319470655
+0.00265628406
+0.00211588039
+0.00156570878
+0.00100824887
+0.000447901713
+6.58288792e-05
+2.58005837e-06
+1.53385878e-06
+1.53136855e-06
+1.53390351e-06
+2.58416526e-06
+6.58806613e-05
+0.000447984325
+0.00100828711
+0.00156573735
+0.00211590912
+0.00265631609
+0.00319474324
+0.00375362791
+0.00438923438
+0.00456832528
+0.00462254865
+0.00438925425
+0.00375364685
+0.0031947845
+0.00265637519
+0.00211598456
+0.00156582981
+0.0010083936
+0.000448101685
+6.59112166e-05
+2.58277004e-06
+1.53376923e-06
+1.53127144e-06
+1.53381419e-06
+2.58689451e-06
+6.59631836e-05
+0.000448184523
+0.00100843193
+0.00156585845
+0.00211601339
+0.00265640737
+0.00319482136
+0.00375369116
+0.00438928164
+0.00456824507
+0.00462259268
+0.00438929819
+0.00375370559
+0.00319485757
+0.00265646137
+0.00211608413
+0.00156594704
+0.00100853568
+0.000448299955
+6.59930934e-05
+2.5854717e-06
+1.53367962e-06
+1.5311743e-06
+1.53372482e-06
+2.58961369e-06
+6.60452429e-05
+0.000448383018
+0.00100857411
+0.00156597576
+0.00211611307
+0.00265649368
+0.00319489459
+0.00375375008
+0.00438932571
+0.00456816372
+0.00462263615
+0.00438933888
+0.0037537599
+0.00319492566
+0.00265654251
+0.00211617906
+0.00156606046
+0.00100867513
+0.000448496517
+6.60745052e-05
+2.58816315e-06
+1.53358997e-06
+1.53107712e-06
+1.5336354e-06
+2.59232259e-06
+6.6126835e-05
+0.000448579801
+0.00100871366
+0.00156608928
+0.00211620811
+0.00265657496
+0.00319496285
+0.00375380459
+0.00438936657
+0.00456808117
+0.004622679
+0.0043893763
+0.00375380974
+0.0031949887
+0.00265661856
+0.00211626933
+0.00156617008
+0.00100881194
+0.000448691359
+6.61554465e-05
+2.59084417e-06
+1.53350025e-06
+1.5309799e-06
+1.53354591e-06
+2.59502098e-06
+6.62079546e-05
+0.000448774862
+0.00100885056
+0.00156619897
+0.00211629849
+0.00265665115
+0.00319502606
+0.00375385462
+0.00438940414
+0.00456799734
+0.00462272117
+0.0043894104
+0.00375385504
+0.00319504663
+0.00265668946
+0.00211635489
+0.00156627586
+0.0010089461
+0.000448884467
+6.62359109e-05
+2.59351448e-06
+1.53341046e-06
+1.53088265e-06
+1.53345636e-06
+2.59770861e-06
+6.62885951e-05
+0.000448968188
+0.00100898483
+0.00156630484
+0.00211638417
+0.0026567222
+0.00319508416
+0.00375390011
+0.0043894384
+0.00456791218
+0.0046227626
+0.00438944117
+0.00375389576
+0.00319509939
+0.00265675517
+0.00211643573
+0.00156637782
+0.00100907763
+0.000449075826
+6.63158911e-05
+2.59617379e-06
+1.53332061e-06
+1.53078534e-06
+1.53336675e-06
+2.60038518e-06
+6.63687492e-05
+0.00044915976
+0.00100911645
+0.00156640688
+0.00211646512
+0.00265678805
+0.00319513709
+0.00375394102
+0.00438946934
+0.00456782561
+0.00462280324
+0.0043894686
+0.00375393187
+0.00319514696
+0.00265681565
+0.00211651182
+0.00156647595
+0.0010092065
+0.000449265414
+6.63953783e-05
+2.59882177e-06
+1.53323069e-06
+1.53068799e-06
+1.53327705e-06
+2.60305036e-06
+6.64484084e-05
+0.000449349561
+0.00100924542
+0.0015665051
+0.00211654133
+0.00265684868
+0.00319518484
+0.00375397733
+0.00438949693
+0.00456773759
+0.00462284305
+0.00438949269
+0.00375396337
+0.00319518931
+0.00265687089
+0.00211658316
+0.00156657023
+0.0010093327
+0.000449453211
+6.64743634e-05
+2.60145804e-06
+1.53314069e-06
+1.53059059e-06
+1.53318729e-06
+2.60570377e-06
+6.65275634e-05
+0.000449537568
+0.00100937173
+0.00156659948
+0.00211661277
+0.00265690407
+0.00319522737
+0.00375400903
+0.00438952119
+0.00456764807
+0.00462288195
+0.00438951346
+0.00375399026
+0.00319522643
+0.00265692087
+0.00211664973
+0.00156666068
+0.00100945626
+0.000449639192
+6.65528358e-05
+2.60408222e-06
+1.53305063e-06
+1.53049314e-06
+1.53309747e-06
+2.60834502e-06
+6.66062038e-05
+0.000449723757
+0.00100949538
+0.00156669002
+0.00211667946
+0.0026569542
+0.00319526466
+0.00375403612
+0.00438954212
+0.004567557
+0.00462291994
+0.00438953092
+0.00375401257
+0.00319525832
+0.0026569656
+0.00211671155
+0.00156674729
+0.00100957713
+0.000449823331
+6.66307844e-05
+2.60669388e-06
+1.53296049e-06
+1.53039567e-06
+1.53300757e-06
+2.61097369e-06
+6.66843184e-05
+0.000449908102
+0.00100961636
+0.00156677672
+0.0021167414
+0.00265699908
+0.00319529673
+0.00375405861
+0.00438955975
+0.00456746432
+0.00462295696
+0.00438954511
+0.00375403029
+0.00319528501
+0.00265700508
+0.00211676862
+0.00156683007
+0.00100969532
+0.000450005602
+6.67081975e-05
+2.60929257e-06
+1.53287028e-06
+1.53029814e-06
+1.5329176e-06
+2.61358932e-06
+6.67618956e-05
+0.000450090576
+0.00100973466
+0.0015668596
+0.00211679858
+0.00265703871
+0.0031953236
+0.00375407654
+0.00438957411
+0.00456737001
+0.00462299298
+0.00438955608
+0.0037540435
+0.00319530653
+0.00265703935
+0.00211682095
+0.00156690903
+0.00100981081
+0.000450185977
+6.67850631e-05
+2.61187783e-06
+1.53278e-06
+1.53020057e-06
+1.53282755e-06
+2.61619145e-06
+6.68389233e-05
+0.000450271152
+0.00100985026
+0.00156693864
+0.00211685103
+0.00265707312
+0.00319534529
+0.00375408995
+0.00438958525
+0.00456727403
+0.00462302796
+0.00438956389
+0.00375405225
+0.00319532292
+0.00265706842
+0.00211686858
+0.00156698417
+0.00100992362
+0.000450364427
+6.68613684e-05
+2.61444918e-06
+1.53268966e-06
+1.53010296e-06
+1.53273744e-06
+2.61877959e-06
+6.69153887e-05
+0.0004504498
+0.00100996316
+0.00156701389
+0.00211689876
+0.00265710234
+0.00319536186
+0.00375409889
+0.00438959323
+0.00456717633
+0.0046230619
+0.00438956861
+0.0037540566
+0.00319533424
+0.00265709235
+0.00211691151
+0.00156705552
+0.00101003371
+0.000450540925
+6.69371009e-05
+2.61700614e-06
+1.53259924e-06
+1.53000531e-06
+1.53264725e-06
+2.62135322e-06
+6.69912791e-05
+0.000450626493
+0.00101007336
+0.00156708532
+0.00211694181
+0.00265712641
+0.00319537335
+0.00375410344
+0.00438959811
+0.0045670769
+0.00462309476
+0.0043895703
+0.00375405664
+0.00319534056
+0.00265711119
+0.00211694981
+0.00156712307
+0.00101014109
+0.000450715439
+6.70122474e-05
+2.61954819e-06
+1.53250875e-06
+1.52990764e-06
+1.53255701e-06
+2.62391178e-06
+6.70665812e-05
+0.0004508012
+0.00101018084
+0.00156715298
+0.00211698022
+0.00265714539
+0.00319537985
+0.00375410367
+0.00438959997
+0.00456697572
+0.00462312652
+0.00438956905
+0.00375405246
+0.00319534197
+0.00265712499
+0.00211698349
+0.00156718688
+0.00101024575
+0.000450887943
+6.70867953e-05
+2.62207484e-06
+1.5324182e-06
+1.52980993e-06
+1.53246668e-06
+2.62645472e-06
+6.71412815e-05
+0.000450973892
+0.00101028561
+0.00156721687
+0.00211701402
+0.00265715934
+0.00319538142
+0.00375409968
+0.00438959889
+0.00456687276
+0.00462315717
+0.00438956496
+0.00375404417
+0.00319533856
+0.00265713384
+0.00211701264
+0.00156724695
+0.00101034768
+0.000451058408
+6.71607309e-05
+2.62458558e-06
+1.53232758e-06
+1.52971219e-06
+1.53237629e-06
+2.62898139e-06
+6.72153662e-05
+0.000451144538
+0.00101038765
+0.00156727702
+0.00211704327
+0.00265716832
+0.00319537816
+0.00375409157
+0.00438959495
+0.00456676801
+0.0046231867
+0.0043895581
+0.00375403186
+0.00319533043
+0.00265713784
+0.00211703729
+0.00156730331
+0.00101044691
+0.000451226809
+6.72340419e-05
+2.62707988e-06
+1.53223688e-06
+1.52961442e-06
+1.53228582e-06
+2.63149106e-06
+6.7288821e-05
+0.000451313111
+0.00101048696
+0.00156733347
+0.00211706802
+0.00265717244
+0.00319537019
+0.00375407944
+0.00438958826
+0.00456666147
+0.00462321511
+0.0043895486
+0.00375401568
+0.00319531768
+0.00265713704
+0.00211705753
+0.00156735601
+0.00101054341
+0.000451393115
+6.73067146e-05
+2.62955722e-06
+1.53214613e-06
+1.52951662e-06
+1.53219526e-06
+2.63398279e-06
+6.73616297e-05
+0.000451479574
+0.00101058353
+0.00156738622
+0.00211708833
+0.00265717176
+0.00319535758
+0.00375406341
+0.00438957891
+0.00456655311
+0.00462324237
+0.00438953657
+0.00375399575
+0.00319530047
+0.0026571316
+0.00211707342
+0.00156740509
+0.0010106372
+0.00045155731
+6.73787373e-05
+2.63201711e-06
+1.5320553e-06
+1.52941879e-06
+1.53210462e-06
+2.63645548e-06
+6.74337764e-05
+0.000451643899
+0.00101067736
+0.00156743533
+0.00211710427
+0.00265716638
+0.00319534049
+0.00375404363
+0.00438956701
+0.00456644295
+0.0046232685
+0.00438952211
+0.0037539722
+0.00319527892
+0.00265712159
+0.00211708504
+0.00156745057
+0.00101072827
+0.000451719365
+6.74500964e-05
+2.634459e-06
+1.5319644e-06
+1.52932094e-06
+1.53201385e-06
+2.63890733e-06
+6.75052393e-05
+0.000451806041
+0.00101076844
+0.0015674808
+0.00211711589
+0.00265715641
+0.003195319
+0.0037540202
+0.00438955266
+0.00456633098
+0.00462329349
+0.00438950535
+0.00375394522
+0.00319525319
+0.00265710717
+0.00211709252
+0.00156749256
+0.00101081668
+0.000451879276
+6.75207822e-05
+2.6368824e-06
+1.53187344e-06
+1.52922305e-06
+1.53192293e-06
+2.64133595e-06
+6.75759959e-05
+0.000451965967
+0.00101085675
+0.00156752267
+0.00211712328
+0.00265714194
+0.00319529327
+0.00375399326
+0.00438953598
+0.00456621724
+0.0046233173
+0.00438948642
+0.00375391494
+0.00319522343
+0.00265708847
+0.00211709594
+0.00156753109
+0.00101090242
+0.000452037023
+6.75907827e-05
+2.63928683e-06
+1.5317824e-06
+1.52912515e-06
+1.5318318e-06
+2.64373713e-06
+6.76460092e-05
+0.000452123601
+0.00101094225
+0.00156756094
+0.00211712646
+0.00265712307
+0.00319526339
+0.00375396293
+0.00438951708
+0.00456610174
+0.00462333996
+0.00438946548
+0.00375388157
+0.00319518986
+0.0026570657
+0.00211709547
+0.00156756631
+0.00101098561
+0.000452192634
+6.76600927e-05
+2.64167182e-06
+1.53169129e-06
+1.52902722e-06
+1.53174034e-06
+2.64610438e-06
+6.77152332e-05
+0.000452278882
+0.00101102492
+0.00156759564
+0.00211712551
+0.00265709987
+0.00319522949
+0.00375392935
+0.00438949604
+0.00456598455
+0.00462336139
+0.00438944267
+0.00375384528
+0.00319515267
+0.002657039
+0.00211709127
+0.00156759832
+0.00101106628
+0.000452346123
+6.7728706e-05
+2.64403698e-06
+1.53160012e-06
+1.52892926e-06
+1.53164837e-06
+2.64842606e-06
+6.77835868e-05
+0.00045243166
+0.00101110462
+0.00156762664
+0.00211712035
+0.00265707234
+0.00319519162
+0.00375389256
+0.00438947297
+0.00456586574
+0.00462338156
+0.0043894182
+0.00375380634
+0.00319511212
+0.00265700868
+0.00211708357
+0.0015676273
+0.0010111446
+0.000452497593
+6.7796632e-05
+2.64638212e-06
+1.53150886e-06
+1.52883127e-06
+1.53155555e-06
+2.6506826e-06
+6.7850948e-05
+0.000452581758
+0.00101118115
+0.0015676538
+0.00211711091
+0.00265704045
+0.00319514974
+0.00375385258
+0.00438944791
+0.0045657455
+0.00462340036
+0.00438939206
+0.00375376486
+0.00319506842
+0.00265697497
+0.00211707262
+0.00156765347
+0.00101122073
+0.000452647096
+6.78638712e-05
+2.64870701e-06
+1.53141754e-06
+1.52873325e-06
+1.53146132e-06
+2.65283791e-06
+6.79170741e-05
+0.000452728726
+0.00101125406
+0.00156767669
+0.00211709678
+0.00265700379
+0.00319510347
+0.00375380904
+0.00438942056
+0.00456562416
+0.00462341767
+0.00438936449
+0.00375372107
+0.00319502172
+0.00265693798
+0.00211705857
+0.00156767712
+0.00101129506
+0.000452794782
+6.79304373e-05
+2.65101169e-06
+1.53132613e-06
+1.52863521e-06
+1.53136467e-06
+2.65482966e-06
+6.7981547e-05
+0.000452871841
+0.00101132268
+0.00156769439
+0.00211707676
+0.00265696109
+0.00319505155
+0.00375376084
+0.00438939029
+0.00456550296
+0.00462343328
+0.00438933577
+0.00375367468
+0.00319497146
+0.00265689697
+0.00211704068
+0.00156769762
+0.0010113672
+0.000452940898
+6.79964018e-05
+2.65329697e-06
+1.53123466e-06
+1.52853713e-06
+1.53126414e-06
+2.65655664e-06
+6.8043695e-05
+0.00045300987
+0.00101138469
+0.00156770385
+0.00211704707
+0.00265690769
+0.00319498867
+0.0037537023
+0.00438935264
+0.00456538372
+0.00462344729
+0.00438930497
+0.00375362531
+0.00319491759
+0.00265685189
+0.00211701852
+0.00156771398
+0.00101143589
+0.00045308495
+6.8061729e-05
+2.65556494e-06
+1.53114316e-06
+1.52843901e-06
+1.53115796e-06
+2.65788137e-06
+6.81025004e-05
+0.000453141446
+0.00101143895
+0.00156770486
+0.00211700824
+0.00265684375
+0.00319491234
+0.0037536247
+0.00438929011
+0.00456527117
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 3.75e-05;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.gas;
+        inletValue      uniform 3.75e-05;
+        value           nonuniform List<scalar>
+25
+(
+0.00462344729
+0.00438930497
+0.00375362531
+0.00319491759
+0.00265685189
+0.00211701852
+0.00156771398
+0.00101143589
+0.00045308495
+6.8061729e-05
+2.65556494e-06
+1.53114316e-06
+1.52843901e-06
+1.53115796e-06
+2.65788137e-06
+6.81025004e-05
+0.000453141446
+0.00101143895
+0.00156770486
+0.00211700824
+0.00265684375
+0.00319491234
+0.0037536247
+0.00438929011
+0.00456527117
+)
+;
+    }
+    wall1
+    {
+        type            kqRWallFunction;
+        value           nonuniform List<scalar>
+75
+(
+0.00462107176
+0.00462108001
+0.00462108965
+0.00462110009
+0.00462111154
+0.00462112415
+0.00462113804
+0.00462115329
+0.00462116993
+0.00462118802
+0.00462120754
+0.00462122852
+0.00462125095
+0.00462127482
+0.00462130011
+0.0046213268
+0.00462135486
+0.00462138427
+0.00462141498
+0.00462144698
+0.00462148022
+0.00462151466
+0.00462155026
+0.00462158696
+0.00462162473
+0.00462166351
+0.00462170325
+0.0046217439
+0.00462178538
+0.00462182763
+0.00462187058
+0.00462191417
+0.00462195831
+0.00462200296
+0.004622048
+0.00462209338
+0.00462213902
+0.00462218483
+0.00462223076
+0.0046222767
+0.0046223226
+0.00462236836
+0.00462241392
+0.00462245921
+0.00462250414
+0.00462254865
+0.00462259268
+0.00462263615
+0.004622679
+0.00462272117
+0.0046227626
+0.00462280324
+0.00462284305
+0.00462288195
+0.00462291994
+0.00462295696
+0.00462299298
+0.00462302796
+0.0046230619
+0.00462309476
+0.00462312652
+0.00462315717
+0.0046231867
+0.00462321511
+0.00462324237
+0.0046232685
+0.00462329349
+0.0046233173
+0.00462333996
+0.00462336139
+0.00462338156
+0.00462340036
+0.00462341767
+0.00462343328
+0.00462344729
+)
+;
+    }
+    wall2
+    {
+        type            kqRWallFunction;
+        value           nonuniform List<scalar>
+75
+(
+0.004571605
+0.00457170683
+0.00457159572
+0.00457150893
+0.00457141936
+0.00457133101
+0.00457124337
+0.00457115655
+0.00457107059
+0.00457098553
+0.00457090136
+0.0045708181
+0.00457073574
+0.00457065426
+0.00457057363
+0.00457049385
+0.00457041488
+0.00457033668
+0.00457025921
+0.00457018245
+0.00457010636
+0.00457003089
+0.00456995598
+0.0045698816
+0.00456980769
+0.00456973421
+0.00456966109
+0.00456958827
+0.00456951568
+0.00456944326
+0.00456937094
+0.00456929863
+0.00456922628
+0.00456915381
+0.00456908111
+0.00456900814
+0.00456893479
+0.00456886101
+0.00456878668
+0.00456871176
+0.00456863615
+0.00456855977
+0.00456848255
+0.00456840441
+0.00456832528
+0.00456824507
+0.00456816372
+0.00456808117
+0.00456799734
+0.00456791218
+0.00456782561
+0.00456773759
+0.00456764807
+0.004567557
+0.00456746432
+0.00456737001
+0.00456727403
+0.00456717633
+0.0045670769
+0.00456697572
+0.00456687276
+0.00456676801
+0.00456666147
+0.00456655311
+0.00456644295
+0.00456633098
+0.00456621724
+0.00456610174
+0.00456598455
+0.00456586574
+0.0045657455
+0.00456562416
+0.00456550296
+0.00456538372
+0.00456527117
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid
new file mode 100644
index 0000000000..ca759f110f
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid
@@ -0,0 +1,2152 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      k.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+0.00462107178
+0.00438626966
+0.00374943216
+0.00318948542
+0.00265007829
+0.00210873598
+0.00155763888
+0.000999380931
+0.000437423577
+6.18238198e-05
+2.45481092e-06
+1.53774716e-06
+1.53559818e-06
+1.53778255e-06
+2.45815968e-06
+6.1867512e-05
+0.000437500668
+0.000999425328
+0.00155767899
+0.00210878059
+0.00265013037
+0.00318954622
+0.0037495042
+0.00438632469
+0.00462088389
+0.00462108004
+0.0043862957
+0.00374948272
+0.00318956251
+0.00265018484
+0.00210887534
+0.001557814
+0.000999588217
+0.000437663698
+6.19071859e-05
+2.45724409e-06
+1.53767321e-06
+1.53551776e-06
+1.53770889e-06
+2.46059938e-06
+6.19506028e-05
+0.000437737352
+0.000999624211
+0.001557841
+0.00210890223
+0.00265021478
+0.00318959689
+0.003749524
+0.00438631324
+0.004620904
+0.00462108968
+0.0043863283
+0.00374954262
+0.00318965239
+0.00265030848
+0.00210903703
+0.0015580175
+0.000999829931
+0.00043794267
+6.20052476e-05
+2.46012542e-06
+1.5375858e-06
+1.53542272e-06
+1.5376215e-06
+2.46348008e-06
+6.20486479e-05
+0.00043801617
+0.000999865675
+0.00155804415
+0.00210906349
+0.00265033794
+0.00318968626
+0.00374958341
+0.00438634531
+0.00462091141
+0.00462110012
+0.00438636547
+0.00374960712
+0.0031897465
+0.00265043576
+0.00210920155
+0.00155822273
+0.00100007209
+0.000438219527
+6.21032465e-05
+2.46301894e-06
+1.53749816e-06
+1.53532739e-06
+1.53753397e-06
+2.46638151e-06
+6.21467072e-05
+0.000438293046
+0.00100010784
+0.00155824942
+0.00210922806
+0.00265046528
+0.00318978045
+0.00374964801
+0.00438638252
+0.00462092198
+0.00462111157
+0.00438640684
+0.00374967597
+0.00318984463
+0.00265056641
+0.00210936855
+0.00155842924
+0.00100031384
+0.000438493749
+6.22009479e-05
+2.46591753e-06
+1.53741048e-06
+1.535232e-06
+1.53744645e-06
+2.46929213e-06
+6.22445068e-05
+0.00043856733
+0.00100034962
+0.00155845596
+0.0021093951
+0.00265059598
+0.00318987864
+0.00374971693
+0.00438642393
+0.00462093332
+0.00462112419
+0.00438645217
+0.00374974903
+0.00318994671
+0.00265070048
+0.00210953812
+0.00155863714
+0.00100055514
+0.000438765692
+6.22984362e-05
+2.46882154e-06
+1.53732268e-06
+1.53513648e-06
+1.53735881e-06
+2.47221039e-06
+6.23421194e-05
+0.000438839367
+0.00100059095
+0.0015586639
+0.0021095647
+0.00265073008
+0.00318998076
+0.00374979004
+0.00438646927
+0.00462094588
+0.00462113809
+0.00438650119
+0.00374982607
+0.00319005261
+0.00265083784
+0.00210971019
+0.00155884633
+0.00100079583
+0.000439035597
+6.23957576e-05
+2.47173278e-06
+1.5372347e-06
+1.53504074e-06
+1.53727103e-06
+2.47513733e-06
+6.24395841e-05
+0.00043910939
+0.00100083168
+0.00155887312
+0.00210973681
+0.00265086747
+0.00319008669
+0.00374986713
+0.0043865183
+0.00462095971
+0.00462115333
+0.00438655363
+0.00374990686
+0.00319016211
+0.00265097833
+0.00210988457
+0.00155905659
+0.00100103564
+0.000439303532
+6.24929007e-05
+2.47465035e-06
+1.53714657e-06
+1.53494482e-06
+1.53718309e-06
+2.47807164e-06
+6.25368864e-05
+0.000439377462
+0.00100107154
+0.0015590834
+0.00210991122
+0.002651008
+0.00319019622
+0.00374994798
+0.00438657075
+0.00462097491
+0.00462116999
+0.00438660926
+0.00374999118
+0.00319027498
+0.00265112171
+0.002110061
+0.00155926759
+0.00100127427
+0.000439569453
+6.25898163e-05
+2.47757228e-06
+1.53705831e-06
+1.53484875e-06
+1.53709503e-06
+2.48101098e-06
+6.26339738e-05
+0.000439643537
+0.00100131021
+0.00155929443
+0.00211008768
+0.00265115139
+0.00319030912
+0.00375003232
+0.00438662637
+0.0046209915
+0.00462118808
+0.00438666786
+0.00375007877
+0.00319039099
+0.00265126775
+0.00211023922
+0.00155947901
+0.00100151138
+0.000439833289
+6.26864478e-05
+2.48049632e-06
+1.53696997e-06
+1.53475256e-06
+1.53700689e-06
+2.48395297e-06
+6.2730788e-05
+0.000439907542
+0.00100154736
+0.00155950588
+0.00211026592
+0.00265129746
+0.00319042515
+0.00375011995
+0.00438668496
+0.00462100953
+0.0046212076
+0.00438672922
+0.00375016944
+0.00319050997
+0.00265141623
+0.00211041898
+0.00155969054
+0.00100174672
+0.000440095001
+6.2782751e-05
+2.48342066e-06
+1.53688158e-06
+1.53465632e-06
+1.53691871e-06
+2.48689564e-06
+6.28272828e-05
+0.000440169433
+0.00100178275
+0.00155971744
+0.00211044569
+0.00265144595
+0.00319054414
+0.00375021064
+0.00438674631
+0.00462102901
+0.00462122858
+0.00438679317
+0.003750263
+0.0031906317
+0.00265156695
+0.00211060002
+0.00155990192
+0.00100198011
+0.000440354586
+6.2878699e-05
+2.48634402e-06
+1.53679316e-06
+1.53456005e-06
+1.5368305e-06
+2.48983759e-06
+6.29234303e-05
+0.000440429211
+0.00100201618
+0.00155992884
+0.00211062676
+0.00265159669
+0.00319066588
+0.00375030424
+0.00438681025
+0.00462104994
+0.00462125102
+0.00438685955
+0.00375035928
+0.00319075601
+0.00265171971
+0.00211078214
+0.0015601129
+0.0010022114
+0.000440612076
+6.297428e-05
+2.4892656e-06
+1.53670472e-06
+1.53446374e-06
+1.53674228e-06
+2.49277799e-06
+6.30192174e-05
+0.000440686902
+0.00100224751
+0.00156013986
+0.0021108089
+0.00265174946
+0.00319079021
+0.00375040054
+0.00438687661
+0.00462107231
+0.00462127489
+0.00438692817
+0.00375045808
+0.00319088271
+0.00265187433
+0.00211096512
+0.00156032328
+0.00100244047
+0.000440867518
+6.30694912e-05
+2.49218491e-06
+1.53661626e-06
+1.5343674e-06
+1.53665403e-06
+2.49571627e-06
+6.31146403e-05
+0.000440942556
+0.00100247663
+0.00156035025
+0.0021109919
+0.00265190409
+0.00319091692
+0.00375049937
+0.00438694522
+0.00462109613
+0.00462130019
+0.00438699888
+0.00375055923
+0.0031910116
+0.00265203058
+0.00211114874
+0.00156053284
+0.00100266725
+0.000441120966
+6.31643337e-05
+2.49510161e-06
+1.53652777e-06
+1.53427103e-06
+1.53656576e-06
+2.49865205e-06
+6.32096991e-05
+0.000441196222
+0.00100270344
+0.00156055983
+0.00211117554
+0.00265206035
+0.00319104583
+0.00375060055
+0.00438701592
+0.00462112137
+0.00462132688
+0.00438707152
+0.00375066253
+0.0031911425
+0.00265218825
+0.00211133275
+0.00156074139
+0.00100289165
+0.000441372465
+6.32588092e-05
+2.49801543e-06
+1.53643925e-06
+1.53417463e-06
+1.53647746e-06
+2.50158505e-06
+6.33043948e-05
+0.000441447946
+0.0010029279
+0.00156076841
+0.00211135957
+0.00265221803
+0.00319117673
+0.00375070388
+0.00438708854
+0.004621148
+0.00462135494
+0.00438714591
+0.0037507678
+0.00319127517
+0.0026523471
+0.00211151693
+0.00156094871
+0.00100311362
+0.000441622052
+6.33529179e-05
+2.50092606e-06
+1.53635071e-06
+1.53407819e-06
+1.53638913e-06
+2.50451491e-06
+6.33987266e-05
+0.000441697765
+0.00100314991
+0.00156097576
+0.00211154378
+0.00265237691
+0.00319130942
+0.00375080916
+0.00438716291
+0.00462117602
+0.00462138436
+0.00438722189
+0.00375087482
+0.00319140941
+0.00265250691
+0.00211170105
+0.00156115462
+0.00100333308
+0.000441869759
+6.34466579e-05
+2.50383316e-06
+1.53626212e-06
+1.53398172e-06
+1.53630077e-06
+2.50744128e-06
+6.34926923e-05
+0.000441945708
+0.00100336942
+0.0015611817
+0.00211172793
+0.00265253673
+0.00319144367
+0.00375091621
+0.00438723887
+0.00462120537
+0.00462141508
+0.00438729928
+0.00375098339
+0.00319154496
+0.00265266741
+0.00211188484
+0.00156135892
+0.00100355
+0.000442115608
+6.35400264e-05
+2.50673639e-06
+1.53617351e-06
+1.53388521e-06
+1.53621237e-06
+2.51036379e-06
+6.3586288e-05
+0.0004421918
+0.00100358638
+0.00156138603
+0.00211191174
+0.00265269726
+0.00319157925
+0.00375102482
+0.00438731625
+0.00462123603
+0.00462144708
+0.00438737791
+0.00375109329
+0.00319168161
+0.00265282837
+0.00211206806
+0.00156156145
+0.00100376431
+0.000442359619
+6.36330191e-05
+2.50963537e-06
+1.53608486e-06
+1.53378868e-06
+1.53612395e-06
+2.51328206e-06
+6.36795092e-05
+0.000442436055
+0.00100380075
+0.00156158859
+0.00211209499
+0.00265285824
+0.00319171592
+0.00375113475
+0.00438739487
+0.00462126797
+0.00462148033
+0.00438745761
+0.00375120429
+0.00319181908
+0.00265298951
+0.00211225048
+0.00156176203
+0.00100397599
+0.000442601806
+6.37256319e-05
+2.51252976e-06
+1.53599619e-06
+1.53369213e-06
+1.5360355e-06
+2.51619571e-06
+6.37723512e-05
+0.000442678491
+0.00100401248
+0.0015617892
+0.00211227744
+0.00265301942
+0.00319185343
+0.00375124579
+0.00438747456
+0.00462130117
+0.00462151477
+0.00438753821
+0.00375131619
+0.00319195715
+0.00265315058
+0.00211243185
+0.00156196049
+0.001004185
+0.000442842186
+6.3817861e-05
+2.51541922e-06
+1.5359075e-06
+1.53359556e-06
+1.53594702e-06
+2.51910441e-06
+6.38648098e-05
+0.000442919122
+0.00100422153
+0.00156198771
+0.00211245886
+0.00265318053
+0.00319199153
+0.00375135773
+0.00438755516
+0.00462133556
+0.00462155037
+0.00438761953
+0.00375142875
+0.00319209556
+0.00265331134
+0.00211261195
+0.0015621567
+0.00100439131
+0.000443080773
+6.39097031e-05
+2.51830346e-06
+1.53581878e-06
+1.53349897e-06
+1.53585852e-06
+2.52200786e-06
+6.39568811e-05
+0.000443157963
+0.0010044279
+0.00156218395
+0.002112639
+0.00265334131
+0.00319212997
+0.00375147033
+0.00438763646
+0.0046213711
+0.00462158708
+0.00438770138
+0.00375154173
+0.00319223404
+0.0026534715
+0.00211279056
+0.00156235051
+0.00100459492
+0.000443317587
+6.4001156e-05
+2.52118224e-06
+1.53573003e-06
+1.53340236e-06
+1.53577e-06
+2.52490579e-06
+6.40485626e-05
+0.000443395031
+0.00100463157
+0.00156237781
+0.00211281767
+0.00265350152
+0.00319226849
+0.00375158337
+0.00438771831
+0.00462140776
+0.00462162485
+0.00438778357
+0.0037516549
+0.00319237233
+0.00265363082
+0.00211296747
+0.00156254181
+0.00100479581
+0.000443552643
+6.40922185e-05
+2.52405535e-06
+1.53564127e-06
+1.53330573e-06
+1.53568146e-06
+2.52779799e-06
+6.4139853e-05
+0.000443630344
+0.00100483252
+0.00156256915
+0.00211299462
+0.00265366091
+0.00319240684
+0.00375169659
+0.00438780051
+0.00462144548
+0.00462166364
+0.00438786593
+0.00375176801
+0.00319251019
+0.00265378907
+0.00211314247
+0.00156273048
+0.00100499399
+0.000443785963
+6.41828901e-05
+2.52692261e-06
+1.53555247e-06
+1.53320908e-06
+1.53559289e-06
+2.5306843e-06
+6.42307513e-05
+0.000443863921
+0.00100503077
+0.00156275787
+0.00211316968
+0.0026538192
+0.00319254475
+0.00375180977
+0.00438788287
+0.00462148422
+0.00462170338
+0.00438794826
+0.00375188083
+0.00319264734
+0.00265394597
+0.00211331537
+0.00156291643
+0.00100518945
+0.000444017566
+6.42731711e-05
+2.52978388e-06
+1.53546365e-06
+1.53311242e-06
+1.53550429e-06
+2.53356454e-06
+6.43212577e-05
+0.00044409578
+0.00100522629
+0.00156294386
+0.00211334263
+0.00265397616
+0.00319268196
+0.00375192266
+0.00438796521
+0.00462152393
+0.00462174403
+0.00438803037
+0.00375199312
+0.00319278352
+0.0026541013
+0.00211348597
+0.00156309953
+0.00100538221
+0.00044424747
+6.43630621e-05
+2.53263906e-06
+1.5353748e-06
+1.53301573e-06
+1.53541567e-06
+2.53643863e-06
+6.44113727e-05
+0.000444325942
+0.00100541912
+0.00156312702
+0.00211351329
+0.00265413156
+0.00319281821
+0.00375203501
+0.00438804734
+0.00462156453
+0.00462178552
+0.00438811207
+0.0037521046
+0.00319291847
+0.00265425479
+0.0021136541
+0.00156327973
+0.00100557227
+0.000444475696
+6.44525636e-05
+2.53548802e-06
+1.53528591e-06
+1.53291902e-06
+1.53532701e-06
+2.53930644e-06
+6.45010967e-05
+0.000444554425
+0.00100560925
+0.00156330726
+0.00211368148
+0.00265428513
+0.00319295324
+0.00375214658
+0.00438812905
+0.00462160598
+0.00462182777
+0.00438819315
+0.00375221504
+0.00319305192
+0.00265440624
+0.00211381956
+0.00156345693
+0.00100575964
+0.000444702258
+6.4541676e-05
+2.53833066e-06
+1.53519698e-06
+1.53282228e-06
+1.53523831e-06
+2.54216785e-06
+6.45904295e-05
+0.000444781245
+0.00100579668
+0.00156348451
+0.00211384701
+0.00265443664
+0.00319308677
+0.0037522571
+0.00438821016
+0.00462164819
+0.00462187073
+0.00438827341
+0.00375232418
+0.00319318362
+0.00265455537
+0.00211398221
+0.00156363104
+0.00100594432
+0.000444927169
+6.46303985e-05
+2.54116685e-06
+1.53510802e-06
+1.53272552e-06
+1.53514957e-06
+2.54502273e-06
+6.46793707e-05
+0.000445006413
+0.00100598144
+0.00156365868
+0.00211400972
+0.00265458586
+0.00319321854
+0.00375236634
+0.00438829045
+0.00462169112
+0.00462191432
+0.00438835265
+0.00375243177
+0.00319331328
+0.00265470198
+0.00211414185
+0.00156380199
+0.00100612633
+0.00044515044
+6.47187294e-05
+2.54399641e-06
+1.53501902e-06
+1.53262872e-06
+1.5350608e-06
+2.54787093e-06
+6.47679184e-05
+0.000445229938
+0.00100616352
+0.00156382969
+0.00211416944
+0.00265473255
+0.0031933483
+0.00375247403
+0.00438836973
+0.00462173468
+0.00462195847
+0.00438843066
+0.00375253755
+0.00319344066
+0.00265484582
+0.00211429834
+0.00156396971
+0.00100630567
+0.000445372073
+6.4806666e-05
+2.54681918e-06
+1.53492997e-06
+1.5325319e-06
+1.53497199e-06
+2.55071225e-06
+6.48560696e-05
+0.000445451826
+0.00100634294
+0.00156399748
+0.002114326
+0.00265487649
+0.00319347578
+0.00375257991
+0.00438844779
+0.00462177881
+0.00462200312
+0.00438850728
+0.00375264127
+0.0031935655
+0.00265498668
+0.00211445151
+0.00156413414
+0.00100648234
+0.000445592071
+6.4894204e-05
+2.54963493e-06
+1.53484089e-06
+1.53243505e-06
+1.53488313e-06
+2.55354647e-06
+6.49438202e-05
+0.000445672076
+0.00100651968
+0.00156416196
+0.00211447925
+0.00265501744
+0.00319360072
+0.00375268375
+0.00438852445
+0.00462182343
+0.00462204816
+0.00438858227
+0.0037527427
+0.00319368754
+0.00265512434
+0.00211460122
+0.00156429521
+0.00100665633
+0.000445810431
+6.49813386e-05
+2.5524434e-06
+1.53475176e-06
+1.53233817e-06
+1.53479422e-06
+2.55637334e-06
+6.50311651e-05
+0.000445890687
+0.00100669376
+0.00156432308
+0.00211462905
+0.0026551552
+0.00319372288
+0.0037527853
+0.0043885995
+0.00462186846
+0.00462209354
+0.00438865546
+0.00375284158
+0.00319380655
+0.00265525859
+0.00211474733
+0.00156445283
+0.00100682767
+0.000446027147
+6.50680639e-05
+2.55524432e-06
+1.5346626e-06
+1.53224126e-06
+1.53470529e-06
+2.55919259e-06
+6.51180985e-05
+0.000446107653
+0.00100686516
+0.00156448078
+0.00211477524
+0.00265528956
+0.00319384201
+0.00375288432
+0.00438867275
+0.00462191384
+0.00462213919
+0.00438872669
+0.00375293771
+0.00319392231
+0.00265538924
+0.00211488971
+0.00156460698
+0.00100699632
+0.000446242215
+6.51543734e-05
+2.55803741e-06
+1.5345734e-06
+1.53214433e-06
+1.53461631e-06
+2.56200392e-06
+6.52046139e-05
+0.000446322968
+0.00100703391
+0.00156463499
+0.0021149177
+0.00265542031
+0.00319395788
+0.00375298059
+0.00438874405
+0.00462195947
+0.00462218501
+0.00438879577
+0.00375303086
+0.00319403456
+0.00265551609
+0.0021150282
+0.00156475759
+0.00100716232
+0.000446455626
+6.52402611e-05
+2.56082237e-06
+1.53448416e-06
+1.53204738e-06
+1.5345273e-06
+2.56480706e-06
+6.52907051e-05
+0.000446536624
+0.00100719999
+0.00156478567
+0.00211505629
+0.00265554727
+0.00319407026
+0.00375307387
+0.0043888132
+0.00462200529
+0.00462223094
+0.00438886255
+0.00375312082
+0.00319414312
+0.00265563897
+0.00211516273
+0.00156490461
+0.00100732563
+0.000446667374
+6.53257207e-05
+2.56359895e-06
+1.53439488e-06
+1.53195041e-06
+1.53443826e-06
+2.56760174e-06
+6.53763659e-05
+0.000446748615
+0.00100736339
+0.00156493277
+0.00211519091
+0.00265567027
+0.00319417896
+0.00375316398
+0.00438888005
+0.00462205121
+0.00462227689
+0.00438892687
+0.00375320741
+0.00319424779
+0.00265575771
+0.00211529316
+0.001565048
+0.00100748629
+0.000446877451
+6.54107467e-05
+2.56636686e-06
+1.53430557e-06
+1.53185343e-06
+1.53434919e-06
+2.57038768e-06
+6.54615907e-05
+0.000446958933
+0.00100752413
+0.00156507623
+0.00211532143
+0.00265578913
+0.00319428377
+0.00375325072
+0.00438894445
+0.00462209717
+0.00462232279
+0.0043889886
+0.00375329044
+0.00319434839
+0.00265587216
+0.00211541941
+0.00156518773
+0.00100764428
+0.000447085854
+6.54953341e-05
+2.5691259e-06
+1.53421624e-06
+1.53175643e-06
+1.53426008e-06
+2.57316466e-06
+6.55463745e-05
+0.000447167575
+0.0010076822
+0.00156521603
+0.00211544778
+0.00265590371
+0.0031943845
+0.00375333392
+0.00438900627
+0.00462214308
+0.00462236856
+0.00438904761
+0.00375336976
+0.00319444474
+0.00265598218
+0.00211554138
+0.00156532376
+0.0010077996
+0.000447292577
+6.55794785e-05
+2.57187582e-06
+1.53412686e-06
+1.53165941e-06
+1.53417093e-06
+2.57593246e-06
+6.56307131e-05
+0.000447374534
+0.00100783762
+0.00156535214
+0.00211556985
+0.00265601386
+0.003194481
+0.0037534134
+0.00438906538
+0.00462218886
+0.00462241412
+0.00438910378
+0.00375344521
+0.00319453668
+0.00265608765
+0.002115659
+0.00156545608
+0.00100795227
+0.000447497617
+6.56631763e-05
+2.57461645e-06
+1.53403744e-06
+1.53156237e-06
+1.53408175e-06
+2.57869089e-06
+6.57146027e-05
+0.000447579809
+0.00100799037
+0.00156548453
+0.00211568758
+0.00265611946
+0.00319457311
+0.00375348902
+0.00438912165
+0.00462223445
+0.00462245941
+0.00438915703
+0.00375351665
+0.00319462409
+0.00265618844
+0.0021157722
+0.00156558465
+0.00100810228
+0.000447700971
+6.57464241e-05
+2.57734761e-06
+1.53394799e-06
+1.53146532e-06
+1.53399254e-06
+2.58143978e-06
+6.57980398e-05
+0.000447783394
+0.00100814047
+0.00156561317
+0.00211580087
+0.00265622038
+0.00319466067
+0.00375356063
+0.004389175
+0.00462227976
+0.00462250435
+0.00438920725
+0.00375358396
+0.00319470683
+0.00265628445
+0.00211588092
+0.00156570944
+0.00100824965
+0.000447902636
+6.58292185e-05
+2.58006912e-06
+1.5338585e-06
+1.53136824e-06
+1.53390327e-06
+2.58417894e-06
+6.58810212e-05
+0.000447985287
+0.00100828794
+0.00156573805
+0.00211590969
+0.00265631653
+0.00319474357
+0.00375362812
+0.00438922531
+0.00462232474
+0.00462254887
+0.00438925435
+0.00375364703
+0.00319478479
+0.00265637559
+0.00211598508
+0.00156583047
+0.00100839438
+0.000448102607
+6.59115562e-05
+2.58278082e-06
+1.53376894e-06
+1.53127113e-06
+1.53381395e-06
+2.58690823e-06
+6.59635438e-05
+0.000448185484
+0.00100843276
+0.00156585915
+0.00211601395
+0.0026564078
+0.00319482169
+0.00375369137
+0.00438927253
+0.00462236929
+0.0046225929
+0.00438929828
+0.00375370577
+0.00319485786
+0.00265646176
+0.00211608465
+0.0015659477
+0.00100853647
+0.000448300878
+6.59934333e-05
+2.58548251e-06
+1.53367934e-06
+1.53117399e-06
+1.53372458e-06
+2.58962744e-06
+6.60456035e-05
+0.00044838398
+0.00100857494
+0.00156597647
+0.00211611364
+0.00265649412
+0.00319489492
+0.00375375029
+0.00438931655
+0.00462241336
+0.00462263637
+0.00438933898
+0.00375376009
+0.00319492595
+0.0026565429
+0.00211617958
+0.00156606112
+0.00100867592
+0.000448497439
+6.60748454e-05
+2.58817398e-06
+1.53358969e-06
+1.53107681e-06
+1.53363516e-06
+2.59233638e-06
+6.6127196e-05
+0.000448580763
+0.00100871449
+0.00156608998
+0.00211620868
+0.0026565754
+0.00319496318
+0.0037538048
+0.00438935737
+0.00462245688
+0.00462267923
+0.0043893764
+0.00375380992
+0.00319498898
+0.00265661895
+0.00211626985
+0.00156617074
+0.00100881272
+0.000448692281
+6.6155787e-05
+2.59085503e-06
+1.53349996e-06
+1.53097959e-06
+1.53354567e-06
+2.59503481e-06
+6.62083159e-05
+0.000448775824
+0.00100885139
+0.00156619968
+0.00211629905
+0.00265665159
+0.00319502638
+0.00375385483
+0.00438939489
+0.00462249979
+0.0046227214
+0.0043894105
+0.00375385522
+0.00319504691
+0.00265668985
+0.00211635541
+0.00156627652
+0.00100894689
+0.00044888539
+6.62362517e-05
+2.59352537e-06
+1.53341018e-06
+1.53088233e-06
+1.53345612e-06
+2.59772249e-06
+6.62889567e-05
+0.00044896915
+0.00100898566
+0.00156630554
+0.00211638473
+0.00265672264
+0.00319508449
+0.00375390032
+0.00438942911
+0.00462254202
+0.00462276284
+0.00438944127
+0.00375389594
+0.00319509967
+0.00265675556
+0.00211643625
+0.00156637848
+0.00100907841
+0.000449076748
+6.63162322e-05
+2.59618471e-06
+1.53332033e-06
+1.53078502e-06
+1.53336651e-06
+2.60039909e-06
+6.63691112e-05
+0.000449160722
+0.00100911728
+0.00156640759
+0.00211646568
+0.00265678849
+0.00319513742
+0.00375394123
+0.00438946
+0.00462258352
+0.00462280348
+0.0043894687
+0.00375393206
+0.00319514724
+0.00265681605
+0.00211651234
+0.0015664766
+0.00100920728
+0.000449266336
+6.63957197e-05
+2.5988327e-06
+1.5332304e-06
+1.53068768e-06
+1.53327682e-06
+2.60306431e-06
+6.64487708e-05
+0.000449350523
+0.00100924625
+0.00156650581
+0.00211654189
+0.00265684912
+0.00319518517
+0.00375397754
+0.00438948754
+0.00462262423
+0.00462284329
+0.00438949278
+0.00375396356
+0.00319518959
+0.00265687128
+0.00211658368
+0.00156657089
+0.00100933349
+0.000449454133
+6.6474705e-05
+2.60146901e-06
+1.53314041e-06
+1.53059028e-06
+1.53318705e-06
+2.60571776e-06
+6.65279261e-05
+0.00044953853
+0.00100937256
+0.00156660019
+0.00211661334
+0.00265690451
+0.00319522769
+0.00375400924
+0.00438951175
+0.00462266411
+0.0046228822
+0.00438951355
+0.00375399045
+0.00319522671
+0.00265692126
+0.00211665025
+0.00156666134
+0.00100945704
+0.000449640114
+6.65531777e-05
+2.60409321e-06
+1.53305034e-06
+1.53049283e-06
+1.53309723e-06
+2.60835904e-06
+6.66065668e-05
+0.000449724719
+0.00100949621
+0.00156669073
+0.00211668003
+0.00265695464
+0.00319526499
+0.00375403633
+0.00438953263
+0.00462270311
+0.0046229202
+0.00438953101
+0.00375401275
+0.0031952586
+0.00265696599
+0.00211671207
+0.00156674795
+0.00100957791
+0.000449824253
+6.66311265e-05
+2.6067049e-06
+1.53296021e-06
+1.53039535e-06
+1.53300733e-06
+2.61098775e-06
+6.66846818e-05
+0.000449909064
+0.00100961719
+0.00156677743
+0.00211674197
+0.00265699952
+0.00319529706
+0.00375405882
+0.00438955021
+0.00462274119
+0.00462295722
+0.00438954521
+0.00375403048
+0.0031952853
+0.00265700548
+0.00211676914
+0.00156683073
+0.00100969611
+0.000450006524
+6.67085399e-05
+2.60930361e-06
+1.53286999e-06
+1.53029782e-06
+1.53291736e-06
+2.61360342e-06
+6.67622593e-05
+0.000450091538
+0.00100973549
+0.00156686031
+0.00211679915
+0.00265703915
+0.00319532393
+0.00375407675
+0.00438956452
+0.0046227783
+0.00462299324
+0.00438955618
+0.00375404368
+0.00319530681
+0.00265703974
+0.00211682147
+0.00156690969
+0.0010098116
+0.000450186899
+6.67854058e-05
+2.6118889e-06
+1.53277972e-06
+1.53020026e-06
+1.53282731e-06
+2.61620559e-06
+6.68392873e-05
+0.000450272114
+0.00100985109
+0.00156693935
+0.0021168516
+0.00265707356
+0.00319534562
+0.00375409016
+0.00438957561
+0.00462281443
+0.00462302823
+0.00438956399
+0.00375405243
+0.0031953232
+0.00265706881
+0.0021168691
+0.00156698483
+0.0010099244
+0.000450365349
+6.68617114e-05
+2.61446028e-06
+1.53268937e-06
+1.53010265e-06
+1.5327372e-06
+2.61879376e-06
+6.69157531e-05
+0.000450450762
+0.00100996399
+0.00156701459
+0.00211689933
+0.00265710278
+0.00319536219
+0.0037540991
+0.00438958353
+0.00462284952
+0.00462306217
+0.0043895687
+0.00375405679
+0.00319533452
+0.00265709274
+0.00211691203
+0.00156705618
+0.00101003449
+0.000450541846
+6.69374442e-05
+2.61701726e-06
+1.53259896e-06
+1.530005e-06
+1.53264702e-06
+2.62136743e-06
+6.69916438e-05
+0.000450627455
+0.00101007419
+0.00156708602
+0.00211694238
+0.00265712685
+0.00319537368
+0.00375410365
+0.00438958835
+0.00462288356
+0.00462309504
+0.0043895704
+0.00375405683
+0.00319534085
+0.00265711158
+0.00211695033
+0.00156712373
+0.00101014188
+0.00045071636
+6.70125909e-05
+2.61955933e-06
+1.53250847e-06
+1.52990732e-06
+1.53255677e-06
+2.62392604e-06
+6.70669462e-05
+0.000450802162
+0.00101018167
+0.00156715369
+0.00211698078
+0.00265714583
+0.00319538018
+0.00375410388
+0.00438959016
+0.00462291654
+0.0046231268
+0.00438956915
+0.00375405264
+0.00319534225
+0.00265712539
+0.00211698402
+0.00156718754
+0.00101024653
+0.000450888865
+6.7087139e-05
+2.62208601e-06
+1.53241791e-06
+1.52980961e-06
+1.53246645e-06
+2.62646901e-06
+6.71416469e-05
+0.000450974854
+0.00101028644
+0.00156721758
+0.00211701459
+0.00265715978
+0.00319538176
+0.00375409989
+0.00438958903
+0.00462294843
+0.00462315746
+0.00438956505
+0.00375404435
+0.00319533884
+0.00265713424
+0.00211701316
+0.00156724761
+0.00101034847
+0.000451059329
+6.71610749e-05
+2.62459677e-06
+1.53232729e-06
+1.52971187e-06
+1.53237606e-06
+2.62899572e-06
+6.72157319e-05
+0.0004511455
+0.00101038848
+0.00156727773
+0.00211704384
+0.00265716876
+0.00319537849
+0.00375409178
+0.00438958503
+0.00462297922
+0.00462318699
+0.0043895582
+0.00375403205
+0.00319533071
+0.00265713823
+0.00211703781
+0.00156730397
+0.00101044769
+0.00045122773
+6.72343861e-05
+2.62709109e-06
+1.5322366e-06
+1.52961411e-06
+1.53228559e-06
+2.63150542e-06
+6.7289187e-05
+0.000451314073
+0.00101048779
+0.00156733417
+0.00211706859
+0.00265717288
+0.00319537052
+0.00375407965
+0.00438957828
+0.0046230089
+0.0046232154
+0.0043895487
+0.00375401586
+0.00319531796
+0.00265713744
+0.00211705805
+0.00156735667
+0.00101054419
+0.000451394036
+6.73070591e-05
+2.62956846e-06
+1.53214585e-06
+1.52951631e-06
+1.53219503e-06
+2.63399719e-06
+6.73619961e-05
+0.000451480536
+0.00101058436
+0.00156738693
+0.0021170889
+0.0026571722
+0.00319535791
+0.00375406363
+0.00438956887
+0.00462303747
+0.00462324268
+0.00438953666
+0.00375399593
+0.00319530076
+0.00265713199
+0.00211707394
+0.00156740575
+0.00101063798
+0.000451558231
+6.73790821e-05
+2.63202837e-06
+1.53205502e-06
+1.52941848e-06
+1.53210439e-06
+2.63646991e-06
+6.74341431e-05
+0.000451644861
+0.00101067819
+0.00156743603
+0.00211710484
+0.00265716682
+0.00319534082
+0.00375404384
+0.00438955691
+0.00462306493
+0.00462326881
+0.0043895222
+0.00375397239
+0.0031952792
+0.00265712198
+0.00211708556
+0.00156745123
+0.00101072905
+0.000451720286
+6.74504414e-05
+2.63447029e-06
+1.53196412e-06
+1.52932063e-06
+1.53201362e-06
+2.63892179e-06
+6.75056063e-05
+0.000451807003
+0.00101076927
+0.0015674815
+0.00211711646
+0.00265715685
+0.00319531933
+0.00375402041
+0.0043895425
+0.00462309128
+0.0046232938
+0.00438950544
+0.0037539454
+0.00319525347
+0.00265710756
+0.00211709304
+0.00156749322
+0.00101081746
+0.000451880197
+6.75211275e-05
+2.63689372e-06
+1.53187316e-06
+1.52922274e-06
+1.53192269e-06
+2.64135044e-06
+6.75763631e-05
+0.000451966929
+0.00101085758
+0.00156752338
+0.00211712385
+0.00265714238
+0.0031952936
+0.00375399348
+0.00438952576
+0.00462311655
+0.00462331762
+0.00438948652
+0.00375391512
+0.00319522371
+0.00265708886
+0.00211709646
+0.00156753175
+0.0010109032
+0.000452037944
+6.75911283e-05
+2.63929816e-06
+1.53178212e-06
+1.52912484e-06
+1.53183156e-06
+2.64375163e-06
+6.76463766e-05
+0.000452124563
+0.00101094308
+0.00156756165
+0.00211712703
+0.00265712351
+0.00319526372
+0.00375396315
+0.0043895068
+0.00462314075
+0.00462334028
+0.00438946558
+0.00375388175
+0.00319519015
+0.00265706609
+0.002117096
+0.00156756697
+0.00101098639
+0.000452193555
+6.76604385e-05
+2.64168318e-06
+1.53169101e-06
+1.5290269e-06
+1.53174011e-06
+2.64611888e-06
+6.77156007e-05
+0.000452279843
+0.00101102575
+0.00156759634
+0.00211712607
+0.00265710031
+0.00319522983
+0.00375392956
+0.00438948571
+0.00462316396
+0.00462336172
+0.00438944277
+0.00375384547
+0.00319515295
+0.0026570394
+0.00211709179
+0.00156759898
+0.00101106706
+0.000452347044
+6.77290521e-05
+2.64404837e-06
+1.53159983e-06
+1.52892895e-06
+1.53164813e-06
+2.64844054e-06
+6.77839542e-05
+0.000452432621
+0.00101110544
+0.00156762734
+0.00211712091
+0.00265707278
+0.00319519195
+0.00375389277
+0.00438946258
+0.00462318623
+0.00462338189
+0.0043894183
+0.00375380653
+0.00319511241
+0.00265700908
+0.0021170841
+0.00156762796
+0.00101114538
+0.000452498515
+6.77969785e-05
+2.64639353e-06
+1.53150858e-06
+1.52883096e-06
+1.53155532e-06
+2.65069701e-06
+6.78513151e-05
+0.000452582718
+0.00101118198
+0.00156765451
+0.00211711147
+0.00265704089
+0.00319515007
+0.00375385279
+0.00438943746
+0.00462320773
+0.00462340069
+0.00438939216
+0.00375376505
+0.00319506871
+0.00265697537
+0.00211707315
+0.00156765413
+0.00101122152
+0.000452648019
+6.78642181e-05
+2.64871845e-06
+1.53141725e-06
+1.52873294e-06
+1.53146108e-06
+2.65285215e-06
+6.79174403e-05
+0.000452729684
+0.00101125489
+0.00156767739
+0.00211709734
+0.00265700423
+0.00319510379
+0.00375380925
+0.00438941006
+0.00462322874
+0.004623418
+0.00438936459
+0.00375372126
+0.00319502201
+0.00265693838
+0.00211705909
+0.00156767779
+0.00101129585
+0.000452795706
+6.79307848e-05
+2.65102315e-06
+1.53132585e-06
+1.5286349e-06
+1.53136443e-06
+2.65484358e-06
+6.79819114e-05
+0.000452872796
+0.00101132351
+0.00156769508
+0.00211707732
+0.00265696152
+0.00319505188
+0.00375376105
+0.00438937974
+0.00462324996
+0.00462343362
+0.00438933587
+0.00375367487
+0.00319497175
+0.00265689737
+0.00211704121
+0.00156769828
+0.00101136799
+0.000452941825
+6.799675e-05
+2.65330847e-06
+1.53123438e-06
+1.52853682e-06
+1.53126388e-06
+2.65656997e-06
+6.80440559e-05
+0.000453010819
+0.00101138551
+0.00156770453
+0.00211704762
+0.00265690811
+0.00319498898
+0.00375370249
+0.00438934208
+0.0046232728
+0.00462344763
+0.00438930507
+0.0037536255
+0.00319491789
+0.00265685229
+0.00211701905
+0.00156771466
+0.00101143669
+0.000453085881
+6.8062078e-05
+2.65557647e-06
+1.53114288e-06
+1.5284387e-06
+1.53115769e-06
+2.65789369e-06
+6.81028548e-05
+0.000453142384
+0.00101143975
+0.00156770554
+0.00211700877
+0.00265684415
+0.00319491263
+0.00375362486
+0.0043892798
+0.00462330671
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            mapped;
+        fieldName       k.liquid;
+        setAverage      0;
+        average         0;
+        interpolationScheme cell;
+        value           nonuniform List<scalar>
+25
+(
+0.00462110009
+0.00438636537
+0.00374960694
+0.00318974621
+0.00265043536
+0.00210920102
+0.00155822206
+0.0010000713
+0.000438218602
+6.21029206e-05
+2.46300935e-06
+1.53749845e-06
+1.53532771e-06
+1.53753422e-06
+2.46636941e-06
+6.21463629e-05
+0.000438292085
+0.00100010701
+0.00155824872
+0.00210922749
+0.00265046484
+0.00318978013
+0.00374964777
+0.00438638241
+0.00462092213
+)
+;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.liquid;
+        inletValue      uniform 3.75e-05;
+        value           nonuniform List<scalar>
+25
+(
+0.00462344763
+0.00438930507
+0.0037536255
+0.00319491789
+0.00265685229
+0.00211701905
+0.00156771466
+0.00101143669
+0.000453085881
+6.8062078e-05
+2.65557647e-06
+1.53114288e-06
+1.5284387e-06
+1.53115769e-06
+2.65789369e-06
+6.81028548e-05
+0.000453142384
+0.00101143975
+0.00156770554
+0.00211700877
+0.00265684415
+0.00319491263
+0.00375362486
+0.0043892798
+0.00462330671
+)
+;
+    }
+    wall1
+    {
+        type            kqRWallFunction;
+        value           nonuniform List<scalar>
+75
+(
+0.00462107178
+0.00462108004
+0.00462108968
+0.00462110012
+0.00462111157
+0.00462112419
+0.00462113809
+0.00462115333
+0.00462116999
+0.00462118808
+0.0046212076
+0.00462122858
+0.00462125102
+0.00462127489
+0.00462130019
+0.00462132688
+0.00462135494
+0.00462138436
+0.00462141508
+0.00462144708
+0.00462148033
+0.00462151477
+0.00462155037
+0.00462158708
+0.00462162485
+0.00462166364
+0.00462170338
+0.00462174403
+0.00462178552
+0.00462182777
+0.00462187073
+0.00462191432
+0.00462195847
+0.00462200312
+0.00462204816
+0.00462209354
+0.00462213919
+0.00462218501
+0.00462223094
+0.00462227689
+0.00462232279
+0.00462236856
+0.00462241412
+0.00462245941
+0.00462250435
+0.00462254887
+0.0046225929
+0.00462263637
+0.00462267923
+0.0046227214
+0.00462276284
+0.00462280348
+0.00462284329
+0.0046228822
+0.0046229202
+0.00462295722
+0.00462299324
+0.00462302823
+0.00462306217
+0.00462309504
+0.0046231268
+0.00462315746
+0.00462318699
+0.0046232154
+0.00462324268
+0.00462326881
+0.0046232938
+0.00462331762
+0.00462334028
+0.00462336172
+0.00462338189
+0.00462340069
+0.004623418
+0.00462343362
+0.00462344763
+)
+;
+    }
+    wall2
+    {
+        type            kqRWallFunction;
+        value           nonuniform List<scalar>
+75
+(
+0.00462088389
+0.004620904
+0.00462091141
+0.00462092198
+0.00462093332
+0.00462094588
+0.00462095971
+0.00462097491
+0.0046209915
+0.00462100953
+0.00462102901
+0.00462104994
+0.00462107231
+0.00462109613
+0.00462112137
+0.004621148
+0.00462117602
+0.00462120537
+0.00462123603
+0.00462126797
+0.00462130117
+0.00462133556
+0.0046213711
+0.00462140776
+0.00462144548
+0.00462148422
+0.00462152393
+0.00462156453
+0.00462160598
+0.00462164819
+0.00462169112
+0.00462173468
+0.00462177881
+0.00462182343
+0.00462186846
+0.00462191384
+0.00462195947
+0.00462200529
+0.00462205121
+0.00462209717
+0.00462214308
+0.00462218886
+0.00462223445
+0.00462227976
+0.00462232474
+0.00462236929
+0.00462241336
+0.00462245688
+0.00462249979
+0.00462254202
+0.00462258352
+0.00462262423
+0.00462266411
+0.00462270311
+0.00462274119
+0.0046227783
+0.00462281443
+0.00462284952
+0.00462288356
+0.00462291654
+0.00462294843
+0.00462297922
+0.0046230089
+0.00462303747
+0.00462306493
+0.00462309128
+0.00462311655
+0.00462314075
+0.00462316396
+0.00462318623
+0.00462320773
+0.00462322874
+0.00462324996
+0.0046232728
+0.00462330671
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/nut.gas
new file mode 100644
index 0000000000..a4f1e28526
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/nut.gas
@@ -0,0 +1,1965 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      nut.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+4.57970072e-05
+0.000104055692
+0.000140550021
+0.000161102808
+0.00016607229
+0.000156791223
+0.000134780553
+0.000101355879
+5.65336369e-05
+1.11269037e-05
+8.07158245e-07
+6.63581651e-07
+6.63114519e-07
+6.63586084e-07
+8.07693224e-07
+1.11355832e-05
+5.65453949e-05
+0.000101361291
+0.000134782775
+0.000156791723
+0.000166071639
+0.000161100955
+0.000140546252
+0.00010403924
+4.55512541e-05
+4.57970482e-05
+0.000104056695
+0.000140552884
+0.000161108237
+0.000166080845
+0.000156803348
+0.000134796519
+0.000101375584
+5.65602419e-05
+1.11407537e-05
+8.07621315e-07
+6.63580218e-07
+6.63111766e-07
+6.63584732e-07
+8.08166213e-07
+1.1149471e-05
+5.65718313e-05
+0.000101380543
+0.000134798101
+0.000156803089
+0.000166079387
+0.000161105598
+0.000140548423
+0.000104040749
+4.55517649e-05
+4.5797096e-05
+0.000104057889
+0.000140556218
+0.000161114544
+0.000166090796
+0.000156817478
+0.000134815167
+0.000101398659
+5.65913414e-05
+1.11570852e-05
+8.08170287e-07
+6.63578535e-07
+6.63108522e-07
+6.63583113e-07
+8.08725781e-07
+1.116587e-05
+5.66029923e-05
+0.000101403621
+0.000134816726
+0.000156817189
+0.000166089312
+0.000161111885
+0.000140551743
+0.000104041877
+4.55512112e-05
+4.57971478e-05
+0.000104059157
+0.000140559658
+0.00016112098
+0.000166100887
+0.000156831739
+0.000134833917
+0.000101421773
+5.66223165e-05
+1.1173433e-05
+8.0872239e-07
+6.63576854e-07
+6.63105265e-07
+6.63581496e-07
+8.09287932e-07
+1.1182289e-05
+5.66340366e-05
+0.000101426753
+0.000134835471
+0.000156831441
+0.000166099393
+0.000161118314
+0.000140555174
+0.000104043149
+4.55507791e-05
+4.57972045e-05
+0.0001040605
+0.000140563201
+0.000161127538
+0.000166111099
+0.000156846106
+0.000134852725
+0.000101444856
+5.66531021e-05
+1.11897563e-05
+8.09276309e-07
+6.63575173e-07
+6.63102001e-07
+6.63579881e-07
+8.09851249e-07
+1.11986838e-05
+5.66648911e-05
+0.000101449854
+0.000134854273
+0.000156845795
+0.000166109595
+0.000161124862
+0.000140558707
+0.000104044453
+4.5550333e-05
+4.57972671e-05
+0.00010406192
+0.000140566849
+0.000161134218
+0.00016612144
+0.000156860583
+0.000134871602
+0.000101467914
+5.66837329e-05
+1.12060682e-05
+8.09832402e-07
+6.63573486e-07
+6.63098739e-07
+6.63578254e-07
+8.10416141e-07
+1.12150667e-05
+5.66955908e-05
+0.00010147293
+0.000134873146
+0.00015686026
+0.000166119924
+0.000161131532
+0.000140562343
+0.000104045847
+4.5549893e-05
+4.5797336e-05
+0.000104063412
+0.000140570599
+0.000161141021
+0.000166131908
+0.000156875172
+0.000134890543
+0.000101490943
+5.67142307e-05
+1.12223755e-05
+8.10390947e-07
+6.63571804e-07
+6.63095465e-07
+6.63576637e-07
+8.10982947e-07
+1.12314441e-05
+5.67261569e-05
+0.000101495978
+0.000134892081
+0.000156874838
+0.000166130379
+0.000161138324
+0.000140566081
+0.000104047314
+4.55494565e-05
+4.57974116e-05
+0.000104064973
+0.000140574448
+0.000161147939
+0.000166142492
+0.00015688986
+0.000134909534
+0.000101513926
+5.67445976e-05
+1.12386753e-05
+8.10951823e-07
+6.63570126e-07
+6.63092186e-07
+6.6357501e-07
+8.11551613e-07
+1.12478127e-05
+5.67565914e-05
+0.00010151898
+0.000134911067
+0.000156889515
+0.000166140953
+0.00016114523
+0.000140569919
+0.000104048848
+4.55490242e-05
+4.57974941e-05
+0.0001040666
+0.000140578393
+0.000161154963
+0.000166153182
+0.00015690463
+0.000134928551
+0.000101536846
+5.67748242e-05
+1.12549583e-05
+8.11514693e-07
+6.63568454e-07
+6.63088906e-07
+6.63573384e-07
+8.1212185e-07
+1.12641634e-05
+5.67868848e-05
+0.000101541919
+0.000134930079
+0.000156904275
+0.000166151631
+0.000161152243
+0.00014057385
+0.000104050447
+4.55485961e-05
+4.57975838e-05
+0.000104068289
+0.000140582426
+0.000161162087
+0.000166163966
+0.000156919465
+0.000134947567
+0.000101559676
+5.68048976e-05
+1.12712141e-05
+8.12079138e-07
+6.63566776e-07
+6.63085613e-07
+6.63571757e-07
+8.12693297e-07
+1.12804855e-05
+5.68170243e-05
+0.000101564769
+0.000134949094
+0.000156919099
+0.000166162404
+0.000161159356
+0.000140577871
+0.000104052106
+4.55481725e-05
+4.57976806e-05
+0.000104070036
+0.000140586545
+0.000161169305
+0.000166174833
+0.000156934349
+0.000134966567
+0.000101582401
+5.68348092e-05
+1.12874344e-05
+8.12644833e-07
+6.63565105e-07
+6.63082328e-07
+6.63570133e-07
+8.13265652e-07
+1.12967707e-05
+5.68470007e-05
+0.000101587512
+0.000134968089
+0.000156933973
+0.000166173259
+0.000161166562
+0.000140581976
+0.000104053824
+4.55477533e-05
+4.57977846e-05
+0.000104071839
+0.000140590746
+0.00016117661
+0.000166185774
+0.000156949268
+0.00013498553
+0.00010160501
+5.68645546e-05
+1.13036138e-05
+8.13211521e-07
+6.63563434e-07
+6.63079038e-07
+6.63568507e-07
+8.13838701e-07
+1.13130136e-05
+5.68768101e-05
+0.000101610138
+0.00013498705
+0.000156948884
+0.00016618419
+0.000161173856
+0.000140586165
+0.000104055595
+4.55473386e-05
+4.57978959e-05
+0.000104073693
+0.000140595026
+0.000161183997
+0.000166196781
+0.000156964211
+0.000135004444
+0.000101627493
+5.68941344e-05
+1.13197494e-05
+8.13779049e-07
+6.63561766e-07
+6.63075747e-07
+6.63566882e-07
+8.14412323e-07
+1.13292113e-05
+5.69064525e-05
+0.000101632638
+0.000135005963
+0.000156963817
+0.000166195186
+0.000161181233
+0.000140590432
+0.000104057419
+4.55469284e-05
+4.57980142e-05
+0.000104075595
+0.00014059938
+0.000161191462
+0.000166207846
+0.000156979165
+0.000135023297
+0.000101649842
+5.69235503e-05
+1.13358399e-05
+8.14347297e-07
+6.63560103e-07
+6.63072454e-07
+6.63565257e-07
+8.14986433e-07
+1.13453625e-05
+5.693593e-05
+0.000101655006
+0.000135024813
+0.000156978763
+0.000166206241
+0.000161188687
+0.000140594773
+0.00010405929
+4.55465225e-05
+4.57981396e-05
+0.000104077543
+0.000140603805
+0.000161198999
+0.000166218959
+0.000156994121
+0.000135042079
+0.000101672056
+5.69528052e-05
+1.13518846e-05
+8.14916186e-07
+6.63558438e-07
+6.63069158e-07
+6.6356363e-07
+8.15560965e-07
+1.13614667e-05
+5.69652452e-05
+0.000101677236
+0.000135043592
+0.000156993711
+0.000166217344
+0.000161196213
+0.000140599185
+0.000104061204
+4.5546121e-05
+4.57982719e-05
+0.000104079532
+0.000140608295
+0.000161206601
+0.000166230113
+0.000157009067
+0.000135060777
+0.000101694129
+5.69819018e-05
+1.13678831e-05
+8.15485641e-07
+6.63556773e-07
+6.63065864e-07
+6.63562011e-07
+8.16135884e-07
+1.13775235e-05
+5.69944009e-05
+0.000101699328
+0.000135062289
+0.000157008648
+0.000166228488
+0.000161203804
+0.000140603663
+0.00010406316
+4.55457235e-05
+4.5798411e-05
+0.000104081559
+0.000140612847
+0.000161214261
+0.000166241296
+0.000157023988
+0.000135079381
+0.000101716058
+5.70108412e-05
+1.13838346e-05
+8.16055572e-07
+6.63555121e-07
+6.63062566e-07
+6.63560385e-07
+8.16711113e-07
+1.13935321e-05
+5.70233984e-05
+0.000101721272
+0.000135080893
+0.000157023563
+0.000166239663
+0.000161211453
+0.0001406082
+0.000104065154
+4.55453302e-05
+4.57985568e-05
+0.000104083621
+0.000140617452
+0.000161221971
+0.0001662525
+0.000157038876
+0.000135097882
+0.000101737835
+5.70396244e-05
+1.1399738e-05
+8.16625897e-07
+6.63553459e-07
+6.63059269e-07
+6.63558763e-07
+8.17286575e-07
+1.14094914e-05
+5.70522383e-05
+0.000101743067
+0.000135099393
+0.000157038445
+0.000166250857
+0.000161219153
+0.000140612794
+0.00010406718
+4.55449406e-05
+4.5798709e-05
+0.000104085711
+0.000140622107
+0.000161229723
+0.000166263713
+0.000157053718
+0.000135116268
+0.00010175946
+5.70682515e-05
+1.14155923e-05
+8.17196514e-07
+6.63551805e-07
+6.63055964e-07
+6.63557141e-07
+8.1786219e-07
+1.14254005e-05
+5.70809214e-05
+0.00010176471
+0.00013511778
+0.00015705328
+0.000166262061
+0.000161226895
+0.000140617436
+0.000104069237
+4.55445548e-05
+4.57988676e-05
+0.000104087829
+0.000140626804
+0.000161237508
+0.000166274923
+0.000157068499
+0.000135134532
+0.000101780928
+5.70967227e-05
+1.14313961e-05
+8.17767318e-07
+6.63550144e-07
+6.63052663e-07
+6.63555521e-07
+8.18437875e-07
+1.14412579e-05
+5.71094468e-05
+0.000101786195
+0.000135136044
+0.000157068055
+0.000166273263
+0.00016123467
+0.00014062212
+0.000104071319
+4.55441724e-05
+4.57990324e-05
+0.000104089968
+0.000140631536
+0.000161245316
+0.000166286118
+0.000157083211
+0.000135152666
+0.000101802235
+5.71250366e-05
+1.14471479e-05
+8.1833822e-07
+6.6354849e-07
+6.63049366e-07
+6.63553897e-07
+8.1901354e-07
+1.14570624e-05
+5.71378143e-05
+0.000101807518
+0.000135154179
+0.000157082761
+0.000166284452
+0.00016124247
+0.000140626839
+0.000104073422
+4.55437933e-05
+4.57992031e-05
+0.000104092124
+0.000140636297
+0.00016125314
+0.000166297291
+0.00015709784
+0.000135170659
+0.000101823378
+5.71531932e-05
+1.14628466e-05
+8.1890912e-07
+6.63546839e-07
+6.63046061e-07
+6.63552269e-07
+8.19589093e-07
+1.14728127e-05
+5.71660231e-05
+0.000101828675
+0.000135172175
+0.000157097385
+0.000166295616
+0.000161250284
+0.000140631587
+0.000104075543
+4.55434174e-05
+4.57993795e-05
+0.000104094295
+0.000140641079
+0.000161260968
+0.000166308427
+0.000157112377
+0.000135188507
+0.000101844353
+5.71811917e-05
+1.1478491e-05
+8.19479932e-07
+6.63545184e-07
+6.63042761e-07
+6.63550643e-07
+8.20164465e-07
+1.14885076e-05
+5.71940728e-05
+0.000101849668
+0.000135190022
+0.000157111918
+0.000166306744
+0.000161258103
+0.000140636357
+0.000104077677
+4.55430442e-05
+4.57995615e-05
+0.000104096475
+0.000140645875
+0.000161268792
+0.000166319515
+0.00015712681
+0.000135206201
+0.000101865159
+5.72090325e-05
+1.14940802e-05
+8.20050582e-07
+6.63543525e-07
+6.63039457e-07
+6.63549022e-07
+8.20739582e-07
+1.15041463e-05
+5.72219635e-05
+0.000101870489
+0.000135207718
+0.000157126348
+0.000166317825
+0.000161265918
+0.000140641141
+0.00010407982
+4.55426736e-05
+4.57997487e-05
+0.000104098659
+0.000140650677
+0.0001612766
+0.000166330544
+0.000157141131
+0.000135223735
+0.000101885793
+5.72367148e-05
+1.15096134e-05
+8.20620996e-07
+6.63541876e-07
+6.63036151e-07
+6.63547392e-07
+8.2131438e-07
+1.15197281e-05
+5.72496949e-05
+0.000101891141
+0.000135225256
+0.000157140665
+0.00016632885
+0.000161273718
+0.000140645931
+0.000104081967
+4.55423054e-05
+4.57999409e-05
+0.000104100843
+0.000140655477
+0.000161284385
+0.000166341507
+0.00015715533
+0.000135241105
+0.000101906256
+5.72642398e-05
+1.15250901e-05
+8.21191113e-07
+6.63540213e-07
+6.6303284e-07
+6.63545767e-07
+8.21888807e-07
+1.15352524e-05
+5.72772676e-05
+0.000101911621
+0.000135242629
+0.000157154861
+0.000166339805
+0.000161281494
+0.000140650719
+0.000104084113
+4.55419393e-05
+4.58001379e-05
+0.000104103023
+0.000140660268
+0.000161292133
+0.000166352388
+0.000157169398
+0.000135258307
+0.000101926545
+5.72916072e-05
+1.15405098e-05
+8.21760881e-07
+6.63538558e-07
+6.63029537e-07
+6.63544139e-07
+8.22462806e-07
+1.15507188e-05
+5.73046817e-05
+0.000101931925
+0.000135259833
+0.000157168926
+0.000166350681
+0.000161289234
+0.000140655498
+0.000104086255
+4.5541575e-05
+4.58003394e-05
+0.000104105193
+0.000140665041
+0.000161299837
+0.000166363181
+0.000157183327
+0.000135275334
+0.00010194666
+5.73188175e-05
+1.15558722e-05
+8.2233025e-07
+6.63536901e-07
+6.63026226e-07
+6.63542512e-07
+8.23036342e-07
+1.1566127e-05
+5.73319378e-05
+0.000101952056
+0.000135276864
+0.000157182853
+0.000166361469
+0.000161296931
+0.000140660259
+0.000104088387
+4.55412122e-05
+4.58005449e-05
+0.00010410735
+0.000140669787
+0.000161307485
+0.000166373872
+0.00015719711
+0.000135292184
+0.0001019666
+5.73458712e-05
+1.15711769e-05
+8.22899171e-07
+6.63535237e-07
+6.63022918e-07
+6.63540884e-07
+8.23609368e-07
+1.15814767e-05
+5.73590363e-05
+0.000101972012
+0.000135293718
+0.000157196632
+0.000166372155
+0.000161304571
+0.000140664993
+0.000104090505
+4.55408505e-05
+4.58007543e-05
+0.000104109488
+0.000140674498
+0.000161315066
+0.000166384454
+0.000157210736
+0.000135308853
+0.000101986364
+5.73727687e-05
+1.15864236e-05
+8.23467598e-07
+6.63533578e-07
+6.63019605e-07
+6.63539247e-07
+8.24181839e-07
+1.15967674e-05
+5.73859777e-05
+0.000101991792
+0.00013531039
+0.000157210256
+0.000166382731
+0.000161312145
+0.000140669692
+0.000104092603
+4.55404896e-05
+4.58009672e-05
+0.000104111601
+0.000140679165
+0.000161322572
+0.000166394914
+0.0001572242
+0.000135325336
+0.000102005953
+5.73995095e-05
+1.16016117e-05
+8.24035485e-07
+6.63531916e-07
+6.63016298e-07
+6.63537612e-07
+8.2475371e-07
+1.16119989e-05
+5.74127617e-05
+0.000102011395
+0.000135326876
+0.000157223718
+0.000166393187
+0.000161319643
+0.000140674348
+0.000104094678
+4.55401293e-05
+4.58011833e-05
+0.000104113685
+0.00014068378
+0.00016132999
+0.000166405244
+0.000157237492
+0.000135341629
+0.000102025363
+5.74260936e-05
+1.16167407e-05
+8.24602769e-07
+6.63530254e-07
+6.63012983e-07
+6.63535978e-07
+8.25324936e-07
+1.16271703e-05
+5.74393876e-05
+0.000102030822
+0.000135343173
+0.00015723701
+0.000166403512
+0.000161327054
+0.000140678951
+0.000104096722
+4.5539769e-05
+4.58014021e-05
+0.000104115734
+0.000140688332
+0.00016133731
+0.000166415432
+0.000157250607
+0.000135357729
+0.000102044595
+5.74525198e-05
+1.16318097e-05
+8.25169403e-07
+6.6352858e-07
+6.63009674e-07
+6.63534342e-07
+8.25895454e-07
+1.1642281e-05
+5.74658548e-05
+0.000102050071
+0.000135359279
+0.000157250122
+0.000166413697
+0.000161334367
+0.000140683493
+0.000104098731
+4.55394084e-05
+4.58016233e-05
+0.000104117746
+0.000140692816
+0.000161344521
+0.000166425469
+0.000157263536
+0.000135373632
+0.000102063647
+5.74787871e-05
+1.16468177e-05
+8.25735317e-07
+6.63526915e-07
+6.63006355e-07
+6.63532697e-07
+8.26465211e-07
+1.16573299e-05
+5.74921624e-05
+0.000102069139
+0.000135375186
+0.00015726305
+0.000166423731
+0.000161341573
+0.000140687965
+0.000104100702
+4.55390473e-05
+4.58018466e-05
+0.000104119713
+0.00014069722
+0.000161351615
+0.000166435348
+0.000157276272
+0.000135389335
+0.000102082517
+5.75048937e-05
+1.16617635e-05
+8.26300442e-07
+6.63525241e-07
+6.63003043e-07
+6.63531048e-07
+8.27034127e-07
+1.16723159e-05
+5.75183085e-05
+0.000102088024
+0.000135390892
+0.000157275787
+0.000166433605
+0.000161348661
+0.000140692359
+0.000104102629
+4.5538685e-05
+4.58020714e-05
+0.000104121631
+0.000140701537
+0.000161358581
+0.000166445055
+0.00015728881
+0.000135404831
+0.000102101205
+5.75308382e-05
+1.16766459e-05
+8.26864706e-07
+6.63523569e-07
+6.62999723e-07
+6.63529406e-07
+8.27602145e-07
+1.16872378e-05
+5.75442913e-05
+0.000102106726
+0.000135406394
+0.000157288324
+0.000166443311
+0.000161355621
+0.000140696666
+0.000104104506
+4.55383213e-05
+4.58022977e-05
+0.000104123496
+0.00014070576
+0.000161365411
+0.000166454587
+0.000157301144
+0.00013542012
+0.000102119706
+5.75566185e-05
+1.16914636e-05
+8.27428037e-07
+6.63521891e-07
+6.62996406e-07
+6.63527749e-07
+8.28169182e-07
+1.17020943e-05
+5.75701094e-05
+0.000102125244
+0.000135421688
+0.000157300658
+0.000166452838
+0.000161362444
+0.000140700878
+0.00010410633
+4.55379558e-05
+4.58025247e-05
+0.000104125304
+0.000140709879
+0.000161372092
+0.000166463932
+0.000157313264
+0.000135435198
+0.000102138022
+5.75822328e-05
+1.17062153e-05
+8.27990348e-07
+6.63520209e-07
+6.62993087e-07
+6.63526094e-07
+8.28735172e-07
+1.17168841e-05
+5.75957607e-05
+0.000102143576
+0.000135436772
+0.000157312778
+0.00016646218
+0.000161369119
+0.000140704987
+0.000104108097
+4.5537588e-05
+4.58027523e-05
+0.000104127049
+0.000140713889
+0.000161378618
+0.000166473083
+0.000157325169
+0.000135450062
+0.000102156148
+5.76076794e-05
+1.17208997e-05
+8.28551591e-07
+6.63518525e-07
+6.62989765e-07
+6.6352444e-07
+8.29300045e-07
+1.17316059e-05
+5.76212435e-05
+0.000102161718
+0.000135451641
+0.000157324684
+0.000166471328
+0.000161375641
+0.000140708986
+0.000104109801
+4.55372176e-05
+4.580298e-05
+0.00010412873
+0.000140717781
+0.000161384981
+0.000166482032
+0.000157336852
+0.000135464707
+0.000102174086
+5.76329565e-05
+1.17355156e-05
+8.29111678e-07
+6.63516831e-07
+6.62986448e-07
+6.63522775e-07
+8.2986373e-07
+1.17462587e-05
+5.7646556e-05
+0.000102179671
+0.000135466293
+0.000157336367
+0.000166480276
+0.000161381999
+0.000140712868
+0.00010411144
+4.55368442e-05
+4.58032075e-05
+0.000104130341
+0.000140721548
+0.000161391173
+0.000166490774
+0.000157348308
+0.000135479133
+0.000102191835
+5.76580628e-05
+1.17500621e-05
+8.2967056e-07
+6.63515147e-07
+6.62983128e-07
+6.6352111e-07
+8.30426176e-07
+1.17608413e-05
+5.76716971e-05
+0.000102197433
+0.000135480724
+0.000157347824
+0.000166489017
+0.000161388186
+0.000140716627
+0.000104113009
+4.55364673e-05
+4.58034343e-05
+0.00010413188
+0.000140725187
+0.000161397187
+0.000166499302
+0.000157359535
+0.000135493338
+0.00010220939
+5.7682997e-05
+1.17645383e-05
+8.30228176e-07
+6.63513445e-07
+6.62979802e-07
+6.63519439e-07
+8.30987322e-07
+1.1775353e-05
+5.7696665e-05
+0.000102215004
+0.000135494935
+0.000157359052
+0.000166497542
+0.000161394194
+0.000140720254
+0.000104114506
+4.55360866e-05
+4.58036601e-05
+0.000104133344
+0.000140728688
+0.000161403015
+0.00016650761
+0.000157370526
+0.00013550732
+0.000102226753
+5.77077578e-05
+1.17789433e-05
+8.30784477e-07
+6.63511745e-07
+6.62976476e-07
+6.63517769e-07
+8.31547117e-07
+1.17897929e-05
+5.77214592e-05
+0.000102232381
+0.000135508922
+0.000157370045
+0.000166505848
+0.000161400019
+0.000140723746
+0.000104115926
+4.55357017e-05
+4.58038845e-05
+0.000104134729
+0.000140732049
+0.000161408652
+0.000166515694
+0.000157381282
+0.000135521077
+0.000102243922
+5.77323443e-05
+1.17932764e-05
+8.31339417e-07
+6.63510042e-07
+6.62973157e-07
+6.63516095e-07
+8.32105518e-07
+1.18041603e-05
+5.77460783e-05
+0.000102249565
+0.000135522684
+0.0001573808
+0.00016651393
+0.000161405651
+0.000140727096
+0.000104117269
+4.55353121e-05
+4.58041072e-05
+0.000104136033
+0.000140735262
+0.000161414093
+0.000166523546
+0.000157391796
+0.000135534605
+0.000102260897
+5.77567555e-05
+1.1807537e-05
+8.31892944e-07
+6.63508338e-07
+6.62969826e-07
+6.63514413e-07
+8.32662479e-07
+1.18184547e-05
+5.77705214e-05
+0.000102266555
+0.00013553622
+0.000157391316
+0.000166521782
+0.000161411086
+0.0001407303
+0.00010411853
+4.55349177e-05
+4.58043278e-05
+0.000104137255
+0.000140738324
+0.00016141933
+0.000166531166
+0.000157402067
+0.000135547907
+0.000102277678
+5.77809907e-05
+1.18217245e-05
+8.32445021e-07
+6.6350662e-07
+6.629665e-07
+6.63512725e-07
+8.33217962e-07
+1.18326753e-05
+5.77947876e-05
+0.000102283351
+0.000135549527
+0.000157401588
+0.0001665294
+0.000161416319
+0.000140733353
+0.000104119709
+4.55345179e-05
+4.5804546e-05
+0.000104138392
+0.000140741232
+0.00016142436
+0.000166538546
+0.00015741209
+0.000135560979
+0.000102294263
+5.78050481e-05
+1.18358379e-05
+8.32995597e-07
+6.63504899e-07
+6.62963175e-07
+6.63511025e-07
+8.33771911e-07
+1.18468214e-05
+5.78188761e-05
+0.00010229995
+0.000135562606
+0.000157411614
+0.000166536779
+0.000161421345
+0.00014073625
+0.000104120801
+4.55341123e-05
+4.58047615e-05
+0.000104139441
+0.000140743979
+0.000161429178
+0.000166545684
+0.000157421866
+0.000135573819
+0.00010231065
+5.78289265e-05
+1.18498766e-05
+8.33544618e-07
+6.63503181e-07
+6.62959846e-07
+6.63509328e-07
+8.34324285e-07
+1.18608921e-05
+5.78427845e-05
+0.000102316352
+0.000135575454
+0.000157421392
+0.000166543915
+0.000161426158
+0.000140738988
+0.000104121807
+4.55337008e-05
+4.58049738e-05
+0.000104140404
+0.000140746565
+0.000161433779
+0.000166552577
+0.000157431392
+0.000135586428
+0.00010232684
+5.78526245e-05
+1.18638396e-05
+8.34092041e-07
+6.6350145e-07
+6.62956514e-07
+6.63507626e-07
+8.3487502e-07
+1.18748866e-05
+5.78665119e-05
+0.000102332555
+0.000135588069
+0.000157430918
+0.000166550807
+0.000161430755
+0.000140741565
+0.000104122725
+4.55332829e-05
+4.58051828e-05
+0.000104141277
+0.000140748985
+0.000161438162
+0.00016655922
+0.000157440664
+0.000135598802
+0.000102342829
+5.78761396e-05
+1.18777255e-05
+8.34637797e-07
+6.63499715e-07
+6.62953184e-07
+6.63505915e-07
+8.35424071e-07
+1.18888037e-05
+5.78900561e-05
+0.000102348561
+0.000135600449
+0.000157440194
+0.00016655745
+0.000161435134
+0.000140743975
+0.000104123553
+4.55328583e-05
+4.58053881e-05
+0.000104142061
+0.000140751238
+0.000161442321
+0.000166565613
+0.000157449682
+0.000135610943
+0.000102358619
+5.78994702e-05
+1.18915333e-05
+8.35181819e-07
+6.63497974e-07
+6.62949848e-07
+6.63504205e-07
+8.35971357e-07
+1.19026421e-05
+5.79134148e-05
+0.000102364364
+0.000135612596
+0.000157449214
+0.000166563841
+0.000161439289
+0.000140746218
+0.000104124291
+4.55324267e-05
+4.58055895e-05
+0.000104142753
+0.000140753321
+0.000161446256
+0.000166571752
+0.000157458443
+0.000135622846
+0.000102374206
+5.79226131e-05
+1.19052614e-05
+8.35724031e-07
+6.63496226e-07
+6.62946512e-07
+6.63502479e-07
+8.36516821e-07
+1.19164003e-05
+5.79365857e-05
+0.000102379965
+0.000135624507
+0.000157457978
+0.000166569978
+0.00016144322
+0.000140748291
+0.000104124938
+4.55319879e-05
+4.58057868e-05
+0.000104143356
+0.000140755232
+0.000161449963
+0.000166577634
+0.000157466947
+0.000135634511
+0.000102389586
+5.79455659e-05
+1.19189082e-05
+8.36264361e-07
+6.63494471e-07
+6.62943173e-07
+6.63500747e-07
+8.37060368e-07
+1.19300767e-05
+5.79595659e-05
+0.00010239536
+0.000135636179
+0.000157466483
+0.000166575861
+0.000161446923
+0.000140750193
+0.000104125496
+4.55315415e-05
+4.58059797e-05
+0.000104143869
+0.000140756972
+0.00016145344
+0.000166583258
+0.000157475191
+0.000135645938
+0.000102404763
+5.79683255e-05
+1.19324718e-05
+8.36802719e-07
+6.63492712e-07
+6.62939827e-07
+6.63499016e-07
+8.37601915e-07
+1.19436696e-05
+5.79823523e-05
+0.00010241055
+0.000135647612
+0.00015747473
+0.000166581484
+0.000161450395
+0.000140751923
+0.000104125962
+4.55310875e-05
+4.58061679e-05
+0.000104144291
+0.000140758539
+0.000161456686
+0.000166588624
+0.000157483175
+0.000135657123
+0.00010241973
+5.79908885e-05
+1.19459505e-05
+8.37339014e-07
+6.63490944e-07
+6.62936492e-07
+6.63497273e-07
+8.38141381e-07
+1.19571771e-05
+5.80049417e-05
+0.00010242553
+0.000135658804
+0.000157482717
+0.00016658685
+0.000161453638
+0.000140753479
+0.000104126338
+4.55306254e-05
+4.58063514e-05
+0.000104144624
+0.000140759932
+0.000161459702
+0.000166593731
+0.000157490898
+0.000135668066
+0.000102434487
+5.80132518e-05
+1.19593422e-05
+8.37873149e-07
+6.63489164e-07
+6.62933149e-07
+6.63495524e-07
+8.38678663e-07
+1.1970597e-05
+5.8027331e-05
+0.000102440301
+0.000135669756
+0.000157490442
+0.000166591956
+0.000161456649
+0.000140754863
+0.000104126624
+4.55301551e-05
+4.58065299e-05
+0.000104144869
+0.000140761152
+0.000161462485
+0.000166598577
+0.000157498359
+0.000135678768
+0.00010244903
+5.80354119e-05
+1.19726448e-05
+8.38405028e-07
+6.63487383e-07
+6.62929804e-07
+6.63493759e-07
+8.39213665e-07
+1.19839276e-05
+5.80495164e-05
+0.000102454859
+0.000135680463
+0.000157497906
+0.000166596801
+0.000161459428
+0.000140756074
+0.000104126822
+4.55296766e-05
+4.58067033e-05
+0.000104145026
+0.000140762201
+0.000161465037
+0.000166603163
+0.000157505558
+0.000135689224
+0.000102463361
+5.80573653e-05
+1.19858562e-05
+8.3893455e-07
+6.63485594e-07
+6.62926456e-07
+6.63491992e-07
+8.39746284e-07
+1.19971665e-05
+5.80714947e-05
+0.000102469202
+0.000135690927
+0.000157505107
+0.000166601387
+0.000161461976
+0.000140757112
+0.000104126932
+4.55291894e-05
+4.58068715e-05
+0.000104145098
+0.000140763079
+0.000161467358
+0.000166607489
+0.000157512495
+0.000135699437
+0.000102477475
+5.80791087e-05
+1.19989744e-05
+8.39461613e-07
+6.63483796e-07
+6.62923103e-07
+6.63490219e-07
+8.40276422e-07
+1.20103117e-05
+5.80932627e-05
+0.000102483329
+0.000135701145
+0.000157512046
+0.000166605712
+0.000161464293
+0.00014075798
+0.000104126956
+4.55286936e-05
+4.58070343e-05
+0.000104145086
+0.000140763788
+0.00016146945
+0.000166611558
+0.00015751917
+0.000135709402
+0.000102491371
+5.81006385e-05
+1.2011997e-05
+8.39986106e-07
+6.6348199e-07
+6.62919754e-07
+6.63488443e-07
+8.40803959e-07
+1.20233609e-05
+5.81148163e-05
+0.000102497237
+0.000135711121
+0.000157518724
+0.000166609779
+0.000161466381
+0.000140758679
+0.000104126895
+4.55281891e-05
+4.58071917e-05
+0.000104144991
+0.00014076433
+0.000161471314
+0.000166615367
+0.000157525584
+0.000135719124
+0.000102505045
+5.8121951e-05
+1.20249219e-05
+8.40507928e-07
+6.63480171e-07
+6.62916404e-07
+6.63486647e-07
+8.41328789e-07
+1.20363119e-05
+5.81361521e-05
+0.000102510927
+0.000135720848
+0.000157525141
+0.000166613588
+0.000161468241
+0.00014075921
+0.000104126752
+4.55276757e-05
+4.58073437e-05
+0.000104144817
+0.000140764708
+0.000161472953
+0.000166618919
+0.000157531737
+0.0001357286
+0.000102518499
+5.8143043e-05
+1.20377469e-05
+8.41026972e-07
+6.63478349e-07
+6.62913053e-07
+6.63484849e-07
+8.41850804e-07
+1.20491623e-05
+5.81572667e-05
+0.000102524393
+0.000135730329
+0.000157531297
+0.00016661714
+0.000161469874
+0.000140759578
+0.000104126529
+4.55271534e-05
+4.58074901e-05
+0.000104144565
+0.000140764923
+0.000161474368
+0.000166622219
+0.000157537631
+0.000135737828
+0.000102531731
+5.81639114e-05
+1.20504698e-05
+8.41543125e-07
+6.63476509e-07
+6.62909702e-07
+6.63483041e-07
+8.42369871e-07
+1.206191e-05
+5.81781567e-05
+0.000102537637
+0.000135739565
+0.000157537193
+0.000166620438
+0.000161471285
+0.000140759783
+0.000104126228
+4.5526622e-05
+4.58076308e-05
+0.000104144237
+0.00014076498
+0.000161475563
+0.000166625266
+0.000157543269
+0.000135746811
+0.000102544738
+5.81845525e-05
+1.20630884e-05
+8.42056277e-07
+6.63474675e-07
+6.62906347e-07
+6.63481219e-07
+8.42885864e-07
+1.20745523e-05
+5.81988181e-05
+0.000102550653
+0.000135748554
+0.000157542832
+0.000166623485
+0.000161472475
+0.000140759829
+0.000104125851
+4.55260817e-05
+4.5807766e-05
+0.000104143837
+0.000140764882
+0.000161476541
+0.000166628065
+0.000157548651
+0.000135755551
+0.00010255752
+5.82049645e-05
+1.20756006e-05
+8.42566329e-07
+6.63472821e-07
+6.6290299e-07
+6.63479393e-07
+8.43398636e-07
+1.20870868e-05
+5.82192472e-05
+0.000102563443
+0.000135757296
+0.000157548214
+0.000166626281
+0.000161473449
+0.000140759721
+0.000104125402
+4.55255323e-05
+4.58078955e-05
+0.000104143367
+0.000140764633
+0.000161477307
+0.000166630618
+0.000157553778
+0.000135764044
+0.000102570075
+5.82251434e-05
+1.20880043e-05
+8.43073164e-07
+6.63470957e-07
+6.62899638e-07
+6.63477545e-07
+8.43907997e-07
+1.20995104e-05
+5.82394397e-05
+0.000102576005
+0.000135765791
+0.000157553341
+0.000166628832
+0.00016147421
+0.000140759462
+0.000104124884
+4.5524974e-05
+4.58080194e-05
+0.000104142829
+0.000140764236
+0.000161477863
+0.000166632929
+0.000157558656
+0.000135772297
+0.000102582406
+5.82450887e-05
+1.21002977e-05
+8.43576679e-07
+6.63469089e-07
+6.62896272e-07
+6.63475683e-07
+8.44413729e-07
+1.211182e-05
+5.82593921e-05
+0.000102588335
+0.00013577404
+0.000157558215
+0.000166631138
+0.000161474761
+0.000140759057
+0.000104124299
+4.55244067e-05
+4.58081374e-05
+0.000104142227
+0.000140763697
+0.000161478215
+0.000166635002
+0.000157563286
+0.000135780308
+0.000102594511
+5.82647981e-05
+1.21124789e-05
+8.44076774e-07
+6.63467205e-07
+6.62892919e-07
+6.63473808e-07
+8.44915483e-07
+1.21240109e-05
+5.82790972e-05
+0.000102600429
+0.000135782042
+0.000157562836
+0.000166633207
+0.000161475109
+0.00014075851
+0.000104123653
+4.55238307e-05
+4.58082497e-05
+0.000104141564
+0.000140763018
+0.000161478369
+0.000166636845
+0.000157567676
+0.000135788084
+0.000102606397
+5.82842745e-05
+1.2124547e-05
+8.44573343e-07
+6.63465312e-07
+6.6288955e-07
+6.634719e-07
+8.45412795e-07
+1.21360778e-05
+5.82985503e-05
+0.000102612287
+0.000135789796
+0.00015756721
+0.000166635038
+0.000161475258
+0.000140757828
+0.00010412295
+4.55232463e-05
+4.5808356e-05
+0.000104140841
+0.000140762207
+0.00016147833
+0.000166638459
+0.000157571829
+0.000135795632
+0.000102618067
+5.83035192e-05
+1.21365008e-05
+8.45066309e-07
+6.63463412e-07
+6.62886196e-07
+6.63469946e-07
+8.4590487e-07
+1.21480116e-05
+5.83177388e-05
+0.000102623898
+0.000135797296
+0.000157571331
+0.000166636638
+0.000161475216
+0.000140757018
+0.000104122198
+4.55226538e-05
+4.58084559e-05
+0.000104140062
+0.000140761266
+0.000161478104
+0.000166639857
+0.000157575756
+0.000135802956
+0.000102629531
+5.83225437e-05
+1.21483421e-05
+8.45555628e-07
+6.63461497e-07
+6.62882828e-07
+6.63467935e-07
+8.46390451e-07
+1.21597999e-05
+5.8336651e-05
+0.000102635251
+0.000135804537
+0.000157575202
+0.000166638008
+0.000161474988
+0.00014075609
+0.000104121406
+4.55220541e-05
+4.58085491e-05
+0.000104139229
+0.0001407602
+0.000161477697
+0.000166641044
+0.000157579464
+0.00013581007
+0.000102640801
+5.83413542e-05
+1.21600708e-05
+8.46041246e-07
+6.63459577e-07
+6.62879461e-07
+6.63465824e-07
+8.4686725e-07
+1.21714174e-05
+5.83552516e-05
+0.000102646318
+0.000135811498
+0.000157578812
+0.000166639149
+0.000161474583
+0.000140755059
+0.000104120596
+4.55214489e-05
+4.58086349e-05
+0.00010413834
+0.000140759009
+0.00016147711
+0.000166642021
+0.00015758296
+0.000135816991
+0.000102651905
+5.83599692e-05
+1.217169e-05
+8.46523172e-07
+6.63457636e-07
+6.62876097e-07
+6.63463536e-07
+8.47331399e-07
+1.21828221e-05
+5.83734908e-05
+0.000102657064
+0.000135818148
+0.00015758213
+0.000166640046
+0.000161474005
+0.000140753945
+0.000104119801
+4.55208445e-05
+4.58087123e-05
+0.00010413741
+0.000140757703
+0.000161476338
+0.00016664277
+0.000157586214
+0.000135823679
+0.000102662816
+5.83784184e-05
+1.21832112e-05
+8.47001564e-07
+6.63455691e-07
+6.62872724e-07
+6.63460986e-07
+8.47776742e-07
+1.21939502e-05
+5.8391289e-05
+0.000102667355
+0.00013582435
+0.000157585047
+0.000166640627
+0.000161473241
+0.000140752802
+0.000104119149
+4.55202499e-05
+4.58087818e-05
+0.000104136431
+0.000140756274
+0.000161475379
+0.000166643278
+0.000157589189
+0.000135830072
+0.000102673446
+5.83966472e-05
+1.21946273e-05
+8.47476442e-07
+6.63453738e-07
+6.62869349e-07
+6.63458043e-07
+8.48194974e-07
+1.22046983e-05
+5.84085371e-05
+0.000102677115
+0.000135830128
+0.000157587707
+0.000166641167
+0.000161472706
+0.000140752202
+0.000104119589
+4.55196887e-05
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 8.4375e-07;
+    }
+    outlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+4.58087818e-05
+0.000104136431
+0.000140756274
+0.000161475379
+0.000166643278
+0.000157589189
+0.000135830072
+0.000102673446
+5.83966472e-05
+1.21946273e-05
+8.47476442e-07
+6.63453738e-07
+6.62869349e-07
+6.63458043e-07
+8.48194974e-07
+1.22046983e-05
+5.84085371e-05
+0.000102677115
+0.000135830128
+0.000157587707
+0.000166641167
+0.000161472706
+0.000140752202
+0.000104119589
+4.55196887e-05
+)
+;
+    }
+    wall1
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+    wall2
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/nut.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/nut.liquid
new file mode 100644
index 0000000000..78ee8edea8
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/nut.liquid
@@ -0,0 +1,2152 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      nut.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+4.57970073e-05
+0.000104055696
+0.000140550032
+0.00016110283
+0.000166072324
+0.000156791271
+0.000134780617
+0.000101355957
+5.65337446e-05
+1.11269604e-05
+8.07160144e-07
+6.63581645e-07
+6.63114507e-07
+6.6358608e-07
+8.0769525e-07
+1.11356419e-05
+5.65455057e-05
+0.000101361372
+0.000134782841
+0.000156791772
+0.000166071673
+0.000161100975
+0.000140546262
+0.000104047282
+4.57967689e-05
+4.57970483e-05
+0.000104056699
+0.000140552895
+0.000161108258
+0.000166080878
+0.000156803394
+0.000134796581
+0.00010137566
+5.65603448e-05
+1.11408079e-05
+8.07623137e-07
+6.63580212e-07
+6.63111755e-07
+6.63584729e-07
+8.08168161e-07
+1.11495272e-05
+5.65719372e-05
+0.000101380621
+0.000134798164
+0.000156803136
+0.000166079419
+0.000161105617
+0.000140548431
+0.000104047723
+4.57975038e-05
+4.57970961e-05
+0.000104057892
+0.000140556229
+0.000161114564
+0.000166090828
+0.000156817524
+0.000134815228
+0.000101398734
+5.65914442e-05
+1.11571394e-05
+8.08172112e-07
+6.63578529e-07
+6.63108511e-07
+6.6358311e-07
+8.08727731e-07
+1.11659262e-05
+5.6603098e-05
+0.000101403699
+0.000134816789
+0.000156817236
+0.000166089344
+0.000161111904
+0.000140551751
+0.000104048899
+4.57974805e-05
+4.57971479e-05
+0.000104059161
+0.000140559669
+0.000161121
+0.000166100919
+0.000156831785
+0.000134833978
+0.000101421849
+5.66224193e-05
+1.11734872e-05
+8.08724222e-07
+6.63576848e-07
+6.63105254e-07
+6.63581493e-07
+8.09289889e-07
+1.11823452e-05
+5.66341422e-05
+0.000101426831
+0.000134835533
+0.000156831488
+0.000166099425
+0.000161118333
+0.000140555182
+0.00010405015
+4.57975524e-05
+4.57972047e-05
+0.000104060504
+0.000140563212
+0.000161127558
+0.000166111131
+0.000156846152
+0.000134852786
+0.000101444932
+5.66532048e-05
+1.11898106e-05
+8.09278147e-07
+6.63575167e-07
+6.6310199e-07
+6.63579878e-07
+8.09853214e-07
+1.119874e-05
+5.66649967e-05
+0.000101449932
+0.000134854336
+0.000156845842
+0.000166109627
+0.00016112488
+0.000140558715
+0.000104051476
+4.57976181e-05
+4.57972673e-05
+0.000104061924
+0.00014056686
+0.000161134239
+0.000166121473
+0.00015686063
+0.000134871663
+0.000101467989
+5.66838357e-05
+1.12061226e-05
+8.09834247e-07
+6.63573481e-07
+6.63098728e-07
+6.63578251e-07
+8.10418113e-07
+1.1215123e-05
+5.66956964e-05
+0.000101473008
+0.000134873208
+0.000156860307
+0.000166119956
+0.00016113155
+0.000140562351
+0.000104052876
+4.57976912e-05
+4.57973362e-05
+0.000104063416
+0.00014057061
+0.000161141042
+0.000166131941
+0.000156875218
+0.000134890604
+0.000101491019
+5.67143334e-05
+1.12224299e-05
+8.10392798e-07
+6.63571798e-07
+6.63095454e-07
+6.63576633e-07
+8.10984926e-07
+1.12315004e-05
+5.67262625e-05
+0.000101496056
+0.000134892144
+0.000156874885
+0.000166130411
+0.000161138342
+0.000140566089
+0.000104054348
+4.57977703e-05
+4.57974118e-05
+0.000104064977
+0.000140574459
+0.000161147959
+0.000166142525
+0.000156889906
+0.000134909595
+0.000101514002
+5.67447003e-05
+1.12387297e-05
+8.1095368e-07
+6.63570121e-07
+6.63092175e-07
+6.63575007e-07
+8.115536e-07
+1.12478691e-05
+5.6756697e-05
+0.000101519058
+0.000134911129
+0.000156889562
+0.000166140985
+0.000161145248
+0.000140569927
+0.000104055889
+4.57978562e-05
+4.57974944e-05
+0.000104066604
+0.000140578404
+0.000161154984
+0.000166153215
+0.000156904676
+0.000134928612
+0.000101536921
+5.67749268e-05
+1.12550128e-05
+8.11516557e-07
+6.63568449e-07
+6.63088895e-07
+6.63573381e-07
+8.12123845e-07
+1.12642198e-05
+5.67869904e-05
+0.000101541997
+0.000134930141
+0.000156904322
+0.000166151663
+0.000161152262
+0.000140573858
+0.000104057495
+4.5797949e-05
+4.57975841e-05
+0.000104068293
+0.000140582437
+0.000161162107
+0.000166163999
+0.000156919511
+0.000134947628
+0.000101559751
+5.68050003e-05
+1.12712687e-05
+8.12081009e-07
+6.6356677e-07
+6.63085602e-07
+6.63571754e-07
+8.12695299e-07
+1.1280542e-05
+5.68171299e-05
+0.000101564847
+0.000134949156
+0.000156919146
+0.000166162436
+0.000161159374
+0.000140577879
+0.000104059163
+4.57980488e-05
+4.57976809e-05
+0.00010407004
+0.000140586556
+0.000161169325
+0.000166174866
+0.000156934395
+0.000134966628
+0.000101582476
+5.68349119e-05
+1.12874891e-05
+8.1264671e-07
+6.635651e-07
+6.63082317e-07
+6.6357013e-07
+8.13267661e-07
+1.12968273e-05
+5.68471062e-05
+0.00010158759
+0.000134968152
+0.00015693402
+0.000166173291
+0.00016116658
+0.000140581984
+0.000104060889
+4.57981557e-05
+4.5797785e-05
+0.000104071843
+0.000140590757
+0.00016117663
+0.000166185807
+0.000156949314
+0.000134985591
+0.000101605086
+5.68646572e-05
+1.13036685e-05
+8.13213405e-07
+6.63563428e-07
+6.63079027e-07
+6.63568504e-07
+8.13840718e-07
+1.13130702e-05
+5.68769157e-05
+0.000101610216
+0.000134987113
+0.00015694893
+0.000166184222
+0.000161173874
+0.000140586173
+0.00010406267
+4.57982699e-05
+4.57978962e-05
+0.000104073697
+0.000140595037
+0.000161184018
+0.000166196813
+0.000156964257
+0.000135004505
+0.000101627568
+5.6894237e-05
+1.13198041e-05
+8.13780939e-07
+6.6356176e-07
+6.63075737e-07
+6.6356688e-07
+8.14414349e-07
+1.1329268e-05
+5.6906558e-05
+0.000101632716
+0.000135006025
+0.000156963863
+0.000166195217
+0.000161181252
+0.00014059044
+0.000104064503
+4.57983912e-05
+4.57980145e-05
+0.000104075599
+0.000140599391
+0.000161191483
+0.000166207878
+0.000156979211
+0.000135023358
+0.000101649918
+5.69236529e-05
+1.13358946e-05
+8.14349194e-07
+6.63560098e-07
+6.63072443e-07
+6.63565254e-07
+8.14988466e-07
+1.13454193e-05
+5.69360355e-05
+0.000101655084
+0.000135024876
+0.00015697881
+0.000166206273
+0.000161188706
+0.000140594781
+0.000104066384
+4.57985195e-05
+4.57981399e-05
+0.000104077547
+0.000140603816
+0.000161199019
+0.000166218992
+0.000156994168
+0.00013504214
+0.000101672131
+5.69529078e-05
+1.13519394e-05
+8.14918089e-07
+6.63558432e-07
+6.63069147e-07
+6.63563628e-07
+8.15563006e-07
+1.13615235e-05
+5.69653507e-05
+0.000101677314
+0.000135043654
+0.000156993758
+0.000166217376
+0.000161196231
+0.000140599193
+0.00010406831
+4.5798655e-05
+4.57982723e-05
+0.000104079536
+0.000140608306
+0.000161206621
+0.000166230146
+0.000157009113
+0.000135060838
+0.000101694204
+5.69820044e-05
+1.13679379e-05
+8.15487552e-07
+6.63556768e-07
+6.63065854e-07
+6.63562008e-07
+8.16137932e-07
+1.13775803e-05
+5.69945064e-05
+0.000101699405
+0.000135062352
+0.000157008695
+0.00016622852
+0.000161203823
+0.000140603671
+0.000104070277
+4.57987973e-05
+4.57984114e-05
+0.000104081563
+0.000140612858
+0.000161214281
+0.000166241329
+0.000157024034
+0.000135079442
+0.000101716133
+5.70109437e-05
+1.13838895e-05
+8.16057489e-07
+6.63555116e-07
+6.63062556e-07
+6.63560382e-07
+8.16713169e-07
+1.1393589e-05
+5.70235039e-05
+0.00010172135
+0.000135080955
+0.00015702361
+0.000166239695
+0.000161211472
+0.000140608208
+0.000104072283
+4.57989464e-05
+4.57985572e-05
+0.000104083625
+0.000140617463
+0.000161221991
+0.000166252533
+0.000157038922
+0.000135097943
+0.00010173791
+5.7039727e-05
+1.1399793e-05
+8.1662782e-07
+6.63553453e-07
+6.63059259e-07
+6.6355876e-07
+8.17288638e-07
+1.14095484e-05
+5.70523438e-05
+0.000101743145
+0.000135099456
+0.000157038492
+0.000166250889
+0.000161219171
+0.000140612802
+0.000104074321
+4.57991022e-05
+4.57987095e-05
+0.000104085715
+0.000140622118
+0.000161229743
+0.000166263745
+0.000157053764
+0.000135116329
+0.000101759536
+5.7068354e-05
+1.14156474e-05
+8.17198444e-07
+6.63551799e-07
+6.63055953e-07
+6.63557138e-07
+8.17864262e-07
+1.14254576e-05
+5.70810269e-05
+0.000101764788
+0.000135117842
+0.000157053326
+0.000166262093
+0.000161226913
+0.000140617444
+0.000104076391
+4.57992645e-05
+4.57988681e-05
+0.000104087833
+0.000140626815
+0.000161237529
+0.000166274955
+0.000157068545
+0.000135134593
+0.000101781004
+5.70968252e-05
+1.14314511e-05
+8.17769255e-07
+6.63550138e-07
+6.63052652e-07
+6.63555519e-07
+8.18439954e-07
+1.1441315e-05
+5.71095522e-05
+0.000101786273
+0.000135136107
+0.000157068102
+0.000166273295
+0.000161234689
+0.000140622128
+0.000104078486
+4.57994331e-05
+4.57990329e-05
+0.000104089972
+0.000140631547
+0.000161245337
+0.000166286151
+0.000157083257
+0.000135152727
+0.000101802311
+5.71251391e-05
+1.1447203e-05
+8.18340163e-07
+6.63548484e-07
+6.63049355e-07
+6.63553894e-07
+8.19015627e-07
+1.14571195e-05
+5.71379198e-05
+0.000101807596
+0.000135154242
+0.000157082808
+0.000166284484
+0.000161242488
+0.000140626847
+0.000104080602
+4.57996078e-05
+4.57992036e-05
+0.000104092128
+0.000140636308
+0.00016125316
+0.000166297323
+0.000157097886
+0.00013517072
+0.000101823454
+5.71532957e-05
+1.14629018e-05
+8.1891107e-07
+6.63546834e-07
+6.6304605e-07
+6.63552267e-07
+8.19591187e-07
+1.14728698e-05
+5.71661285e-05
+0.000101828753
+0.000135172237
+0.000157097432
+0.000166295648
+0.000161250302
+0.000140631595
+0.000104082737
+4.57997886e-05
+4.57993801e-05
+0.000104094299
+0.00014064109
+0.000161260989
+0.000166308459
+0.000157112423
+0.000135188567
+0.000101844428
+5.71812941e-05
+1.14785462e-05
+8.19481888e-07
+6.63545178e-07
+6.6304275e-07
+6.6355064e-07
+8.20166567e-07
+1.14885649e-05
+5.71941783e-05
+0.000101849745
+0.000135190085
+0.000157111965
+0.000166306776
+0.000161258121
+0.000140636365
+0.000104084886
+4.5799975e-05
+4.57995621e-05
+0.000104096479
+0.000140645886
+0.000161268813
+0.000166319547
+0.000157126856
+0.000135206261
+0.000101865234
+5.72091349e-05
+1.14941355e-05
+8.20052545e-07
+6.6354352e-07
+6.63039446e-07
+6.63549019e-07
+8.20741692e-07
+1.15042036e-05
+5.7222069e-05
+0.000101870567
+0.000135207781
+0.000157126394
+0.000166317857
+0.000161265936
+0.000140641149
+0.000104087043
+4.5800167e-05
+4.57997493e-05
+0.000104098663
+0.000140650688
+0.000161276621
+0.000166330577
+0.000157141177
+0.000135223796
+0.000101885869
+5.72368172e-05
+1.15096688e-05
+8.20622965e-07
+6.6354187e-07
+6.6303614e-07
+6.63547389e-07
+8.21316497e-07
+1.15197855e-05
+5.72498003e-05
+0.000101891219
+0.000135225318
+0.000157140711
+0.000166328882
+0.000161273736
+0.000140645939
+0.000104089205
+4.58003643e-05
+4.57999415e-05
+0.000104100847
+0.000140655488
+0.000161284405
+0.000166341539
+0.000157155376
+0.000135241166
+0.000101906332
+5.72643422e-05
+1.15251455e-05
+8.21193089e-07
+6.63540208e-07
+6.63032829e-07
+6.63545764e-07
+8.21890932e-07
+1.15353098e-05
+5.7277373e-05
+0.000101911698
+0.000135242691
+0.000157154908
+0.000166339837
+0.000161281512
+0.000140650727
+0.000104091367
+4.58005666e-05
+4.58001385e-05
+0.000104103027
+0.000140660279
+0.000161292154
+0.000166352421
+0.000157169444
+0.000135258368
+0.00010192662
+5.72917096e-05
+1.15405653e-05
+8.21762863e-07
+6.63538552e-07
+6.63029526e-07
+6.63544137e-07
+8.22464938e-07
+1.15507763e-05
+5.73047871e-05
+0.000101932003
+0.000135259895
+0.000157168973
+0.000166350713
+0.000161289253
+0.000140655506
+0.000104093525
+4.58007737e-05
+4.580034e-05
+0.000104105197
+0.000140665052
+0.000161299858
+0.000166363214
+0.000157183373
+0.000135275395
+0.000101946735
+5.73189199e-05
+1.15559277e-05
+8.22332238e-07
+6.63536896e-07
+6.63026215e-07
+6.6354251e-07
+8.23038482e-07
+1.15661846e-05
+5.73320432e-05
+0.000101952134
+0.000135276927
+0.0001571829
+0.0001663615
+0.000161296949
+0.000140660267
+0.000104095673
+4.58009853e-05
+4.58005456e-05
+0.000104107354
+0.000140669798
+0.000161307505
+0.000166373904
+0.000157197156
+0.000135292245
+0.000101966675
+5.73459735e-05
+1.15712324e-05
+8.22901166e-07
+6.63535232e-07
+6.63022907e-07
+6.63540882e-07
+8.23611516e-07
+1.15815342e-05
+5.73591417e-05
+0.00010197209
+0.00013529378
+0.000157196679
+0.000166372187
+0.000161304589
+0.000140665001
+0.000104097807
+4.58012011e-05
+4.5800755e-05
+0.000104109492
+0.000140674509
+0.000161315087
+0.000166384487
+0.000157210782
+0.000135308914
+0.00010198644
+5.7372871e-05
+1.15864792e-05
+8.234696e-07
+6.63533573e-07
+6.63019595e-07
+6.63539245e-07
+8.24183995e-07
+1.1596825e-05
+5.73860831e-05
+0.00010199187
+0.000135310452
+0.000157210303
+0.000166382763
+0.000161312164
+0.0001406697
+0.000104099922
+4.58014207e-05
+4.5800968e-05
+0.000104111605
+0.000140679176
+0.000161322592
+0.000166394946
+0.000157224246
+0.000135325397
+0.000102006028
+5.73996119e-05
+1.16016674e-05
+8.24037493e-07
+6.63531911e-07
+6.63016288e-07
+6.6353761e-07
+8.24755873e-07
+1.16120565e-05
+5.74128671e-05
+0.000102011473
+0.000135326939
+0.000157223765
+0.000166393219
+0.000161319661
+0.000140674356
+0.000104102013
+4.58016439e-05
+4.5801184e-05
+0.000104113689
+0.00014068379
+0.00016133001
+0.000166405276
+0.000157237538
+0.000135341689
+0.000102025438
+5.74261959e-05
+1.16167964e-05
+8.24604784e-07
+6.63530249e-07
+6.63012972e-07
+6.63535975e-07
+8.25327107e-07
+1.1627228e-05
+5.74394929e-05
+0.0001020309
+0.000135343236
+0.000157237056
+0.000166403543
+0.000161327072
+0.000140678959
+0.000104104075
+4.58018702e-05
+4.58014028e-05
+0.000104115738
+0.000140688343
+0.00016133733
+0.000166415464
+0.000157250653
+0.000135357789
+0.00010204467
+5.74526221e-05
+1.16318654e-05
+8.25171424e-07
+6.63528575e-07
+6.63009663e-07
+6.6353434e-07
+8.25897633e-07
+1.16423387e-05
+5.74659602e-05
+0.000102050149
+0.000135359341
+0.000157250169
+0.000166413729
+0.000161334385
+0.000140683501
+0.000104106102
+4.58020994e-05
+4.58016241e-05
+0.00010411775
+0.000140692827
+0.000161344542
+0.000166425502
+0.000157263582
+0.000135373693
+0.000102063722
+5.74788894e-05
+1.16468734e-05
+8.25737345e-07
+6.6352691e-07
+6.63006344e-07
+6.63532695e-07
+8.26467397e-07
+1.16573877e-05
+5.74922677e-05
+0.000102069217
+0.000135375248
+0.000157263097
+0.000166423762
+0.000161341591
+0.000140687973
+0.000104108091
+4.5802331e-05
+4.58018474e-05
+0.000104119717
+0.000140697231
+0.000161351636
+0.00016643538
+0.000157276318
+0.000135389396
+0.000102082592
+5.7504996e-05
+1.16618193e-05
+8.26302476e-07
+6.63525235e-07
+6.63003032e-07
+6.63531046e-07
+8.2703632e-07
+1.16723738e-05
+5.75184139e-05
+0.000102088102
+0.000135390955
+0.000157275834
+0.000166433637
+0.000161348679
+0.000140692367
+0.000104110036
+4.58025647e-05
+4.58020723e-05
+0.000104121635
+0.000140701548
+0.000161358602
+0.000166445088
+0.000157288856
+0.000135404892
+0.00010210128
+5.75309404e-05
+1.16767018e-05
+8.26866746e-07
+6.63523564e-07
+6.62999712e-07
+6.63529404e-07
+8.27604346e-07
+1.16872958e-05
+5.75443966e-05
+0.000102106804
+0.000135406457
+0.000157288371
+0.000166443342
+0.00016135564
+0.000140696674
+0.000104111931
+4.58028001e-05
+4.58022985e-05
+0.0001041235
+0.00014070577
+0.000161365431
+0.00016645462
+0.00015730119
+0.000135420181
+0.000102119781
+5.75567207e-05
+1.16915195e-05
+8.27430084e-07
+6.63521886e-07
+6.62996395e-07
+6.63527747e-07
+8.2817139e-07
+1.17021523e-05
+5.75702147e-05
+0.000102125322
+0.000135421751
+0.000157300705
+0.000166452869
+0.000161362462
+0.000140700886
+0.000104113774
+4.58030369e-05
+4.58025256e-05
+0.000104125308
+0.00014070989
+0.000161372113
+0.000166463965
+0.00015731331
+0.000135435259
+0.000102138098
+5.7582335e-05
+1.17062712e-05
+8.27992401e-07
+6.63520204e-07
+6.62993076e-07
+6.63526092e-07
+8.28737389e-07
+1.17169422e-05
+5.7595866e-05
+0.000102143654
+0.000135436835
+0.000157312825
+0.000166462211
+0.000161369137
+0.000140704995
+0.000104115559
+4.58032746e-05
+4.58027532e-05
+0.000104127053
+0.0001407139
+0.000161378639
+0.000166473115
+0.000157325216
+0.000135450122
+0.000102156224
+5.76077816e-05
+1.17209557e-05
+8.2855365e-07
+6.6351852e-07
+6.62989755e-07
+6.63524438e-07
+8.29302269e-07
+1.1731664e-05
+5.76213488e-05
+0.000102161796
+0.000135451704
+0.000157324731
+0.00016647136
+0.000161375659
+0.000140708994
+0.000104117283
+4.58035128e-05
+4.5802981e-05
+0.000104128734
+0.000140717792
+0.000161385002
+0.000166482065
+0.000157336898
+0.000135464768
+0.000102174162
+5.76330587e-05
+1.17355717e-05
+8.29113743e-07
+6.63516826e-07
+6.62986437e-07
+6.63522773e-07
+8.29865961e-07
+1.17463168e-05
+5.76466613e-05
+0.000102179749
+0.000135466355
+0.000157336413
+0.000166480308
+0.000161382018
+0.000140712876
+0.000104118941
+4.58037513e-05
+4.58032084e-05
+0.000104130345
+0.000140721559
+0.000161391194
+0.000166490807
+0.000157348354
+0.000135479193
+0.00010219191
+5.7658165e-05
+1.17501182e-05
+8.29672631e-07
+6.63515142e-07
+6.62983117e-07
+6.63521108e-07
+8.30428415e-07
+1.17608995e-05
+5.76718024e-05
+0.000102197511
+0.000135480787
+0.000157347871
+0.000166489048
+0.000161388204
+0.000140716634
+0.00010412053
+4.58039895e-05
+4.58034353e-05
+0.000104131884
+0.000140725198
+0.000161397208
+0.000166499334
+0.000157359581
+0.000135493399
+0.000102209465
+5.76830991e-05
+1.17645944e-05
+8.30230254e-07
+6.6351344e-07
+6.62979791e-07
+6.63519437e-07
+8.30989569e-07
+1.17754112e-05
+5.76967702e-05
+0.000102215082
+0.000135494997
+0.000157359098
+0.000166497574
+0.000161394212
+0.000140720262
+0.000104122047
+4.58042272e-05
+4.58036611e-05
+0.000104133347
+0.000140728699
+0.000161403036
+0.000166507643
+0.000157370572
+0.000135507381
+0.000102226828
+5.77078599e-05
+1.17789994e-05
+8.30786561e-07
+6.6351174e-07
+6.62976465e-07
+6.63517767e-07
+8.31549371e-07
+1.17898512e-05
+5.77215644e-05
+0.000102232459
+0.000135508985
+0.000157370092
+0.00016650588
+0.000161400037
+0.000140723754
+0.000104123487
+4.58044639e-05
+4.58038855e-05
+0.000104134733
+0.00014073206
+0.000161408673
+0.000166515726
+0.000157381328
+0.000135521138
+0.000102243997
+5.77324464e-05
+1.17933326e-05
+8.31341508e-07
+6.63510037e-07
+6.62973146e-07
+6.63516093e-07
+8.32107779e-07
+1.18042187e-05
+5.77461836e-05
+0.000102249642
+0.000135522747
+0.000157380846
+0.000166513962
+0.000161405669
+0.000140727104
+0.00010412485
+4.58046994e-05
+4.58041083e-05
+0.000104136037
+0.000140735273
+0.000161414113
+0.000166523579
+0.000157391842
+0.000135534666
+0.000102260972
+5.77568576e-05
+1.18075933e-05
+8.31895041e-07
+6.63508333e-07
+6.62969815e-07
+6.63514411e-07
+8.32664748e-07
+1.18185131e-05
+5.77706267e-05
+0.000102266633
+0.000135536282
+0.000157391363
+0.000166521814
+0.000161411104
+0.000140730308
+0.000104126132
+4.58049332e-05
+4.58043289e-05
+0.000104137259
+0.000140738335
+0.000161419351
+0.000166531198
+0.000157402113
+0.000135547968
+0.000102277753
+5.77810928e-05
+1.18217808e-05
+8.32447124e-07
+6.63506615e-07
+6.62966489e-07
+6.63512723e-07
+8.33220239e-07
+1.18327337e-05
+5.77948929e-05
+0.000102283429
+0.00013554959
+0.000157401635
+0.000166529432
+0.000161416337
+0.000140733361
+0.000104127331
+4.58051649e-05
+4.58045471e-05
+0.000104138396
+0.000140741243
+0.000161424381
+0.000166538578
+0.000157412136
+0.00013556104
+0.000102294338
+5.78051502e-05
+1.18358943e-05
+8.32997706e-07
+6.63504894e-07
+6.62963165e-07
+6.63511023e-07
+8.33774195e-07
+1.18468799e-05
+5.78189814e-05
+0.000102300028
+0.000135562668
+0.000157411661
+0.000166536811
+0.000161421363
+0.000140736258
+0.000104128445
+4.58053943e-05
+4.58047626e-05
+0.000104139445
+0.00014074399
+0.000161429199
+0.000166545717
+0.000157421912
+0.00013557388
+0.000102310726
+5.78290286e-05
+1.1849933e-05
+8.33546733e-07
+6.63503176e-07
+6.62959835e-07
+6.63509326e-07
+8.34326576e-07
+1.18609507e-05
+5.78428898e-05
+0.00010231643
+0.000135575516
+0.000157421438
+0.000166543947
+0.000161426177
+0.000140738996
+0.000104129472
+4.5805621e-05
+4.5804975e-05
+0.000104140408
+0.000140746576
+0.0001614338
+0.000166552609
+0.000157431438
+0.000135586489
+0.000102326915
+5.78527265e-05
+1.1863896e-05
+8.34094162e-07
+6.63501445e-07
+6.62956503e-07
+6.63507624e-07
+8.34877319e-07
+1.18749452e-05
+5.78666171e-05
+0.000102332633
+0.000135588132
+0.000157430965
+0.000166550839
+0.000161430773
+0.000140741572
+0.000104130411
+4.58058448e-05
+4.58051839e-05
+0.000104141281
+0.000140748996
+0.000161438183
+0.000166559253
+0.00015744071
+0.000135598863
+0.000102342904
+5.78762416e-05
+1.1877782e-05
+8.34639924e-07
+6.6349971e-07
+6.62953174e-07
+6.63505914e-07
+8.35426377e-07
+1.18888624e-05
+5.78901613e-05
+0.000102348639
+0.000135600512
+0.00015744024
+0.000166557482
+0.000161435153
+0.000140743983
+0.000104131261
+4.58060652e-05
+4.58053893e-05
+0.000104142064
+0.000140751249
+0.000161442342
+0.000166565646
+0.000157449728
+0.000135611003
+0.000102358694
+5.78995722e-05
+1.18915899e-05
+8.35183953e-07
+6.63497969e-07
+6.62949837e-07
+6.63504203e-07
+8.35973671e-07
+1.19027008e-05
+5.791352e-05
+0.000102364442
+0.000135612658
+0.00015744926
+0.000166563873
+0.000161439307
+0.000140746226
+0.000104132021
+4.58062821e-05
+4.58055907e-05
+0.000104142757
+0.000140753332
+0.000161446277
+0.000166571784
+0.000157458489
+0.000135622907
+0.000102374281
+5.7922715e-05
+1.1905318e-05
+8.35726171e-07
+6.63496221e-07
+6.62946501e-07
+6.63502477e-07
+8.36519141e-07
+1.1916459e-05
+5.79366909e-05
+0.000102380043
+0.000135624569
+0.000157458025
+0.00016657001
+0.000161443238
+0.000140748299
+0.00010413269
+4.58064951e-05
+4.5805788e-05
+0.00010414336
+0.000140755243
+0.000161449983
+0.000166577666
+0.000157466993
+0.000135634572
+0.000102389661
+5.79456679e-05
+1.19189648e-05
+8.36266506e-07
+6.63494466e-07
+6.62943163e-07
+6.63500745e-07
+8.37062696e-07
+1.19301355e-05
+5.79596711e-05
+0.000102395438
+0.000135636242
+0.000157466529
+0.000166575893
+0.000161446941
+0.000140750201
+0.00010413327
+4.58067041e-05
+4.58059809e-05
+0.000104143873
+0.000140756983
+0.000161453461
+0.00016658329
+0.000157475237
+0.000135645998
+0.000102404838
+5.79684275e-05
+1.19325285e-05
+8.3680487e-07
+6.63492707e-07
+6.62939817e-07
+6.63499015e-07
+8.3760425e-07
+1.19437285e-05
+5.79824575e-05
+0.000102410628
+0.000135647675
+0.000157474777
+0.000166581516
+0.000161450413
+0.00014075193
+0.000104133759
+4.58069087e-05
+4.58061692e-05
+0.000104144295
+0.000140758549
+0.000161456707
+0.000166588657
+0.000157483221
+0.000135657183
+0.000102419805
+5.79909904e-05
+1.19460072e-05
+8.37341172e-07
+6.6349094e-07
+6.62936482e-07
+6.63497272e-07
+8.38143723e-07
+1.1957236e-05
+5.80050469e-05
+0.000102425608
+0.000135658866
+0.000157482764
+0.000166586882
+0.000161453656
+0.000140753487
+0.000104134157
+4.58071089e-05
+4.58063527e-05
+0.000104144628
+0.000140759943
+0.000161459723
+0.000166593763
+0.000157490944
+0.000135668127
+0.000102434562
+5.80133537e-05
+1.19593989e-05
+8.37875312e-07
+6.63489159e-07
+6.62933138e-07
+6.63495522e-07
+8.38681013e-07
+1.1970656e-05
+5.80274361e-05
+0.000102440379
+0.000135669818
+0.000157490489
+0.000166591988
+0.000161456667
+0.00014075487
+0.000104134466
+4.58073043e-05
+4.58065312e-05
+0.000104144873
+0.000140761163
+0.000161462506
+0.00016659861
+0.000157498405
+0.000135678829
+0.000102449105
+5.80355138e-05
+1.19727016e-05
+8.38407198e-07
+6.63487378e-07
+6.62929793e-07
+6.63493758e-07
+8.39216022e-07
+1.19839866e-05
+5.80496216e-05
+0.000102454937
+0.000135680525
+0.000157497953
+0.000166596833
+0.000161459446
+0.000140756081
+0.000104134687
+4.58074949e-05
+4.58067046e-05
+0.00010414503
+0.000140762212
+0.000161465058
+0.000166603195
+0.000157505604
+0.000135689285
+0.000102463436
+5.80574672e-05
+1.1985913e-05
+8.38936725e-07
+6.63485589e-07
+6.62926445e-07
+6.63491991e-07
+8.39748648e-07
+1.19972256e-05
+5.80715999e-05
+0.00010246928
+0.000135690989
+0.000157505154
+0.000166601419
+0.000161461994
+0.00014075712
+0.00010413482
+4.58076804e-05
+4.58068728e-05
+0.000104145102
+0.00014076309
+0.000161467379
+0.000166607522
+0.000157512541
+0.000135699498
+0.00010247755
+5.80792106e-05
+1.19990312e-05
+8.39463795e-07
+6.63483791e-07
+6.62923092e-07
+6.63490218e-07
+8.40278793e-07
+1.20103708e-05
+5.80933678e-05
+0.000102483407
+0.000135701208
+0.000157512093
+0.000166605744
+0.000161464311
+0.000140757988
+0.000104134868
+4.58078608e-05
+4.58070357e-05
+0.00010414509
+0.000140763799
+0.000161469471
+0.00016661159
+0.000157519216
+0.000135709463
+0.000102491446
+5.81007403e-05
+1.20120539e-05
+8.39988293e-07
+6.63481985e-07
+6.62919743e-07
+6.63488442e-07
+8.40806338e-07
+1.202342e-05
+5.81149214e-05
+0.000102497315
+0.000135711183
+0.00015751877
+0.000166609811
+0.000161466399
+0.000140758686
+0.000104134831
+4.5808036e-05
+4.58071931e-05
+0.000104144995
+0.000140764341
+0.000161471335
+0.000166615399
+0.00015752563
+0.000135719184
+0.00010250512
+5.81220528e-05
+1.20249788e-05
+8.40510121e-07
+6.63480166e-07
+6.62916393e-07
+6.63486646e-07
+8.41331175e-07
+1.2036371e-05
+5.81362572e-05
+0.000102511005
+0.00013572091
+0.000157525187
+0.00016661362
+0.000161468259
+0.000140759218
+0.000104134712
+4.58082059e-05
+4.58073451e-05
+0.000104144821
+0.000140764719
+0.000161472974
+0.000166618952
+0.000157531783
+0.00013572866
+0.000102518574
+5.81431448e-05
+1.20378038e-05
+8.41029171e-07
+6.63478345e-07
+6.62913042e-07
+6.63484848e-07
+8.41853196e-07
+1.20492216e-05
+5.81573718e-05
+0.000102524471
+0.000135730391
+0.000157531344
+0.000166617171
+0.000161469892
+0.000140759585
+0.000104134512
+4.58083704e-05
+4.58074915e-05
+0.000104144569
+0.000140764934
+0.000161474389
+0.000166622252
+0.000157537677
+0.000135737889
+0.000102531806
+5.81640132e-05
+1.20505268e-05
+8.4154533e-07
+6.63476505e-07
+6.62909691e-07
+6.6348304e-07
+8.42372271e-07
+1.20619693e-05
+5.81782618e-05
+0.000102537715
+0.000135739627
+0.00015753724
+0.00016662047
+0.000161471303
+0.00014075979
+0.000104134235
+4.58085294e-05
+4.58076323e-05
+0.000104144241
+0.000140764991
+0.000161475583
+0.000166625298
+0.000157543315
+0.000135746872
+0.000102544813
+5.81846543e-05
+1.20631454e-05
+8.42058488e-07
+6.63474671e-07
+6.62906336e-07
+6.63481218e-07
+8.4288827e-07
+1.20746117e-05
+5.81989232e-05
+0.000102550731
+0.000135748617
+0.000157542879
+0.000166623517
+0.000161472493
+0.000140759837
+0.000104133883
+4.5808683e-05
+4.58077675e-05
+0.000104143841
+0.000140764893
+0.000161476562
+0.000166628098
+0.000157548697
+0.000135755611
+0.000102557595
+5.82050663e-05
+1.20756577e-05
+8.42568545e-07
+6.63472816e-07
+6.62902979e-07
+6.63479392e-07
+8.43401049e-07
+1.20871462e-05
+5.82193523e-05
+0.000102563521
+0.000135757358
+0.000157548261
+0.000166626313
+0.000161473467
+0.000140759729
+0.000104133458
+4.58088313e-05
+4.5807897e-05
+0.000104143371
+0.000140764644
+0.000161477327
+0.000166630651
+0.000157553824
+0.000135764105
+0.00010257015
+5.82252452e-05
+1.20880614e-05
+8.43075386e-07
+6.63470952e-07
+6.62899627e-07
+6.63477544e-07
+8.43910416e-07
+1.20995698e-05
+5.82395448e-05
+0.000102576083
+0.000135765854
+0.000157553388
+0.000166628863
+0.000161474228
+0.000140759469
+0.000104132964
+4.5808974e-05
+4.58080209e-05
+0.000104142833
+0.000140764247
+0.000161477884
+0.000166632962
+0.000157558702
+0.000135772358
+0.000102582481
+5.82451905e-05
+1.21003549e-05
+8.43578907e-07
+6.63469085e-07
+6.62896262e-07
+6.63475681e-07
+8.44416155e-07
+1.21118794e-05
+5.82594972e-05
+0.000102588413
+0.000135774103
+0.000157558261
+0.00016663117
+0.000161474779
+0.000140759064
+0.000104132404
+4.58091116e-05
+4.5808139e-05
+0.000104142231
+0.000140763708
+0.000161478236
+0.000166635035
+0.000157563332
+0.000135780369
+0.000102594586
+5.82648998e-05
+1.21125361e-05
+8.44079007e-07
+6.634672e-07
+6.62892908e-07
+6.63473807e-07
+8.44917914e-07
+1.21240704e-05
+5.82792023e-05
+0.000102600507
+0.000135782104
+0.000157562883
+0.000166633238
+0.000161475127
+0.000140758517
+0.000104131782
+4.5809244e-05
+4.58082513e-05
+0.000104141567
+0.000140763029
+0.00016147839
+0.000166636877
+0.000157567722
+0.000135788145
+0.000102606472
+5.82843762e-05
+1.21246042e-05
+8.44575581e-07
+6.63465307e-07
+6.6288954e-07
+6.63471899e-07
+8.45415232e-07
+1.21361373e-05
+5.82986553e-05
+0.000102612365
+0.000135789858
+0.000157567256
+0.00016663507
+0.000161475276
+0.000140757835
+0.000104131102
+4.58093716e-05
+4.58083576e-05
+0.000104140845
+0.000140762218
+0.00016147835
+0.000166638492
+0.000157571875
+0.000135795692
+0.000102618142
+5.8303621e-05
+1.21365581e-05
+8.45068553e-07
+6.63463408e-07
+6.62886185e-07
+6.63469945e-07
+8.45907309e-07
+1.21480711e-05
+5.83178438e-05
+0.000102623976
+0.000135797358
+0.000157571378
+0.000166636669
+0.000161475234
+0.000140757026
+0.000104130373
+4.58094949e-05
+4.58084576e-05
+0.000104140066
+0.000140761277
+0.000161478124
+0.000166639889
+0.000157575802
+0.000135803017
+0.000102629606
+5.83226455e-05
+1.21483994e-05
+8.45557878e-07
+6.63461492e-07
+6.62882817e-07
+6.63467933e-07
+8.4639289e-07
+1.21598594e-05
+5.83367559e-05
+0.000102635329
+0.000135804599
+0.000157575248
+0.00016663804
+0.000161475006
+0.000140756097
+0.000104129601
+4.58096146e-05
+4.58085508e-05
+0.000104139233
+0.000140760211
+0.000161477718
+0.000166641076
+0.00015757951
+0.000135810131
+0.000102640877
+5.83414561e-05
+1.21601282e-05
+8.46043502e-07
+6.63459572e-07
+6.6287945e-07
+6.63465823e-07
+8.46869684e-07
+1.21714768e-05
+5.83553564e-05
+0.000102646395
+0.000135811561
+0.000157578858
+0.000166639181
+0.000161474601
+0.000140755067
+0.000104128805
+4.58097326e-05
+4.58086366e-05
+0.000104138344
+0.00014075902
+0.00016147713
+0.000166642054
+0.000157583007
+0.000135817052
+0.00010265198
+5.83600713e-05
+1.21717476e-05
+8.46525435e-07
+6.63457631e-07
+6.62876086e-07
+6.63463534e-07
+8.47333817e-07
+1.21828814e-05
+5.83735953e-05
+0.000102657142
+0.00013581821
+0.000157582176
+0.000166640078
+0.000161474023
+0.000140753952
+0.000104128015
+4.5809854e-05
+4.5808714e-05
+0.000104137414
+0.000140757714
+0.000161476359
+0.000166642802
+0.00015758626
+0.00013582374
+0.000102662892
+5.83785209e-05
+1.21832688e-05
+8.47003834e-07
+6.63455687e-07
+6.62872714e-07
+6.63460984e-07
+8.47779129e-07
+1.21940091e-05
+5.83913932e-05
+0.000102667432
+0.000135824412
+0.000157585094
+0.000166640659
+0.000161473259
+0.00014075281
+0.000104127342
+4.58099825e-05
+4.58087834e-05
+0.000104136434
+0.000140756285
+0.000161475399
+0.000166643311
+0.000157589236
+0.000135830133
+0.000102673523
+5.839675e-05
+1.2194685e-05
+8.47478719e-07
+6.63453734e-07
+6.62869338e-07
+6.6345804e-07
+8.48197303e-07
+1.22047566e-05
+5.84086405e-05
+0.000102677191
+0.000135830189
+0.000157587753
+0.000166641198
+0.000161472724
+0.00014075221
+0.000104127533
+4.58101843e-05
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+4.57971478e-05
+0.000104059157
+0.000140559658
+0.00016112098
+0.000166100887
+0.000156831739
+0.000134833917
+0.000101421773
+5.66223165e-05
+1.1173433e-05
+8.0872239e-07
+6.63576854e-07
+6.63105265e-07
+6.63581496e-07
+8.09287932e-07
+1.1182289e-05
+5.66340366e-05
+0.000101426753
+0.000134835471
+0.000156831441
+0.000166099393
+0.000161118314
+0.000140555176
+0.000104050155
+4.57962633e-05
+)
+;
+    }
+    outlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+4.58087834e-05
+0.000104136434
+0.000140756285
+0.000161475399
+0.000166643311
+0.000157589236
+0.000135830133
+0.000102673523
+5.839675e-05
+1.2194685e-05
+8.47478719e-07
+6.63453734e-07
+6.62869338e-07
+6.6345804e-07
+8.48197303e-07
+1.22047566e-05
+5.84086405e-05
+0.000102677191
+0.000135830189
+0.000157587753
+0.000166641198
+0.000161472724
+0.00014075221
+0.000104127533
+4.58101843e-05
+)
+;
+    }
+    wall1
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           nonuniform List<scalar>
+75
+(
+5.27711099e-06
+5.27711536e-06
+5.27712047e-06
+5.277126e-06
+5.27713206e-06
+5.27713874e-06
+5.2771461e-06
+5.27715417e-06
+5.27716299e-06
+5.27717257e-06
+5.27718291e-06
+5.27719402e-06
+5.2772059e-06
+5.27721854e-06
+5.27723194e-06
+5.27724607e-06
+5.27726093e-06
+5.27727651e-06
+5.27729278e-06
+5.27730972e-06
+5.27732733e-06
+5.27734556e-06
+5.27736442e-06
+5.27738385e-06
+5.27740386e-06
+5.27742439e-06
+5.27744544e-06
+5.27746696e-06
+5.27748893e-06
+5.2775113e-06
+5.27753405e-06
+5.27755713e-06
+5.27758051e-06
+5.27760415e-06
+5.277628e-06
+5.27765203e-06
+5.2776762e-06
+5.27770046e-06
+5.27772478e-06
+5.2777491e-06
+5.27777341e-06
+5.27779764e-06
+5.27782176e-06
+5.27784574e-06
+5.27786954e-06
+5.27789311e-06
+5.27791642e-06
+5.27793944e-06
+5.27796213e-06
+5.27798445e-06
+5.27800639e-06
+5.27802791e-06
+5.27804899e-06
+5.27806959e-06
+5.27808971e-06
+5.2781093e-06
+5.27812838e-06
+5.2781469e-06
+5.27816487e-06
+5.27818227e-06
+5.27819908e-06
+5.27821532e-06
+5.27823095e-06
+5.27824599e-06
+5.27826043e-06
+5.27827427e-06
+5.27828749e-06
+5.27830011e-06
+5.2783121e-06
+5.27832345e-06
+5.27833413e-06
+5.27834409e-06
+5.27835325e-06
+5.27836152e-06
+5.27836894e-06
+)
+;
+    }
+    wall2
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           nonuniform List<scalar>
+75
+(
+5.27701149e-06
+5.27702214e-06
+5.27702606e-06
+5.27703166e-06
+5.27703767e-06
+5.27704431e-06
+5.27705164e-06
+5.27705969e-06
+5.27706848e-06
+5.27707802e-06
+5.27708834e-06
+5.27709942e-06
+5.27711127e-06
+5.27712388e-06
+5.27713725e-06
+5.27715135e-06
+5.27716619e-06
+5.27718173e-06
+5.27719797e-06
+5.27721488e-06
+5.27723246e-06
+5.27725067e-06
+5.27726949e-06
+5.2772889e-06
+5.27730888e-06
+5.27732939e-06
+5.27735041e-06
+5.27737192e-06
+5.27739386e-06
+5.27741621e-06
+5.27743895e-06
+5.27746201e-06
+5.27748538e-06
+5.27750901e-06
+5.27753285e-06
+5.27755687e-06
+5.27758104e-06
+5.2776053e-06
+5.27762961e-06
+5.27765395e-06
+5.27767826e-06
+5.27770249e-06
+5.27772663e-06
+5.27775063e-06
+5.27777444e-06
+5.27779803e-06
+5.27782136e-06
+5.2778444e-06
+5.27786712e-06
+5.27788948e-06
+5.27791145e-06
+5.27793301e-06
+5.27795412e-06
+5.27797477e-06
+5.27799493e-06
+5.27801458e-06
+5.27803371e-06
+5.27805228e-06
+5.27807031e-06
+5.27808777e-06
+5.27810465e-06
+5.27812095e-06
+5.27813667e-06
+5.27815179e-06
+5.27816633e-06
+5.27818028e-06
+5.27819366e-06
+5.27820647e-06
+5.27821876e-06
+5.27823055e-06
+5.27824193e-06
+5.27825305e-06
+5.27826429e-06
+5.27827638e-06
+5.27829433e-06
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/p
new file mode 100644
index 0000000000..75547532e9
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/p
@@ -0,0 +1,2117 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+119348.073
+119348.087
+119348.115
+119348.156
+119348.207
+119348.266
+119348.332
+119348.403
+119348.476
+119348.549
+119348.644
+119348.772
+119348.933
+119349.127
+119349.354
+119349.616
+119349.899
+119350.184
+119350.472
+119350.765
+119351.065
+119351.376
+119351.699
+119352.037
+119352.376
+119096.454
+119096.466
+119096.491
+119096.529
+119096.578
+119096.64
+119096.714
+119096.8
+119096.898
+119097.01
+119097.138
+119097.282
+119097.444
+119097.624
+119097.822
+119098.036
+119098.265
+119098.507
+119098.761
+119099.025
+119099.3
+119099.584
+119099.877
+119100.18
+119100.503
+118844.579
+118844.591
+118844.616
+118844.655
+118844.706
+118844.77
+118844.847
+118844.937
+118845.04
+118845.157
+118845.288
+118845.432
+118845.591
+118845.764
+118845.95
+118846.151
+118846.364
+118846.59
+118846.828
+118847.078
+118847.34
+118847.612
+118847.895
+118848.19
+118848.509
+118592.451
+118592.464
+118592.489
+118592.527
+118592.579
+118592.643
+118592.721
+118592.811
+118592.915
+118593.032
+118593.161
+118593.304
+118593.46
+118593.629
+118593.811
+118594.005
+118594.212
+118594.432
+118594.664
+118594.908
+118595.164
+118595.432
+118595.712
+118596.005
+118596.324
+118340.069
+118340.082
+118340.107
+118340.145
+118340.197
+118340.261
+118340.338
+118340.428
+118340.531
+118340.647
+118340.776
+118340.917
+118341.071
+118341.238
+118341.417
+118341.609
+118341.814
+118342.031
+118342.26
+118342.502
+118342.756
+118343.023
+118343.302
+118343.594
+118343.913
+118087.434
+118087.446
+118087.471
+118087.51
+118087.561
+118087.625
+118087.701
+118087.791
+118087.894
+118088.009
+118088.137
+118088.277
+118088.43
+118088.596
+118088.774
+118088.965
+118089.168
+118089.384
+118089.613
+118089.854
+118090.107
+118090.373
+118090.652
+118090.945
+118091.264
+117834.546
+117834.558
+117834.583
+117834.621
+117834.672
+117834.736
+117834.813
+117834.902
+117835.004
+117835.119
+117835.246
+117835.386
+117835.539
+117835.704
+117835.882
+117836.072
+117836.275
+117836.491
+117836.719
+117836.96
+117837.213
+117837.479
+117837.758
+117838.051
+117838.371
+117581.406
+117581.419
+117581.444
+117581.482
+117581.533
+117581.596
+117581.673
+117581.762
+117581.864
+117581.978
+117582.105
+117582.245
+117582.397
+117582.562
+117582.74
+117582.93
+117583.133
+117583.348
+117583.577
+117583.817
+117584.071
+117584.337
+117584.616
+117584.909
+117585.229
+117328.016
+117328.028
+117328.053
+117328.091
+117328.142
+117328.205
+117328.282
+117328.371
+117328.473
+117328.587
+117328.714
+117328.854
+117329.006
+117329.171
+117329.348
+117329.539
+117329.741
+117329.957
+117330.185
+117330.426
+117330.679
+117330.945
+117331.225
+117331.518
+117331.839
+117074.374
+117074.387
+117074.412
+117074.45
+117074.5
+117074.564
+117074.64
+117074.729
+117074.831
+117074.945
+117075.072
+117075.212
+117075.364
+117075.529
+117075.706
+117075.897
+117076.099
+117076.315
+117076.543
+117076.784
+117077.037
+117077.304
+117077.583
+117077.877
+117078.198
+116820.482
+116820.494
+116820.52
+116820.557
+116820.608
+116820.671
+116820.748
+116820.837
+116820.938
+116821.053
+116821.18
+116821.319
+116821.471
+116821.636
+116821.814
+116822.004
+116822.207
+116822.422
+116822.65
+116822.891
+116823.145
+116823.411
+116823.69
+116823.984
+116824.305
+116566.34
+116566.352
+116566.377
+116566.415
+116566.465
+116566.529
+116566.605
+116566.694
+116566.796
+116566.91
+116567.037
+116567.176
+116567.328
+116567.493
+116567.671
+116567.861
+116568.063
+116568.278
+116568.506
+116568.747
+116569.001
+116569.267
+116569.547
+116569.84
+116570.161
+116311.947
+116311.959
+116311.984
+116312.022
+116312.072
+116312.136
+116312.212
+116312.301
+116312.402
+116312.517
+116312.643
+116312.783
+116312.935
+116313.099
+116313.277
+116313.467
+116313.669
+116313.884
+116314.112
+116314.353
+116314.606
+116314.872
+116315.151
+116315.445
+116315.766
+116057.304
+116057.316
+116057.341
+116057.379
+116057.429
+116057.492
+116057.568
+116057.657
+116057.759
+116057.873
+116057.999
+116058.139
+116058.29
+116058.455
+116058.632
+116058.822
+116059.024
+116059.239
+116059.467
+116059.707
+116059.96
+116060.226
+116060.505
+116060.798
+116061.119
+115802.411
+115802.423
+115802.448
+115802.486
+115802.536
+115802.599
+115802.675
+115802.764
+115802.865
+115802.979
+115803.105
+115803.244
+115803.396
+115803.56
+115803.737
+115803.927
+115804.129
+115804.343
+115804.57
+115804.811
+115805.063
+115805.329
+115805.607
+115805.9
+115806.221
+115547.269
+115547.281
+115547.306
+115547.343
+115547.394
+115547.457
+115547.532
+115547.621
+115547.722
+115547.836
+115547.962
+115548.101
+115548.252
+115548.416
+115548.592
+115548.781
+115548.983
+115549.197
+115549.424
+115549.664
+115549.916
+115550.181
+115550.459
+115550.751
+115551.071
+115291.877
+115291.889
+115291.914
+115291.952
+115292.002
+115292.065
+115292.14
+115292.229
+115292.33
+115292.443
+115292.569
+115292.707
+115292.858
+115293.022
+115293.198
+115293.387
+115293.588
+115293.801
+115294.028
+115294.267
+115294.519
+115294.783
+115295.06
+115295.352
+115295.671
+115036.238
+115036.25
+115036.274
+115036.312
+115036.362
+115036.425
+115036.5
+115036.588
+115036.689
+115036.802
+115036.927
+115037.065
+115037.216
+115037.379
+115037.555
+115037.743
+115037.943
+115038.156
+115038.382
+115038.62
+115038.872
+115039.135
+115039.412
+115039.703
+115040.021
+114780.35
+114780.362
+114780.387
+114780.424
+114780.474
+114780.537
+114780.612
+114780.7
+114780.8
+114780.913
+114781.038
+114781.175
+114781.325
+114781.488
+114781.663
+114781.851
+114782.05
+114782.263
+114782.488
+114782.725
+114782.976
+114783.239
+114783.514
+114783.804
+114784.122
+114524.216
+114524.228
+114524.253
+114524.29
+114524.339
+114524.402
+114524.477
+114524.564
+114524.664
+114524.776
+114524.901
+114525.038
+114525.188
+114525.349
+114525.524
+114525.711
+114525.91
+114526.121
+114526.346
+114526.582
+114526.832
+114527.094
+114527.368
+114527.657
+114527.973
+114267.836
+114267.848
+114267.872
+114267.909
+114267.959
+114268.021
+114268.095
+114268.182
+114268.282
+114268.394
+114268.518
+114268.654
+114268.803
+114268.965
+114269.138
+114269.324
+114269.523
+114269.733
+114269.957
+114270.192
+114270.441
+114270.701
+114270.975
+114271.263
+114271.578
+114011.211
+114011.223
+114011.247
+114011.284
+114011.333
+114011.395
+114011.469
+114011.556
+114011.655
+114011.766
+114011.89
+114012.025
+114012.174
+114012.334
+114012.507
+114012.692
+114012.89
+114013.099
+114013.321
+114013.556
+114013.803
+114014.063
+114014.335
+114014.621
+114014.935
+113754.342
+113754.354
+113754.378
+113754.415
+113754.464
+113754.525
+113754.599
+113754.685
+113754.784
+113754.894
+113755.017
+113755.152
+113755.3
+113755.459
+113755.631
+113755.816
+113756.012
+113756.221
+113756.442
+113756.675
+113756.921
+113757.179
+113757.45
+113757.735
+113758.047
+113497.231
+113497.242
+113497.266
+113497.303
+113497.352
+113497.413
+113497.486
+113497.572
+113497.67
+113497.78
+113497.902
+113498.036
+113498.183
+113498.342
+113498.513
+113498.696
+113498.891
+113499.098
+113499.318
+113499.55
+113499.795
+113500.051
+113500.321
+113500.604
+113500.915
+113239.878
+113239.89
+113239.914
+113239.95
+113239.998
+113240.059
+113240.132
+113240.217
+113240.314
+113240.424
+113240.545
+113240.679
+113240.824
+113240.982
+113241.152
+113241.334
+113241.528
+113241.734
+113241.953
+113242.183
+113242.426
+113242.681
+113242.949
+113243.231
+113243.539
+112982.286
+112982.298
+112982.321
+112982.357
+112982.405
+112982.466
+112982.538
+112982.623
+112982.719
+112982.828
+112982.949
+112983.081
+112983.226
+112983.383
+112983.551
+112983.732
+112983.925
+112984.13
+112984.346
+112984.576
+112984.817
+112985.07
+112985.336
+112985.616
+112985.923
+112724.456
+112724.467
+112724.491
+112724.527
+112724.575
+112724.634
+112724.706
+112724.79
+112724.886
+112724.994
+112725.114
+112725.245
+112725.389
+112725.545
+112725.712
+112725.892
+112726.083
+112726.286
+112726.501
+112726.729
+112726.968
+112727.22
+112727.484
+112727.761
+112728.066
+112466.39
+112466.401
+112466.425
+112466.46
+112466.507
+112466.567
+112466.638
+112466.721
+112466.817
+112466.924
+112467.042
+112467.173
+112467.315
+112467.47
+112467.636
+112467.814
+112468.004
+112468.205
+112468.419
+112468.644
+112468.882
+112469.132
+112469.393
+112469.669
+112469.971
+112208.089
+112208.101
+112208.124
+112208.159
+112208.206
+112208.265
+112208.335
+112208.418
+112208.512
+112208.619
+112208.736
+112208.866
+112209.007
+112209.16
+112209.325
+112209.501
+112209.689
+112209.889
+112210.101
+112210.325
+112210.56
+112210.808
+112211.067
+112211.34
+112211.64
+111949.556
+111949.568
+111949.59
+111949.625
+111949.672
+111949.73
+111949.8
+111949.882
+111949.976
+111950.081
+111950.197
+111950.326
+111950.466
+111950.617
+111950.781
+111950.955
+111951.142
+111951.34
+111951.55
+111951.771
+111952.005
+111952.25
+111952.507
+111952.778
+111953.075
+111690.793
+111690.804
+111690.827
+111690.861
+111690.908
+111690.965
+111691.035
+111691.116
+111691.208
+111691.313
+111691.428
+111691.555
+111691.694
+111691.844
+111692.005
+111692.179
+111692.363
+111692.559
+111692.767
+111692.987
+111693.218
+111693.461
+111693.715
+111693.983
+111694.278
+111431.802
+111431.813
+111431.836
+111431.87
+111431.915
+111431.972
+111432.041
+111432.121
+111432.213
+111432.316
+111432.43
+111432.556
+111432.693
+111432.842
+111433.002
+111433.173
+111433.356
+111433.55
+111433.756
+111433.973
+111434.201
+111434.442
+111434.694
+111434.959
+111435.251
+111172.586
+111172.596
+111172.619
+111172.652
+111172.697
+111172.754
+111172.822
+111172.901
+111172.992
+111173.094
+111173.207
+111173.331
+111173.467
+111173.614
+111173.772
+111173.941
+111174.122
+111174.314
+111174.517
+111174.732
+111174.958
+111175.196
+111175.445
+111175.707
+111175.996
+110913.146
+110913.157
+110913.179
+110913.212
+110913.256
+110913.312
+110913.379
+110913.458
+110913.547
+110913.648
+110913.76
+110913.883
+110914.017
+110914.162
+110914.318
+110914.486
+110914.664
+110914.854
+110915.055
+110915.267
+110915.49
+110915.725
+110915.972
+110916.231
+110916.517
+110653.486
+110653.496
+110653.518
+110653.551
+110653.595
+110653.65
+110653.716
+110653.794
+110653.882
+110653.982
+110654.092
+110654.213
+110654.346
+110654.489
+110654.643
+110654.809
+110654.985
+110655.172
+110655.371
+110655.58
+110655.801
+110656.033
+110656.276
+110656.532
+110656.815
+110393.608
+110393.618
+110393.64
+110393.672
+110393.716
+110393.77
+110393.835
+110393.912
+110393.999
+110394.097
+110394.206
+110394.326
+110394.456
+110394.598
+110394.75
+110394.913
+110395.087
+110395.272
+110395.468
+110395.675
+110395.892
+110396.121
+110396.361
+110396.614
+110396.893
+110133.515
+110133.525
+110133.547
+110133.579
+110133.621
+110133.675
+110133.74
+110133.815
+110133.901
+110133.998
+110134.105
+110134.223
+110134.352
+110134.491
+110134.641
+110134.802
+110134.974
+110135.156
+110135.349
+110135.553
+110135.768
+110135.993
+110136.23
+110136.479
+110136.755
+109873.211
+109873.221
+109873.242
+109873.273
+109873.315
+109873.368
+109873.432
+109873.506
+109873.591
+109873.686
+109873.792
+109873.908
+109874.035
+109874.172
+109874.32
+109874.479
+109874.648
+109874.827
+109875.017
+109875.218
+109875.43
+109875.652
+109875.885
+109876.131
+109876.403
+109612.698
+109612.708
+109612.728
+109612.759
+109612.801
+109612.853
+109612.915
+109612.988
+109613.072
+109613.166
+109613.27
+109613.384
+109613.509
+109613.644
+109613.79
+109613.946
+109614.112
+109614.289
+109614.476
+109614.674
+109614.882
+109615.101
+109615.33
+109615.572
+109615.84
+109351.979
+109351.989
+109352.009
+109352.04
+109352.081
+109352.132
+109352.193
+109352.265
+109352.347
+109352.439
+109352.542
+109352.654
+109352.777
+109352.91
+109353.053
+109353.207
+109353.37
+109353.544
+109353.728
+109353.923
+109354.127
+109354.343
+109354.568
+109354.806
+109355.07
+109091.059
+109091.069
+109091.088
+109091.118
+109091.158
+109091.209
+109091.269
+109091.34
+109091.42
+109091.511
+109091.612
+109091.722
+109091.843
+109091.974
+109092.114
+109092.265
+109092.426
+109092.596
+109092.777
+109092.968
+109093.169
+109093.381
+109093.603
+109093.836
+109094.096
+108829.94
+108829.95
+108829.969
+108829.998
+108830.038
+108830.087
+108830.146
+108830.216
+108830.295
+108830.384
+108830.483
+108830.591
+108830.71
+108830.838
+108830.976
+108831.124
+108831.282
+108831.449
+108831.627
+108831.814
+108832.012
+108832.219
+108832.437
+108832.666
+108832.921
+108568.627
+108568.636
+108568.655
+108568.684
+108568.722
+108568.771
+108568.829
+108568.897
+108568.975
+108569.062
+108569.159
+108569.265
+108569.381
+108569.507
+108569.642
+108569.787
+108569.942
+108570.106
+108570.28
+108570.464
+108570.658
+108570.861
+108571.075
+108571.3
+108571.55
+108307.122
+108307.131
+108307.15
+108307.178
+108307.216
+108307.263
+108307.32
+108307.387
+108307.463
+108307.548
+108307.643
+108307.747
+108307.861
+108307.984
+108308.117
+108308.259
+108308.411
+108308.571
+108308.742
+108308.922
+108309.112
+108309.311
+108309.52
+108309.741
+108309.986
+108045.431
+108045.44
+108045.458
+108045.485
+108045.522
+108045.569
+108045.625
+108045.69
+108045.764
+108045.848
+108045.94
+108046.042
+108046.154
+108046.274
+108046.404
+108046.543
+108046.691
+108046.849
+108047.015
+108047.191
+108047.377
+108047.572
+108047.777
+108047.992
+108048.233
+107783.557
+107783.565
+107783.583
+107783.61
+107783.646
+107783.691
+107783.746
+107783.809
+107783.882
+107783.964
+107784.054
+107784.154
+107784.263
+107784.38
+107784.507
+107784.643
+107784.788
+107784.942
+107785.105
+107785.277
+107785.458
+107785.649
+107785.849
+107786.059
+107786.295
+107521.503
+107521.512
+107521.529
+107521.555
+107521.591
+107521.635
+107521.688
+107521.75
+107521.821
+107521.901
+107521.989
+107522.086
+107522.192
+107522.307
+107522.431
+107522.564
+107522.705
+107522.855
+107523.014
+107523.182
+107523.359
+107523.545
+107523.74
+107523.946
+107524.177
+107259.276
+107259.284
+107259.301
+107259.326
+107259.361
+107259.404
+107259.455
+107259.516
+107259.585
+107259.663
+107259.749
+107259.844
+107259.947
+107260.059
+107260.18
+107260.309
+107260.447
+107260.593
+107260.748
+107260.912
+107261.084
+107261.265
+107261.455
+107261.656
+107261.881
+106996.878
+106996.886
+106996.902
+106996.927
+106996.961
+106997.003
+106997.053
+106997.112
+106997.179
+106997.255
+106997.339
+106997.431
+106997.531
+106997.64
+106997.758
+106997.884
+106998.017
+106998.16
+106998.311
+106998.47
+106998.638
+106998.814
+106998.999
+106999.194
+106999.414
+106734.315
+106734.323
+106734.338
+106734.363
+106734.395
+106734.436
+106734.485
+106734.542
+106734.607
+106734.681
+106734.762
+106734.852
+106734.95
+106735.056
+106735.17
+106735.292
+106735.422
+106735.56
+106735.707
+106735.861
+106736.025
+106736.196
+106736.376
+106736.566
+106736.78
+106471.591
+106471.598
+106471.614
+106471.637
+106471.669
+106471.708
+106471.756
+106471.811
+106471.875
+106471.946
+106472.025
+106472.112
+106472.207
+106472.31
+106472.42
+106472.539
+106472.665
+106472.799
+106472.941
+106473.091
+106473.249
+106473.416
+106473.59
+106473.774
+106473.983
+106208.711
+106208.718
+106208.733
+106208.756
+106208.787
+106208.825
+106208.871
+106208.925
+106208.986
+106209.055
+106209.132
+106209.216
+106209.308
+106209.407
+106209.514
+106209.629
+106209.751
+106209.881
+106210.018
+106210.164
+106210.317
+106210.478
+106210.647
+106210.825
+106211.028
+105945.681
+105945.688
+105945.702
+105945.724
+105945.753
+105945.79
+105945.835
+105945.887
+105945.946
+105946.013
+105946.087
+105946.168
+105946.257
+105946.353
+105946.456
+105946.567
+105946.685
+105946.811
+105946.944
+105947.084
+105947.232
+105947.388
+105947.551
+105947.723
+105947.92
+105682.504
+105682.511
+105682.525
+105682.546
+105682.574
+105682.61
+105682.653
+105682.703
+105682.76
+105682.824
+105682.896
+105682.974
+105683.06
+105683.152
+105683.252
+105683.359
+105683.473
+105683.594
+105683.722
+105683.857
+105684
+105684.15
+105684.308
+105684.474
+105684.664
+105419.187
+105419.193
+105419.207
+105419.227
+105419.254
+105419.289
+105419.33
+105419.378
+105419.433
+105419.495
+105419.564
+105419.639
+105419.721
+105419.811
+105419.907
+105420.009
+105420.119
+105420.235
+105420.359
+105420.489
+105420.626
+105420.771
+105420.922
+105421.082
+105421.266
+105155.735
+105155.741
+105155.753
+105155.773
+105155.799
+105155.832
+105155.872
+105155.918
+105155.971
+105156.03
+105156.096
+105156.168
+105156.247
+105156.333
+105156.425
+105156.524
+105156.629
+105156.741
+105156.859
+105156.984
+105157.116
+105157.254
+105157.4
+105157.553
+105157.73
+104892.152
+104892.158
+104892.17
+104892.189
+104892.214
+104892.245
+104892.283
+104892.328
+104892.378
+104892.435
+104892.498
+104892.567
+104892.643
+104892.725
+104892.813
+104892.908
+104893.008
+104893.115
+104893.228
+104893.348
+104893.474
+104893.607
+104893.746
+104893.893
+104894.063
+104628.446
+104628.451
+104628.463
+104628.481
+104628.504
+104628.535
+104628.571
+104628.613
+104628.661
+104628.716
+104628.776
+104628.842
+104628.914
+104628.992
+104629.076
+104629.166
+104629.262
+104629.364
+104629.472
+104629.586
+104629.707
+104629.833
+104629.966
+104630.107
+104630.27
+104364.621
+104364.626
+104364.637
+104364.654
+104364.676
+104364.705
+104364.739
+104364.78
+104364.826
+104364.877
+104364.934
+104364.997
+104365.066
+104365.14
+104365.22
+104365.306
+104365.397
+104365.494
+104365.597
+104365.705
+104365.82
+104365.94
+104366.066
+104366.2
+104366.357
+104100.683
+104100.688
+104100.698
+104100.714
+104100.735
+104100.763
+104100.795
+104100.833
+104100.877
+104100.926
+104100.98
+104101.039
+104101.104
+104101.175
+104101.251
+104101.332
+104101.418
+104101.51
+104101.607
+104101.71
+104101.819
+104101.932
+104102.052
+104102.179
+104102.328
+103836.638
+103836.643
+103836.652
+103836.667
+103836.688
+103836.713
+103836.744
+103836.78
+103836.821
+103836.867
+103836.918
+103836.975
+103837.036
+103837.102
+103837.174
+103837.25
+103837.332
+103837.418
+103837.51
+103837.607
+103837.709
+103837.817
+103837.93
+103838.05
+103838.192
+103572.493
+103572.497
+103572.506
+103572.52
+103572.539
+103572.563
+103572.592
+103572.626
+103572.664
+103572.708
+103572.756
+103572.808
+103572.866
+103572.928
+103572.995
+103573.067
+103573.144
+103573.225
+103573.311
+103573.402
+103573.498
+103573.599
+103573.705
+103573.818
+103573.952
+103308.253
+103308.257
+103308.265
+103308.278
+103308.296
+103308.318
+103308.345
+103308.377
+103308.413
+103308.453
+103308.498
+103308.547
+103308.601
+103308.659
+103308.722
+103308.789
+103308.86
+103308.936
+103309.016
+103309.101
+103309.191
+103309.285
+103309.384
+103309.49
+103309.617
+103043.925
+103043.928
+103043.936
+103043.948
+103043.965
+103043.985
+103044.01
+103044.04
+103044.073
+103044.111
+103044.152
+103044.198
+103044.247
+103044.301
+103044.359
+103044.422
+103044.488
+103044.558
+103044.633
+103044.711
+103044.795
+103044.882
+103044.974
+103045.072
+103045.191
+102779.515
+102779.518
+102779.525
+102779.536
+102779.552
+102779.571
+102779.594
+102779.62
+102779.651
+102779.686
+102779.724
+102779.766
+102779.812
+102779.861
+102779.914
+102779.972
+102780.033
+102780.097
+102780.166
+102780.238
+102780.315
+102780.395
+102780.48
+102780.57
+102780.682
+102515.03
+102515.033
+102515.039
+102515.049
+102515.063
+102515.08
+102515.101
+102515.126
+102515.154
+102515.185
+102515.22
+102515.258
+102515.3
+102515.345
+102515.394
+102515.446
+102515.501
+102515.56
+102515.622
+102515.688
+102515.758
+102515.832
+102515.909
+102515.992
+102516.095
+102250.476
+102250.479
+102250.485
+102250.494
+102250.506
+102250.522
+102250.54
+102250.562
+102250.588
+102250.616
+102250.647
+102250.681
+102250.719
+102250.759
+102250.803
+102250.85
+102250.9
+102250.953
+102251.009
+102251.069
+102251.132
+102251.198
+102251.268
+102251.342
+102251.438
+101985.861
+101985.863
+101985.869
+101985.877
+101985.887
+101985.901
+101985.918
+101985.937
+101985.959
+101985.984
+101986.012
+101986.042
+101986.075
+101986.111
+101986.15
+101986.191
+101986.236
+101986.283
+101986.332
+101986.385
+101986.441
+101986.5
+101986.562
+101986.629
+101986.716
+101721.192
+101721.194
+101721.198
+101721.205
+101721.214
+101721.226
+101721.24
+101721.257
+101721.276
+101721.298
+101721.322
+101721.348
+101721.376
+101721.407
+101721.441
+101721.477
+101721.515
+101721.556
+101721.599
+101721.645
+101721.694
+101721.745
+101721.799
+101721.858
+101721.937
+101456.475
+101456.476
+101456.48
+101456.486
+101456.493
+101456.503
+101456.515
+101456.529
+101456.545
+101456.563
+101456.583
+101456.605
+101456.629
+101456.655
+101456.683
+101456.713
+101456.745
+101456.779
+101456.816
+101456.855
+101456.896
+101456.94
+101456.986
+101457.037
+101457.107
+101191.718
+101191.719
+101191.722
+101191.726
+101191.733
+101191.74
+101191.75
+101191.761
+101191.774
+101191.788
+101191.803
+101191.821
+101191.84
+101191.86
+101191.883
+101191.907
+101191.932
+101191.96
+101191.989
+101192.021
+101192.054
+101192.09
+101192.128
+101192.171
+101192.232
+100926.928
+100926.929
+100926.931
+100926.935
+100926.939
+100926.945
+100926.952
+100926.96
+100926.969
+100926.979
+100926.991
+100927.003
+100927.017
+100927.032
+100927.048
+100927.066
+100927.084
+100927.105
+100927.126
+100927.15
+100927.176
+100927.203
+100927.233
+100927.267
+100927.319
+100662.113
+100662.113
+100662.115
+100662.117
+100662.12
+100662.124
+100662.129
+100662.134
+100662.14
+100662.146
+100662.153
+100662.161
+100662.17
+100662.179
+100662.189
+100662.199
+100662.21
+100662.223
+100662.236
+100662.251
+100662.267
+100662.285
+100662.306
+100662.331
+100662.375
+100397.278
+100397.278
+100397.279
+100397.28
+100397.282
+100397.284
+100397.287
+100397.29
+100397.293
+100397.296
+100397.3
+100397.303
+100397.308
+100397.312
+100397.316
+100397.32
+100397.324
+100397.328
+100397.333
+100397.337
+100397.342
+100397.347
+100397.354
+100397.365
+100397.397
+100132.427
+100132.427
+100132.427
+100132.427
+100132.428
+100132.428
+100132.429
+100132.43
+100132.431
+100132.432
+100132.432
+100132.433
+100132.434
+100132.435
+100132.437
+100132.438
+100132.439
+100132.44
+100132.441
+100132.443
+100132.444
+100132.446
+100132.449
+100132.454
+100132.47
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+25
+(
+119473.51
+119473.524
+119473.552
+119473.593
+119473.644
+119473.703
+119473.77
+119473.84
+119473.913
+119473.987
+119474.081
+119474.209
+119474.37
+119474.564
+119474.791
+119475.053
+119475.337
+119475.621
+119475.909
+119476.202
+119476.502
+119476.813
+119477.136
+119477.474
+119477.805
+)
+;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 100000;
+    }
+    wall1
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+75
+(
+119348.073
+119096.454
+118844.579
+118592.451
+118340.069
+118087.434
+117834.546
+117581.406
+117328.016
+117074.374
+116820.482
+116566.34
+116311.947
+116057.304
+115802.411
+115547.269
+115291.877
+115036.238
+114780.35
+114524.216
+114267.836
+114011.211
+113754.342
+113497.231
+113239.878
+112982.286
+112724.456
+112466.39
+112208.089
+111949.556
+111690.793
+111431.802
+111172.586
+110913.146
+110653.486
+110393.608
+110133.515
+109873.211
+109612.698
+109351.979
+109091.059
+108829.94
+108568.627
+108307.122
+108045.431
+107783.557
+107521.503
+107259.276
+106996.878
+106734.315
+106471.591
+106208.711
+105945.681
+105682.504
+105419.187
+105155.735
+104892.152
+104628.446
+104364.621
+104100.683
+103836.638
+103572.493
+103308.253
+103043.925
+102779.515
+102515.03
+102250.476
+101985.861
+101721.192
+101456.475
+101191.718
+100926.928
+100662.113
+100397.278
+100132.427
+)
+;
+    }
+    wall2
+    {
+        type            calculated;
+        value           nonuniform List<scalar>
+75
+(
+119352.376
+119100.503
+118848.509
+118596.324
+118343.913
+118091.264
+117838.371
+117585.229
+117331.839
+117078.198
+116824.305
+116570.161
+116315.766
+116061.119
+115806.221
+115551.071
+115295.671
+115040.021
+114784.122
+114527.973
+114271.578
+114014.935
+113758.047
+113500.915
+113243.539
+112985.923
+112728.066
+112469.971
+112211.64
+111953.075
+111694.278
+111435.251
+111175.996
+110916.517
+110656.815
+110396.893
+110136.755
+109876.403
+109615.84
+109355.07
+109094.096
+108832.921
+108571.55
+108309.986
+108048.233
+107786.295
+107524.177
+107261.881
+106999.414
+106736.78
+106473.983
+106211.028
+105947.92
+105684.664
+105421.266
+105157.73
+104894.063
+104630.27
+104366.357
+104102.328
+103838.192
+103573.952
+103309.617
+103045.191
+102780.682
+102516.095
+102251.438
+101986.716
+101721.937
+101457.107
+101192.232
+100927.319
+100662.375
+100397.397
+100132.47
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/p_rgh
new file mode 100644
index 0000000000..8bc7ba315b
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/p_rgh
@@ -0,0 +1,2150 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "5";
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+119473.51
+119473.524
+119473.552
+119473.593
+119473.644
+119473.703
+119473.77
+119473.84
+119473.913
+119473.987
+119474.081
+119474.209
+119474.37
+119474.564
+119474.791
+119475.053
+119475.337
+119475.621
+119475.909
+119476.202
+119476.502
+119476.813
+119477.136
+119477.474
+119477.805
+119472.766
+119472.778
+119472.803
+119472.84
+119472.89
+119472.952
+119473.025
+119473.111
+119473.21
+119473.322
+119473.45
+119473.594
+119473.756
+119473.936
+119474.134
+119474.348
+119474.577
+119474.819
+119475.072
+119475.337
+119475.611
+119475.896
+119476.189
+119476.492
+119476.791
+119471.765
+119471.777
+119471.802
+119471.841
+119471.892
+119471.956
+119472.033
+119472.123
+119472.226
+119472.343
+119472.474
+119472.618
+119472.777
+119472.95
+119473.136
+119473.337
+119473.55
+119473.776
+119474.014
+119474.264
+119474.526
+119474.798
+119475.081
+119475.376
+119475.656
+119470.511
+119470.524
+119470.549
+119470.588
+119470.639
+119470.704
+119470.781
+119470.872
+119470.975
+119471.092
+119471.222
+119471.364
+119471.52
+119471.689
+119471.871
+119472.066
+119472.273
+119472.492
+119472.724
+119472.968
+119473.225
+119473.493
+119473.773
+119474.066
+119474.329
+119469.004
+119469.016
+119469.042
+119469.08
+119469.131
+119469.196
+119469.273
+119469.363
+119469.466
+119469.582
+119469.71
+119469.852
+119470.006
+119470.173
+119470.352
+119470.544
+119470.749
+119470.966
+119471.195
+119471.437
+119471.691
+119471.958
+119472.236
+119472.529
+119472.777
+119467.243
+119467.255
+119467.281
+119467.319
+119467.37
+119467.434
+119467.511
+119467.6
+119467.703
+119467.818
+119467.946
+119468.086
+119468.239
+119468.405
+119468.583
+119468.774
+119468.978
+119469.194
+119469.422
+119469.663
+119469.916
+119470.183
+119470.461
+119470.754
+119470.986
+119465.23
+119465.242
+119465.267
+119465.305
+119465.356
+119465.42
+119465.496
+119465.586
+119465.688
+119465.802
+119465.93
+119466.07
+119466.222
+119466.388
+119466.566
+119466.756
+119466.959
+119467.174
+119467.402
+119467.643
+119467.897
+119468.163
+119468.441
+119468.734
+119468.951
+119462.964
+119462.977
+119463.002
+119463.04
+119463.091
+119463.154
+119463.231
+119463.32
+119463.422
+119463.536
+119463.663
+119463.803
+119463.955
+119464.12
+119464.298
+119464.488
+119464.691
+119464.906
+119465.135
+119465.375
+119465.629
+119465.895
+119466.174
+119466.467
+119466.668
+119460.448
+119460.46
+119460.486
+119460.523
+119460.574
+119460.638
+119460.714
+119460.803
+119460.905
+119461.019
+119461.146
+119461.286
+119461.438
+119461.603
+119461.781
+119461.971
+119462.174
+119462.389
+119462.617
+119462.858
+119463.111
+119463.378
+119463.657
+119463.95
+119464.135
+119457.681
+119457.693
+119457.718
+119457.756
+119457.807
+119457.87
+119457.947
+119458.036
+119458.138
+119458.252
+119458.379
+119458.518
+119458.671
+119458.836
+119459.013
+119459.203
+119459.406
+119459.621
+119459.85
+119460.09
+119460.344
+119460.61
+119460.89
+119461.183
+119461.352
+119454.663
+119454.676
+119454.701
+119454.739
+119454.789
+119454.853
+119454.929
+119455.018
+119455.12
+119455.234
+119455.361
+119455.5
+119455.653
+119455.817
+119455.995
+119456.185
+119456.388
+119456.603
+119456.831
+119457.072
+119457.326
+119457.592
+119457.872
+119458.165
+119458.318
+119451.395
+119451.407
+119451.432
+119451.47
+119451.521
+119451.584
+119451.661
+119451.749
+119451.851
+119451.965
+119452.092
+119452.232
+119452.384
+119452.549
+119452.726
+119452.916
+119453.119
+119453.334
+119453.562
+119453.803
+119454.056
+119454.323
+119454.602
+119454.896
+119455.032
+119447.877
+119447.889
+119447.914
+119447.952
+119448.002
+119448.066
+119448.142
+119448.231
+119448.332
+119448.447
+119448.573
+119448.713
+119448.865
+119449.029
+119449.207
+119449.397
+119449.599
+119449.814
+119450.042
+119450.283
+119450.536
+119450.802
+119451.081
+119451.375
+119451.495
+119444.108
+119444.12
+119444.145
+119444.183
+119444.234
+119444.297
+119444.373
+119444.462
+119444.563
+119444.677
+119444.804
+119444.943
+119445.095
+119445.259
+119445.436
+119445.626
+119445.828
+119446.043
+119446.271
+119446.511
+119446.765
+119447.03
+119447.309
+119447.603
+119447.705
+119440.09
+119440.102
+119440.127
+119440.164
+119440.215
+119440.278
+119440.354
+119440.443
+119440.544
+119440.658
+119440.784
+119440.923
+119441.075
+119441.239
+119441.416
+119441.605
+119441.807
+119442.022
+119442.249
+119442.489
+119442.742
+119443.008
+119443.286
+119443.579
+119443.665
+119435.822
+119435.834
+119435.859
+119435.896
+119435.947
+119436.01
+119436.086
+119436.174
+119436.275
+119436.389
+119436.515
+119436.654
+119436.805
+119436.969
+119437.146
+119437.335
+119437.536
+119437.75
+119437.977
+119438.217
+119438.469
+119438.734
+119439.012
+119439.304
+119439.373
+119431.305
+119431.317
+119431.342
+119431.379
+119431.43
+119431.492
+119431.568
+119431.656
+119431.757
+119431.871
+119431.997
+119432.135
+119432.286
+119432.449
+119432.626
+119432.814
+119433.015
+119433.229
+119433.455
+119433.694
+119433.946
+119434.211
+119434.488
+119434.78
+119434.831
+119426.54
+119426.552
+119426.576
+119426.614
+119426.664
+119426.727
+119426.802
+119426.89
+119426.991
+119427.104
+119427.229
+119427.367
+119427.518
+119427.681
+119427.857
+119428.045
+119428.245
+119428.458
+119428.684
+119428.922
+119429.174
+119429.437
+119429.714
+119430.005
+119430.038
+119421.527
+119421.539
+119421.563
+119421.601
+119421.651
+119421.713
+119421.788
+119421.876
+119421.976
+119422.089
+119422.214
+119422.352
+119422.502
+119422.664
+119422.839
+119423.027
+119423.227
+119423.439
+119423.664
+119423.902
+119424.152
+119424.415
+119424.691
+119424.98
+119424.996
+119416.267
+119416.279
+119416.303
+119416.341
+119416.39
+119416.453
+119416.527
+119416.615
+119416.715
+119416.827
+119416.952
+119417.089
+119417.238
+119417.4
+119417.575
+119417.762
+119417.961
+119418.172
+119418.396
+119418.633
+119418.882
+119419.144
+119419.419
+119419.708
+119419.705
+119410.761
+119410.773
+119410.797
+119410.834
+119410.884
+119410.946
+119411.021
+119411.108
+119411.207
+119411.319
+119411.443
+119411.58
+119411.728
+119411.89
+119412.063
+119412.249
+119412.448
+119412.659
+119412.882
+119413.117
+119413.366
+119413.627
+119413.9
+119414.188
+119414.167
+119405.01
+119405.022
+119405.047
+119405.083
+119405.133
+119405.194
+119405.269
+119405.355
+119405.454
+119405.566
+119405.689
+119405.825
+119405.973
+119406.134
+119406.307
+119406.492
+119406.689
+119406.899
+119407.121
+119407.356
+119407.603
+119407.862
+119408.135
+119408.421
+119408.381
+119399.016
+119399.028
+119399.052
+119399.089
+119399.138
+119399.199
+119399.273
+119399.359
+119399.458
+119399.568
+119399.691
+119399.826
+119399.974
+119400.133
+119400.305
+119400.49
+119400.686
+119400.895
+119401.116
+119401.349
+119401.595
+119401.853
+119402.124
+119402.409
+119402.35
+119392.779
+119392.791
+119392.815
+119392.851
+119392.9
+119392.961
+119393.034
+119393.12
+119393.218
+119393.328
+119393.45
+119393.585
+119393.731
+119393.89
+119394.061
+119394.244
+119394.439
+119394.647
+119394.867
+119395.099
+119395.343
+119395.6
+119395.869
+119396.152
+119396.075
+119386.301
+119386.313
+119386.336
+119386.373
+119386.421
+119386.482
+119386.555
+119386.64
+119386.737
+119386.847
+119386.968
+119387.102
+119387.247
+119387.405
+119387.575
+119387.757
+119387.951
+119388.157
+119388.375
+119388.606
+119388.849
+119389.104
+119389.372
+119389.653
+119389.557
+119379.583
+119379.595
+119379.619
+119379.655
+119379.703
+119379.763
+119379.835
+119379.92
+119380.017
+119380.125
+119380.246
+119380.379
+119380.523
+119380.68
+119380.849
+119381.029
+119381.222
+119381.427
+119381.644
+119381.873
+119382.114
+119382.367
+119382.633
+119382.913
+119382.797
+119372.628
+119372.639
+119372.663
+119372.698
+119372.746
+119372.806
+119372.878
+119372.962
+119373.058
+119373.166
+119373.285
+119373.417
+119373.561
+119373.716
+119373.884
+119374.063
+119374.254
+119374.458
+119374.673
+119374.9
+119375.14
+119375.391
+119375.655
+119375.933
+119375.797
+119365.436
+119365.447
+119365.471
+119365.506
+119365.553
+119365.613
+119365.684
+119365.767
+119365.863
+119365.97
+119366.088
+119366.219
+119366.361
+119366.516
+119366.682
+119366.86
+119367.05
+119367.251
+119367.465
+119367.69
+119367.928
+119368.178
+119368.439
+119368.715
+119368.559
+119358.01
+119358.021
+119358.044
+119358.079
+119358.126
+119358.185
+119358.256
+119358.338
+119358.433
+119358.539
+119358.657
+119358.786
+119358.927
+119359.08
+119359.245
+119359.422
+119359.61
+119359.81
+119360.021
+119360.245
+119360.481
+119360.728
+119360.988
+119361.26
+119361.085
+119350.351
+119350.362
+119350.385
+119350.42
+119350.467
+119350.525
+119350.595
+119350.677
+119350.77
+119350.876
+119350.992
+119351.121
+119351.26
+119351.412
+119351.575
+119351.75
+119351.937
+119352.135
+119352.344
+119352.566
+119352.799
+119353.045
+119353.302
+119353.572
+119353.376
+119342.462
+119342.474
+119342.496
+119342.531
+119342.577
+119342.635
+119342.704
+119342.785
+119342.878
+119342.982
+119343.097
+119343.224
+119343.363
+119343.513
+119343.675
+119343.848
+119344.032
+119344.229
+119344.436
+119344.656
+119344.887
+119345.13
+119345.384
+119345.652
+119345.436
+119334.346
+119334.357
+119334.379
+119334.413
+119334.459
+119334.516
+119334.585
+119334.665
+119334.757
+119334.86
+119334.974
+119335.1
+119335.237
+119335.385
+119335.545
+119335.717
+119335.899
+119336.094
+119336.299
+119336.516
+119336.745
+119336.985
+119337.237
+119337.502
+119337.265
+119326.004
+119326.014
+119326.037
+119326.07
+119326.115
+119326.172
+119326.24
+119326.319
+119326.41
+119326.512
+119326.625
+119326.749
+119326.885
+119327.032
+119327.19
+119327.359
+119327.54
+119327.732
+119327.935
+119328.15
+119328.376
+119328.614
+119328.863
+119329.125
+119328.867
+119317.438
+119317.449
+119317.471
+119317.504
+119317.549
+119317.605
+119317.672
+119317.75
+119317.84
+119317.94
+119318.052
+119318.175
+119318.309
+119318.454
+119318.611
+119318.778
+119318.957
+119319.146
+119319.347
+119319.559
+119319.783
+119320.018
+119320.264
+119320.523
+119320.243
+119308.653
+119308.663
+119308.685
+119308.718
+119308.762
+119308.817
+119308.883
+119308.96
+119309.049
+119309.148
+119309.259
+119309.38
+119309.512
+119309.656
+119309.81
+119309.976
+119310.152
+119310.339
+119310.537
+119310.747
+119310.968
+119311.2
+119311.443
+119311.699
+119311.397
+119299.649
+119299.659
+119299.681
+119299.713
+119299.757
+119299.811
+119299.877
+119299.953
+119300.04
+119300.138
+119300.247
+119300.367
+119300.498
+119300.639
+119300.791
+119300.955
+119301.129
+119301.313
+119301.509
+119301.716
+119301.934
+119302.162
+119302.403
+119302.655
+119302.332
+119290.431
+119290.441
+119290.462
+119290.494
+119290.537
+119290.591
+119290.655
+119290.73
+119290.817
+119290.913
+119291.021
+119291.139
+119291.267
+119291.407
+119291.557
+119291.718
+119291.89
+119292.072
+119292.265
+119292.469
+119292.683
+119292.909
+119293.146
+119293.395
+119293.049
+119281.001
+119281.011
+119281.032
+119281.063
+119281.105
+119281.158
+119281.222
+119281.296
+119281.381
+119281.476
+119281.582
+119281.698
+119281.825
+119281.962
+119282.11
+119282.269
+119282.438
+119282.617
+119282.807
+119283.008
+119283.22
+119283.442
+119283.675
+119283.921
+119283.553
+119271.362
+119271.372
+119271.393
+119271.424
+119271.465
+119271.517
+119271.58
+119271.653
+119271.736
+119271.83
+119271.934
+119272.049
+119272.173
+119272.309
+119272.454
+119272.61
+119272.777
+119272.953
+119273.14
+119273.338
+119273.546
+119273.765
+119273.995
+119274.236
+119273.846
+119261.518
+119261.528
+119261.548
+119261.579
+119261.619
+119261.671
+119261.732
+119261.804
+119261.886
+119261.978
+119262.081
+119262.193
+119262.316
+119262.449
+119262.592
+119262.746
+119262.909
+119263.083
+119263.267
+119263.461
+119263.666
+119263.881
+119264.107
+119264.345
+119263.932
+119251.472
+119251.482
+119251.502
+119251.532
+119251.572
+119251.622
+119251.682
+119251.753
+119251.834
+119251.924
+119252.025
+119252.135
+119252.256
+119252.387
+119252.527
+119252.678
+119252.839
+119253.01
+119253.19
+119253.381
+119253.583
+119253.794
+119254.016
+119254.249
+119253.813
+119241.228
+119241.237
+119241.257
+119241.286
+119241.325
+119241.375
+119241.434
+119241.503
+119241.583
+119241.672
+119241.77
+119241.879
+119241.997
+119242.125
+119242.264
+119242.412
+119242.569
+119242.737
+119242.914
+119243.102
+119243.299
+119243.507
+119243.725
+119243.954
+119243.495
+119230.789
+119230.798
+119230.817
+119230.846
+119230.884
+119230.933
+119230.991
+119231.059
+119231.137
+119231.224
+119231.321
+119231.427
+119231.543
+119231.669
+119231.804
+119231.949
+119232.104
+119232.268
+119232.442
+119232.626
+119232.82
+119233.023
+119233.237
+119233.461
+119232.979
+119220.159
+119220.168
+119220.186
+119220.215
+119220.252
+119220.3
+119220.357
+119220.423
+119220.499
+119220.585
+119220.68
+119220.784
+119220.898
+119221.021
+119221.153
+119221.296
+119221.447
+119221.608
+119221.778
+119221.958
+119222.148
+119222.347
+119222.556
+119222.776
+119222.27
+119209.342
+119209.351
+119209.369
+119209.396
+119209.433
+119209.48
+119209.535
+119209.6
+119209.675
+119209.759
+119209.851
+119209.953
+119210.064
+119210.185
+119210.315
+119210.454
+119210.602
+119210.759
+119210.926
+119211.102
+119211.288
+119211.483
+119211.687
+119211.903
+119211.372
+119198.342
+119198.35
+119198.368
+119198.395
+119198.431
+119198.476
+119198.531
+119198.594
+119198.667
+119198.749
+119198.84
+119198.939
+119199.048
+119199.166
+119199.292
+119199.428
+119199.573
+119199.727
+119199.89
+119200.062
+119200.243
+119200.434
+119200.634
+119200.844
+119200.289
+119187.163
+119187.171
+119187.189
+119187.215
+119187.25
+119187.294
+119187.347
+119187.41
+119187.481
+119187.56
+119187.649
+119187.746
+119187.852
+119187.967
+119188.091
+119188.223
+119188.365
+119188.515
+119188.674
+119188.842
+119189.019
+119189.205
+119189.4
+119189.605
+119189.026
+119175.81
+119175.818
+119175.835
+119175.86
+119175.895
+119175.938
+119175.989
+119176.05
+119176.119
+119176.197
+119176.283
+119176.378
+119176.481
+119176.593
+119176.714
+119176.843
+119176.981
+119177.127
+119177.282
+119177.446
+119177.618
+119177.799
+119177.989
+119178.19
+119177.586
+119164.286
+119164.294
+119164.311
+119164.336
+119164.369
+119164.411
+119164.461
+119164.52
+119164.588
+119164.663
+119164.747
+119164.839
+119164.94
+119165.049
+119165.166
+119165.292
+119165.426
+119165.568
+119165.719
+119165.878
+119166.046
+119166.222
+119166.408
+119166.602
+119165.973
+119152.598
+119152.605
+119152.621
+119152.645
+119152.678
+119152.719
+119152.768
+119152.825
+119152.89
+119152.964
+119153.045
+119153.135
+119153.233
+119153.338
+119153.453
+119153.575
+119153.705
+119153.843
+119153.99
+119154.144
+119154.307
+119154.479
+119154.659
+119154.848
+119154.193
+119140.748
+119140.756
+119140.771
+119140.795
+119140.826
+119140.866
+119140.913
+119140.969
+119141.032
+119141.103
+119141.182
+119141.269
+119141.364
+119141.467
+119141.577
+119141.696
+119141.822
+119141.956
+119142.098
+119142.248
+119142.407
+119142.573
+119142.747
+119142.931
+119142.251
+119128.743
+119128.75
+119128.765
+119128.788
+119128.818
+119128.856
+119128.902
+119128.956
+119129.018
+119129.087
+119129.163
+119129.247
+119129.339
+119129.439
+119129.546
+119129.66
+119129.783
+119129.912
+119130.05
+119130.195
+119130.348
+119130.509
+119130.678
+119130.856
+119130.15
+119116.587
+119116.594
+119116.608
+119116.63
+119116.659
+119116.696
+119116.741
+119116.793
+119116.852
+119116.919
+119116.993
+119117.074
+119117.163
+119117.259
+119117.362
+119117.473
+119117.591
+119117.717
+119117.85
+119117.99
+119118.138
+119118.294
+119118.457
+119118.629
+119117.897
+119104.285
+119104.291
+119104.305
+119104.326
+119104.355
+119104.39
+119104.433
+119104.483
+119104.541
+119104.605
+119104.676
+119104.755
+119104.84
+119104.933
+119105.033
+119105.139
+119105.253
+119105.374
+119105.502
+119105.638
+119105.781
+119105.931
+119106.088
+119106.254
+119105.496
+119091.842
+119091.848
+119091.861
+119091.882
+119091.909
+119091.943
+119091.985
+119092.033
+119092.088
+119092.15
+119092.219
+119092.294
+119092.376
+119092.465
+119092.561
+119092.664
+119092.774
+119092.89
+119093.013
+119093.144
+119093.281
+119093.425
+119093.577
+119093.737
+119092.952
+119079.264
+119079.27
+119079.283
+119079.302
+119079.328
+119079.361
+119079.401
+119079.447
+119079.5
+119079.559
+119079.625
+119079.698
+119079.777
+119079.862
+119079.954
+119080.053
+119080.158
+119080.27
+119080.388
+119080.513
+119080.645
+119080.783
+119080.929
+119081.082
+119080.271
+119066.556
+119066.562
+119066.574
+119066.592
+119066.618
+119066.649
+119066.687
+119066.731
+119066.782
+119066.839
+119066.902
+119066.971
+119067.047
+119067.129
+119067.217
+119067.311
+119067.412
+119067.519
+119067.632
+119067.751
+119067.878
+119068.01
+119068.149
+119068.296
+119067.458
+119053.724
+119053.729
+119053.741
+119053.759
+119053.782
+119053.813
+119053.849
+119053.891
+119053.939
+119053.994
+119054.054
+119054.12
+119054.192
+119054.27
+119054.354
+119054.444
+119054.54
+119054.642
+119054.75
+119054.864
+119054.985
+119055.111
+119055.244
+119055.384
+119054.518
+119040.773
+119040.778
+119040.789
+119040.806
+119040.829
+119040.857
+119040.892
+119040.932
+119040.978
+119041.03
+119041.087
+119041.15
+119041.218
+119041.292
+119041.372
+119041.458
+119041.549
+119041.646
+119041.749
+119041.858
+119041.972
+119042.092
+119042.219
+119042.352
+119041.459
+119027.709
+119027.714
+119027.725
+119027.741
+119027.762
+119027.789
+119027.822
+119027.86
+119027.904
+119027.953
+119028.007
+119028.066
+119028.131
+119028.202
+119028.277
+119028.359
+119028.445
+119028.537
+119028.634
+119028.737
+119028.845
+119028.959
+119029.079
+119029.206
+119028.284
+119014.539
+119014.544
+119014.554
+119014.569
+119014.589
+119014.614
+119014.645
+119014.681
+119014.722
+119014.768
+119014.82
+119014.876
+119014.937
+119015.003
+119015.075
+119015.151
+119015.233
+119015.319
+119015.411
+119015.508
+119015.611
+119015.718
+119015.831
+119015.95
+119015.001
+119001.268
+119001.272
+119001.282
+119001.296
+119001.315
+119001.339
+119001.368
+119001.401
+119001.44
+119001.483
+119001.531
+119001.584
+119001.642
+119001.704
+119001.771
+119001.843
+119001.919
+119002.001
+119002.087
+119002.178
+119002.274
+119002.375
+119002.481
+119002.593
+119001.615
+118987.903
+118987.907
+118987.915
+118987.928
+118987.946
+118987.968
+118987.995
+118988.027
+118988.063
+118988.103
+118988.148
+118988.197
+118988.251
+118988.309
+118988.372
+118988.439
+118988.51
+118988.586
+118988.666
+118988.751
+118988.841
+118988.935
+118989.034
+118989.139
+118988.133
+118974.449
+118974.453
+118974.461
+118974.473
+118974.489
+118974.51
+118974.535
+118974.564
+118974.598
+118974.635
+118974.677
+118974.722
+118974.772
+118974.826
+118974.884
+118974.946
+118975.012
+118975.082
+118975.157
+118975.236
+118975.319
+118975.406
+118975.498
+118975.596
+118974.561
+118960.914
+118960.917
+118960.924
+118960.935
+118960.95
+118960.969
+118960.992
+118961.019
+118961.05
+118961.085
+118961.123
+118961.165
+118961.21
+118961.26
+118961.313
+118961.37
+118961.431
+118961.496
+118961.565
+118961.637
+118961.714
+118961.794
+118961.879
+118961.969
+118960.904
+118947.303
+118947.306
+118947.312
+118947.323
+118947.336
+118947.354
+118947.375
+118947.399
+118947.427
+118947.458
+118947.493
+118947.531
+118947.573
+118947.618
+118947.667
+118947.719
+118947.774
+118947.833
+118947.896
+118947.962
+118948.031
+118948.105
+118948.182
+118948.264
+118947.171
+118933.624
+118933.626
+118933.632
+118933.641
+118933.654
+118933.669
+118933.688
+118933.71
+118933.735
+118933.763
+118933.795
+118933.829
+118933.866
+118933.907
+118933.951
+118933.998
+118934.047
+118934.1
+118934.157
+118934.216
+118934.279
+118934.345
+118934.415
+118934.489
+118933.366
+118919.883
+118919.885
+118919.891
+118919.899
+118919.909
+118919.923
+118919.94
+118919.959
+118919.981
+118920.006
+118920.034
+118920.064
+118920.097
+118920.133
+118920.172
+118920.213
+118920.258
+118920.305
+118920.354
+118920.407
+118920.463
+118920.522
+118920.584
+118920.65
+118919.498
+118906.088
+118906.09
+118906.094
+118906.101
+118906.11
+118906.122
+118906.137
+118906.153
+118906.173
+118906.194
+118906.218
+118906.244
+118906.273
+118906.304
+118906.337
+118906.373
+118906.411
+118906.452
+118906.495
+118906.541
+118906.59
+118906.642
+118906.696
+118906.754
+118905.571
+118892.246
+118892.247
+118892.251
+118892.256
+118892.264
+118892.274
+118892.286
+118892.3
+118892.316
+118892.334
+118892.354
+118892.376
+118892.399
+118892.425
+118892.454
+118892.484
+118892.516
+118892.55
+118892.587
+118892.625
+118892.667
+118892.71
+118892.757
+118892.807
+118891.594
+118878.363
+118878.364
+118878.367
+118878.372
+118878.378
+118878.386
+118878.395
+118878.406
+118878.419
+118878.433
+118878.449
+118878.466
+118878.485
+118878.505
+118878.528
+118878.552
+118878.577
+118878.605
+118878.634
+118878.666
+118878.7
+118878.735
+118878.774
+118878.815
+118877.572
+118864.448
+118864.449
+118864.451
+118864.454
+118864.459
+118864.464
+118864.471
+118864.48
+118864.489
+118864.499
+118864.51
+118864.523
+118864.537
+118864.552
+118864.568
+118864.585
+118864.604
+118864.624
+118864.646
+118864.67
+118864.695
+118864.723
+118864.753
+118864.785
+118863.511
+118850.507
+118850.507
+118850.509
+118850.511
+118850.514
+118850.518
+118850.523
+118850.528
+118850.534
+118850.54
+118850.547
+118850.555
+118850.564
+118850.573
+118850.583
+118850.593
+118850.604
+118850.617
+118850.63
+118850.645
+118850.661
+118850.679
+118850.7
+118850.724
+118849.418
+118836.546
+118836.546
+118836.547
+118836.549
+118836.55
+118836.553
+118836.555
+118836.558
+118836.561
+118836.565
+118836.568
+118836.572
+118836.576
+118836.58
+118836.585
+118836.589
+118836.593
+118836.597
+118836.601
+118836.605
+118836.61
+118836.615
+118836.622
+118836.632
+118835.292
+118822.569
+118822.569
+118822.57
+118822.57
+118822.571
+118822.571
+118822.572
+118822.573
+118822.574
+118822.574
+118822.575
+118822.576
+118822.577
+118822.578
+118822.579
+118822.58
+118822.581
+118822.583
+118822.584
+118822.585
+118822.587
+118822.589
+118822.592
+118822.596
+118821.22
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedFluxPressure;
+        gradient        uniform 0;
+        value           nonuniform List<scalar>
+25
+(
+1.10023477e-312
+9.56803577e-317
+0
+9.90566442e-317
+0.000166643311
+6.91152471e-310
+9.89394123e-317
+0
+0
+0
+2.71615461e-312
+9.89845107e-317
+6.95280695e-310
+0
+0
+1.22047495e-05
+0
+0
+7.90505033e-322
+2.3715151e-322
+9.88275954e-317
+3.45845952e-323
+0.000140752294
+1.31043555e-306
+1.02765654e-321
+)
+;
+    }
+    outlet
+    {
+        type            prghPressure;
+        p               uniform 100000;
+        value           nonuniform List<scalar>
+25
+(
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.58
+118815.579
+118814.178
+)
+;
+    }
+    wall1
+    {
+        type            fixedFluxPressure;
+        gradient        uniform 0;
+        value           nonuniform List<scalar>
+75
+(
+1.10023477e-312
+1.10023477e-312
+2.12199579e-314
+9.76619289e+11
+1.32291928e+180
+5.29778802e+151
+1.23971581e+224
+1.44161265e+214
+3.50346163e-86
+6.8991168e-310
+4.7430302e-322
+1.74405173e-321
+9.92084607e-317
+9.92340731e-317
+2.12199579e-314
+3.9698428e+257
+1.92659091e+31
+3.9698428e+257
+1.04896151e+242
+9.76619289e+11
+1.63936678e-52
+1.05845575e+189
+4.11667183e-311
+0.00010412751
+0
+0
+0
+6.91134029e-310
+9.94971136e-317
+9.90329291e-317
+7.90505033e-322
+2.3715151e-322
+9.94969951e-317
+1.97626258e-323
+2.12199579e-314
+8.40835471e-315
+1.02765654e-321
+3.16202013e-322
+9.92353379e-317
+1.08221785e-312
+9.90332848e-317
+9.76619045e+11
+1.32291887e+180
+5.2977871e+151
+1.23971565e+224
+4.00193173e-322
+1.00526865e-316
+9.90332058e-317
+1.58101007e-322
+2.3715151e-322
+9.90333639e-317
+2.47032823e-323
+2.12199579e-314
+2.15294903e-312
+2.21341409e-321
+4.7430302e-322
+9.92325711e-317
+2.61854792e-322
+6.91155249e-310
+9.76619289e+11
+1.32291928e+180
+5.29778802e+151
+1.23971581e+224
+1.44161265e+214
+4.90839929e+252
+2.15253881e-312
+0
+4.00193173e-322
+1.00526865e-316
+9.94969951e-317
+1.58101007e-322
+2.3715151e-322
+9.92094884e-317
+4.94065646e-323
+2.12199579e-314
+)
+;
+    }
+    wall2
+    {
+        type            fixedFluxPressure;
+        gradient        uniform 0;
+        value           nonuniform List<scalar>
+75
+(
+1.10023477e-312
+1.10023477e-312
+9.90713872e-317
+9.90713872e-317
+0
+9.90660117e-317
+9.76767782e-321
+5.14322337e-321
+1.10023477e-312
+9.90582648e-317
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+)
+;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/water.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/water.gas
new file mode 100644
index 0000000000..88fcd3f522
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/water.gas
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volScalarField;
+    location    "5";
+    object      water.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.gas;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    wall1
+    {
+        type            zeroGradient;
+    }
+    wall2
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/water.liquid
similarity index 59%
rename from tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/water.liquid
index 4564ccc46a..d9898cfff0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/water.liquid
@@ -2,47 +2,50 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
+    class       volScalarField;
+    location    "5";
+    object      water.liquid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-4
-(
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
     inlet
     {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
+        type            fixedValue;
+        value           uniform 1;
     }
     outlet
     {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
+        type            inletOutlet;
+        phi             phi.liquid;
+        inletValue      uniform 1;
+        value           uniform 1;
     }
-    walls
+    wall1
     {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
+        type            zeroGradient;
+    }
+    wall2
+    {
+        type            zeroGradient;
     }
     defaultFaces
     {
         type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
     }
-)
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/chemistryProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/chemistryProperties.gas
new file mode 100644
index 0000000000..6b8951c710
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/chemistryProperties.gas
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      chemistryProperties.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+chemistryType
+{
+    chemistrySolver   EulerImplicit;
+    chemistryThermo   rho;
+}
+
+chemistry           off;
+
+initialChemicalTimeStep 1e-07;
+
+EulerImplicitCoeffs
+{
+    cTauChem        1;
+    equilibriumRateLimiter off;
+}
+
+odeCoeffs
+{
+    solver          Rosenbrock43;
+    absTol          1e-12;
+    relTol          0.01;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/combustionProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/combustionProperties.gas
new file mode 100644
index 0000000000..dc92f24629
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/combustionProperties.gas
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      combustionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+combustionModel    PaSR<rhoChemistryCombustion>;
+
+active  false;
+
+laminarCoeffs
+{}
+
+noCombustionCoeffs
+{}
+
+PaSRCoeffs
+{
+    Cmix                1.0;
+    turbulentReaction   yes;
+    useReactionRate     true;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
similarity index 89%
rename from tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g
rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
index 508d658494..558d533e74 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -16,7 +16,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 0);
-
+value           ( 0 -9.81 0 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
new file mode 100644
index 0000000000..edb155ace2
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
@@ -0,0 +1,239 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      phaseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type    thermalPhaseChangeTwoPhaseSystem;
+
+phases (gas liquid);
+
+volatile    "water";
+
+massTransfer on;
+
+gas
+{
+    type            multiComponentPhaseModel;
+    diameterModel   isothermal;
+    constantCoeffs
+    {
+        d               0.00045;
+    }
+
+    isothermalCoeffs
+    {
+        d0               0.00045;
+        p0              1e5;
+    }
+    Sc              0.7;
+
+    residualAlpha   1e-4;
+}
+
+liquid
+{
+    type            multiComponentPhaseModel;
+    diameterModel   constant;
+    constantCoeffs
+    {
+        d               0.00045;
+    }
+    Sc              0.7;
+
+    residualAlpha   1e-4;
+}
+
+blending
+{
+    default
+    {
+        type            linear;
+        continuousPhase liquid;
+        minFullyContinuousAlpha.gas 0.7;
+        minPartlyContinuousAlpha.gas 0.5;
+        minFullyContinuousAlpha.liquid 0.7;
+        minPartlyContinuousAlpha.liquid 0.5;
+    }
+
+    heatTransfer
+    {
+        type            linear;
+        continuousPhase liquid;
+        minFullyContinuousAlpha.gas 1;
+        minPartlyContinuousAlpha.gas 0;
+        minFullyContinuousAlpha.liquid 1;
+        minPartlyContinuousAlpha.liquid 0;
+    }
+
+    massTransfer
+    {
+        type            linear;
+        continuousPhase liquid;
+        minFullyContinuousAlpha.gas 1;
+        minPartlyContinuousAlpha.gas 0;
+        minFullyContinuousAlpha.liquid 1;
+        minPartlyContinuousAlpha.liquid 0;
+    }
+}
+
+surfaceTension
+(
+    (gas and liquid)
+    {
+        type            constant;
+        sigma           0.07;
+    }
+);
+
+saturationModel
+{
+    type polynomial;
+    C<8>
+    (
+        308.0422
+        0.0015096
+        -1.61589e-8
+        1.114106e-13
+        -4.52216e-19
+        1.05192e-24
+        -1.2953e-30
+        6.5365e-37
+    );
+};
+
+aspectRatio
+(
+    (gas in liquid)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (liquid in gas)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (gas in liquid)
+    {
+        type            SchillerNaumann;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (liquid in gas)
+    {
+        type            SchillerNaumann;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
+
+virtualMass
+(
+    (gas in liquid)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (liquid in gas)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+);
+
+interfaceComposition
+();
+
+heatTransfer.gas
+(
+    (gas in liquid)
+    {
+        type spherical;
+        residualAlpha 1e-3;
+    }
+
+    (liquid in gas)
+    {
+        type RanzMarshall;
+        residualAlpha 1e-3;
+    }
+);
+
+heatTransfer.liquid
+(
+    (gas in liquid)
+    {
+        type RanzMarshall;
+        residualAlpha 1e-3;
+    }
+
+    (liquid in gas)
+    {
+        type spherical;
+        residualAlpha 1e-3;
+    }
+);
+
+massTransfer.gas
+();
+
+massTransfer.liquid
+();
+
+lift
+();
+
+wallLubrication
+(
+    (gas in liquid)
+    {
+        type            Antal;
+        Cw1             -0.01;
+        Cw2             0.05;
+        Cwc             10.0;
+        Cwd             6.8;
+        p               1.7;
+    }
+);
+
+turbulentDispersion
+(
+    (gas in liquid)
+    {
+        type                Burns;
+        sigma               0.7;
+        Ctd                 1.0;
+        residualAlpha       1e-3;
+    }
+);
+
+// Minimum allowable pressure
+pMin            10000;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
new file mode 100644
index 0000000000..7b3b350ea1
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
@@ -0,0 +1,68 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         multiComponentMixture;
+    transport       const;
+    thermo          hRefConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+dpdt no;
+
+species
+(
+    water
+);
+
+inertSpecie water;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/constant/reactions.gas";
+
+water
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        rho        1;
+    }
+
+    thermodynamics
+    {
+        Hf          0;
+        Cp          12078.4;
+        Tref        373.55;
+        Href        2675500;
+    }
+    transport
+    {
+        mu          1.2256e-5;
+        Pr          2.289;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
new file mode 100644
index 0000000000..7406b2ce4f
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties.liquid;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         multiComponentMixture;
+    transport       const;
+    thermo          hRefConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+dpdt no;
+
+species
+(
+    water
+);
+
+inertSpecie water;
+
+"(mixture|H2O|water)"
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    equationOfState
+    {
+        R           3000;
+        rho0        959;
+        rho        959;
+    }
+    thermodynamics
+    {
+        Hf          0;
+        Cp          4195;
+        Tref        373.55;
+        Href        417500;
+    }
+    transport
+    {
+        mu          2.8291e-4;
+        Pr          2.289;
+    }
+}
+
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
new file mode 100644
index 0000000000..40de4981f5
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RAS;
+
+RAS
+{
+    RASModel continuousGasKEpsilon;
+
+    turbulence      on;
+    printCoeffs     on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
new file mode 100644
index 0000000000..2c0b129e11
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RAS;
+
+RAS
+{
+    RASModel LaheyKEpsilon;
+
+    turbulence      on;
+    printCoeffs     on;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
new file mode 100644
index 0000000000..d2ab81e94b
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict
@@ -0,0 +1,80 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (0 0 0)
+    (0.05 0 0)
+    (0.05 2 0)
+    (0 2 0)
+    (0 0 0.1)
+    (0.05 0 0.1)
+    (0.05 2 0.1)
+    (0 2 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (25 75 1) simpleGrading (1 1 1)
+);
+
+boundary
+(
+    inlet
+    {
+        type mappedPatch;
+        offset          (0 0.1 0);
+        sampleRegion    region0;
+        sampleMode      nearestCell;
+        samplePatch     none;
+
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+
+    wall1
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+
+    wall2
+    {
+        type wall;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
new file mode 100644
index 0000000000..e5924f35ea
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingTwoPhaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         2;
+
+deltaT          1e-5;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  9;
+
+writeCompression compressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.05;
+
+maxDeltaT       0.001;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
new file mode 100644
index 0000000000..7b1bd04503
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes
@@ -0,0 +1,71 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default                         none;
+
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
+    "div\(phir,alpha.*\)"           Gauss vanLeer;
+
+    "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"              Gauss limitedLinearV 1;
+
+    "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
+    "div\(alphaPhi.*,p\)"           Gauss limitedLinear 1;
+
+    "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss upwind;
+    "div\(phim,(k|epsilon)m\)"      Gauss upwind;
+
+    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+wallDist
+{
+    method          meshWave;
+    nRequired       yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
new file mode 100644
index 0000000000..290f4171f4
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution
@@ -0,0 +1,112 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 3;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        smoother        DIC;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+        tolerance       1e-8;
+        relTol          0.1;
+        maxIter         100;
+        minIter         2;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        relTol          0;
+    }
+
+    "U.*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+    }
+
+    "(e|h).*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-12;
+        relTol          0.001;
+        minIter         1;
+        maxIter         20;
+    }
+
+    "(k|epsilon|Theta).*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+        minIter         1;
+    }
+
+    Yi
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+        residualAlpha   1e-8;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors    3;
+    nCorrectors         1;
+    nNonOrthogonalCorrectors 0;
+    nEnergyCorrectors   3;
+    faceMomentum        on;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        iDmdt 0.4;
+    }
+
+    equations
+    {
+        ".*"            1;
+        "h.*"           0.4;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
index 9c0fd4206c..c687cb56b5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
index e592c501d5..c657a1cac0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index de5ac9e437..34f585b9fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 3f7a06fbc5..d4af30d67a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 26877364f2..895e7d2cd6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 996495e814..832475f155 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index 350b0c0c1f..cb85de6bd8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/CO.gas
index 3241a1ab52..219c366301 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/CO.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/CO.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.gas
index 4c75b36928..725f4dc423 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.liquid
index c7ad1c1c75..f5f19ecf1c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/H2O.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.gas
index db51372765..b050c6b4b0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.liquid
index 1e5699a4cd..ebc13c97f1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/T.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas
index 48fc136a2d..d0833a5210 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid
index b041afd007..b132d0935e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/U.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/Ydefault b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/Ydefault
index cc22bdff91..1c9821ffac 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/Ydefault
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/Ydefault
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.gas
index a97658d602..def001f5ff 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.liquid
index dc181ed87a..b1319efa66 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/air.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas
index 2d4796c433..1cc50fb0ce 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas.org
index 093bcdab07..4696fb329b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.gas.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid
index 60143dd533..a65ec6204d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid.org
index 4ba98f325e..8b632e35f0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/alpha.liquid.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh
index de5ac9e437..34f585b9fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
index eb0bbd970e..aff6b241a8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
index 0bfc34018d..42605ffdfa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
index 2f486f8bea..e996b363d2 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
index 1db1a26701..fea48e71e0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
index 8a2a00b53a..d4a6d83a5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
index 04b7acab20..b855978f2a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
index b6cb44bf83..8f05dacb9c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
index c98c387d4e..84a5101247 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
index 4e59054879..0671dfcaf5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
index 323c361051..b9e7536aa7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
index 8afdc29c84..11031f6ba4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.gas
index 1da050a2b2..775a80b054 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.liquid
index 8a681a590b..aaacda2b2c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/T.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.gas
index 4f37ea90bf..0e5be4f8de 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.liquid
index c70b49719c..9632924156 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/U.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.gas
index 2e6c5de3ba..d233d12efd 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.liquid
index dc181ed87a..b1319efa66 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/air.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.gas
index 5169dec6f8..6fab74f8d5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.liquid
index 2fc0873d4f..cad8aaf938 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/alpha.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh
index de5ac9e437..34f585b9fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.gas
index 4bb3d7f79b..628748ad48 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.liquid
index 51e7d02eb1..15a333ce73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/water.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
index 6b628569c1..cfb3954e0d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
index 8b81329328..eb6cf045c4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
index 22a48eded3..379d4211c4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
index 1db1a26701..fea48e71e0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
index 8a2a00b53a..d4a6d83a5c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
index d24ddcc366..6e9f6b0890 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
index aa9a02819a..91cef51bb5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
index 8f0f170458..3561d227f0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
index facd52f351..8d03adba12 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
index 9c0fd4206c..c687cb56b5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
index 1cfd38f926..a379d10905 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air
index cd5560fb91..b8d3eac959 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
index de5ac9e437..34f585b9fc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index e46eefe317..a4dee09379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 26877364f2..895e7d2cd6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index ebb603c3cc..4b90bcb59d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
index 171537ad31..b275bf3588 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
index 85996cf966..04e6149cb7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.air
index de0ac66f78..c81346a16e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles
index 5762b51bd8..549ac0225f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
index f417c38e3a..7d7c3fa9c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
index a9af55993e..cfd52f9dab 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles
index fa0397ae35..4d47947495 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles
index cf55161b4a..35c2298115 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org
index b28a5a97d9..24b7f560f7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
index b047d8d119..515adc6051 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air
index 0b5f62a356..b46c7bc85e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/k.air
index 307a3495c9..6d5b08a389 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/k.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air
index dcb65148ae..bc4243363e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles
index 6264a273f7..95275d1e5a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p
index b318305599..ecd66ab696 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh
index 955d523b83..f711cf992d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index 140b966aee..69b681419c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/boundary
deleted file mode 100644
index cda7f49514..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11770;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11800;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          400;
-        startFace       11830;
-    }
-    frontAndBackPlanes
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12000;
-        startFace       12230;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..21f45062dc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index 08671cc51e..0adb9d8a77 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
index 900f5a585b..95e1975252 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 9718ec3234..0a487eda39 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 4a0b2ace30..852ff24bc5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index 0081c93776..17b0b1e8eb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
index 6b0a740e5c..161a83fac6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.air
index 94edcc5942..2e96c6ec6d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.water
index 36476e1e29..22b2370b23 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.air
index 2a2f95b740..11eeff6ada 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.water
index 407b341dbe..17034155ee 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air.org b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air.org
index 6832d99db2..1d3911c757 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air.org
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p
index 84126539db..9d41413f0c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh
index 3659b453ff..9aa3e1af97 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
index 5bc7e7ef87..b270e4c706 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
index efcc993537..139b98d146 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/polyMesh/boundary
deleted file mode 100644
index 47889c5cc1..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          175;
-        startFace       3675;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
index 7d811b77b3..7abc42d0ab 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
index 9855241d11..37e6a1c8df 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
index ce72eac3c2..da2a1c9189 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
index 350b0c0c1f..cb85de6bd8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
index 610cfff17e..d9d3331012 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
index c2ea64d776..1ea789cf49 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta
index b18d202df8..19fecae11d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
index 7a88b38478..e36f036426 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
index b93b8d870d..b6559f069a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
index b995d77c16..d1904cd5e9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p
index f8b3deba00..ded959d921 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
index 3267f0a6f3..a70d061e91 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index c604aa7e2c..d25c9f545a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index e374b02851..0a6fa4dbca 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict
deleted file mode 100644
index 0c15d76614..0000000000
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict
+++ /dev/null
@@ -1,818 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// General macros to create 2D/extruded-2D meshes
-
-
-
-
-
-
-
-
-
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.1;
-
-// Hub radius
-
-
-// Impeller-tip radius
-
-
-// Baffle-tip radius
-
-
-// Tank radius
-
-
-// MRF region radius
-
-
-// Thickness of 2D slab
-
-
-// Base z
-
-
-// Top z
-
-
-// Number of cells radially between hub and impeller tip
-
-
-// Number of cells radially in each of the two regions between
-// impeller and baffle tips
-
-
-// Number of cells radially between baffle tip and tank
-
-
-// Number of cells azimuthally in each of the 8 blocks
-
-
-// Number of cells in the thickness of the slab
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-vertices
-(
-    (0.2 0 0) // Vertex r0b = 0
-    (0.2 0 0) // Vertex r0sb = 1
-    (0.141421356364228 -0.141421356110391 0) // Vertex r1b = 2
-    (3.58979347393082e-10 -0.2 0) // Vertex r2b = 3
-    (3.58979347393082e-10 -0.2 0) // Vertex r2sb = 4
-    (-0.141421355856554 -0.141421356618065 0) // Vertex r3b = 5
-    (-0.2 7.17958694786164e-10 0) // Vertex r4b = 6
-    (-0.2 7.17958694786164e-10 0) // Vertex r4sb = 7
-    (-0.141421355856554 0.141421356618065 0) // Vertex r5b = 8
-    (3.58979347393082e-10 0.2 0) // Vertex r6b = 9
-    (3.58979347393082e-10 0.2 0) // Vertex r6sb = 10
-    (0.141421356364228 0.141421356110391 0) // Vertex r7b = 11
-
-    (0.5 0 0) // Vertex rb0b = 12
-    (0.353553390910569 -0.353553390275978 0) // Vertex rb1b = 13
-    (8.97448368482705e-10 -0.5 0) // Vertex rb2b = 14
-    (-0.353553389641386 -0.353553391545162 0) // Vertex rb3b = 15
-    (-0.5 1.79489673696541e-09 0) // Vertex rb4b = 16
-    (-0.353553389641386 0.353553391545162 0) // Vertex rb5b = 17
-    (8.97448368482705e-10 0.5 0) // Vertex rb6b = 18
-    (0.353553390910569 0.353553390275978 0) // Vertex rb7b = 19
-
-    (0.6 0 0) // Vertex ri0b = 20
-    (0.424264069092683 -0.424264068331174 0) // Vertex ri1b = 21
-    (1.07693804217925e-09 -0.6 0) // Vertex ri2b = 22
-    (-0.424264067569663 -0.424264069854194 0) // Vertex ri3b = 23
-    (-0.6 2.15387608435849e-09 0) // Vertex ri4b = 24
-    (-0.424264067569663 0.424264069854194 0) // Vertex ri5b = 25
-    (1.07693804217925e-09 0.6 0) // Vertex ri6b = 26
-    (0.424264069092683 0.424264068331174 0) // Vertex ri7b = 27
-
-    (0.7 0 0) // Vertex Rb0b = 28
-    (0.494974747274797 -0.494974746386369 0) // Vertex Rb1b = 29
-    (1.25642771587579e-09 -0.7 0) // Vertex Rb2b = 30
-    (-0.49497474549794 -0.494974748163226 0) // Vertex Rb3b = 31
-    (-0.7 2.51285543175157e-09 0) // Vertex Rb4b = 32
-    (-0.49497474549794 0.494974748163226 0) // Vertex Rb5b = 33
-    (1.25642771587579e-09 0.7 0) // Vertex Rb6b = 34
-    (0.494974747274797 0.494974746386369 0) // Vertex Rb7b = 35
-
-    (1 0 0) // Vertex R0b = 36
-    (0.707106781821139 -0.707106780551956 0) // Vertex R1b = 37
-    (0.707106781821139 -0.707106780551956 0) // Vertex R1sb = 38
-    (1.79489673696541e-09 -1 0) // Vertex R2b = 39
-    (-0.707106779282772 -0.707106783090323 0) // Vertex R3b = 40
-    (-0.707106779282772 -0.707106783090323 0) // Vertex R3sb = 41
-    (-1 3.58979347393082e-09 0) // Vertex R4b = 42
-    (-0.707106779282772 0.707106783090323 0) // Vertex R5b = 43
-    (-0.707106779282772 0.707106783090323 0) // Vertex R5sb = 44
-    (1.79489673696541e-09 1 0) // Vertex R6b = 45
-    (0.707106781821139 0.707106780551956 0) // Vertex R7b = 46
-    (0.707106781821139 0.707106780551956 0) // Vertex R7sb = 47
-
-    (0.2 0 0.1) // Vertex r0t = 48
-    (0.2 0 0.1) // Vertex r0st = 49
-    (0.141421356364228 -0.141421356110391 0.1) // Vertex r1t = 50
-    (3.58979347393082e-10 -0.2 0.1) // Vertex r2t = 51
-    (3.58979347393082e-10 -0.2 0.1) // Vertex r2st = 52
-    (-0.141421355856554 -0.141421356618065 0.1) // Vertex r3t = 53
-    (-0.2 7.17958694786164e-10 0.1) // Vertex r4t = 54
-    (-0.2 7.17958694786164e-10 0.1) // Vertex r4st = 55
-    (-0.141421355856554 0.141421356618065 0.1) // Vertex r5t = 56
-    (3.58979347393082e-10 0.2 0.1) // Vertex r6t = 57
-    (3.58979347393082e-10 0.2 0.1) // Vertex r6st = 58
-    (0.141421356364228 0.141421356110391 0.1) // Vertex r7t = 59
-
-    (0.5 0 0.1) // Vertex rb0t = 60
-    (0.353553390910569 -0.353553390275978 0.1) // Vertex rb1t = 61
-    (8.97448368482705e-10 -0.5 0.1) // Vertex rb2t = 62
-    (-0.353553389641386 -0.353553391545162 0.1) // Vertex rb3t = 63
-    (-0.5 1.79489673696541e-09 0.1) // Vertex rb4t = 64
-    (-0.353553389641386 0.353553391545162 0.1) // Vertex rb5t = 65
-    (8.97448368482705e-10 0.5 0.1) // Vertex rb6t = 66
-    (0.353553390910569 0.353553390275978 0.1) // Vertex rb7t = 67
-
-    (0.6 0 0.1) // Vertex ri0t = 68
-    (0.424264069092683 -0.424264068331174 0.1) // Vertex ri1t = 69
-    (1.07693804217925e-09 -0.6 0.1) // Vertex ri2t = 70
-    (-0.424264067569663 -0.424264069854194 0.1) // Vertex ri3t = 71
-    (-0.6 2.15387608435849e-09 0.1) // Vertex ri4t = 72
-    (-0.424264067569663 0.424264069854194 0.1) // Vertex ri5t = 73
-    (1.07693804217925e-09 0.6 0.1) // Vertex ri6t = 74
-    (0.424264069092683 0.424264068331174 0.1) // Vertex ri7t = 75
-
-    (0.7 0 0.1) // Vertex Rb0t = 76
-    (0.494974747274797 -0.494974746386369 0.1) // Vertex Rb1t = 77
-    (1.25642771587579e-09 -0.7 0.1) // Vertex Rb2t = 78
-    (-0.49497474549794 -0.494974748163226 0.1) // Vertex Rb3t = 79
-    (-0.7 2.51285543175157e-09 0.1) // Vertex Rb4t = 80
-    (-0.49497474549794 0.494974748163226 0.1) // Vertex Rb5t = 81
-    (1.25642771587579e-09 0.7 0.1) // Vertex Rb6t = 82
-    (0.494974747274797 0.494974746386369 0.1) // Vertex Rb7t = 83
-
-    (1 0 0.1) // Vertex R0t = 84
-    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1t = 85
-    (0.707106781821139 -0.707106780551956 0.1) // Vertex R1st = 86
-    (1.79489673696541e-09 -1 0.1) // Vertex R2t = 87
-    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3t = 88
-    (-0.707106779282772 -0.707106783090323 0.1) // Vertex R3st = 89
-    (-1 3.58979347393082e-09 0.1) // Vertex R4t = 90
-    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5t = 91
-    (-0.707106779282772 0.707106783090323 0.1) // Vertex R5st = 92
-    (1.79489673696541e-09 1 0.1) // Vertex R6t = 93
-    (0.707106781821139 0.707106780551956 0.1) // Vertex R7t = 94
-    (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95
-);
-
-blocks
-(
-    // block0
-    hex (0 2 13 12 48 50 61 60)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex (2 4 14 13 50 52 62 61)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex (3 5 15 14 51 53 63 62)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex (5 7 16 15 53 55 64 63)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex (6 8 17 16 54 56 65 64)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex (8 10 18 17 56 58 66 65)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex (9 11 19 18 57 59 67 66)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex (11 1 12 19 59 49 60 67)
-    rotor
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex (12 13 21 20 60 61 69 68)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex (13 14 22 21 61 62 70 69)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex (14 15 23 22 62 63 71 70)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex (15 16 24 23 63 64 72 71)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex (16 17 25 24 64 65 73 72)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex (17 18 26 25 65 66 74 73)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex (18 19 27 26 66 67 75 74)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex (19 12 20 27 67 60 68 75)
-    rotor
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex (20 21 29 28 68 69 77 76)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex (21 22 30 29 69 70 78 77)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex (22 23 31 30 70 71 79 78)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex (23 24 32 31 71 72 80 79)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex (24 25 33 32 72 73 81 80)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex (25 26 34 33 73 74 82 81)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex (26 27 35 34 74 75 83 82)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex (27 20 28 35 75 68 76 83)
-    (12 4 1)
-    simpleGrading (1 1 1)
-
-    // block0
-    hex (28 29 38 36 76 77 86 84)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block1
-    hex (29 30 39 37 77 78 87 85)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block2
-    hex (30 31 41 39 78 79 89 87)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block3
-    hex (31 32 42 40 79 80 90 88)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block4
-    hex (32 33 44 42 80 81 92 90)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block5
-    hex (33 34 45 43 81 82 93 91)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block6
-    hex (34 35 47 45 82 83 95 93)
-    (12 12 1)
-    simpleGrading (1 1 1)
-
-    // block7
-    hex (35 28 36 46 83 76 84 94)
-    (12 12 1)
-    simpleGrading (1 1 1)
-);
-
-edges
-(
-    arc 0 2 (0.184775906536601 -0.0765366863901046 0)
-    arc 2 4 (0.0765366867217582 -0.184775906399226 0)
-    arc 3 5 (-0.0765366860584508 -0.184775906673977 0)
-    arc 5 7 (-0.18477590626185 -0.0765366870534118 0)
-    arc 6 8 (-0.18477590626185 0.0765366870534118 0)
-    arc 8 10 (-0.0765366860584508 0.184775906673977 0)
-    arc 9 11 (0.0765366867217582 0.184775906399226 0)
-    arc 11 1 (0.184775906536601 0.0765366863901046 0)
-
-    arc 12 13 (0.461939766341503 -0.191341715975262 0)
-    arc 13 14 (0.191341716804395 -0.461939765998065 0)
-    arc 14 15 (-0.191341715146127 -0.461939766684942 0)
-    arc 15 16 (-0.461939765654626 -0.19134171763353 0)
-    arc 16 17 (-0.461939765654626 0.19134171763353 0)
-    arc 17 18 (-0.191341715146127 0.461939766684942 0)
-    arc 18 19 (0.191341716804395 0.461939765998065 0)
-    arc 19 12 (0.461939766341503 0.191341715975262 0)
-
-    arc 20 21 (0.554327719609804 -0.229610059170314 0)
-    arc 21 22 (0.229610060165275 -0.554327719197677 0)
-    arc 22 23 (-0.229610058175352 -0.55432772002193 0)
-    arc 23 24 (-0.554327718785551 -0.229610061160235 0)
-    arc 24 25 (-0.554327718785551 0.229610061160235 0)
-    arc 25 26 (-0.229610058175352 0.55432772002193 0)
-    arc 26 27 (0.229610060165275 0.554327719197677 0)
-    arc 27 20 (0.554327719609804 0.229610059170314 0)
-
-    arc 28 29 (0.646715672878104 -0.267878402365366 0)
-    arc 29 30 (0.267878403526154 -0.64671567239729 0)
-    arc 30 31 (-0.267878401204578 -0.646715673358918 0)
-    arc 31 32 (-0.646715671916476 -0.267878404686941 0)
-    arc 32 33 (-0.646715671916476 0.267878404686941 0)
-    arc 33 34 (-0.267878401204578 0.646715673358918 0)
-    arc 34 35 (0.267878403526154 0.64671567239729 0)
-    arc 35 28 (0.646715672878104 0.267878402365366 0)
-
-    arc 36 38 (0.923879532683006 -0.382683431950523 0)
-    arc 37 39 (0.382683433608791 -0.923879531996129 0)
-    arc 39 41 (-0.382683430292254 -0.923879533369883 0)
-    arc 40 42 (-0.923879531309252 -0.382683435267059 0)
-    arc 42 44 (-0.923879531309252 0.382683435267059 0)
-    arc 43 45 (-0.382683430292254 0.923879533369883 0)
-    arc 45 47 (0.382683433608791 0.923879531996129 0)
-    arc 46 36 (0.923879532683006 0.382683431950523 0)
-
-    arc 48 50 (0.184775906536601 -0.0765366863901046 0.1)
-    arc 50 52 (0.0765366867217582 -0.184775906399226 0.1)
-    arc 51 53 (-0.0765366860584508 -0.184775906673977 0.1)
-    arc 53 55 (-0.18477590626185 -0.0765366870534118 0.1)
-    arc 54 56 (-0.18477590626185 0.0765366870534118 0.1)
-    arc 56 58 (-0.0765366860584508 0.184775906673977 0.1)
-    arc 57 59 (0.0765366867217582 0.184775906399226 0.1)
-    arc 59 49 (0.184775906536601 0.0765366863901046 0.1)
-
-    arc 60 61 (0.461939766341503 -0.191341715975262 0.1)
-    arc 61 62 (0.191341716804395 -0.461939765998065 0.1)
-    arc 62 63 (-0.191341715146127 -0.461939766684942 0.1)
-    arc 63 64 (-0.461939765654626 -0.19134171763353 0.1)
-    arc 64 65 (-0.461939765654626 0.19134171763353 0.1)
-    arc 65 66 (-0.191341715146127 0.461939766684942 0.1)
-    arc 66 67 (0.191341716804395 0.461939765998065 0.1)
-    arc 67 60 (0.461939766341503 0.191341715975262 0.1)
-
-    arc 68 69 (0.554327719609804 -0.229610059170314 0.1)
-    arc 69 70 (0.229610060165275 -0.554327719197677 0.1)
-    arc 70 71 (-0.229610058175352 -0.55432772002193 0.1)
-    arc 71 72 (-0.554327718785551 -0.229610061160235 0.1)
-    arc 72 73 (-0.554327718785551 0.229610061160235 0.1)
-    arc 73 74 (-0.229610058175352 0.55432772002193 0.1)
-    arc 74 75 (0.229610060165275 0.554327719197677 0.1)
-    arc 75 68 (0.554327719609804 0.229610059170314 0.1)
-
-    arc 76 77 (0.646715672878104 -0.267878402365366 0.1)
-    arc 77 78 (0.267878403526154 -0.64671567239729 0.1)
-    arc 78 79 (-0.267878401204578 -0.646715673358918 0.1)
-    arc 79 80 (-0.646715671916476 -0.267878404686941 0.1)
-    arc 80 81 (-0.646715671916476 0.267878404686941 0.1)
-    arc 81 82 (-0.267878401204578 0.646715673358918 0.1)
-    arc 82 83 (0.267878403526154 0.64671567239729 0.1)
-    arc 83 76 (0.646715672878104 0.267878402365366 0.1)
-
-    arc 84 86 (0.923879532683006 -0.382683431950523 0.1)
-    arc 85 87 (0.382683433608791 -0.923879531996129 0.1)
-    arc 87 89 (-0.382683430292254 -0.923879533369883 0.1)
-    arc 88 90 (-0.923879531309252 -0.382683435267059 0.1)
-    arc 90 92 (-0.923879531309252 0.382683435267059 0.1)
-    arc 91 93 (-0.382683430292254 0.923879533369883 0.1)
-    arc 93 95 (0.382683433608791 0.923879531996129 0.1)
-    arc 94 84 (0.923879532683006 0.382683431950523 0.1)
-);
-
-patches
-(
-    wall rotor
-    (
-        (0 2 50 48)
-        (2 4 52 50)
-        (3 5 53 51)
-        (5 7 55 53)
-        (6 8 56 54)
-        (8 10 58 56)
-        (9 11 59 57)
-        (11 1 49 59)
-
-        (0 12 60 48)
-        (1 12 60 49)
-
-        (3 14 62 51)
-        (4 14 62 52)
-
-        (6 16 64 54)
-        (7 16 64 55)
-
-        (9 18 66 57)
-        (10 18 66 58)
-    )
-
-    wall stator
-    (
-        (36 38 86 84)
-        (37 39 87 85)
-        (39 41 89 87)
-        (40 42 90 88)
-        (42 44 92 90)
-        (43 45 93 91)
-        (45 47 95 93)
-        (46 36 84 94)
-
-        (37 29 77 85)
-        (38 29 77 86)
-
-        (40 31 79 88)
-        (41 31 79 89)
-
-        (43 33 81 91)
-        (44 33 81 92)
-
-        (46 35 83 94)
-        (47 35 83 95)
-    )
-
-    empty front
-    (
-        (48 50 61 60)
-        (50 52 62 61)
-        (51 53 63 62)
-        (53 55 64 63)
-        (54 56 65 64)
-        (56 58 66 65)
-        (57 59 67 66)
-        (59 49 60 67)
-        (60 61 69 68)
-        (61 62 70 69)
-        (62 63 71 70)
-        (63 64 72 71)
-        (64 65 73 72)
-        (65 66 74 73)
-        (66 67 75 74)
-        (67 60 68 75)
-        (68 69 77 76)
-        (69 70 78 77)
-        (70 71 79 78)
-        (71 72 80 79)
-        (72 73 81 80)
-        (73 74 82 81)
-        (74 75 83 82)
-        (75 68 76 83)
-        (76 77 86 84)
-        (77 78 87 85)
-        (78 79 89 87)
-        (79 80 90 88)
-        (80 81 92 90)
-        (81 82 93 91)
-        (82 83 95 93)
-        (83 76 84 94)
-    )
-
-    empty back
-    (
-        (0 12 13 2)
-        (2 13 14 4)
-        (3 14 15 5)
-        (5 15 16 7)
-        (6 16 17 8)
-        (8 17 18 10)
-        (9 18 19 11)
-        (11 19 12 1)
-        (12 20 21 13)
-        (13 21 22 14)
-        (14 22 23 15)
-        (15 23 24 16)
-        (16 24 25 17)
-        (17 25 26 18)
-        (18 26 27 19)
-        (19 27 20 12)
-        (20 28 29 21)
-        (21 29 30 22)
-        (22 30 31 23)
-        (23 31 32 24)
-        (24 32 33 25)
-        (25 33 34 26)
-        (26 34 35 27)
-        (27 35 28 20)
-        (28 36 38 29)
-        (29 37 39 30)
-        (30 39 41 31)
-        (31 40 42 32)
-        (32 42 44 33)
-        (33 43 45 34)
-        (34 45 47 35)
-        (35 46 36 28)
-    )
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index 7b2296286e..c0243822f7 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index b085840d99..c8bab71e26 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index a95a952401..da7b64ff4d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam
index c0cd064e49..832bf39e21 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water
index 16c68c31f2..65b9ad5c7e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
index 15d945857a..08deb569d0 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
index 256fe1cb1a..0453f60d31 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam
index 0b69e50eed..0a4cd4ac1a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water
index f7aab53be2..fcea8de967 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water
index 634a29a38b..9837c5ebda 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p
index 799576be27..c90384c99a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh
index 071e58a395..e74e073d62 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
index edd088bc17..183d9d5818 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water
index 78063efe66..e80b5ab95a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
index 6a3a4da0be..85a7bb4f67 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
index fc976bc67c..5f0bf2d728 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
index 4053b173ee..3774ba27c8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
index 3e40c9dce6..68aec9cf1d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
index bdcd006d4e..4afe6ef54d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
index 2accd9147b..f4b5167927 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
index c39421ffae..8adfcf34f8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
index 2eb1993dc7..647af265ba 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -61,11 +61,6 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 wallDist
 {
     method          meshWave;
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
index 2486938d7b..d32df01eeb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/U b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/U
index a3a762a342..a7bfdc893c 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/U
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/U
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
index 0b43750be0..429e0cd582 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/alpha.sludge
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
index b61e0277ec..838078e6d8 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
index 037e3b47f3..622f53c352 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
index 38345834ae..18277bfcd8 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
index aefe0c27d7..68ff5154b0 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
index 2927ad0265..129623509b 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
index d8e11662d8..89cc3022e5 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
index 329583146a..d78b7ac02c 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
index 6ad387f715..61fb17d658 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
index 12f879946c..2fad5e9636 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.air
index f704d27aa3..9ac7e4a775 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.water
index 3c62df75d0..768ad6beb0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
index 60979da94f..ff4b3efea5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
index 3ae0a65592..15c5b20244 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air
index ed94c59d53..c0667b6fa1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water
index 1cd27e448b..f3455fa5fc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/epsilon.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.air
index b4dd763108..355a8835da 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.water
index 3381282f9c..f522004ca0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/k.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
index 475091edaa..94056cb3d3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
index 475091edaa..94056cb3d3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/nut.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
index 9b695bbaa0..0510a139a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 34551827f4..69a85f6f0f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
index 9311885865..e667b89b6f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
index 9ca26ce033..54ec978c46 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
index 0a0bfc89cf..9480d5bad7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
index 7f00c9e2bc..ac9c2cf5c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
index de1aecacf9..d80fe019b2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.air
index f704d27aa3..9ac7e4a775 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.water
index 3c62df75d0..768ad6beb0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
index 60979da94f..ff4b3efea5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
index 3ae0a65592..15c5b20244 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air
index ee103be57f..3b8dde8bae 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water
index cf8ea7bda7..bff009fc56 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilon.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm
index a3139ddbc1..da351317c0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/epsilonm
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.air
index 3b5244d4a3..2876cd2be7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.water
index 7cec6e66d0..aa435074db 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/k.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/km b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/km
index f6f89f4167..83272168ac 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/km
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/km
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air
index e3ce09a2cb..c5bbbb881b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water
index 376ed3f794..654723b666 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/nut.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
index 9b695bbaa0..0510a139a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 34551827f4..69a85f6f0f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
index fe69aba1ea..d39b66bb7d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
index b82e81c0cb..33df5f6f51 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 0a0bfc89cf..9480d5bad7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
index f037499679..70bce0e1d9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
index f6f72076f0..3d4837a956 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.air
index de0ac66f78..c81346a16e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
index 5762b51bd8..549ac0225f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/T.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
index f417c38e3a..7d7c3fa9c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
index a9af55993e..cfd52f9dab 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles
index fa0397ae35..4d47947495 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/U.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air
index 288160cdf0..bda738e3fc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org
index 6292e5ffc0..6b1738c6e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles
index cf55161b4a..35c2298115 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
index b28a5a97d9..24b7f560f7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alpha.particles.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
index 60979da94f..ff4b3efea5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
index b047d8d119..515adc6051 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air
index 0b5f62a356..b46c7bc85e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/k.air
index 307a3495c9..6d5b08a389 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air
index dcb65148ae..bc4243363e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles
index 6264a273f7..95275d1e5a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/nut.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p
index b318305599..ecd66ab696 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh
index a4c9bfe592..2fd4916b1a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index 18e714aec4..766d9630c0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/boundary
deleted file mode 100644
index cda7f49514..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11770;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11800;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          400;
-        startFace       11830;
-    }
-    frontAndBackPlanes
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12000;
-        startFace       12230;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..21f45062dc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
index d702f90d3b..effc65fa12 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 6a26e64e58..d88723a0bc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
index 900f5a585b..95e1975252 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
index db2ff7d973..3ab7340db6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
index c08eb7fb7e..aeb9e99b49 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
index 0f5531cfc0..58c5caadd8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
index 6b0a740e5c..161a83fac6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
index 9c0fd4206c..c687cb56b5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
index e592c501d5..c657a1cac0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index 9b695bbaa0..0510a139a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index c96162d7cf..058023a2ab 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
index 0a0bfc89cf..9480d5bad7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index 996495e814..832475f155 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
index 350b0c0c1f..cb85de6bd8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
index f704d27aa3..9ac7e4a775 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
index 3c62df75d0..768ad6beb0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
index 4cfbc0bbea..ebc67e3e9c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air
index e81fffac06..2ff02376fb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water
index aab00fd78b..242e3581c5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org
index 4472b0c635..311ff251cb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air
index cd5560fb91..b8d3eac959 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/kappai.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
index 0af317df79..c7c9f2ec23 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
index 9b695bbaa0..0510a139a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index e74028c4b0..e84e2d7d1c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/boundary
deleted file mode 100644
index 4564ccc46a..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
index d03967afdc..6c80517436 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
index 0a0bfc89cf..9480d5bad7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
index ba3b6d5461..ed92cc5559 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
index 28572b1e0a..e3e00aee3f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.air
index de0ac66f78..c81346a16e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles
index 5762b51bd8..549ac0225f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/T.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
index f417c38e3a..7d7c3fa9c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
index a9af55993e..cfd52f9dab 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles
index fa0397ae35..4d47947495 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/U.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles
index cf55161b4a..35c2298115 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org
index b28a5a97d9..24b7f560f7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alpha.particles.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
index b047d8d119..515adc6051 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air
index 0b5f62a356..b46c7bc85e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/epsilon.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/k.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/k.air
index 307a3495c9..6d5b08a389 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/k.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air
index dcb65148ae..bc4243363e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles
index 6264a273f7..95275d1e5a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/nut.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p
index b318305599..ecd66ab696 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh
index a4c9bfe592..2fd4916b1a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index e0ec9c1cd4..dc60a7a7de 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/boundary
deleted file mode 100644
index cda7f49514..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/polyMesh/boundary
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11770;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       11800;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          400;
-        startFace       11830;
-    }
-    frontAndBackPlanes
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          12000;
-        startFace       12230;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..21f45062dc 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
index 08671cc51e..0adb9d8a77 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
index 900f5a585b..95e1975252 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
index 519fbe0b29..c528d9125d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 4a0b2ace30..852ff24bc5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
index 0081c93776..17b0b1e8eb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
index 6b0a740e5c..161a83fac6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.air
index 94edcc5942..2e96c6ec6d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.water
index 36476e1e29..22b2370b23 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.air
index 2a2f95b740..11eeff6ada 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.water
index 407b341dbe..17034155ee 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air
index 1b1a35684a..db6dcf67c3 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air.org b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air.org
index 6832d99db2..1d3911c757 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air.org
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/alpha.air.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p
index 84126539db..9d41413f0c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh
index 3659b453ff..9aa3e1af97 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
index 5bc7e7ef87..b270e4c706 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
index 0cc222ca34..fdb459fd07 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
index ab168c846a..f80d78431d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/polyMesh/boundary
deleted file mode 100644
index 47889c5cc1..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/polyMesh/boundary
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    walls
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          175;
-        startFace       3675;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
index 7d811b77b3..7abc42d0ab 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
index ad11d8ff4b..a5965e70dd 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
index ce72eac3c2..da2a1c9189 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
index 350b0c0c1f..cb85de6bd8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
index 93d742ba74..ef44955f62 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
index 610cfff17e..d9d3331012 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
index c2ea64d776..1ea789cf49 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/T.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta
index b18d202df8..19fecae11d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/Theta
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
index 7a88b38478..e36f036426 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
index b93b8d870d..b6559f069a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
index b995d77c16..d1904cd5e9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p
index f8b3deba00..ded959d921 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
index 3267f0a6f3..a70d061e91 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
index c604aa7e2c..d25c9f545a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
index 508d658494..db2fa4c55e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 808de74ee0..b244ed296f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
deleted file mode 100644
index 5c2a6cf99c..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    rotor
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       5952;
-    }
-    stator
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          192;
-        startFace       6144;
-    }
-    front
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       6336;
-    }
-    back
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          3072;
-        startFace       9408;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index befc0aeae4..9cffa3e1e1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c44c005d3b..7ae58e3c53 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
index 1296429b72..a68005728f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
index 7f0d75a82f..b97305f73e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
index a93868498b..ce70bd9cfa 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
index dd1a00f171..5e560a03da 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index b085840d99..c8bab71e26 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
index a95a952401..da7b64ff4d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
index bf749449bf..8ffd2980bf 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allclean b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
new file mode 100755
index 0000000000..2c5a008802
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0 > /dev/null 2>&1
+
+cleanCase
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/Allrun b/tutorials/preProcessing/createZeroDirectory/cavity/Allrun
new file mode 100755
index 0000000000..cdef18649d
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/Allrun
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+
+runApplication createZeroDirectory
+
+runApplication $(getApplication)
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties b/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties
new file mode 100644
index 0000000000..0b71114447
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 0.01;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict b/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict
new file mode 100644
index 0000000000..dc0e26dfdd
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/blockMeshDict
@@ -0,0 +1,75 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+vertices
+(
+    (0 0 0)
+    (1 0 0)
+    (1 1 0)
+    (0 1 0)
+    (0 0 0.1)
+    (1 0 0.1)
+    (1 1 0.1)
+    (0 1 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+        );
+    }
+    frontAndBack
+    {
+        type empty;
+        faces
+        (
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties b/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties
new file mode 100644
index 0000000000..a216dc34a8
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/caseProperties
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    U           uniform (0 0 0);
+    p           uniform 0;
+}
+
+boundaryConditions
+{
+    topWall
+    {
+        category        wall;
+        patches         (movingWall);
+        type            noSlip;
+        options
+        {
+            wallFunction    highReynolds;
+            motion          moving;
+        };
+        values
+        {
+            U           uniform (1 0 0);
+        }
+    }
+
+    walls
+    {
+        category        wall;
+        patches         (fixedWalls);
+        type            noSlip;
+        options
+        {
+            wallFunction    highReynolds;
+            motion          stationary;
+        };
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict b/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict
new file mode 100644
index 0000000000..f095103f7c
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/controlDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+//endTime         0.5;
+endTime         0.005;
+
+deltaT          0.005;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes
new file mode 100644
index 0000000000..03029d2451
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSchemes
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(nu,U) Gauss linear orthogonal;
+    laplacian((1|A(U)),p) Gauss linear orthogonal;
+}
+
+interpolationSchemes
+{
+    default         linear;
+    interpolate(HbyA) linear;
+}
+
+snGradSchemes
+{
+    default         orthogonal;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution
new file mode 100644
index 0000000000..bea5167a6f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/cavity/system/fvSolution
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
new file mode 100755
index 0000000000..17464e7020
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allclean
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+# remove surface and features
+\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
+
+rm -rf 0 > /dev/null 2>&1
+
+cleanCase
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
new file mode 100755
index 0000000000..26b898a3e2
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/Allrun
@@ -0,0 +1,25 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# copy motorbike surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+runApplication surfaceFeatureExtract
+
+runApplication blockMesh
+
+runApplication decomposePar
+runParallel snappyHexMesh 6 -overwrite
+
+runParallel createZeroDirectory 6
+
+runParallel patchSummary 6
+runParallel potentialFoam 6 -noFunctionObjects
+runParallel $(getApplication) 6
+
+runApplication reconstructParMesh -constant
+runApplication reconstructPar -latestTime
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties
new file mode 100644
index 0000000000..ce7acf265a
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/constant/triSurface/README b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/triSurface/README
new file mode 100644
index 0000000000..dbf3b73d5f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/triSurface/README
@@ -0,0 +1,4 @@
+Folder to house tri-surfaces
+
+The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
+folder
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties
similarity index 89%
rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties
rename to tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties
index 691c02bb16..35734dd5ea 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/constant/turbulenceProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      RASProperties;
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -25,5 +25,4 @@ RAS
     printCoeffs         on;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict
new file mode 100644
index 0000000000..0a9f48ca1a
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/blockMeshDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-5 -4 0)
+    (15 -4 0)
+    (15  4 0)
+    (-5  4 0)
+    (-5 -4 8)
+    (15 -4 8)
+    (15  4 8)
+    (-5  4 8)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (20 8 8) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    frontAndBack
+    {
+        type patch;
+        faces
+        (
+            (3 7 6 2)
+            (1 5 4 0)
+        );
+    }
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    upperWall
+    {
+        type patch;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties b/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties
new file mode 100644
index 0000000000..93ba59e2dc
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/caseProperties
@@ -0,0 +1,115 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    U           uniform (20 0 0);
+    p           uniform 0;
+    k           uniform 0.24;
+    omega       uniform 1.78;
+    nut         uniform 0;
+}
+
+boundaryConditions
+{
+    motorbike
+    {
+        category        wall;
+        type            noSlip;
+        patches         (motorBikeGroup);
+        options
+        {
+            wallFunction    highReynolds;
+            motion          stationary;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+
+    inlet
+    {
+        category        inlet;
+        type            subSonic;
+        patches         (inlet);
+        options
+        {
+            flowSpecification fixedVelocity;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+
+    lowerWall
+    {
+        category        wall;
+        type            noSlip;
+        patches         (lowerWall);
+        options
+        {
+            wallFunction    highReynolds;
+            motion          stationary;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+
+    outlet
+    {
+        category        outlet;
+        type            subSonic;
+        patches         (outlet);
+        options
+        {
+            returnFlow      default;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+
+    upperWall
+    {
+        category        wall;
+        type            slip;
+        patches         (upperWall);
+        values
+        {
+            $:initialConditions;
+        }
+    }
+
+    frontAndBack
+    {
+        category        wall;
+        type            slip;
+        patches         (frontAndBack);
+        values
+        {
+            $:initialConditions;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict
new file mode 100644
index 0000000000..ed14808279
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/controlDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For patchSummary to find the boundary conditions
+libs            ("libincompressibleTurbulenceModels.so");
+
+application     simpleFoam;
+
+startFrom       startTime; // latestTime;
+
+startTime       0;
+
+stopAt          writeNow;   //endTime;
+
+endTime         500;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   100;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict
new file mode 100644
index 0000000000..ed8cab434c
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/decomposeParDict
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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 6;
+
+method          hierarchical;
+// method          ptscotch;
+
+simpleCoeffs
+{
+    n               (4 1 1);
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               (3 2 1);
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "cellDecomposition";
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes
new file mode 100644
index 0000000000..4bcee4e331
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSchemes
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         steadyState;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(U)         cellLimited Gauss linear 1;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      bounded Gauss linearUpwindV grad(U);
+    div(phi,k)      bounded Gauss upwind;
+    div(phi,omega)  bounded Gauss upwind;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+wallDist
+{
+    method meshWave;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution
new file mode 100644
index 0000000000..d7adb04eb8
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/fvSolution
@@ -0,0 +1,92 @@
+/*--------------------------------*- 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      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.01;
+        smoother         GaussSeidel;
+        nPreSweeps       0;
+        nPostSweeps      2;
+        cacheAgglomeration on;
+        agglomerator     faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels      1;
+    }
+
+    Phi
+    {
+        $p;
+    }
+
+    U
+    {
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
+
+    k
+    {
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
+
+    omega
+    {
+        solver           smoothSolver;
+        smoother         GaussSeidel;
+        tolerance        1e-8;
+        relTol           0.1;
+        nSweeps          1;
+    }
+}
+
+SIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+    consistent yes;
+}
+
+potentialFlow
+{
+    nNonOrthogonalCorrectors 10;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        U               0.9;
+        k               0.7;
+        omega           0.7;
+    }
+}
+
+cache
+{
+    grad(U);
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict
new file mode 100644
index 0000000000..47b71187e1
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/meshQualityDict
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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      meshQualityDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include defaults parameters from master dictionary
+#includeEtc "caseDicts/meshQualityDict"
+
+//- minFaceWeight (0 -> 0.5)
+minFaceWeight 0.02;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict
new file mode 100644
index 0000000000..edf84a011b
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict
@@ -0,0 +1,317 @@
+/*--------------------------------*- 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      snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh true;
+snap            true;
+addLayers       true;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+// Surfaces are used
+// - to specify refinement for any mesh cell intersecting it
+// - to specify refinement for any mesh cell inside/outside/near
+// - to 'snap' the mesh boundary to the surface
+geometry
+{
+    motorBike.obj
+    {
+        type triSurfaceMesh;
+        name motorBike;
+    }
+
+    refinementBox
+    {
+        type searchableBox;
+        min (-1.0 -0.7 0.0);
+        max ( 8.0  0.7 2.5);
+    }
+};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations refining just a
+    // few cells. This setting will cause refinement to stop if <= minimumRefine
+    // are selected for refinement. Note: it will at least do one iteration
+    // (unless the number of cells to refine is 0)
+    minRefinementCells 10;
+
+    // Allow a certain level of imbalance during refining
+    // (since balancing is quite expensive)
+    // Expressed as fraction of perfect balance (= overall number of cells /
+    // nProcs). 0=balance always.
+    maxLoadUnbalance 0.10;
+
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 3;
+
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by its edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    features
+    (
+        {
+            file "motorBike.eMesh";
+            level 6;
+        }
+    );
+
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {
+        motorBike
+        {
+            // Surface-wise min and max refinement level
+            level (5 6);
+
+            // Optional specification of patch type (default is wall). No
+            // constraint types (cyclic, symmetry) etc. are allowed.
+            patchInfo
+            {
+                type wall;
+                inGroups (motorBikeGroup);
+            }
+        }
+    }
+
+    // Resolve sharp angles
+    resolveFeatureAngle 30;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   descending order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {
+        refinementBox
+        {
+            mode inside;
+            levels ((1E15 4));
+        }
+    }
+
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the locationInMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    locationInMesh (3.0001 3.0001 0.43);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces true;
+}
+
+
+
+// Settings for the snapping.
+snapControls
+{
+    //- Number of patch smoothing iterations before finding correspondence
+    //  to surface
+    nSmoothPatch 3;
+
+    //- Relative distance for points to be attracted by surface feature point
+    //  or edge. True distance is this factor times local
+    //  maximum edge length.
+    tolerance 2.0;
+
+    //- Number of mesh displacement relaxation iterations.
+    nSolveIter 30;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    // Feature snapping
+
+        //- Number of feature edge snapping iterations.
+        //  Leave out altogether to disable.
+        nFeatureSnapIter 10;
+
+        //- Detect (geometric only) features by sampling the surface
+        //  (default=false).
+        implicitFeatureSnap false;
+
+        //- Use castellatedMeshControls::features (default = true)
+        explicitFeatureSnap true;
+
+        //- Detect points on multiple surfaces (only for explicitFeatureSnap)
+        multiRegionFeatureSnap false;
+}
+
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
+    relativeSizes true;
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+        "(lowerWall|motorBike).*"
+        {
+            nSurfaceLayers 1;
+        }
+    }
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.0;
+
+    // Wanted thickness of final added cell layer. If multiple layers
+    // is the thickness of the layer furthest away from the wall.
+    // Relative to undistorted size of cell outside layer.
+    // See relativeSizes parameter.
+    finalLayerThickness 0.3;
+
+    // Minimum thickness of cell layer. If for any reason layer
+    // cannot be above minThickness do not add layer.
+    // Relative to undistorted size of cell outside layer.
+    minThickness 0.1;
+
+    // If points get not extruded do nGrow layers of connected faces that are
+    // also not grown. This helps convergence of the layer addition process
+    // close to features.
+    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
+    nGrow 0;
+
+    // Advanced settings
+
+    // When not to extrude surface. 0 is flat surface, 90 is when two faces
+    // are perpendicular
+    featureAngle 60;
+
+    // At non-patched sides allow mesh to slip if extrusion direction makes
+    // angle larger than slipFeatureAngle.
+    slipFeatureAngle 30;
+
+    // Maximum number of snapping relaxation iterations. Should stop
+    // before upon reaching a correct mesh.
+    nRelaxIter 3;
+
+    // Number of smoothing iterations of surface normals
+    nSmoothSurfaceNormals 1;
+
+    // Number of smoothing iterations of interior mesh movement direction
+    nSmoothNormals 3;
+
+    // Smooth layer thickness over surface patches
+    nSmoothThickness 10;
+
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 0.5;
+
+    // Reduce layer growth where ratio thickness to medial
+    // distance is large
+    maxThicknessToMedialRatio 0.3;
+
+    // Angle used to pick up medial axis points
+    // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x.
+    minMedianAxisAngle 90;
+
+
+    // Create buffer region for new layer terminations
+    nBufferCellsNoExtrude 0;
+
+
+    // Overall max number of layer addition iterations. The mesher will exit
+    // if it reaches this number of iterations; possibly with an illegal
+    // mesh.
+    nLayerIter 50;
+}
+
+
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+meshQualityControls
+{
+    #include "meshQualityDict"
+
+
+    // Advanced
+
+    //- Number of error distribution iterations
+    nSmoothScale 4;
+    //- Amount to scale back displacement at error points
+    errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1e-6;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..8098430cd1
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+motorBike.obj
+{
+    // How to obtain raw features (extractFromFile || extractFromSurface)
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    subsetFeatures
+    {
+        // Keep nonManifold edges (edges with >2 connected faces)
+        nonManifoldEdges       no;
+
+        // Keep open edges (edges with 1 connected face)
+        openEdges       yes;
+    }
+
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
new file mode 100755
index 0000000000..44f1fb098f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allclean
@@ -0,0 +1,21 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
+rm -f constant/polyMesh/boundary
+
+cleanCase
+rm -rf VTK
+rm -rf constant/cellToRegion constant/polyMesh/sets
+rm -rf 0
+rm -rf constant/bottomAir/polyMesh
+rm -rf constant/topAir/polyMesh
+rm -rf constant/heater/polyMesh
+rm -rf constant/leftSolid/polyMesh
+rm -rf constant/rightSolid/polyMesh
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
new file mode 100755
index 0000000000..2682bf4df7
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/Allrun
@@ -0,0 +1,39 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+rm -rf constant/polyMesh/sets
+
+runApplication blockMesh
+
+runApplication surfaceFeatureExtract
+
+runApplication snappyHexMesh -overwrite
+runApplication splitMeshRegions -cellZones -overwrite
+
+for i in bottomAir topAir heater leftSolid rightSolid
+do
+    runApplication changeDictionary -region $i
+    mv log.changeDictionary log.changeDictionary.$i 2>&1
+done
+
+runApplication decomposePar -allRegions
+
+runParallel createZeroDirectory 4
+
+#-- Run in parallel
+runParallel $(getApplication) 4
+
+# Reconstruct
+runApplication reconstructPar -allRegions
+
+
+echo
+echo "creating files for paraview post-processing"
+echo
+paraFoam -touchAll
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g
new file mode 100644
index 0000000000..389a4c9faa
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
new file mode 100644
index 0000000000..d6b0e89e15
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/radiationProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  none;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
new file mode 100644
index 0000000000..b68737c6ca
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant/bottomAir";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
new file mode 100644
index 0000000000..c4416fdce2
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties
new file mode 100644
index 0000000000..60a537f629
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/radiationProperties
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiationModel  opaqueSolid;
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    none;
+
+transmissivityModel none;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
new file mode 100644
index 0000000000..d455c7696a
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   12;
+    }
+
+    transport
+    {
+        kappa   80;
+    }
+
+    thermodynamics
+    {
+        Hf      0;
+        Cp      450;
+    }
+
+    equationOfState
+    {
+        rho     8000;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
new file mode 100644
index 0000000000..60a537f629
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/radiationProperties
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiationModel  opaqueSolid;
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    none;
+
+transmissivityModel none;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
new file mode 120000
index 0000000000..dc4d3a18ee
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1 @@
+../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties
new file mode 100644
index 0000000000..e63897261f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/regionProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      regionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+regions
+(
+    fluid       (bottomAir topAir)
+    solid       (heater leftSolid rightSolid)
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
new file mode 100644
index 0000000000..60a537f629
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/radiationProperties
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiationModel  opaqueSolid;
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    none;
+
+transmissivityModel none;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
new file mode 120000
index 0000000000..dc4d3a18ee
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1 @@
+../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g
new file mode 100644
index 0000000000..389a4c9faa
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties
new file mode 100644
index 0000000000..d6b0e89e15
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/radiationProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  none;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
new file mode 100644
index 0000000000..00ce1d437f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant/topAir";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.9;
+    }
+    thermodynamics
+    {
+        Cp              1000;
+        Hf              0;
+    }
+    transport
+    {
+        mu              1.8e-05;
+        Pr              0.7;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
new file mode 100644
index 0000000000..c4416fdce2
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl
new file mode 100644
index 0000000000..200e4e80fc
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl
@@ -0,0 +1,14632 @@
+solid minX
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 -0.05
+       vertex -0.1 -0.04 -0.04
+       vertex -0.1 -0.032 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 -0.04
+       vertex -0.1 -0.032 -0.05
+       vertex -0.1 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 -0.05
+       vertex -0.1 -0.032 -0.04
+       vertex -0.1 -0.024 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 -0.04
+       vertex -0.1 -0.024 -0.05
+       vertex -0.1 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 -0.05
+       vertex -0.1 -0.024 -0.04
+       vertex -0.1 -0.016 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 -0.04
+       vertex -0.1 -0.016 -0.05
+       vertex -0.1 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 -0.05
+       vertex -0.1 -0.016 -0.04
+       vertex -0.1 -0.008 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 -0.04
+       vertex -0.1 -0.008 -0.05
+       vertex -0.1 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 -0.05
+       vertex -0.1 -0.008 -0.04
+       vertex -0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 -0.04
+       vertex -0.1 0 -0.05
+       vertex -0.1 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 -0.04
+       vertex -0.1 -0.04 -0.03
+       vertex -0.1 -0.032 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 -0.03
+       vertex -0.1 -0.032 -0.04
+       vertex -0.1 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 -0.04
+       vertex -0.1 -0.032 -0.03
+       vertex -0.1 -0.024 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 -0.03
+       vertex -0.1 -0.024 -0.04
+       vertex -0.1 -0.032 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 -0.04
+       vertex -0.1 -0.024 -0.03
+       vertex -0.1 -0.016 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 -0.03
+       vertex -0.1 -0.016 -0.04
+       vertex -0.1 -0.024 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 -0.04
+       vertex -0.1 -0.016 -0.03
+       vertex -0.1 -0.008 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 -0.03
+       vertex -0.1 -0.008 -0.04
+       vertex -0.1 -0.016 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 -0.04
+       vertex -0.1 -0.008 -0.03
+       vertex -0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 -0.03
+       vertex -0.1 0 -0.04
+       vertex -0.1 -0.008 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 -0.03
+       vertex -0.1 -0.04 -0.02
+       vertex -0.1 -0.032 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 -0.02
+       vertex -0.1 -0.032 -0.03
+       vertex -0.1 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 -0.03
+       vertex -0.1 -0.032 -0.02
+       vertex -0.1 -0.024 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 -0.02
+       vertex -0.1 -0.024 -0.03
+       vertex -0.1 -0.032 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 -0.03
+       vertex -0.1 -0.024 -0.02
+       vertex -0.1 -0.016 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 -0.02
+       vertex -0.1 -0.016 -0.03
+       vertex -0.1 -0.024 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 -0.03
+       vertex -0.1 -0.016 -0.02
+       vertex -0.1 -0.008 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 -0.02
+       vertex -0.1 -0.008 -0.03
+       vertex -0.1 -0.016 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 -0.03
+       vertex -0.1 -0.008 -0.02
+       vertex -0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 -0.02
+       vertex -0.1 0 -0.03
+       vertex -0.1 -0.008 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 -0.02
+       vertex -0.1 -0.04 -0.01
+       vertex -0.1 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 -0.01
+       vertex -0.1 -0.032 -0.02
+       vertex -0.1 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 -0.02
+       vertex -0.1 -0.032 -0.01
+       vertex -0.1 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 -0.01
+       vertex -0.1 -0.024 -0.02
+       vertex -0.1 -0.032 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 -0.02
+       vertex -0.1 -0.024 -0.01
+       vertex -0.1 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 -0.01
+       vertex -0.1 -0.016 -0.02
+       vertex -0.1 -0.024 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 -0.02
+       vertex -0.1 -0.016 -0.01
+       vertex -0.1 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 -0.01
+       vertex -0.1 -0.008 -0.02
+       vertex -0.1 -0.016 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 -0.02
+       vertex -0.1 -0.008 -0.01
+       vertex -0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 -0.01
+       vertex -0.1 0 -0.02
+       vertex -0.1 -0.008 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 -0.01
+       vertex -0.1 -0.04 0
+       vertex -0.1 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 1.156482e-18
+       vertex -0.1 -0.032 -0.01
+       vertex -0.1 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 -0.01
+       vertex -0.1 -0.032 1.156482e-18
+       vertex -0.1 -0.024 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 0
+       vertex -0.1 -0.024 -0.01
+       vertex -0.1 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 -0.01
+       vertex -0.1 -0.024 0
+       vertex -0.1 -0.016 -1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 -1.156482e-18
+       vertex -0.1 -0.016 -0.01
+       vertex -0.1 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 -0.01
+       vertex -0.1 -0.016 -1.156482e-18
+       vertex -0.1 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 0
+       vertex -0.1 -0.008 -0.01
+       vertex -0.1 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 -0.01
+       vertex -0.1 -0.008 0
+       vertex -0.1 0 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 0
+       vertex -0.1 0 -0.01
+       vertex -0.1 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 0.01
+       vertex -0.1 -0.032 0.01
+       vertex -0.1 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -0.1 -0.032 1.156482e-18
+       vertex -0.1 -0.04 0
+       vertex -0.1 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 1.156482e-18
+       vertex -0.1 -0.032 0.01
+       vertex -0.1 -0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 0.01
+       vertex -0.1 -0.024 0
+       vertex -0.1 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 0
+       vertex -0.1 -0.024 0.01
+       vertex -0.1 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 0.01
+       vertex -0.1 -0.016 -1.156482e-18
+       vertex -0.1 -0.024 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 0.01
+       vertex -0.1 -0.008 0.01
+       vertex -0.1 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -0.1 -0.008 0
+       vertex -0.1 -0.016 -1.156482e-18
+       vertex -0.1 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 0
+       vertex -0.1 -0.008 0.01
+       vertex -0.1 0 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 0.01
+       vertex -0.1 0 0
+       vertex -0.1 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 0.01
+       vertex -0.1 -0.04 0.02
+       vertex -0.1 -0.032 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 0.02
+       vertex -0.1 -0.032 0.01
+       vertex -0.1 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 0.01
+       vertex -0.1 -0.032 0.02
+       vertex -0.1 -0.024 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 0.02
+       vertex -0.1 -0.024 0.01
+       vertex -0.1 -0.032 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 0.01
+       vertex -0.1 -0.024 0.02
+       vertex -0.1 -0.016 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 0.02
+       vertex -0.1 -0.016 0.01
+       vertex -0.1 -0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 0.01
+       vertex -0.1 -0.016 0.02
+       vertex -0.1 -0.008 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 0.02
+       vertex -0.1 -0.008 0.01
+       vertex -0.1 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 0.01
+       vertex -0.1 -0.008 0.02
+       vertex -0.1 0 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 0.02
+       vertex -0.1 0 0.01
+       vertex -0.1 -0.008 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 0.02
+       vertex -0.1 -0.04 0.03
+       vertex -0.1 -0.032 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 0.03
+       vertex -0.1 -0.032 0.02
+       vertex -0.1 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 0.02
+       vertex -0.1 -0.032 0.03
+       vertex -0.1 -0.024 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 0.03
+       vertex -0.1 -0.024 0.02
+       vertex -0.1 -0.032 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 0.02
+       vertex -0.1 -0.024 0.03
+       vertex -0.1 -0.016 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 0.03
+       vertex -0.1 -0.016 0.02
+       vertex -0.1 -0.024 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 0.02
+       vertex -0.1 -0.016 0.03
+       vertex -0.1 -0.008 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 0.03
+       vertex -0.1 -0.008 0.02
+       vertex -0.1 -0.016 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 0.02
+       vertex -0.1 -0.008 0.03
+       vertex -0.1 0 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 0.03
+       vertex -0.1 0 0.02
+       vertex -0.1 -0.008 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 0.03
+       vertex -0.1 -0.04 0.04
+       vertex -0.1 -0.032 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 0.04
+       vertex -0.1 -0.032 0.03
+       vertex -0.1 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 0.03
+       vertex -0.1 -0.032 0.04
+       vertex -0.1 -0.024 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 0.04
+       vertex -0.1 -0.024 0.03
+       vertex -0.1 -0.032 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 0.03
+       vertex -0.1 -0.024 0.04
+       vertex -0.1 -0.016 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 0.04
+       vertex -0.1 -0.016 0.03
+       vertex -0.1 -0.024 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 0.03
+       vertex -0.1 -0.016 0.04
+       vertex -0.1 -0.008 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 0.04
+       vertex -0.1 -0.008 0.03
+       vertex -0.1 -0.016 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 0.03
+       vertex -0.1 -0.008 0.04
+       vertex -0.1 0 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 0.04
+       vertex -0.1 0 0.03
+       vertex -0.1 -0.008 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.04 0.04
+       vertex -0.1 -0.04 0.05
+       vertex -0.1 -0.032 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.032 0.05
+       vertex -0.1 -0.032 0.04
+       vertex -0.1 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.032 0.04
+       vertex -0.1 -0.032 0.05
+       vertex -0.1 -0.024 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.024 0.05
+       vertex -0.1 -0.024 0.04
+       vertex -0.1 -0.032 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.024 0.04
+       vertex -0.1 -0.024 0.05
+       vertex -0.1 -0.016 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.016 0.05
+       vertex -0.1 -0.016 0.04
+       vertex -0.1 -0.024 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.016 0.04
+       vertex -0.1 -0.016 0.05
+       vertex -0.1 -0.008 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 -0.008 0.05
+       vertex -0.1 -0.008 0.04
+       vertex -0.1 -0.016 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 -0.008 0.04
+       vertex -0.1 -0.008 0.05
+       vertex -0.1 0 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0 0.05
+       vertex -0.1 0 0.04
+       vertex -0.1 -0.008 0.04
+    endloop
+  endfacet
+endsolid minX
+solid maxX
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 -0.05
+       vertex 0.1 -0.032 -0.05
+       vertex 0.1 -0.032 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.04
+       vertex 0.1 -0.04 -0.04
+       vertex 0.1 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.05
+       vertex 0.1 -0.024 -0.05
+       vertex 0.1 -0.024 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.04
+       vertex 0.1 -0.032 -0.04
+       vertex 0.1 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.05
+       vertex 0.1 -0.016 -0.05
+       vertex 0.1 -0.016 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.04
+       vertex 0.1 -0.024 -0.04
+       vertex 0.1 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.05
+       vertex 0.1 -0.008 -0.05
+       vertex 0.1 -0.008 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.04
+       vertex 0.1 -0.016 -0.04
+       vertex 0.1 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.05
+       vertex 0.1 0 -0.05
+       vertex 0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.04
+       vertex 0.1 -0.008 -0.04
+       vertex 0.1 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 -0.04
+       vertex 0.1 -0.032 -0.04
+       vertex 0.1 -0.032 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.03
+       vertex 0.1 -0.04 -0.03
+       vertex 0.1 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.04
+       vertex 0.1 -0.024 -0.04
+       vertex 0.1 -0.024 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.03
+       vertex 0.1 -0.032 -0.03
+       vertex 0.1 -0.032 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.04
+       vertex 0.1 -0.016 -0.04
+       vertex 0.1 -0.016 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.03
+       vertex 0.1 -0.024 -0.03
+       vertex 0.1 -0.024 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.04
+       vertex 0.1 -0.008 -0.04
+       vertex 0.1 -0.008 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.03
+       vertex 0.1 -0.016 -0.03
+       vertex 0.1 -0.016 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.04
+       vertex 0.1 0 -0.04
+       vertex 0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.03
+       vertex 0.1 -0.008 -0.03
+       vertex 0.1 -0.008 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 -0.03
+       vertex 0.1 -0.032 -0.03
+       vertex 0.1 -0.032 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.02
+       vertex 0.1 -0.04 -0.02
+       vertex 0.1 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.03
+       vertex 0.1 -0.024 -0.03
+       vertex 0.1 -0.024 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.02
+       vertex 0.1 -0.032 -0.02
+       vertex 0.1 -0.032 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.03
+       vertex 0.1 -0.016 -0.03
+       vertex 0.1 -0.016 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.02
+       vertex 0.1 -0.024 -0.02
+       vertex 0.1 -0.024 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.03
+       vertex 0.1 -0.008 -0.03
+       vertex 0.1 -0.008 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.02
+       vertex 0.1 -0.016 -0.02
+       vertex 0.1 -0.016 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.03
+       vertex 0.1 0 -0.03
+       vertex 0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.02
+       vertex 0.1 -0.008 -0.02
+       vertex 0.1 -0.008 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 -0.02
+       vertex 0.1 -0.032 -0.02
+       vertex 0.1 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.01
+       vertex 0.1 -0.04 -0.01
+       vertex 0.1 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.02
+       vertex 0.1 -0.024 -0.02
+       vertex 0.1 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.01
+       vertex 0.1 -0.032 -0.01
+       vertex 0.1 -0.032 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.02
+       vertex 0.1 -0.016 -0.02
+       vertex 0.1 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.01
+       vertex 0.1 -0.024 -0.01
+       vertex 0.1 -0.024 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.02
+       vertex 0.1 -0.008 -0.02
+       vertex 0.1 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.01
+       vertex 0.1 -0.016 -0.01
+       vertex 0.1 -0.016 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.02
+       vertex 0.1 0 -0.02
+       vertex 0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.01
+       vertex 0.1 -0.008 -0.01
+       vertex 0.1 -0.008 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 -0.01
+       vertex 0.1 -0.032 -0.01
+       vertex 0.1 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 1.156482e-18
+       vertex 0.1 -0.04 0
+       vertex 0.1 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 -0.01
+       vertex 0.1 -0.024 -0.01
+       vertex 0.1 -0.024 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0
+       vertex 0.1 -0.032 1.156482e-18
+       vertex 0.1 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 -0.01
+       vertex 0.1 -0.016 -0.01
+       vertex 0.1 -0.016 -1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -1.156482e-18
+       vertex 0.1 -0.024 0
+       vertex 0.1 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 -0.01
+       vertex 0.1 -0.008 -0.01
+       vertex 0.1 -0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0
+       vertex 0.1 -0.016 -1.156482e-18
+       vertex 0.1 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 -0.01
+       vertex 0.1 0 -0.01
+       vertex 0.1 0 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0
+       vertex 0.1 -0.008 0
+       vertex 0.1 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 0.1 -0.032 1.156482e-18
+       vertex 0.1 -0.032 0.01
+       vertex 0.1 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 0.01
+       vertex 0.1 -0.04 0
+       vertex 0.1 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.1 -0.032 1.156482e-18
+       vertex 0.1 -0.024 0
+       vertex 0.1 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.01
+       vertex 0.1 -0.032 0.01
+       vertex 0.1 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.1 -0.024 0
+       vertex 0.1 -0.016 -1.156482e-18
+       vertex 0.1 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.01
+       vertex 0.1 -0.024 0.01
+       vertex 0.1 -0.024 0
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 0.1 -0.008 0
+       vertex 0.1 -0.008 0.01
+       vertex 0.1 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.01
+       vertex 0.1 -0.016 -1.156482e-18
+       vertex 0.1 -0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0
+       vertex 0.1 0 0
+       vertex 0.1 0 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.01
+       vertex 0.1 -0.008 0.01
+       vertex 0.1 -0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 0.01
+       vertex 0.1 -0.032 0.01
+       vertex 0.1 -0.032 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.02
+       vertex 0.1 -0.04 0.02
+       vertex 0.1 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.01
+       vertex 0.1 -0.024 0.01
+       vertex 0.1 -0.024 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.02
+       vertex 0.1 -0.032 0.02
+       vertex 0.1 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.01
+       vertex 0.1 -0.016 0.01
+       vertex 0.1 -0.016 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.02
+       vertex 0.1 -0.024 0.02
+       vertex 0.1 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.01
+       vertex 0.1 -0.008 0.01
+       vertex 0.1 -0.008 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.02
+       vertex 0.1 -0.016 0.02
+       vertex 0.1 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.01
+       vertex 0.1 0 0.01
+       vertex 0.1 0 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.02
+       vertex 0.1 -0.008 0.02
+       vertex 0.1 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 0.02
+       vertex 0.1 -0.032 0.02
+       vertex 0.1 -0.032 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.03
+       vertex 0.1 -0.04 0.03
+       vertex 0.1 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.02
+       vertex 0.1 -0.024 0.02
+       vertex 0.1 -0.024 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.03
+       vertex 0.1 -0.032 0.03
+       vertex 0.1 -0.032 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.02
+       vertex 0.1 -0.016 0.02
+       vertex 0.1 -0.016 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.03
+       vertex 0.1 -0.024 0.03
+       vertex 0.1 -0.024 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.02
+       vertex 0.1 -0.008 0.02
+       vertex 0.1 -0.008 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.03
+       vertex 0.1 -0.016 0.03
+       vertex 0.1 -0.016 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.02
+       vertex 0.1 0 0.02
+       vertex 0.1 0 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.03
+       vertex 0.1 -0.008 0.03
+       vertex 0.1 -0.008 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 0.03
+       vertex 0.1 -0.032 0.03
+       vertex 0.1 -0.032 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.04
+       vertex 0.1 -0.04 0.04
+       vertex 0.1 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.03
+       vertex 0.1 -0.024 0.03
+       vertex 0.1 -0.024 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.04
+       vertex 0.1 -0.032 0.04
+       vertex 0.1 -0.032 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.03
+       vertex 0.1 -0.016 0.03
+       vertex 0.1 -0.016 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.04
+       vertex 0.1 -0.024 0.04
+       vertex 0.1 -0.024 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.03
+       vertex 0.1 -0.008 0.03
+       vertex 0.1 -0.008 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.04
+       vertex 0.1 -0.016 0.04
+       vertex 0.1 -0.016 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.03
+       vertex 0.1 0 0.03
+       vertex 0.1 0 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.04
+       vertex 0.1 -0.008 0.04
+       vertex 0.1 -0.008 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.04 0.04
+       vertex 0.1 -0.032 0.04
+       vertex 0.1 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.05
+       vertex 0.1 -0.04 0.05
+       vertex 0.1 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.032 0.04
+       vertex 0.1 -0.024 0.04
+       vertex 0.1 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.05
+       vertex 0.1 -0.032 0.05
+       vertex 0.1 -0.032 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.024 0.04
+       vertex 0.1 -0.016 0.04
+       vertex 0.1 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.05
+       vertex 0.1 -0.024 0.05
+       vertex 0.1 -0.024 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.016 0.04
+       vertex 0.1 -0.008 0.04
+       vertex 0.1 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.05
+       vertex 0.1 -0.016 0.05
+       vertex 0.1 -0.016 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 -0.008 0.04
+       vertex 0.1 0 0.04
+       vertex 0.1 0 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.05
+       vertex 0.1 -0.008 0.05
+       vertex 0.1 -0.008 0.04
+    endloop
+  endfacet
+endsolid maxX
+solid minY
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 -0.05
+       vertex -0.09333333 -0.04 -0.05
+       vertex -0.09333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.04
+       vertex -0.1 -0.04 -0.04
+       vertex -0.1 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 -0.04
+       vertex -0.09333333 -0.04 -0.04
+       vertex -0.09333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.03
+       vertex -0.1 -0.04 -0.03
+       vertex -0.1 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 -0.03
+       vertex -0.09333333 -0.04 -0.03
+       vertex -0.09333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.02
+       vertex -0.1 -0.04 -0.02
+       vertex -0.1 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 -0.02
+       vertex -0.09333333 -0.04 -0.02
+       vertex -0.09333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.01
+       vertex -0.1 -0.04 -0.01
+       vertex -0.1 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 -0.01
+       vertex -0.09333333 -0.04 -0.01
+       vertex -0.09333333 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0
+       vertex -0.1 -0.04 0
+       vertex -0.1 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 0
+       vertex -0.09333333 -0.04 0
+       vertex -0.09333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.01
+       vertex -0.1 -0.04 0.01
+       vertex -0.1 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 0.01
+       vertex -0.09333333 -0.04 0.01
+       vertex -0.09333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.02
+       vertex -0.1 -0.04 0.02
+       vertex -0.1 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 0.02
+       vertex -0.09333333 -0.04 0.02
+       vertex -0.09333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.03
+       vertex -0.1 -0.04 0.03
+       vertex -0.1 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 0.03
+       vertex -0.09333333 -0.04 0.03
+       vertex -0.09333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.04
+       vertex -0.1 -0.04 0.04
+       vertex -0.1 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 -0.04 0.04
+       vertex -0.09333333 -0.04 0.04
+       vertex -0.09333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.05
+       vertex -0.1 -0.04 0.05
+       vertex -0.1 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.05
+       vertex -0.08666667 -0.04 -0.05
+       vertex -0.08666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.04
+       vertex -0.09333333 -0.04 -0.04
+       vertex -0.09333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.04
+       vertex -0.08666667 -0.04 -0.04
+       vertex -0.08666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.03
+       vertex -0.09333333 -0.04 -0.03
+       vertex -0.09333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.03
+       vertex -0.08666667 -0.04 -0.03
+       vertex -0.08666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.02
+       vertex -0.09333333 -0.04 -0.02
+       vertex -0.09333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.02
+       vertex -0.08666667 -0.04 -0.02
+       vertex -0.08666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.01
+       vertex -0.09333333 -0.04 -0.01
+       vertex -0.09333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 -0.01
+       vertex -0.08666667 -0.04 -0.01
+       vertex -0.08666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0
+       vertex -0.09333333 -0.04 0
+       vertex -0.09333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0
+       vertex -0.08666667 -0.04 0
+       vertex -0.08666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.01
+       vertex -0.09333333 -0.04 0.01
+       vertex -0.09333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.01
+       vertex -0.08666667 -0.04 0.01
+       vertex -0.08666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.02
+       vertex -0.09333333 -0.04 0.02
+       vertex -0.09333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.02
+       vertex -0.08666667 -0.04 0.02
+       vertex -0.08666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.03
+       vertex -0.09333333 -0.04 0.03
+       vertex -0.09333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.03
+       vertex -0.08666667 -0.04 0.03
+       vertex -0.08666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.04
+       vertex -0.09333333 -0.04 0.04
+       vertex -0.09333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 -0.04 0.04
+       vertex -0.08666667 -0.04 0.04
+       vertex -0.08666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.05
+       vertex -0.09333333 -0.04 0.05
+       vertex -0.09333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.05
+       vertex -0.08 -0.04 -0.05
+       vertex -0.08 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.04
+       vertex -0.08666667 -0.04 -0.04
+       vertex -0.08666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.04
+       vertex -0.08 -0.04 -0.04
+       vertex -0.08 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.03
+       vertex -0.08666667 -0.04 -0.03
+       vertex -0.08666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.03
+       vertex -0.08 -0.04 -0.03
+       vertex -0.08 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.02
+       vertex -0.08666667 -0.04 -0.02
+       vertex -0.08666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 -0.02
+       vertex -0.08 -0.04 -0.02
+       vertex -0.08 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.01
+       vertex -0.08666667 -0.04 -0.01
+       vertex -0.08666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0
+       vertex -0.08666667 -0.04 -0.01
+       vertex -0.08 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.01
+       vertex -0.08 -0.04 1.156482e-18
+       vertex -0.08666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 1.156482e-18
+       vertex -0.08 -0.04 0.01
+       vertex -0.08666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.01
+       vertex -0.08666667 -0.04 0
+       vertex -0.08 -0.04 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.01
+       vertex -0.08 -0.04 0.01
+       vertex -0.08 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.02
+       vertex -0.08666667 -0.04 0.02
+       vertex -0.08666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.02
+       vertex -0.08 -0.04 0.02
+       vertex -0.08 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.03
+       vertex -0.08666667 -0.04 0.03
+       vertex -0.08666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.03
+       vertex -0.08 -0.04 0.03
+       vertex -0.08 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.04
+       vertex -0.08666667 -0.04 0.04
+       vertex -0.08666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 -0.04 0.04
+       vertex -0.08 -0.04 0.04
+       vertex -0.08 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.05
+       vertex -0.08666667 -0.04 0.05
+       vertex -0.08666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.05
+       vertex -0.07333333 -0.04 -0.05
+       vertex -0.07333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.04
+       vertex -0.08 -0.04 -0.04
+       vertex -0.08 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.04
+       vertex -0.07333333 -0.04 -0.04
+       vertex -0.07333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.03
+       vertex -0.08 -0.04 -0.03
+       vertex -0.08 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.03
+       vertex -0.07333333 -0.04 -0.03
+       vertex -0.07333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.02
+       vertex -0.08 -0.04 -0.02
+       vertex -0.08 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.02
+       vertex -0.07333333 -0.04 -0.02
+       vertex -0.07333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.01
+       vertex -0.08 -0.04 -0.01
+       vertex -0.08 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0
+       vertex -0.08 -0.04 1.156482e-18
+       vertex -0.08 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 -0.01
+       vertex -0.07333333 -0.04 -0.01
+       vertex -0.07333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 1.156482e-18
+       vertex -0.07333333 -0.04 0
+       vertex -0.07333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.01
+       vertex -0.08 -0.04 0.01
+       vertex -0.08 -0.04 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.01
+       vertex -0.07333333 -0.04 0.01
+       vertex -0.07333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.02
+       vertex -0.08 -0.04 0.02
+       vertex -0.08 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.02
+       vertex -0.07333333 -0.04 0.02
+       vertex -0.07333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.03
+       vertex -0.08 -0.04 0.03
+       vertex -0.08 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.03
+       vertex -0.07333333 -0.04 0.03
+       vertex -0.07333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.04
+       vertex -0.08 -0.04 0.04
+       vertex -0.08 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 -0.04 0.04
+       vertex -0.07333333 -0.04 0.04
+       vertex -0.07333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.05
+       vertex -0.08 -0.04 0.05
+       vertex -0.08 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.05
+       vertex -0.06666667 -0.04 -0.05
+       vertex -0.06666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.04
+       vertex -0.07333333 -0.04 -0.04
+       vertex -0.07333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.04
+       vertex -0.06666667 -0.04 -0.04
+       vertex -0.06666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.03
+       vertex -0.07333333 -0.04 -0.03
+       vertex -0.07333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.03
+       vertex -0.06666667 -0.04 -0.03
+       vertex -0.06666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.02
+       vertex -0.07333333 -0.04 -0.02
+       vertex -0.07333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.02
+       vertex -0.06666667 -0.04 -0.02
+       vertex -0.06666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.01
+       vertex -0.07333333 -0.04 -0.01
+       vertex -0.07333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 -0.01
+       vertex -0.06666667 -0.04 -0.01
+       vertex -0.06666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0
+       vertex -0.07333333 -0.04 0
+       vertex -0.07333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0
+       vertex -0.06666667 -0.04 0
+       vertex -0.06666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.01
+       vertex -0.07333333 -0.04 0.01
+       vertex -0.07333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.01
+       vertex -0.06666667 -0.04 0.01
+       vertex -0.06666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.02
+       vertex -0.07333333 -0.04 0.02
+       vertex -0.07333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.02
+       vertex -0.06666667 -0.04 0.02
+       vertex -0.06666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.03
+       vertex -0.07333333 -0.04 0.03
+       vertex -0.07333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.03
+       vertex -0.06666667 -0.04 0.03
+       vertex -0.06666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.04
+       vertex -0.07333333 -0.04 0.04
+       vertex -0.07333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 -0.04 0.04
+       vertex -0.06666667 -0.04 0.04
+       vertex -0.06666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.05
+       vertex -0.07333333 -0.04 0.05
+       vertex -0.07333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.05
+       vertex -0.06 -0.04 -0.05
+       vertex -0.06 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.04
+       vertex -0.06666667 -0.04 -0.04
+       vertex -0.06666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.04
+       vertex -0.06 -0.04 -0.04
+       vertex -0.06 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.03
+       vertex -0.06666667 -0.04 -0.03
+       vertex -0.06666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.03
+       vertex -0.06 -0.04 -0.03
+       vertex -0.06 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.02
+       vertex -0.06666667 -0.04 -0.02
+       vertex -0.06666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.02
+       vertex -0.06 -0.04 -0.02
+       vertex -0.06 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.01
+       vertex -0.06666667 -0.04 -0.01
+       vertex -0.06666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 -0.01
+       vertex -0.06 -0.04 -0.01
+       vertex -0.06 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0
+       vertex -0.06666667 -0.04 0
+       vertex -0.06666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0
+       vertex -0.06 -0.04 0
+       vertex -0.06 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.01
+       vertex -0.06666667 -0.04 0.01
+       vertex -0.06666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.01
+       vertex -0.06 -0.04 0.01
+       vertex -0.06 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.02
+       vertex -0.06666667 -0.04 0.02
+       vertex -0.06666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.02
+       vertex -0.06 -0.04 0.02
+       vertex -0.06 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.03
+       vertex -0.06666667 -0.04 0.03
+       vertex -0.06666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.03
+       vertex -0.06 -0.04 0.03
+       vertex -0.06 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.04
+       vertex -0.06666667 -0.04 0.04
+       vertex -0.06666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 -0.04 0.04
+       vertex -0.06 -0.04 0.04
+       vertex -0.06 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.05
+       vertex -0.06666667 -0.04 0.05
+       vertex -0.06666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.05
+       vertex -0.05333333 -0.04 -0.05
+       vertex -0.05333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.04
+       vertex -0.06 -0.04 -0.04
+       vertex -0.06 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.04
+       vertex -0.05333333 -0.04 -0.04
+       vertex -0.05333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.03
+       vertex -0.06 -0.04 -0.03
+       vertex -0.06 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.03
+       vertex -0.05333333 -0.04 -0.03
+       vertex -0.05333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.02
+       vertex -0.06 -0.04 -0.02
+       vertex -0.06 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.02
+       vertex -0.05333333 -0.04 -0.02
+       vertex -0.05333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.01
+       vertex -0.06 -0.04 -0.01
+       vertex -0.06 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 -0.01
+       vertex -0.05333333 -0.04 -0.01
+       vertex -0.05333333 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0
+       vertex -0.06 -0.04 0
+       vertex -0.06 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0
+       vertex -0.05333333 -0.04 0
+       vertex -0.05333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.01
+       vertex -0.06 -0.04 0.01
+       vertex -0.06 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.01
+       vertex -0.05333333 -0.04 0.01
+       vertex -0.05333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.02
+       vertex -0.06 -0.04 0.02
+       vertex -0.06 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.02
+       vertex -0.05333333 -0.04 0.02
+       vertex -0.05333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.03
+       vertex -0.06 -0.04 0.03
+       vertex -0.06 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.03
+       vertex -0.05333333 -0.04 0.03
+       vertex -0.05333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.04
+       vertex -0.06 -0.04 0.04
+       vertex -0.06 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 -0.04 0.04
+       vertex -0.05333333 -0.04 0.04
+       vertex -0.05333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.05
+       vertex -0.06 -0.04 0.05
+       vertex -0.06 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.05
+       vertex -0.04666667 -0.04 -0.05
+       vertex -0.04666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.04
+       vertex -0.05333333 -0.04 -0.04
+       vertex -0.05333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.04
+       vertex -0.04666667 -0.04 -0.04
+       vertex -0.04666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.03
+       vertex -0.05333333 -0.04 -0.03
+       vertex -0.05333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.03
+       vertex -0.04666667 -0.04 -0.03
+       vertex -0.04666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.02
+       vertex -0.05333333 -0.04 -0.02
+       vertex -0.05333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.02
+       vertex -0.04666667 -0.04 -0.02
+       vertex -0.04666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.01
+       vertex -0.05333333 -0.04 -0.01
+       vertex -0.05333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 -0.01
+       vertex -0.04666667 -0.04 -0.01
+       vertex -0.04666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0
+       vertex -0.05333333 -0.04 0
+       vertex -0.05333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0
+       vertex -0.04666667 -0.04 0
+       vertex -0.04666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.01
+       vertex -0.05333333 -0.04 0.01
+       vertex -0.05333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.01
+       vertex -0.04666667 -0.04 0.01
+       vertex -0.04666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.02
+       vertex -0.05333333 -0.04 0.02
+       vertex -0.05333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.02
+       vertex -0.04666667 -0.04 0.02
+       vertex -0.04666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.03
+       vertex -0.05333333 -0.04 0.03
+       vertex -0.05333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.03
+       vertex -0.04666667 -0.04 0.03
+       vertex -0.04666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.04
+       vertex -0.05333333 -0.04 0.04
+       vertex -0.05333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 -0.04 0.04
+       vertex -0.04666667 -0.04 0.04
+       vertex -0.04666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.05
+       vertex -0.05333333 -0.04 0.05
+       vertex -0.05333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.05
+       vertex -0.04 -0.04 -0.05
+       vertex -0.04 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.04
+       vertex -0.04666667 -0.04 -0.04
+       vertex -0.04666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.04
+       vertex -0.04 -0.04 -0.04
+       vertex -0.04 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.03
+       vertex -0.04666667 -0.04 -0.03
+       vertex -0.04666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.03
+       vertex -0.04 -0.04 -0.03
+       vertex -0.04 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.02
+       vertex -0.04666667 -0.04 -0.02
+       vertex -0.04666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.02
+       vertex -0.04 -0.04 -0.02
+       vertex -0.04 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.01
+       vertex -0.04666667 -0.04 -0.01
+       vertex -0.04666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 -0.01
+       vertex -0.04 -0.04 -0.01
+       vertex -0.04 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0
+       vertex -0.04666667 -0.04 0
+       vertex -0.04666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0
+       vertex -0.04 -0.04 0
+       vertex -0.04 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.01
+       vertex -0.04666667 -0.04 0.01
+       vertex -0.04666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.01
+       vertex -0.04 -0.04 0.01
+       vertex -0.04 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.02
+       vertex -0.04666667 -0.04 0.02
+       vertex -0.04666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.02
+       vertex -0.04 -0.04 0.02
+       vertex -0.04 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.03
+       vertex -0.04666667 -0.04 0.03
+       vertex -0.04666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.03
+       vertex -0.04 -0.04 0.03
+       vertex -0.04 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.04
+       vertex -0.04666667 -0.04 0.04
+       vertex -0.04666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 -0.04 0.04
+       vertex -0.04 -0.04 0.04
+       vertex -0.04 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.05
+       vertex -0.04666667 -0.04 0.05
+       vertex -0.04666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.05
+       vertex -0.03333333 -0.04 -0.05
+       vertex -0.03333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.04
+       vertex -0.04 -0.04 -0.04
+       vertex -0.04 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.04
+       vertex -0.03333333 -0.04 -0.04
+       vertex -0.03333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.03
+       vertex -0.04 -0.04 -0.03
+       vertex -0.04 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.03
+       vertex -0.03333333 -0.04 -0.03
+       vertex -0.03333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.02
+       vertex -0.04 -0.04 -0.02
+       vertex -0.04 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.02
+       vertex -0.03333333 -0.04 -0.02
+       vertex -0.03333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.01
+       vertex -0.04 -0.04 -0.01
+       vertex -0.04 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 -0.01
+       vertex -0.03333333 -0.04 -0.01
+       vertex -0.03333333 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0
+       vertex -0.04 -0.04 0
+       vertex -0.04 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0
+       vertex -0.03333333 -0.04 0
+       vertex -0.03333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.01
+       vertex -0.04 -0.04 0.01
+       vertex -0.04 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.01
+       vertex -0.03333333 -0.04 0.01
+       vertex -0.03333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.02
+       vertex -0.04 -0.04 0.02
+       vertex -0.04 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.02
+       vertex -0.03333333 -0.04 0.02
+       vertex -0.03333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.03
+       vertex -0.04 -0.04 0.03
+       vertex -0.04 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.03
+       vertex -0.03333333 -0.04 0.03
+       vertex -0.03333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.04
+       vertex -0.04 -0.04 0.04
+       vertex -0.04 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 -0.04 0.04
+       vertex -0.03333333 -0.04 0.04
+       vertex -0.03333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.05
+       vertex -0.04 -0.04 0.05
+       vertex -0.04 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.05
+       vertex -0.02666667 -0.04 -0.05
+       vertex -0.02666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.04
+       vertex -0.03333333 -0.04 -0.04
+       vertex -0.03333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.04
+       vertex -0.02666667 -0.04 -0.04
+       vertex -0.02666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.03
+       vertex -0.03333333 -0.04 -0.03
+       vertex -0.03333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.03
+       vertex -0.02666667 -0.04 -0.03
+       vertex -0.02666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.02
+       vertex -0.03333333 -0.04 -0.02
+       vertex -0.03333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.02
+       vertex -0.02666667 -0.04 -0.02
+       vertex -0.02666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.01
+       vertex -0.03333333 -0.04 -0.01
+       vertex -0.03333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 -0.01
+       vertex -0.02666667 -0.04 -0.01
+       vertex -0.02666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0
+       vertex -0.03333333 -0.04 0
+       vertex -0.03333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0
+       vertex -0.02666667 -0.04 0
+       vertex -0.02666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.01
+       vertex -0.03333333 -0.04 0.01
+       vertex -0.03333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.01
+       vertex -0.02666667 -0.04 0.01
+       vertex -0.02666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.02
+       vertex -0.03333333 -0.04 0.02
+       vertex -0.03333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.02
+       vertex -0.02666667 -0.04 0.02
+       vertex -0.02666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.03
+       vertex -0.03333333 -0.04 0.03
+       vertex -0.03333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.03
+       vertex -0.02666667 -0.04 0.03
+       vertex -0.02666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.04
+       vertex -0.03333333 -0.04 0.04
+       vertex -0.03333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 -0.04 0.04
+       vertex -0.02666667 -0.04 0.04
+       vertex -0.02666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.05
+       vertex -0.03333333 -0.04 0.05
+       vertex -0.03333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.05
+       vertex -0.02 -0.04 -0.05
+       vertex -0.02 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.04
+       vertex -0.02666667 -0.04 -0.04
+       vertex -0.02666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.04
+       vertex -0.02 -0.04 -0.04
+       vertex -0.02 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.03
+       vertex -0.02666667 -0.04 -0.03
+       vertex -0.02666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.03
+       vertex -0.02 -0.04 -0.03
+       vertex -0.02 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.02
+       vertex -0.02666667 -0.04 -0.02
+       vertex -0.02666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.02
+       vertex -0.02 -0.04 -0.02
+       vertex -0.02 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.01
+       vertex -0.02666667 -0.04 -0.01
+       vertex -0.02666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 -0.01
+       vertex -0.02 -0.04 -0.01
+       vertex -0.02 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0
+       vertex -0.02666667 -0.04 0
+       vertex -0.02666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0
+       vertex -0.02 -0.04 0
+       vertex -0.02 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.01
+       vertex -0.02666667 -0.04 0.01
+       vertex -0.02666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.01
+       vertex -0.02 -0.04 0.01
+       vertex -0.02 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.02
+       vertex -0.02666667 -0.04 0.02
+       vertex -0.02666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.02
+       vertex -0.02 -0.04 0.02
+       vertex -0.02 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.03
+       vertex -0.02666667 -0.04 0.03
+       vertex -0.02666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.03
+       vertex -0.02 -0.04 0.03
+       vertex -0.02 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.04
+       vertex -0.02666667 -0.04 0.04
+       vertex -0.02666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 -0.04 0.04
+       vertex -0.02 -0.04 0.04
+       vertex -0.02 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.05
+       vertex -0.02666667 -0.04 0.05
+       vertex -0.02666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.05
+       vertex -0.01333333 -0.04 -0.05
+       vertex -0.01333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.04
+       vertex -0.02 -0.04 -0.04
+       vertex -0.02 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.04
+       vertex -0.01333333 -0.04 -0.04
+       vertex -0.01333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.03
+       vertex -0.02 -0.04 -0.03
+       vertex -0.02 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.03
+       vertex -0.01333333 -0.04 -0.03
+       vertex -0.01333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.02
+       vertex -0.02 -0.04 -0.02
+       vertex -0.02 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.02
+       vertex -0.01333333 -0.04 -0.02
+       vertex -0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.02 -0.04 -0.01
+       vertex -0.02 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 -0.01
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.01333333 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0
+       vertex -0.02 -0.04 0
+       vertex -0.02 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0
+       vertex -0.01333333 -0.04 0
+       vertex -0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.02 -0.04 0.01
+       vertex -0.02 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.01
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.01333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.02
+       vertex -0.02 -0.04 0.02
+       vertex -0.02 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.02
+       vertex -0.01333333 -0.04 0.02
+       vertex -0.01333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.03
+       vertex -0.02 -0.04 0.03
+       vertex -0.02 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.03
+       vertex -0.01333333 -0.04 0.03
+       vertex -0.01333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.04
+       vertex -0.02 -0.04 0.04
+       vertex -0.02 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 -0.04 0.04
+       vertex -0.01333333 -0.04 0.04
+       vertex -0.01333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.05
+       vertex -0.02 -0.04 0.05
+       vertex -0.02 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.05
+       vertex -0.006666667 -0.04 -0.05
+       vertex -0.006666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.04
+       vertex -0.01333333 -0.04 -0.04
+       vertex -0.01333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.04
+       vertex -0.006666667 -0.04 -0.04
+       vertex -0.006666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.03
+       vertex -0.01333333 -0.04 -0.03
+       vertex -0.01333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.03
+       vertex -0.006666667 -0.04 -0.03
+       vertex -0.006666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.02
+       vertex -0.01333333 -0.04 -0.02
+       vertex -0.01333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.02
+       vertex -0.006666667 -0.04 -0.02
+       vertex -0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.01
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.01333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.006666667 -0.04 0.01
+       vertex -0.006666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.02
+       vertex -0.01333333 -0.04 0.02
+       vertex -0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.02
+       vertex -0.006666667 -0.04 0.02
+       vertex -0.006666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.03
+       vertex -0.01333333 -0.04 0.03
+       vertex -0.01333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.03
+       vertex -0.006666667 -0.04 0.03
+       vertex -0.006666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.04
+       vertex -0.01333333 -0.04 0.04
+       vertex -0.01333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0.04
+       vertex -0.006666667 -0.04 0.04
+       vertex -0.006666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.05
+       vertex -0.01333333 -0.04 0.05
+       vertex -0.01333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.05
+       vertex 0 -0.04 -0.05
+       vertex 0 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.04
+       vertex -0.006666667 -0.04 -0.04
+       vertex -0.006666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.04
+       vertex 0 -0.04 -0.04
+       vertex 0 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.03
+       vertex -0.006666667 -0.04 -0.03
+       vertex -0.006666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.03
+       vertex 0 -0.04 -0.03
+       vertex 0 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.02
+       vertex -0.006666667 -0.04 -0.02
+       vertex -0.006666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.02
+       vertex 0 -0.04 -0.02
+       vertex 0 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.01
+       vertex -0.006666667 -0.04 -0.01
+       vertex -0.006666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.01
+       vertex 0 -0.04 0.01
+       vertex 0 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 0.02
+       vertex -0.006666667 -0.04 0.02
+       vertex -0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.02
+       vertex 0 -0.04 0.02
+       vertex 0 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 0.03
+       vertex -0.006666667 -0.04 0.03
+       vertex -0.006666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.03
+       vertex 0 -0.04 0.03
+       vertex 0 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 0.04
+       vertex -0.006666667 -0.04 0.04
+       vertex -0.006666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.04
+       vertex 0 -0.04 0.04
+       vertex 0 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 0.05
+       vertex -0.006666667 -0.04 0.05
+       vertex -0.006666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.05
+       vertex 0.006666667 -0.04 -0.05
+       vertex 0.006666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.04
+       vertex 0 -0.04 -0.04
+       vertex 0 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.04
+       vertex 0.006666667 -0.04 -0.04
+       vertex 0.006666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.03
+       vertex 0 -0.04 -0.03
+       vertex 0 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.03
+       vertex 0.006666667 -0.04 -0.03
+       vertex 0.006666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.02
+       vertex 0 -0.04 -0.02
+       vertex 0 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.02
+       vertex 0.006666667 -0.04 -0.02
+       vertex 0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0 -0.04 -0.01
+       vertex 0 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 0.01
+       vertex 0.006666667 -0.04 0.01
+       vertex 0.006666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.02
+       vertex 0 -0.04 0.02
+       vertex 0 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 0.02
+       vertex 0.006666667 -0.04 0.02
+       vertex 0.006666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.03
+       vertex 0 -0.04 0.03
+       vertex 0 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 0.03
+       vertex 0.006666667 -0.04 0.03
+       vertex 0.006666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.04
+       vertex 0 -0.04 0.04
+       vertex 0 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 0.04
+       vertex 0.006666667 -0.04 0.04
+       vertex 0.006666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.05
+       vertex 0 -0.04 0.05
+       vertex 0 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.05
+       vertex 0.01333333 -0.04 -0.05
+       vertex 0.01333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.04
+       vertex 0.006666667 -0.04 -0.04
+       vertex 0.006666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.04
+       vertex 0.01333333 -0.04 -0.04
+       vertex 0.01333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.03
+       vertex 0.006666667 -0.04 -0.03
+       vertex 0.006666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.03
+       vertex 0.01333333 -0.04 -0.03
+       vertex 0.01333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.02
+       vertex 0.006666667 -0.04 -0.02
+       vertex 0.006666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.02
+       vertex 0.01333333 -0.04 -0.02
+       vertex 0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0.006666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.01
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.01333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.02
+       vertex 0.006666667 -0.04 0.02
+       vertex 0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.02
+       vertex 0.01333333 -0.04 0.02
+       vertex 0.01333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.03
+       vertex 0.006666667 -0.04 0.03
+       vertex 0.006666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.03
+       vertex 0.01333333 -0.04 0.03
+       vertex 0.01333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.04
+       vertex 0.006666667 -0.04 0.04
+       vertex 0.006666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.04
+       vertex 0.01333333 -0.04 0.04
+       vertex 0.01333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.05
+       vertex 0.006666667 -0.04 0.05
+       vertex 0.006666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.05
+       vertex 0.02 -0.04 -0.05
+       vertex 0.02 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.04
+       vertex 0.01333333 -0.04 -0.04
+       vertex 0.01333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.04
+       vertex 0.02 -0.04 -0.04
+       vertex 0.02 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.03
+       vertex 0.01333333 -0.04 -0.03
+       vertex 0.01333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.03
+       vertex 0.02 -0.04 -0.03
+       vertex 0.02 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.02
+       vertex 0.01333333 -0.04 -0.02
+       vertex 0.01333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.02
+       vertex 0.02 -0.04 -0.02
+       vertex 0.02 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.01
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.01333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.02 -0.04 -0.01
+       vertex 0.02 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0
+       vertex 0.01333333 -0.04 0
+       vertex 0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0
+       vertex 0.02 -0.04 0
+       vertex 0.02 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.01
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.01333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.02 -0.04 0.01
+       vertex 0.02 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.02
+       vertex 0.01333333 -0.04 0.02
+       vertex 0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.02
+       vertex 0.02 -0.04 0.02
+       vertex 0.02 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.03
+       vertex 0.01333333 -0.04 0.03
+       vertex 0.01333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.03
+       vertex 0.02 -0.04 0.03
+       vertex 0.02 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.04
+       vertex 0.01333333 -0.04 0.04
+       vertex 0.01333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.04
+       vertex 0.02 -0.04 0.04
+       vertex 0.02 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.05
+       vertex 0.01333333 -0.04 0.05
+       vertex 0.01333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.05
+       vertex 0.02666667 -0.04 -0.05
+       vertex 0.02666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.04
+       vertex 0.02 -0.04 -0.04
+       vertex 0.02 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.04
+       vertex 0.02666667 -0.04 -0.04
+       vertex 0.02666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.03
+       vertex 0.02 -0.04 -0.03
+       vertex 0.02 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.03
+       vertex 0.02666667 -0.04 -0.03
+       vertex 0.02666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.02
+       vertex 0.02 -0.04 -0.02
+       vertex 0.02 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.02
+       vertex 0.02666667 -0.04 -0.02
+       vertex 0.02666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.01
+       vertex 0.02 -0.04 -0.01
+       vertex 0.02 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 -0.01
+       vertex 0.02666667 -0.04 -0.01
+       vertex 0.02666667 -0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 5.782412e-19
+       vertex 0.02 -0.04 0
+       vertex 0.02 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 5.782412e-19
+       vertex 0.02666667 -0.04 0.01
+       vertex 0.02 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.01
+       vertex 0.02 -0.04 0
+       vertex 0.02666667 -0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.01
+       vertex 0.02666667 -0.04 0.01
+       vertex 0.02666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.02
+       vertex 0.02 -0.04 0.02
+       vertex 0.02 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.02
+       vertex 0.02666667 -0.04 0.02
+       vertex 0.02666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.03
+       vertex 0.02 -0.04 0.03
+       vertex 0.02 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.03
+       vertex 0.02666667 -0.04 0.03
+       vertex 0.02666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.04
+       vertex 0.02 -0.04 0.04
+       vertex 0.02 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 -0.04 0.04
+       vertex 0.02666667 -0.04 0.04
+       vertex 0.02666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.05
+       vertex 0.02 -0.04 0.05
+       vertex 0.02 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.05
+       vertex 0.03333333 -0.04 -0.05
+       vertex 0.03333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.04
+       vertex 0.02666667 -0.04 -0.04
+       vertex 0.02666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.04
+       vertex 0.03333333 -0.04 -0.04
+       vertex 0.03333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.03
+       vertex 0.02666667 -0.04 -0.03
+       vertex 0.02666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.03
+       vertex 0.03333333 -0.04 -0.03
+       vertex 0.03333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.02
+       vertex 0.02666667 -0.04 -0.02
+       vertex 0.02666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.02
+       vertex 0.03333333 -0.04 -0.02
+       vertex 0.03333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.01
+       vertex 0.02666667 -0.04 -0.01
+       vertex 0.02666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 -0.01
+       vertex 0.03333333 -0.04 -0.01
+       vertex 0.03333333 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0
+       vertex 0.02666667 -0.04 5.782412e-19
+       vertex 0.02666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 5.782412e-19
+       vertex 0.03333333 -0.04 0
+       vertex 0.03333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.01
+       vertex 0.02666667 -0.04 0.01
+       vertex 0.02666667 -0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.01
+       vertex 0.03333333 -0.04 0.01
+       vertex 0.03333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.02
+       vertex 0.02666667 -0.04 0.02
+       vertex 0.02666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.02
+       vertex 0.03333333 -0.04 0.02
+       vertex 0.03333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.03
+       vertex 0.02666667 -0.04 0.03
+       vertex 0.02666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.03
+       vertex 0.03333333 -0.04 0.03
+       vertex 0.03333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.04
+       vertex 0.02666667 -0.04 0.04
+       vertex 0.02666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 -0.04 0.04
+       vertex 0.03333333 -0.04 0.04
+       vertex 0.03333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.05
+       vertex 0.02666667 -0.04 0.05
+       vertex 0.02666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.05
+       vertex 0.04 -0.04 -0.05
+       vertex 0.04 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.04
+       vertex 0.03333333 -0.04 -0.04
+       vertex 0.03333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.04
+       vertex 0.04 -0.04 -0.04
+       vertex 0.04 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.03
+       vertex 0.03333333 -0.04 -0.03
+       vertex 0.03333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.03
+       vertex 0.04 -0.04 -0.03
+       vertex 0.04 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.02
+       vertex 0.03333333 -0.04 -0.02
+       vertex 0.03333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.02
+       vertex 0.04 -0.04 -0.02
+       vertex 0.04 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.01
+       vertex 0.03333333 -0.04 -0.01
+       vertex 0.03333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 -0.01
+       vertex 0.04 -0.04 -0.01
+       vertex 0.04 -0.04 -5.782412e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -5.782412e-19
+       vertex 0.03333333 -0.04 0
+       vertex 0.03333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0
+       vertex 0.04 -0.04 -5.782412e-19
+       vertex 0.04 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.01
+       vertex 0.03333333 -0.04 0.01
+       vertex 0.03333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.01
+       vertex 0.04 -0.04 0.01
+       vertex 0.04 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.02
+       vertex 0.03333333 -0.04 0.02
+       vertex 0.03333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.02
+       vertex 0.04 -0.04 0.02
+       vertex 0.04 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.03
+       vertex 0.03333333 -0.04 0.03
+       vertex 0.03333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.03
+       vertex 0.04 -0.04 0.03
+       vertex 0.04 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.04
+       vertex 0.03333333 -0.04 0.04
+       vertex 0.03333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 -0.04 0.04
+       vertex 0.04 -0.04 0.04
+       vertex 0.04 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.05
+       vertex 0.03333333 -0.04 0.05
+       vertex 0.03333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.05
+       vertex 0.04666667 -0.04 -0.05
+       vertex 0.04666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.04
+       vertex 0.04 -0.04 -0.04
+       vertex 0.04 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.04
+       vertex 0.04666667 -0.04 -0.04
+       vertex 0.04666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.03
+       vertex 0.04 -0.04 -0.03
+       vertex 0.04 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.03
+       vertex 0.04666667 -0.04 -0.03
+       vertex 0.04666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.02
+       vertex 0.04 -0.04 -0.02
+       vertex 0.04 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.02
+       vertex 0.04666667 -0.04 -0.02
+       vertex 0.04666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.01
+       vertex 0.04 -0.04 -0.01
+       vertex 0.04 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 -0.01
+       vertex 0.04666667 -0.04 -0.01
+       vertex 0.04666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0
+       vertex 0.04 -0.04 -5.782412e-19
+       vertex 0.04 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0
+       vertex 0.04666667 -0.04 0.01
+       vertex 0.04 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.01
+       vertex 0.04 -0.04 -5.782412e-19
+       vertex 0.04666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.01
+       vertex 0.04666667 -0.04 0.01
+       vertex 0.04666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.02
+       vertex 0.04 -0.04 0.02
+       vertex 0.04 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.02
+       vertex 0.04666667 -0.04 0.02
+       vertex 0.04666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.03
+       vertex 0.04 -0.04 0.03
+       vertex 0.04 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.03
+       vertex 0.04666667 -0.04 0.03
+       vertex 0.04666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.04
+       vertex 0.04 -0.04 0.04
+       vertex 0.04 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -0.04 0.04
+       vertex 0.04666667 -0.04 0.04
+       vertex 0.04666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.05
+       vertex 0.04 -0.04 0.05
+       vertex 0.04 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.05
+       vertex 0.05333333 -0.04 -0.05
+       vertex 0.05333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.04
+       vertex 0.04666667 -0.04 -0.04
+       vertex 0.04666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.04
+       vertex 0.05333333 -0.04 -0.04
+       vertex 0.05333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.03
+       vertex 0.04666667 -0.04 -0.03
+       vertex 0.04666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.03
+       vertex 0.05333333 -0.04 -0.03
+       vertex 0.05333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.02
+       vertex 0.04666667 -0.04 -0.02
+       vertex 0.04666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.02
+       vertex 0.05333333 -0.04 -0.02
+       vertex 0.05333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.01
+       vertex 0.04666667 -0.04 -0.01
+       vertex 0.04666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 -0.01
+       vertex 0.05333333 -0.04 -0.01
+       vertex 0.05333333 -0.04 -2.891206e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -2.891206e-19
+       vertex 0.04666667 -0.04 0
+       vertex 0.04666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0
+       vertex 0.05333333 -0.04 -2.891206e-19
+       vertex 0.05333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.01
+       vertex 0.04666667 -0.04 0.01
+       vertex 0.04666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.01
+       vertex 0.05333333 -0.04 0.01
+       vertex 0.05333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.02
+       vertex 0.04666667 -0.04 0.02
+       vertex 0.04666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.02
+       vertex 0.05333333 -0.04 0.02
+       vertex 0.05333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.03
+       vertex 0.04666667 -0.04 0.03
+       vertex 0.04666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.03
+       vertex 0.05333333 -0.04 0.03
+       vertex 0.05333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.04
+       vertex 0.04666667 -0.04 0.04
+       vertex 0.04666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 -0.04 0.04
+       vertex 0.05333333 -0.04 0.04
+       vertex 0.05333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.05
+       vertex 0.04666667 -0.04 0.05
+       vertex 0.04666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.05
+       vertex 0.06 -0.04 -0.05
+       vertex 0.06 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.04
+       vertex 0.05333333 -0.04 -0.04
+       vertex 0.05333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.04
+       vertex 0.06 -0.04 -0.04
+       vertex 0.06 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.03
+       vertex 0.05333333 -0.04 -0.03
+       vertex 0.05333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.03
+       vertex 0.06 -0.04 -0.03
+       vertex 0.06 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.02
+       vertex 0.05333333 -0.04 -0.02
+       vertex 0.05333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.02
+       vertex 0.06 -0.04 -0.02
+       vertex 0.06 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.01
+       vertex 0.05333333 -0.04 -0.01
+       vertex 0.05333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 -0.01
+       vertex 0.06 -0.04 -0.01
+       vertex 0.06 -0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 5.782412e-19
+       vertex 0.05333333 -0.04 -2.891206e-19
+       vertex 0.05333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 5.782412e-19
+       vertex 0.06 -0.04 0.01
+       vertex 0.05333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.01
+       vertex 0.05333333 -0.04 -2.891206e-19
+       vertex 0.06 -0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.01
+       vertex 0.06 -0.04 0.01
+       vertex 0.06 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.02
+       vertex 0.05333333 -0.04 0.02
+       vertex 0.05333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.02
+       vertex 0.06 -0.04 0.02
+       vertex 0.06 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.03
+       vertex 0.05333333 -0.04 0.03
+       vertex 0.05333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.03
+       vertex 0.06 -0.04 0.03
+       vertex 0.06 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.04
+       vertex 0.05333333 -0.04 0.04
+       vertex 0.05333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 -0.04 0.04
+       vertex 0.06 -0.04 0.04
+       vertex 0.06 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.05
+       vertex 0.05333333 -0.04 0.05
+       vertex 0.05333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.05
+       vertex 0.06666667 -0.04 -0.05
+       vertex 0.06666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.04
+       vertex 0.06 -0.04 -0.04
+       vertex 0.06 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.04
+       vertex 0.06666667 -0.04 -0.04
+       vertex 0.06666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.03
+       vertex 0.06 -0.04 -0.03
+       vertex 0.06 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.03
+       vertex 0.06666667 -0.04 -0.03
+       vertex 0.06666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.02
+       vertex 0.06 -0.04 -0.02
+       vertex 0.06 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.02
+       vertex 0.06666667 -0.04 -0.02
+       vertex 0.06666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.01
+       vertex 0.06 -0.04 -0.01
+       vertex 0.06 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 -0.01
+       vertex 0.06666667 -0.04 -0.01
+       vertex 0.06666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0
+       vertex 0.06 -0.04 5.782412e-19
+       vertex 0.06 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 5.782412e-19
+       vertex 0.06666667 -0.04 0
+       vertex 0.06666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.01
+       vertex 0.06 -0.04 0.01
+       vertex 0.06 -0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.01
+       vertex 0.06666667 -0.04 0.01
+       vertex 0.06666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.02
+       vertex 0.06 -0.04 0.02
+       vertex 0.06 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.02
+       vertex 0.06666667 -0.04 0.02
+       vertex 0.06666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.03
+       vertex 0.06 -0.04 0.03
+       vertex 0.06 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.03
+       vertex 0.06666667 -0.04 0.03
+       vertex 0.06666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.04
+       vertex 0.06 -0.04 0.04
+       vertex 0.06 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 -0.04 0.04
+       vertex 0.06666667 -0.04 0.04
+       vertex 0.06666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.05
+       vertex 0.06 -0.04 0.05
+       vertex 0.06 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.05
+       vertex 0.07333333 -0.04 -0.05
+       vertex 0.07333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.04
+       vertex 0.06666667 -0.04 -0.04
+       vertex 0.06666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.04
+       vertex 0.07333333 -0.04 -0.04
+       vertex 0.07333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.03
+       vertex 0.06666667 -0.04 -0.03
+       vertex 0.06666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.03
+       vertex 0.07333333 -0.04 -0.03
+       vertex 0.07333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.02
+       vertex 0.06666667 -0.04 -0.02
+       vertex 0.06666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.02
+       vertex 0.07333333 -0.04 -0.02
+       vertex 0.07333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.01
+       vertex 0.06666667 -0.04 -0.01
+       vertex 0.06666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 -0.01
+       vertex 0.07333333 -0.04 -0.01
+       vertex 0.07333333 -0.04 -4.336809e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -4.336809e-19
+       vertex 0.06666667 -0.04 0
+       vertex 0.06666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0
+       vertex 0.07333333 -0.04 -4.336809e-19
+       vertex 0.07333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.01
+       vertex 0.06666667 -0.04 0.01
+       vertex 0.06666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.01
+       vertex 0.07333333 -0.04 0.01
+       vertex 0.07333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.02
+       vertex 0.06666667 -0.04 0.02
+       vertex 0.06666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.02
+       vertex 0.07333333 -0.04 0.02
+       vertex 0.07333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.03
+       vertex 0.06666667 -0.04 0.03
+       vertex 0.06666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.03
+       vertex 0.07333333 -0.04 0.03
+       vertex 0.07333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.04
+       vertex 0.06666667 -0.04 0.04
+       vertex 0.06666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 -0.04 0.04
+       vertex 0.07333333 -0.04 0.04
+       vertex 0.07333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.05
+       vertex 0.06666667 -0.04 0.05
+       vertex 0.06666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.05
+       vertex 0.08 -0.04 -0.05
+       vertex 0.08 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.04
+       vertex 0.07333333 -0.04 -0.04
+       vertex 0.07333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.04
+       vertex 0.08 -0.04 -0.04
+       vertex 0.08 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.03
+       vertex 0.07333333 -0.04 -0.03
+       vertex 0.07333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.03
+       vertex 0.08 -0.04 -0.03
+       vertex 0.08 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.02
+       vertex 0.07333333 -0.04 -0.02
+       vertex 0.07333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.02
+       vertex 0.08 -0.04 -0.02
+       vertex 0.08 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.01
+       vertex 0.07333333 -0.04 -0.01
+       vertex 0.07333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 -0.01
+       vertex 0.08 -0.04 -0.01
+       vertex 0.08 -0.04 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 2.891206e-19
+       vertex 0.07333333 -0.04 -4.336809e-19
+       vertex 0.07333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 2.891206e-19
+       vertex 0.08 -0.04 0.01
+       vertex 0.07333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.01
+       vertex 0.07333333 -0.04 -4.336809e-19
+       vertex 0.08 -0.04 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.01
+       vertex 0.08 -0.04 0.01
+       vertex 0.08 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.02
+       vertex 0.07333333 -0.04 0.02
+       vertex 0.07333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.02
+       vertex 0.08 -0.04 0.02
+       vertex 0.08 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.03
+       vertex 0.07333333 -0.04 0.03
+       vertex 0.07333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.03
+       vertex 0.08 -0.04 0.03
+       vertex 0.08 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.04
+       vertex 0.07333333 -0.04 0.04
+       vertex 0.07333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 -0.04 0.04
+       vertex 0.08 -0.04 0.04
+       vertex 0.08 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.05
+       vertex 0.07333333 -0.04 0.05
+       vertex 0.07333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.05
+       vertex 0.08666667 -0.04 -0.05
+       vertex 0.08666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.04
+       vertex 0.08 -0.04 -0.04
+       vertex 0.08 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.04
+       vertex 0.08666667 -0.04 -0.04
+       vertex 0.08666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.03
+       vertex 0.08 -0.04 -0.03
+       vertex 0.08 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.03
+       vertex 0.08666667 -0.04 -0.03
+       vertex 0.08666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.02
+       vertex 0.08 -0.04 -0.02
+       vertex 0.08 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.02
+       vertex 0.08666667 -0.04 -0.02
+       vertex 0.08666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.01
+       vertex 0.08 -0.04 -0.01
+       vertex 0.08 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 -0.01
+       vertex 0.08666667 -0.04 -0.01
+       vertex 0.08666667 -0.04 -2.168404e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -2.168404e-19
+       vertex 0.08 -0.04 2.891206e-19
+       vertex 0.08 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 2.891206e-19
+       vertex 0.08666667 -0.04 -2.168404e-19
+       vertex 0.08666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.01
+       vertex 0.08 -0.04 0.01
+       vertex 0.08 -0.04 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.01
+       vertex 0.08666667 -0.04 0.01
+       vertex 0.08666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.02
+       vertex 0.08 -0.04 0.02
+       vertex 0.08 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.02
+       vertex 0.08666667 -0.04 0.02
+       vertex 0.08666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.03
+       vertex 0.08 -0.04 0.03
+       vertex 0.08 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.03
+       vertex 0.08666667 -0.04 0.03
+       vertex 0.08666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.04
+       vertex 0.08 -0.04 0.04
+       vertex 0.08 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 -0.04 0.04
+       vertex 0.08666667 -0.04 0.04
+       vertex 0.08666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.05
+       vertex 0.08 -0.04 0.05
+       vertex 0.08 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.05
+       vertex 0.09333333 -0.04 -0.05
+       vertex 0.09333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.04
+       vertex 0.08666667 -0.04 -0.04
+       vertex 0.08666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.04
+       vertex 0.09333333 -0.04 -0.04
+       vertex 0.09333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.03
+       vertex 0.08666667 -0.04 -0.03
+       vertex 0.08666667 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.03
+       vertex 0.09333333 -0.04 -0.03
+       vertex 0.09333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.02
+       vertex 0.08666667 -0.04 -0.02
+       vertex 0.08666667 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.02
+       vertex 0.09333333 -0.04 -0.02
+       vertex 0.09333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.01
+       vertex 0.08666667 -0.04 -0.01
+       vertex 0.08666667 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 -0.01
+       vertex 0.09333333 -0.04 -0.01
+       vertex 0.09333333 -0.04 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 4.698209e-19
+       vertex 0.08666667 -0.04 -2.168404e-19
+       vertex 0.08666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 4.698209e-19
+       vertex 0.09333333 -0.04 0.01
+       vertex 0.08666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.01
+       vertex 0.08666667 -0.04 -2.168404e-19
+       vertex 0.09333333 -0.04 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.01
+       vertex 0.09333333 -0.04 0.01
+       vertex 0.09333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.02
+       vertex 0.08666667 -0.04 0.02
+       vertex 0.08666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.02
+       vertex 0.09333333 -0.04 0.02
+       vertex 0.09333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.03
+       vertex 0.08666667 -0.04 0.03
+       vertex 0.08666667 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.03
+       vertex 0.09333333 -0.04 0.03
+       vertex 0.09333333 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.04
+       vertex 0.08666667 -0.04 0.04
+       vertex 0.08666667 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 -0.04 0.04
+       vertex 0.09333333 -0.04 0.04
+       vertex 0.09333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.05
+       vertex 0.08666667 -0.04 0.05
+       vertex 0.08666667 -0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.05
+       vertex 0.1 -0.04 -0.05
+       vertex 0.1 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 -0.04
+       vertex 0.09333333 -0.04 -0.04
+       vertex 0.09333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.04
+       vertex 0.1 -0.04 -0.04
+       vertex 0.1 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 -0.03
+       vertex 0.09333333 -0.04 -0.03
+       vertex 0.09333333 -0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.03
+       vertex 0.1 -0.04 -0.03
+       vertex 0.1 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 -0.02
+       vertex 0.09333333 -0.04 -0.02
+       vertex 0.09333333 -0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.02
+       vertex 0.1 -0.04 -0.02
+       vertex 0.1 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 -0.01
+       vertex 0.09333333 -0.04 -0.01
+       vertex 0.09333333 -0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 -0.01
+       vertex 0.1 -0.04 -0.01
+       vertex 0.1 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 0
+       vertex 0.09333333 -0.04 4.698209e-19
+       vertex 0.09333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 4.698209e-19
+       vertex 0.1 -0.04 0
+       vertex 0.1 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 0.01
+       vertex 0.09333333 -0.04 0.01
+       vertex 0.09333333 -0.04 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.01
+       vertex 0.1 -0.04 0.01
+       vertex 0.1 -0.04 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 0.02
+       vertex 0.09333333 -0.04 0.02
+       vertex 0.09333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.02
+       vertex 0.1 -0.04 0.02
+       vertex 0.1 -0.04 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 0.03
+       vertex 0.09333333 -0.04 0.03
+       vertex 0.09333333 -0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.03
+       vertex 0.1 -0.04 0.03
+       vertex 0.1 -0.04 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 0.04
+       vertex 0.09333333 -0.04 0.04
+       vertex 0.09333333 -0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 -0.04 0.04
+       vertex 0.1 -0.04 0.04
+       vertex 0.1 -0.04 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 -0.04 0.05
+       vertex 0.09333333 -0.04 0.05
+       vertex 0.09333333 -0.04 0.04
+    endloop
+  endfacet
+endsolid minY
+solid minZ
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 -0.04 -0.05
+       vertex -0.1 -0.032 -0.05
+       vertex -0.09333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 -0.032 -0.05
+       vertex -0.09333333 -0.04 -0.05
+       vertex -0.1 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 -0.032 -0.05
+       vertex -0.1 -0.024 -0.05
+       vertex -0.09333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 -0.024 -0.05
+       vertex -0.09333333 -0.032 -0.05
+       vertex -0.1 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 -0.024 -0.05
+       vertex -0.1 -0.016 -0.05
+       vertex -0.09333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 -0.016 -0.05
+       vertex -0.09333333 -0.024 -0.05
+       vertex -0.1 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 -0.016 -0.05
+       vertex -0.1 -0.008 -0.05
+       vertex -0.09333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 -0.008 -0.05
+       vertex -0.09333333 -0.016 -0.05
+       vertex -0.1 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 -0.008 -0.05
+       vertex -0.1 0 -0.05
+       vertex -0.09333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 0 -0.05
+       vertex -0.09333333 -0.008 -0.05
+       vertex -0.1 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 -0.04 -0.05
+       vertex -0.09333333 -0.032 -0.05
+       vertex -0.08666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 -0.032 -0.05
+       vertex -0.08666667 -0.04 -0.05
+       vertex -0.09333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 -0.032 -0.05
+       vertex -0.09333333 -0.024 -0.05
+       vertex -0.08666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 -0.024 -0.05
+       vertex -0.08666667 -0.032 -0.05
+       vertex -0.09333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 -0.024 -0.05
+       vertex -0.09333333 -0.016 -0.05
+       vertex -0.08666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 -0.016 -0.05
+       vertex -0.08666667 -0.024 -0.05
+       vertex -0.09333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 -0.016 -0.05
+       vertex -0.09333333 -0.008 -0.05
+       vertex -0.08666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 -0.008 -0.05
+       vertex -0.08666667 -0.016 -0.05
+       vertex -0.09333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 -0.008 -0.05
+       vertex -0.09333333 0 -0.05
+       vertex -0.08666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 0 -0.05
+       vertex -0.08666667 -0.008 -0.05
+       vertex -0.09333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 -0.04 -0.05
+       vertex -0.08666667 -0.032 -0.05
+       vertex -0.08 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 -0.032 -0.05
+       vertex -0.08 -0.04 -0.05
+       vertex -0.08666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 -0.032 -0.05
+       vertex -0.08666667 -0.024 -0.05
+       vertex -0.08 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 -0.024 -0.05
+       vertex -0.08 -0.032 -0.05
+       vertex -0.08666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 -0.024 -0.05
+       vertex -0.08666667 -0.016 -0.05
+       vertex -0.08 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 -0.016 -0.05
+       vertex -0.08 -0.024 -0.05
+       vertex -0.08666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 -0.016 -0.05
+       vertex -0.08666667 -0.008 -0.05
+       vertex -0.08 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 -0.008 -0.05
+       vertex -0.08 -0.016 -0.05
+       vertex -0.08666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 -0.008 -0.05
+       vertex -0.08666667 0 -0.05
+       vertex -0.08 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 0 -0.05
+       vertex -0.08 -0.008 -0.05
+       vertex -0.08666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 -0.04 -0.05
+       vertex -0.08 -0.032 -0.05
+       vertex -0.07333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 -0.032 -0.05
+       vertex -0.07333333 -0.04 -0.05
+       vertex -0.08 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 -0.032 -0.05
+       vertex -0.08 -0.024 -0.05
+       vertex -0.07333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 -0.024 -0.05
+       vertex -0.07333333 -0.032 -0.05
+       vertex -0.08 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 -0.024 -0.05
+       vertex -0.08 -0.016 -0.05
+       vertex -0.07333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 -0.016 -0.05
+       vertex -0.07333333 -0.024 -0.05
+       vertex -0.08 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 -0.016 -0.05
+       vertex -0.08 -0.008 -0.05
+       vertex -0.07333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 -0.008 -0.05
+       vertex -0.07333333 -0.016 -0.05
+       vertex -0.08 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 -0.008 -0.05
+       vertex -0.08 0 -0.05
+       vertex -0.07333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 0 -0.05
+       vertex -0.07333333 -0.008 -0.05
+       vertex -0.08 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 -0.04 -0.05
+       vertex -0.07333333 -0.032 -0.05
+       vertex -0.06666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 -0.032 -0.05
+       vertex -0.06666667 -0.04 -0.05
+       vertex -0.07333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 -0.032 -0.05
+       vertex -0.07333333 -0.024 -0.05
+       vertex -0.06666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 -0.024 -0.05
+       vertex -0.06666667 -0.032 -0.05
+       vertex -0.07333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 -0.024 -0.05
+       vertex -0.07333333 -0.016 -0.05
+       vertex -0.06666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 -0.016 -0.05
+       vertex -0.06666667 -0.024 -0.05
+       vertex -0.07333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 -0.016 -0.05
+       vertex -0.07333333 -0.008 -0.05
+       vertex -0.06666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 -0.008 -0.05
+       vertex -0.06666667 -0.016 -0.05
+       vertex -0.07333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 -0.008 -0.05
+       vertex -0.07333333 0 -0.05
+       vertex -0.06666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 0 -0.05
+       vertex -0.06666667 -0.008 -0.05
+       vertex -0.07333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 -0.04 -0.05
+       vertex -0.06666667 -0.032 -0.05
+       vertex -0.06 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 -0.032 -0.05
+       vertex -0.06 -0.04 -0.05
+       vertex -0.06666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 -0.032 -0.05
+       vertex -0.06666667 -0.024 -0.05
+       vertex -0.06 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 -0.024 -0.05
+       vertex -0.06 -0.032 -0.05
+       vertex -0.06666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 -0.024 -0.05
+       vertex -0.06666667 -0.016 -0.05
+       vertex -0.06 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 -0.016 -0.05
+       vertex -0.06 -0.024 -0.05
+       vertex -0.06666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 -0.016 -0.05
+       vertex -0.06666667 -0.008 -0.05
+       vertex -0.06 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 -0.008 -0.05
+       vertex -0.06 -0.016 -0.05
+       vertex -0.06666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 -0.008 -0.05
+       vertex -0.06666667 0 -0.05
+       vertex -0.06 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 0 -0.05
+       vertex -0.06 -0.008 -0.05
+       vertex -0.06666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 -0.04 -0.05
+       vertex -0.06 -0.032 -0.05
+       vertex -0.05333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 -0.032 -0.05
+       vertex -0.05333333 -0.04 -0.05
+       vertex -0.06 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 -0.032 -0.05
+       vertex -0.06 -0.024 -0.05
+       vertex -0.05333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 -0.024 -0.05
+       vertex -0.05333333 -0.032 -0.05
+       vertex -0.06 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 -0.024 -0.05
+       vertex -0.06 -0.016 -0.05
+       vertex -0.05333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 -0.016 -0.05
+       vertex -0.05333333 -0.024 -0.05
+       vertex -0.06 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 -0.016 -0.05
+       vertex -0.06 -0.008 -0.05
+       vertex -0.05333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 -0.008 -0.05
+       vertex -0.05333333 -0.016 -0.05
+       vertex -0.06 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 -0.008 -0.05
+       vertex -0.06 0 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.05333333 -0.008 -0.05
+       vertex -0.06 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 -0.04 -0.05
+       vertex -0.05333333 -0.032 -0.05
+       vertex -0.04666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 -0.032 -0.05
+       vertex -0.04666667 -0.04 -0.05
+       vertex -0.05333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 -0.032 -0.05
+       vertex -0.05333333 -0.024 -0.05
+       vertex -0.04666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 -0.024 -0.05
+       vertex -0.04666667 -0.032 -0.05
+       vertex -0.05333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 -0.024 -0.05
+       vertex -0.05333333 -0.016 -0.05
+       vertex -0.04666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 -0.016 -0.05
+       vertex -0.04666667 -0.024 -0.05
+       vertex -0.05333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 -0.016 -0.05
+       vertex -0.05333333 -0.008 -0.05
+       vertex -0.04666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 -0.008 -0.05
+       vertex -0.04666667 -0.016 -0.05
+       vertex -0.05333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 -0.008 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.04666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 0 -0.05
+       vertex -0.04666667 -0.008 -0.05
+       vertex -0.05333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 -0.04 -0.05
+       vertex -0.04666667 -0.032 -0.05
+       vertex -0.04 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 -0.032 -0.05
+       vertex -0.04 -0.04 -0.05
+       vertex -0.04666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 -0.032 -0.05
+       vertex -0.04666667 -0.024 -0.05
+       vertex -0.04 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 -0.024 -0.05
+       vertex -0.04 -0.032 -0.05
+       vertex -0.04666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 -0.024 -0.05
+       vertex -0.04666667 -0.016 -0.05
+       vertex -0.04 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 -0.016 -0.05
+       vertex -0.04 -0.024 -0.05
+       vertex -0.04666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 -0.016 -0.05
+       vertex -0.04666667 -0.008 -0.05
+       vertex -0.04 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 -0.008 -0.05
+       vertex -0.04 -0.016 -0.05
+       vertex -0.04666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 -0.008 -0.05
+       vertex -0.04666667 0 -0.05
+       vertex -0.04 5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.04 -0.008 -0.05
+       vertex -0.04666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 -0.04 -0.05
+       vertex -0.04 -0.032 -0.05
+       vertex -0.03333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 -0.032 -0.05
+       vertex -0.03333333 -0.04 -0.05
+       vertex -0.04 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 -0.032 -0.05
+       vertex -0.04 -0.024 -0.05
+       vertex -0.03333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 -0.024 -0.05
+       vertex -0.03333333 -0.032 -0.05
+       vertex -0.04 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 -0.024 -0.05
+       vertex -0.04 -0.016 -0.05
+       vertex -0.03333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 -0.016 -0.05
+       vertex -0.03333333 -0.024 -0.05
+       vertex -0.04 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 -0.016 -0.05
+       vertex -0.04 -0.008 -0.05
+       vertex -0.03333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 -0.008 -0.05
+       vertex -0.03333333 -0.016 -0.05
+       vertex -0.04 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.03333333 -0.008 -0.05
+       vertex -0.04 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 -0.008 -0.05
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 -0.04 -0.05
+       vertex -0.03333333 -0.032 -0.05
+       vertex -0.02666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 -0.032 -0.05
+       vertex -0.02666667 -0.04 -0.05
+       vertex -0.03333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 -0.032 -0.05
+       vertex -0.03333333 -0.024 -0.05
+       vertex -0.02666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 -0.024 -0.05
+       vertex -0.02666667 -0.032 -0.05
+       vertex -0.03333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 -0.024 -0.05
+       vertex -0.03333333 -0.016 -0.05
+       vertex -0.02666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 -0.016 -0.05
+       vertex -0.02666667 -0.024 -0.05
+       vertex -0.03333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 -0.016 -0.05
+       vertex -0.03333333 -0.008 -0.05
+       vertex -0.02666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 -0.008 -0.05
+       vertex -0.02666667 -0.016 -0.05
+       vertex -0.03333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 -0.008 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 0 -0.05
+       vertex -0.02666667 -0.008 -0.05
+       vertex -0.03333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 -0.04 -0.05
+       vertex -0.02666667 -0.032 -0.05
+       vertex -0.02 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 -0.032 -0.05
+       vertex -0.02 -0.04 -0.05
+       vertex -0.02666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 -0.032 -0.05
+       vertex -0.02666667 -0.024 -0.05
+       vertex -0.02 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 -0.024 -0.05
+       vertex -0.02 -0.032 -0.05
+       vertex -0.02666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 -0.024 -0.05
+       vertex -0.02666667 -0.016 -0.05
+       vertex -0.02 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 -0.016 -0.05
+       vertex -0.02 -0.024 -0.05
+       vertex -0.02666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 -0.016 -0.05
+       vertex -0.02666667 -0.008 -0.05
+       vertex -0.02 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 -0.008 -0.05
+       vertex -0.02 -0.016 -0.05
+       vertex -0.02666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 -0.008 -0.05
+       vertex -0.02666667 0 -0.05
+       vertex -0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 0 -0.05
+       vertex -0.02 -0.008 -0.05
+       vertex -0.02666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 -0.04 -0.05
+       vertex -0.02 -0.032 -0.05
+       vertex -0.01333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 -0.032 -0.05
+       vertex -0.01333333 -0.04 -0.05
+       vertex -0.02 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 -0.032 -0.05
+       vertex -0.02 -0.024 -0.05
+       vertex -0.01333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 -0.024 -0.05
+       vertex -0.01333333 -0.032 -0.05
+       vertex -0.02 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 -0.024 -0.05
+       vertex -0.02 -0.016 -0.05
+       vertex -0.01333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 -0.016 -0.05
+       vertex -0.01333333 -0.024 -0.05
+       vertex -0.02 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 -0.016 -0.05
+       vertex -0.02 -0.008 -0.05
+       vertex -0.01333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 -0.008 -0.05
+       vertex -0.01333333 -0.016 -0.05
+       vertex -0.02 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 -0.008 -0.05
+       vertex -0.02 0 -0.05
+       vertex -0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 0 -0.05
+       vertex -0.01333333 -0.008 -0.05
+       vertex -0.02 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.04 -0.05
+       vertex -0.01333333 -0.032 -0.05
+       vertex -0.006666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.032 -0.05
+       vertex -0.006666667 -0.04 -0.05
+       vertex -0.01333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.032 -0.05
+       vertex -0.01333333 -0.024 -0.05
+       vertex -0.006666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.024 -0.05
+       vertex -0.006666667 -0.032 -0.05
+       vertex -0.01333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.024 -0.05
+       vertex -0.01333333 -0.016 -0.05
+       vertex -0.006666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.016 -0.05
+       vertex -0.006666667 -0.024 -0.05
+       vertex -0.01333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.016 -0.05
+       vertex -0.01333333 -0.008 -0.05
+       vertex -0.006666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.008 -0.05
+       vertex -0.006666667 -0.016 -0.05
+       vertex -0.01333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.008 -0.05
+       vertex -0.01333333 0 -0.05
+       vertex -0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0 -0.05
+       vertex -0.006666667 -0.008 -0.05
+       vertex -0.01333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.04 -0.05
+       vertex -0.006666667 -0.032 -0.05
+       vertex 0 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.032 -0.05
+       vertex 0 -0.04 -0.05
+       vertex -0.006666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.032 -0.05
+       vertex -0.006666667 -0.024 -0.05
+       vertex 0 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.024 -0.05
+       vertex 0 -0.032 -0.05
+       vertex -0.006666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.024 -0.05
+       vertex -0.006666667 -0.016 -0.05
+       vertex 0 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.016 -0.05
+       vertex 0 -0.024 -0.05
+       vertex -0.006666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.016 -0.05
+       vertex -0.006666667 -0.008 -0.05
+       vertex 0 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.008 -0.05
+       vertex 0 -0.016 -0.05
+       vertex -0.006666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.008 -0.05
+       vertex -0.006666667 0 -0.05
+       vertex 0 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0 -0.05
+       vertex 0 -0.008 -0.05
+       vertex -0.006666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.04 -0.05
+       vertex 0 -0.032 -0.05
+       vertex 0.006666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.032 -0.05
+       vertex 0.006666667 -0.04 -0.05
+       vertex 0 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.032 -0.05
+       vertex 0 -0.024 -0.05
+       vertex 0.006666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.024 -0.05
+       vertex 0.006666667 -0.032 -0.05
+       vertex 0 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.024 -0.05
+       vertex 0 -0.016 -0.05
+       vertex 0.006666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.016 -0.05
+       vertex 0.006666667 -0.024 -0.05
+       vertex 0 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.016 -0.05
+       vertex 0 -0.008 -0.05
+       vertex 0.006666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.008 -0.05
+       vertex 0.006666667 -0.016 -0.05
+       vertex 0 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.008 -0.05
+       vertex 0 0 -0.05
+       vertex 0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0 -0.05
+       vertex 0.006666667 -0.008 -0.05
+       vertex 0 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.04 -0.05
+       vertex 0.006666667 -0.032 -0.05
+       vertex 0.01333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.032 -0.05
+       vertex 0.01333333 -0.04 -0.05
+       vertex 0.006666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.032 -0.05
+       vertex 0.006666667 -0.024 -0.05
+       vertex 0.01333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.024 -0.05
+       vertex 0.01333333 -0.032 -0.05
+       vertex 0.006666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.024 -0.05
+       vertex 0.006666667 -0.016 -0.05
+       vertex 0.01333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.016 -0.05
+       vertex 0.01333333 -0.024 -0.05
+       vertex 0.006666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.016 -0.05
+       vertex 0.006666667 -0.008 -0.05
+       vertex 0.01333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.008 -0.05
+       vertex 0.01333333 -0.016 -0.05
+       vertex 0.006666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.008 -0.05
+       vertex 0.006666667 0 -0.05
+       vertex 0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0 -0.05
+       vertex 0.01333333 -0.008 -0.05
+       vertex 0.006666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 -0.04 -0.05
+       vertex 0.01333333 -0.032 -0.05
+       vertex 0.02 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 -0.032 -0.05
+       vertex 0.02 -0.04 -0.05
+       vertex 0.01333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 -0.032 -0.05
+       vertex 0.01333333 -0.024 -0.05
+       vertex 0.02 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 -0.024 -0.05
+       vertex 0.02 -0.032 -0.05
+       vertex 0.01333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 -0.024 -0.05
+       vertex 0.01333333 -0.016 -0.05
+       vertex 0.02 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 -0.016 -0.05
+       vertex 0.02 -0.024 -0.05
+       vertex 0.01333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 -0.016 -0.05
+       vertex 0.01333333 -0.008 -0.05
+       vertex 0.02 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 -0.008 -0.05
+       vertex 0.02 -0.016 -0.05
+       vertex 0.01333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 -0.008 -0.05
+       vertex 0.01333333 0 -0.05
+       vertex 0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 0 -0.05
+       vertex 0.02 -0.008 -0.05
+       vertex 0.01333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 -0.04 -0.05
+       vertex 0.02 -0.032 -0.05
+       vertex 0.02666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 -0.032 -0.05
+       vertex 0.02666667 -0.04 -0.05
+       vertex 0.02 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 -0.032 -0.05
+       vertex 0.02 -0.024 -0.05
+       vertex 0.02666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 -0.024 -0.05
+       vertex 0.02666667 -0.032 -0.05
+       vertex 0.02 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 -0.024 -0.05
+       vertex 0.02 -0.016 -0.05
+       vertex 0.02666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 -0.016 -0.05
+       vertex 0.02666667 -0.024 -0.05
+       vertex 0.02 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 -0.016 -0.05
+       vertex 0.02 -0.008 -0.05
+       vertex 0.02666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 -0.008 -0.05
+       vertex 0.02666667 -0.016 -0.05
+       vertex 0.02 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 -0.008 -0.05
+       vertex 0.02 0 -0.05
+       vertex 0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 0 -0.05
+       vertex 0.02666667 -0.008 -0.05
+       vertex 0.02 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 -0.04 -0.05
+       vertex 0.02666667 -0.032 -0.05
+       vertex 0.03333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 -0.032 -0.05
+       vertex 0.03333333 -0.04 -0.05
+       vertex 0.02666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 -0.032 -0.05
+       vertex 0.02666667 -0.024 -0.05
+       vertex 0.03333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 -0.024 -0.05
+       vertex 0.03333333 -0.032 -0.05
+       vertex 0.02666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 -0.024 -0.05
+       vertex 0.02666667 -0.016 -0.05
+       vertex 0.03333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 -0.016 -0.05
+       vertex 0.03333333 -0.024 -0.05
+       vertex 0.02666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 -0.016 -0.05
+       vertex 0.02666667 -0.008 -0.05
+       vertex 0.03333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 -0.008 -0.05
+       vertex 0.03333333 -0.016 -0.05
+       vertex 0.02666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 -0.008 -0.05
+       vertex 0.02666667 0 -0.05
+       vertex 0.03333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 0 -0.05
+       vertex 0.03333333 -0.008 -0.05
+       vertex 0.02666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 -0.04 -0.05
+       vertex 0.03333333 -0.032 -0.05
+       vertex 0.04 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 -0.032 -0.05
+       vertex 0.04 -0.04 -0.05
+       vertex 0.03333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 -0.032 -0.05
+       vertex 0.03333333 -0.024 -0.05
+       vertex 0.04 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 -0.024 -0.05
+       vertex 0.04 -0.032 -0.05
+       vertex 0.03333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 -0.024 -0.05
+       vertex 0.03333333 -0.016 -0.05
+       vertex 0.04 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 -0.016 -0.05
+       vertex 0.04 -0.024 -0.05
+       vertex 0.03333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 -0.016 -0.05
+       vertex 0.03333333 -0.008 -0.05
+       vertex 0.04 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 -0.008 -0.05
+       vertex 0.04 -0.016 -0.05
+       vertex 0.03333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 -0.008 -0.05
+       vertex 0.03333333 0 -0.05
+       vertex 0.04 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.04 -0.008 -0.05
+       vertex 0.03333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 -0.04 -0.05
+       vertex 0.04 -0.032 -0.05
+       vertex 0.04666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 -0.032 -0.05
+       vertex 0.04666667 -0.04 -0.05
+       vertex 0.04 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 -0.032 -0.05
+       vertex 0.04 -0.024 -0.05
+       vertex 0.04666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 -0.024 -0.05
+       vertex 0.04666667 -0.032 -0.05
+       vertex 0.04 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 -0.024 -0.05
+       vertex 0.04 -0.016 -0.05
+       vertex 0.04666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 -0.016 -0.05
+       vertex 0.04666667 -0.024 -0.05
+       vertex 0.04 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 -0.016 -0.05
+       vertex 0.04 -0.008 -0.05
+       vertex 0.04666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 -0.008 -0.05
+       vertex 0.04666667 -0.016 -0.05
+       vertex 0.04 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 -0.008 -0.05
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.04666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.04666667 -0.008 -0.05
+       vertex 0.04 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 -0.04 -0.05
+       vertex 0.04666667 -0.032 -0.05
+       vertex 0.05333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 -0.032 -0.05
+       vertex 0.05333333 -0.04 -0.05
+       vertex 0.04666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 -0.032 -0.05
+       vertex 0.04666667 -0.024 -0.05
+       vertex 0.05333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 -0.024 -0.05
+       vertex 0.05333333 -0.032 -0.05
+       vertex 0.04666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 -0.024 -0.05
+       vertex 0.04666667 -0.016 -0.05
+       vertex 0.05333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 -0.016 -0.05
+       vertex 0.05333333 -0.024 -0.05
+       vertex 0.04666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 -0.016 -0.05
+       vertex 0.04666667 -0.008 -0.05
+       vertex 0.05333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 -0.008 -0.05
+       vertex 0.05333333 -0.016 -0.05
+       vertex 0.04666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 -0.008 -0.05
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.05333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 0 -0.05
+       vertex 0.05333333 -0.008 -0.05
+       vertex 0.04666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 -0.04 -0.05
+       vertex 0.05333333 -0.032 -0.05
+       vertex 0.06 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 -0.032 -0.05
+       vertex 0.06 -0.04 -0.05
+       vertex 0.05333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 -0.032 -0.05
+       vertex 0.05333333 -0.024 -0.05
+       vertex 0.06 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 -0.024 -0.05
+       vertex 0.06 -0.032 -0.05
+       vertex 0.05333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 -0.024 -0.05
+       vertex 0.05333333 -0.016 -0.05
+       vertex 0.06 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 -0.016 -0.05
+       vertex 0.06 -0.024 -0.05
+       vertex 0.05333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 -0.016 -0.05
+       vertex 0.05333333 -0.008 -0.05
+       vertex 0.06 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 -0.008 -0.05
+       vertex 0.06 -0.016 -0.05
+       vertex 0.05333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 -0.008 -0.05
+       vertex 0.05333333 0 -0.05
+       vertex 0.06 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.06 -0.008 -0.05
+       vertex 0.05333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 -0.04 -0.05
+       vertex 0.06 -0.032 -0.05
+       vertex 0.06666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 -0.032 -0.05
+       vertex 0.06666667 -0.04 -0.05
+       vertex 0.06 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 -0.032 -0.05
+       vertex 0.06 -0.024 -0.05
+       vertex 0.06666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 -0.024 -0.05
+       vertex 0.06666667 -0.032 -0.05
+       vertex 0.06 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 -0.024 -0.05
+       vertex 0.06 -0.016 -0.05
+       vertex 0.06666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 -0.016 -0.05
+       vertex 0.06666667 -0.024 -0.05
+       vertex 0.06 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 -0.016 -0.05
+       vertex 0.06 -0.008 -0.05
+       vertex 0.06666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 -0.008 -0.05
+       vertex 0.06666667 -0.016 -0.05
+       vertex 0.06 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 -0.008 -0.05
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.06666667 -0.008 -0.05
+       vertex 0.06 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 -0.04 -0.05
+       vertex 0.06666667 -0.032 -0.05
+       vertex 0.07333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 -0.032 -0.05
+       vertex 0.07333333 -0.04 -0.05
+       vertex 0.06666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 -0.032 -0.05
+       vertex 0.06666667 -0.024 -0.05
+       vertex 0.07333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 -0.024 -0.05
+       vertex 0.07333333 -0.032 -0.05
+       vertex 0.06666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 -0.024 -0.05
+       vertex 0.06666667 -0.016 -0.05
+       vertex 0.07333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 -0.016 -0.05
+       vertex 0.07333333 -0.024 -0.05
+       vertex 0.06666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 -0.016 -0.05
+       vertex 0.06666667 -0.008 -0.05
+       vertex 0.07333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 -0.008 -0.05
+       vertex 0.07333333 -0.016 -0.05
+       vertex 0.06666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 -0.008 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.07333333 -0.008 -0.05
+       vertex 0.06666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 -0.04 -0.05
+       vertex 0.07333333 -0.032 -0.05
+       vertex 0.08 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 -0.032 -0.05
+       vertex 0.08 -0.04 -0.05
+       vertex 0.07333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 -0.032 -0.05
+       vertex 0.07333333 -0.024 -0.05
+       vertex 0.08 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 -0.024 -0.05
+       vertex 0.08 -0.032 -0.05
+       vertex 0.07333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 -0.024 -0.05
+       vertex 0.07333333 -0.016 -0.05
+       vertex 0.08 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 -0.016 -0.05
+       vertex 0.08 -0.024 -0.05
+       vertex 0.07333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 -0.016 -0.05
+       vertex 0.07333333 -0.008 -0.05
+       vertex 0.08 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 -0.008 -0.05
+       vertex 0.08 -0.016 -0.05
+       vertex 0.07333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 -0.008 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.08 4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.08 -0.008 -0.05
+       vertex 0.07333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 -0.04 -0.05
+       vertex 0.08 -0.032 -0.05
+       vertex 0.08666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 -0.032 -0.05
+       vertex 0.08666667 -0.04 -0.05
+       vertex 0.08 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 -0.032 -0.05
+       vertex 0.08 -0.024 -0.05
+       vertex 0.08666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 -0.024 -0.05
+       vertex 0.08666667 -0.032 -0.05
+       vertex 0.08 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 -0.024 -0.05
+       vertex 0.08 -0.016 -0.05
+       vertex 0.08666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 -0.016 -0.05
+       vertex 0.08666667 -0.024 -0.05
+       vertex 0.08 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 -0.016 -0.05
+       vertex 0.08 -0.008 -0.05
+       vertex 0.08666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 -0.008 -0.05
+       vertex 0.08666667 -0.016 -0.05
+       vertex 0.08 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 -0.008 -0.05
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.08666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.08666667 -0.008 -0.05
+       vertex 0.08 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 -0.04 -0.05
+       vertex 0.08666667 -0.032 -0.05
+       vertex 0.09333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 -0.032 -0.05
+       vertex 0.09333333 -0.04 -0.05
+       vertex 0.08666667 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 -0.032 -0.05
+       vertex 0.08666667 -0.024 -0.05
+       vertex 0.09333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 -0.024 -0.05
+       vertex 0.09333333 -0.032 -0.05
+       vertex 0.08666667 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 -0.024 -0.05
+       vertex 0.08666667 -0.016 -0.05
+       vertex 0.09333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 -0.016 -0.05
+       vertex 0.09333333 -0.024 -0.05
+       vertex 0.08666667 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 -0.016 -0.05
+       vertex 0.08666667 -0.008 -0.05
+       vertex 0.09333333 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 -0.008 -0.05
+       vertex 0.09333333 -0.016 -0.05
+       vertex 0.08666667 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 -0.008 -0.05
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.09333333 1.445603e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.09333333 -0.008 -0.05
+       vertex 0.08666667 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 -0.04 -0.05
+       vertex 0.09333333 -0.032 -0.05
+       vertex 0.1 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 -0.032 -0.05
+       vertex 0.1 -0.04 -0.05
+       vertex 0.09333333 -0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 -0.032 -0.05
+       vertex 0.09333333 -0.024 -0.05
+       vertex 0.1 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 -0.024 -0.05
+       vertex 0.1 -0.032 -0.05
+       vertex 0.09333333 -0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 -0.024 -0.05
+       vertex 0.09333333 -0.016 -0.05
+       vertex 0.1 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 -0.016 -0.05
+       vertex 0.1 -0.024 -0.05
+       vertex 0.09333333 -0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 -0.016 -0.05
+       vertex 0.09333333 -0.008 -0.05
+       vertex 0.1 -0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 -0.008 -0.05
+       vertex 0.1 -0.016 -0.05
+       vertex 0.09333333 -0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 -0.008 -0.05
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.1 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 0 -0.05
+       vertex 0.1 -0.008 -0.05
+       vertex 0.09333333 -0.008 -0.05
+    endloop
+  endfacet
+endsolid minZ
+solid maxZ
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 -0.04 0.05
+       vertex -0.09333333 -0.04 0.05
+       vertex -0.09333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.032 0.05
+       vertex -0.1 -0.032 0.05
+       vertex -0.1 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 -0.032 0.05
+       vertex -0.09333333 -0.032 0.05
+       vertex -0.09333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.024 0.05
+       vertex -0.1 -0.024 0.05
+       vertex -0.1 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 -0.024 0.05
+       vertex -0.09333333 -0.024 0.05
+       vertex -0.09333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.016 0.05
+       vertex -0.1 -0.016 0.05
+       vertex -0.1 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 -0.016 0.05
+       vertex -0.09333333 -0.016 0.05
+       vertex -0.09333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.008 0.05
+       vertex -0.1 -0.008 0.05
+       vertex -0.1 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 -0.008 0.05
+       vertex -0.09333333 -0.008 0.05
+       vertex -0.09333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0 0.05
+       vertex -0.1 0 0.05
+       vertex -0.1 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.04 0.05
+       vertex -0.08666667 -0.04 0.05
+       vertex -0.08666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.032 0.05
+       vertex -0.09333333 -0.032 0.05
+       vertex -0.09333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.032 0.05
+       vertex -0.08666667 -0.032 0.05
+       vertex -0.08666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.024 0.05
+       vertex -0.09333333 -0.024 0.05
+       vertex -0.09333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.024 0.05
+       vertex -0.08666667 -0.024 0.05
+       vertex -0.08666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.016 0.05
+       vertex -0.09333333 -0.016 0.05
+       vertex -0.09333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.016 0.05
+       vertex -0.08666667 -0.016 0.05
+       vertex -0.08666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.008 0.05
+       vertex -0.09333333 -0.008 0.05
+       vertex -0.09333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 -0.008 0.05
+       vertex -0.08666667 -0.008 0.05
+       vertex -0.08666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0 0.05
+       vertex -0.09333333 0 0.05
+       vertex -0.09333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.04 0.05
+       vertex -0.08 -0.04 0.05
+       vertex -0.08 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.032 0.05
+       vertex -0.08666667 -0.032 0.05
+       vertex -0.08666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.032 0.05
+       vertex -0.08 -0.032 0.05
+       vertex -0.08 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.024 0.05
+       vertex -0.08666667 -0.024 0.05
+       vertex -0.08666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.024 0.05
+       vertex -0.08 -0.024 0.05
+       vertex -0.08 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.016 0.05
+       vertex -0.08666667 -0.016 0.05
+       vertex -0.08666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.016 0.05
+       vertex -0.08 -0.016 0.05
+       vertex -0.08 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.008 0.05
+       vertex -0.08666667 -0.008 0.05
+       vertex -0.08666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 -0.008 0.05
+       vertex -0.08 -0.008 0.05
+       vertex -0.08 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0 0.05
+       vertex -0.08666667 0 0.05
+       vertex -0.08666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.04 0.05
+       vertex -0.07333333 -0.04 0.05
+       vertex -0.07333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.032 0.05
+       vertex -0.08 -0.032 0.05
+       vertex -0.08 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.032 0.05
+       vertex -0.07333333 -0.032 0.05
+       vertex -0.07333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.024 0.05
+       vertex -0.08 -0.024 0.05
+       vertex -0.08 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.024 0.05
+       vertex -0.07333333 -0.024 0.05
+       vertex -0.07333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.016 0.05
+       vertex -0.08 -0.016 0.05
+       vertex -0.08 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.016 0.05
+       vertex -0.07333333 -0.016 0.05
+       vertex -0.07333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.008 0.05
+       vertex -0.08 -0.008 0.05
+       vertex -0.08 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 -0.008 0.05
+       vertex -0.07333333 -0.008 0.05
+       vertex -0.07333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0 0.05
+       vertex -0.08 0 0.05
+       vertex -0.08 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.04 0.05
+       vertex -0.06666667 -0.04 0.05
+       vertex -0.06666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.032 0.05
+       vertex -0.07333333 -0.032 0.05
+       vertex -0.07333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.032 0.05
+       vertex -0.06666667 -0.032 0.05
+       vertex -0.06666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.024 0.05
+       vertex -0.07333333 -0.024 0.05
+       vertex -0.07333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.024 0.05
+       vertex -0.06666667 -0.024 0.05
+       vertex -0.06666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.016 0.05
+       vertex -0.07333333 -0.016 0.05
+       vertex -0.07333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.016 0.05
+       vertex -0.06666667 -0.016 0.05
+       vertex -0.06666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.008 0.05
+       vertex -0.07333333 -0.008 0.05
+       vertex -0.07333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 -0.008 0.05
+       vertex -0.06666667 -0.008 0.05
+       vertex -0.06666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0 0.05
+       vertex -0.07333333 0 0.05
+       vertex -0.07333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.04 0.05
+       vertex -0.06 -0.04 0.05
+       vertex -0.06 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.032 0.05
+       vertex -0.06666667 -0.032 0.05
+       vertex -0.06666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.032 0.05
+       vertex -0.06 -0.032 0.05
+       vertex -0.06 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.024 0.05
+       vertex -0.06666667 -0.024 0.05
+       vertex -0.06666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.024 0.05
+       vertex -0.06 -0.024 0.05
+       vertex -0.06 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.016 0.05
+       vertex -0.06666667 -0.016 0.05
+       vertex -0.06666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.016 0.05
+       vertex -0.06 -0.016 0.05
+       vertex -0.06 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.008 0.05
+       vertex -0.06666667 -0.008 0.05
+       vertex -0.06666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 -0.008 0.05
+       vertex -0.06 -0.008 0.05
+       vertex -0.06 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0 0.05
+       vertex -0.06666667 0 0.05
+       vertex -0.06666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.04 0.05
+       vertex -0.05333333 -0.04 0.05
+       vertex -0.05333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.032 0.05
+       vertex -0.06 -0.032 0.05
+       vertex -0.06 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.032 0.05
+       vertex -0.05333333 -0.032 0.05
+       vertex -0.05333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.024 0.05
+       vertex -0.06 -0.024 0.05
+       vertex -0.06 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.024 0.05
+       vertex -0.05333333 -0.024 0.05
+       vertex -0.05333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.016 0.05
+       vertex -0.06 -0.016 0.05
+       vertex -0.06 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.016 0.05
+       vertex -0.05333333 -0.016 0.05
+       vertex -0.05333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.008 0.05
+       vertex -0.06 -0.008 0.05
+       vertex -0.06 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 -0.008 0.05
+       vertex -0.05333333 -0.008 0.05
+       vertex -0.05333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.06 0 0.05
+       vertex -0.06 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.04 0.05
+       vertex -0.04666667 -0.04 0.05
+       vertex -0.04666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.032 0.05
+       vertex -0.05333333 -0.032 0.05
+       vertex -0.05333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.032 0.05
+       vertex -0.04666667 -0.032 0.05
+       vertex -0.04666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.024 0.05
+       vertex -0.05333333 -0.024 0.05
+       vertex -0.05333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.024 0.05
+       vertex -0.04666667 -0.024 0.05
+       vertex -0.04666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.016 0.05
+       vertex -0.05333333 -0.016 0.05
+       vertex -0.05333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.016 0.05
+       vertex -0.04666667 -0.016 0.05
+       vertex -0.04666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.008 0.05
+       vertex -0.05333333 -0.008 0.05
+       vertex -0.05333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 -0.008 0.05
+       vertex -0.04666667 -0.008 0.05
+       vertex -0.04666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0 0.05
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.05333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.04 0.05
+       vertex -0.04 -0.04 0.05
+       vertex -0.04 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.032 0.05
+       vertex -0.04666667 -0.032 0.05
+       vertex -0.04666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.032 0.05
+       vertex -0.04 -0.032 0.05
+       vertex -0.04 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.024 0.05
+       vertex -0.04666667 -0.024 0.05
+       vertex -0.04666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.024 0.05
+       vertex -0.04 -0.024 0.05
+       vertex -0.04 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.016 0.05
+       vertex -0.04666667 -0.016 0.05
+       vertex -0.04666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.016 0.05
+       vertex -0.04 -0.016 0.05
+       vertex -0.04 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.008 0.05
+       vertex -0.04666667 -0.008 0.05
+       vertex -0.04666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 -0.008 0.05
+       vertex -0.04 -0.008 0.05
+       vertex -0.04 5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.04666667 0 0.05
+       vertex -0.04666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.04 0.05
+       vertex -0.03333333 -0.04 0.05
+       vertex -0.03333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.032 0.05
+       vertex -0.04 -0.032 0.05
+       vertex -0.04 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.032 0.05
+       vertex -0.03333333 -0.032 0.05
+       vertex -0.03333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.024 0.05
+       vertex -0.04 -0.024 0.05
+       vertex -0.04 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.024 0.05
+       vertex -0.03333333 -0.024 0.05
+       vertex -0.03333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.016 0.05
+       vertex -0.04 -0.016 0.05
+       vertex -0.04 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.016 0.05
+       vertex -0.03333333 -0.016 0.05
+       vertex -0.03333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.008 0.05
+       vertex -0.04 -0.008 0.05
+       vertex -0.04 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.04 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 -0.008 0.05
+       vertex -0.03333333 -0.008 0.05
+       vertex -0.03333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.04 0.05
+       vertex -0.02666667 -0.04 0.05
+       vertex -0.02666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.032 0.05
+       vertex -0.03333333 -0.032 0.05
+       vertex -0.03333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.032 0.05
+       vertex -0.02666667 -0.032 0.05
+       vertex -0.02666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.024 0.05
+       vertex -0.03333333 -0.024 0.05
+       vertex -0.03333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.024 0.05
+       vertex -0.02666667 -0.024 0.05
+       vertex -0.02666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.016 0.05
+       vertex -0.03333333 -0.016 0.05
+       vertex -0.03333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.016 0.05
+       vertex -0.02666667 -0.016 0.05
+       vertex -0.02666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.008 0.05
+       vertex -0.03333333 -0.008 0.05
+       vertex -0.03333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 -0.008 0.05
+       vertex -0.02666667 -0.008 0.05
+       vertex -0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0 0.05
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.03333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.04 0.05
+       vertex -0.02 -0.04 0.05
+       vertex -0.02 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.032 0.05
+       vertex -0.02666667 -0.032 0.05
+       vertex -0.02666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.032 0.05
+       vertex -0.02 -0.032 0.05
+       vertex -0.02 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.024 0.05
+       vertex -0.02666667 -0.024 0.05
+       vertex -0.02666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.024 0.05
+       vertex -0.02 -0.024 0.05
+       vertex -0.02 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.016 0.05
+       vertex -0.02666667 -0.016 0.05
+       vertex -0.02666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.016 0.05
+       vertex -0.02 -0.016 0.05
+       vertex -0.02 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.008 0.05
+       vertex -0.02666667 -0.008 0.05
+       vertex -0.02666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 -0.008 0.05
+       vertex -0.02 -0.008 0.05
+       vertex -0.02 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0 0.05
+       vertex -0.02666667 0 0.05
+       vertex -0.02666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.04 0.05
+       vertex -0.01333333 -0.04 0.05
+       vertex -0.01333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.032 0.05
+       vertex -0.02 -0.032 0.05
+       vertex -0.02 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.032 0.05
+       vertex -0.01333333 -0.032 0.05
+       vertex -0.01333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.024 0.05
+       vertex -0.02 -0.024 0.05
+       vertex -0.02 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.024 0.05
+       vertex -0.01333333 -0.024 0.05
+       vertex -0.01333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.016 0.05
+       vertex -0.02 -0.016 0.05
+       vertex -0.02 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.016 0.05
+       vertex -0.01333333 -0.016 0.05
+       vertex -0.01333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.008 0.05
+       vertex -0.02 -0.008 0.05
+       vertex -0.02 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 -0.008 0.05
+       vertex -0.01333333 -0.008 0.05
+       vertex -0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0 0.05
+       vertex -0.02 0 0.05
+       vertex -0.02 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.04 0.05
+       vertex -0.006666667 -0.04 0.05
+       vertex -0.006666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.032 0.05
+       vertex -0.01333333 -0.032 0.05
+       vertex -0.01333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.032 0.05
+       vertex -0.006666667 -0.032 0.05
+       vertex -0.006666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.024 0.05
+       vertex -0.01333333 -0.024 0.05
+       vertex -0.01333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.024 0.05
+       vertex -0.006666667 -0.024 0.05
+       vertex -0.006666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.016 0.05
+       vertex -0.01333333 -0.016 0.05
+       vertex -0.01333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.016 0.05
+       vertex -0.006666667 -0.016 0.05
+       vertex -0.006666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.008 0.05
+       vertex -0.01333333 -0.008 0.05
+       vertex -0.01333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.008 0.05
+       vertex -0.006666667 -0.008 0.05
+       vertex -0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0 0.05
+       vertex -0.01333333 0 0.05
+       vertex -0.01333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.04 0.05
+       vertex 0 -0.04 0.05
+       vertex 0 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.032 0.05
+       vertex -0.006666667 -0.032 0.05
+       vertex -0.006666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.032 0.05
+       vertex 0 -0.032 0.05
+       vertex 0 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.024 0.05
+       vertex -0.006666667 -0.024 0.05
+       vertex -0.006666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.024 0.05
+       vertex 0 -0.024 0.05
+       vertex 0 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.016 0.05
+       vertex -0.006666667 -0.016 0.05
+       vertex -0.006666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.016 0.05
+       vertex 0 -0.016 0.05
+       vertex 0 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.008 0.05
+       vertex -0.006666667 -0.008 0.05
+       vertex -0.006666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.008 0.05
+       vertex 0 -0.008 0.05
+       vertex 0 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0 0.05
+       vertex -0.006666667 0 0.05
+       vertex -0.006666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.04 0.05
+       vertex 0.006666667 -0.04 0.05
+       vertex 0.006666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.032 0.05
+       vertex 0 -0.032 0.05
+       vertex 0 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.032 0.05
+       vertex 0.006666667 -0.032 0.05
+       vertex 0.006666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.024 0.05
+       vertex 0 -0.024 0.05
+       vertex 0 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.024 0.05
+       vertex 0.006666667 -0.024 0.05
+       vertex 0.006666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.016 0.05
+       vertex 0 -0.016 0.05
+       vertex 0 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.016 0.05
+       vertex 0.006666667 -0.016 0.05
+       vertex 0.006666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.008 0.05
+       vertex 0 -0.008 0.05
+       vertex 0 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.008 0.05
+       vertex 0.006666667 -0.008 0.05
+       vertex 0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0 0.05
+       vertex 0 0 0.05
+       vertex 0 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.04 0.05
+       vertex 0.01333333 -0.04 0.05
+       vertex 0.01333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.032 0.05
+       vertex 0.006666667 -0.032 0.05
+       vertex 0.006666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.032 0.05
+       vertex 0.01333333 -0.032 0.05
+       vertex 0.01333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.024 0.05
+       vertex 0.006666667 -0.024 0.05
+       vertex 0.006666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.024 0.05
+       vertex 0.01333333 -0.024 0.05
+       vertex 0.01333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.016 0.05
+       vertex 0.006666667 -0.016 0.05
+       vertex 0.006666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.016 0.05
+       vertex 0.01333333 -0.016 0.05
+       vertex 0.01333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.008 0.05
+       vertex 0.006666667 -0.008 0.05
+       vertex 0.006666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.008 0.05
+       vertex 0.01333333 -0.008 0.05
+       vertex 0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0 0.05
+       vertex 0.006666667 0 0.05
+       vertex 0.006666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.04 0.05
+       vertex 0.02 -0.04 0.05
+       vertex 0.02 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.032 0.05
+       vertex 0.01333333 -0.032 0.05
+       vertex 0.01333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.032 0.05
+       vertex 0.02 -0.032 0.05
+       vertex 0.02 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.024 0.05
+       vertex 0.01333333 -0.024 0.05
+       vertex 0.01333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.024 0.05
+       vertex 0.02 -0.024 0.05
+       vertex 0.02 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.016 0.05
+       vertex 0.01333333 -0.016 0.05
+       vertex 0.01333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.016 0.05
+       vertex 0.02 -0.016 0.05
+       vertex 0.02 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.008 0.05
+       vertex 0.01333333 -0.008 0.05
+       vertex 0.01333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.008 0.05
+       vertex 0.02 -0.008 0.05
+       vertex 0.02 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0 0.05
+       vertex 0.01333333 0 0.05
+       vertex 0.01333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.04 0.05
+       vertex 0.02666667 -0.04 0.05
+       vertex 0.02666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.032 0.05
+       vertex 0.02 -0.032 0.05
+       vertex 0.02 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.032 0.05
+       vertex 0.02666667 -0.032 0.05
+       vertex 0.02666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.024 0.05
+       vertex 0.02 -0.024 0.05
+       vertex 0.02 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.024 0.05
+       vertex 0.02666667 -0.024 0.05
+       vertex 0.02666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.016 0.05
+       vertex 0.02 -0.016 0.05
+       vertex 0.02 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.016 0.05
+       vertex 0.02666667 -0.016 0.05
+       vertex 0.02666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.008 0.05
+       vertex 0.02 -0.008 0.05
+       vertex 0.02 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 -0.008 0.05
+       vertex 0.02666667 -0.008 0.05
+       vertex 0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0 0.05
+       vertex 0.02 0 0.05
+       vertex 0.02 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.04 0.05
+       vertex 0.03333333 -0.04 0.05
+       vertex 0.03333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.032 0.05
+       vertex 0.02666667 -0.032 0.05
+       vertex 0.02666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.032 0.05
+       vertex 0.03333333 -0.032 0.05
+       vertex 0.03333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.024 0.05
+       vertex 0.02666667 -0.024 0.05
+       vertex 0.02666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.024 0.05
+       vertex 0.03333333 -0.024 0.05
+       vertex 0.03333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.016 0.05
+       vertex 0.02666667 -0.016 0.05
+       vertex 0.02666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.016 0.05
+       vertex 0.03333333 -0.016 0.05
+       vertex 0.03333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.008 0.05
+       vertex 0.02666667 -0.008 0.05
+       vertex 0.02666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 -0.008 0.05
+       vertex 0.03333333 -0.008 0.05
+       vertex 0.03333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0 0.05
+       vertex 0.02666667 0 0.05
+       vertex 0.02666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.04 0.05
+       vertex 0.04 -0.04 0.05
+       vertex 0.04 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.032 0.05
+       vertex 0.03333333 -0.032 0.05
+       vertex 0.03333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.032 0.05
+       vertex 0.04 -0.032 0.05
+       vertex 0.04 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.024 0.05
+       vertex 0.03333333 -0.024 0.05
+       vertex 0.03333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.024 0.05
+       vertex 0.04 -0.024 0.05
+       vertex 0.04 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.016 0.05
+       vertex 0.03333333 -0.016 0.05
+       vertex 0.03333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.016 0.05
+       vertex 0.04 -0.016 0.05
+       vertex 0.04 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.008 0.05
+       vertex 0.03333333 -0.008 0.05
+       vertex 0.03333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 -0.008 0.05
+       vertex 0.04 -0.008 0.05
+       vertex 0.04 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.03333333 0 0.05
+       vertex 0.03333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.04 0.05
+       vertex 0.04666667 -0.04 0.05
+       vertex 0.04666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.032 0.05
+       vertex 0.04 -0.032 0.05
+       vertex 0.04 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.032 0.05
+       vertex 0.04666667 -0.032 0.05
+       vertex 0.04666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.024 0.05
+       vertex 0.04 -0.024 0.05
+       vertex 0.04 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.024 0.05
+       vertex 0.04666667 -0.024 0.05
+       vertex 0.04666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.016 0.05
+       vertex 0.04 -0.016 0.05
+       vertex 0.04 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.016 0.05
+       vertex 0.04666667 -0.016 0.05
+       vertex 0.04666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.008 0.05
+       vertex 0.04 -0.008 0.05
+       vertex 0.04 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 -0.008 0.05
+       vertex 0.04666667 -0.008 0.05
+       vertex 0.04666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.04 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.04 0.05
+       vertex 0.05333333 -0.04 0.05
+       vertex 0.05333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.032 0.05
+       vertex 0.04666667 -0.032 0.05
+       vertex 0.04666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.032 0.05
+       vertex 0.05333333 -0.032 0.05
+       vertex 0.05333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.024 0.05
+       vertex 0.04666667 -0.024 0.05
+       vertex 0.04666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.024 0.05
+       vertex 0.05333333 -0.024 0.05
+       vertex 0.05333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.016 0.05
+       vertex 0.04666667 -0.016 0.05
+       vertex 0.04666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.016 0.05
+       vertex 0.05333333 -0.016 0.05
+       vertex 0.05333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.008 0.05
+       vertex 0.04666667 -0.008 0.05
+       vertex 0.04666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 -0.008 0.05
+       vertex 0.05333333 -0.008 0.05
+       vertex 0.05333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0 0.05
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.04666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.04 0.05
+       vertex 0.06 -0.04 0.05
+       vertex 0.06 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.032 0.05
+       vertex 0.05333333 -0.032 0.05
+       vertex 0.05333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.032 0.05
+       vertex 0.06 -0.032 0.05
+       vertex 0.06 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.024 0.05
+       vertex 0.05333333 -0.024 0.05
+       vertex 0.05333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.024 0.05
+       vertex 0.06 -0.024 0.05
+       vertex 0.06 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.016 0.05
+       vertex 0.05333333 -0.016 0.05
+       vertex 0.05333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.016 0.05
+       vertex 0.06 -0.016 0.05
+       vertex 0.06 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.008 0.05
+       vertex 0.05333333 -0.008 0.05
+       vertex 0.05333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 -0.008 0.05
+       vertex 0.06 -0.008 0.05
+       vertex 0.06 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.05333333 0 0.05
+       vertex 0.05333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.04 0.05
+       vertex 0.06666667 -0.04 0.05
+       vertex 0.06666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.032 0.05
+       vertex 0.06 -0.032 0.05
+       vertex 0.06 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.032 0.05
+       vertex 0.06666667 -0.032 0.05
+       vertex 0.06666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.024 0.05
+       vertex 0.06 -0.024 0.05
+       vertex 0.06 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.024 0.05
+       vertex 0.06666667 -0.024 0.05
+       vertex 0.06666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.016 0.05
+       vertex 0.06 -0.016 0.05
+       vertex 0.06 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.016 0.05
+       vertex 0.06666667 -0.016 0.05
+       vertex 0.06666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.008 0.05
+       vertex 0.06 -0.008 0.05
+       vertex 0.06 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 -0.008 0.05
+       vertex 0.06666667 -0.008 0.05
+       vertex 0.06666667 -4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.06 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.04 0.05
+       vertex 0.07333333 -0.04 0.05
+       vertex 0.07333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.032 0.05
+       vertex 0.06666667 -0.032 0.05
+       vertex 0.06666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.032 0.05
+       vertex 0.07333333 -0.032 0.05
+       vertex 0.07333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.024 0.05
+       vertex 0.06666667 -0.024 0.05
+       vertex 0.06666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.024 0.05
+       vertex 0.07333333 -0.024 0.05
+       vertex 0.07333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.016 0.05
+       vertex 0.06666667 -0.016 0.05
+       vertex 0.06666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.016 0.05
+       vertex 0.07333333 -0.016 0.05
+       vertex 0.07333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.008 0.05
+       vertex 0.06666667 -0.008 0.05
+       vertex 0.06666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 -0.008 0.05
+       vertex 0.07333333 -0.008 0.05
+       vertex 0.07333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.06666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.04 0.05
+       vertex 0.08 -0.04 0.05
+       vertex 0.08 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.032 0.05
+       vertex 0.07333333 -0.032 0.05
+       vertex 0.07333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.032 0.05
+       vertex 0.08 -0.032 0.05
+       vertex 0.08 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.024 0.05
+       vertex 0.07333333 -0.024 0.05
+       vertex 0.07333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.024 0.05
+       vertex 0.08 -0.024 0.05
+       vertex 0.08 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.016 0.05
+       vertex 0.07333333 -0.016 0.05
+       vertex 0.07333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.016 0.05
+       vertex 0.08 -0.016 0.05
+       vertex 0.08 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.008 0.05
+       vertex 0.07333333 -0.008 0.05
+       vertex 0.07333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 -0.008 0.05
+       vertex 0.08 -0.008 0.05
+       vertex 0.08 4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.07333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.04 0.05
+       vertex 0.08666667 -0.04 0.05
+       vertex 0.08666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.032 0.05
+       vertex 0.08 -0.032 0.05
+       vertex 0.08 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.032 0.05
+       vertex 0.08666667 -0.032 0.05
+       vertex 0.08666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.024 0.05
+       vertex 0.08 -0.024 0.05
+       vertex 0.08 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.024 0.05
+       vertex 0.08666667 -0.024 0.05
+       vertex 0.08666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.016 0.05
+       vertex 0.08 -0.016 0.05
+       vertex 0.08 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.016 0.05
+       vertex 0.08666667 -0.016 0.05
+       vertex 0.08666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.008 0.05
+       vertex 0.08 -0.008 0.05
+       vertex 0.08 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 -0.008 0.05
+       vertex 0.08666667 -0.008 0.05
+       vertex 0.08666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.08 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.04 0.05
+       vertex 0.09333333 -0.04 0.05
+       vertex 0.09333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.032 0.05
+       vertex 0.08666667 -0.032 0.05
+       vertex 0.08666667 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.032 0.05
+       vertex 0.09333333 -0.032 0.05
+       vertex 0.09333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.024 0.05
+       vertex 0.08666667 -0.024 0.05
+       vertex 0.08666667 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.024 0.05
+       vertex 0.09333333 -0.024 0.05
+       vertex 0.09333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.016 0.05
+       vertex 0.08666667 -0.016 0.05
+       vertex 0.08666667 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.016 0.05
+       vertex 0.09333333 -0.016 0.05
+       vertex 0.09333333 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.008 0.05
+       vertex 0.08666667 -0.008 0.05
+       vertex 0.08666667 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 -0.008 0.05
+       vertex 0.09333333 -0.008 0.05
+       vertex 0.09333333 1.445603e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.08666667 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.04 0.05
+       vertex 0.1 -0.04 0.05
+       vertex 0.1 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 -0.032 0.05
+       vertex 0.09333333 -0.032 0.05
+       vertex 0.09333333 -0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.032 0.05
+       vertex 0.1 -0.032 0.05
+       vertex 0.1 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 -0.024 0.05
+       vertex 0.09333333 -0.024 0.05
+       vertex 0.09333333 -0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.024 0.05
+       vertex 0.1 -0.024 0.05
+       vertex 0.1 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 -0.016 0.05
+       vertex 0.09333333 -0.016 0.05
+       vertex 0.09333333 -0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.016 0.05
+       vertex 0.1 -0.016 0.05
+       vertex 0.1 -0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 -0.008 0.05
+       vertex 0.09333333 -0.008 0.05
+       vertex 0.09333333 -0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 -0.008 0.05
+       vertex 0.1 -0.008 0.05
+       vertex 0.1 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 0 0.05
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.09333333 -0.008 0.05
+    endloop
+  endfacet
+endsolid maxZ
+solid bottomAir_to_rightSolid
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex 0.01333333 0 -0.05
+       vertex 0.01333333 0 -0.04
+       vertex 0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 5.782412e-17
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.02 0 -0.05
+       vertex 0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 5.782412e-17
+    outer loop
+       vertex 0.02 0 -0.05
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.04
+       vertex 0.02666667 0 -0.05
+       vertex 0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.05
+       vertex 0.02666667 0 -0.04
+       vertex 0.03333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 -0.04
+       vertex 0.03333333 0 -0.05
+       vertex 0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 -0.05
+       vertex 0.03333333 0 -0.04
+       vertex 0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -2.891206e-17
+    outer loop
+       vertex 0.04 0 -0.04
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.03333333 0 -0.05
+    endloop
+  endfacet
+  facet normal -4.336807e-17 1 -2.891206e-17
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.04 0 -0.04
+       vertex 0.04666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.04 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -0
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.05333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 -0.04
+       vertex 0.05333333 0 -0.05
+       vertex 0.04666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 -0.05
+       vertex 0.05333333 0 -0.04
+       vertex 0.06 -2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.05333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.06 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.08 4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.09333333 1.445603e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.08666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 -0.04
+       vertex 0.1 0 -0.05
+       vertex 0.09333333 1.445603e-19 -0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0 -0.03
+       vertex 0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.02666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.02666667 0 -0.03
+       vertex 0.02666667 0 -0.04
+       vertex 0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.04
+       vertex 0.02666667 0 -0.03
+       vertex 0.03333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 -0.03
+       vertex 0.03333333 0 -0.04
+       vertex 0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 -0.04
+       vertex 0.03333333 0 -0.03
+       vertex 0.04 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 2.891206e-17
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.04 0 -0.04
+       vertex 0.03333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 2.891206e-17
+    outer loop
+       vertex 0.04 0 -0.04
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.04666667 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 1 5.782412e-17
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 5.782412e-17
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.05333333 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -2.891206e-17
+    outer loop
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.05333333 0 -0.04
+       vertex 0.04666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -2.891206e-17
+    outer loop
+       vertex 0.05333333 0 -0.04
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.05333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.06 -2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.09333333 1.445603e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 -0.03
+       vertex 0.1 0 -0.04
+       vertex 0.09333333 1.445603e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0 -0.02
+       vertex 0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -5.782412e-17
+    outer loop
+       vertex 0.02 0 -0.02
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.02 0 -0.02
+       vertex 0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.02666667 0 -0.02
+       vertex 0.02666667 0 -0.03
+       vertex 0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.03
+       vertex 0.02666667 0 -0.02
+       vertex 0.03333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 -0.02
+       vertex 0.03333333 0 -0.03
+       vertex 0.02666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 -0.03
+       vertex 0.03333333 0 -0.02
+       vertex 0.04 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.03333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.04666667 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.04 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -4.336813e-17 1 0
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.05333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 2.891206e-17
+    outer loop
+       vertex 0.05333333 0 -0.02
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.04666667 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 2.891206e-17
+    outer loop
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.05333333 0 -0.02
+       vertex 0.06 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.05333333 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.09333333 1.445603e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 -0.02
+       vertex 0.1 0 -0.03
+       vertex 0.09333333 1.445603e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0 -0.01
+       vertex 0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 -0.01
+       vertex 0.02 0 -0.02
+       vertex 0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 -0.02
+       vertex 0.02 0 -0.01
+       vertex 0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.01
+       vertex 0.02666667 0 -0.02
+       vertex 0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.02
+       vertex 0.02666667 0 -0.01
+       vertex 0.03333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 -0.01
+       vertex 0.03333333 0 -0.02
+       vertex 0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 -0.02
+       vertex 0.03333333 0 -0.01
+       vertex 0.04 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.03333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.04666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.04 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -5.782412e-17
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.05333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 -0.01
+       vertex 0.05333333 0 -0.02
+       vertex 0.04666667 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 -0.02
+       vertex 0.05333333 0 -0.01
+       vertex 0.06 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.05333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.06 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.08 4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.09333333 1.445603e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 -0.01
+       vertex 0.1 0 -0.02
+       vertex 0.09333333 1.445603e-19 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0 0
+       vertex 0.02 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0
+       vertex 0.02 0 -0.01
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 -0.01
+       vertex 0.02 0 0
+       vertex 0.02666667 0 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.02666667 0 -0.01
+       vertex 0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 -0.01
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.03333333 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 0
+       vertex 0.03333333 0 -0.01
+       vertex 0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 -0.01
+       vertex 0.03333333 0 0
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.03333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.04666667 2.891206e-19 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.04 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -0
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.05333333 0 -2.891206e-19
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.05333333 0 -0.01
+       vertex 0.04666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 -0.01
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.06 -2.891206e-19 5.782412e-19
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.05333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.06666667 -4.336809e-19 0
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.06 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.08 4.336809e-19 2.891206e-19
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.08 4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.1 0 0
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 0
+       vertex 0.1 0 -0.01
+       vertex 0.09333333 1.445603e-19 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0 0.01
+       vertex 0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.01
+       vertex 0.02 0 0
+       vertex 0.01333333 0 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.02 0 0.01
+       vertex 0.02666667 0 0.01
+       vertex 0.02666667 0 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.02 0 0
+       vertex 0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.02666667 0 0.01
+       vertex 0.03333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 0.01
+       vertex 0.03333333 0 0
+       vertex 0.02666667 0 5.782412e-19
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 0
+       vertex 0.03333333 0 0.01
+       vertex 0.04 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.03333333 0 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.04666667 2.891206e-19 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.04 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.05333333 0 0.01
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 0.01
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.04666667 2.891206e-19 0
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.05333333 0 0.01
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.06 -2.891206e-19 5.782412e-19
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.05333333 0 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.06666667 -4.336809e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.06 -2.891206e-19 5.782412e-19
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.07333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.06666667 -4.336809e-19 0
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.08 4.336809e-19 2.891206e-19
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.07333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.08666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.08 4.336809e-19 2.891206e-19
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.08666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.1 0 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 0.01
+       vertex 0.1 0 0
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0 0.02
+       vertex 0.02 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.02
+       vertex 0.02 0 0.01
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.01
+       vertex 0.02 0 0.02
+       vertex 0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.02
+       vertex 0.02666667 0 0.01
+       vertex 0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.01
+       vertex 0.02666667 0 0.02
+       vertex 0.03333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 0.02
+       vertex 0.03333333 0 0.01
+       vertex 0.02666667 0 0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 0.01
+       vertex 0.03333333 0 0.02
+       vertex 0.04 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.03333333 0 0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.04666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.04 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.05333333 0 0.02
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 0.02
+       vertex 0.05333333 0 0.01
+       vertex 0.04666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 0.01
+       vertex 0.05333333 0 0.02
+       vertex 0.06 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.05333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.06666667 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -1.445603e-17
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.06 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -1.445603e-17
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.06666667 -4.336809e-19 0.01
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.08 4.336809e-19 0.02
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.07333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.08 4.336809e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.09333333 1.445603e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.08666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.1 0 0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 0.02
+       vertex 0.1 0 0.01
+       vertex 0.09333333 1.445603e-19 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0 0.03
+       vertex 0.02 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.03
+       vertex 0.02 0 0.02
+       vertex 0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.02
+       vertex 0.02 0 0.03
+       vertex 0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.03
+       vertex 0.02666667 0 0.02
+       vertex 0.02 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.02
+       vertex 0.02666667 0 0.03
+       vertex 0.03333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 0.03
+       vertex 0.03333333 0 0.02
+       vertex 0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 0.02
+       vertex 0.03333333 0 0.03
+       vertex 0.04 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.03333333 0 0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.04666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.04 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.05333333 0 0.03
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 0.03
+       vertex 0.05333333 0 0.02
+       vertex 0.04666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 0.02
+       vertex 0.05333333 0 0.03
+       vertex 0.06 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.05333333 0 0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.06666667 -4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal 0 1 1.445603e-17
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.06 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 1.445603e-17
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.06666667 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.08 4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.08 4.336809e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.09333333 1.445603e-19 0.03
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.1 0 0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 0.03
+       vertex 0.1 0 0.02
+       vertex 0.09333333 1.445603e-19 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0 0.04
+       vertex 0.02 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.04
+       vertex 0.02 0 0.03
+       vertex 0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.03
+       vertex 0.02 0 0.04
+       vertex 0.02666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.04
+       vertex 0.02666667 0 0.03
+       vertex 0.02 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.03
+       vertex 0.02666667 0 0.04
+       vertex 0.03333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 0.04
+       vertex 0.03333333 0 0.03
+       vertex 0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 0.03
+       vertex 0.03333333 0 0.04
+       vertex 0.04 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.03333333 0 0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.04666667 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 8.673618e-17
+    outer loop
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.04 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 8.673618e-17
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.05333333 0 0.04
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.05333333 0 0.04
+       vertex 0.05333333 0 0.03
+       vertex 0.04666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 0.03
+       vertex 0.05333333 0 0.04
+       vertex 0.06 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.05333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.06666667 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -1.445603e-17
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.06 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -1.445603e-17
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.06666667 -4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.08 4.336809e-19 0.04
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.08 4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.09333333 1.445603e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.1 0 0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 0.04
+       vertex 0.1 0 0.03
+       vertex 0.09333333 1.445603e-19 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0 0.05
+       vertex 0.02 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.05
+       vertex 0.02 0 0.04
+       vertex 0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0 0.04
+       vertex 0.02 0 0.05
+       vertex 0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.05
+       vertex 0.02666667 0 0.04
+       vertex 0.02 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0 0.04
+       vertex 0.02666667 0 0.05
+       vertex 0.03333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0 0.05
+       vertex 0.03333333 0 0.04
+       vertex 0.02666667 0 0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.03333333 0 0.04
+       vertex 0.03333333 0 0.05
+       vertex 0.04 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.03333333 0 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.04666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -8.673618e-17
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.04 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 -8.673618e-17
+    outer loop
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.05333333 0 0.05
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex 0.05333333 0 0.05
+       vertex 0.05333333 0 0.04
+       vertex 0.04666667 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 -0
+    outer loop
+       vertex 0.05333333 0 0.04
+       vertex 0.05333333 0 0.05
+       vertex 0.06 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 4.336807e-17 1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.05333333 0 0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.06666667 -4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 1 1.445603e-17
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.06 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 1.445603e-17
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.07333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 4.336813e-17 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.06666667 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.08 4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal -1.517882e-16 1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.08666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.08 4.336809e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.09333333 1.445603e-19 0.05
+    endloop
+  endfacet
+  facet normal 2.168407e-17 1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 -0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.1 0 0.05
+    endloop
+  endfacet
+  facet normal 2.168403e-17 1 0
+    outer loop
+       vertex 0.1 0 0.05
+       vertex 0.1 0 0.04
+       vertex 0.09333333 1.445603e-19 0.04
+    endloop
+  endfacet
+endsolid bottomAir_to_rightSolid
+solid bottomAir_to_leftSolid
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 -0.05
+       vertex -0.1 0 -0.04
+       vertex -0.09333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.04
+       vertex -0.09333333 0 -0.05
+       vertex -0.1 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.05
+       vertex -0.09333333 0 -0.04
+       vertex -0.08666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.04
+       vertex -0.08666667 0 -0.05
+       vertex -0.09333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.05
+       vertex -0.08666667 0 -0.04
+       vertex -0.08 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 -0.04
+       vertex -0.08 0 -0.05
+       vertex -0.08666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 -0.05
+       vertex -0.08 0 -0.04
+       vertex -0.07333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.04
+       vertex -0.07333333 0 -0.05
+       vertex -0.08 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.05
+       vertex -0.07333333 0 -0.04
+       vertex -0.06666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.04
+       vertex -0.06666667 0 -0.05
+       vertex -0.07333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.05
+       vertex -0.06666667 0 -0.04
+       vertex -0.06 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 -0.04
+       vertex -0.06 0 -0.05
+       vertex -0.06666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 -0.05
+       vertex -0.06 0 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.06 0 -0.05
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.04666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.04
+       vertex -0.04666667 0 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0 -0.05
+       vertex -0.04666667 0 -0.04
+       vertex -0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 5.782412e-17
+    outer loop
+       vertex -0.04 0 -0.04
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.04666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 5.782412e-17
+    outer loop
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.04 0 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.04 5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.02666667 0 -0.04
+       vertex -0.02666667 0 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.02666667 0 -0.05
+       vertex -0.02666667 0 -0.04
+       vertex -0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 5.782412e-17
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.02 0 -0.05
+       vertex -0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 5.782412e-17
+    outer loop
+       vertex -0.02 0 -0.05
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0 -0.05
+       vertex -0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 -0.04
+       vertex -0.1 0 -0.03
+       vertex -0.09333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.03
+       vertex -0.09333333 0 -0.04
+       vertex -0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.04
+       vertex -0.09333333 0 -0.03
+       vertex -0.08666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.03
+       vertex -0.08666667 0 -0.04
+       vertex -0.09333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -1.734722e-16 1 0
+    outer loop
+       vertex -0.08666667 0 -0.04
+       vertex -0.08666667 0 -0.03
+       vertex -0.08 1.156482e-18 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 -1.156482e-16
+    outer loop
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.08 0 -0.04
+       vertex -0.08666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 1.734722e-16 1 -1.156482e-16
+    outer loop
+       vertex -0.08 0 -0.04
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.07333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.03
+       vertex -0.07333333 0 -0.04
+       vertex -0.08 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.04
+       vertex -0.07333333 0 -0.03
+       vertex -0.06666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.03
+       vertex -0.06666667 0 -0.04
+       vertex -0.07333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.04
+       vertex -0.06666667 0 -0.03
+       vertex -0.06 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 -0.03
+       vertex -0.06 0 -0.04
+       vertex -0.06666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 -0.04
+       vertex -0.06 0 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.06 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.04666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.03
+       vertex -0.04666667 0 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.04
+       vertex -0.04666667 0 -0.03
+       vertex -0.04 5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.04 0 -0.04
+       vertex -0.04666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -5.782412e-17
+    outer loop
+       vertex -0.04 0 -0.04
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.02666667 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 5.782412e-17
+    outer loop
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.02666667 0 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 5.782412e-17
+    outer loop
+       vertex -0.02666667 0 -0.04
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0 -0.04
+       vertex -0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 -0.03
+       vertex -0.1 0 -0.02
+       vertex -0.09333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.02
+       vertex -0.09333333 0 -0.03
+       vertex -0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.03
+       vertex -0.09333333 0 -0.02
+       vertex -0.08666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.02
+       vertex -0.08666667 0 -0.03
+       vertex -0.09333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.03
+       vertex -0.08666667 0 -0.02
+       vertex -0.08 0 -0.02
+    endloop
+  endfacet
+  facet normal -1.734722e-16 1 1.156482e-16
+    outer loop
+       vertex -0.08 0 -0.02
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.08666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 1.156482e-16
+    outer loop
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.08 0 -0.02
+       vertex -0.07333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 1.734722e-16 1 0
+    outer loop
+       vertex -0.07333333 0 -0.02
+       vertex -0.07333333 0 -0.03
+       vertex -0.08 1.156482e-18 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.03
+       vertex -0.07333333 0 -0.02
+       vertex -0.06666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.02
+       vertex -0.06666667 0 -0.03
+       vertex -0.07333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.03
+       vertex -0.06666667 0 -0.02
+       vertex -0.06 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 -0.02
+       vertex -0.06 0 -0.03
+       vertex -0.06666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 -0.03
+       vertex -0.06 0 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.06 0 -0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.04666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.02
+       vertex -0.04666667 0 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.03
+       vertex -0.04666667 0 -0.02
+       vertex -0.04 5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.04666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.04 5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex -0.02666667 0 -0.02
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.02666667 0 -0.02
+       vertex -0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex -0.02 0 -0.02
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.02666667 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 -5.782412e-17
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.02 0 -0.02
+       vertex -0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0 -0.03
+       vertex -0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 -0.02
+       vertex -0.1 0 -0.01
+       vertex -0.09333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.01
+       vertex -0.09333333 0 -0.02
+       vertex -0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.02
+       vertex -0.09333333 0 -0.01
+       vertex -0.08666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.01
+       vertex -0.08666667 0 -0.02
+       vertex -0.09333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 -0.02
+       vertex -0.08666667 0 -0.01
+       vertex -0.08 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 -0.01
+       vertex -0.08 0 -0.02
+       vertex -0.08666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 -0.02
+       vertex -0.08 0 -0.01
+       vertex -0.07333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.01
+       vertex -0.07333333 0 -0.02
+       vertex -0.08 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.02
+       vertex -0.07333333 0 -0.01
+       vertex -0.06666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.01
+       vertex -0.06666667 0 -0.02
+       vertex -0.07333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.02
+       vertex -0.06666667 0 -0.01
+       vertex -0.06 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 -0.01
+       vertex -0.06 0 -0.02
+       vertex -0.06666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 -0.02
+       vertex -0.06 0 -0.01
+       vertex -0.05333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.06 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.04666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.01
+       vertex -0.04666667 0 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.02
+       vertex -0.04666667 0 -0.01
+       vertex -0.04 5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.04666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.03333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.04 5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.02666667 0 -0.01
+       vertex -0.02666667 0 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0 -0.02
+       vertex -0.02666667 0 -0.01
+       vertex -0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 -0.01
+       vertex -0.02 0 -0.02
+       vertex -0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 -0.02
+       vertex -0.02 0 -0.01
+       vertex -0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0 -0.02
+       vertex -0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 -0.01
+       vertex -0.1 0 0
+       vertex -0.09333333 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0
+       vertex -0.09333333 0 -0.01
+       vertex -0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 -0.01
+       vertex -0.09333333 0 0
+       vertex -0.08666667 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0
+       vertex -0.08666667 0 -0.01
+       vertex -0.09333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.08666667 0 0
+       vertex -0.08 0 1.156482e-18
+       vertex -0.08 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 -0.01
+       vertex -0.08666667 0 -0.01
+       vertex -0.08666667 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0
+       vertex -0.07333333 0 -0.01
+       vertex -0.08 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 -0.01
+       vertex -0.08 0 1.156482e-18
+       vertex -0.07333333 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 -0.01
+       vertex -0.07333333 0 0
+       vertex -0.06666667 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0
+       vertex -0.06666667 0 -0.01
+       vertex -0.07333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 -0.01
+       vertex -0.06666667 0 0
+       vertex -0.06 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 0
+       vertex -0.06 0 -0.01
+       vertex -0.06666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 -0.01
+       vertex -0.06 0 0
+       vertex -0.05333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.06 0 -0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.04666667 0 0
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0
+       vertex -0.04666667 0 -0.01
+       vertex -0.05333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 -0.01
+       vertex -0.04666667 0 0
+       vertex -0.04 5.782412e-19 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.04666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.04 5.782412e-19 0
+       vertex -0.03333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.04 5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.02666667 0 0
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.02666667 0 0
+       vertex -0.02666667 0 -0.01
+       vertex -0.03333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0 -0.01
+       vertex -0.02666667 0 0
+       vertex -0.02 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0
+       vertex -0.02 0 -0.01
+       vertex -0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 -0.01
+       vertex -0.02 0 0
+       vertex -0.01333333 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0 -0.01
+       vertex -0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 0
+       vertex -0.1 0 0.01
+       vertex -0.09333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.01
+       vertex -0.09333333 0 0
+       vertex -0.1 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0
+       vertex -0.09333333 0 0.01
+       vertex -0.08666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.01
+       vertex -0.08666667 0 0
+       vertex -0.09333333 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 1.156482e-18
+       vertex -0.08666667 0 0
+       vertex -0.08666667 0 0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.08666667 0 0.01
+       vertex -0.08 0 0.01
+       vertex -0.08 0 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 1.156482e-18
+       vertex -0.08 0 0.01
+       vertex -0.07333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.01
+       vertex -0.07333333 0 0
+       vertex -0.08 0 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0
+       vertex -0.07333333 0 0.01
+       vertex -0.06666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.01
+       vertex -0.06666667 0 0
+       vertex -0.07333333 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0
+       vertex -0.06666667 0 0.01
+       vertex -0.06 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 0.01
+       vertex -0.06 0 0
+       vertex -0.06666667 0 0
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 0
+       vertex -0.06 0 0.01
+       vertex -0.05333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.06 0 0
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.04666667 0 0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.01
+       vertex -0.04666667 0 0
+       vertex -0.05333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0
+       vertex -0.04666667 0 0.01
+       vertex -0.04 5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.04 5.782412e-19 0
+       vertex -0.04666667 0 0
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 0
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.03333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.04 5.782412e-19 0
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.02666667 0 0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.02666667 0 0.01
+       vertex -0.02666667 0 0
+       vertex -0.03333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0 0
+       vertex -0.02666667 0 0.01
+       vertex -0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.01
+       vertex -0.02 0 0
+       vertex -0.02666667 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0
+       vertex -0.02 0 0.01
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0 0
+       vertex -0.02 0 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 0.01
+       vertex -0.1 0 0.02
+       vertex -0.09333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.02
+       vertex -0.09333333 0 0.01
+       vertex -0.1 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.01
+       vertex -0.09333333 0 0.02
+       vertex -0.08666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.02
+       vertex -0.08666667 0 0.01
+       vertex -0.09333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.01
+       vertex -0.08666667 0 0.02
+       vertex -0.08 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.02
+       vertex -0.08 0 0.01
+       vertex -0.08666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.01
+       vertex -0.08 0 0.02
+       vertex -0.07333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.02
+       vertex -0.07333333 0 0.01
+       vertex -0.08 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.01
+       vertex -0.07333333 0 0.02
+       vertex -0.06666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.02
+       vertex -0.06666667 0 0.01
+       vertex -0.07333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.01
+       vertex -0.06666667 0 0.02
+       vertex -0.06 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 0.02
+       vertex -0.06 0 0.01
+       vertex -0.06666667 0 0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 0.01
+       vertex -0.06 0 0.02
+       vertex -0.05333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.06 0 0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.04666667 0 0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.02
+       vertex -0.04666667 0 0.01
+       vertex -0.05333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.01
+       vertex -0.04666667 0 0.02
+       vertex -0.04 5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.04666667 0 0.01
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.03333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.04 5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.02666667 0 0.02
+       vertex -0.02666667 0 0.01
+       vertex -0.03333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0 0.01
+       vertex -0.02666667 0 0.02
+       vertex -0.02 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.02
+       vertex -0.02 0 0.01
+       vertex -0.02666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.01
+       vertex -0.02 0 0.02
+       vertex -0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0 0.01
+       vertex -0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 0.02
+       vertex -0.1 0 0.03
+       vertex -0.09333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.03
+       vertex -0.09333333 0 0.02
+       vertex -0.1 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.02
+       vertex -0.09333333 0 0.03
+       vertex -0.08666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.03
+       vertex -0.08666667 0 0.02
+       vertex -0.09333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.02
+       vertex -0.08666667 0 0.03
+       vertex -0.08 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.03
+       vertex -0.08 0 0.02
+       vertex -0.08666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.02
+       vertex -0.08 0 0.03
+       vertex -0.07333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.03
+       vertex -0.07333333 0 0.02
+       vertex -0.08 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.02
+       vertex -0.07333333 0 0.03
+       vertex -0.06666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.03
+       vertex -0.06666667 0 0.02
+       vertex -0.07333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.02
+       vertex -0.06666667 0 0.03
+       vertex -0.06 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 0.03
+       vertex -0.06 0 0.02
+       vertex -0.06666667 0 0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 0.02
+       vertex -0.06 0 0.03
+       vertex -0.05333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.06 0 0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.04666667 0 0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.03
+       vertex -0.04666667 0 0.02
+       vertex -0.05333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.02
+       vertex -0.04666667 0 0.03
+       vertex -0.04 5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.04666667 0 0.02
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.03333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.04 5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.02666667 0 0.03
+       vertex -0.02666667 0 0.02
+       vertex -0.03333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0 0.02
+       vertex -0.02666667 0 0.03
+       vertex -0.02 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.03
+       vertex -0.02 0 0.02
+       vertex -0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.02
+       vertex -0.02 0 0.03
+       vertex -0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0 0.02
+       vertex -0.02 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 0.03
+       vertex -0.1 0 0.04
+       vertex -0.09333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.04
+       vertex -0.09333333 0 0.03
+       vertex -0.1 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.03
+       vertex -0.09333333 0 0.04
+       vertex -0.08666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.04
+       vertex -0.08666667 0 0.03
+       vertex -0.09333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.03
+       vertex -0.08666667 0 0.04
+       vertex -0.08 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.04
+       vertex -0.08 0 0.03
+       vertex -0.08666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.03
+       vertex -0.08 0 0.04
+       vertex -0.07333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.04
+       vertex -0.07333333 0 0.03
+       vertex -0.08 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.03
+       vertex -0.07333333 0 0.04
+       vertex -0.06666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.04
+       vertex -0.06666667 0 0.03
+       vertex -0.07333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.03
+       vertex -0.06666667 0 0.04
+       vertex -0.06 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 0.04
+       vertex -0.06 0 0.03
+       vertex -0.06666667 0 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 0.03
+       vertex -0.06 0 0.04
+       vertex -0.05333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.06 0 0.03
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.04666667 0 0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.04
+       vertex -0.04666667 0 0.03
+       vertex -0.05333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.03
+       vertex -0.04666667 0 0.04
+       vertex -0.04 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.04666667 0 0.03
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.04 5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -1.734725e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.02666667 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 -5.782412e-17
+    outer loop
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.02666667 0 0.03
+       vertex -0.03333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -5.782412e-17
+    outer loop
+       vertex -0.02666667 0 0.03
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.02 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.04
+       vertex -0.02 0 0.03
+       vertex -0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.03
+       vertex -0.02 0 0.04
+       vertex -0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0 0.03
+       vertex -0.02 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0 0.04
+       vertex -0.1 0 0.05
+       vertex -0.09333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.05
+       vertex -0.09333333 0 0.04
+       vertex -0.1 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0 0.04
+       vertex -0.09333333 0 0.05
+       vertex -0.08666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.05
+       vertex -0.08666667 0 0.04
+       vertex -0.09333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0 0.04
+       vertex -0.08666667 0 0.05
+       vertex -0.08 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.05
+       vertex -0.08 0 0.04
+       vertex -0.08666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0 0.04
+       vertex -0.08 0 0.05
+       vertex -0.07333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.05
+       vertex -0.07333333 0 0.04
+       vertex -0.08 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0 0.04
+       vertex -0.07333333 0 0.05
+       vertex -0.06666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.05
+       vertex -0.06666667 0 0.04
+       vertex -0.07333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0 0.04
+       vertex -0.06666667 0 0.05
+       vertex -0.06 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0 0.05
+       vertex -0.06 0 0.04
+       vertex -0.06666667 0 0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 -0
+    outer loop
+       vertex -0.06 0 0.04
+       vertex -0.06 0 0.05
+       vertex -0.05333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.06 0 0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.04666667 0 0.05
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.05
+       vertex -0.04666667 0 0.04
+       vertex -0.05333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04666667 0 0.04
+       vertex -0.04666667 0 0.05
+       vertex -0.04 5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal -8.673614e-17 1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.04666667 0 0.04
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 -0
+    outer loop
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.03333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 1.734723e-16 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.04 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673627e-17 1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal -1.734725e-16 1 5.782412e-17
+    outer loop
+       vertex -0.02666667 0 0.05
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 0 1 5.782412e-17
+    outer loop
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.02666667 0 0.05
+       vertex -0.02 0 0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 1 0
+    outer loop
+       vertex -0.02 0 0.05
+       vertex -0.02 0 0.04
+       vertex -0.02666667 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0 0.04
+       vertex -0.02 0 0.05
+       vertex -0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.05
+       vertex -0.01333333 0 0.04
+       vertex -0.02 0 0.04
+    endloop
+  endfacet
+endsolid bottomAir_to_leftSolid
+solid bottomAir_to_heater
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 -0.05
+       vertex -0.01333333 0 -0.04
+       vertex -0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.04
+       vertex -0.006666667 0 -0.05
+       vertex -0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.05
+       vertex -0.006666667 0 -0.04
+       vertex 0 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.04
+       vertex 0 0 -0.05
+       vertex -0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.05
+       vertex 0 0 -0.04
+       vertex 0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.04
+       vertex 0.006666667 0 -0.05
+       vertex 0 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.05
+       vertex 0.006666667 0 -0.04
+       vertex 0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0 -0.05
+       vertex 0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0 -0.03
+       vertex -0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.03
+       vertex -0.006666667 0 -0.04
+       vertex -0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.04
+       vertex -0.006666667 0 -0.03
+       vertex 0 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.03
+       vertex 0 0 -0.04
+       vertex -0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.04
+       vertex 0 0 -0.03
+       vertex 0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.03
+       vertex 0.006666667 0 -0.04
+       vertex 0 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.04
+       vertex 0.006666667 0 -0.03
+       vertex 0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0 -0.04
+       vertex 0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0 -0.02
+       vertex -0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.02
+       vertex -0.006666667 0 -0.03
+       vertex -0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.03
+       vertex -0.006666667 0 -0.02
+       vertex 0 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.02
+       vertex 0 0 -0.03
+       vertex -0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.03
+       vertex 0 0 -0.02
+       vertex 0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.02
+       vertex 0.006666667 0 -0.03
+       vertex 0 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.03
+       vertex 0.006666667 0 -0.02
+       vertex 0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0 -0.03
+       vertex 0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.006666667 -0.04 -0.01
+       vertex -0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.032 -0.01
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.04 -0.01
+       vertex 0 -0.04 -0.01
+       vertex 0 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.032 -0.01
+       vertex -0.006666667 -0.032 -0.01
+       vertex -0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.04 -0.01
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0 -0.032 -0.01
+       vertex 0 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.006666667 -0.032 -0.01
+       vertex -0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.024 -0.01
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.032 -0.01
+       vertex 0 -0.032 -0.01
+       vertex 0 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.024 -0.01
+       vertex -0.006666667 -0.024 -0.01
+       vertex -0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.032 -0.01
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0 -0.024 -0.01
+       vertex 0 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.006666667 -0.024 -0.01
+       vertex -0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.016 -0.01
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.024 -0.01
+       vertex 0 -0.024 -0.01
+       vertex 0 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.016 -0.01
+       vertex -0.006666667 -0.016 -0.01
+       vertex -0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.024 -0.01
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0 -0.016 -0.01
+       vertex 0 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.006666667 -0.016 -0.01
+       vertex -0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.008 -0.01
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.016 -0.01
+       vertex 0 -0.016 -0.01
+       vertex 0 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.008 -0.01
+       vertex -0.006666667 -0.008 -0.01
+       vertex -0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.016 -0.01
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0 -0.008 -0.01
+       vertex 0 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0 -0.01
+       vertex -0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.01
+       vertex -0.006666667 0 -0.02
+       vertex -0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.006666667 -0.008 -0.01
+       vertex -0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0 -0.01
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 -0.02
+       vertex -0.006666667 0 -0.01
+       vertex 0 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.01
+       vertex 0 0 -0.02
+       vertex -0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.008 -0.01
+       vertex 0 -0.008 -0.01
+       vertex 0 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0 -0.01
+       vertex -0.006666667 0 -0.01
+       vertex -0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 -0.02
+       vertex 0 0 -0.01
+       vertex 0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.01
+       vertex 0.006666667 0 -0.02
+       vertex 0 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.008 -0.01
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0 -0.01
+       vertex 0 0 -0.01
+       vertex 0 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 -0.02
+       vertex 0.006666667 0 -0.01
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0 -0.02
+       vertex 0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.006666667 0 -0.01
+       vertex 0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.04 0
+       vertex -0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.01333333 -0.04 0
+       vertex 0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.01333333 -0.016 -1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.016 -1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 0 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.01333333 -0.04 0
+       vertex -0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.032 0.01
+       vertex -0.006666667 -0.04 0.01
+       vertex -0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.04 0.01
+       vertex -0.006666667 -0.032 0.01
+       vertex 0 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.032 0.01
+       vertex 0 -0.04 0.01
+       vertex -0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.04 0.01
+       vertex 0 -0.032 0.01
+       vertex 0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.032 0.01
+       vertex 0.006666667 -0.04 0.01
+       vertex 0 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.04 0
+       vertex 0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.04 0.01
+       vertex 0.006666667 -0.032 0.01
+       vertex 0.01333333 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.024 0.01
+       vertex -0.006666667 -0.032 0.01
+       vertex -0.01333333 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.032 0.01
+       vertex -0.006666667 -0.024 0.01
+       vertex 0 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.024 0.01
+       vertex 0 -0.032 0.01
+       vertex -0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.032 0.01
+       vertex 0 -0.024 0.01
+       vertex 0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.024 0.01
+       vertex 0.006666667 -0.032 0.01
+       vertex 0 -0.032 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.032 0.01
+       vertex 0.006666667 -0.024 0.01
+       vertex 0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.016 0.01
+       vertex -0.006666667 -0.024 0.01
+       vertex -0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.024 0.01
+       vertex -0.006666667 -0.016 0.01
+       vertex 0 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.016 0.01
+       vertex 0 -0.024 0.01
+       vertex -0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.024 0.01
+       vertex 0 -0.016 0.01
+       vertex 0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.016 0.01
+       vertex 0.006666667 -0.024 0.01
+       vertex 0 -0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.024 0.01
+       vertex 0.006666667 -0.016 0.01
+       vertex 0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.008 0.01
+       vertex -0.006666667 -0.016 0.01
+       vertex -0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.016 0.01
+       vertex -0.006666667 -0.008 0.01
+       vertex 0 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.008 0.01
+       vertex 0 -0.016 0.01
+       vertex -0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.016 0.01
+       vertex 0 -0.008 0.01
+       vertex 0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.008 0.01
+       vertex 0.006666667 -0.016 0.01
+       vertex 0 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.016 0.01
+       vertex 0.006666667 -0.008 0.01
+       vertex 0.01333333 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.01333333 0 0.01
+       vertex -0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0 0.01
+       vertex -0.006666667 -0.008 0.01
+       vertex -0.01333333 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.008 0.01
+       vertex -0.006666667 0 0.01
+       vertex 0 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0 0.01
+       vertex 0 -0.008 0.01
+       vertex -0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.008 0.01
+       vertex 0 0 0.01
+       vertex 0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0 0.01
+       vertex 0.006666667 -0.008 0.01
+       vertex 0 -0.008 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0 0
+       vertex 0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.008 0.01
+       vertex 0.006666667 0 0.01
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0 0.02
+       vertex -0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.02
+       vertex -0.006666667 0 0.01
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.01
+       vertex -0.006666667 0 0.02
+       vertex 0 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.02
+       vertex 0 0 0.01
+       vertex -0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.01
+       vertex 0 0 0.02
+       vertex 0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.02
+       vertex 0.006666667 0 0.01
+       vertex 0 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.01
+       vertex 0.006666667 0 0.02
+       vertex 0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0 0.01
+       vertex 0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0 0.03
+       vertex -0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.03
+       vertex -0.006666667 0 0.02
+       vertex -0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.02
+       vertex -0.006666667 0 0.03
+       vertex 0 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.03
+       vertex 0 0 0.02
+       vertex -0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.02
+       vertex 0 0 0.03
+       vertex 0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.03
+       vertex 0.006666667 0 0.02
+       vertex 0 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.02
+       vertex 0.006666667 0 0.03
+       vertex 0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0 0.02
+       vertex 0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0 0.04
+       vertex -0.006666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.04
+       vertex -0.006666667 0 0.03
+       vertex -0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.03
+       vertex -0.006666667 0 0.04
+       vertex 0 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.04
+       vertex 0 0 0.03
+       vertex -0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.03
+       vertex 0 0 0.04
+       vertex 0.006666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.04
+       vertex 0.006666667 0 0.03
+       vertex 0 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.03
+       vertex 0.006666667 0 0.04
+       vertex 0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0 0.03
+       vertex 0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0 0.05
+       vertex -0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.05
+       vertex -0.006666667 0 0.04
+       vertex -0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0 0.04
+       vertex -0.006666667 0 0.05
+       vertex 0 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.05
+       vertex 0 0 0.04
+       vertex -0.006666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0 0.04
+       vertex 0 0 0.05
+       vertex 0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.05
+       vertex 0.006666667 0 0.04
+       vertex 0 0 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0 0.04
+       vertex 0.006666667 0 0.05
+       vertex 0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0 0.05
+       vertex 0.01333333 0 0.04
+       vertex 0.006666667 0 0.04
+    endloop
+  endfacet
+endsolid bottomAir_to_heater
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/heater.stl b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/heater.stl
new file mode 100644
index 0000000000..a9b98f11f2
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/heater.stl
@@ -0,0 +1,2366 @@
+solid minY
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.006666667 -0.04 -0.01
+       vertex -0.006666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0
+       vertex -0.01333333 -0.04 0
+       vertex -0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 -0.04 0
+       vertex -0.006666667 -0.04 0
+       vertex -0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0.01
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.01333333 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 -0.01
+       vertex 0 -0.04 -0.01
+       vertex 0 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 0
+       vertex -0.006666667 -0.04 0
+       vertex -0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 -0.04 0
+       vertex 0 -0.04 0
+       vertex 0 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 -0.04 0.01
+       vertex -0.006666667 -0.04 0.01
+       vertex -0.006666667 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 -0.01
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0.006666667 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0
+       vertex 0 -0.04 0
+       vertex 0 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 -0.04 0
+       vertex 0.006666667 -0.04 0
+       vertex 0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0.01
+       vertex 0 -0.04 0.01
+       vertex 0 -0.04 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.01333333 -0.04 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0
+       vertex 0.006666667 -0.04 0
+       vertex 0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 -0.04 0
+       vertex 0.01333333 -0.04 0
+       vertex 0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.006666667 -0.04 0.01
+       vertex 0.006666667 -0.04 0
+    endloop
+  endfacet
+endsolid minY
+solid minZ
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 0 -0.05
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0.008 -0.05
+       vertex -0.006666667 0 -0.05
+       vertex -0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 0 -0.05
+       vertex -0.006666667 0.008 -0.05
+       vertex 0 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0.008 -0.05
+       vertex 0 0 -0.05
+       vertex -0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 0 -0.05
+       vertex 0 0.008 -0.05
+       vertex 0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0.008 -0.05
+       vertex 0.006666667 0 -0.05
+       vertex 0 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 0 -0.05
+       vertex 0.006666667 0.008 -0.05
+       vertex 0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.01333333 0 -0.05
+       vertex 0.006666667 0 -0.05
+    endloop
+  endfacet
+endsolid minZ
+solid maxZ
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0 0.05
+       vertex -0.006666667 0 0.05
+       vertex -0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.008 0.05
+       vertex -0.01333333 0.008 0.05
+       vertex -0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0 0.05
+       vertex 0 0 0.05
+       vertex 0 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.008 0.05
+       vertex -0.006666667 0.008 0.05
+       vertex -0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0 0.05
+       vertex 0.006666667 0 0.05
+       vertex 0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.008 0.05
+       vertex 0 0.008 0.05
+       vertex 0 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0 0.05
+       vertex 0.01333333 0 0.05
+       vertex 0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.008 0.05
+       vertex 0.006666667 0.008 0.05
+       vertex 0.006666667 0 0.05
+    endloop
+  endfacet
+endsolid maxZ
+solid heater_to_topAir
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.04
+       vertex -0.006666667 0.008 -0.05
+       vertex -0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.05
+       vertex -0.006666667 0.008 -0.04
+       vertex 0 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.04
+       vertex 0 0.008 -0.05
+       vertex -0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.05
+       vertex 0 0.008 -0.04
+       vertex 0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.04
+       vertex 0.006666667 0.008 -0.05
+       vertex 0 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.05
+       vertex 0.006666667 0.008 -0.04
+       vertex 0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.03
+       vertex -0.006666667 0.008 -0.04
+       vertex -0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.04
+       vertex -0.006666667 0.008 -0.03
+       vertex 0 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.03
+       vertex 0 0.008 -0.04
+       vertex -0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.04
+       vertex 0 0.008 -0.03
+       vertex 0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.03
+       vertex 0.006666667 0.008 -0.04
+       vertex 0 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.04
+       vertex 0.006666667 0.008 -0.03
+       vertex 0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.02
+       vertex -0.006666667 0.008 -0.03
+       vertex -0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.03
+       vertex -0.006666667 0.008 -0.02
+       vertex 0 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.02
+       vertex 0 0.008 -0.03
+       vertex -0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.03
+       vertex 0 0.008 -0.02
+       vertex 0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.02
+       vertex 0.006666667 0.008 -0.03
+       vertex 0 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.03
+       vertex 0.006666667 0.008 -0.02
+       vertex 0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.01
+       vertex -0.006666667 0.008 -0.02
+       vertex -0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.02
+       vertex -0.006666667 0.008 -0.01
+       vertex 0 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.01
+       vertex 0 0.008 -0.02
+       vertex -0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.02
+       vertex 0 0.008 -0.01
+       vertex 0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.01
+       vertex 0.006666667 0.008 -0.02
+       vertex 0 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.02
+       vertex 0.006666667 0.008 -0.01
+       vertex 0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0.008 0
+       vertex -0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0
+       vertex -0.006666667 0.008 -0.01
+       vertex -0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.01
+       vertex -0.006666667 0.008 0
+       vertex 0 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0
+       vertex 0 0.008 -0.01
+       vertex -0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 -0.01
+       vertex 0 0.008 0
+       vertex 0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0
+       vertex 0.006666667 0.008 -0.01
+       vertex 0 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.01
+       vertex 0.006666667 0.008 0
+       vertex 0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0.008 0.01
+       vertex -0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.01
+       vertex -0.006666667 0.008 0
+       vertex -0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0
+       vertex -0.006666667 0.008 0.01
+       vertex 0 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.01
+       vertex 0 0.008 0
+       vertex -0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0
+       vertex 0 0.008 0.01
+       vertex 0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.01
+       vertex 0.006666667 0.008 0
+       vertex 0 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0
+       vertex 0.006666667 0.008 0.01
+       vertex 0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0.008 0
+       vertex 0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0.008 0.02
+       vertex -0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.02
+       vertex -0.006666667 0.008 0.01
+       vertex -0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.01
+       vertex -0.006666667 0.008 0.02
+       vertex 0 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.02
+       vertex 0 0.008 0.01
+       vertex -0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.01
+       vertex 0 0.008 0.02
+       vertex 0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.02
+       vertex 0.006666667 0.008 0.01
+       vertex 0 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.01
+       vertex 0.006666667 0.008 0.02
+       vertex 0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0.008 0.01
+       vertex 0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0.008 0.03
+       vertex -0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.03
+       vertex -0.006666667 0.008 0.02
+       vertex -0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.02
+       vertex -0.006666667 0.008 0.03
+       vertex 0 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.03
+       vertex 0 0.008 0.02
+       vertex -0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.02
+       vertex 0 0.008 0.03
+       vertex 0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.03
+       vertex 0.006666667 0.008 0.02
+       vertex 0 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.02
+       vertex 0.006666667 0.008 0.03
+       vertex 0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0.008 0.02
+       vertex 0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0.008 0.04
+       vertex -0.006666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.04
+       vertex -0.006666667 0.008 0.03
+       vertex -0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.03
+       vertex -0.006666667 0.008 0.04
+       vertex 0 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.04
+       vertex 0 0.008 0.03
+       vertex -0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.03
+       vertex 0 0.008 0.04
+       vertex 0.006666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.04
+       vertex 0.006666667 0.008 0.03
+       vertex 0 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.03
+       vertex 0.006666667 0.008 0.04
+       vertex 0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0.008 0.03
+       vertex 0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0.008 0.05
+       vertex -0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.05
+       vertex -0.006666667 0.008 0.04
+       vertex -0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.008 0.04
+       vertex -0.006666667 0.008 0.05
+       vertex 0 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.05
+       vertex 0 0.008 0.04
+       vertex -0.006666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.008 0.04
+       vertex 0 0.008 0.05
+       vertex 0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.05
+       vertex 0.006666667 0.008 0.04
+       vertex 0 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.008 0.04
+       vertex 0.006666667 0.008 0.05
+       vertex 0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.05
+       vertex 0.01333333 0.008 0.04
+       vertex 0.006666667 0.008 0.04
+    endloop
+  endfacet
+endsolid heater_to_topAir
+solid heater_to_rightSolid
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.05
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0.008 0.05
+       vertex 0.01333333 0 0.05
+       vertex 0.01333333 0 0.04
+    endloop
+  endfacet
+endsolid heater_to_rightSolid
+solid heater_to_leftSolid
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.05
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0 0.05
+       vertex -0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0.008 0.05
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0 0.04
+    endloop
+  endfacet
+endsolid heater_to_leftSolid
+solid heater_to_bottomAir
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 -0.05
+       vertex -0.006666667 0 -0.05
+       vertex -0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.04
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.05
+       vertex 0 0 -0.05
+       vertex 0 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 -0.04
+       vertex -0.006666667 0 -0.04
+       vertex -0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 -0.05
+       vertex 0.006666667 0 -0.05
+       vertex 0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.04
+       vertex 0 0 -0.04
+       vertex 0 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.05
+       vertex 0.01333333 0 -0.05
+       vertex 0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.04
+       vertex 0.006666667 0 -0.04
+       vertex 0.006666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 -0.04
+       vertex -0.006666667 0 -0.04
+       vertex -0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.03
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.04
+       vertex 0 0 -0.04
+       vertex 0 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 -0.03
+       vertex -0.006666667 0 -0.03
+       vertex -0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 -0.04
+       vertex 0.006666667 0 -0.04
+       vertex 0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.03
+       vertex 0 0 -0.03
+       vertex 0 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.04
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.03
+       vertex 0.006666667 0 -0.03
+       vertex 0.006666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 -0.03
+       vertex -0.006666667 0 -0.03
+       vertex -0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.02
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.03
+       vertex 0 0 -0.03
+       vertex 0 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 -0.02
+       vertex -0.006666667 0 -0.02
+       vertex -0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 -0.03
+       vertex 0.006666667 0 -0.03
+       vertex 0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.02
+       vertex 0 0 -0.02
+       vertex 0 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.03
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.02
+       vertex 0.006666667 0 -0.02
+       vertex 0.006666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.032 -0.01
+       vertex -0.006666667 -0.04 -0.01
+       vertex -0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.04 -0.01
+       vertex -0.006666667 -0.032 -0.01
+       vertex 0 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.032 -0.01
+       vertex 0 -0.04 -0.01
+       vertex -0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.04 -0.01
+       vertex 0 -0.032 -0.01
+       vertex 0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.04 -0.01
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.006666667 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.024 -0.01
+       vertex -0.006666667 -0.032 -0.01
+       vertex -0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.032 -0.01
+       vertex -0.006666667 -0.024 -0.01
+       vertex 0 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.024 -0.01
+       vertex 0 -0.032 -0.01
+       vertex -0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.032 -0.01
+       vertex 0 -0.024 -0.01
+       vertex 0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.032 -0.01
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.006666667 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.016 -0.01
+       vertex -0.006666667 -0.024 -0.01
+       vertex -0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.024 -0.01
+       vertex -0.006666667 -0.016 -0.01
+       vertex 0 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.016 -0.01
+       vertex 0 -0.024 -0.01
+       vertex -0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.024 -0.01
+       vertex 0 -0.016 -0.01
+       vertex 0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.024 -0.01
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.006666667 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 -0.008 -0.01
+       vertex -0.006666667 -0.016 -0.01
+       vertex -0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.016 -0.01
+       vertex -0.006666667 -0.008 -0.01
+       vertex 0 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 -0.008 -0.01
+       vertex 0 -0.016 -0.01
+       vertex -0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.016 -0.01
+       vertex 0 -0.008 -0.01
+       vertex 0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.016 -0.01
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.006666667 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 -0.02
+       vertex -0.006666667 0 -0.02
+       vertex -0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.01
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.01333333 0 -0.01
+       vertex -0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0 -0.01
+       vertex -0.006666667 -0.008 -0.01
+       vertex -0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 -0.02
+       vertex 0 0 -0.02
+       vertex 0 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 -0.01
+       vertex -0.006666667 0 -0.01
+       vertex -0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 -0.008 -0.01
+       vertex -0.006666667 0 -0.01
+       vertex 0 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0 -0.01
+       vertex 0 -0.008 -0.01
+       vertex -0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 -0.02
+       vertex 0.006666667 0 -0.02
+       vertex 0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.01
+       vertex 0 0 -0.01
+       vertex 0 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 -0.008 -0.01
+       vertex 0 0 -0.01
+       vertex 0.006666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0 -0.01
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 -0.02
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.006666667 0 -0.01
+       vertex 0.006666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 -0.008 -0.01
+       vertex 0.006666667 0 -0.01
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.006666667 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.04 -0.01
+       vertex -0.01333333 -0.04 0
+       vertex -0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.04 -0.01
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.04 0
+       vertex 0.01333333 -0.04 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.032 -0.01
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.032 -0.01
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.032 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.024 -0.01
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.016 -1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.024 -0.01
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.01333333 -0.016 -1.156482e-18
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.024 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.016 -0.01
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.016 -0.01
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.016 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.008 -0.01
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 0 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.008 -0.01
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 -0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.04 0
+       vertex -0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.04 0.01
+       vertex -0.006666667 -0.04 0.01
+       vertex -0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.032 0.01
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.04 0.01
+       vertex 0 -0.04 0.01
+       vertex 0 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.032 0.01
+       vertex -0.006666667 -0.032 0.01
+       vertex -0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.04 0.01
+       vertex 0.006666667 -0.04 0.01
+       vertex 0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.032 0.01
+       vertex 0 -0.032 0.01
+       vertex 0 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.01333333 -0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.01333333 -0.04 0
+       vertex 0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.04 0.01
+       vertex 0.01333333 -0.04 0.01
+       vertex 0.01333333 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.006666667 -0.032 0.01
+       vertex 0.006666667 -0.04 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.032 1.156482e-18
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.032 0.01
+       vertex -0.006666667 -0.032 0.01
+       vertex -0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.024 0.01
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.01333333 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.032 0.01
+       vertex 0 -0.032 0.01
+       vertex 0 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.024 0.01
+       vertex -0.006666667 -0.024 0.01
+       vertex -0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.032 0.01
+       vertex 0.006666667 -0.032 0.01
+       vertex 0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.024 0.01
+       vertex 0 -0.024 0.01
+       vertex 0 -0.032 0.01
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.01333333 -0.032 1.156482e-18
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.01333333 -0.032 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.032 0.01
+       vertex 0.01333333 -0.032 0.01
+       vertex 0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.006666667 -0.024 0.01
+       vertex 0.006666667 -0.032 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.024 0
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.024 0.01
+       vertex -0.006666667 -0.024 0.01
+       vertex -0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.016 0.01
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.01333333 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.024 0.01
+       vertex 0 -0.024 0.01
+       vertex 0 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.016 0.01
+       vertex -0.006666667 -0.016 0.01
+       vertex -0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.024 0.01
+       vertex 0.006666667 -0.024 0.01
+       vertex 0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.016 0.01
+       vertex 0 -0.016 0.01
+       vertex 0 -0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.01333333 -0.024 0
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.01333333 -0.024 0
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.024 0.01
+       vertex 0.01333333 -0.024 0.01
+       vertex 0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.006666667 -0.016 0.01
+       vertex 0.006666667 -0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 -0.016 -1.156482e-18
+       vertex -0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.016 0.01
+       vertex -0.006666667 -0.016 0.01
+       vertex -0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.008 0.01
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.016 0.01
+       vertex 0 -0.016 0.01
+       vertex 0 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.008 0.01
+       vertex -0.006666667 -0.008 0.01
+       vertex -0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.016 0.01
+       vertex 0.006666667 -0.016 0.01
+       vertex 0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.008 0.01
+       vertex 0 -0.008 0.01
+       vertex 0 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.01333333 -0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.01333333 -0.016 -1.156482e-18
+       vertex 0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.016 0.01
+       vertex 0.01333333 -0.016 0.01
+       vertex 0.01333333 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.006666667 -0.008 0.01
+       vertex 0.006666667 -0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.01333333 -0.008 0
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0 0
+       vertex -0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 -0.008 0.01
+       vertex -0.006666667 -0.008 0.01
+       vertex -0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0 0.01
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 -0.008 0.01
+       vertex 0 -0.008 0.01
+       vertex 0 0 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0 0.01
+       vertex -0.006666667 0 0.01
+       vertex -0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 -0.008 0.01
+       vertex 0.006666667 -0.008 0.01
+       vertex 0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0 0.01
+       vertex 0 0 0.01
+       vertex 0 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 -0.008 0
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.01333333 -0.008 0
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 -0.008 0.01
+       vertex 0.01333333 -0.008 0.01
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.006666667 0 0.01
+       vertex 0.006666667 -0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.006666667 0 0.01
+       vertex -0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.02
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.01
+       vertex 0 0 0.01
+       vertex 0 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 0.02
+       vertex -0.006666667 0 0.02
+       vertex -0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 0.01
+       vertex 0.006666667 0 0.01
+       vertex 0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.02
+       vertex 0 0 0.02
+       vertex 0 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.01
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.02
+       vertex 0.006666667 0 0.02
+       vertex 0.006666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.02
+       vertex -0.006666667 0 0.02
+       vertex -0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.03
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.02
+       vertex 0 0 0.02
+       vertex 0 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 0.03
+       vertex -0.006666667 0 0.03
+       vertex -0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 0.02
+       vertex 0.006666667 0 0.02
+       vertex 0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.03
+       vertex 0 0 0.03
+       vertex 0 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.02
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.03
+       vertex 0.006666667 0 0.03
+       vertex 0.006666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.03
+       vertex -0.006666667 0 0.03
+       vertex -0.006666667 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.04
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.03
+       vertex 0 0 0.03
+       vertex 0 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 0.04
+       vertex -0.006666667 0 0.04
+       vertex -0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 0.03
+       vertex 0.006666667 0 0.03
+       vertex 0.006666667 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.04
+       vertex 0 0 0.04
+       vertex 0 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.03
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.04
+       vertex 0.006666667 0 0.04
+       vertex 0.006666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.04
+       vertex -0.006666667 0 0.04
+       vertex -0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.05
+       vertex -0.01333333 0 0.05
+       vertex -0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0 0.04
+       vertex 0 0 0.04
+       vertex 0 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0 0.05
+       vertex -0.006666667 0 0.05
+       vertex -0.006666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0 0.04
+       vertex 0.006666667 0 0.04
+       vertex 0.006666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.05
+       vertex 0 0 0.05
+       vertex 0 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0 0.04
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.05
+       vertex 0.006666667 0 0.05
+       vertex 0.006666667 0 0.04
+    endloop
+  endfacet
+endsolid heater_to_bottomAir
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl
new file mode 100644
index 0000000000..0cdc26c084
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl
@@ -0,0 +1,4296 @@
+solid minX
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 -0.05
+       vertex -0.1 0 -0.04
+       vertex -0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 -0.04
+       vertex -0.1 0.008 -0.05
+       vertex -0.1 0 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 -0.04
+       vertex -0.1 0 -0.03
+       vertex -0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 -0.03
+       vertex -0.1 0.008 -0.04
+       vertex -0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 -0.03
+       vertex -0.1 0 -0.02
+       vertex -0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 -0.02
+       vertex -0.1 0.008 -0.03
+       vertex -0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 -0.02
+       vertex -0.1 0 -0.01
+       vertex -0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 -0.01
+       vertex -0.1 0.008 -0.02
+       vertex -0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 -0.01
+       vertex -0.1 0 0
+       vertex -0.1 0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 0
+       vertex -0.1 0.008 -0.01
+       vertex -0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 0
+       vertex -0.1 0 0.01
+       vertex -0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 0.01
+       vertex -0.1 0.008 0
+       vertex -0.1 0 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 0.01
+       vertex -0.1 0 0.02
+       vertex -0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 0.02
+       vertex -0.1 0.008 0.01
+       vertex -0.1 0 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 0.02
+       vertex -0.1 0 0.03
+       vertex -0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 0.03
+       vertex -0.1 0.008 0.02
+       vertex -0.1 0 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 0.03
+       vertex -0.1 0 0.04
+       vertex -0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 0.04
+       vertex -0.1 0.008 0.03
+       vertex -0.1 0 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0 0.04
+       vertex -0.1 0 0.05
+       vertex -0.1 0.008 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.008 0.05
+       vertex -0.1 0.008 0.04
+       vertex -0.1 0 0.04
+    endloop
+  endfacet
+endsolid minX
+solid minZ
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 0 -0.05
+       vertex -0.1 0.008 -0.05
+       vertex -0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.09333333 0 -0.05
+       vertex -0.1 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 0 -0.05
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.08666667 0 -0.05
+       vertex -0.09333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 0 -0.05
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 0.008 -0.05
+       vertex -0.08 0 -0.05
+       vertex -0.08666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 0 -0.05
+       vertex -0.08 0.008 -0.05
+       vertex -0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.07333333 0 -0.05
+       vertex -0.08 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 0 -0.05
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.06666667 0 -0.05
+       vertex -0.07333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 0 -0.05
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 0.008 -0.05
+       vertex -0.06 0 -0.05
+       vertex -0.06666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 0 -0.05
+       vertex -0.06 0.008 -0.05
+       vertex -0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.06 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.04666667 0 -0.05
+    endloop
+  endfacet
+  facet normal -0 0 -1
+    outer loop
+       vertex -0.04666667 0 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.04 0.008 -0.05
+       vertex -0.04 5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal -0 0 -1
+    outer loop
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.04666667 0 -0.05
+       vertex -0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.04 0.008 -0.05
+       vertex -0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.04 5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal -0 0 -1
+    outer loop
+       vertex -0.02666667 0 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 0 -0.05
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 0.008 -0.05
+       vertex -0.02 0 -0.05
+       vertex -0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 0 -0.05
+       vertex -0.02 0.008 -0.05
+       vertex -0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.01333333 0 -0.05
+       vertex -0.02 0 -0.05
+    endloop
+  endfacet
+endsolid minZ
+solid maxZ
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 0 0.05
+       vertex -0.09333333 0 0.05
+       vertex -0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.008 0.05
+       vertex -0.1 0.008 0.05
+       vertex -0.1 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0 0.05
+       vertex -0.08666667 0 0.05
+       vertex -0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.008 0.05
+       vertex -0.09333333 0.008 0.05
+       vertex -0.09333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0 0.05
+       vertex -0.08 0 0.05
+       vertex -0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.008 0.05
+       vertex -0.08666667 0.008 0.05
+       vertex -0.08666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0 0.05
+       vertex -0.07333333 0 0.05
+       vertex -0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.008 0.05
+       vertex -0.08 0.008 0.05
+       vertex -0.08 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0 0.05
+       vertex -0.06666667 0 0.05
+       vertex -0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.008 0.05
+       vertex -0.07333333 0.008 0.05
+       vertex -0.07333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0 0.05
+       vertex -0.06 0 0.05
+       vertex -0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.008 0.05
+       vertex -0.06666667 0.008 0.05
+       vertex -0.06666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex -0.06 0 0.05
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.008 0.05
+       vertex -0.06 0.008 0.05
+       vertex -0.06 0 0.05
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+       vertex -0.04666667 0 0.05
+       vertex -0.04666667 0.008 0.05
+       vertex -0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.008 0.05
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.04666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.04 0.008 0.05
+       vertex -0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.008 0.05
+       vertex -0.04666667 0 0.05
+       vertex -0.04 5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.008 0.05
+       vertex -0.04 0.008 0.05
+       vertex -0.04 5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+       vertex -0.02666667 0 0.05
+       vertex -0.02666667 0.008 0.05
+       vertex -0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.008 0.05
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0 0.05
+       vertex -0.02 0 0.05
+       vertex -0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.008 0.05
+       vertex -0.02666667 0.008 0.05
+       vertex -0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0 0.05
+       vertex -0.01333333 0 0.05
+       vertex -0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.008 0.05
+       vertex -0.02 0.008 0.05
+       vertex -0.02 0 0.05
+    endloop
+  endfacet
+endsolid maxZ
+solid leftSolid_to_bottomAir
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 -0.05
+       vertex -0.09333333 0 -0.05
+       vertex -0.09333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.04
+       vertex -0.1 0 -0.04
+       vertex -0.1 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.05
+       vertex -0.08666667 0 -0.05
+       vertex -0.08666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 -0.04
+       vertex -0.09333333 0 -0.04
+       vertex -0.09333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 -0.05
+       vertex -0.08 0 -0.05
+       vertex -0.08 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 -0.04
+       vertex -0.08666667 0 -0.04
+       vertex -0.08666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 -0.05
+       vertex -0.07333333 0 -0.05
+       vertex -0.07333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.04
+       vertex -0.08 0 -0.04
+       vertex -0.08 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.05
+       vertex -0.06666667 0 -0.05
+       vertex -0.06666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.04
+       vertex -0.07333333 0 -0.04
+       vertex -0.07333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.05
+       vertex -0.06 0 -0.05
+       vertex -0.06 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 -0.04
+       vertex -0.06666667 0 -0.04
+       vertex -0.06666667 0 -0.05
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.05333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.06 0 -0.04
+       vertex -0.06 0 -0.05
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.05
+       vertex -0.04666667 0 -0.05
+       vertex -0.04666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 -5.782412e-17
+    outer loop
+       vertex -0.04666667 0 -0.05
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0 -0.04
+       vertex -0.04666667 0 -0.04
+       vertex -0.04666667 0 -0.05
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.03333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 -5.782412e-17
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.04 0 -0.04
+       vertex -0.04 5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.05
+       vertex -0.02666667 0 -0.05
+       vertex -0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 -5.782412e-17
+    outer loop
+       vertex -0.02666667 0 -0.05
+       vertex -0.02 0 -0.05
+       vertex -0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.02666667 0 -0.04
+       vertex -0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 -0.05
+       vertex -0.01333333 0 -0.05
+       vertex -0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 -5.782412e-17
+    outer loop
+       vertex -0.01333333 0 -0.04
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 -0.04
+       vertex -0.09333333 0 -0.04
+       vertex -0.09333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.03
+       vertex -0.1 0 -0.03
+       vertex -0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.04
+       vertex -0.08666667 0 -0.04
+       vertex -0.08666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 -0.03
+       vertex -0.09333333 0 -0.03
+       vertex -0.09333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 1.156482e-16
+    outer loop
+       vertex -0.08666667 0 -0.04
+       vertex -0.08 0 -0.04
+       vertex -0.08 1.156482e-18 -0.03
+    endloop
+  endfacet
+  facet normal 1.734722e-16 -1 0
+    outer loop
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.08666667 0 -0.03
+       vertex -0.08666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 -0.04
+       vertex -0.07333333 0 -0.04
+       vertex -0.07333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -1.734722e-16 -1 1.156482e-16
+    outer loop
+       vertex -0.07333333 0 -0.03
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.08 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.04
+       vertex -0.06666667 0 -0.04
+       vertex -0.06666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.03
+       vertex -0.07333333 0 -0.03
+       vertex -0.07333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.04
+       vertex -0.06 0 -0.04
+       vertex -0.06 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 -0.03
+       vertex -0.06666667 0 -0.03
+       vertex -0.06666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.05333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.06 0 -0.03
+       vertex -0.06 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.04
+       vertex -0.04666667 0 -0.04
+       vertex -0.04666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex -0.04666667 0 -0.04
+       vertex -0.04 0 -0.04
+       vertex -0.04 5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.04666667 0 -0.03
+       vertex -0.04666667 0 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 0 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.03333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 5.782412e-17
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 -5.782412e-17
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.04
+       vertex -0.02666667 0 -0.04
+       vertex -0.02666667 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 -0.04
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 -5.782412e-17
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.04
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.01333333 0 -0.03
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 -0.03
+       vertex -0.09333333 0 -0.03
+       vertex -0.09333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.02
+       vertex -0.1 0 -0.02
+       vertex -0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.03
+       vertex -0.08666667 0 -0.03
+       vertex -0.08666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 -0.02
+       vertex -0.09333333 0 -0.02
+       vertex -0.09333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 1.734722e-16 -1 -1.156482e-16
+    outer loop
+       vertex -0.08666667 0 -0.03
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.08 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 -0.02
+       vertex -0.08666667 0 -0.02
+       vertex -0.08666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -1.734722e-16 -1 0
+    outer loop
+       vertex -0.08 1.156482e-18 -0.03
+       vertex -0.07333333 0 -0.03
+       vertex -0.07333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 -1.156482e-16
+    outer loop
+       vertex -0.07333333 0 -0.02
+       vertex -0.08 0 -0.02
+       vertex -0.08 1.156482e-18 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.03
+       vertex -0.06666667 0 -0.03
+       vertex -0.06666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.02
+       vertex -0.07333333 0 -0.02
+       vertex -0.07333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.03
+       vertex -0.06 0 -0.03
+       vertex -0.06 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 -0.02
+       vertex -0.06666667 0 -0.02
+       vertex -0.06666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.05333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.06 0 -0.02
+       vertex -0.06 0 -0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.03
+       vertex -0.04666667 0 -0.03
+       vertex -0.04666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.03
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.04 5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.04666667 0 -0.02
+       vertex -0.04666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.03333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.04 5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.03
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex -0.02666667 -5.782412e-19 -0.03
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex -0.02 0 -0.02
+       vertex -0.02666667 0 -0.02
+       vertex -0.02666667 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.02 -5.782412e-19 -0.03
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex -0.01333333 0 -0.02
+       vertex -0.02 0 -0.02
+       vertex -0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 -0.02
+       vertex -0.09333333 0 -0.02
+       vertex -0.09333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.01
+       vertex -0.1 0 -0.01
+       vertex -0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.02
+       vertex -0.08666667 0 -0.02
+       vertex -0.08666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 -0.01
+       vertex -0.09333333 0 -0.01
+       vertex -0.09333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 -0.02
+       vertex -0.08 0 -0.02
+       vertex -0.08 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 -0.01
+       vertex -0.08666667 0 -0.01
+       vertex -0.08666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 -0.02
+       vertex -0.07333333 0 -0.02
+       vertex -0.07333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.01
+       vertex -0.08 0 -0.01
+       vertex -0.08 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.02
+       vertex -0.06666667 0 -0.02
+       vertex -0.06666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.01
+       vertex -0.07333333 0 -0.01
+       vertex -0.07333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.02
+       vertex -0.06 0 -0.02
+       vertex -0.06 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 -0.01
+       vertex -0.06666667 0 -0.01
+       vertex -0.06666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.05333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.06 0 -0.01
+       vertex -0.06 0 -0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.02
+       vertex -0.04666667 0 -0.02
+       vertex -0.04666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.01
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.05333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.02
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.04 5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.04666667 0 -0.01
+       vertex -0.04666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.03333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.04 5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.02
+       vertex -0.02666667 0 -0.02
+       vertex -0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 -0.01
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.03333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0 -0.02
+       vertex -0.02 0 -0.02
+       vertex -0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0 -0.01
+       vertex -0.02666667 0 -0.01
+       vertex -0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 -0.02
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 -0.01
+       vertex -0.02 0 -0.01
+       vertex -0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 -0.01
+       vertex -0.09333333 0 -0.01
+       vertex -0.09333333 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 0
+       vertex -0.1 0 0
+       vertex -0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 -0.01
+       vertex -0.08666667 0 -0.01
+       vertex -0.08666667 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 0
+       vertex -0.09333333 0 0
+       vertex -0.09333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 0
+       vertex -0.08666667 0 -0.01
+       vertex -0.08 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 -0.01
+       vertex -0.08 0 1.156482e-18
+       vertex -0.08666667 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 0
+       vertex -0.08 0 1.156482e-18
+       vertex -0.08 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 -0.01
+       vertex -0.07333333 0 -0.01
+       vertex -0.07333333 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 -0.01
+       vertex -0.06666667 0 -0.01
+       vertex -0.06666667 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 0
+       vertex -0.07333333 0 0
+       vertex -0.07333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 -0.01
+       vertex -0.06 0 -0.01
+       vertex -0.06 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 0
+       vertex -0.06666667 0 0
+       vertex -0.06666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 -0.01
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.05333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.06 0 0
+       vertex -0.06 0 -0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 -0.01
+       vertex -0.04666667 0 -0.01
+       vertex -0.04666667 0 0
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.05333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 -0.01
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.04 5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0
+       vertex -0.04666667 0 0
+       vertex -0.04666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 -0.01
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.03333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.04 5.782412e-19 0
+       vertex -0.04 5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 -0.01
+       vertex -0.02666667 0 -0.01
+       vertex -0.02666667 0 0
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 0
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.03333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0 -0.01
+       vertex -0.02 0 -0.01
+       vertex -0.02 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0 0
+       vertex -0.02666667 0 0
+       vertex -0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 -0.01
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 0
+       vertex -0.02 0 0
+       vertex -0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 0
+       vertex -0.09333333 0 0
+       vertex -0.09333333 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.01
+       vertex -0.1 0 0.01
+       vertex -0.1 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 0
+       vertex -0.08666667 0 0
+       vertex -0.08666667 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.01
+       vertex -0.09333333 0 0.01
+       vertex -0.09333333 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 1.156482e-18
+       vertex -0.08 0 0.01
+       vertex -0.08666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.01
+       vertex -0.08666667 0 0
+       vertex -0.08 0 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 1.156482e-18
+       vertex -0.07333333 0 0
+       vertex -0.07333333 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.01
+       vertex -0.08 0 0.01
+       vertex -0.08 0 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 0
+       vertex -0.06666667 0 0
+       vertex -0.06666667 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.01
+       vertex -0.07333333 0 0.01
+       vertex -0.07333333 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 0
+       vertex -0.06 0 0
+       vertex -0.06 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 0.01
+       vertex -0.06666667 0 0.01
+       vertex -0.06666667 0 0
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 0
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.05333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.06 0 0.01
+       vertex -0.06 0 0
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0
+       vertex -0.04666667 0 0
+       vertex -0.04666667 0 0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.01
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.05333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0
+       vertex -0.04 5.782412e-19 0
+       vertex -0.04 5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.04666667 0 0.01
+       vertex -0.04666667 0 0
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.03333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.04 5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0
+       vertex -0.02666667 0 0
+       vertex -0.02666667 0 0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 0.01
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.03333333 -5.782412e-19 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0 0
+       vertex -0.02 0 0
+       vertex -0.02 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0 0.01
+       vertex -0.02666667 0 0.01
+       vertex -0.02666667 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 0
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.02 0 0.01
+       vertex -0.02 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 0.01
+       vertex -0.09333333 0 0.01
+       vertex -0.09333333 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.02
+       vertex -0.1 0 0.02
+       vertex -0.1 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.01
+       vertex -0.08666667 0 0.01
+       vertex -0.08666667 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.02
+       vertex -0.09333333 0 0.02
+       vertex -0.09333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.01
+       vertex -0.08 0 0.01
+       vertex -0.08 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 0.02
+       vertex -0.08666667 0 0.02
+       vertex -0.08666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 0.01
+       vertex -0.07333333 0 0.01
+       vertex -0.07333333 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.02
+       vertex -0.08 0 0.02
+       vertex -0.08 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.01
+       vertex -0.06666667 0 0.01
+       vertex -0.06666667 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.02
+       vertex -0.07333333 0 0.02
+       vertex -0.07333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.01
+       vertex -0.06 0 0.01
+       vertex -0.06 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 0.02
+       vertex -0.06666667 0 0.02
+       vertex -0.06666667 0 0.01
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 0.01
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.05333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.06 0 0.02
+       vertex -0.06 0 0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.01
+       vertex -0.04666667 0 0.01
+       vertex -0.04666667 0 0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.02
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.05333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.01
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.04 5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.04666667 0 0.02
+       vertex -0.04666667 0 0.01
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.01
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.03333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.04 5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.01
+       vertex -0.02666667 0 0.01
+       vertex -0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 0.02
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.03333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0 0.01
+       vertex -0.02 0 0.01
+       vertex -0.02 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0 0.02
+       vertex -0.02666667 0 0.02
+       vertex -0.02666667 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 0.01
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.02
+       vertex -0.02 0 0.02
+       vertex -0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 0.02
+       vertex -0.09333333 0 0.02
+       vertex -0.09333333 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.03
+       vertex -0.1 0 0.03
+       vertex -0.1 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.02
+       vertex -0.08666667 0 0.02
+       vertex -0.08666667 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.03
+       vertex -0.09333333 0 0.03
+       vertex -0.09333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.02
+       vertex -0.08 0 0.02
+       vertex -0.08 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 0.03
+       vertex -0.08666667 0 0.03
+       vertex -0.08666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 0.02
+       vertex -0.07333333 0 0.02
+       vertex -0.07333333 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.03
+       vertex -0.08 0 0.03
+       vertex -0.08 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.02
+       vertex -0.06666667 0 0.02
+       vertex -0.06666667 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.03
+       vertex -0.07333333 0 0.03
+       vertex -0.07333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.02
+       vertex -0.06 0 0.02
+       vertex -0.06 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 0.03
+       vertex -0.06666667 0 0.03
+       vertex -0.06666667 0 0.02
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 0.02
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.05333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.06 0 0.03
+       vertex -0.06 0 0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.02
+       vertex -0.04666667 0 0.02
+       vertex -0.04666667 0 0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.03
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.05333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.02
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.04 5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.04666667 0 0.03
+       vertex -0.04666667 0 0.02
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.02
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.03333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.04 5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.02
+       vertex -0.02666667 0 0.02
+       vertex -0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 0.03
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.03333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0 0.02
+       vertex -0.02 0 0.02
+       vertex -0.02 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0 0.03
+       vertex -0.02666667 0 0.03
+       vertex -0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 0.02
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.03
+       vertex -0.02 0 0.03
+       vertex -0.02 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 0.03
+       vertex -0.09333333 0 0.03
+       vertex -0.09333333 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.04
+       vertex -0.1 0 0.04
+       vertex -0.1 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.03
+       vertex -0.08666667 0 0.03
+       vertex -0.08666667 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.04
+       vertex -0.09333333 0 0.04
+       vertex -0.09333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.03
+       vertex -0.08 0 0.03
+       vertex -0.08 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 0.04
+       vertex -0.08666667 0 0.04
+       vertex -0.08666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 0.03
+       vertex -0.07333333 0 0.03
+       vertex -0.07333333 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.04
+       vertex -0.08 0 0.04
+       vertex -0.08 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.03
+       vertex -0.06666667 0 0.03
+       vertex -0.06666667 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.04
+       vertex -0.07333333 0 0.04
+       vertex -0.07333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.03
+       vertex -0.06 0 0.03
+       vertex -0.06 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 0.04
+       vertex -0.06666667 0 0.04
+       vertex -0.06666667 0 0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 0.03
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.05333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.06 0 0.04
+       vertex -0.06 0 0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.03
+       vertex -0.04666667 0 0.03
+       vertex -0.04666667 0 0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.04
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.05333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.03
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.04 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.04666667 0 0.04
+       vertex -0.04666667 0 0.03
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.03
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.03333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.04 5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 5.782412e-17
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.03
+       vertex -0.02666667 0 0.03
+       vertex -0.02666667 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 1.734725e-16 -1 0
+    outer loop
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0 0.03
+       vertex -0.02 0 0.03
+       vertex -0.02 0 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 5.782412e-17
+    outer loop
+       vertex -0.02 0 0.04
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 0.03
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.04
+       vertex -0.02 0 0.04
+       vertex -0.02 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0 0.04
+       vertex -0.09333333 0 0.04
+       vertex -0.09333333 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.05
+       vertex -0.1 0 0.05
+       vertex -0.1 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0 0.04
+       vertex -0.08666667 0 0.04
+       vertex -0.08666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.05
+       vertex -0.09333333 0 0.05
+       vertex -0.09333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0 0.04
+       vertex -0.08 0 0.04
+       vertex -0.08 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0 0.05
+       vertex -0.08666667 0 0.05
+       vertex -0.08666667 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0 0.04
+       vertex -0.07333333 0 0.04
+       vertex -0.07333333 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.05
+       vertex -0.08 0 0.05
+       vertex -0.08 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0 0.04
+       vertex -0.06666667 0 0.04
+       vertex -0.06666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.05
+       vertex -0.07333333 0 0.05
+       vertex -0.07333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0 0.04
+       vertex -0.06 0 0.04
+       vertex -0.06 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0 0.05
+       vertex -0.06666667 0 0.05
+       vertex -0.06666667 0 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.06 0 0.04
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.05333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.06 0 0.05
+       vertex -0.06 0 0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.05333333 -5.782412e-19 0.04
+       vertex -0.04666667 0 0.04
+       vertex -0.04666667 0 0.05
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.05
+       vertex -0.05333333 -5.782412e-19 0.05
+       vertex -0.05333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04666667 0 0.04
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.04 5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.04666667 0 0.05
+       vertex -0.04666667 0 0.04
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.04 5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.03333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal -1.734723e-16 -1 0
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.04 5.782412e-19 0.05
+       vertex -0.04 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 1.734725e-16 -1 -5.782412e-17
+    outer loop
+       vertex -0.03333333 -5.782412e-19 0.04
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex -0.02666667 0 0.05
+       vertex -0.03333333 -5.782412e-19 0.05
+       vertex -0.03333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex -0.02666667 5.782412e-19 0.04
+       vertex -0.02 0 0.04
+       vertex -0.02 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 -5.782412e-17
+    outer loop
+       vertex -0.02 0 0.05
+       vertex -0.02666667 0 0.05
+       vertex -0.02666667 5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0 0.04
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0 0.05
+       vertex -0.02 0 0.05
+       vertex -0.02 0 0.04
+    endloop
+  endfacet
+endsolid leftSolid_to_bottomAir
+solid leftSolid_to_heater
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.05
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.04
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.03
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.02
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 -0.01
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0.01
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0.02
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0.03
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0 0.04
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex -0.01333333 0.008 0.05
+       vertex -0.01333333 0 0.05
+       vertex -0.01333333 0 0.04
+    endloop
+  endfacet
+endsolid leftSolid_to_heater
+solid leftSolid_to_topAir
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 -0.05
+       vertex -0.1 0.008 -0.04
+       vertex -0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.1 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.04
+       vertex -0.08 0.008 -0.05
+       vertex -0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.05
+       vertex -0.08 0.008 -0.04
+       vertex -0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.04
+       vertex -0.06 0.008 -0.05
+       vertex -0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.05
+       vertex -0.06 0.008 -0.04
+       vertex -0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.04
+       vertex -0.04 0.008 -0.05
+       vertex -0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.05
+       vertex -0.04 0.008 -0.04
+       vertex -0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.04
+       vertex -0.02 0.008 -0.05
+       vertex -0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.05
+       vertex -0.02 0.008 -0.04
+       vertex -0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 -0.04
+       vertex -0.1 0.008 -0.03
+       vertex -0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.03
+       vertex -0.08 0.008 -0.04
+       vertex -0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.04
+       vertex -0.08 0.008 -0.03
+       vertex -0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.03
+       vertex -0.06 0.008 -0.04
+       vertex -0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.04
+       vertex -0.06 0.008 -0.03
+       vertex -0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.03
+       vertex -0.04 0.008 -0.04
+       vertex -0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.04
+       vertex -0.04 0.008 -0.03
+       vertex -0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.03
+       vertex -0.02 0.008 -0.04
+       vertex -0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.04
+       vertex -0.02 0.008 -0.03
+       vertex -0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 -0.03
+       vertex -0.1 0.008 -0.02
+       vertex -0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.02
+       vertex -0.08 0.008 -0.03
+       vertex -0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.03
+       vertex -0.08 0.008 -0.02
+       vertex -0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.02
+       vertex -0.06 0.008 -0.03
+       vertex -0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.03
+       vertex -0.06 0.008 -0.02
+       vertex -0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.02
+       vertex -0.04 0.008 -0.03
+       vertex -0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.03
+       vertex -0.04 0.008 -0.02
+       vertex -0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.02
+       vertex -0.02 0.008 -0.03
+       vertex -0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.03
+       vertex -0.02 0.008 -0.02
+       vertex -0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 -0.02
+       vertex -0.1 0.008 -0.01
+       vertex -0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.01
+       vertex -0.08 0.008 -0.02
+       vertex -0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.02
+       vertex -0.08 0.008 -0.01
+       vertex -0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.01
+       vertex -0.06 0.008 -0.02
+       vertex -0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.02
+       vertex -0.06 0.008 -0.01
+       vertex -0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.01
+       vertex -0.04 0.008 -0.02
+       vertex -0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.02
+       vertex -0.04 0.008 -0.01
+       vertex -0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.01
+       vertex -0.02 0.008 -0.02
+       vertex -0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.02
+       vertex -0.02 0.008 -0.01
+       vertex -0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 -0.01
+       vertex -0.1 0.008 0
+       vertex -0.09333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.09333333 0.008 0
+       vertex -0.08666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.08666667 0.008 0
+       vertex -0.08 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0
+       vertex -0.08 0.008 -0.01
+       vertex -0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 -0.01
+       vertex -0.08 0.008 0
+       vertex -0.07333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.06666667 0.008 0
+       vertex -0.06 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0
+       vertex -0.06 0.008 -0.01
+       vertex -0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 -0.01
+       vertex -0.06 0.008 0
+       vertex -0.05333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.05333333 0.008 0
+       vertex -0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.04666667 0.008 0
+       vertex -0.04 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0
+       vertex -0.04 0.008 -0.01
+       vertex -0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 -0.01
+       vertex -0.04 0.008 0
+       vertex -0.03333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.02666667 0.008 -5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0
+       vertex -0.02 0.008 -0.01
+       vertex -0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 -0.01
+       vertex -0.02 0.008 0
+       vertex -0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 0
+       vertex -0.1 0.008 0.01
+       vertex -0.09333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.01
+       vertex -0.09333333 0.008 0
+       vertex -0.1 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0
+       vertex -0.09333333 0.008 0.01
+       vertex -0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.01
+       vertex -0.08666667 0.008 0
+       vertex -0.09333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0
+       vertex -0.08666667 0.008 0.01
+       vertex -0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.01
+       vertex -0.08 0.008 0
+       vertex -0.08666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.08 0.008 0.01
+       vertex -0.07333333 0.008 0.01
+       vertex -0.07333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.08 0.008 0
+       vertex -0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.07333333 0.008 0.01
+       vertex -0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.01
+       vertex -0.06666667 0.008 0
+       vertex -0.07333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0
+       vertex -0.06666667 0.008 0.01
+       vertex -0.06 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.01
+       vertex -0.06 0.008 0
+       vertex -0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0
+       vertex -0.06 0.008 0.01
+       vertex -0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.01
+       vertex -0.05333333 0.008 0
+       vertex -0.06 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0
+       vertex -0.05333333 0.008 0.01
+       vertex -0.04666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.01
+       vertex -0.04666667 0.008 0
+       vertex -0.05333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0
+       vertex -0.04666667 0.008 0.01
+       vertex -0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.01
+       vertex -0.04 0.008 0
+       vertex -0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.04 0.008 0.01
+       vertex -0.03333333 0.008 0.01
+       vertex -0.03333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.04 0.008 0
+       vertex -0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.03333333 0.008 0.01
+       vertex -0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.01
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.03333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.01
+       vertex -0.02 0.008 0.01
+       vertex -0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0
+       vertex -0.02 0.008 0.01
+       vertex -0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0.008 0
+       vertex -0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 0.01
+       vertex -0.1 0.008 0.02
+       vertex -0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.02
+       vertex -0.09333333 0.008 0.01
+       vertex -0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.01
+       vertex -0.09333333 0.008 0.02
+       vertex -0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.02
+       vertex -0.08666667 0.008 0.01
+       vertex -0.09333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.01
+       vertex -0.08666667 0.008 0.02
+       vertex -0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.02
+       vertex -0.08 0.008 0.01
+       vertex -0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.01
+       vertex -0.08 0.008 0.02
+       vertex -0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.02
+       vertex -0.07333333 0.008 0.01
+       vertex -0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.01
+       vertex -0.07333333 0.008 0.02
+       vertex -0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.02
+       vertex -0.06666667 0.008 0.01
+       vertex -0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.01
+       vertex -0.06666667 0.008 0.02
+       vertex -0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.02
+       vertex -0.06 0.008 0.01
+       vertex -0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.01
+       vertex -0.06 0.008 0.02
+       vertex -0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.02
+       vertex -0.05333333 0.008 0.01
+       vertex -0.06 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.01
+       vertex -0.05333333 0.008 0.02
+       vertex -0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.02
+       vertex -0.04666667 0.008 0.01
+       vertex -0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.01
+       vertex -0.04666667 0.008 0.02
+       vertex -0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.02
+       vertex -0.04 0.008 0.01
+       vertex -0.04666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.01
+       vertex -0.04 0.008 0.02
+       vertex -0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.02
+       vertex -0.03333333 0.008 0.01
+       vertex -0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.01
+       vertex -0.03333333 0.008 0.02
+       vertex -0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.02
+       vertex -0.02666667 0.008 0.01
+       vertex -0.03333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.01
+       vertex -0.02666667 0.008 0.02
+       vertex -0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.02
+       vertex -0.02 0.008 0.01
+       vertex -0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.01
+       vertex -0.02 0.008 0.02
+       vertex -0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0.008 0.01
+       vertex -0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 0.02
+       vertex -0.1 0.008 0.03
+       vertex -0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.03
+       vertex -0.09333333 0.008 0.02
+       vertex -0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.02
+       vertex -0.09333333 0.008 0.03
+       vertex -0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.03
+       vertex -0.08666667 0.008 0.02
+       vertex -0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.02
+       vertex -0.08666667 0.008 0.03
+       vertex -0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.03
+       vertex -0.08 0.008 0.02
+       vertex -0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.02
+       vertex -0.08 0.008 0.03
+       vertex -0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.03
+       vertex -0.07333333 0.008 0.02
+       vertex -0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.02
+       vertex -0.07333333 0.008 0.03
+       vertex -0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.03
+       vertex -0.06666667 0.008 0.02
+       vertex -0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.02
+       vertex -0.06666667 0.008 0.03
+       vertex -0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.03
+       vertex -0.06 0.008 0.02
+       vertex -0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.02
+       vertex -0.06 0.008 0.03
+       vertex -0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.03
+       vertex -0.05333333 0.008 0.02
+       vertex -0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.02
+       vertex -0.05333333 0.008 0.03
+       vertex -0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.03
+       vertex -0.04666667 0.008 0.02
+       vertex -0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.02
+       vertex -0.04666667 0.008 0.03
+       vertex -0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.03
+       vertex -0.04 0.008 0.02
+       vertex -0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.02
+       vertex -0.04 0.008 0.03
+       vertex -0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.03
+       vertex -0.03333333 0.008 0.02
+       vertex -0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.02
+       vertex -0.03333333 0.008 0.03
+       vertex -0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.03
+       vertex -0.02666667 0.008 0.02
+       vertex -0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.02
+       vertex -0.02666667 0.008 0.03
+       vertex -0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.03
+       vertex -0.02 0.008 0.02
+       vertex -0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.02
+       vertex -0.02 0.008 0.03
+       vertex -0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0.008 0.02
+       vertex -0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 0.03
+       vertex -0.1 0.008 0.04
+       vertex -0.09333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.04
+       vertex -0.09333333 0.008 0.03
+       vertex -0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.03
+       vertex -0.09333333 0.008 0.04
+       vertex -0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.04
+       vertex -0.08666667 0.008 0.03
+       vertex -0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.03
+       vertex -0.08666667 0.008 0.04
+       vertex -0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.04
+       vertex -0.08 0.008 0.03
+       vertex -0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.03
+       vertex -0.08 0.008 0.04
+       vertex -0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.04
+       vertex -0.07333333 0.008 0.03
+       vertex -0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.03
+       vertex -0.07333333 0.008 0.04
+       vertex -0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.04
+       vertex -0.06666667 0.008 0.03
+       vertex -0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.03
+       vertex -0.06666667 0.008 0.04
+       vertex -0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.04
+       vertex -0.06 0.008 0.03
+       vertex -0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.03
+       vertex -0.06 0.008 0.04
+       vertex -0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.04
+       vertex -0.05333333 0.008 0.03
+       vertex -0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.03
+       vertex -0.05333333 0.008 0.04
+       vertex -0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.04
+       vertex -0.04666667 0.008 0.03
+       vertex -0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.03
+       vertex -0.04666667 0.008 0.04
+       vertex -0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.04
+       vertex -0.04 0.008 0.03
+       vertex -0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.03
+       vertex -0.04 0.008 0.04
+       vertex -0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.04
+       vertex -0.03333333 0.008 0.03
+       vertex -0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.03
+       vertex -0.03333333 0.008 0.04
+       vertex -0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.04
+       vertex -0.02666667 0.008 0.03
+       vertex -0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.03
+       vertex -0.02666667 0.008 0.04
+       vertex -0.02 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.04
+       vertex -0.02 0.008 0.03
+       vertex -0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.03
+       vertex -0.02 0.008 0.04
+       vertex -0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0.008 0.03
+       vertex -0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.008 0.04
+       vertex -0.1 0.008 0.05
+       vertex -0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.05
+       vertex -0.09333333 0.008 0.04
+       vertex -0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.008 0.04
+       vertex -0.09333333 0.008 0.05
+       vertex -0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.05
+       vertex -0.08666667 0.008 0.04
+       vertex -0.09333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.008 0.04
+       vertex -0.08666667 0.008 0.05
+       vertex -0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.05
+       vertex -0.08 0.008 0.04
+       vertex -0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.008 0.04
+       vertex -0.08 0.008 0.05
+       vertex -0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.05
+       vertex -0.07333333 0.008 0.04
+       vertex -0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.008 0.04
+       vertex -0.07333333 0.008 0.05
+       vertex -0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.05
+       vertex -0.06666667 0.008 0.04
+       vertex -0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.008 0.04
+       vertex -0.06666667 0.008 0.05
+       vertex -0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.05
+       vertex -0.06 0.008 0.04
+       vertex -0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.008 0.04
+       vertex -0.06 0.008 0.05
+       vertex -0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.05
+       vertex -0.05333333 0.008 0.04
+       vertex -0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.008 0.04
+       vertex -0.05333333 0.008 0.05
+       vertex -0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.05
+       vertex -0.04666667 0.008 0.04
+       vertex -0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.008 0.04
+       vertex -0.04666667 0.008 0.05
+       vertex -0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.05
+       vertex -0.04 0.008 0.04
+       vertex -0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.008 0.04
+       vertex -0.04 0.008 0.05
+       vertex -0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.05
+       vertex -0.03333333 0.008 0.04
+       vertex -0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.008 0.04
+       vertex -0.03333333 0.008 0.05
+       vertex -0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.05
+       vertex -0.02666667 0.008 0.04
+       vertex -0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.008 0.04
+       vertex -0.02666667 0.008 0.05
+       vertex -0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.05
+       vertex -0.02 0.008 0.04
+       vertex -0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.008 0.04
+       vertex -0.02 0.008 0.05
+       vertex -0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.008 0.05
+       vertex -0.01333333 0.008 0.04
+       vertex -0.02 0.008 0.04
+    endloop
+  endfacet
+endsolid leftSolid_to_topAir
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl
new file mode 100644
index 0000000000..35d7ba781a
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl
@@ -0,0 +1,4296 @@
+solid maxX
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.05
+       vertex 0.1 0.008 -0.05
+       vertex 0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.04
+       vertex 0.1 0 -0.04
+       vertex 0.1 0 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.04
+       vertex 0.1 0.008 -0.04
+       vertex 0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.03
+       vertex 0.1 0 -0.03
+       vertex 0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.03
+       vertex 0.1 0.008 -0.03
+       vertex 0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.02
+       vertex 0.1 0 -0.02
+       vertex 0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.02
+       vertex 0.1 0.008 -0.02
+       vertex 0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.01
+       vertex 0.1 0 -0.01
+       vertex 0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 -0.01
+       vertex 0.1 0.008 -0.01
+       vertex 0.1 0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0
+       vertex 0.1 0 0
+       vertex 0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0
+       vertex 0.1 0.008 0
+       vertex 0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.01
+       vertex 0.1 0 0.01
+       vertex 0.1 0 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.01
+       vertex 0.1 0.008 0.01
+       vertex 0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.02
+       vertex 0.1 0 0.02
+       vertex 0.1 0 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.02
+       vertex 0.1 0.008 0.02
+       vertex 0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.03
+       vertex 0.1 0 0.03
+       vertex 0.1 0 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.03
+       vertex 0.1 0.008 0.03
+       vertex 0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.04
+       vertex 0.1 0 0.04
+       vertex 0.1 0 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0 0.04
+       vertex 0.1 0.008 0.04
+       vertex 0.1 0.008 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.05
+       vertex 0.1 0 0.05
+       vertex 0.1 0 0.04
+    endloop
+  endfacet
+endsolid maxX
+solid minZ
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 0 -0.05
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 0.008 -0.05
+       vertex 0.02 0 -0.05
+       vertex 0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 0 -0.05
+       vertex 0.02 0.008 -0.05
+       vertex 0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.02666667 0 -0.05
+       vertex 0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 0 -0.05
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.03333333 0 -0.05
+       vertex 0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 0 -0.05
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 0.008 -0.05
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.03333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 0.008 -0.05
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.04666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal -0 0 -1
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.05333333 0 -0.05
+       vertex 0.04666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 0 -0.05
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 0.008 -0.05
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.05333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.06 0.008 -0.05
+       vertex 0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.06 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.08 0.008 -0.05
+       vertex 0.08 4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal -0 0 -1
+    outer loop
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.08 0.008 -0.05
+       vertex 0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.08 4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.08666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.1 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 0.008 -0.05
+       vertex 0.1 0 -0.05
+       vertex 0.09333333 1.445603e-19 -0.05
+    endloop
+  endfacet
+endsolid minZ
+solid maxZ
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0 0.05
+       vertex 0.02 0 0.05
+       vertex 0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.008 0.05
+       vertex 0.01333333 0.008 0.05
+       vertex 0.01333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0 0.05
+       vertex 0.02666667 0 0.05
+       vertex 0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.008 0.05
+       vertex 0.02 0.008 0.05
+       vertex 0.02 0 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0 0.05
+       vertex 0.03333333 0 0.05
+       vertex 0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.008 0.05
+       vertex 0.02666667 0.008 0.05
+       vertex 0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.03333333 0 0.05
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.008 0.05
+       vertex 0.03333333 0.008 0.05
+       vertex 0.03333333 0 0.05
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.04666667 0.008 0.05
+       vertex 0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.008 0.05
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.04666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.05333333 0 0.05
+       vertex 0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.008 0.05
+       vertex 0.04666667 0.008 0.05
+       vertex 0.04666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.05333333 0 0.05
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.008 0.05
+       vertex 0.05333333 0.008 0.05
+       vertex 0.05333333 0 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.008 0.05
+       vertex 0.06 0.008 0.05
+       vertex 0.06 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.008 0.05
+       vertex 0.06666667 0.008 0.05
+       vertex 0.06666667 -4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.08 0.008 0.05
+       vertex 0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.008 0.05
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.08 4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.008 0.05
+       vertex 0.08 0.008 0.05
+       vertex 0.08 4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.008 0.05
+       vertex 0.08666667 0.008 0.05
+       vertex 0.08666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -0 0 1
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.1 0 0.05
+       vertex 0.1 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 0.008 0.05
+       vertex 0.09333333 0.008 0.05
+       vertex 0.09333333 1.445603e-19 0.05
+    endloop
+  endfacet
+endsolid maxZ
+solid rightSolid_to_bottomAir
+  facet normal 0 -1 -5.782412e-17
+    outer loop
+       vertex 0.01333333 0 -0.05
+       vertex 0.02 0 -0.05
+       vertex 0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 -0.05
+       vertex 0.02666667 0 -0.05
+       vertex 0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 -5.782412e-17
+    outer loop
+       vertex 0.02666667 0 -0.04
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.02 0 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.05
+       vertex 0.03333333 0 -0.05
+       vertex 0.03333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.04
+       vertex 0.02666667 0 -0.04
+       vertex 0.02666667 0 -0.05
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 2.891206e-17
+    outer loop
+       vertex 0.03333333 0 -0.05
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0 -0.04
+       vertex 0.03333333 0 -0.04
+       vertex 0.03333333 0 -0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.05
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.04666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 -1 2.891206e-17
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.04 0 -0.04
+       vertex 0.04 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.05
+       vertex 0.05333333 0 -0.05
+       vertex 0.05333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -0.04
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.04666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -0.05
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.06 -2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.05333333 0 -0.04
+       vertex 0.05333333 0 -0.05
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.06666667 -4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.06 -2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.07333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.05
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.08 4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.05
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.05
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.08666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.05
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.05
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.09333333 1.445603e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.05
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.05
+       vertex 0.1 0 -0.05
+       vertex 0.1 0 -0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 -0.04
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.09333333 1.445603e-19 -0.05
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.04
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.04
+       vertex 0.02666667 0 -0.04
+       vertex 0.02666667 0 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.03
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.02 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.04
+       vertex 0.03333333 0 -0.04
+       vertex 0.03333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.03
+       vertex 0.02666667 0 -0.03
+       vertex 0.02666667 0 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 -2.891206e-17
+    outer loop
+       vertex 0.03333333 0 -0.04
+       vertex 0.04 0 -0.04
+       vertex 0.04 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.03333333 0 -0.03
+       vertex 0.03333333 0 -0.04
+    endloop
+  endfacet
+  facet normal 4.336807e-17 -1 -5.782412e-17
+    outer loop
+       vertex 0.04 0 -0.04
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.04666667 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 -2.891206e-17
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.04 0 -0.04
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 2.891206e-17
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.04
+       vertex 0.05333333 0 -0.04
+       vertex 0.05333333 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 -5.782412e-17
+    outer loop
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.04666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -0.04
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.06 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 2.891206e-17
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.05333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.06666667 -4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.07333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.08 4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.08666667 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.04
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.09333333 1.445603e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.04
+       vertex 0.1 0 -0.04
+       vertex 0.1 0 -0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 -0.03
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.09333333 1.445603e-19 -0.04
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 5.782412e-17
+    outer loop
+       vertex 0.01333333 0 -0.03
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 -0.02
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.02 -5.782412e-19 -0.03
+       vertex 0.02666667 0 -0.03
+       vertex 0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex 0.02666667 0 -0.02
+       vertex 0.02 0 -0.02
+       vertex 0.02 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.03
+       vertex 0.03333333 0 -0.03
+       vertex 0.03333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.02
+       vertex 0.02666667 0 -0.02
+       vertex 0.02666667 0 -0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.03
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.04 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.03333333 0 -0.02
+       vertex 0.03333333 0 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.03
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.04666667 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.04 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 -2.891206e-17
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.03
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.05333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 4.336813e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -0.02
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.04666667 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -8.673614e-17 -1 0
+    outer loop
+       vertex 0.05333333 2.891206e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.06 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 -2.891206e-17
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.05333333 0 -0.02
+       vertex 0.05333333 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.06666667 -4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.06 -2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.07333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.08 4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.08666667 2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.03
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.09333333 1.445603e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.03
+       vertex 0.1 0 -0.03
+       vertex 0.1 0 -0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 -0.02
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.09333333 1.445603e-19 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.02
+       vertex 0.02 0 -0.02
+       vertex 0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 -0.01
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 -0.02
+       vertex 0.02666667 0 -0.02
+       vertex 0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.01
+       vertex 0.02 0 -0.01
+       vertex 0.02 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.02
+       vertex 0.03333333 0 -0.02
+       vertex 0.03333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.01
+       vertex 0.02666667 0 -0.01
+       vertex 0.02666667 0 -0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.02
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.04 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.03333333 0 -0.01
+       vertex 0.03333333 0 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 5.782412e-17
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.02
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.04666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.04 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal 4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 -2.891206e-19 -0.02
+       vertex 0.05333333 0 -0.02
+       vertex 0.05333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 5.782412e-17
+    outer loop
+       vertex 0.05333333 0 -0.01
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.04666667 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -0.02
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.06 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.05333333 0 -0.01
+       vertex 0.05333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.06666667 -4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.06 -2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.07333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.08 4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.08666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.08 4.336809e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.02
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.09333333 1.445603e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.02
+       vertex 0.1 0 -0.02
+       vertex 0.1 0 -0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 -0.01
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.09333333 1.445603e-19 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.02 0 -0.01
+       vertex 0.02 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 0
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 -0.01
+       vertex 0.02666667 0 -0.01
+       vertex 0.02666667 0 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.02 0 0
+       vertex 0.02 0 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 -0.01
+       vertex 0.03333333 0 -0.01
+       vertex 0.03333333 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 0
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.02666667 0 -0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 -0.01
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.03333333 0 0
+       vertex 0.03333333 0 -0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 -0.01
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.04666667 2.891206e-19 0
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.04 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 -0.01
+       vertex 0.05333333 0 -0.01
+       vertex 0.05333333 0 -2.891206e-19
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.04666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 -0.01
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.06 -2.891206e-19 5.782412e-19
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.05333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.06666667 -4.336809e-19 0
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.06 -2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.06666667 -4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 -0.01
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.08 4.336809e-19 2.891206e-19
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.07333333 -5.782412e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.08 4.336809e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 -0.01
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.08666667 2.891206e-19 -0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 -0.01
+       vertex 0.1 0 -0.01
+       vertex 0.1 0 0
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 0
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.09333333 1.445603e-19 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 0
+       vertex 0.02 0 0
+       vertex 0.02 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 0.01
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.02666667 0 0.01
+       vertex 0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 0.01
+       vertex 0.02 0 0
+       vertex 0.02666667 0 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 5.782412e-19
+       vertex 0.03333333 0 0
+       vertex 0.03333333 0 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 0.01
+       vertex 0.02666667 0 0.01
+       vertex 0.02666667 0 5.782412e-19
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 0
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.04 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.03333333 0 0.01
+       vertex 0.03333333 0 0
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.04 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.04 -2.891206e-19 -5.782412e-19
+       vertex 0.04666667 2.891206e-19 0
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.05333333 0 0.01
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.01
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.04666667 2.891206e-19 0
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.05333333 0 0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 -0
+    outer loop
+       vertex 0.05333333 0 0.01
+       vertex 0.05333333 0 -2.891206e-19
+       vertex 0.06 -2.891206e-19 5.782412e-19
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 5.782412e-19
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.06666667 -4.336809e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.06 -2.891206e-19 5.782412e-19
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.07333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.06666667 -4.336809e-19 0
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.07333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.07333333 -5.782412e-19 -4.336809e-19
+       vertex 0.08 4.336809e-19 2.891206e-19
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 2.891206e-19
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.08666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.08 4.336809e-19 2.891206e-19
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.08666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 -0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.08666667 2.891206e-19 -2.168404e-19
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+       vertex 0.1 0 0
+       vertex 0.1 0 0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 0.01
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.09333333 1.445603e-19 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.02 0 0.01
+       vertex 0.02 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 0.02
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 0.01
+       vertex 0.02666667 0 0.01
+       vertex 0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.02
+       vertex 0.02 0 0.02
+       vertex 0.02 0 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.01
+       vertex 0.03333333 0 0.01
+       vertex 0.03333333 0 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 0.02
+       vertex 0.02666667 0 0.02
+       vertex 0.02666667 0 0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 0.01
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.04 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.03333333 0 0.02
+       vertex 0.03333333 0 0.01
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.01
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.04666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.04 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.01
+       vertex 0.05333333 0 0.01
+       vertex 0.05333333 0 0.02
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.02
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.04666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.01
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.06 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.05333333 0 0.02
+       vertex 0.05333333 0 0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 1.445603e-17
+    outer loop
+       vertex 0.06 -2.891206e-19 0.01
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.06666667 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.06 -2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.01
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.07333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 1.445603e-17
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.06666667 -4.336809e-19 0.01
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.01
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.08 4.336809e-19 0.02
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.01
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.08666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.08 4.336809e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.01
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.09333333 1.445603e-19 0.02
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.01
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.01
+       vertex 0.1 0 0.01
+       vertex 0.1 0 0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 0.02
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.09333333 1.445603e-19 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.02
+       vertex 0.02 0 0.02
+       vertex 0.02 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 0.03
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 0.02
+       vertex 0.02666667 0 0.02
+       vertex 0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.03
+       vertex 0.02 0 0.03
+       vertex 0.02 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.02
+       vertex 0.03333333 0 0.02
+       vertex 0.03333333 0 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 0.03
+       vertex 0.02666667 0 0.03
+       vertex 0.02666667 0 0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 0.02
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.04 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.03333333 0 0.03
+       vertex 0.03333333 0 0.02
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.02
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.04666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.04 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.02
+       vertex 0.05333333 0 0.02
+       vertex 0.05333333 0 0.03
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.03
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.04666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.02
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.06 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.05333333 0 0.03
+       vertex 0.05333333 0 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 -1.445603e-17
+    outer loop
+       vertex 0.06 -2.891206e-19 0.02
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.06666667 -4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.06 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.07333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 -1.445603e-17
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.06666667 -2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.02
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.08 4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.08666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.08 4.336809e-19 0.02
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.02
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.09333333 1.445603e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.02
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.02
+       vertex 0.1 0 0.02
+       vertex 0.1 0 0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 0.03
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.09333333 1.445603e-19 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.03
+       vertex 0.02 0 0.03
+       vertex 0.02 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 0.04
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 0.03
+       vertex 0.02666667 0 0.03
+       vertex 0.02666667 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.04
+       vertex 0.02 0 0.04
+       vertex 0.02 0 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.03
+       vertex 0.03333333 0 0.03
+       vertex 0.03333333 0 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 0.04
+       vertex 0.02666667 0 0.04
+       vertex 0.02666667 0 0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 0.03
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.04 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.03333333 0 0.04
+       vertex 0.03333333 0 0.03
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 -8.673618e-17
+    outer loop
+       vertex 0.04 -2.891206e-19 0.03
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.04666667 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.04 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.03
+       vertex 0.05333333 0 0.03
+       vertex 0.05333333 0 0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 -8.673618e-17
+    outer loop
+       vertex 0.05333333 0 0.04
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.04666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.03
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.06 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.05333333 0 0.04
+       vertex 0.05333333 0 0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 1.445603e-17
+    outer loop
+       vertex 0.06 -2.891206e-19 0.03
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.06666667 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.06 -2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.07333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 1.445603e-17
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.06666667 -4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.03
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.08 4.336809e-19 0.04
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.08666667 2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.08 4.336809e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.03
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.09333333 1.445603e-19 0.04
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.03
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.03
+       vertex 0.1 0 0.03
+       vertex 0.1 0 0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 0.04
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.09333333 1.445603e-19 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0 0.04
+       vertex 0.02 0 0.04
+       vertex 0.02 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0 0.05
+       vertex 0.01333333 0 0.05
+       vertex 0.01333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0 0.04
+       vertex 0.02666667 0 0.04
+       vertex 0.02666667 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.05
+       vertex 0.02 0 0.05
+       vertex 0.02 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0 0.04
+       vertex 0.03333333 0 0.04
+       vertex 0.03333333 0 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0 0.05
+       vertex 0.02666667 0 0.05
+       vertex 0.02666667 0 0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.03333333 0 0.04
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.04 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.03333333 0 0.05
+       vertex 0.03333333 0 0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 8.673618e-17
+    outer loop
+       vertex 0.04 -2.891206e-19 0.04
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.04666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal 8.673614e-17 -1 0
+    outer loop
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.04 -2.891206e-19 0.05
+       vertex 0.04 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 8.673627e-17 -1 0
+    outer loop
+       vertex 0.04666667 -5.782412e-19 0.04
+       vertex 0.05333333 0 0.04
+       vertex 0.05333333 0 0.05
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 8.673618e-17
+    outer loop
+       vertex 0.05333333 0 0.05
+       vertex 0.04666667 2.891206e-19 0.05
+       vertex 0.04666667 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.05333333 0 0.04
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.06 -2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -4.336807e-17 -1 0
+    outer loop
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.05333333 0 0.05
+       vertex 0.05333333 0 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 -1.445603e-17
+    outer loop
+       vertex 0.06 -2.891206e-19 0.04
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.06666667 -4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.06 -2.891206e-19 0.05
+       vertex 0.06 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -4.336813e-17 -1 0
+    outer loop
+       vertex 0.06666667 -2.891206e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.07333333 -5.782412e-19 0.05
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 -1.445603e-17
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.06666667 -4.336809e-19 0.05
+       vertex 0.06666667 -2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.07333333 -5.782412e-19 0.04
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.08 4.336809e-19 0.05
+    endloop
+  endfacet
+  facet normal 1.517882e-16 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.07333333 -5.782412e-19 0.05
+       vertex 0.07333333 -5.782412e-19 0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08 4.336809e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.08666667 2.891206e-19 0.05
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.08 4.336809e-19 0.05
+       vertex 0.08 4.336809e-19 0.04
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.08666667 2.891206e-19 0.04
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.09333333 1.445603e-19 0.05
+    endloop
+  endfacet
+  facet normal -2.168407e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.08666667 2.891206e-19 0.05
+       vertex 0.08666667 2.891206e-19 0.04
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.09333333 1.445603e-19 0.04
+       vertex 0.1 0 0.04
+       vertex 0.1 0 0.05
+    endloop
+  endfacet
+  facet normal -2.168403e-17 -1 0
+    outer loop
+       vertex 0.1 0 0.05
+       vertex 0.09333333 1.445603e-19 0.05
+       vertex 0.09333333 1.445603e-19 0.04
+    endloop
+  endfacet
+endsolid rightSolid_to_bottomAir
+solid rightSolid_to_topAir
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.04
+       vertex 0.02 0.008 -0.05
+       vertex 0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.05
+       vertex 0.02 0.008 -0.04
+       vertex 0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.04
+       vertex 0.04 0.008 -0.05
+       vertex 0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.05
+       vertex 0.04 0.008 -0.04
+       vertex 0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.04
+       vertex 0.06 0.008 -0.05
+       vertex 0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.05
+       vertex 0.06 0.008 -0.04
+       vertex 0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.04
+       vertex 0.08 0.008 -0.05
+       vertex 0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.05
+       vertex 0.08 0.008 -0.04
+       vertex 0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 -0.04
+       vertex 0.1 0.008 -0.05
+       vertex 0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.03
+       vertex 0.02 0.008 -0.04
+       vertex 0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.04
+       vertex 0.02 0.008 -0.03
+       vertex 0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.03
+       vertex 0.04 0.008 -0.04
+       vertex 0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.04
+       vertex 0.04 0.008 -0.03
+       vertex 0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.03
+       vertex 0.06 0.008 -0.04
+       vertex 0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.04
+       vertex 0.06 0.008 -0.03
+       vertex 0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.03
+       vertex 0.08 0.008 -0.04
+       vertex 0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.04
+       vertex 0.08 0.008 -0.03
+       vertex 0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 -0.03
+       vertex 0.1 0.008 -0.04
+       vertex 0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.02
+       vertex 0.02 0.008 -0.03
+       vertex 0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.03
+       vertex 0.02 0.008 -0.02
+       vertex 0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.02
+       vertex 0.04 0.008 -0.03
+       vertex 0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.03
+       vertex 0.04 0.008 -0.02
+       vertex 0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.02
+       vertex 0.06 0.008 -0.03
+       vertex 0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.03
+       vertex 0.06 0.008 -0.02
+       vertex 0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.02
+       vertex 0.08 0.008 -0.03
+       vertex 0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.03
+       vertex 0.08 0.008 -0.02
+       vertex 0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 -0.02
+       vertex 0.1 0.008 -0.03
+       vertex 0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.01
+       vertex 0.02 0.008 -0.02
+       vertex 0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.02
+       vertex 0.02 0.008 -0.01
+       vertex 0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.01
+       vertex 0.04 0.008 -0.02
+       vertex 0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.02
+       vertex 0.04 0.008 -0.01
+       vertex 0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.01
+       vertex 0.06 0.008 -0.02
+       vertex 0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.02
+       vertex 0.06 0.008 -0.01
+       vertex 0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.01
+       vertex 0.08 0.008 -0.02
+       vertex 0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.02
+       vertex 0.08 0.008 -0.01
+       vertex 0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 -0.01
+       vertex 0.1 0.008 -0.02
+       vertex 0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0.008 0
+       vertex 0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0
+       vertex 0.02 0.008 -0.01
+       vertex 0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 -0.01
+       vertex 0.02 0.008 0
+       vertex 0.02666667 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.03333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.03333333 0.008 0
+       vertex 0.04 0.008 -5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.04 0.008 -0.01
+       vertex 0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 -0.01
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.04666667 0.008 0
+       vertex 0.05333333 0.008 -2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.06 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.06 0.008 -0.01
+       vertex 0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 -0.01
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.06666667 0.008 0
+       vertex 0.07333333 0.008 -4.336809e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.08 0.008 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.08 0.008 -0.01
+       vertex 0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 -0.01
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.08666667 0.008 -2.168404e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.09333333 0.008 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.1 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 0
+       vertex 0.1 0.008 -0.01
+       vertex 0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0.008 0.01
+       vertex 0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.01
+       vertex 0.02 0.008 0
+       vertex 0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.02 0.008 0.01
+       vertex 0.02666667 0.008 0.01
+       vertex 0.02666667 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.02 0.008 0
+       vertex 0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.02666667 0.008 0.01
+       vertex 0.03333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.01
+       vertex 0.03333333 0.008 0
+       vertex 0.02666667 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0
+       vertex 0.03333333 0.008 0.01
+       vertex 0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.01
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.03333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.04 0.008 0.01
+       vertex 0.04666667 0.008 0.01
+       vertex 0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0
+       vertex 0.04666667 0.008 0.01
+       vertex 0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.01
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.01
+       vertex 0.06 0.008 0.01
+       vertex 0.06 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.06 0.008 0.01
+       vertex 0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.01
+       vertex 0.06666667 0.008 0
+       vertex 0.06 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0
+       vertex 0.06666667 0.008 0.01
+       vertex 0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.01
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.01
+       vertex 0.08 0.008 0.01
+       vertex 0.08 0.008 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.08 0.008 0.01
+       vertex 0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.01
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.08 0.008 2.891206e-19
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.01
+       vertex 0.09333333 0.008 0.01
+       vertex 0.09333333 0.008 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.09333333 0.008 0.01
+       vertex 0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 0.01
+       vertex 0.1 0.008 0
+       vertex 0.09333333 0.008 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0.008 0.02
+       vertex 0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.02
+       vertex 0.02 0.008 0.01
+       vertex 0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.01
+       vertex 0.02 0.008 0.02
+       vertex 0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.02
+       vertex 0.02666667 0.008 0.01
+       vertex 0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.01
+       vertex 0.02666667 0.008 0.02
+       vertex 0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.02
+       vertex 0.03333333 0.008 0.01
+       vertex 0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.01
+       vertex 0.03333333 0.008 0.02
+       vertex 0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.02
+       vertex 0.04 0.008 0.01
+       vertex 0.03333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.01
+       vertex 0.04 0.008 0.02
+       vertex 0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.02
+       vertex 0.04666667 0.008 0.01
+       vertex 0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.01
+       vertex 0.04666667 0.008 0.02
+       vertex 0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.02
+       vertex 0.05333333 0.008 0.01
+       vertex 0.04666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.01
+       vertex 0.05333333 0.008 0.02
+       vertex 0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.02
+       vertex 0.06 0.008 0.01
+       vertex 0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.01
+       vertex 0.06 0.008 0.02
+       vertex 0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.02
+       vertex 0.06666667 0.008 0.01
+       vertex 0.06 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.01
+       vertex 0.06666667 0.008 0.02
+       vertex 0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.02
+       vertex 0.07333333 0.008 0.01
+       vertex 0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.01
+       vertex 0.07333333 0.008 0.02
+       vertex 0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.02
+       vertex 0.08 0.008 0.01
+       vertex 0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.01
+       vertex 0.08 0.008 0.02
+       vertex 0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.02
+       vertex 0.08666667 0.008 0.01
+       vertex 0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.01
+       vertex 0.08666667 0.008 0.02
+       vertex 0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.02
+       vertex 0.09333333 0.008 0.01
+       vertex 0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.01
+       vertex 0.09333333 0.008 0.02
+       vertex 0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 0.02
+       vertex 0.1 0.008 0.01
+       vertex 0.09333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0.008 0.03
+       vertex 0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.03
+       vertex 0.02 0.008 0.02
+       vertex 0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.02
+       vertex 0.02 0.008 0.03
+       vertex 0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.03
+       vertex 0.02666667 0.008 0.02
+       vertex 0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.02
+       vertex 0.02666667 0.008 0.03
+       vertex 0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.03
+       vertex 0.03333333 0.008 0.02
+       vertex 0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.02
+       vertex 0.03333333 0.008 0.03
+       vertex 0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.03
+       vertex 0.04 0.008 0.02
+       vertex 0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.02
+       vertex 0.04 0.008 0.03
+       vertex 0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.03
+       vertex 0.04666667 0.008 0.02
+       vertex 0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.02
+       vertex 0.04666667 0.008 0.03
+       vertex 0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.03
+       vertex 0.05333333 0.008 0.02
+       vertex 0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.02
+       vertex 0.05333333 0.008 0.03
+       vertex 0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.03
+       vertex 0.06 0.008 0.02
+       vertex 0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.02
+       vertex 0.06 0.008 0.03
+       vertex 0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.03
+       vertex 0.06666667 0.008 0.02
+       vertex 0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.02
+       vertex 0.06666667 0.008 0.03
+       vertex 0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.03
+       vertex 0.07333333 0.008 0.02
+       vertex 0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.02
+       vertex 0.07333333 0.008 0.03
+       vertex 0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.03
+       vertex 0.08 0.008 0.02
+       vertex 0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.02
+       vertex 0.08 0.008 0.03
+       vertex 0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.03
+       vertex 0.08666667 0.008 0.02
+       vertex 0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.02
+       vertex 0.08666667 0.008 0.03
+       vertex 0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.03
+       vertex 0.09333333 0.008 0.02
+       vertex 0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.02
+       vertex 0.09333333 0.008 0.03
+       vertex 0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 0.03
+       vertex 0.1 0.008 0.02
+       vertex 0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0.008 0.04
+       vertex 0.02 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.04
+       vertex 0.02 0.008 0.03
+       vertex 0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.03
+       vertex 0.02 0.008 0.04
+       vertex 0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.04
+       vertex 0.02666667 0.008 0.03
+       vertex 0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.03
+       vertex 0.02666667 0.008 0.04
+       vertex 0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.04
+       vertex 0.03333333 0.008 0.03
+       vertex 0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.03
+       vertex 0.03333333 0.008 0.04
+       vertex 0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.04
+       vertex 0.04 0.008 0.03
+       vertex 0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.03
+       vertex 0.04 0.008 0.04
+       vertex 0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.04
+       vertex 0.04666667 0.008 0.03
+       vertex 0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.03
+       vertex 0.04666667 0.008 0.04
+       vertex 0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.04
+       vertex 0.05333333 0.008 0.03
+       vertex 0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.03
+       vertex 0.05333333 0.008 0.04
+       vertex 0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.04
+       vertex 0.06 0.008 0.03
+       vertex 0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.03
+       vertex 0.06 0.008 0.04
+       vertex 0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.04
+       vertex 0.06666667 0.008 0.03
+       vertex 0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.03
+       vertex 0.06666667 0.008 0.04
+       vertex 0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.04
+       vertex 0.07333333 0.008 0.03
+       vertex 0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.03
+       vertex 0.07333333 0.008 0.04
+       vertex 0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.04
+       vertex 0.08 0.008 0.03
+       vertex 0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.03
+       vertex 0.08 0.008 0.04
+       vertex 0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.04
+       vertex 0.08666667 0.008 0.03
+       vertex 0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.03
+       vertex 0.08666667 0.008 0.04
+       vertex 0.09333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.04
+       vertex 0.09333333 0.008 0.03
+       vertex 0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.03
+       vertex 0.09333333 0.008 0.04
+       vertex 0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 0.04
+       vertex 0.1 0.008 0.03
+       vertex 0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0.008 0.05
+       vertex 0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.05
+       vertex 0.02 0.008 0.04
+       vertex 0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.008 0.04
+       vertex 0.02 0.008 0.05
+       vertex 0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.05
+       vertex 0.02666667 0.008 0.04
+       vertex 0.02 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.008 0.04
+       vertex 0.02666667 0.008 0.05
+       vertex 0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.05
+       vertex 0.03333333 0.008 0.04
+       vertex 0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.008 0.04
+       vertex 0.03333333 0.008 0.05
+       vertex 0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.05
+       vertex 0.04 0.008 0.04
+       vertex 0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.008 0.04
+       vertex 0.04 0.008 0.05
+       vertex 0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.05
+       vertex 0.04666667 0.008 0.04
+       vertex 0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.008 0.04
+       vertex 0.04666667 0.008 0.05
+       vertex 0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.05
+       vertex 0.05333333 0.008 0.04
+       vertex 0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.008 0.04
+       vertex 0.05333333 0.008 0.05
+       vertex 0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.05
+       vertex 0.06 0.008 0.04
+       vertex 0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.008 0.04
+       vertex 0.06 0.008 0.05
+       vertex 0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.05
+       vertex 0.06666667 0.008 0.04
+       vertex 0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.008 0.04
+       vertex 0.06666667 0.008 0.05
+       vertex 0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.05
+       vertex 0.07333333 0.008 0.04
+       vertex 0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.008 0.04
+       vertex 0.07333333 0.008 0.05
+       vertex 0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.05
+       vertex 0.08 0.008 0.04
+       vertex 0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.008 0.04
+       vertex 0.08 0.008 0.05
+       vertex 0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.05
+       vertex 0.08666667 0.008 0.04
+       vertex 0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.008 0.04
+       vertex 0.08666667 0.008 0.05
+       vertex 0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.05
+       vertex 0.09333333 0.008 0.04
+       vertex 0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.008 0.04
+       vertex 0.09333333 0.008 0.05
+       vertex 0.1 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.008 0.05
+       vertex 0.1 0.008 0.04
+       vertex 0.09333333 0.008 0.04
+    endloop
+  endfacet
+endsolid rightSolid_to_topAir
+solid rightSolid_to_heater
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.05
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.01333333 0 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.04
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.03
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.02
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 -0.01
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 0
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 0.01
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 0.02
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 0.03
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex 0.01333333 0 0.04
+       vertex 0.01333333 0 0.05
+       vertex 0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex 0.01333333 0.008 0.05
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0 0.04
+    endloop
+  endfacet
+endsolid rightSolid_to_heater
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/topAir.stl b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/topAir.stl
new file mode 100644
index 0000000000..227f0317cd
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/constant/triSurface/topAir.stl
@@ -0,0 +1,12896 @@
+solid maxY
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 -0.05
+       vertex -0.1 0.04 -0.04
+       vertex -0.09333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.04
+       vertex -0.09333333 0.04 -0.05
+       vertex -0.1 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 -0.04
+       vertex -0.1 0.04 -0.03
+       vertex -0.09333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.03
+       vertex -0.09333333 0.04 -0.04
+       vertex -0.1 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 -0.03
+       vertex -0.1 0.04 -0.02
+       vertex -0.09333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.02
+       vertex -0.09333333 0.04 -0.03
+       vertex -0.1 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 -0.02
+       vertex -0.1 0.04 -0.01
+       vertex -0.09333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.01
+       vertex -0.09333333 0.04 -0.02
+       vertex -0.1 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 -0.01
+       vertex -0.1 0.04 0
+       vertex -0.09333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0
+       vertex -0.09333333 0.04 -0.01
+       vertex -0.1 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 0
+       vertex -0.1 0.04 0.01
+       vertex -0.09333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.01
+       vertex -0.09333333 0.04 0
+       vertex -0.1 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 0.01
+       vertex -0.1 0.04 0.02
+       vertex -0.09333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.02
+       vertex -0.09333333 0.04 0.01
+       vertex -0.1 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 0.02
+       vertex -0.1 0.04 0.03
+       vertex -0.09333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.03
+       vertex -0.09333333 0.04 0.02
+       vertex -0.1 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 0.03
+       vertex -0.1 0.04 0.04
+       vertex -0.09333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.04
+       vertex -0.09333333 0.04 0.03
+       vertex -0.1 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.1 0.04 0.04
+       vertex -0.1 0.04 0.05
+       vertex -0.09333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.05
+       vertex -0.09333333 0.04 0.04
+       vertex -0.1 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.05
+       vertex -0.09333333 0.04 -0.04
+       vertex -0.08666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.04
+       vertex -0.08666667 0.04 -0.05
+       vertex -0.09333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.04
+       vertex -0.09333333 0.04 -0.03
+       vertex -0.08666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.03
+       vertex -0.08666667 0.04 -0.04
+       vertex -0.09333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.03
+       vertex -0.09333333 0.04 -0.02
+       vertex -0.08666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.02
+       vertex -0.08666667 0.04 -0.03
+       vertex -0.09333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.02
+       vertex -0.09333333 0.04 -0.01
+       vertex -0.08666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.01
+       vertex -0.08666667 0.04 -0.02
+       vertex -0.09333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 -0.01
+       vertex -0.09333333 0.04 0
+       vertex -0.08666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0
+       vertex -0.08666667 0.04 -0.01
+       vertex -0.09333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0
+       vertex -0.09333333 0.04 0.01
+       vertex -0.08666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.01
+       vertex -0.08666667 0.04 0
+       vertex -0.09333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.01
+       vertex -0.09333333 0.04 0.02
+       vertex -0.08666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.02
+       vertex -0.08666667 0.04 0.01
+       vertex -0.09333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.02
+       vertex -0.09333333 0.04 0.03
+       vertex -0.08666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.03
+       vertex -0.08666667 0.04 0.02
+       vertex -0.09333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.03
+       vertex -0.09333333 0.04 0.04
+       vertex -0.08666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.04
+       vertex -0.08666667 0.04 0.03
+       vertex -0.09333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.09333333 0.04 0.04
+       vertex -0.09333333 0.04 0.05
+       vertex -0.08666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.05
+       vertex -0.08666667 0.04 0.04
+       vertex -0.09333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.05
+       vertex -0.08666667 0.04 -0.04
+       vertex -0.08 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.04
+       vertex -0.08 0.04 -0.05
+       vertex -0.08666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.04
+       vertex -0.08666667 0.04 -0.03
+       vertex -0.08 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.03
+       vertex -0.08 0.04 -0.04
+       vertex -0.08666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.03
+       vertex -0.08666667 0.04 -0.02
+       vertex -0.08 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.02
+       vertex -0.08 0.04 -0.03
+       vertex -0.08666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 -0.02
+       vertex -0.08666667 0.04 -0.01
+       vertex -0.08 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.01
+       vertex -0.08 0.04 -0.02
+       vertex -0.08666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0
+       vertex -0.08 0.04 1.156482e-18
+       vertex -0.08 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.01
+       vertex -0.08666667 0.04 -0.01
+       vertex -0.08666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 1.156482e-18
+       vertex -0.08666667 0.04 0
+       vertex -0.08666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.01
+       vertex -0.08 0.04 0.01
+       vertex -0.08 0.04 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.01
+       vertex -0.08666667 0.04 0.02
+       vertex -0.08 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.02
+       vertex -0.08 0.04 0.01
+       vertex -0.08666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.02
+       vertex -0.08666667 0.04 0.03
+       vertex -0.08 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.03
+       vertex -0.08 0.04 0.02
+       vertex -0.08666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.03
+       vertex -0.08666667 0.04 0.04
+       vertex -0.08 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.04
+       vertex -0.08 0.04 0.03
+       vertex -0.08666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08666667 0.04 0.04
+       vertex -0.08666667 0.04 0.05
+       vertex -0.08 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.05
+       vertex -0.08 0.04 0.04
+       vertex -0.08666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.05
+       vertex -0.08 0.04 -0.04
+       vertex -0.07333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.04
+       vertex -0.07333333 0.04 -0.05
+       vertex -0.08 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.04
+       vertex -0.08 0.04 -0.03
+       vertex -0.07333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.03
+       vertex -0.07333333 0.04 -0.04
+       vertex -0.08 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.03
+       vertex -0.08 0.04 -0.02
+       vertex -0.07333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.02
+       vertex -0.07333333 0.04 -0.03
+       vertex -0.08 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.02
+       vertex -0.08 0.04 -0.01
+       vertex -0.07333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.01
+       vertex -0.07333333 0.04 -0.02
+       vertex -0.08 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0
+       vertex -0.07333333 0.04 -0.01
+       vertex -0.08 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 -0.01
+       vertex -0.08 0.04 1.156482e-18
+       vertex -0.07333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 1.156482e-18
+       vertex -0.08 0.04 0.01
+       vertex -0.07333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.01
+       vertex -0.07333333 0.04 0
+       vertex -0.08 0.04 1.156482e-18
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.01
+       vertex -0.08 0.04 0.02
+       vertex -0.07333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.02
+       vertex -0.07333333 0.04 0.01
+       vertex -0.08 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.02
+       vertex -0.08 0.04 0.03
+       vertex -0.07333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.03
+       vertex -0.07333333 0.04 0.02
+       vertex -0.08 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.03
+       vertex -0.08 0.04 0.04
+       vertex -0.07333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.04
+       vertex -0.07333333 0.04 0.03
+       vertex -0.08 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.08 0.04 0.04
+       vertex -0.08 0.04 0.05
+       vertex -0.07333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.05
+       vertex -0.07333333 0.04 0.04
+       vertex -0.08 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.05
+       vertex -0.07333333 0.04 -0.04
+       vertex -0.06666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.04
+       vertex -0.06666667 0.04 -0.05
+       vertex -0.07333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.04
+       vertex -0.07333333 0.04 -0.03
+       vertex -0.06666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.03
+       vertex -0.06666667 0.04 -0.04
+       vertex -0.07333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.03
+       vertex -0.07333333 0.04 -0.02
+       vertex -0.06666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.02
+       vertex -0.06666667 0.04 -0.03
+       vertex -0.07333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.02
+       vertex -0.07333333 0.04 -0.01
+       vertex -0.06666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.01
+       vertex -0.06666667 0.04 -0.02
+       vertex -0.07333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 -0.01
+       vertex -0.07333333 0.04 0
+       vertex -0.06666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0
+       vertex -0.06666667 0.04 -0.01
+       vertex -0.07333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0
+       vertex -0.07333333 0.04 0.01
+       vertex -0.06666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.01
+       vertex -0.06666667 0.04 0
+       vertex -0.07333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.01
+       vertex -0.07333333 0.04 0.02
+       vertex -0.06666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.02
+       vertex -0.06666667 0.04 0.01
+       vertex -0.07333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.02
+       vertex -0.07333333 0.04 0.03
+       vertex -0.06666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.03
+       vertex -0.06666667 0.04 0.02
+       vertex -0.07333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.03
+       vertex -0.07333333 0.04 0.04
+       vertex -0.06666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.04
+       vertex -0.06666667 0.04 0.03
+       vertex -0.07333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.07333333 0.04 0.04
+       vertex -0.07333333 0.04 0.05
+       vertex -0.06666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.05
+       vertex -0.06666667 0.04 0.04
+       vertex -0.07333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.05
+       vertex -0.06666667 0.04 -0.04
+       vertex -0.06 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.04
+       vertex -0.06 0.04 -0.05
+       vertex -0.06666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.04
+       vertex -0.06666667 0.04 -0.03
+       vertex -0.06 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.03
+       vertex -0.06 0.04 -0.04
+       vertex -0.06666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.03
+       vertex -0.06666667 0.04 -0.02
+       vertex -0.06 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.02
+       vertex -0.06 0.04 -0.03
+       vertex -0.06666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.02
+       vertex -0.06666667 0.04 -0.01
+       vertex -0.06 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.01
+       vertex -0.06 0.04 -0.02
+       vertex -0.06666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 -0.01
+       vertex -0.06666667 0.04 0
+       vertex -0.06 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0
+       vertex -0.06 0.04 -0.01
+       vertex -0.06666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0
+       vertex -0.06666667 0.04 0.01
+       vertex -0.06 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.01
+       vertex -0.06 0.04 0
+       vertex -0.06666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.01
+       vertex -0.06666667 0.04 0.02
+       vertex -0.06 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.02
+       vertex -0.06 0.04 0.01
+       vertex -0.06666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.02
+       vertex -0.06666667 0.04 0.03
+       vertex -0.06 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.03
+       vertex -0.06 0.04 0.02
+       vertex -0.06666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.03
+       vertex -0.06666667 0.04 0.04
+       vertex -0.06 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.04
+       vertex -0.06 0.04 0.03
+       vertex -0.06666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06666667 0.04 0.04
+       vertex -0.06666667 0.04 0.05
+       vertex -0.06 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.05
+       vertex -0.06 0.04 0.04
+       vertex -0.06666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.05
+       vertex -0.06 0.04 -0.04
+       vertex -0.05333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.04
+       vertex -0.05333333 0.04 -0.05
+       vertex -0.06 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.04
+       vertex -0.06 0.04 -0.03
+       vertex -0.05333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.03
+       vertex -0.05333333 0.04 -0.04
+       vertex -0.06 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.03
+       vertex -0.06 0.04 -0.02
+       vertex -0.05333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.02
+       vertex -0.05333333 0.04 -0.03
+       vertex -0.06 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.02
+       vertex -0.06 0.04 -0.01
+       vertex -0.05333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.01
+       vertex -0.05333333 0.04 -0.02
+       vertex -0.06 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 -0.01
+       vertex -0.06 0.04 0
+       vertex -0.05333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0
+       vertex -0.05333333 0.04 -0.01
+       vertex -0.06 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0
+       vertex -0.06 0.04 0.01
+       vertex -0.05333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.01
+       vertex -0.05333333 0.04 0
+       vertex -0.06 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.01
+       vertex -0.06 0.04 0.02
+       vertex -0.05333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.02
+       vertex -0.05333333 0.04 0.01
+       vertex -0.06 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.02
+       vertex -0.06 0.04 0.03
+       vertex -0.05333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.03
+       vertex -0.05333333 0.04 0.02
+       vertex -0.06 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.03
+       vertex -0.06 0.04 0.04
+       vertex -0.05333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.04
+       vertex -0.05333333 0.04 0.03
+       vertex -0.06 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.06 0.04 0.04
+       vertex -0.06 0.04 0.05
+       vertex -0.05333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.05
+       vertex -0.05333333 0.04 0.04
+       vertex -0.06 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.05
+       vertex -0.05333333 0.04 -0.04
+       vertex -0.04666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.04
+       vertex -0.04666667 0.04 -0.05
+       vertex -0.05333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.04
+       vertex -0.05333333 0.04 -0.03
+       vertex -0.04666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.03
+       vertex -0.04666667 0.04 -0.04
+       vertex -0.05333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.03
+       vertex -0.05333333 0.04 -0.02
+       vertex -0.04666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.02
+       vertex -0.04666667 0.04 -0.03
+       vertex -0.05333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.02
+       vertex -0.05333333 0.04 -0.01
+       vertex -0.04666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.01
+       vertex -0.04666667 0.04 -0.02
+       vertex -0.05333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 -0.01
+       vertex -0.05333333 0.04 0
+       vertex -0.04666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0
+       vertex -0.04666667 0.04 -0.01
+       vertex -0.05333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0
+       vertex -0.05333333 0.04 0.01
+       vertex -0.04666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.01
+       vertex -0.04666667 0.04 0
+       vertex -0.05333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.01
+       vertex -0.05333333 0.04 0.02
+       vertex -0.04666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.02
+       vertex -0.04666667 0.04 0.01
+       vertex -0.05333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.02
+       vertex -0.05333333 0.04 0.03
+       vertex -0.04666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.03
+       vertex -0.04666667 0.04 0.02
+       vertex -0.05333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.03
+       vertex -0.05333333 0.04 0.04
+       vertex -0.04666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.04
+       vertex -0.04666667 0.04 0.03
+       vertex -0.05333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.05333333 0.04 0.04
+       vertex -0.05333333 0.04 0.05
+       vertex -0.04666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.05
+       vertex -0.04666667 0.04 0.04
+       vertex -0.05333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.05
+       vertex -0.04666667 0.04 -0.04
+       vertex -0.04 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.04
+       vertex -0.04 0.04 -0.05
+       vertex -0.04666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.04
+       vertex -0.04666667 0.04 -0.03
+       vertex -0.04 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.03
+       vertex -0.04 0.04 -0.04
+       vertex -0.04666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.03
+       vertex -0.04666667 0.04 -0.02
+       vertex -0.04 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.02
+       vertex -0.04 0.04 -0.03
+       vertex -0.04666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.02
+       vertex -0.04666667 0.04 -0.01
+       vertex -0.04 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.01
+       vertex -0.04 0.04 -0.02
+       vertex -0.04666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 -0.01
+       vertex -0.04666667 0.04 0
+       vertex -0.04 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0
+       vertex -0.04 0.04 -0.01
+       vertex -0.04666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0
+       vertex -0.04666667 0.04 0.01
+       vertex -0.04 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.01
+       vertex -0.04 0.04 0
+       vertex -0.04666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.01
+       vertex -0.04666667 0.04 0.02
+       vertex -0.04 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.02
+       vertex -0.04 0.04 0.01
+       vertex -0.04666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.02
+       vertex -0.04666667 0.04 0.03
+       vertex -0.04 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.03
+       vertex -0.04 0.04 0.02
+       vertex -0.04666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.03
+       vertex -0.04666667 0.04 0.04
+       vertex -0.04 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.04
+       vertex -0.04 0.04 0.03
+       vertex -0.04666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04666667 0.04 0.04
+       vertex -0.04666667 0.04 0.05
+       vertex -0.04 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.05
+       vertex -0.04 0.04 0.04
+       vertex -0.04666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.05
+       vertex -0.04 0.04 -0.04
+       vertex -0.03333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.04
+       vertex -0.03333333 0.04 -0.05
+       vertex -0.04 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.04
+       vertex -0.04 0.04 -0.03
+       vertex -0.03333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.03
+       vertex -0.03333333 0.04 -0.04
+       vertex -0.04 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.03
+       vertex -0.04 0.04 -0.02
+       vertex -0.03333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.02
+       vertex -0.03333333 0.04 -0.03
+       vertex -0.04 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.02
+       vertex -0.04 0.04 -0.01
+       vertex -0.03333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.01
+       vertex -0.03333333 0.04 -0.02
+       vertex -0.04 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 -0.01
+       vertex -0.04 0.04 0
+       vertex -0.03333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0
+       vertex -0.03333333 0.04 -0.01
+       vertex -0.04 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0
+       vertex -0.04 0.04 0.01
+       vertex -0.03333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.01
+       vertex -0.03333333 0.04 0
+       vertex -0.04 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.01
+       vertex -0.04 0.04 0.02
+       vertex -0.03333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.02
+       vertex -0.03333333 0.04 0.01
+       vertex -0.04 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.02
+       vertex -0.04 0.04 0.03
+       vertex -0.03333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.03
+       vertex -0.03333333 0.04 0.02
+       vertex -0.04 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.03
+       vertex -0.04 0.04 0.04
+       vertex -0.03333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.04
+       vertex -0.03333333 0.04 0.03
+       vertex -0.04 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.04 0.04 0.04
+       vertex -0.04 0.04 0.05
+       vertex -0.03333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.05
+       vertex -0.03333333 0.04 0.04
+       vertex -0.04 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.05
+       vertex -0.03333333 0.04 -0.04
+       vertex -0.02666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.04
+       vertex -0.02666667 0.04 -0.05
+       vertex -0.03333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.04
+       vertex -0.03333333 0.04 -0.03
+       vertex -0.02666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.03
+       vertex -0.02666667 0.04 -0.04
+       vertex -0.03333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.03
+       vertex -0.03333333 0.04 -0.02
+       vertex -0.02666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.02
+       vertex -0.02666667 0.04 -0.03
+       vertex -0.03333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.02
+       vertex -0.03333333 0.04 -0.01
+       vertex -0.02666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.01
+       vertex -0.02666667 0.04 -0.02
+       vertex -0.03333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 -0.01
+       vertex -0.03333333 0.04 0
+       vertex -0.02666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0
+       vertex -0.02666667 0.04 -0.01
+       vertex -0.03333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0
+       vertex -0.03333333 0.04 0.01
+       vertex -0.02666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.01
+       vertex -0.02666667 0.04 0
+       vertex -0.03333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.01
+       vertex -0.03333333 0.04 0.02
+       vertex -0.02666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.02
+       vertex -0.02666667 0.04 0.01
+       vertex -0.03333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.02
+       vertex -0.03333333 0.04 0.03
+       vertex -0.02666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.03
+       vertex -0.02666667 0.04 0.02
+       vertex -0.03333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.03
+       vertex -0.03333333 0.04 0.04
+       vertex -0.02666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.04
+       vertex -0.02666667 0.04 0.03
+       vertex -0.03333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.03333333 0.04 0.04
+       vertex -0.03333333 0.04 0.05
+       vertex -0.02666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.05
+       vertex -0.02666667 0.04 0.04
+       vertex -0.03333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.05
+       vertex -0.02666667 0.04 -0.04
+       vertex -0.02 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.04
+       vertex -0.02 0.04 -0.05
+       vertex -0.02666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.04
+       vertex -0.02666667 0.04 -0.03
+       vertex -0.02 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.03
+       vertex -0.02 0.04 -0.04
+       vertex -0.02666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.03
+       vertex -0.02666667 0.04 -0.02
+       vertex -0.02 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.02
+       vertex -0.02 0.04 -0.03
+       vertex -0.02666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.02
+       vertex -0.02666667 0.04 -0.01
+       vertex -0.02 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.01
+       vertex -0.02 0.04 -0.02
+       vertex -0.02666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 -0.01
+       vertex -0.02666667 0.04 0
+       vertex -0.02 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0
+       vertex -0.02 0.04 -0.01
+       vertex -0.02666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0
+       vertex -0.02666667 0.04 0.01
+       vertex -0.02 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.01
+       vertex -0.02 0.04 0
+       vertex -0.02666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.01
+       vertex -0.02666667 0.04 0.02
+       vertex -0.02 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.02
+       vertex -0.02 0.04 0.01
+       vertex -0.02666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.02
+       vertex -0.02666667 0.04 0.03
+       vertex -0.02 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.03
+       vertex -0.02 0.04 0.02
+       vertex -0.02666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.03
+       vertex -0.02666667 0.04 0.04
+       vertex -0.02 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.04
+       vertex -0.02 0.04 0.03
+       vertex -0.02666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02666667 0.04 0.04
+       vertex -0.02666667 0.04 0.05
+       vertex -0.02 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.05
+       vertex -0.02 0.04 0.04
+       vertex -0.02666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.05
+       vertex -0.02 0.04 -0.04
+       vertex -0.01333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.04
+       vertex -0.01333333 0.04 -0.05
+       vertex -0.02 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.04
+       vertex -0.02 0.04 -0.03
+       vertex -0.01333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.03
+       vertex -0.01333333 0.04 -0.04
+       vertex -0.02 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.03
+       vertex -0.02 0.04 -0.02
+       vertex -0.01333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.02
+       vertex -0.01333333 0.04 -0.03
+       vertex -0.02 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.02
+       vertex -0.02 0.04 -0.01
+       vertex -0.01333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.01
+       vertex -0.01333333 0.04 -0.02
+       vertex -0.02 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 -0.01
+       vertex -0.02 0.04 0
+       vertex -0.01333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0
+       vertex -0.01333333 0.04 -0.01
+       vertex -0.02 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0
+       vertex -0.02 0.04 0.01
+       vertex -0.01333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.01
+       vertex -0.01333333 0.04 0
+       vertex -0.02 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.01
+       vertex -0.02 0.04 0.02
+       vertex -0.01333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.02
+       vertex -0.01333333 0.04 0.01
+       vertex -0.02 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.02
+       vertex -0.02 0.04 0.03
+       vertex -0.01333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.03
+       vertex -0.01333333 0.04 0.02
+       vertex -0.02 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.03
+       vertex -0.02 0.04 0.04
+       vertex -0.01333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.04
+       vertex -0.01333333 0.04 0.03
+       vertex -0.02 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.02 0.04 0.04
+       vertex -0.02 0.04 0.05
+       vertex -0.01333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.05
+       vertex -0.01333333 0.04 0.04
+       vertex -0.02 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.05
+       vertex -0.01333333 0.04 -0.04
+       vertex -0.006666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.04
+       vertex -0.006666667 0.04 -0.05
+       vertex -0.01333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.04
+       vertex -0.01333333 0.04 -0.03
+       vertex -0.006666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.03
+       vertex -0.006666667 0.04 -0.04
+       vertex -0.01333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.03
+       vertex -0.01333333 0.04 -0.02
+       vertex -0.006666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.02
+       vertex -0.006666667 0.04 -0.03
+       vertex -0.01333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.02
+       vertex -0.01333333 0.04 -0.01
+       vertex -0.006666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.01
+       vertex -0.006666667 0.04 -0.02
+       vertex -0.01333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 -0.01
+       vertex -0.01333333 0.04 0
+       vertex -0.006666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0
+       vertex -0.006666667 0.04 -0.01
+       vertex -0.01333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0
+       vertex -0.01333333 0.04 0.01
+       vertex -0.006666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.01
+       vertex -0.006666667 0.04 0
+       vertex -0.01333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.01
+       vertex -0.01333333 0.04 0.02
+       vertex -0.006666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.02
+       vertex -0.006666667 0.04 0.01
+       vertex -0.01333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.02
+       vertex -0.01333333 0.04 0.03
+       vertex -0.006666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.03
+       vertex -0.006666667 0.04 0.02
+       vertex -0.01333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.03
+       vertex -0.01333333 0.04 0.04
+       vertex -0.006666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.04
+       vertex -0.006666667 0.04 0.03
+       vertex -0.01333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.01333333 0.04 0.04
+       vertex -0.01333333 0.04 0.05
+       vertex -0.006666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.05
+       vertex -0.006666667 0.04 0.04
+       vertex -0.01333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.05
+       vertex -0.006666667 0.04 -0.04
+       vertex 0 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.04
+       vertex 0 0.04 -0.05
+       vertex -0.006666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.04
+       vertex -0.006666667 0.04 -0.03
+       vertex 0 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.03
+       vertex 0 0.04 -0.04
+       vertex -0.006666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.03
+       vertex -0.006666667 0.04 -0.02
+       vertex 0 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.02
+       vertex 0 0.04 -0.03
+       vertex -0.006666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.02
+       vertex -0.006666667 0.04 -0.01
+       vertex 0 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.01
+       vertex 0 0.04 -0.02
+       vertex -0.006666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 -0.01
+       vertex -0.006666667 0.04 0
+       vertex 0 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0
+       vertex 0 0.04 -0.01
+       vertex -0.006666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0
+       vertex -0.006666667 0.04 0.01
+       vertex 0 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.01
+       vertex 0 0.04 0
+       vertex -0.006666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.01
+       vertex -0.006666667 0.04 0.02
+       vertex 0 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.02
+       vertex 0 0.04 0.01
+       vertex -0.006666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.02
+       vertex -0.006666667 0.04 0.03
+       vertex 0 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.03
+       vertex 0 0.04 0.02
+       vertex -0.006666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.03
+       vertex -0.006666667 0.04 0.04
+       vertex 0 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.04
+       vertex 0 0.04 0.03
+       vertex -0.006666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex -0.006666667 0.04 0.04
+       vertex -0.006666667 0.04 0.05
+       vertex 0 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.05
+       vertex 0 0.04 0.04
+       vertex -0.006666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.05
+       vertex 0 0.04 -0.04
+       vertex 0.006666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.04
+       vertex 0.006666667 0.04 -0.05
+       vertex 0 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.04
+       vertex 0 0.04 -0.03
+       vertex 0.006666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.03
+       vertex 0.006666667 0.04 -0.04
+       vertex 0 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.03
+       vertex 0 0.04 -0.02
+       vertex 0.006666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.02
+       vertex 0.006666667 0.04 -0.03
+       vertex 0 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.02
+       vertex 0 0.04 -0.01
+       vertex 0.006666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.01
+       vertex 0.006666667 0.04 -0.02
+       vertex 0 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 -0.01
+       vertex 0 0.04 0
+       vertex 0.006666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0
+       vertex 0.006666667 0.04 -0.01
+       vertex 0 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0
+       vertex 0 0.04 0.01
+       vertex 0.006666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.01
+       vertex 0.006666667 0.04 0
+       vertex 0 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.01
+       vertex 0 0.04 0.02
+       vertex 0.006666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.02
+       vertex 0.006666667 0.04 0.01
+       vertex 0 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.02
+       vertex 0 0.04 0.03
+       vertex 0.006666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.03
+       vertex 0.006666667 0.04 0.02
+       vertex 0 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.03
+       vertex 0 0.04 0.04
+       vertex 0.006666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.04
+       vertex 0.006666667 0.04 0.03
+       vertex 0 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0 0.04 0.04
+       vertex 0 0.04 0.05
+       vertex 0.006666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.05
+       vertex 0.006666667 0.04 0.04
+       vertex 0 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.05
+       vertex 0.006666667 0.04 -0.04
+       vertex 0.01333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.04
+       vertex 0.01333333 0.04 -0.05
+       vertex 0.006666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.04
+       vertex 0.006666667 0.04 -0.03
+       vertex 0.01333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.03
+       vertex 0.01333333 0.04 -0.04
+       vertex 0.006666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.03
+       vertex 0.006666667 0.04 -0.02
+       vertex 0.01333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.02
+       vertex 0.01333333 0.04 -0.03
+       vertex 0.006666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.02
+       vertex 0.006666667 0.04 -0.01
+       vertex 0.01333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.01
+       vertex 0.01333333 0.04 -0.02
+       vertex 0.006666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 -0.01
+       vertex 0.006666667 0.04 0
+       vertex 0.01333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0
+       vertex 0.01333333 0.04 -0.01
+       vertex 0.006666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0
+       vertex 0.006666667 0.04 0.01
+       vertex 0.01333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.01
+       vertex 0.01333333 0.04 0
+       vertex 0.006666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.01
+       vertex 0.006666667 0.04 0.02
+       vertex 0.01333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.02
+       vertex 0.01333333 0.04 0.01
+       vertex 0.006666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.02
+       vertex 0.006666667 0.04 0.03
+       vertex 0.01333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.03
+       vertex 0.01333333 0.04 0.02
+       vertex 0.006666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.03
+       vertex 0.006666667 0.04 0.04
+       vertex 0.01333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.04
+       vertex 0.01333333 0.04 0.03
+       vertex 0.006666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.006666667 0.04 0.04
+       vertex 0.006666667 0.04 0.05
+       vertex 0.01333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.05
+       vertex 0.01333333 0.04 0.04
+       vertex 0.006666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.05
+       vertex 0.01333333 0.04 -0.04
+       vertex 0.02 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.04
+       vertex 0.02 0.04 -0.05
+       vertex 0.01333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.04
+       vertex 0.01333333 0.04 -0.03
+       vertex 0.02 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.03
+       vertex 0.02 0.04 -0.04
+       vertex 0.01333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.03
+       vertex 0.01333333 0.04 -0.02
+       vertex 0.02 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.02
+       vertex 0.02 0.04 -0.03
+       vertex 0.01333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.02
+       vertex 0.01333333 0.04 -0.01
+       vertex 0.02 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.01
+       vertex 0.02 0.04 -0.02
+       vertex 0.01333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 -0.01
+       vertex 0.01333333 0.04 0
+       vertex 0.02 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0
+       vertex 0.02 0.04 -0.01
+       vertex 0.01333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0
+       vertex 0.01333333 0.04 0.01
+       vertex 0.02 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.01
+       vertex 0.02 0.04 0
+       vertex 0.01333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.01
+       vertex 0.01333333 0.04 0.02
+       vertex 0.02 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.02
+       vertex 0.02 0.04 0.01
+       vertex 0.01333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.02
+       vertex 0.01333333 0.04 0.03
+       vertex 0.02 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.03
+       vertex 0.02 0.04 0.02
+       vertex 0.01333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.03
+       vertex 0.01333333 0.04 0.04
+       vertex 0.02 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.04
+       vertex 0.02 0.04 0.03
+       vertex 0.01333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.01333333 0.04 0.04
+       vertex 0.01333333 0.04 0.05
+       vertex 0.02 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.05
+       vertex 0.02 0.04 0.04
+       vertex 0.01333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.05
+       vertex 0.02 0.04 -0.04
+       vertex 0.02666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.04
+       vertex 0.02666667 0.04 -0.05
+       vertex 0.02 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.04
+       vertex 0.02 0.04 -0.03
+       vertex 0.02666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.03
+       vertex 0.02666667 0.04 -0.04
+       vertex 0.02 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.03
+       vertex 0.02 0.04 -0.02
+       vertex 0.02666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.02
+       vertex 0.02666667 0.04 -0.03
+       vertex 0.02 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.02
+       vertex 0.02 0.04 -0.01
+       vertex 0.02666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.01
+       vertex 0.02666667 0.04 -0.02
+       vertex 0.02 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 -0.01
+       vertex 0.02 0.04 0
+       vertex 0.02666667 0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 5.782412e-19
+       vertex 0.02666667 0.04 -0.01
+       vertex 0.02 0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.02 0.04 0.01
+       vertex 0.02666667 0.04 0.01
+       vertex 0.02666667 0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 5.782412e-19
+       vertex 0.02 0.04 0
+       vertex 0.02 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.01
+       vertex 0.02 0.04 0.02
+       vertex 0.02666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.02
+       vertex 0.02666667 0.04 0.01
+       vertex 0.02 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.02
+       vertex 0.02 0.04 0.03
+       vertex 0.02666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.03
+       vertex 0.02666667 0.04 0.02
+       vertex 0.02 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.03
+       vertex 0.02 0.04 0.04
+       vertex 0.02666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.04
+       vertex 0.02666667 0.04 0.03
+       vertex 0.02 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02 0.04 0.04
+       vertex 0.02 0.04 0.05
+       vertex 0.02666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.05
+       vertex 0.02666667 0.04 0.04
+       vertex 0.02 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.05
+       vertex 0.02666667 0.04 -0.04
+       vertex 0.03333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.04
+       vertex 0.03333333 0.04 -0.05
+       vertex 0.02666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.04
+       vertex 0.02666667 0.04 -0.03
+       vertex 0.03333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.03
+       vertex 0.03333333 0.04 -0.04
+       vertex 0.02666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.03
+       vertex 0.02666667 0.04 -0.02
+       vertex 0.03333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.02
+       vertex 0.03333333 0.04 -0.03
+       vertex 0.02666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.02
+       vertex 0.02666667 0.04 -0.01
+       vertex 0.03333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.01
+       vertex 0.03333333 0.04 -0.02
+       vertex 0.02666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 -0.01
+       vertex 0.02666667 0.04 5.782412e-19
+       vertex 0.03333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0
+       vertex 0.03333333 0.04 -0.01
+       vertex 0.02666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 5.782412e-19
+       vertex 0.02666667 0.04 0.01
+       vertex 0.03333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.01
+       vertex 0.03333333 0.04 0
+       vertex 0.02666667 0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.01
+       vertex 0.02666667 0.04 0.02
+       vertex 0.03333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.02
+       vertex 0.03333333 0.04 0.01
+       vertex 0.02666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.02
+       vertex 0.02666667 0.04 0.03
+       vertex 0.03333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.03
+       vertex 0.03333333 0.04 0.02
+       vertex 0.02666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.03
+       vertex 0.02666667 0.04 0.04
+       vertex 0.03333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.04
+       vertex 0.03333333 0.04 0.03
+       vertex 0.02666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.02666667 0.04 0.04
+       vertex 0.02666667 0.04 0.05
+       vertex 0.03333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.05
+       vertex 0.03333333 0.04 0.04
+       vertex 0.02666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.05
+       vertex 0.03333333 0.04 -0.04
+       vertex 0.04 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.04
+       vertex 0.04 0.04 -0.05
+       vertex 0.03333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.04
+       vertex 0.03333333 0.04 -0.03
+       vertex 0.04 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.03
+       vertex 0.04 0.04 -0.04
+       vertex 0.03333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.03
+       vertex 0.03333333 0.04 -0.02
+       vertex 0.04 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.02
+       vertex 0.04 0.04 -0.03
+       vertex 0.03333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.02
+       vertex 0.03333333 0.04 -0.01
+       vertex 0.04 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.01
+       vertex 0.04 0.04 -0.02
+       vertex 0.03333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 -0.01
+       vertex 0.03333333 0.04 0
+       vertex 0.04 0.04 -5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -5.782412e-19
+       vertex 0.04 0.04 -0.01
+       vertex 0.03333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0
+       vertex 0.03333333 0.04 0.01
+       vertex 0.04 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.01
+       vertex 0.04 0.04 -5.782412e-19
+       vertex 0.03333333 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.01
+       vertex 0.03333333 0.04 0.02
+       vertex 0.04 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.02
+       vertex 0.04 0.04 0.01
+       vertex 0.03333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.02
+       vertex 0.03333333 0.04 0.03
+       vertex 0.04 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.03
+       vertex 0.04 0.04 0.02
+       vertex 0.03333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.03
+       vertex 0.03333333 0.04 0.04
+       vertex 0.04 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.04
+       vertex 0.04 0.04 0.03
+       vertex 0.03333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.03333333 0.04 0.04
+       vertex 0.03333333 0.04 0.05
+       vertex 0.04 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.05
+       vertex 0.04 0.04 0.04
+       vertex 0.03333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.05
+       vertex 0.04 0.04 -0.04
+       vertex 0.04666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.04
+       vertex 0.04666667 0.04 -0.05
+       vertex 0.04 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.04
+       vertex 0.04 0.04 -0.03
+       vertex 0.04666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.03
+       vertex 0.04666667 0.04 -0.04
+       vertex 0.04 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.03
+       vertex 0.04 0.04 -0.02
+       vertex 0.04666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.02
+       vertex 0.04666667 0.04 -0.03
+       vertex 0.04 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.02
+       vertex 0.04 0.04 -0.01
+       vertex 0.04666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.01
+       vertex 0.04666667 0.04 -0.02
+       vertex 0.04 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 -0.01
+       vertex 0.04 0.04 -5.782412e-19
+       vertex 0.04666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0
+       vertex 0.04666667 0.04 -0.01
+       vertex 0.04 0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.04 0.04 0.01
+       vertex 0.04666667 0.04 0.01
+       vertex 0.04666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0
+       vertex 0.04 0.04 -5.782412e-19
+       vertex 0.04 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.01
+       vertex 0.04 0.04 0.02
+       vertex 0.04666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.02
+       vertex 0.04666667 0.04 0.01
+       vertex 0.04 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.02
+       vertex 0.04 0.04 0.03
+       vertex 0.04666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.03
+       vertex 0.04666667 0.04 0.02
+       vertex 0.04 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.03
+       vertex 0.04 0.04 0.04
+       vertex 0.04666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.04
+       vertex 0.04666667 0.04 0.03
+       vertex 0.04 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04 0.04 0.04
+       vertex 0.04 0.04 0.05
+       vertex 0.04666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.05
+       vertex 0.04666667 0.04 0.04
+       vertex 0.04 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.05
+       vertex 0.04666667 0.04 -0.04
+       vertex 0.05333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.04
+       vertex 0.05333333 0.04 -0.05
+       vertex 0.04666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.04
+       vertex 0.04666667 0.04 -0.03
+       vertex 0.05333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.03
+       vertex 0.05333333 0.04 -0.04
+       vertex 0.04666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.03
+       vertex 0.04666667 0.04 -0.02
+       vertex 0.05333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.02
+       vertex 0.05333333 0.04 -0.03
+       vertex 0.04666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.02
+       vertex 0.04666667 0.04 -0.01
+       vertex 0.05333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.01
+       vertex 0.05333333 0.04 -0.02
+       vertex 0.04666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 -0.01
+       vertex 0.04666667 0.04 0
+       vertex 0.05333333 0.04 -2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -2.891206e-19
+       vertex 0.05333333 0.04 -0.01
+       vertex 0.04666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0
+       vertex 0.04666667 0.04 0.01
+       vertex 0.05333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.01
+       vertex 0.05333333 0.04 -2.891206e-19
+       vertex 0.04666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.01
+       vertex 0.04666667 0.04 0.02
+       vertex 0.05333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.02
+       vertex 0.05333333 0.04 0.01
+       vertex 0.04666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.02
+       vertex 0.04666667 0.04 0.03
+       vertex 0.05333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.03
+       vertex 0.05333333 0.04 0.02
+       vertex 0.04666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.03
+       vertex 0.04666667 0.04 0.04
+       vertex 0.05333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.04
+       vertex 0.05333333 0.04 0.03
+       vertex 0.04666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.04666667 0.04 0.04
+       vertex 0.04666667 0.04 0.05
+       vertex 0.05333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.05
+       vertex 0.05333333 0.04 0.04
+       vertex 0.04666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.05
+       vertex 0.05333333 0.04 -0.04
+       vertex 0.06 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.04
+       vertex 0.06 0.04 -0.05
+       vertex 0.05333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.04
+       vertex 0.05333333 0.04 -0.03
+       vertex 0.06 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.03
+       vertex 0.06 0.04 -0.04
+       vertex 0.05333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.03
+       vertex 0.05333333 0.04 -0.02
+       vertex 0.06 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.02
+       vertex 0.06 0.04 -0.03
+       vertex 0.05333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.02
+       vertex 0.05333333 0.04 -0.01
+       vertex 0.06 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.01
+       vertex 0.06 0.04 -0.02
+       vertex 0.05333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 -0.01
+       vertex 0.05333333 0.04 -2.891206e-19
+       vertex 0.06 0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 5.782412e-19
+       vertex 0.06 0.04 -0.01
+       vertex 0.05333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.01
+       vertex 0.06 0.04 0.01
+       vertex 0.06 0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 5.782412e-19
+       vertex 0.05333333 0.04 -2.891206e-19
+       vertex 0.05333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.01
+       vertex 0.05333333 0.04 0.02
+       vertex 0.06 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.02
+       vertex 0.06 0.04 0.01
+       vertex 0.05333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.02
+       vertex 0.05333333 0.04 0.03
+       vertex 0.06 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.03
+       vertex 0.06 0.04 0.02
+       vertex 0.05333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.03
+       vertex 0.05333333 0.04 0.04
+       vertex 0.06 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.04
+       vertex 0.06 0.04 0.03
+       vertex 0.05333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.05333333 0.04 0.04
+       vertex 0.05333333 0.04 0.05
+       vertex 0.06 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.05
+       vertex 0.06 0.04 0.04
+       vertex 0.05333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.05
+       vertex 0.06 0.04 -0.04
+       vertex 0.06666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.04
+       vertex 0.06666667 0.04 -0.05
+       vertex 0.06 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.04
+       vertex 0.06 0.04 -0.03
+       vertex 0.06666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.03
+       vertex 0.06666667 0.04 -0.04
+       vertex 0.06 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.03
+       vertex 0.06 0.04 -0.02
+       vertex 0.06666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.02
+       vertex 0.06666667 0.04 -0.03
+       vertex 0.06 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.02
+       vertex 0.06 0.04 -0.01
+       vertex 0.06666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.01
+       vertex 0.06666667 0.04 -0.02
+       vertex 0.06 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 -0.01
+       vertex 0.06 0.04 5.782412e-19
+       vertex 0.06666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0
+       vertex 0.06666667 0.04 -0.01
+       vertex 0.06 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 5.782412e-19
+       vertex 0.06 0.04 0.01
+       vertex 0.06666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.01
+       vertex 0.06666667 0.04 0
+       vertex 0.06 0.04 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.01
+       vertex 0.06 0.04 0.02
+       vertex 0.06666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.02
+       vertex 0.06666667 0.04 0.01
+       vertex 0.06 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.02
+       vertex 0.06 0.04 0.03
+       vertex 0.06666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.03
+       vertex 0.06666667 0.04 0.02
+       vertex 0.06 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.03
+       vertex 0.06 0.04 0.04
+       vertex 0.06666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.04
+       vertex 0.06666667 0.04 0.03
+       vertex 0.06 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06 0.04 0.04
+       vertex 0.06 0.04 0.05
+       vertex 0.06666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.05
+       vertex 0.06666667 0.04 0.04
+       vertex 0.06 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.05
+       vertex 0.06666667 0.04 -0.04
+       vertex 0.07333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.04
+       vertex 0.07333333 0.04 -0.05
+       vertex 0.06666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.04
+       vertex 0.06666667 0.04 -0.03
+       vertex 0.07333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.03
+       vertex 0.07333333 0.04 -0.04
+       vertex 0.06666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.03
+       vertex 0.06666667 0.04 -0.02
+       vertex 0.07333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.02
+       vertex 0.07333333 0.04 -0.03
+       vertex 0.06666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.02
+       vertex 0.06666667 0.04 -0.01
+       vertex 0.07333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.01
+       vertex 0.07333333 0.04 -0.02
+       vertex 0.06666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 -0.01
+       vertex 0.06666667 0.04 0
+       vertex 0.07333333 0.04 -4.336809e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -4.336809e-19
+       vertex 0.07333333 0.04 -0.01
+       vertex 0.06666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0
+       vertex 0.06666667 0.04 0.01
+       vertex 0.07333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.01
+       vertex 0.07333333 0.04 -4.336809e-19
+       vertex 0.06666667 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.01
+       vertex 0.06666667 0.04 0.02
+       vertex 0.07333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.02
+       vertex 0.07333333 0.04 0.01
+       vertex 0.06666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.02
+       vertex 0.06666667 0.04 0.03
+       vertex 0.07333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.03
+       vertex 0.07333333 0.04 0.02
+       vertex 0.06666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.03
+       vertex 0.06666667 0.04 0.04
+       vertex 0.07333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.04
+       vertex 0.07333333 0.04 0.03
+       vertex 0.06666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.06666667 0.04 0.04
+       vertex 0.06666667 0.04 0.05
+       vertex 0.07333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.05
+       vertex 0.07333333 0.04 0.04
+       vertex 0.06666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.05
+       vertex 0.07333333 0.04 -0.04
+       vertex 0.08 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.04
+       vertex 0.08 0.04 -0.05
+       vertex 0.07333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.04
+       vertex 0.07333333 0.04 -0.03
+       vertex 0.08 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.03
+       vertex 0.08 0.04 -0.04
+       vertex 0.07333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.03
+       vertex 0.07333333 0.04 -0.02
+       vertex 0.08 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.02
+       vertex 0.08 0.04 -0.03
+       vertex 0.07333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.02
+       vertex 0.07333333 0.04 -0.01
+       vertex 0.08 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.01
+       vertex 0.08 0.04 -0.02
+       vertex 0.07333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 -0.01
+       vertex 0.07333333 0.04 -4.336809e-19
+       vertex 0.08 0.04 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 2.891206e-19
+       vertex 0.08 0.04 -0.01
+       vertex 0.07333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.01
+       vertex 0.08 0.04 0.01
+       vertex 0.08 0.04 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 2.891206e-19
+       vertex 0.07333333 0.04 -4.336809e-19
+       vertex 0.07333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.01
+       vertex 0.07333333 0.04 0.02
+       vertex 0.08 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.02
+       vertex 0.08 0.04 0.01
+       vertex 0.07333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.02
+       vertex 0.07333333 0.04 0.03
+       vertex 0.08 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.03
+       vertex 0.08 0.04 0.02
+       vertex 0.07333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.03
+       vertex 0.07333333 0.04 0.04
+       vertex 0.08 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.04
+       vertex 0.08 0.04 0.03
+       vertex 0.07333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.07333333 0.04 0.04
+       vertex 0.07333333 0.04 0.05
+       vertex 0.08 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.05
+       vertex 0.08 0.04 0.04
+       vertex 0.07333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.05
+       vertex 0.08 0.04 -0.04
+       vertex 0.08666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.04
+       vertex 0.08666667 0.04 -0.05
+       vertex 0.08 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.04
+       vertex 0.08 0.04 -0.03
+       vertex 0.08666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.03
+       vertex 0.08666667 0.04 -0.04
+       vertex 0.08 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.03
+       vertex 0.08 0.04 -0.02
+       vertex 0.08666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.02
+       vertex 0.08666667 0.04 -0.03
+       vertex 0.08 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.02
+       vertex 0.08 0.04 -0.01
+       vertex 0.08666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.01
+       vertex 0.08666667 0.04 -0.02
+       vertex 0.08 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 -0.01
+       vertex 0.08 0.04 2.891206e-19
+       vertex 0.08666667 0.04 -2.168404e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -2.168404e-19
+       vertex 0.08666667 0.04 -0.01
+       vertex 0.08 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 2.891206e-19
+       vertex 0.08 0.04 0.01
+       vertex 0.08666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.01
+       vertex 0.08666667 0.04 -2.168404e-19
+       vertex 0.08 0.04 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.01
+       vertex 0.08 0.04 0.02
+       vertex 0.08666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.02
+       vertex 0.08666667 0.04 0.01
+       vertex 0.08 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.02
+       vertex 0.08 0.04 0.03
+       vertex 0.08666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.03
+       vertex 0.08666667 0.04 0.02
+       vertex 0.08 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.03
+       vertex 0.08 0.04 0.04
+       vertex 0.08666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.04
+       vertex 0.08666667 0.04 0.03
+       vertex 0.08 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08 0.04 0.04
+       vertex 0.08 0.04 0.05
+       vertex 0.08666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.05
+       vertex 0.08666667 0.04 0.04
+       vertex 0.08 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.05
+       vertex 0.08666667 0.04 -0.04
+       vertex 0.09333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.04
+       vertex 0.09333333 0.04 -0.05
+       vertex 0.08666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.04
+       vertex 0.08666667 0.04 -0.03
+       vertex 0.09333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.03
+       vertex 0.09333333 0.04 -0.04
+       vertex 0.08666667 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.03
+       vertex 0.08666667 0.04 -0.02
+       vertex 0.09333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.02
+       vertex 0.09333333 0.04 -0.03
+       vertex 0.08666667 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.02
+       vertex 0.08666667 0.04 -0.01
+       vertex 0.09333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.01
+       vertex 0.09333333 0.04 -0.02
+       vertex 0.08666667 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 -0.01
+       vertex 0.08666667 0.04 -2.168404e-19
+       vertex 0.09333333 0.04 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 4.698209e-19
+       vertex 0.09333333 0.04 -0.01
+       vertex 0.08666667 0.04 -0.01
+    endloop
+  endfacet
+  facet normal -0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.01
+       vertex 0.09333333 0.04 0.01
+       vertex 0.09333333 0.04 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 4.698209e-19
+       vertex 0.08666667 0.04 -2.168404e-19
+       vertex 0.08666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.01
+       vertex 0.08666667 0.04 0.02
+       vertex 0.09333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.02
+       vertex 0.09333333 0.04 0.01
+       vertex 0.08666667 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.02
+       vertex 0.08666667 0.04 0.03
+       vertex 0.09333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.03
+       vertex 0.09333333 0.04 0.02
+       vertex 0.08666667 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.03
+       vertex 0.08666667 0.04 0.04
+       vertex 0.09333333 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.04
+       vertex 0.09333333 0.04 0.03
+       vertex 0.08666667 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.08666667 0.04 0.04
+       vertex 0.08666667 0.04 0.05
+       vertex 0.09333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.05
+       vertex 0.09333333 0.04 0.04
+       vertex 0.08666667 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.05
+       vertex 0.09333333 0.04 -0.04
+       vertex 0.1 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 -0.04
+       vertex 0.1 0.04 -0.05
+       vertex 0.09333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.04
+       vertex 0.09333333 0.04 -0.03
+       vertex 0.1 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 -0.03
+       vertex 0.1 0.04 -0.04
+       vertex 0.09333333 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.03
+       vertex 0.09333333 0.04 -0.02
+       vertex 0.1 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 -0.02
+       vertex 0.1 0.04 -0.03
+       vertex 0.09333333 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.02
+       vertex 0.09333333 0.04 -0.01
+       vertex 0.1 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 -0.01
+       vertex 0.1 0.04 -0.02
+       vertex 0.09333333 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 -0.01
+       vertex 0.09333333 0.04 4.698209e-19
+       vertex 0.1 0.04 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 0
+       vertex 0.1 0.04 -0.01
+       vertex 0.09333333 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 4.698209e-19
+       vertex 0.09333333 0.04 0.01
+       vertex 0.1 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 0.01
+       vertex 0.1 0.04 0
+       vertex 0.09333333 0.04 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.01
+       vertex 0.09333333 0.04 0.02
+       vertex 0.1 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 0.02
+       vertex 0.1 0.04 0.01
+       vertex 0.09333333 0.04 0.01
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.02
+       vertex 0.09333333 0.04 0.03
+       vertex 0.1 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 0.03
+       vertex 0.1 0.04 0.02
+       vertex 0.09333333 0.04 0.02
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.03
+       vertex 0.09333333 0.04 0.04
+       vertex 0.1 0.04 0.04
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 0.04
+       vertex 0.1 0.04 0.03
+       vertex 0.09333333 0.04 0.03
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.09333333 0.04 0.04
+       vertex 0.09333333 0.04 0.05
+       vertex 0.1 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+       vertex 0.1 0.04 0.05
+       vertex 0.1 0.04 0.04
+       vertex 0.09333333 0.04 0.04
+    endloop
+  endfacet
+endsolid maxY
+solid minX
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 -0.05
+       vertex -0.1 0.008 -0.04
+       vertex -0.1 0.016 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 -0.04
+       vertex -0.1 0.016 -0.05
+       vertex -0.1 0.008 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 -0.05
+       vertex -0.1 0.016 -0.04
+       vertex -0.1 0.024 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 -0.04
+       vertex -0.1 0.024 -0.05
+       vertex -0.1 0.016 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 -0.05
+       vertex -0.1 0.024 -0.04
+       vertex -0.1 0.032 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 -0.04
+       vertex -0.1 0.032 -0.05
+       vertex -0.1 0.024 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 -0.05
+       vertex -0.1 0.032 -0.04
+       vertex -0.1 0.04 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 -0.04
+       vertex -0.1 0.04 -0.05
+       vertex -0.1 0.032 -0.05
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 -0.04
+       vertex -0.1 0.008 -0.03
+       vertex -0.1 0.016 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 -0.03
+       vertex -0.1 0.016 -0.04
+       vertex -0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 -0.04
+       vertex -0.1 0.016 -0.03
+       vertex -0.1 0.024 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 -0.03
+       vertex -0.1 0.024 -0.04
+       vertex -0.1 0.016 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 -0.04
+       vertex -0.1 0.024 -0.03
+       vertex -0.1 0.032 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 -0.03
+       vertex -0.1 0.032 -0.04
+       vertex -0.1 0.024 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 -0.04
+       vertex -0.1 0.032 -0.03
+       vertex -0.1 0.04 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 -0.03
+       vertex -0.1 0.04 -0.04
+       vertex -0.1 0.032 -0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 -0.03
+       vertex -0.1 0.008 -0.02
+       vertex -0.1 0.016 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 -0.02
+       vertex -0.1 0.016 -0.03
+       vertex -0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 -0.03
+       vertex -0.1 0.016 -0.02
+       vertex -0.1 0.024 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 -0.02
+       vertex -0.1 0.024 -0.03
+       vertex -0.1 0.016 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 -0.03
+       vertex -0.1 0.024 -0.02
+       vertex -0.1 0.032 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 -0.02
+       vertex -0.1 0.032 -0.03
+       vertex -0.1 0.024 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 -0.03
+       vertex -0.1 0.032 -0.02
+       vertex -0.1 0.04 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 -0.02
+       vertex -0.1 0.04 -0.03
+       vertex -0.1 0.032 -0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 -0.02
+       vertex -0.1 0.008 -0.01
+       vertex -0.1 0.016 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 -0.01
+       vertex -0.1 0.016 -0.02
+       vertex -0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 -0.02
+       vertex -0.1 0.016 -0.01
+       vertex -0.1 0.024 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 -0.01
+       vertex -0.1 0.024 -0.02
+       vertex -0.1 0.016 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 -0.02
+       vertex -0.1 0.024 -0.01
+       vertex -0.1 0.032 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 -0.01
+       vertex -0.1 0.032 -0.02
+       vertex -0.1 0.024 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 -0.02
+       vertex -0.1 0.032 -0.01
+       vertex -0.1 0.04 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 -0.01
+       vertex -0.1 0.04 -0.02
+       vertex -0.1 0.032 -0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 -0.01
+       vertex -0.1 0.008 0
+       vertex -0.1 0.016 -2.891206e-19
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 -2.891206e-19
+       vertex -0.1 0.016 -0.01
+       vertex -0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 -0.01
+       vertex -0.1 0.016 -2.891206e-19
+       vertex -0.1 0.024 5.782412e-19
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 5.782412e-19
+       vertex -0.1 0.024 -0.01
+       vertex -0.1 0.016 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 -0.01
+       vertex -0.1 0.024 5.782412e-19
+       vertex -0.1 0.032 2.891206e-19
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 2.891206e-19
+       vertex -0.1 0.032 -0.01
+       vertex -0.1 0.024 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 -0.01
+       vertex -0.1 0.032 2.891206e-19
+       vertex -0.1 0.04 0
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 0
+       vertex -0.1 0.04 -0.01
+       vertex -0.1 0.032 -0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 0
+       vertex -0.1 0.008 0.01
+       vertex -0.1 0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 0.01
+       vertex -0.1 0.016 -2.891206e-19
+       vertex -0.1 0.008 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 0.01
+       vertex -0.1 0.024 0.01
+       vertex -0.1 0.024 5.782412e-19
+    endloop
+  endfacet
+  facet normal -1 -0 0
+    outer loop
+       vertex -0.1 0.024 5.782412e-19
+       vertex -0.1 0.016 -2.891206e-19
+       vertex -0.1 0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 5.782412e-19
+       vertex -0.1 0.024 0.01
+       vertex -0.1 0.032 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 0.01
+       vertex -0.1 0.032 2.891206e-19
+       vertex -0.1 0.024 5.782412e-19
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 2.891206e-19
+       vertex -0.1 0.032 0.01
+       vertex -0.1 0.04 0.01
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 0.01
+       vertex -0.1 0.04 0
+       vertex -0.1 0.032 2.891206e-19
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 0.01
+       vertex -0.1 0.008 0.02
+       vertex -0.1 0.016 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 0.02
+       vertex -0.1 0.016 0.01
+       vertex -0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 0.01
+       vertex -0.1 0.016 0.02
+       vertex -0.1 0.024 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 0.02
+       vertex -0.1 0.024 0.01
+       vertex -0.1 0.016 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 0.01
+       vertex -0.1 0.024 0.02
+       vertex -0.1 0.032 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 0.02
+       vertex -0.1 0.032 0.01
+       vertex -0.1 0.024 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 0.01
+       vertex -0.1 0.032 0.02
+       vertex -0.1 0.04 0.02
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 0.02
+       vertex -0.1 0.04 0.01
+       vertex -0.1 0.032 0.01
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 0.02
+       vertex -0.1 0.008 0.03
+       vertex -0.1 0.016 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 0.03
+       vertex -0.1 0.016 0.02
+       vertex -0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 0.02
+       vertex -0.1 0.016 0.03
+       vertex -0.1 0.024 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 0.03
+       vertex -0.1 0.024 0.02
+       vertex -0.1 0.016 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 0.02
+       vertex -0.1 0.024 0.03
+       vertex -0.1 0.032 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 0.03
+       vertex -0.1 0.032 0.02
+       vertex -0.1 0.024 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 0.02
+       vertex -0.1 0.032 0.03
+       vertex -0.1 0.04 0.03
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 0.03
+       vertex -0.1 0.04 0.02
+       vertex -0.1 0.032 0.02
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 0.03
+       vertex -0.1 0.008 0.04
+       vertex -0.1 0.016 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 0.04
+       vertex -0.1 0.016 0.03
+       vertex -0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 0.03
+       vertex -0.1 0.016 0.04
+       vertex -0.1 0.024 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 0.04
+       vertex -0.1 0.024 0.03
+       vertex -0.1 0.016 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 0.03
+       vertex -0.1 0.024 0.04
+       vertex -0.1 0.032 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 0.04
+       vertex -0.1 0.032 0.03
+       vertex -0.1 0.024 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 0.03
+       vertex -0.1 0.032 0.04
+       vertex -0.1 0.04 0.04
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 0.04
+       vertex -0.1 0.04 0.03
+       vertex -0.1 0.032 0.03
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.008 0.04
+       vertex -0.1 0.008 0.05
+       vertex -0.1 0.016 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.016 0.05
+       vertex -0.1 0.016 0.04
+       vertex -0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.016 0.04
+       vertex -0.1 0.016 0.05
+       vertex -0.1 0.024 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.024 0.05
+       vertex -0.1 0.024 0.04
+       vertex -0.1 0.016 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.024 0.04
+       vertex -0.1 0.024 0.05
+       vertex -0.1 0.032 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.032 0.05
+       vertex -0.1 0.032 0.04
+       vertex -0.1 0.024 0.04
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+       vertex -0.1 0.032 0.04
+       vertex -0.1 0.032 0.05
+       vertex -0.1 0.04 0.05
+    endloop
+  endfacet
+  facet normal -1 0 -0
+    outer loop
+       vertex -0.1 0.04 0.05
+       vertex -0.1 0.04 0.04
+       vertex -0.1 0.032 0.04
+    endloop
+  endfacet
+endsolid minX
+solid maxX
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.05
+       vertex 0.1 0.016 -0.05
+       vertex 0.1 0.016 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.04
+       vertex 0.1 0.008 -0.04
+       vertex 0.1 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.05
+       vertex 0.1 0.024 -0.05
+       vertex 0.1 0.024 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.04
+       vertex 0.1 0.016 -0.04
+       vertex 0.1 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.05
+       vertex 0.1 0.032 -0.05
+       vertex 0.1 0.032 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.04
+       vertex 0.1 0.024 -0.04
+       vertex 0.1 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.05
+       vertex 0.1 0.04 -0.05
+       vertex 0.1 0.04 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 -0.04
+       vertex 0.1 0.032 -0.04
+       vertex 0.1 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.04
+       vertex 0.1 0.016 -0.04
+       vertex 0.1 0.016 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.03
+       vertex 0.1 0.008 -0.03
+       vertex 0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.04
+       vertex 0.1 0.024 -0.04
+       vertex 0.1 0.024 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.03
+       vertex 0.1 0.016 -0.03
+       vertex 0.1 0.016 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.04
+       vertex 0.1 0.032 -0.04
+       vertex 0.1 0.032 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.03
+       vertex 0.1 0.024 -0.03
+       vertex 0.1 0.024 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.04
+       vertex 0.1 0.04 -0.04
+       vertex 0.1 0.04 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 -0.03
+       vertex 0.1 0.032 -0.03
+       vertex 0.1 0.032 -0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.03
+       vertex 0.1 0.016 -0.03
+       vertex 0.1 0.016 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.02
+       vertex 0.1 0.008 -0.02
+       vertex 0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.03
+       vertex 0.1 0.024 -0.03
+       vertex 0.1 0.024 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.02
+       vertex 0.1 0.016 -0.02
+       vertex 0.1 0.016 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.03
+       vertex 0.1 0.032 -0.03
+       vertex 0.1 0.032 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.02
+       vertex 0.1 0.024 -0.02
+       vertex 0.1 0.024 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.03
+       vertex 0.1 0.04 -0.03
+       vertex 0.1 0.04 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 -0.02
+       vertex 0.1 0.032 -0.02
+       vertex 0.1 0.032 -0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.02
+       vertex 0.1 0.016 -0.02
+       vertex 0.1 0.016 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.01
+       vertex 0.1 0.008 -0.01
+       vertex 0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.02
+       vertex 0.1 0.024 -0.02
+       vertex 0.1 0.024 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.01
+       vertex 0.1 0.016 -0.01
+       vertex 0.1 0.016 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.02
+       vertex 0.1 0.032 -0.02
+       vertex 0.1 0.032 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.01
+       vertex 0.1 0.024 -0.01
+       vertex 0.1 0.024 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.02
+       vertex 0.1 0.04 -0.02
+       vertex 0.1 0.04 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 -0.01
+       vertex 0.1 0.032 -0.01
+       vertex 0.1 0.032 -0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 -0.01
+       vertex 0.1 0.016 -0.01
+       vertex 0.1 0.016 -2.891206e-19
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -2.891206e-19
+       vertex 0.1 0.008 0
+       vertex 0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 -0.01
+       vertex 0.1 0.024 -0.01
+       vertex 0.1 0.024 5.782412e-19
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 5.782412e-19
+       vertex 0.1 0.016 -2.891206e-19
+       vertex 0.1 0.016 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 -0.01
+       vertex 0.1 0.032 -0.01
+       vertex 0.1 0.032 2.891206e-19
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 2.891206e-19
+       vertex 0.1 0.024 5.782412e-19
+       vertex 0.1 0.024 -0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 -0.01
+       vertex 0.1 0.04 -0.01
+       vertex 0.1 0.04 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 0
+       vertex 0.1 0.032 2.891206e-19
+       vertex 0.1 0.032 -0.01
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.1 0.008 0
+       vertex 0.1 0.016 -2.891206e-19
+       vertex 0.1 0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.01
+       vertex 0.1 0.008 0.01
+       vertex 0.1 0.008 0
+    endloop
+  endfacet
+  facet normal 1 0 -0
+    outer loop
+       vertex 0.1 0.024 5.782412e-19
+       vertex 0.1 0.024 0.01
+       vertex 0.1 0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.01
+       vertex 0.1 0.016 -2.891206e-19
+       vertex 0.1 0.024 5.782412e-19
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.1 0.024 5.782412e-19
+       vertex 0.1 0.032 2.891206e-19
+       vertex 0.1 0.032 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.01
+       vertex 0.1 0.024 0.01
+       vertex 0.1 0.024 5.782412e-19
+    endloop
+  endfacet
+  facet normal 1 -0 0
+    outer loop
+       vertex 0.1 0.032 2.891206e-19
+       vertex 0.1 0.04 0
+       vertex 0.1 0.04 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 0.01
+       vertex 0.1 0.032 0.01
+       vertex 0.1 0.032 2.891206e-19
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.01
+       vertex 0.1 0.016 0.01
+       vertex 0.1 0.016 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.02
+       vertex 0.1 0.008 0.02
+       vertex 0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.01
+       vertex 0.1 0.024 0.01
+       vertex 0.1 0.024 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.02
+       vertex 0.1 0.016 0.02
+       vertex 0.1 0.016 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.01
+       vertex 0.1 0.032 0.01
+       vertex 0.1 0.032 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.02
+       vertex 0.1 0.024 0.02
+       vertex 0.1 0.024 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.01
+       vertex 0.1 0.04 0.01
+       vertex 0.1 0.04 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 0.02
+       vertex 0.1 0.032 0.02
+       vertex 0.1 0.032 0.01
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.02
+       vertex 0.1 0.016 0.02
+       vertex 0.1 0.016 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.03
+       vertex 0.1 0.008 0.03
+       vertex 0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.02
+       vertex 0.1 0.024 0.02
+       vertex 0.1 0.024 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.03
+       vertex 0.1 0.016 0.03
+       vertex 0.1 0.016 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.02
+       vertex 0.1 0.032 0.02
+       vertex 0.1 0.032 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.03
+       vertex 0.1 0.024 0.03
+       vertex 0.1 0.024 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.02
+       vertex 0.1 0.04 0.02
+       vertex 0.1 0.04 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 0.03
+       vertex 0.1 0.032 0.03
+       vertex 0.1 0.032 0.02
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.03
+       vertex 0.1 0.016 0.03
+       vertex 0.1 0.016 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.04
+       vertex 0.1 0.008 0.04
+       vertex 0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.03
+       vertex 0.1 0.024 0.03
+       vertex 0.1 0.024 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.04
+       vertex 0.1 0.016 0.04
+       vertex 0.1 0.016 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.03
+       vertex 0.1 0.032 0.03
+       vertex 0.1 0.032 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.04
+       vertex 0.1 0.024 0.04
+       vertex 0.1 0.024 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.03
+       vertex 0.1 0.04 0.03
+       vertex 0.1 0.04 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 0.04
+       vertex 0.1 0.032 0.04
+       vertex 0.1 0.032 0.03
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.008 0.04
+       vertex 0.1 0.016 0.04
+       vertex 0.1 0.016 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.05
+       vertex 0.1 0.008 0.05
+       vertex 0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.016 0.04
+       vertex 0.1 0.024 0.04
+       vertex 0.1 0.024 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.05
+       vertex 0.1 0.016 0.05
+       vertex 0.1 0.016 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.024 0.04
+       vertex 0.1 0.032 0.04
+       vertex 0.1 0.032 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.05
+       vertex 0.1 0.024 0.05
+       vertex 0.1 0.024 0.04
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.032 0.04
+       vertex 0.1 0.04 0.04
+       vertex 0.1 0.04 0.05
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+       vertex 0.1 0.04 0.05
+       vertex 0.1 0.032 0.05
+       vertex 0.1 0.032 0.04
+    endloop
+  endfacet
+endsolid maxX
+solid minZ
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 0.008 -0.05
+       vertex -0.1 0.016 -0.05
+       vertex -0.09333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 0.016 -0.05
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.1 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 0.016 -0.05
+       vertex -0.1 0.024 -0.05
+       vertex -0.09333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 0.024 -0.05
+       vertex -0.09333333 0.016 -0.05
+       vertex -0.1 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 0.024 -0.05
+       vertex -0.1 0.032 -0.05
+       vertex -0.09333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 0.032 -0.05
+       vertex -0.09333333 0.024 -0.05
+       vertex -0.1 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.1 0.032 -0.05
+       vertex -0.1 0.04 -0.05
+       vertex -0.09333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.09333333 0.04 -0.05
+       vertex -0.09333333 0.032 -0.05
+       vertex -0.1 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.09333333 0.016 -0.05
+       vertex -0.08666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 0.016 -0.05
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 0.016 -0.05
+       vertex -0.09333333 0.024 -0.05
+       vertex -0.08666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 0.024 -0.05
+       vertex -0.08666667 0.016 -0.05
+       vertex -0.09333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 0.024 -0.05
+       vertex -0.09333333 0.032 -0.05
+       vertex -0.08666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 0.032 -0.05
+       vertex -0.08666667 0.024 -0.05
+       vertex -0.09333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.09333333 0.032 -0.05
+       vertex -0.09333333 0.04 -0.05
+       vertex -0.08666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08666667 0.04 -0.05
+       vertex -0.08666667 0.032 -0.05
+       vertex -0.09333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.08666667 0.016 -0.05
+       vertex -0.08 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 0.016 -0.05
+       vertex -0.08 0.008 -0.05
+       vertex -0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 0.016 -0.05
+       vertex -0.08666667 0.024 -0.05
+       vertex -0.08 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 0.024 -0.05
+       vertex -0.08 0.016 -0.05
+       vertex -0.08666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 0.024 -0.05
+       vertex -0.08666667 0.032 -0.05
+       vertex -0.08 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 0.032 -0.05
+       vertex -0.08 0.024 -0.05
+       vertex -0.08666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08666667 0.032 -0.05
+       vertex -0.08666667 0.04 -0.05
+       vertex -0.08 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.08 0.04 -0.05
+       vertex -0.08 0.032 -0.05
+       vertex -0.08666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 0.008 -0.05
+       vertex -0.08 0.016 -0.05
+       vertex -0.07333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 0.016 -0.05
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 0.016 -0.05
+       vertex -0.08 0.024 -0.05
+       vertex -0.07333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 0.024 -0.05
+       vertex -0.07333333 0.016 -0.05
+       vertex -0.08 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 0.024 -0.05
+       vertex -0.08 0.032 -0.05
+       vertex -0.07333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 0.032 -0.05
+       vertex -0.07333333 0.024 -0.05
+       vertex -0.08 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.08 0.032 -0.05
+       vertex -0.08 0.04 -0.05
+       vertex -0.07333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.07333333 0.04 -0.05
+       vertex -0.07333333 0.032 -0.05
+       vertex -0.08 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.07333333 0.016 -0.05
+       vertex -0.06666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 0.016 -0.05
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 0.016 -0.05
+       vertex -0.07333333 0.024 -0.05
+       vertex -0.06666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 0.024 -0.05
+       vertex -0.06666667 0.016 -0.05
+       vertex -0.07333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 0.024 -0.05
+       vertex -0.07333333 0.032 -0.05
+       vertex -0.06666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 0.032 -0.05
+       vertex -0.06666667 0.024 -0.05
+       vertex -0.07333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.07333333 0.032 -0.05
+       vertex -0.07333333 0.04 -0.05
+       vertex -0.06666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06666667 0.04 -0.05
+       vertex -0.06666667 0.032 -0.05
+       vertex -0.07333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.06666667 0.016 -0.05
+       vertex -0.06 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 0.016 -0.05
+       vertex -0.06 0.008 -0.05
+       vertex -0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 0.016 -0.05
+       vertex -0.06666667 0.024 -0.05
+       vertex -0.06 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 0.024 -0.05
+       vertex -0.06 0.016 -0.05
+       vertex -0.06666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 0.024 -0.05
+       vertex -0.06666667 0.032 -0.05
+       vertex -0.06 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 0.032 -0.05
+       vertex -0.06 0.024 -0.05
+       vertex -0.06666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06666667 0.032 -0.05
+       vertex -0.06666667 0.04 -0.05
+       vertex -0.06 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.06 0.04 -0.05
+       vertex -0.06 0.032 -0.05
+       vertex -0.06666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 0.008 -0.05
+       vertex -0.06 0.016 -0.05
+       vertex -0.05333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 0.016 -0.05
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 0.016 -0.05
+       vertex -0.06 0.024 -0.05
+       vertex -0.05333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 0.024 -0.05
+       vertex -0.05333333 0.016 -0.05
+       vertex -0.06 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 0.024 -0.05
+       vertex -0.06 0.032 -0.05
+       vertex -0.05333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 0.032 -0.05
+       vertex -0.05333333 0.024 -0.05
+       vertex -0.06 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.06 0.032 -0.05
+       vertex -0.06 0.04 -0.05
+       vertex -0.05333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.05333333 0.04 -0.05
+       vertex -0.05333333 0.032 -0.05
+       vertex -0.06 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.05333333 0.016 -0.05
+       vertex -0.04666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 0.016 -0.05
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 0.016 -0.05
+       vertex -0.05333333 0.024 -0.05
+       vertex -0.04666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 0.024 -0.05
+       vertex -0.04666667 0.016 -0.05
+       vertex -0.05333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 0.024 -0.05
+       vertex -0.05333333 0.032 -0.05
+       vertex -0.04666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 0.032 -0.05
+       vertex -0.04666667 0.024 -0.05
+       vertex -0.05333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.05333333 0.032 -0.05
+       vertex -0.05333333 0.04 -0.05
+       vertex -0.04666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04666667 0.04 -0.05
+       vertex -0.04666667 0.032 -0.05
+       vertex -0.05333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.04666667 0.016 -0.05
+       vertex -0.04 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 0.016 -0.05
+       vertex -0.04 0.008 -0.05
+       vertex -0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 0.016 -0.05
+       vertex -0.04666667 0.024 -0.05
+       vertex -0.04 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 0.024 -0.05
+       vertex -0.04 0.016 -0.05
+       vertex -0.04666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 0.024 -0.05
+       vertex -0.04666667 0.032 -0.05
+       vertex -0.04 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 0.032 -0.05
+       vertex -0.04 0.024 -0.05
+       vertex -0.04666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04666667 0.032 -0.05
+       vertex -0.04666667 0.04 -0.05
+       vertex -0.04 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.04 0.04 -0.05
+       vertex -0.04 0.032 -0.05
+       vertex -0.04666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 0.008 -0.05
+       vertex -0.04 0.016 -0.05
+       vertex -0.03333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 0.016 -0.05
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 0.016 -0.05
+       vertex -0.04 0.024 -0.05
+       vertex -0.03333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 0.024 -0.05
+       vertex -0.03333333 0.016 -0.05
+       vertex -0.04 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 0.024 -0.05
+       vertex -0.04 0.032 -0.05
+       vertex -0.03333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 0.032 -0.05
+       vertex -0.03333333 0.024 -0.05
+       vertex -0.04 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.04 0.032 -0.05
+       vertex -0.04 0.04 -0.05
+       vertex -0.03333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.03333333 0.04 -0.05
+       vertex -0.03333333 0.032 -0.05
+       vertex -0.04 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.03333333 0.016 -0.05
+       vertex -0.02666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 0.016 -0.05
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 0.016 -0.05
+       vertex -0.03333333 0.024 -0.05
+       vertex -0.02666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 0.024 -0.05
+       vertex -0.02666667 0.016 -0.05
+       vertex -0.03333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 0.024 -0.05
+       vertex -0.03333333 0.032 -0.05
+       vertex -0.02666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 0.032 -0.05
+       vertex -0.02666667 0.024 -0.05
+       vertex -0.03333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.03333333 0.032 -0.05
+       vertex -0.03333333 0.04 -0.05
+       vertex -0.02666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02666667 0.04 -0.05
+       vertex -0.02666667 0.032 -0.05
+       vertex -0.03333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.02666667 0.016 -0.05
+       vertex -0.02 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 0.016 -0.05
+       vertex -0.02 0.008 -0.05
+       vertex -0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 0.016 -0.05
+       vertex -0.02666667 0.024 -0.05
+       vertex -0.02 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 0.024 -0.05
+       vertex -0.02 0.016 -0.05
+       vertex -0.02666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 0.024 -0.05
+       vertex -0.02666667 0.032 -0.05
+       vertex -0.02 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 0.032 -0.05
+       vertex -0.02 0.024 -0.05
+       vertex -0.02666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02666667 0.032 -0.05
+       vertex -0.02666667 0.04 -0.05
+       vertex -0.02 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.02 0.04 -0.05
+       vertex -0.02 0.032 -0.05
+       vertex -0.02666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 0.008 -0.05
+       vertex -0.02 0.016 -0.05
+       vertex -0.01333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 0.016 -0.05
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 0.016 -0.05
+       vertex -0.02 0.024 -0.05
+       vertex -0.01333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 0.024 -0.05
+       vertex -0.01333333 0.016 -0.05
+       vertex -0.02 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 0.024 -0.05
+       vertex -0.02 0.032 -0.05
+       vertex -0.01333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 0.032 -0.05
+       vertex -0.01333333 0.024 -0.05
+       vertex -0.02 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.02 0.032 -0.05
+       vertex -0.02 0.04 -0.05
+       vertex -0.01333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.01333333 0.04 -0.05
+       vertex -0.01333333 0.032 -0.05
+       vertex -0.02 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.01333333 0.016 -0.05
+       vertex -0.006666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0.016 -0.05
+       vertex -0.006666667 0.008 -0.05
+       vertex -0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 0.016 -0.05
+       vertex -0.01333333 0.024 -0.05
+       vertex -0.006666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0.024 -0.05
+       vertex -0.006666667 0.016 -0.05
+       vertex -0.01333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 0.024 -0.05
+       vertex -0.01333333 0.032 -0.05
+       vertex -0.006666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0.032 -0.05
+       vertex -0.006666667 0.024 -0.05
+       vertex -0.01333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.01333333 0.032 -0.05
+       vertex -0.01333333 0.04 -0.05
+       vertex -0.006666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex -0.006666667 0.04 -0.05
+       vertex -0.006666667 0.032 -0.05
+       vertex -0.01333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 0.008 -0.05
+       vertex -0.006666667 0.016 -0.05
+       vertex 0 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0.016 -0.05
+       vertex 0 0.008 -0.05
+       vertex -0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 0.016 -0.05
+       vertex -0.006666667 0.024 -0.05
+       vertex 0 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0.024 -0.05
+       vertex 0 0.016 -0.05
+       vertex -0.006666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 0.024 -0.05
+       vertex -0.006666667 0.032 -0.05
+       vertex 0 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0.032 -0.05
+       vertex 0 0.024 -0.05
+       vertex -0.006666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex -0.006666667 0.032 -0.05
+       vertex -0.006666667 0.04 -0.05
+       vertex 0 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0 0.04 -0.05
+       vertex 0 0.032 -0.05
+       vertex -0.006666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 0.008 -0.05
+       vertex 0 0.016 -0.05
+       vertex 0.006666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0.016 -0.05
+       vertex 0.006666667 0.008 -0.05
+       vertex 0 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 0.016 -0.05
+       vertex 0 0.024 -0.05
+       vertex 0.006666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0.024 -0.05
+       vertex 0.006666667 0.016 -0.05
+       vertex 0 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 0.024 -0.05
+       vertex 0 0.032 -0.05
+       vertex 0.006666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0.032 -0.05
+       vertex 0.006666667 0.024 -0.05
+       vertex 0 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0 0.032 -0.05
+       vertex 0 0.04 -0.05
+       vertex 0.006666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.006666667 0.04 -0.05
+       vertex 0.006666667 0.032 -0.05
+       vertex 0 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 0.008 -0.05
+       vertex 0.006666667 0.016 -0.05
+       vertex 0.01333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0.016 -0.05
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 0.016 -0.05
+       vertex 0.006666667 0.024 -0.05
+       vertex 0.01333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0.024 -0.05
+       vertex 0.01333333 0.016 -0.05
+       vertex 0.006666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 0.024 -0.05
+       vertex 0.006666667 0.032 -0.05
+       vertex 0.01333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0.032 -0.05
+       vertex 0.01333333 0.024 -0.05
+       vertex 0.006666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.006666667 0.032 -0.05
+       vertex 0.006666667 0.04 -0.05
+       vertex 0.01333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.01333333 0.04 -0.05
+       vertex 0.01333333 0.032 -0.05
+       vertex 0.006666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.01333333 0.016 -0.05
+       vertex 0.02 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 0.016 -0.05
+       vertex 0.02 0.008 -0.05
+       vertex 0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 0.016 -0.05
+       vertex 0.01333333 0.024 -0.05
+       vertex 0.02 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 0.024 -0.05
+       vertex 0.02 0.016 -0.05
+       vertex 0.01333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 0.024 -0.05
+       vertex 0.01333333 0.032 -0.05
+       vertex 0.02 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 0.032 -0.05
+       vertex 0.02 0.024 -0.05
+       vertex 0.01333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.01333333 0.032 -0.05
+       vertex 0.01333333 0.04 -0.05
+       vertex 0.02 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02 0.04 -0.05
+       vertex 0.02 0.032 -0.05
+       vertex 0.01333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 0.008 -0.05
+       vertex 0.02 0.016 -0.05
+       vertex 0.02666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 0.016 -0.05
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 0.016 -0.05
+       vertex 0.02 0.024 -0.05
+       vertex 0.02666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 0.024 -0.05
+       vertex 0.02666667 0.016 -0.05
+       vertex 0.02 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 0.024 -0.05
+       vertex 0.02 0.032 -0.05
+       vertex 0.02666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 0.032 -0.05
+       vertex 0.02666667 0.024 -0.05
+       vertex 0.02 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02 0.032 -0.05
+       vertex 0.02 0.04 -0.05
+       vertex 0.02666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.02666667 0.04 -0.05
+       vertex 0.02666667 0.032 -0.05
+       vertex 0.02 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.02666667 0.016 -0.05
+       vertex 0.03333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 0.016 -0.05
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 0.016 -0.05
+       vertex 0.02666667 0.024 -0.05
+       vertex 0.03333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 0.024 -0.05
+       vertex 0.03333333 0.016 -0.05
+       vertex 0.02666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 0.024 -0.05
+       vertex 0.02666667 0.032 -0.05
+       vertex 0.03333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 0.032 -0.05
+       vertex 0.03333333 0.024 -0.05
+       vertex 0.02666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.02666667 0.032 -0.05
+       vertex 0.02666667 0.04 -0.05
+       vertex 0.03333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.03333333 0.04 -0.05
+       vertex 0.03333333 0.032 -0.05
+       vertex 0.02666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.03333333 0.016 -0.05
+       vertex 0.04 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 0.016 -0.05
+       vertex 0.04 0.008 -0.05
+       vertex 0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 0.016 -0.05
+       vertex 0.03333333 0.024 -0.05
+       vertex 0.04 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 0.024 -0.05
+       vertex 0.04 0.016 -0.05
+       vertex 0.03333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 0.024 -0.05
+       vertex 0.03333333 0.032 -0.05
+       vertex 0.04 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 0.032 -0.05
+       vertex 0.04 0.024 -0.05
+       vertex 0.03333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.03333333 0.032 -0.05
+       vertex 0.03333333 0.04 -0.05
+       vertex 0.04 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04 0.04 -0.05
+       vertex 0.04 0.032 -0.05
+       vertex 0.03333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 0.008 -0.05
+       vertex 0.04 0.016 -0.05
+       vertex 0.04666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 0.016 -0.05
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 0.016 -0.05
+       vertex 0.04 0.024 -0.05
+       vertex 0.04666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 0.024 -0.05
+       vertex 0.04666667 0.016 -0.05
+       vertex 0.04 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 0.024 -0.05
+       vertex 0.04 0.032 -0.05
+       vertex 0.04666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 0.032 -0.05
+       vertex 0.04666667 0.024 -0.05
+       vertex 0.04 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04 0.032 -0.05
+       vertex 0.04 0.04 -0.05
+       vertex 0.04666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.04666667 0.04 -0.05
+       vertex 0.04666667 0.032 -0.05
+       vertex 0.04 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.04666667 0.016 -0.05
+       vertex 0.05333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 0.016 -0.05
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 0.016 -0.05
+       vertex 0.04666667 0.024 -0.05
+       vertex 0.05333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 0.024 -0.05
+       vertex 0.05333333 0.016 -0.05
+       vertex 0.04666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 0.024 -0.05
+       vertex 0.04666667 0.032 -0.05
+       vertex 0.05333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 0.032 -0.05
+       vertex 0.05333333 0.024 -0.05
+       vertex 0.04666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.04666667 0.032 -0.05
+       vertex 0.04666667 0.04 -0.05
+       vertex 0.05333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.05333333 0.04 -0.05
+       vertex 0.05333333 0.032 -0.05
+       vertex 0.04666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.05333333 0.016 -0.05
+       vertex 0.06 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 0.016 -0.05
+       vertex 0.06 0.008 -0.05
+       vertex 0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 0.016 -0.05
+       vertex 0.05333333 0.024 -0.05
+       vertex 0.06 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 0.024 -0.05
+       vertex 0.06 0.016 -0.05
+       vertex 0.05333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 0.024 -0.05
+       vertex 0.05333333 0.032 -0.05
+       vertex 0.06 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 0.032 -0.05
+       vertex 0.06 0.024 -0.05
+       vertex 0.05333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.05333333 0.032 -0.05
+       vertex 0.05333333 0.04 -0.05
+       vertex 0.06 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06 0.04 -0.05
+       vertex 0.06 0.032 -0.05
+       vertex 0.05333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 0.008 -0.05
+       vertex 0.06 0.016 -0.05
+       vertex 0.06666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 0.016 -0.05
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 0.016 -0.05
+       vertex 0.06 0.024 -0.05
+       vertex 0.06666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 0.024 -0.05
+       vertex 0.06666667 0.016 -0.05
+       vertex 0.06 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 0.024 -0.05
+       vertex 0.06 0.032 -0.05
+       vertex 0.06666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 0.032 -0.05
+       vertex 0.06666667 0.024 -0.05
+       vertex 0.06 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06 0.032 -0.05
+       vertex 0.06 0.04 -0.05
+       vertex 0.06666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.06666667 0.04 -0.05
+       vertex 0.06666667 0.032 -0.05
+       vertex 0.06 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.06666667 0.016 -0.05
+       vertex 0.07333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 0.016 -0.05
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 0.016 -0.05
+       vertex 0.06666667 0.024 -0.05
+       vertex 0.07333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 0.024 -0.05
+       vertex 0.07333333 0.016 -0.05
+       vertex 0.06666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 0.024 -0.05
+       vertex 0.06666667 0.032 -0.05
+       vertex 0.07333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 0.032 -0.05
+       vertex 0.07333333 0.024 -0.05
+       vertex 0.06666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.06666667 0.032 -0.05
+       vertex 0.06666667 0.04 -0.05
+       vertex 0.07333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.07333333 0.04 -0.05
+       vertex 0.07333333 0.032 -0.05
+       vertex 0.06666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.07333333 0.016 -0.05
+       vertex 0.08 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 0.016 -0.05
+       vertex 0.08 0.008 -0.05
+       vertex 0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 0.016 -0.05
+       vertex 0.07333333 0.024 -0.05
+       vertex 0.08 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 0.024 -0.05
+       vertex 0.08 0.016 -0.05
+       vertex 0.07333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 0.024 -0.05
+       vertex 0.07333333 0.032 -0.05
+       vertex 0.08 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 0.032 -0.05
+       vertex 0.08 0.024 -0.05
+       vertex 0.07333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.07333333 0.032 -0.05
+       vertex 0.07333333 0.04 -0.05
+       vertex 0.08 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08 0.04 -0.05
+       vertex 0.08 0.032 -0.05
+       vertex 0.07333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 0.008 -0.05
+       vertex 0.08 0.016 -0.05
+       vertex 0.08666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 0.016 -0.05
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 0.016 -0.05
+       vertex 0.08 0.024 -0.05
+       vertex 0.08666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 0.024 -0.05
+       vertex 0.08666667 0.016 -0.05
+       vertex 0.08 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 0.024 -0.05
+       vertex 0.08 0.032 -0.05
+       vertex 0.08666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 0.032 -0.05
+       vertex 0.08666667 0.024 -0.05
+       vertex 0.08 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08 0.032 -0.05
+       vertex 0.08 0.04 -0.05
+       vertex 0.08666667 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.08666667 0.04 -0.05
+       vertex 0.08666667 0.032 -0.05
+       vertex 0.08 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.08666667 0.016 -0.05
+       vertex 0.09333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 0.016 -0.05
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 0.016 -0.05
+       vertex 0.08666667 0.024 -0.05
+       vertex 0.09333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 0.024 -0.05
+       vertex 0.09333333 0.016 -0.05
+       vertex 0.08666667 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 0.024 -0.05
+       vertex 0.08666667 0.032 -0.05
+       vertex 0.09333333 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 0.032 -0.05
+       vertex 0.09333333 0.024 -0.05
+       vertex 0.08666667 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.08666667 0.032 -0.05
+       vertex 0.08666667 0.04 -0.05
+       vertex 0.09333333 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.09333333 0.04 -0.05
+       vertex 0.09333333 0.032 -0.05
+       vertex 0.08666667 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.09333333 0.016 -0.05
+       vertex 0.1 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 0.016 -0.05
+       vertex 0.1 0.008 -0.05
+       vertex 0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 0.016 -0.05
+       vertex 0.09333333 0.024 -0.05
+       vertex 0.1 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 0.024 -0.05
+       vertex 0.1 0.016 -0.05
+       vertex 0.09333333 0.016 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 0.024 -0.05
+       vertex 0.09333333 0.032 -0.05
+       vertex 0.1 0.032 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 0.032 -0.05
+       vertex 0.1 0.024 -0.05
+       vertex 0.09333333 0.024 -0.05
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+       vertex 0.09333333 0.032 -0.05
+       vertex 0.09333333 0.04 -0.05
+       vertex 0.1 0.04 -0.05
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+       vertex 0.1 0.04 -0.05
+       vertex 0.1 0.032 -0.05
+       vertex 0.09333333 0.032 -0.05
+    endloop
+  endfacet
+endsolid minZ
+solid maxZ
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 0.008 0.05
+       vertex -0.09333333 0.008 0.05
+       vertex -0.09333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.016 0.05
+       vertex -0.1 0.016 0.05
+       vertex -0.1 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 0.016 0.05
+       vertex -0.09333333 0.016 0.05
+       vertex -0.09333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.024 0.05
+       vertex -0.1 0.024 0.05
+       vertex -0.1 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 0.024 0.05
+       vertex -0.09333333 0.024 0.05
+       vertex -0.09333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.032 0.05
+       vertex -0.1 0.032 0.05
+       vertex -0.1 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.1 0.032 0.05
+       vertex -0.09333333 0.032 0.05
+       vertex -0.09333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.04 0.05
+       vertex -0.1 0.04 0.05
+       vertex -0.1 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.008 0.05
+       vertex -0.08666667 0.008 0.05
+       vertex -0.08666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.016 0.05
+       vertex -0.09333333 0.016 0.05
+       vertex -0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.016 0.05
+       vertex -0.08666667 0.016 0.05
+       vertex -0.08666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.024 0.05
+       vertex -0.09333333 0.024 0.05
+       vertex -0.09333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.024 0.05
+       vertex -0.08666667 0.024 0.05
+       vertex -0.08666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.032 0.05
+       vertex -0.09333333 0.032 0.05
+       vertex -0.09333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.09333333 0.032 0.05
+       vertex -0.08666667 0.032 0.05
+       vertex -0.08666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.04 0.05
+       vertex -0.09333333 0.04 0.05
+       vertex -0.09333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.008 0.05
+       vertex -0.08 0.008 0.05
+       vertex -0.08 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.016 0.05
+       vertex -0.08666667 0.016 0.05
+       vertex -0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.016 0.05
+       vertex -0.08 0.016 0.05
+       vertex -0.08 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.024 0.05
+       vertex -0.08666667 0.024 0.05
+       vertex -0.08666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.024 0.05
+       vertex -0.08 0.024 0.05
+       vertex -0.08 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.032 0.05
+       vertex -0.08666667 0.032 0.05
+       vertex -0.08666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08666667 0.032 0.05
+       vertex -0.08 0.032 0.05
+       vertex -0.08 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.04 0.05
+       vertex -0.08666667 0.04 0.05
+       vertex -0.08666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.008 0.05
+       vertex -0.07333333 0.008 0.05
+       vertex -0.07333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.016 0.05
+       vertex -0.08 0.016 0.05
+       vertex -0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.016 0.05
+       vertex -0.07333333 0.016 0.05
+       vertex -0.07333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.024 0.05
+       vertex -0.08 0.024 0.05
+       vertex -0.08 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.024 0.05
+       vertex -0.07333333 0.024 0.05
+       vertex -0.07333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.032 0.05
+       vertex -0.08 0.032 0.05
+       vertex -0.08 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.08 0.032 0.05
+       vertex -0.07333333 0.032 0.05
+       vertex -0.07333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.04 0.05
+       vertex -0.08 0.04 0.05
+       vertex -0.08 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.008 0.05
+       vertex -0.06666667 0.008 0.05
+       vertex -0.06666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.016 0.05
+       vertex -0.07333333 0.016 0.05
+       vertex -0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.016 0.05
+       vertex -0.06666667 0.016 0.05
+       vertex -0.06666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.024 0.05
+       vertex -0.07333333 0.024 0.05
+       vertex -0.07333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.024 0.05
+       vertex -0.06666667 0.024 0.05
+       vertex -0.06666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.032 0.05
+       vertex -0.07333333 0.032 0.05
+       vertex -0.07333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.07333333 0.032 0.05
+       vertex -0.06666667 0.032 0.05
+       vertex -0.06666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.04 0.05
+       vertex -0.07333333 0.04 0.05
+       vertex -0.07333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.008 0.05
+       vertex -0.06 0.008 0.05
+       vertex -0.06 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.016 0.05
+       vertex -0.06666667 0.016 0.05
+       vertex -0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.016 0.05
+       vertex -0.06 0.016 0.05
+       vertex -0.06 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.024 0.05
+       vertex -0.06666667 0.024 0.05
+       vertex -0.06666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.024 0.05
+       vertex -0.06 0.024 0.05
+       vertex -0.06 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.032 0.05
+       vertex -0.06666667 0.032 0.05
+       vertex -0.06666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06666667 0.032 0.05
+       vertex -0.06 0.032 0.05
+       vertex -0.06 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.04 0.05
+       vertex -0.06666667 0.04 0.05
+       vertex -0.06666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.008 0.05
+       vertex -0.05333333 0.008 0.05
+       vertex -0.05333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.016 0.05
+       vertex -0.06 0.016 0.05
+       vertex -0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.016 0.05
+       vertex -0.05333333 0.016 0.05
+       vertex -0.05333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.024 0.05
+       vertex -0.06 0.024 0.05
+       vertex -0.06 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.024 0.05
+       vertex -0.05333333 0.024 0.05
+       vertex -0.05333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.032 0.05
+       vertex -0.06 0.032 0.05
+       vertex -0.06 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.06 0.032 0.05
+       vertex -0.05333333 0.032 0.05
+       vertex -0.05333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.04 0.05
+       vertex -0.06 0.04 0.05
+       vertex -0.06 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.008 0.05
+       vertex -0.04666667 0.008 0.05
+       vertex -0.04666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.016 0.05
+       vertex -0.05333333 0.016 0.05
+       vertex -0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.016 0.05
+       vertex -0.04666667 0.016 0.05
+       vertex -0.04666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.024 0.05
+       vertex -0.05333333 0.024 0.05
+       vertex -0.05333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.024 0.05
+       vertex -0.04666667 0.024 0.05
+       vertex -0.04666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.032 0.05
+       vertex -0.05333333 0.032 0.05
+       vertex -0.05333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.05333333 0.032 0.05
+       vertex -0.04666667 0.032 0.05
+       vertex -0.04666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.04 0.05
+       vertex -0.05333333 0.04 0.05
+       vertex -0.05333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.008 0.05
+       vertex -0.04 0.008 0.05
+       vertex -0.04 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.016 0.05
+       vertex -0.04666667 0.016 0.05
+       vertex -0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.016 0.05
+       vertex -0.04 0.016 0.05
+       vertex -0.04 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.024 0.05
+       vertex -0.04666667 0.024 0.05
+       vertex -0.04666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.024 0.05
+       vertex -0.04 0.024 0.05
+       vertex -0.04 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.032 0.05
+       vertex -0.04666667 0.032 0.05
+       vertex -0.04666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04666667 0.032 0.05
+       vertex -0.04 0.032 0.05
+       vertex -0.04 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.04 0.05
+       vertex -0.04666667 0.04 0.05
+       vertex -0.04666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.008 0.05
+       vertex -0.03333333 0.008 0.05
+       vertex -0.03333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.016 0.05
+       vertex -0.04 0.016 0.05
+       vertex -0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.016 0.05
+       vertex -0.03333333 0.016 0.05
+       vertex -0.03333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.024 0.05
+       vertex -0.04 0.024 0.05
+       vertex -0.04 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.024 0.05
+       vertex -0.03333333 0.024 0.05
+       vertex -0.03333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.032 0.05
+       vertex -0.04 0.032 0.05
+       vertex -0.04 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.04 0.032 0.05
+       vertex -0.03333333 0.032 0.05
+       vertex -0.03333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.04 0.05
+       vertex -0.04 0.04 0.05
+       vertex -0.04 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.008 0.05
+       vertex -0.02666667 0.008 0.05
+       vertex -0.02666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.016 0.05
+       vertex -0.03333333 0.016 0.05
+       vertex -0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.016 0.05
+       vertex -0.02666667 0.016 0.05
+       vertex -0.02666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.024 0.05
+       vertex -0.03333333 0.024 0.05
+       vertex -0.03333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.024 0.05
+       vertex -0.02666667 0.024 0.05
+       vertex -0.02666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.032 0.05
+       vertex -0.03333333 0.032 0.05
+       vertex -0.03333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.03333333 0.032 0.05
+       vertex -0.02666667 0.032 0.05
+       vertex -0.02666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.04 0.05
+       vertex -0.03333333 0.04 0.05
+       vertex -0.03333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.008 0.05
+       vertex -0.02 0.008 0.05
+       vertex -0.02 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.016 0.05
+       vertex -0.02666667 0.016 0.05
+       vertex -0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.016 0.05
+       vertex -0.02 0.016 0.05
+       vertex -0.02 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.024 0.05
+       vertex -0.02666667 0.024 0.05
+       vertex -0.02666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.024 0.05
+       vertex -0.02 0.024 0.05
+       vertex -0.02 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.032 0.05
+       vertex -0.02666667 0.032 0.05
+       vertex -0.02666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02666667 0.032 0.05
+       vertex -0.02 0.032 0.05
+       vertex -0.02 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.04 0.05
+       vertex -0.02666667 0.04 0.05
+       vertex -0.02666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.008 0.05
+       vertex -0.01333333 0.008 0.05
+       vertex -0.01333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.016 0.05
+       vertex -0.02 0.016 0.05
+       vertex -0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.016 0.05
+       vertex -0.01333333 0.016 0.05
+       vertex -0.01333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.024 0.05
+       vertex -0.02 0.024 0.05
+       vertex -0.02 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.024 0.05
+       vertex -0.01333333 0.024 0.05
+       vertex -0.01333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.032 0.05
+       vertex -0.02 0.032 0.05
+       vertex -0.02 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.02 0.032 0.05
+       vertex -0.01333333 0.032 0.05
+       vertex -0.01333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.04 0.05
+       vertex -0.02 0.04 0.05
+       vertex -0.02 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.008 0.05
+       vertex -0.006666667 0.008 0.05
+       vertex -0.006666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.016 0.05
+       vertex -0.01333333 0.016 0.05
+       vertex -0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.016 0.05
+       vertex -0.006666667 0.016 0.05
+       vertex -0.006666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.024 0.05
+       vertex -0.01333333 0.024 0.05
+       vertex -0.01333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.024 0.05
+       vertex -0.006666667 0.024 0.05
+       vertex -0.006666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.032 0.05
+       vertex -0.01333333 0.032 0.05
+       vertex -0.01333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.01333333 0.032 0.05
+       vertex -0.006666667 0.032 0.05
+       vertex -0.006666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.04 0.05
+       vertex -0.01333333 0.04 0.05
+       vertex -0.01333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.008 0.05
+       vertex 0 0.008 0.05
+       vertex 0 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.016 0.05
+       vertex -0.006666667 0.016 0.05
+       vertex -0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.016 0.05
+       vertex 0 0.016 0.05
+       vertex 0 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.024 0.05
+       vertex -0.006666667 0.024 0.05
+       vertex -0.006666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.024 0.05
+       vertex 0 0.024 0.05
+       vertex 0 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.032 0.05
+       vertex -0.006666667 0.032 0.05
+       vertex -0.006666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex -0.006666667 0.032 0.05
+       vertex 0 0.032 0.05
+       vertex 0 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.04 0.05
+       vertex -0.006666667 0.04 0.05
+       vertex -0.006666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.008 0.05
+       vertex 0.006666667 0.008 0.05
+       vertex 0.006666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.016 0.05
+       vertex 0 0.016 0.05
+       vertex 0 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.016 0.05
+       vertex 0.006666667 0.016 0.05
+       vertex 0.006666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.024 0.05
+       vertex 0 0.024 0.05
+       vertex 0 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.024 0.05
+       vertex 0.006666667 0.024 0.05
+       vertex 0.006666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.032 0.05
+       vertex 0 0.032 0.05
+       vertex 0 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0 0.032 0.05
+       vertex 0.006666667 0.032 0.05
+       vertex 0.006666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.04 0.05
+       vertex 0 0.04 0.05
+       vertex 0 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.008 0.05
+       vertex 0.01333333 0.008 0.05
+       vertex 0.01333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.016 0.05
+       vertex 0.006666667 0.016 0.05
+       vertex 0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.016 0.05
+       vertex 0.01333333 0.016 0.05
+       vertex 0.01333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.024 0.05
+       vertex 0.006666667 0.024 0.05
+       vertex 0.006666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.024 0.05
+       vertex 0.01333333 0.024 0.05
+       vertex 0.01333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.032 0.05
+       vertex 0.006666667 0.032 0.05
+       vertex 0.006666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.006666667 0.032 0.05
+       vertex 0.01333333 0.032 0.05
+       vertex 0.01333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.04 0.05
+       vertex 0.006666667 0.04 0.05
+       vertex 0.006666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.008 0.05
+       vertex 0.02 0.008 0.05
+       vertex 0.02 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.016 0.05
+       vertex 0.01333333 0.016 0.05
+       vertex 0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.016 0.05
+       vertex 0.02 0.016 0.05
+       vertex 0.02 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.024 0.05
+       vertex 0.01333333 0.024 0.05
+       vertex 0.01333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.024 0.05
+       vertex 0.02 0.024 0.05
+       vertex 0.02 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.032 0.05
+       vertex 0.01333333 0.032 0.05
+       vertex 0.01333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.01333333 0.032 0.05
+       vertex 0.02 0.032 0.05
+       vertex 0.02 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.04 0.05
+       vertex 0.01333333 0.04 0.05
+       vertex 0.01333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.008 0.05
+       vertex 0.02666667 0.008 0.05
+       vertex 0.02666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.016 0.05
+       vertex 0.02 0.016 0.05
+       vertex 0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.016 0.05
+       vertex 0.02666667 0.016 0.05
+       vertex 0.02666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.024 0.05
+       vertex 0.02 0.024 0.05
+       vertex 0.02 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.024 0.05
+       vertex 0.02666667 0.024 0.05
+       vertex 0.02666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.032 0.05
+       vertex 0.02 0.032 0.05
+       vertex 0.02 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02 0.032 0.05
+       vertex 0.02666667 0.032 0.05
+       vertex 0.02666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.04 0.05
+       vertex 0.02 0.04 0.05
+       vertex 0.02 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.008 0.05
+       vertex 0.03333333 0.008 0.05
+       vertex 0.03333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.016 0.05
+       vertex 0.02666667 0.016 0.05
+       vertex 0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.016 0.05
+       vertex 0.03333333 0.016 0.05
+       vertex 0.03333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.024 0.05
+       vertex 0.02666667 0.024 0.05
+       vertex 0.02666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.024 0.05
+       vertex 0.03333333 0.024 0.05
+       vertex 0.03333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.032 0.05
+       vertex 0.02666667 0.032 0.05
+       vertex 0.02666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.02666667 0.032 0.05
+       vertex 0.03333333 0.032 0.05
+       vertex 0.03333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.04 0.05
+       vertex 0.02666667 0.04 0.05
+       vertex 0.02666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.008 0.05
+       vertex 0.04 0.008 0.05
+       vertex 0.04 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.016 0.05
+       vertex 0.03333333 0.016 0.05
+       vertex 0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.016 0.05
+       vertex 0.04 0.016 0.05
+       vertex 0.04 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.024 0.05
+       vertex 0.03333333 0.024 0.05
+       vertex 0.03333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.024 0.05
+       vertex 0.04 0.024 0.05
+       vertex 0.04 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.032 0.05
+       vertex 0.03333333 0.032 0.05
+       vertex 0.03333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.03333333 0.032 0.05
+       vertex 0.04 0.032 0.05
+       vertex 0.04 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.04 0.05
+       vertex 0.03333333 0.04 0.05
+       vertex 0.03333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.008 0.05
+       vertex 0.04666667 0.008 0.05
+       vertex 0.04666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.016 0.05
+       vertex 0.04 0.016 0.05
+       vertex 0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.016 0.05
+       vertex 0.04666667 0.016 0.05
+       vertex 0.04666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.024 0.05
+       vertex 0.04 0.024 0.05
+       vertex 0.04 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.024 0.05
+       vertex 0.04666667 0.024 0.05
+       vertex 0.04666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.032 0.05
+       vertex 0.04 0.032 0.05
+       vertex 0.04 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04 0.032 0.05
+       vertex 0.04666667 0.032 0.05
+       vertex 0.04666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.04 0.05
+       vertex 0.04 0.04 0.05
+       vertex 0.04 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.008 0.05
+       vertex 0.05333333 0.008 0.05
+       vertex 0.05333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.016 0.05
+       vertex 0.04666667 0.016 0.05
+       vertex 0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.016 0.05
+       vertex 0.05333333 0.016 0.05
+       vertex 0.05333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.024 0.05
+       vertex 0.04666667 0.024 0.05
+       vertex 0.04666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.024 0.05
+       vertex 0.05333333 0.024 0.05
+       vertex 0.05333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.032 0.05
+       vertex 0.04666667 0.032 0.05
+       vertex 0.04666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.04666667 0.032 0.05
+       vertex 0.05333333 0.032 0.05
+       vertex 0.05333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.04 0.05
+       vertex 0.04666667 0.04 0.05
+       vertex 0.04666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.008 0.05
+       vertex 0.06 0.008 0.05
+       vertex 0.06 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.016 0.05
+       vertex 0.05333333 0.016 0.05
+       vertex 0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.016 0.05
+       vertex 0.06 0.016 0.05
+       vertex 0.06 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.024 0.05
+       vertex 0.05333333 0.024 0.05
+       vertex 0.05333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.024 0.05
+       vertex 0.06 0.024 0.05
+       vertex 0.06 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.032 0.05
+       vertex 0.05333333 0.032 0.05
+       vertex 0.05333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.05333333 0.032 0.05
+       vertex 0.06 0.032 0.05
+       vertex 0.06 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.04 0.05
+       vertex 0.05333333 0.04 0.05
+       vertex 0.05333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.008 0.05
+       vertex 0.06666667 0.008 0.05
+       vertex 0.06666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.016 0.05
+       vertex 0.06 0.016 0.05
+       vertex 0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.016 0.05
+       vertex 0.06666667 0.016 0.05
+       vertex 0.06666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.024 0.05
+       vertex 0.06 0.024 0.05
+       vertex 0.06 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.024 0.05
+       vertex 0.06666667 0.024 0.05
+       vertex 0.06666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.032 0.05
+       vertex 0.06 0.032 0.05
+       vertex 0.06 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06 0.032 0.05
+       vertex 0.06666667 0.032 0.05
+       vertex 0.06666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.04 0.05
+       vertex 0.06 0.04 0.05
+       vertex 0.06 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.008 0.05
+       vertex 0.07333333 0.008 0.05
+       vertex 0.07333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.016 0.05
+       vertex 0.06666667 0.016 0.05
+       vertex 0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.016 0.05
+       vertex 0.07333333 0.016 0.05
+       vertex 0.07333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.024 0.05
+       vertex 0.06666667 0.024 0.05
+       vertex 0.06666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.024 0.05
+       vertex 0.07333333 0.024 0.05
+       vertex 0.07333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.032 0.05
+       vertex 0.06666667 0.032 0.05
+       vertex 0.06666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.06666667 0.032 0.05
+       vertex 0.07333333 0.032 0.05
+       vertex 0.07333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.04 0.05
+       vertex 0.06666667 0.04 0.05
+       vertex 0.06666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.008 0.05
+       vertex 0.08 0.008 0.05
+       vertex 0.08 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.016 0.05
+       vertex 0.07333333 0.016 0.05
+       vertex 0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.016 0.05
+       vertex 0.08 0.016 0.05
+       vertex 0.08 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.024 0.05
+       vertex 0.07333333 0.024 0.05
+       vertex 0.07333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.024 0.05
+       vertex 0.08 0.024 0.05
+       vertex 0.08 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.032 0.05
+       vertex 0.07333333 0.032 0.05
+       vertex 0.07333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.07333333 0.032 0.05
+       vertex 0.08 0.032 0.05
+       vertex 0.08 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.04 0.05
+       vertex 0.07333333 0.04 0.05
+       vertex 0.07333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.008 0.05
+       vertex 0.08666667 0.008 0.05
+       vertex 0.08666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.016 0.05
+       vertex 0.08 0.016 0.05
+       vertex 0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.016 0.05
+       vertex 0.08666667 0.016 0.05
+       vertex 0.08666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.024 0.05
+       vertex 0.08 0.024 0.05
+       vertex 0.08 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.024 0.05
+       vertex 0.08666667 0.024 0.05
+       vertex 0.08666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.032 0.05
+       vertex 0.08 0.032 0.05
+       vertex 0.08 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08 0.032 0.05
+       vertex 0.08666667 0.032 0.05
+       vertex 0.08666667 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.04 0.05
+       vertex 0.08 0.04 0.05
+       vertex 0.08 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.008 0.05
+       vertex 0.09333333 0.008 0.05
+       vertex 0.09333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.016 0.05
+       vertex 0.08666667 0.016 0.05
+       vertex 0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.016 0.05
+       vertex 0.09333333 0.016 0.05
+       vertex 0.09333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.024 0.05
+       vertex 0.08666667 0.024 0.05
+       vertex 0.08666667 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.024 0.05
+       vertex 0.09333333 0.024 0.05
+       vertex 0.09333333 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.032 0.05
+       vertex 0.08666667 0.032 0.05
+       vertex 0.08666667 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.08666667 0.032 0.05
+       vertex 0.09333333 0.032 0.05
+       vertex 0.09333333 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.04 0.05
+       vertex 0.08666667 0.04 0.05
+       vertex 0.08666667 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.008 0.05
+       vertex 0.1 0.008 0.05
+       vertex 0.1 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 0.016 0.05
+       vertex 0.09333333 0.016 0.05
+       vertex 0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.016 0.05
+       vertex 0.1 0.016 0.05
+       vertex 0.1 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 0.024 0.05
+       vertex 0.09333333 0.024 0.05
+       vertex 0.09333333 0.016 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.024 0.05
+       vertex 0.1 0.024 0.05
+       vertex 0.1 0.032 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 0.032 0.05
+       vertex 0.09333333 0.032 0.05
+       vertex 0.09333333 0.024 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.09333333 0.032 0.05
+       vertex 0.1 0.032 0.05
+       vertex 0.1 0.04 0.05
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+       vertex 0.1 0.04 0.05
+       vertex 0.09333333 0.04 0.05
+       vertex 0.09333333 0.032 0.05
+    endloop
+  endfacet
+endsolid maxZ
+solid topAir_to_rightSolid
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.02 0.008 -0.05
+       vertex 0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.04
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.05
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.02 0.008 -0.04
+       vertex 0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.05
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.05
+       vertex 0.04 0.008 -0.05
+       vertex 0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.04
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.05
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.04 0.008 -0.04
+       vertex 0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.05
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.05
+       vertex 0.06 0.008 -0.05
+       vertex 0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.04
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.05
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.06 0.008 -0.04
+       vertex 0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.05
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.05
+       vertex 0.08 0.008 -0.05
+       vertex 0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.04
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.05
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.08 0.008 -0.04
+       vertex 0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.05
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.05
+       vertex 0.1 0.008 -0.05
+       vertex 0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 -0.04
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.02 0.008 -0.04
+       vertex 0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.03
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.04
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.02 0.008 -0.03
+       vertex 0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.04
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.04
+       vertex 0.04 0.008 -0.04
+       vertex 0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.03
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.04
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.04 0.008 -0.03
+       vertex 0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.04
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.04
+       vertex 0.06 0.008 -0.04
+       vertex 0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.03
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.04
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.06 0.008 -0.03
+       vertex 0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.04
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.04
+       vertex 0.08 0.008 -0.04
+       vertex 0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.03
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.04
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.08 0.008 -0.03
+       vertex 0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.04
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.04
+       vertex 0.1 0.008 -0.04
+       vertex 0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 -0.03
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.02 0.008 -0.03
+       vertex 0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.02
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.03
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.02 0.008 -0.02
+       vertex 0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.03
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.03
+       vertex 0.04 0.008 -0.03
+       vertex 0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.02
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.03
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.04 0.008 -0.02
+       vertex 0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.03
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.03
+       vertex 0.06 0.008 -0.03
+       vertex 0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.02
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.03
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.06 0.008 -0.02
+       vertex 0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.03
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.03
+       vertex 0.08 0.008 -0.03
+       vertex 0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.02
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.03
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.08 0.008 -0.02
+       vertex 0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.03
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.03
+       vertex 0.1 0.008 -0.03
+       vertex 0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 -0.02
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.02 0.008 -0.02
+       vertex 0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.01
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.02
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.02 0.008 -0.01
+       vertex 0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.02
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.02
+       vertex 0.04 0.008 -0.02
+       vertex 0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.01
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.02
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.04 0.008 -0.01
+       vertex 0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.02
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.02
+       vertex 0.06 0.008 -0.02
+       vertex 0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.01
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.02
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.06 0.008 -0.01
+       vertex 0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.02
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.02
+       vertex 0.08 0.008 -0.02
+       vertex 0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.01
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.02
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.08 0.008 -0.01
+       vertex 0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.02
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.02
+       vertex 0.1 0.008 -0.02
+       vertex 0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 -0.01
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.02 0.008 -0.01
+       vertex 0.02 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 0
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 -0.01
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.02666667 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.02 0.008 0
+       vertex 0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 -0.01
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.03333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 -0.01
+       vertex 0.04 0.008 -0.01
+       vertex 0.04 0.008 -5.782412e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.03333333 0.008 0
+       vertex 0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 -0.01
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 -0.01
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.05333333 0.008 -2.891206e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.04666667 0.008 0
+       vertex 0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 -0.01
+       vertex 0.06 0.008 -0.01
+       vertex 0.06 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 -0.01
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 -0.01
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.07333333 0.008 -4.336809e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.06666667 0.008 0
+       vertex 0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 -0.01
+       vertex 0.08 0.008 -0.01
+       vertex 0.08 0.008 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 -0.01
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.08666667 0.008 -2.168404e-19
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 -0.01
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.09333333 0.008 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 -0.01
+       vertex 0.1 0.008 -0.01
+       vertex 0.1 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 0
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0
+       vertex 0.02 0.008 0
+       vertex 0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.01
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.02666667 0.008 0.01
+       vertex 0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.01
+       vertex 0.02 0.008 0
+       vertex 0.02666667 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 5.782412e-19
+       vertex 0.03333333 0.008 0
+       vertex 0.03333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.01
+       vertex 0.02666667 0.008 0.01
+       vertex 0.02666667 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.01
+       vertex 0.03333333 0.008 0.01
+       vertex 0.03333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0
+       vertex 0.04666667 0.008 0.01
+       vertex 0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.01
+       vertex 0.04 0.008 -5.782412e-19
+       vertex 0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.01
+       vertex 0.04666667 0.008 0.01
+       vertex 0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.06 0.008 0.01
+       vertex 0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.01
+       vertex 0.05333333 0.008 -2.891206e-19
+       vertex 0.06 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 5.782412e-19
+       vertex 0.06666667 0.008 0
+       vertex 0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.01
+       vertex 0.06 0.008 0.01
+       vertex 0.06 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.01
+       vertex 0.06666667 0.008 0.01
+       vertex 0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.08 0.008 0.01
+       vertex 0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.01
+       vertex 0.07333333 0.008 -4.336809e-19
+       vertex 0.08 0.008 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 2.891206e-19
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.01
+       vertex 0.08 0.008 0.01
+       vertex 0.08 0.008 2.891206e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.09333333 0.008 0.01
+       vertex 0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.01
+       vertex 0.08666667 0.008 -2.168404e-19
+       vertex 0.09333333 0.008 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 4.698209e-19
+       vertex 0.1 0.008 0
+       vertex 0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 0.01
+       vertex 0.09333333 0.008 0.01
+       vertex 0.09333333 0.008 4.698209e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.01
+       vertex 0.02 0.008 0.01
+       vertex 0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.02
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.01
+       vertex 0.02666667 0.008 0.01
+       vertex 0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.02
+       vertex 0.02 0.008 0.02
+       vertex 0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.01
+       vertex 0.03333333 0.008 0.01
+       vertex 0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.02
+       vertex 0.02666667 0.008 0.02
+       vertex 0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.01
+       vertex 0.04 0.008 0.01
+       vertex 0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.02
+       vertex 0.03333333 0.008 0.02
+       vertex 0.03333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.01
+       vertex 0.04666667 0.008 0.01
+       vertex 0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.02
+       vertex 0.04 0.008 0.02
+       vertex 0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.01
+       vertex 0.05333333 0.008 0.01
+       vertex 0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.02
+       vertex 0.04666667 0.008 0.02
+       vertex 0.04666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.01
+       vertex 0.06 0.008 0.01
+       vertex 0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.02
+       vertex 0.05333333 0.008 0.02
+       vertex 0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.01
+       vertex 0.06666667 0.008 0.01
+       vertex 0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.02
+       vertex 0.06 0.008 0.02
+       vertex 0.06 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.01
+       vertex 0.07333333 0.008 0.01
+       vertex 0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.02
+       vertex 0.06666667 0.008 0.02
+       vertex 0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.01
+       vertex 0.08 0.008 0.01
+       vertex 0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.02
+       vertex 0.07333333 0.008 0.02
+       vertex 0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.01
+       vertex 0.08666667 0.008 0.01
+       vertex 0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.02
+       vertex 0.08 0.008 0.02
+       vertex 0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.01
+       vertex 0.09333333 0.008 0.01
+       vertex 0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.02
+       vertex 0.08666667 0.008 0.02
+       vertex 0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.01
+       vertex 0.1 0.008 0.01
+       vertex 0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 0.02
+       vertex 0.09333333 0.008 0.02
+       vertex 0.09333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.02
+       vertex 0.02 0.008 0.02
+       vertex 0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.03
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.02
+       vertex 0.02666667 0.008 0.02
+       vertex 0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.03
+       vertex 0.02 0.008 0.03
+       vertex 0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.02
+       vertex 0.03333333 0.008 0.02
+       vertex 0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.03
+       vertex 0.02666667 0.008 0.03
+       vertex 0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.02
+       vertex 0.04 0.008 0.02
+       vertex 0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.03
+       vertex 0.03333333 0.008 0.03
+       vertex 0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.02
+       vertex 0.04666667 0.008 0.02
+       vertex 0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.03
+       vertex 0.04 0.008 0.03
+       vertex 0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.02
+       vertex 0.05333333 0.008 0.02
+       vertex 0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.03
+       vertex 0.04666667 0.008 0.03
+       vertex 0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.02
+       vertex 0.06 0.008 0.02
+       vertex 0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.03
+       vertex 0.05333333 0.008 0.03
+       vertex 0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.02
+       vertex 0.06666667 0.008 0.02
+       vertex 0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.03
+       vertex 0.06 0.008 0.03
+       vertex 0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.02
+       vertex 0.07333333 0.008 0.02
+       vertex 0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.03
+       vertex 0.06666667 0.008 0.03
+       vertex 0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.02
+       vertex 0.08 0.008 0.02
+       vertex 0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.03
+       vertex 0.07333333 0.008 0.03
+       vertex 0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.02
+       vertex 0.08666667 0.008 0.02
+       vertex 0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.03
+       vertex 0.08 0.008 0.03
+       vertex 0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.02
+       vertex 0.09333333 0.008 0.02
+       vertex 0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.03
+       vertex 0.08666667 0.008 0.03
+       vertex 0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.02
+       vertex 0.1 0.008 0.02
+       vertex 0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 0.03
+       vertex 0.09333333 0.008 0.03
+       vertex 0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.03
+       vertex 0.02 0.008 0.03
+       vertex 0.02 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.04
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.03
+       vertex 0.02666667 0.008 0.03
+       vertex 0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.04
+       vertex 0.02 0.008 0.04
+       vertex 0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.03
+       vertex 0.03333333 0.008 0.03
+       vertex 0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.04
+       vertex 0.02666667 0.008 0.04
+       vertex 0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.03
+       vertex 0.04 0.008 0.03
+       vertex 0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.04
+       vertex 0.03333333 0.008 0.04
+       vertex 0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.03
+       vertex 0.04666667 0.008 0.03
+       vertex 0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.04
+       vertex 0.04 0.008 0.04
+       vertex 0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.03
+       vertex 0.05333333 0.008 0.03
+       vertex 0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.04
+       vertex 0.04666667 0.008 0.04
+       vertex 0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.03
+       vertex 0.06 0.008 0.03
+       vertex 0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.04
+       vertex 0.05333333 0.008 0.04
+       vertex 0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.03
+       vertex 0.06666667 0.008 0.03
+       vertex 0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.04
+       vertex 0.06 0.008 0.04
+       vertex 0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.03
+       vertex 0.07333333 0.008 0.03
+       vertex 0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.04
+       vertex 0.06666667 0.008 0.04
+       vertex 0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.03
+       vertex 0.08 0.008 0.03
+       vertex 0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.04
+       vertex 0.07333333 0.008 0.04
+       vertex 0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.03
+       vertex 0.08666667 0.008 0.03
+       vertex 0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.04
+       vertex 0.08 0.008 0.04
+       vertex 0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.03
+       vertex 0.09333333 0.008 0.03
+       vertex 0.09333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.04
+       vertex 0.08666667 0.008 0.04
+       vertex 0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.03
+       vertex 0.1 0.008 0.03
+       vertex 0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 0.04
+       vertex 0.09333333 0.008 0.04
+       vertex 0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.04
+       vertex 0.02 0.008 0.04
+       vertex 0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.05
+       vertex 0.01333333 0.008 0.05
+       vertex 0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02 0.008 0.04
+       vertex 0.02666667 0.008 0.04
+       vertex 0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.05
+       vertex 0.02 0.008 0.05
+       vertex 0.02 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.02666667 0.008 0.04
+       vertex 0.03333333 0.008 0.04
+       vertex 0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.05
+       vertex 0.02666667 0.008 0.05
+       vertex 0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.03333333 0.008 0.04
+       vertex 0.04 0.008 0.04
+       vertex 0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.05
+       vertex 0.03333333 0.008 0.05
+       vertex 0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04 0.008 0.04
+       vertex 0.04666667 0.008 0.04
+       vertex 0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.05
+       vertex 0.04 0.008 0.05
+       vertex 0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.04666667 0.008 0.04
+       vertex 0.05333333 0.008 0.04
+       vertex 0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.05
+       vertex 0.04666667 0.008 0.05
+       vertex 0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.05333333 0.008 0.04
+       vertex 0.06 0.008 0.04
+       vertex 0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.05
+       vertex 0.05333333 0.008 0.05
+       vertex 0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06 0.008 0.04
+       vertex 0.06666667 0.008 0.04
+       vertex 0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.05
+       vertex 0.06 0.008 0.05
+       vertex 0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.06666667 0.008 0.04
+       vertex 0.07333333 0.008 0.04
+       vertex 0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.05
+       vertex 0.06666667 0.008 0.05
+       vertex 0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.07333333 0.008 0.04
+       vertex 0.08 0.008 0.04
+       vertex 0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.05
+       vertex 0.07333333 0.008 0.05
+       vertex 0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08 0.008 0.04
+       vertex 0.08666667 0.008 0.04
+       vertex 0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.05
+       vertex 0.08 0.008 0.05
+       vertex 0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.08666667 0.008 0.04
+       vertex 0.09333333 0.008 0.04
+       vertex 0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.05
+       vertex 0.08666667 0.008 0.05
+       vertex 0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.09333333 0.008 0.04
+       vertex 0.1 0.008 0.04
+       vertex 0.1 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.1 0.008 0.05
+       vertex 0.09333333 0.008 0.05
+       vertex 0.09333333 0.008 0.04
+    endloop
+  endfacet
+endsolid topAir_to_rightSolid
+solid topAir_to_heater
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.006666667 0.008 -0.05
+       vertex -0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.04
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.05
+       vertex 0 0.008 -0.05
+       vertex 0 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 -0.04
+       vertex -0.006666667 0.008 -0.04
+       vertex -0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 -0.05
+       vertex 0.006666667 0.008 -0.05
+       vertex 0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.04
+       vertex 0 0.008 -0.04
+       vertex 0 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.05
+       vertex 0.01333333 0.008 -0.05
+       vertex 0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.006666667 0.008 -0.04
+       vertex 0.006666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.006666667 0.008 -0.04
+       vertex -0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.03
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.04
+       vertex 0 0.008 -0.04
+       vertex 0 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 -0.03
+       vertex -0.006666667 0.008 -0.03
+       vertex -0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 -0.04
+       vertex 0.006666667 0.008 -0.04
+       vertex 0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.03
+       vertex 0 0.008 -0.03
+       vertex 0 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.04
+       vertex 0.01333333 0.008 -0.04
+       vertex 0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.006666667 0.008 -0.03
+       vertex 0.006666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.006666667 0.008 -0.03
+       vertex -0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.02
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.03
+       vertex 0 0.008 -0.03
+       vertex 0 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 -0.02
+       vertex -0.006666667 0.008 -0.02
+       vertex -0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 -0.03
+       vertex 0.006666667 0.008 -0.03
+       vertex 0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.02
+       vertex 0 0.008 -0.02
+       vertex 0 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.03
+       vertex 0.01333333 0.008 -0.03
+       vertex 0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.006666667 0.008 -0.02
+       vertex 0.006666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.006666667 0.008 -0.02
+       vertex -0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.01
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.02
+       vertex 0 0.008 -0.02
+       vertex 0 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 -0.01
+       vertex -0.006666667 0.008 -0.01
+       vertex -0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 -0.02
+       vertex 0.006666667 0.008 -0.02
+       vertex 0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.01
+       vertex 0 0.008 -0.01
+       vertex 0 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.02
+       vertex 0.01333333 0.008 -0.02
+       vertex 0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.006666667 0.008 -0.01
+       vertex 0.006666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.006666667 0.008 -0.01
+       vertex -0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 -0.01
+       vertex 0 0.008 -0.01
+       vertex 0 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 0
+       vertex -0.006666667 0.008 0
+       vertex -0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 -0.01
+       vertex 0.006666667 0.008 -0.01
+       vertex 0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0
+       vertex 0 0.008 0
+       vertex 0 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 -0.01
+       vertex 0.01333333 0.008 -0.01
+       vertex 0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0
+       vertex 0.006666667 0.008 0
+       vertex 0.006666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0
+       vertex -0.006666667 0.008 0
+       vertex -0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.01
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0
+       vertex 0 0.008 0
+       vertex 0 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 0.01
+       vertex -0.006666667 0.008 0.01
+       vertex -0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 0
+       vertex 0.006666667 0.008 0
+       vertex 0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.01
+       vertex 0 0.008 0.01
+       vertex 0 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0
+       vertex 0.01333333 0.008 0
+       vertex 0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.01
+       vertex 0.006666667 0.008 0.01
+       vertex 0.006666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.01
+       vertex -0.006666667 0.008 0.01
+       vertex -0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.02
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.01
+       vertex 0 0.008 0.01
+       vertex 0 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 0.02
+       vertex -0.006666667 0.008 0.02
+       vertex -0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 0.01
+       vertex 0.006666667 0.008 0.01
+       vertex 0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.02
+       vertex 0 0.008 0.02
+       vertex 0 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.01
+       vertex 0.01333333 0.008 0.01
+       vertex 0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.02
+       vertex 0.006666667 0.008 0.02
+       vertex 0.006666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.02
+       vertex -0.006666667 0.008 0.02
+       vertex -0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.03
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.02
+       vertex 0 0.008 0.02
+       vertex 0 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 0.03
+       vertex -0.006666667 0.008 0.03
+       vertex -0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 0.02
+       vertex 0.006666667 0.008 0.02
+       vertex 0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.03
+       vertex 0 0.008 0.03
+       vertex 0 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.02
+       vertex 0.01333333 0.008 0.02
+       vertex 0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.03
+       vertex 0.006666667 0.008 0.03
+       vertex 0.006666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.03
+       vertex -0.006666667 0.008 0.03
+       vertex -0.006666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.04
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.03
+       vertex 0 0.008 0.03
+       vertex 0 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 0.04
+       vertex -0.006666667 0.008 0.04
+       vertex -0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 0.03
+       vertex 0.006666667 0.008 0.03
+       vertex 0.006666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.04
+       vertex 0 0.008 0.04
+       vertex 0 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.03
+       vertex 0.01333333 0.008 0.03
+       vertex 0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.04
+       vertex 0.006666667 0.008 0.04
+       vertex 0.006666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.04
+       vertex -0.006666667 0.008 0.04
+       vertex -0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.05
+       vertex -0.01333333 0.008 0.05
+       vertex -0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.006666667 0.008 0.04
+       vertex 0 0.008 0.04
+       vertex 0 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0 0.008 0.05
+       vertex -0.006666667 0.008 0.05
+       vertex -0.006666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0 0.008 0.04
+       vertex 0.006666667 0.008 0.04
+       vertex 0.006666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.05
+       vertex 0 0.008 0.05
+       vertex 0 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex 0.006666667 0.008 0.04
+       vertex 0.01333333 0.008 0.04
+       vertex 0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex 0.01333333 0.008 0.05
+       vertex 0.006666667 0.008 0.05
+       vertex 0.006666667 0.008 0.04
+    endloop
+  endfacet
+endsolid topAir_to_heater
+solid topAir_to_leftSolid
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 -0.05
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.1 0.008 -0.04
+       vertex -0.1 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.05
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.09333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.05
+       vertex -0.08 0.008 -0.05
+       vertex -0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.04
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.08666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.05
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.08 0.008 -0.04
+       vertex -0.08 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.05
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.07333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.05
+       vertex -0.06 0.008 -0.05
+       vertex -0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.04
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.06666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.05
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.06 0.008 -0.04
+       vertex -0.06 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.05
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.05333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.05
+       vertex -0.04 0.008 -0.05
+       vertex -0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.04
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.04666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.05
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.04 0.008 -0.04
+       vertex -0.04 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.05
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.03333333 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.05
+       vertex -0.02 0.008 -0.05
+       vertex -0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.04
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.02666667 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.05
+       vertex -0.01333333 0.008 -0.05
+       vertex -0.01333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.02 0.008 -0.04
+       vertex -0.02 0.008 -0.05
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 -0.04
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.1 0.008 -0.03
+       vertex -0.1 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.04
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.09333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.04
+       vertex -0.08 0.008 -0.04
+       vertex -0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.03
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.08666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.04
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.08 0.008 -0.03
+       vertex -0.08 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.04
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.07333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.04
+       vertex -0.06 0.008 -0.04
+       vertex -0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.03
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.06666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.04
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.06 0.008 -0.03
+       vertex -0.06 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.04
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.05333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.04
+       vertex -0.04 0.008 -0.04
+       vertex -0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.03
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.04666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.04
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.04 0.008 -0.03
+       vertex -0.04 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.04
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.03333333 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.04
+       vertex -0.02 0.008 -0.04
+       vertex -0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.03
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.02666667 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.04
+       vertex -0.01333333 0.008 -0.04
+       vertex -0.01333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.02 0.008 -0.03
+       vertex -0.02 0.008 -0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 -0.03
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.1 0.008 -0.02
+       vertex -0.1 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.03
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.09333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.03
+       vertex -0.08 0.008 -0.03
+       vertex -0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.02
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.08666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.03
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.08 0.008 -0.02
+       vertex -0.08 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.03
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.07333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.03
+       vertex -0.06 0.008 -0.03
+       vertex -0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.02
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.06666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.03
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.06 0.008 -0.02
+       vertex -0.06 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.03
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.05333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.03
+       vertex -0.04 0.008 -0.03
+       vertex -0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.02
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.04666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.03
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.04 0.008 -0.02
+       vertex -0.04 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.03
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.03333333 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.03
+       vertex -0.02 0.008 -0.03
+       vertex -0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.02
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.02666667 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.03
+       vertex -0.01333333 0.008 -0.03
+       vertex -0.01333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.02 0.008 -0.02
+       vertex -0.02 0.008 -0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 -0.02
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.1 0.008 -0.01
+       vertex -0.1 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.02
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.09333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.02
+       vertex -0.08 0.008 -0.02
+       vertex -0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.01
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.08666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.02
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.08 0.008 -0.01
+       vertex -0.08 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.02
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.07333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.02
+       vertex -0.06 0.008 -0.02
+       vertex -0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.01
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.06666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.02
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.06 0.008 -0.01
+       vertex -0.06 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.02
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.05333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.02
+       vertex -0.04 0.008 -0.02
+       vertex -0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.01
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.04666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.02
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.04 0.008 -0.01
+       vertex -0.04 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.02
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.03333333 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.02
+       vertex -0.02 0.008 -0.02
+       vertex -0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.01
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.02666667 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.02
+       vertex -0.01333333 0.008 -0.02
+       vertex -0.01333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.02 0.008 -0.01
+       vertex -0.02 0.008 -0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 -0.01
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.09333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0
+       vertex -0.1 0.008 0
+       vertex -0.1 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 -0.01
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.08666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0
+       vertex -0.09333333 0.008 0
+       vertex -0.09333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 -0.01
+       vertex -0.08 0.008 -0.01
+       vertex -0.08 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 0
+       vertex -0.08666667 0.008 0
+       vertex -0.08666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 -0.01
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.07333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.08 0.008 0
+       vertex -0.08 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 -0.01
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.07333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 -0.01
+       vertex -0.06 0.008 -0.01
+       vertex -0.06 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 0
+       vertex -0.06666667 0.008 0
+       vertex -0.06666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 -0.01
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.05333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0
+       vertex -0.06 0.008 0
+       vertex -0.06 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 -0.01
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0
+       vertex -0.05333333 0.008 0
+       vertex -0.05333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 -0.01
+       vertex -0.04 0.008 -0.01
+       vertex -0.04 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 0
+       vertex -0.04666667 0.008 0
+       vertex -0.04666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 -0.01
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.03333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.04 0.008 0
+       vertex -0.04 0.008 -0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.03333333 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 -0.01
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.02666667 0.008 -5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 -0.01
+       vertex -0.02 0.008 -0.01
+       vertex -0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.02666667 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 -0.01
+       vertex -0.01333333 0.008 -0.01
+       vertex -0.01333333 0.008 0
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0
+       vertex -0.02 0.008 0
+       vertex -0.02 0.008 -0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 0
+       vertex -0.09333333 0.008 0
+       vertex -0.09333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.01
+       vertex -0.1 0.008 0.01
+       vertex -0.1 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0
+       vertex -0.08666667 0.008 0
+       vertex -0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.01
+       vertex -0.09333333 0.008 0.01
+       vertex -0.09333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0
+       vertex -0.08 0.008 0
+       vertex -0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.01
+       vertex -0.08666667 0.008 0.01
+       vertex -0.08666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.07333333 0.008 0.01
+       vertex -0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.01
+       vertex -0.08 0.008 0
+       vertex -0.07333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 5.782412e-19
+       vertex -0.06666667 0.008 0
+       vertex -0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.01
+       vertex -0.07333333 0.008 0.01
+       vertex -0.07333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0
+       vertex -0.06 0.008 0
+       vertex -0.06 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.01
+       vertex -0.06666667 0.008 0.01
+       vertex -0.06666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 0
+       vertex -0.05333333 0.008 0
+       vertex -0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.01
+       vertex -0.06 0.008 0.01
+       vertex -0.06 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0
+       vertex -0.04666667 0.008 0
+       vertex -0.04666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.01
+       vertex -0.05333333 0.008 0.01
+       vertex -0.05333333 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0
+       vertex -0.04 0.008 0
+       vertex -0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.01
+       vertex -0.04666667 0.008 0.01
+       vertex -0.04666667 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.03333333 0.008 0.01
+       vertex -0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.01
+       vertex -0.04 0.008 0
+       vertex -0.03333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 5.782412e-19
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.01
+       vertex -0.03333333 0.008 0.01
+       vertex -0.03333333 0.008 5.782412e-19
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0
+       vertex -0.02 0.008 0.01
+       vertex -0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.01
+       vertex -0.02666667 0.008 -5.782412e-19
+       vertex -0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0
+       vertex -0.01333333 0.008 0
+       vertex -0.01333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.01
+       vertex -0.02 0.008 0.01
+       vertex -0.02 0.008 0
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 0.01
+       vertex -0.09333333 0.008 0.01
+       vertex -0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.02
+       vertex -0.1 0.008 0.02
+       vertex -0.1 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.01
+       vertex -0.08666667 0.008 0.01
+       vertex -0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.02
+       vertex -0.09333333 0.008 0.02
+       vertex -0.09333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.01
+       vertex -0.08 0.008 0.01
+       vertex -0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.02
+       vertex -0.08666667 0.008 0.02
+       vertex -0.08666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.01
+       vertex -0.07333333 0.008 0.01
+       vertex -0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.02
+       vertex -0.08 0.008 0.02
+       vertex -0.08 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.01
+       vertex -0.06666667 0.008 0.01
+       vertex -0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.02
+       vertex -0.07333333 0.008 0.02
+       vertex -0.07333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.01
+       vertex -0.06 0.008 0.01
+       vertex -0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.02
+       vertex -0.06666667 0.008 0.02
+       vertex -0.06666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.01
+       vertex -0.05333333 0.008 0.01
+       vertex -0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.02
+       vertex -0.06 0.008 0.02
+       vertex -0.06 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.01
+       vertex -0.04666667 0.008 0.01
+       vertex -0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.02
+       vertex -0.05333333 0.008 0.02
+       vertex -0.05333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.01
+       vertex -0.04 0.008 0.01
+       vertex -0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.02
+       vertex -0.04666667 0.008 0.02
+       vertex -0.04666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.01
+       vertex -0.03333333 0.008 0.01
+       vertex -0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.02
+       vertex -0.04 0.008 0.02
+       vertex -0.04 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.01
+       vertex -0.02666667 0.008 0.01
+       vertex -0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.02
+       vertex -0.03333333 0.008 0.02
+       vertex -0.03333333 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.01
+       vertex -0.02 0.008 0.01
+       vertex -0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.02
+       vertex -0.02666667 0.008 0.02
+       vertex -0.02666667 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.01
+       vertex -0.01333333 0.008 0.01
+       vertex -0.01333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.02
+       vertex -0.02 0.008 0.02
+       vertex -0.02 0.008 0.01
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 0.02
+       vertex -0.09333333 0.008 0.02
+       vertex -0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.03
+       vertex -0.1 0.008 0.03
+       vertex -0.1 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.02
+       vertex -0.08666667 0.008 0.02
+       vertex -0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.03
+       vertex -0.09333333 0.008 0.03
+       vertex -0.09333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.02
+       vertex -0.08 0.008 0.02
+       vertex -0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.03
+       vertex -0.08666667 0.008 0.03
+       vertex -0.08666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.02
+       vertex -0.07333333 0.008 0.02
+       vertex -0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.03
+       vertex -0.08 0.008 0.03
+       vertex -0.08 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.02
+       vertex -0.06666667 0.008 0.02
+       vertex -0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.03
+       vertex -0.07333333 0.008 0.03
+       vertex -0.07333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.02
+       vertex -0.06 0.008 0.02
+       vertex -0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.03
+       vertex -0.06666667 0.008 0.03
+       vertex -0.06666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.02
+       vertex -0.05333333 0.008 0.02
+       vertex -0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.03
+       vertex -0.06 0.008 0.03
+       vertex -0.06 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.02
+       vertex -0.04666667 0.008 0.02
+       vertex -0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.03
+       vertex -0.05333333 0.008 0.03
+       vertex -0.05333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.02
+       vertex -0.04 0.008 0.02
+       vertex -0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.03
+       vertex -0.04666667 0.008 0.03
+       vertex -0.04666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.02
+       vertex -0.03333333 0.008 0.02
+       vertex -0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.03
+       vertex -0.04 0.008 0.03
+       vertex -0.04 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.02
+       vertex -0.02666667 0.008 0.02
+       vertex -0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.03
+       vertex -0.03333333 0.008 0.03
+       vertex -0.03333333 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.02
+       vertex -0.02 0.008 0.02
+       vertex -0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.03
+       vertex -0.02666667 0.008 0.03
+       vertex -0.02666667 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.02
+       vertex -0.01333333 0.008 0.02
+       vertex -0.01333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.03
+       vertex -0.02 0.008 0.03
+       vertex -0.02 0.008 0.02
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 0.03
+       vertex -0.09333333 0.008 0.03
+       vertex -0.09333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.04
+       vertex -0.1 0.008 0.04
+       vertex -0.1 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.03
+       vertex -0.08666667 0.008 0.03
+       vertex -0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.04
+       vertex -0.09333333 0.008 0.04
+       vertex -0.09333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.03
+       vertex -0.08 0.008 0.03
+       vertex -0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.04
+       vertex -0.08666667 0.008 0.04
+       vertex -0.08666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.03
+       vertex -0.07333333 0.008 0.03
+       vertex -0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.04
+       vertex -0.08 0.008 0.04
+       vertex -0.08 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.03
+       vertex -0.06666667 0.008 0.03
+       vertex -0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.04
+       vertex -0.07333333 0.008 0.04
+       vertex -0.07333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.03
+       vertex -0.06 0.008 0.03
+       vertex -0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.04
+       vertex -0.06666667 0.008 0.04
+       vertex -0.06666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.03
+       vertex -0.05333333 0.008 0.03
+       vertex -0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.04
+       vertex -0.06 0.008 0.04
+       vertex -0.06 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.03
+       vertex -0.04666667 0.008 0.03
+       vertex -0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.04
+       vertex -0.05333333 0.008 0.04
+       vertex -0.05333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.03
+       vertex -0.04 0.008 0.03
+       vertex -0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.04
+       vertex -0.04666667 0.008 0.04
+       vertex -0.04666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.03
+       vertex -0.03333333 0.008 0.03
+       vertex -0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.04
+       vertex -0.04 0.008 0.04
+       vertex -0.04 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.03
+       vertex -0.02666667 0.008 0.03
+       vertex -0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.04
+       vertex -0.03333333 0.008 0.04
+       vertex -0.03333333 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.03
+       vertex -0.02 0.008 0.03
+       vertex -0.02 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.04
+       vertex -0.02666667 0.008 0.04
+       vertex -0.02666667 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.03
+       vertex -0.01333333 0.008 0.03
+       vertex -0.01333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.04
+       vertex -0.02 0.008 0.04
+       vertex -0.02 0.008 0.03
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.1 0.008 0.04
+       vertex -0.09333333 0.008 0.04
+       vertex -0.09333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.05
+       vertex -0.1 0.008 0.05
+       vertex -0.1 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.09333333 0.008 0.04
+       vertex -0.08666667 0.008 0.04
+       vertex -0.08666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.05
+       vertex -0.09333333 0.008 0.05
+       vertex -0.09333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08666667 0.008 0.04
+       vertex -0.08 0.008 0.04
+       vertex -0.08 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.05
+       vertex -0.08666667 0.008 0.05
+       vertex -0.08666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.08 0.008 0.04
+       vertex -0.07333333 0.008 0.04
+       vertex -0.07333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.05
+       vertex -0.08 0.008 0.05
+       vertex -0.08 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.07333333 0.008 0.04
+       vertex -0.06666667 0.008 0.04
+       vertex -0.06666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.05
+       vertex -0.07333333 0.008 0.05
+       vertex -0.07333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06666667 0.008 0.04
+       vertex -0.06 0.008 0.04
+       vertex -0.06 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.05
+       vertex -0.06666667 0.008 0.05
+       vertex -0.06666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.06 0.008 0.04
+       vertex -0.05333333 0.008 0.04
+       vertex -0.05333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.05
+       vertex -0.06 0.008 0.05
+       vertex -0.06 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.05333333 0.008 0.04
+       vertex -0.04666667 0.008 0.04
+       vertex -0.04666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.05
+       vertex -0.05333333 0.008 0.05
+       vertex -0.05333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04666667 0.008 0.04
+       vertex -0.04 0.008 0.04
+       vertex -0.04 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.05
+       vertex -0.04666667 0.008 0.05
+       vertex -0.04666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.04 0.008 0.04
+       vertex -0.03333333 0.008 0.04
+       vertex -0.03333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.05
+       vertex -0.04 0.008 0.05
+       vertex -0.04 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.03333333 0.008 0.04
+       vertex -0.02666667 0.008 0.04
+       vertex -0.02666667 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.05
+       vertex -0.03333333 0.008 0.05
+       vertex -0.03333333 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02666667 0.008 0.04
+       vertex -0.02 0.008 0.04
+       vertex -0.02 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.05
+       vertex -0.02666667 0.008 0.05
+       vertex -0.02666667 0.008 0.04
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+       vertex -0.02 0.008 0.04
+       vertex -0.01333333 0.008 0.04
+       vertex -0.01333333 0.008 0.05
+    endloop
+  endfacet
+  facet normal -0 -1 0
+    outer loop
+       vertex -0.01333333 0.008 0.05
+       vertex -0.02 0.008 0.05
+       vertex -0.02 0.008 0.04
+    endloop
+  endfacet
+endsolid topAir_to_leftSolid
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/README b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/README
new file mode 100644
index 0000000000..5a81b9a570
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/README
@@ -0,0 +1,3 @@
+fvSolution is used for outer correctors specification.
+fvSchemes is only so that pre-processing activities can proceed
+
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict
new file mode 100644
index 0000000000..ef1992cc0f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/blockMeshDict
@@ -0,0 +1,96 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-0.1 -0.04  -0.05)
+    ( 0.1 -0.04  -0.05)
+    ( 0.1  0.04  -0.05)
+    (-0.1  0.04  -0.05)
+    (-0.1 -0.04   0.05)
+    ( 0.1 -0.04   0.05)
+    ( 0.1  0.04   0.05)
+    (-0.1  0.04   0.05)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (30 10 10) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    maxY
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    minX
+    {
+        type patch;
+        faces
+        (
+            (0 4 7 3)
+        );
+    }
+    maxX
+    {
+        type patch;
+        faces
+        (
+            (2 6 5 1)
+        );
+    }
+    minY
+    {
+        type wall;
+        faces
+        (
+            (1 5 4 0)
+        );
+    }
+    minZ
+    {
+        type wall;
+        faces
+        (
+            (0 3 2 1)
+        );
+    }
+    maxZ
+    {
+        type wall;
+        faces
+        (
+            (4 5 6 7)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties
new file mode 100644
index 0000000000..b98e0ce426
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/caseProperties
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    alphat  uniform 0;
+    U       uniform (0.01 0 0);
+    p       uniform 100000;
+    p_rgh   uniform 100000;
+    rho     uniform 8000;
+    T       uniform 300;
+}
+
+
+boundaryConditions
+{
+    thermalWalls
+    {
+        category    wall;
+        type        noSlip;
+        patches     (minX maxX minY minZ maxZ);
+        options
+        {
+            wallFunction highReynolds;
+            motion      stationary;
+            heatTransfer adiabatic;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    thermalCoupledWalls
+    {
+        category    wall;
+        type        noSlip;
+        patches     (".*_to_.*");
+        options
+        {
+            wallFunction highReynolds;
+            motion      stationary;
+            heatTransfer thermalCoupled;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
new file mode 100644
index 0000000000..cb3202ef11
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minX
+        {
+            type            wall;
+        }
+        maxX
+        {
+            type            wall;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
new file mode 100644
index 0000000000..4f3d3fb667
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes
new file mode 100644
index 0000000000..439194c8ca
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss upwind;
+    div(phi,K)      Gauss linear;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(R)          Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
new file mode 100644
index 0000000000..44a0147233
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -0,0 +1,85 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "(rho|rhoFinal)"
+    {
+        solver          PCG
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        tolerance       1e-7;
+        relTol          0.01;
+
+        smoother        GaussSeidel;
+
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+
+        maxIter         100;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance        1e-7;
+        relTol           0;
+    }
+
+    "(U|h|k|epsilon|R)"
+    {
+        solver           PBiCG;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    "(U|h|k|epsilon|R)Final"
+    {
+        $U;
+        tolerance        1e-07;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   on;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict
new file mode 100644
index 0000000000..cac4409581
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/controlDict
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     chtMultiRegionFoam;
+
+startFrom       latestTime;
+
+startTime       0.001;
+
+stopAt          writeNow;   //endTime;
+
+endTime         75;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   15;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  7;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+maxCo           0.3;
+
+maxDi           10.0;
+
+adjustTimeStep  yes;
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict
new file mode 100644
index 0000000000..1594b7133b
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+// method          scotch;
+method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes
new file mode 100644
index 0000000000..402b38b2cd
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSchemes
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+}
+
+gradSchemes
+{
+}
+
+divSchemes
+{
+}
+
+laplacianSchemes
+{
+}
+
+interpolationSchemes
+{
+}
+
+snGradSchemes
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution
new file mode 100644
index 0000000000..3e44345cba
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/fvSolution
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+PIMPLE
+{
+    nOuterCorrectors 1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties
new file mode 100644
index 0000000000..30d7dd6a63
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/caseProperties
@@ -0,0 +1,73 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    p       uniform 100000;
+    T       uniform 300;
+}
+
+
+boundaryConditions
+{
+    fixedTemperature
+    {
+        category    wall;
+        type        thermal;
+        patches     (minY);
+        options
+        {
+            heatTransfer fixedTemperature;
+        }
+        values
+        {
+            $:initialConditions;
+            T       uniform 500;
+        }
+    }
+    thermalWalls
+    {
+        category    wall;
+        type        thermal;
+        patches     (minZ maxZ);
+        options
+        {
+            heatTransfer adiabatic;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    thermalCoupledWalls
+    {
+        category    wall;
+        type        thermal;
+        patches     (".*_to_.*");
+        options
+        {
+            heatTransfer thermalCoupled;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict
new file mode 100644
index 0000000000..d2f0f853f7
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minY
+        {
+            type            patch;
+        }
+        minZ
+        {
+            type            patch;
+        }
+        maxZ
+        {
+            type            patch;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict
new file mode 100644
index 0000000000..4f3d3fb667
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes
new file mode 100644
index 0000000000..07e39bf4e1
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution
new file mode 100644
index 0000000000..9e6034aab5
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/heater/fvSolution
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties
new file mode 100644
index 0000000000..a7c5de1834
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/caseProperties
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    p       uniform 100000;
+    rho     uniform 8000;
+    T       uniform 300;
+}
+
+
+boundaryConditions
+{
+    thermalWalls
+    {
+        category    wall;
+        type        thermal;
+        patches     (minX minZ maxZ);
+        options
+        {
+            heatTransfer adiabatic;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    thermalCoupledWalls
+    {
+        category    wall;
+        type        thermal;
+        patches     (".*_to_.*");
+        options
+        {
+            heatTransfer thermalCoupled;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
new file mode 100644
index 0000000000..94340ad1b3
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minZ
+        {
+            type            patch;
+        }
+        maxZ
+        {
+            type            patch;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
new file mode 100644
index 0000000000..4f3d3fb667
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes
new file mode 100644
index 0000000000..07e39bf4e1
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSchemes
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSolution
new file mode 120000
index 0000000000..0bde0fc62f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/leftSolid/fvSolution
@@ -0,0 +1 @@
+../heater/fvSolution
\ No newline at end of file
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties
new file mode 100644
index 0000000000..7b71b22f1a
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/caseProperties
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    p       uniform 100000;
+    rho     uniform 8000;
+    T       uniform 300;
+}
+
+
+boundaryConditions
+{
+    thermalWalls
+    {
+        category    wall;
+        type        thermal;
+        patches     (maxX minZ maxZ);
+        options
+        {
+            heatTransfer adiabatic;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    thermalCoupledWalls
+    {
+        category    wall;
+        type        thermal;
+        patches     (".*_to_.*");
+        options
+        {
+            heatTransfer thermalCoupled;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
new file mode 100644
index 0000000000..94340ad1b3
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+    boundary
+    {
+        minZ
+        {
+            type            patch;
+        }
+        maxZ
+        {
+            type            patch;
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
new file mode 100644
index 0000000000..4f3d3fb667
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes
new file mode 100644
index 0000000000..07e39bf4e1
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSchemes
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSolution
new file mode 120000
index 0000000000..0bde0fc62f
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/rightSolid/fvSolution
@@ -0,0 +1 @@
+../heater/fvSolution
\ No newline at end of file
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
new file mode 100644
index 0000000000..cbc02614fa
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -0,0 +1,419 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      autoHexMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh true;
+snap            true;
+addLayers       false;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+// Surfaces are used
+// - to specify refinement for any mesh cell intersecting it
+// - to specify refinement for any mesh cell inside/outside/near
+// - to 'snap' the mesh boundary to the surface
+geometry
+{
+    bottomAir.stl
+    {
+        type triSurfaceMesh;
+        name bottomAir;
+    }
+
+    topAir.stl
+    {
+        type triSurfaceMesh;
+        name topAir;
+    }
+
+    leftSolid.stl
+    {
+        type triSurfaceMesh;
+        name leftSolid;
+    }
+
+    rightSolid.stl
+    {
+        type triSurfaceMesh;
+        name rightSolid;
+    }
+
+    heater.stl
+    {
+        type triSurfaceMesh;
+        name heater;
+    }
+
+    //refinementBox
+    //{
+    //    type searchableBox;
+    //    min (-0.3 -0.4 -0.1);
+    //    max ( 3.0  0.4  1.4);
+   // }
+};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations
+    // refining just a few cells. This setting will cause refinement
+    // to stop if <= minimumRefine are selected for refinement. Note:
+    // it will at least do one iteration (unless the number of cells
+    // to refine is 0)
+    minRefinementCells 10;
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 2;
+
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by its edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    features
+    (
+        {
+            file "bottomAir.eMesh";
+            level 1;
+        }
+        {
+            file "heater.eMesh";
+            level 1;
+        }
+        {
+            file "leftSolid.eMesh";
+            level 1;
+        }
+        {
+            file "rightSolid.eMesh";
+            level 1;
+        }
+        {
+            file "topAir.eMesh";
+            level 1;
+        }
+    );
+
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {
+        bottomAir
+        {
+            // Surface-wise min and max refinement level
+            level (1 1);
+
+            faceZone bottomAir;
+            cellZone bottomAir;
+            cellZoneInside inside;
+        }
+
+        topAir
+        {
+            // Surface-wise min and max refinement level
+            level (1 1);
+
+            faceZone topAir;
+            cellZone topAir;
+            cellZoneInside inside;
+        }
+
+        heater
+        {
+            // Surface-wise min and max refinement level
+            level (0 0);
+
+            faceZone heater;
+            cellZone heater;
+            cellZoneInside inside;
+        }
+
+        leftSolid
+        {
+            // Surface-wise min and max refinement level
+            level (1 1);
+
+            faceZone leftSolid;
+            cellZone leftSolid;
+            cellZoneInside inside;
+        }
+
+        rightSolid
+        {
+            // Surface-wise min and max refinement level
+            level (1 1);
+
+            faceZone rightSolid;
+            cellZone rightSolid;
+            cellZoneInside inside;
+        }
+    }
+
+    // Resolve sharp angles
+    resolveFeatureAngle 30;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   descending order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {
+        //refinementBox
+        //{
+        //    mode inside;
+        //    levels ((1E15 4));
+        //}
+    }
+
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the locationInMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    locationInMesh (0.01 0.01 0.01);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces false;
+}
+
+
+
+// Settings for the snapping.
+snapControls
+{
+    //- Number of patch smoothing iterations before finding correspondence
+    //  to surface
+    nSmoothPatch 3;
+
+    //- Relative distance for points to be attracted by surface feature point
+    //  or edge. True distance is this factor times local
+    //  maximum edge length.
+    tolerance 1.0;
+
+    //- Number of mesh displacement relaxation iterations.
+    nSolveIter 30;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    //- Highly experimental and wip: number of feature edge snapping
+    //  iterations. Leave out altogether to disable.
+    //  Of limited use in this case since faceZone faces not handled.
+    nFeatureSnapIter 10;
+}
+
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    relativeSizes true;
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+        maxY
+        {
+            nSurfaceLayers 3;
+        }
+    }
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.3;
+
+    // Wanted thickness of final added cell layer. If multiple layers
+    // is the thickness of the layer furthest away from the wall.
+    // Relative to undistorted size of cell outside layer.
+    finalLayerThickness 1;
+
+    // Minimum thickness of cell layer. If for any reason layer
+    // cannot be above minThickness do not add layer.
+    // Relative to undistorted size of cell outside layer.
+    minThickness 0.1;
+
+    // If points get not extruded do nGrow layers of connected faces that are
+    // also not grown. This helps convergence of the layer addition process
+    // close to features.
+    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
+    nGrow 0;
+
+    // Advanced settings
+
+    // When not to extrude surface. 0 is flat surface, 90 is when two faces
+    // are perpendicular
+    featureAngle 30;
+
+    // Maximum number of snapping relaxation iterations. Should stop
+    // before upon reaching a correct mesh.
+    nRelaxIter 3;
+
+    // Number of smoothing iterations of surface normals
+    nSmoothSurfaceNormals 1;
+
+    // Number of smoothing iterations of interior mesh movement direction
+    nSmoothNormals 3;
+
+    // Smooth layer thickness over surface patches
+    nSmoothThickness 2;
+
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 0.5;
+
+    // Reduce layer growth where ratio thickness to medial
+    // distance is large
+    maxThicknessToMedialRatio 1;
+
+    // Angle used to pick up medial axis points
+    // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x.
+    minMedianAxisAngle 90;
+
+    // Create buffer region for new layer terminations
+    nBufferCellsNoExtrude 0;
+
+    // Overall max number of layer addition iterations. The mesher will exit
+    // if it reaches this number of iterations; possibly with an illegal
+    // mesh.
+    nLayerIter 50;
+}
+
+
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+meshQualityControls
+{
+    //- Maximum non-orthogonality allowed. Set to 180 to disable.
+    maxNonOrtho 65;
+
+    //- Max skewness allowed. Set to <0 to disable.
+    maxBoundarySkewness 20;
+    maxInternalSkewness 4;
+
+    //- Max concaveness allowed. Is angle (in degrees) below which concavity
+    //  is allowed. 0 is straight face, <0 would be convex face.
+    //  Set to 180 to disable.
+    maxConcave 80;
+
+    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
+    //  Set to very negative number (e.g. -1E30) to disable.
+    minVol 0;
+
+    //- Minimum quality of the tet formed by the face-centre
+    //  and variable base point minimum decomposition triangles and
+    //  the cell centre.  Set to very negative number (e.g. -1E30) to
+    //  disable.
+    //     <0 = inside out tet,
+    //      0 = flat tet
+    //      1 = regular tet
+    minTetQuality 1e-30;
+
+    //- Minimum face area. Set to <0 to disable.
+    minArea -1;
+
+    //- Minimum face twist. Set to <-1 to disable. dot product of face normal
+    //- and face centre triangles normal
+    minTwist 0.02;
+
+    //- minimum normalised cell determinant
+    //- 1 = hex, <= 0 = folded or flattened illegal cell
+    minDeterminant 0.001;
+
+    //- minFaceWeight (0 -> 0.5)
+    minFaceWeight 0.02;
+
+    //- minVolRatio (0 -> 1)
+    minVolRatio 0.01;
+
+    //must be >0 for Fluent compatibility
+    minTriangleTwist -1;
+
+
+    // Advanced
+
+    //- Number of error distribution iterations
+    nSmoothScale 4;
+    //- amount to scale back displacement at error points
+    errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Flags for optional output
+// 0 : only write final meshes
+// 1 : write intermediate meshes
+// 2 : write volScalarField with cellLevel for postprocessing
+// 4 : write current intersections as .obj files
+debug 0;
+
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1e-6;
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..befe329465
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -0,0 +1,99 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+bottomAir.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+heater.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+leftSolid.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+rightSolid.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+topAir.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties
new file mode 100644
index 0000000000..c1aeadba39
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/caseProperties
@@ -0,0 +1,93 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      caseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+initialConditions
+{
+    alphat  uniform 0;
+    U       uniform (0.1 0 0);
+    p       uniform 100000;
+    p_rgh   uniform 100000;
+    T       uniform 300;
+}
+
+
+boundaryConditions
+{
+    inlet
+    {
+        category    inlet;
+        type        subSonic;
+        patches     (minX);
+        options
+        {
+            flowSpecification fixedVelocity;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    outlet
+    {
+        category    outlet;
+        type        subSonic;
+        patches     (maxX);
+        options
+        {
+            returnFlow  wall;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    thermalWalls
+    {
+        category    wall;
+        type        noSlip;
+        patches     (maxY minZ maxZ);
+        options
+        {
+            wallFunction highReynolds;
+            motion      stationary;
+            heatTransfer adiabatic;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+    thermalCoupledWalls
+    {
+        category    wall;
+        type        noSlip;
+        patches     (".*_to_.*");
+        options
+        {
+            wallFunction highReynolds;
+            motion      stationary;
+            heatTransfer thermalCoupled;
+        }
+        values
+        {
+            $:initialConditions;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
new file mode 100644
index 0000000000..a8a40b7bcf
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dictionaryReplacement
+{
+}
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict
new file mode 100644
index 0000000000..4f3d3fb667
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/decomposeParDict
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    note        "mesh decomposition control dictionary";
+    location    "system";
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  4;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+method          scotch;
+// method          hierarchical;
+// method          simple;
+// method          manual;
+
+simpleCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (2 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+
+//// Is the case distributed
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes
new file mode 100644
index 0000000000..439194c8ca
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss upwind;
+    div(phi,K)      Gauss linear;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(R)          Gauss linear;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear limited corrected 0.333;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         limited corrected 0.333;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
new file mode 100644
index 0000000000..3fc4f95ec6
--- /dev/null
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -0,0 +1,85 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.2                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "(rho|rhoFinal)"
+    {
+        solver          PCG
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.01;
+
+        smoother         GaussSeidel;
+
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator     faceAreaPair;
+        mergeLevels      1;
+
+        maxIter          100;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance        1e-7;
+        relTol           0;
+    }
+
+    "(U|h|k|epsilon|R)"
+    {
+        solver           PBiCG;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    "(U|h|k|epsilon|R)Final"
+    {
+        $U;
+        tolerance        1e-07;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   on;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
index c4a675b0aa..899ce1a2d7 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
index e1962380c3..6d80a0821d 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
index 377c6cee24..215f3249d6 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
deleted file mode 100644
index 1d54b63e6b..0000000000
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    left
-    {
-        type            symmetryPlane;
-        nFaces          30;
-        startFace       1930;
-    }
-    right
-    {
-        type            patch;
-        nFaces          30;
-        startFace       1960;
-    }
-    down
-    {
-        type            symmetryPlane;
-        nFaces          30;
-        startFace       1990;
-    }
-    up
-    {
-        type            patch;
-        nFaces          30;
-        startFace       2020;
-    }
-    hole
-    {
-        type            patch;
-        nFaces          20;
-        startFace       2050;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          2000;
-        startFace       2070;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
index 77f422aca4..c4267f5a5c 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
index 62d50e5d12..a1f0862161 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
index cc0bafb7a4..622fd88bc2 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
index 4590e5528a..ca28dfdf99 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
index 94b968c1c9..fbe3ab922c 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
index 9df7725687..94a8ba9299 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
index 68446c9905..cb2343fdf2 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
index 81f99d5f7b..3c35439a89 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
index 98c43c5450..2a7ec38e99 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
index 8e28bddeb6..62147b108d 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
index 77f422aca4..c4267f5a5c 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
index 2579387b2b..cbf47a53d7 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
index d10a13e3f8..29212e58d1 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
index fbe284faba..0c61b18dcd 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
index 7a6ec470ee..a0b9a4e853 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
index 26948af5b6..ba977755f7 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/wmake/MakefileFiles b/wmake/MakefileFiles
index 9f0ed1cf9d..8c5535354a 100644
--- a/wmake/MakefileFiles
+++ b/wmake/MakefileFiles
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -68,16 +68,9 @@ $(SFILES): $(MAKE_DIR)/files
 	# Add a newline to files to ensure the last line is followed by a newline
 	@echo "" >> $(SFILES)
 	# Remove commented lines, blank lines, and trailing blanks from files
-	@sed -i \
-	    -e '/^#/ d'         \
-	    -e '/^[ \t]*$$/ d'   \
-	    -e 's,[ \t]*$$,,'    \
-	     $(SFILES)
+	@sed -i -e '/^#/ d' -e '/^[ \t]*$$/ d' -e 's,[ \t]*$$,,' $(SFILES)
 	# Add backslashes
-	@sed -i \
-	    -e 's,$$, \\,'    \
-	    -e '$$s,\\,,'    \
-	    $(SFILES)
+	@sed -i -e 's,$$, \\,' -e '$$s,\\,,' $(SFILES)
 
 $(VARS): $(SFILES)
 
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index ddb05970b1..f7d8a111eb 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
 
 # Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value
 
 CC          = clang++ -m64
 
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index db31f57760..9d1ecb7482 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
 
 # Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedef -Wno-tautological-undefined-compare
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedef -Wno-tautological-undefined-compare -Wno-shift-negative-value
 
 CC          = clang++ -m32